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=-12.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 9D84AC4727F for ; Wed, 7 Oct 2020 22:18:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F107920882 for ; Wed, 7 Oct 2020 22:18:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="K+rmowKL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F107920882 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3410C6B005C; Wed, 7 Oct 2020 18:18:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CB6F8E0001; Wed, 7 Oct 2020 18:18:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1917A6B0062; Wed, 7 Oct 2020 18:18:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0054.hostedemail.com [216.40.44.54]) by kanga.kvack.org (Postfix) with ESMTP id D92986B005C for ; Wed, 7 Oct 2020 18:18:50 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 6509F824999B for ; Wed, 7 Oct 2020 22:18:50 +0000 (UTC) X-FDA: 77346545220.02.wheel85_490ca47271d2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 3F35E10169584 for ; Wed, 7 Oct 2020 22:18:50 +0000 (UTC) X-HE-Tag: wheel85_490ca47271d2 X-Filterd-Recvd-Size: 11516 Received: from hqnvemgate26.nvidia.com (hqnvemgate26.nvidia.com [216.228.121.65]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 7 Oct 2020 22:18:49 +0000 (UTC) Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Wed, 07 Oct 2020 15:18:35 -0700 Received: from [10.2.85.86] (172.20.13.39) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 7 Oct 2020 22:18:42 +0000 Subject: Re: [PATCH 06/13] media: videobuf2: Move frame_vector into media subsystem To: Daniel Vetter , DRI Development , LKML CC: , , , , , , Daniel Vetter , Jason Gunthorpe , Pawel Osciak , Marek Szyprowski , "Kyungmin Park" , Tomasz Figa , "Mauro Carvalho Chehab" , Andrew Morton , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Jan Kara , Dan Williams References: <20201007164426.1812530-1-daniel.vetter@ffwll.ch> <20201007164426.1812530-7-daniel.vetter@ffwll.ch> From: John Hubbard Message-ID: <25f92b5b-0bf8-98b9-a056-413b08850341@nvidia.com> Date: Wed, 7 Oct 2020 15:18:41 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201007164426.1812530-7-daniel.vetter@ffwll.ch> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1602109115; bh=RBb11DPNv4MaIyVxWn7lW9yIg1xY4SBFzpNcqMq9OMk=; h=Subject:To:CC:References:From:Message-ID:Date:User-Agent: MIME-Version:In-Reply-To:Content-Type:Content-Language: Content-Transfer-Encoding:X-Originating-IP:X-ClientProxiedBy; b=K+rmowKL9KsU86qg+jrSSUEuBWd2ZUS2RQSHTr1UAVR+xQWbIYZqI/lWcXkWKRKC0 FgqMEsXEv/Ac8sDbgyS8J/RImVj8o2rSDKpicHDFi8gX/9RXMmtXi/FhaEyoXbsFmK BLXkJ8MjZoHU/0ca+VCu5im9jhSxmy0wCQdIRc3l4T5Ui/NAKplYUx+vAwDuu37pZN kAfG0zTuR2D4/T/iTrUnkT7nZglx37YlScaC4n79del3V/kZkahukyVNTQmzrBkqOB UEMd5dXALdAzo95nw80FkkrV635q8AXItXVNCqcWplCocQMssGeSAokhbNWFpTO4Uz QN6bY0O+bT2gg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 10/7/20 9:44 AM, 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). >=20 > 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 > --- Failed to spot any problems here. :) Reviewed-by: John Hubbard thanks, --=20 John Hubbard NVIDIA > 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 39db520a51dc..b95f4f371681 100644 > --- a/mm/frame_vector.c > +++ b/drivers/media/common/videobuf2/frame_vector.c > @@ -8,6 +8,8 @@ > #include > #include > =20 > +#include > + > /** > * 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 */ > 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 >=20