On Fri, Oct 09, 2020 at 12:14:17PM +0200, Mauro Carvalho Chehab wrote: > Em Fri, 9 Oct 2020 09:59:23 +0200 > Daniel Vetter <daniel.vetter@xxxxxxxx> escreveu: > > > It's the only user. This also garbage collects the CONFIG_FRAME_VECTOR > > symbol from all over the tree (well just one place, somehow omap media > > driver still had this in its Kconfig, despite not using it). > > > > Reviewed-by: John Hubbard <jhubbard@xxxxxxxxxx> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > > Cc: Jason Gunthorpe <jgg@xxxxxxxx> > > Cc: Pawel Osciak <pawel@xxxxxxxxxx> > > Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> > > Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > > Cc: Tomasz Figa <tfiga@xxxxxxxxxxxx> > > Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> > > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > > Cc: John Hubbard <jhubbard@xxxxxxxxxx> > > Cc: Jérôme Glisse <jglisse@xxxxxxxxxx> > > Cc: Jan Kara <jack@xxxxxxx> > > Cc: Dan Williams <dan.j.williams@xxxxxxxxx> > > Cc: linux-mm@xxxxxxxxx > > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > > Cc: linux-samsung-soc@xxxxxxxxxxxxxxx > > Cc: linux-media@xxxxxxxxxxxxxxx > > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> > > --- > > drivers/media/common/videobuf2/Kconfig | 1 - > > drivers/media/common/videobuf2/Makefile | 1 + > > .../media/common/videobuf2}/frame_vector.c | 2 + > > drivers/media/platform/omap/Kconfig | 1 - > > include/linux/mm.h | 42 ------------------- > > include/media/videobuf2-core.h | 42 +++++++++++++++++++ > > mm/Kconfig | 3 -- > > mm/Makefile | 1 - > > 8 files changed, 45 insertions(+), 48 deletions(-) > > rename {mm => drivers/media/common/videobuf2}/frame_vector.c (99%) > > > > diff --git a/drivers/media/common/videobuf2/Kconfig b/drivers/media/common/videobuf2/Kconfig > > index edbc99ebba87..d2223a12c95f 100644 > > --- a/drivers/media/common/videobuf2/Kconfig > > +++ b/drivers/media/common/videobuf2/Kconfig > > @@ -9,7 +9,6 @@ config VIDEOBUF2_V4L2 > > > > config VIDEOBUF2_MEMOPS > > tristate > > - select FRAME_VECTOR > > > > config VIDEOBUF2_DMA_CONTIG > > tristate > > diff --git a/drivers/media/common/videobuf2/Makefile b/drivers/media/common/videobuf2/Makefile > > index 77bebe8b202f..54306f8d096c 100644 > > --- a/drivers/media/common/videobuf2/Makefile > > +++ b/drivers/media/common/videobuf2/Makefile > > @@ -1,5 +1,6 @@ > > # SPDX-License-Identifier: GPL-2.0 > > videobuf2-common-objs := videobuf2-core.o > > +videobuf2-common-objs += frame_vector.o > > > > ifeq ($(CONFIG_TRACEPOINTS),y) > > videobuf2-common-objs += vb2-trace.o > > diff --git a/mm/frame_vector.c b/drivers/media/common/videobuf2/frame_vector.c > > similarity index 99% > > rename from mm/frame_vector.c > > rename to drivers/media/common/videobuf2/frame_vector.c > > index d44779e56313..2b0b97761d15 100644 > > --- a/mm/frame_vector.c > > +++ b/drivers/media/common/videobuf2/frame_vector.c > > @@ -8,6 +8,8 @@ > > #include <linux/pagemap.h> > > #include <linux/sched.h> > > > > +#include <media/videobuf2-core.h> > > + > > See my comment below... > > > /** > > * get_vaddr_frames() - map virtual addresses to pfns > > * @start: starting user address > > diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig > > index f73b5893220d..de16de46c0f4 100644 > > --- a/drivers/media/platform/omap/Kconfig > > +++ b/drivers/media/platform/omap/Kconfig > > @@ -12,6 +12,5 @@ config VIDEO_OMAP2_VOUT > > depends on VIDEO_V4L2 > > select VIDEOBUF2_DMA_CONTIG > > select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3 > > - select FRAME_VECTOR > > help > > V4L2 Display driver support for OMAP2/3 based boards. > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index 16b799a0522c..acd60fbf1a5a 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -1743,48 +1743,6 @@ int account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc); > > int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc, > > struct task_struct *task, bool bypass_rlim); > > > > -/* Container for pinned pfns / pages */ > > -struct frame_vector { > > - unsigned int nr_allocated; /* Number of frames we have space for */ > > - unsigned int nr_frames; /* Number of frames stored in ptrs array */ > > - bool got_ref; /* Did we pin pages by getting page ref? */ > > - bool is_pfns; /* Does array contain pages or pfns? */ > > - void *ptrs[]; /* Array of pinned pfns / pages. Use > > - * pfns_vector_pages() or pfns_vector_pfns() > > - * for access */ > > -}; > > - > > -struct frame_vector *frame_vector_create(unsigned int nr_frames); > > -void frame_vector_destroy(struct frame_vector *vec); > > -int get_vaddr_frames(unsigned long start, unsigned int nr_pfns, > > - unsigned int gup_flags, struct frame_vector *vec); > > -void put_vaddr_frames(struct frame_vector *vec); > > -int frame_vector_to_pages(struct frame_vector *vec); > > -void frame_vector_to_pfns(struct frame_vector *vec); > > - > > -static inline unsigned int frame_vector_count(struct frame_vector *vec) > > -{ > > - return vec->nr_frames; > > -} > > - > > -static inline struct page **frame_vector_pages(struct frame_vector *vec) > > -{ > > - if (vec->is_pfns) { > > - int err = frame_vector_to_pages(vec); > > - > > - if (err) > > - return ERR_PTR(err); > > - } > > - return (struct page **)(vec->ptrs); > > -} > > - > > -static inline unsigned long *frame_vector_pfns(struct frame_vector *vec) > > -{ > > - if (!vec->is_pfns) > > - frame_vector_to_pfns(vec); > > - return (unsigned long *)(vec->ptrs); > > -} > > - > > struct kvec; > > int get_kernel_pages(const struct kvec *iov, int nr_pages, int write, > > struct page **pages); > > diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h > > index bbb3f26fbde9..a2e75ca0334f 100644 > > --- a/include/media/videobuf2-core.h > > +++ b/include/media/videobuf2-core.h > > @@ -1254,4 +1254,46 @@ bool vb2_request_object_is_buffer(struct media_request_object *obj); > > */ > > unsigned int vb2_request_buffer_cnt(struct media_request *req); > > > > +/* Container for pinned pfns / pages in frame_vector.c */ > > +struct frame_vector { > > + unsigned int nr_allocated; /* Number of frames we have space for */ > > + unsigned int nr_frames; /* Number of frames stored in ptrs array */ > > + bool got_ref; /* Did we pin pages by getting page ref? */ > > + bool is_pfns; /* Does array contain pages or pfns? */ > > + void *ptrs[]; /* Array of pinned pfns / pages. Use > > + * pfns_vector_pages() or pfns_vector_pfns() > > + * for access */ > > +}; > > + > > +struct frame_vector *frame_vector_create(unsigned int nr_frames); > > +void frame_vector_destroy(struct frame_vector *vec); > > +int get_vaddr_frames(unsigned long start, unsigned int nr_pfns, > > + unsigned int gup_flags, struct frame_vector *vec); > > +void put_vaddr_frames(struct frame_vector *vec); > > +int frame_vector_to_pages(struct frame_vector *vec); > > +void frame_vector_to_pfns(struct frame_vector *vec); > > + > > +static inline unsigned int frame_vector_count(struct frame_vector *vec) > > +{ > > + return vec->nr_frames; > > +} > > + > > +static inline struct page **frame_vector_pages(struct frame_vector *vec) > > +{ > > + if (vec->is_pfns) { > > + int err = frame_vector_to_pages(vec); > > + > > + if (err) > > + return ERR_PTR(err); > > + } > > + return (struct page **)(vec->ptrs); > > +} > > + > > +static inline unsigned long *frame_vector_pfns(struct frame_vector *vec) > > +{ > > + if (!vec->is_pfns) > > + frame_vector_to_pfns(vec); > > + return (unsigned long *)(vec->ptrs); > > +} > > + > > #endif /* _MEDIA_VIDEOBUF2_CORE_H */ > > Please place those into a include/media/frame_vector.h file, instead of > merging it directly at vb2 core header. > > Then include the new header at videobuf2-core.h and at frame_vector.c. Makes sense, I'll do that for v3. > With such changes: > > Acked-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> Thanks for taking a look. -Daniel > > > diff --git a/mm/Kconfig b/mm/Kconfig > > index 6c974888f86f..da6c943fe9f1 100644 > > --- a/mm/Kconfig > > +++ b/mm/Kconfig > > @@ -815,9 +815,6 @@ config DEVICE_PRIVATE > > memory; i.e., memory that is only accessible from the device (or > > group of devices). You likely also want to select HMM_MIRROR. > > > > -config FRAME_VECTOR > > - bool > > - > > config ARCH_USES_HIGH_VMA_FLAGS > > bool > > config ARCH_HAS_PKEYS > > diff --git a/mm/Makefile b/mm/Makefile > > index d5649f1c12c0..a025fd6c6afd 100644 > > --- a/mm/Makefile > > +++ b/mm/Makefile > > @@ -111,7 +111,6 @@ obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o > > obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o > > obj-$(CONFIG_USERFAULTFD) += userfaultfd.o > > obj-$(CONFIG_IDLE_PAGE_TRACKING) += page_idle.o > > -obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o > > obj-$(CONFIG_DEBUG_PAGE_REF) += debug_page_ref.o > > obj-$(CONFIG_HARDENED_USERCOPY) += usercopy.o > > obj-$(CONFIG_PERCPU_STATS) += percpu-stats.o > > > > Thanks, > Mauro -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel