From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5284FC433DF for ; Fri, 9 Oct 2020 10:14:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0CEA5222B9 for ; Fri, 9 Oct 2020 10:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602238472; bh=HLpDhcg7JCIZWffZIBZCvMxe2w6BmkPx1lvxzb/jlAA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=AGM9bfs9eRuVAWcXx9vQF2rBkhCrnfXiyJsaTeXQl7poLLLet/dFvrF2wP3JSJJLc CrFjNBISBUj/HGjXiIK7P+RQQDUpJAbFXCm1JZYqFsvEq9rGBaBRzSYW3HIqL9YYv2 73k4knvSApAndpKHiITdUgYCPIl5BrVB/59Dronc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387529AbgJIKO1 (ORCPT ); Fri, 9 Oct 2020 06:14:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:40444 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726357AbgJIKO1 (ORCPT ); Fri, 9 Oct 2020 06:14:27 -0400 Received: from coco.lan (ip5f5ad5d0.dynamic.kabel-deutschland.de [95.90.213.208]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AEF062226B; Fri, 9 Oct 2020 10:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602238465; bh=HLpDhcg7JCIZWffZIBZCvMxe2w6BmkPx1lvxzb/jlAA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=entYTMU57H8h4pHlBfmfx61IZZz86qZXtKIa3/8kyOsu7AJtmiUWy0DpXZ8c355dF oxwMgMeoIfe32cPPr8yifCD9zFte1J/ueRlcm5tjhBiUii2B/j6Ox0Z6+f+auAMpj9 zx6ZdvznIgHatn9Me42Sr1LkAeyYY1zjSs8WJ9mw= Date: Fri, 9 Oct 2020 12:14:17 +0200 From: Mauro Carvalho Chehab To: Daniel Vetter Cc: DRI Development , LKML , kvm@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, linux-s390@vger.kernel.org, John Hubbard , Daniel Vetter , Jason Gunthorpe , Pawel Osciak , Marek Szyprowski , Kyungmin Park , Tomasz Figa , Andrew Morton , =?UTF-8?B?SsOpcsO0bWU=?= Glisse , Jan Kara , Dan Williams Subject: Re: [PATCH v2 06/17] media: videobuf2: Move frame_vector into media subsystem Message-ID: <20201009121417.115db7d9@coco.lan> In-Reply-To: <20201009075934.3509076-7-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> <20201009075934.3509076-7-daniel.vetter@ffwll.ch> X-Mailer: Claws Mail 3.17.6 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Em Fri, 9 Oct 2020 09:59:23 +0200 Daniel Vetter 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). >=20 > Reviewed-by: John Hubbard > Signed-off-by: Daniel Vetter > Cc: Jason Gunthorpe > Cc: Pawel Osciak > Cc: Marek Szyprowski > Cc: Kyungmin Park > Cc: Tomasz Figa > Cc: Mauro Carvalho Chehab > Cc: Andrew Morton > Cc: John Hubbard > Cc: J=C3=A9r=C3=B4me Glisse > Cc: Jan Kara > Cc: Dan Williams > 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 > --- > 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 =3D> drivers/media/common/videobuf2}/frame_vector.c (99%) >=20 > diff --git a/drivers/media/common/videobuf2/Kconfig b/drivers/media/commo= n/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 > =20 > config VIDEOBUF2_MEMOPS > tristate > - select FRAME_VECTOR > =20 > config VIDEOBUF2_DMA_CONTIG > tristate > diff --git a/drivers/media/common/videobuf2/Makefile b/drivers/media/comm= on/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 :=3D videobuf2-core.o > +videobuf2-common-objs +=3D frame_vector.o > =20 > ifeq ($(CONFIG_TRACEPOINTS),y) > videobuf2-common-objs +=3D vb2-trace.o > diff --git a/mm/frame_vector.c b/drivers/media/common/videobuf2/frame_vec= tor.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 > #include > =20 > +#include > + 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, unsign= ed long pages, bool inc); > int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool = inc, > struct task_struct *task, bool bypass_rlim); > =20 > -/* 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 =3D 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-cor= e.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_req= uest_object *obj); > */ > unsigned int vb2_request_buffer_cnt(struct media_request *req); > =20 > +/* 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 =3D 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. With such changes: Acked-by: Mauro Carvalho Chehab > 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. > =20 > -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) +=3D page_ext.o > obj-$(CONFIG_CMA_DEBUGFS) +=3D cma_debug.o > obj-$(CONFIG_USERFAULTFD) +=3D userfaultfd.o > obj-$(CONFIG_IDLE_PAGE_TRACKING) +=3D page_idle.o > -obj-$(CONFIG_FRAME_VECTOR) +=3D frame_vector.o > obj-$(CONFIG_DEBUG_PAGE_REF) +=3D debug_page_ref.o > obj-$(CONFIG_HARDENED_USERCOPY) +=3D usercopy.o > obj-$(CONFIG_PERCPU_STATS) +=3D percpu-stats.o Thanks, Mauro