diff mbox series

[v6,06/17] media: videobuf2: Move frame_vector into media subsystem

Message ID 20201119144146.1045202-7-daniel.vetter@ffwll.ch
State Superseded
Headers show
Series follow_pfn and other iomap races | expand

Commit Message

Daniel Vetter Nov. 19, 2020, 2:41 p.m. UTC 
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@nvidia.com>
Acked-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Acked-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Pawel Osciak <pawel@osciak.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Tomasz Figa <tfiga@chromium.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: linux-mm@kvack.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
--
v3:
- Create a new frame_vector.h header for this (Mauro)
v5:
- Rebase over changes in frame-vector.c from Tomasz review.
---
 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/frame_vector.h                  | 47 +++++++++++++++++++
 include/media/videobuf2-core.h                |  1 +
 mm/Kconfig                                    |  3 --
 mm/Makefile                                   |  1 -
 9 files changed, 51 insertions(+), 48 deletions(-)
 rename {mm => drivers/media/common/videobuf2}/frame_vector.c (99%)
 create mode 100644 include/media/frame_vector.h

Comments

Hans Verkuil Nov. 20, 2020, 8:07 a.m. UTC | #1 
On 19/11/2020 15:41, Daniel Vetter wrote:
> 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@nvidia.com>

> Acked-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

> Acked-by: Tomasz Figa <tfiga@chromium.org>


Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>


Thanks!

	Hans

> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

> Cc: Jason Gunthorpe <jgg@ziepe.ca>

> Cc: Pawel Osciak <pawel@osciak.com>

> Cc: Marek Szyprowski <m.szyprowski@samsung.com>

> Cc: Kyungmin Park <kyungmin.park@samsung.com>

> Cc: Tomasz Figa <tfiga@chromium.org>

> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>

> Cc: Andrew Morton <akpm@linux-foundation.org>

> Cc: John Hubbard <jhubbard@nvidia.com>

> Cc: Jérôme Glisse <jglisse@redhat.com>

> Cc: Jan Kara <jack@suse.cz>

> Cc: Dan Williams <dan.j.williams@intel.com>

> Cc: linux-mm@kvack.org

> Cc: linux-arm-kernel@lists.infradead.org

> Cc: linux-samsung-soc@vger.kernel.org

> Cc: linux-media@vger.kernel.org

> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>

> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> --

> v3:

> - Create a new frame_vector.h header for this (Mauro)

> v5:

> - Rebase over changes in frame-vector.c from Tomasz review.

> ---

>  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/frame_vector.h                  | 47 +++++++++++++++++++

>  include/media/videobuf2-core.h                |  1 +

>  mm/Kconfig                                    |  3 --

>  mm/Makefile                                   |  1 -

>  9 files changed, 51 insertions(+), 48 deletions(-)

>  rename {mm => drivers/media/common/videobuf2}/frame_vector.c (99%)

>  create mode 100644 include/media/frame_vector.h

> 

> 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 f8c34b895c76..a0e65481a201 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/frame_vector.h>

> +

>  /**

>   * 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 efb8c39bc933..b1a4a140863d 100644

> --- a/include/linux/mm.h

> +++ b/include/linux/mm.h

> @@ -1751,48 +1751,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,

> -		     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/frame_vector.h b/include/media/frame_vector.h

> new file mode 100644

> index 000000000000..bfed1710dc24

> --- /dev/null

> +++ b/include/media/frame_vector.h

> @@ -0,0 +1,47 @@

> +// SPDX-License-Identifier: GPL-2.0

> +#ifndef _MEDIA_FRAME_VECTOR_H

> +#define _MEDIA_FRAME_VECTOR_H

> +

> +/* 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,

> +		     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_FRAME_VECTOR_H */

> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h

> index bbb3f26fbde9..d045e3a5a1d8 100644

> --- a/include/media/videobuf2-core.h

> +++ b/include/media/videobuf2-core.h

> @@ -18,6 +18,7 @@

>  #include <linux/dma-buf.h>

>  #include <linux/bitops.h>

>  #include <media/media-request.h>

> +#include <media/frame_vector.h>

>  

>  #define VB2_MAX_FRAME	(32)

>  #define VB2_MAX_PLANES	(8)

> diff --git a/mm/Kconfig b/mm/Kconfig

> index d42423f884a7..0dcff24cba53 100644

> --- a/mm/Kconfig

> +++ b/mm/Kconfig

> @@ -819,9 +819,6 @@ config DEVICE_PRIVATE

>  config VMAP_PFN

>  	bool

>  

> -config FRAME_VECTOR

> -	bool

> -

>  config ARCH_USES_HIGH_VMA_FLAGS

>  	bool

>  config ARCH_HAS_PKEYS

> diff --git a/mm/Makefile b/mm/Makefile

> index d73aed0fc99c..db41fff05038 100644

> --- a/mm/Makefile

> +++ b/mm/Makefile

> @@ -110,7 +110,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

>
diff mbox series

Patch

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 f8c34b895c76..a0e65481a201 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/frame_vector.h>
+
 /**
  * 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 efb8c39bc933..b1a4a140863d 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1751,48 +1751,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,
-		     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/frame_vector.h b/include/media/frame_vector.h
new file mode 100644
index 000000000000..bfed1710dc24
--- /dev/null
+++ b/include/media/frame_vector.h
@@ -0,0 +1,47 @@ 
+// SPDX-License-Identifier: GPL-2.0
+#ifndef _MEDIA_FRAME_VECTOR_H
+#define _MEDIA_FRAME_VECTOR_H
+
+/* 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,
+		     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_FRAME_VECTOR_H */
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index bbb3f26fbde9..d045e3a5a1d8 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -18,6 +18,7 @@ 
 #include <linux/dma-buf.h>
 #include <linux/bitops.h>
 #include <media/media-request.h>
+#include <media/frame_vector.h>
 
 #define VB2_MAX_FRAME	(32)
 #define VB2_MAX_PLANES	(8)
diff --git a/mm/Kconfig b/mm/Kconfig
index d42423f884a7..0dcff24cba53 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -819,9 +819,6 @@  config DEVICE_PRIVATE
 config VMAP_PFN
 	bool
 
-config FRAME_VECTOR
-	bool
-
 config ARCH_USES_HIGH_VMA_FLAGS
 	bool
 config ARCH_HAS_PKEYS
diff --git a/mm/Makefile b/mm/Makefile
index d73aed0fc99c..db41fff05038 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -110,7 +110,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