Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp1393764ybc; Tue, 12 Nov 2019 20:33:31 -0800 (PST) X-Google-Smtp-Source: APXvYqxRYxgv8a7RkHhG0iPGMe0GDTKJn6/vEvzXDD1mnb71RcqkMw0/EYi2+dkJbKdc0dbaWUrr X-Received: by 2002:a17:906:69cb:: with SMTP id g11mr876293ejs.328.1573619611146; Tue, 12 Nov 2019 20:33:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573619611; cv=none; d=google.com; s=arc-20160816; b=0v0wZNvRA2eBZZclxtbMqxxXluENTJRDtkjFdAQrwbzlMh7jf9y/p5qNB8ksjv2YCB +KJt4u4osNEAmxJxbADor+J5LZ2RE4p/hG5uBRD9DSFD79p9LDEmUSz1pwJ81PcDCZpf 9dLja1PQOEPN6RrE6DEdKZCZsPuwQuQmTTdAP6V+Qg1LMN9Bvec8FMLWTKQHT6zDrbrh +aWS9I++e/sz/Ew1R61mERV8AcPV9BDdmlyf7U8LQtcVTPLu7Aa/e2ibzgA4Zg0CxpgX 14H4GoMEYujTxNF2ENKc1dDRc5UOT0fZVkNBe1PuTm7JcegMKLg+NztByyJebsqrvvT4 axSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=GEhpFyTQIibXhYqN9YRdzJtS2txKyU2Kys/WSrzZyBk=; b=pvR3UAox0+iAVxr1It9XSbDZ5G7xgS2qSSDlTEn9w6UPUrWosI8Pql7WCEMvQEZvzz 4rr15KMcgpz3SvX6VTUAiRtB+idtJ6Ekgv4oH4sg4jfv3HRBmB6SZylOliwLdC+HEHcj S8G1Nu6z3+iuYAYgp7jUY2cXy52kLWsaTWg0otOpdDwwwzonrWymix480KRhHAuPUHId sZmv7AaGv0zuCYAu1WIgykXVXhXLs3fJ8eDjp1gDveCZolnuniG0Dc+QJFeuQzNekx7o ucxce0E70Kqtibc205eKOuoWRtTNABPCbpeGLx6VYabWxORb3ZOqFqZyXVZkVs+Suc7J KcLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=YvHG7hxD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ec17si417408ejb.131.2019.11.12.20.33.06; Tue, 12 Nov 2019 20:33:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=YvHG7hxD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728293AbfKME35 (ORCPT + 99 others); Tue, 12 Nov 2019 23:29:57 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:13732 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727614AbfKME1U (ORCPT ); Tue, 12 Nov 2019 23:27:20 -0500 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 12 Nov 2019 20:27:13 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Tue, 12 Nov 2019 20:27:14 -0800 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Tue, 12 Nov 2019 20:27:14 -0800 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 13 Nov 2019 04:27:13 +0000 Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 13 Nov 2019 04:27:13 +0000 Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Tue, 12 Nov 2019 20:27:13 -0800 From: John Hubbard To: Andrew Morton CC: Al Viro , Alex Williamson , Benjamin Herrenschmidt , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Christoph Hellwig , Dan Williams , Daniel Vetter , Dave Chinner , David Airlie , "David S . Miller" , Ira Weiny , Jan Kara , Jason Gunthorpe , Jens Axboe , Jonathan Corbet , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Magnus Karlsson , Mauro Carvalho Chehab , Michael Ellerman , Michal Hocko , Mike Kravetz , Paul Mackerras , Shuah Khan , Vlastimil Babka , , , , , , , , , , , , , LKML , John Hubbard , Hans Verkuil Subject: [PATCH v4 17/23] media/v4l2-core: pin_longterm_pages (FOLL_PIN) and put_user_page() conversion Date: Tue, 12 Nov 2019 20:27:04 -0800 Message-ID: <20191113042710.3997854-18-jhubbard@nvidia.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191113042710.3997854-1-jhubbard@nvidia.com> References: <20191113042710.3997854-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1573619234; bh=GEhpFyTQIibXhYqN9YRdzJtS2txKyU2Kys/WSrzZyBk=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=YvHG7hxDuvg7L9X2oUv7Sg7l3tB5pmzAdQk1SYOsSRyzdo4bhnNGeSgW+oHYx5i3N JnVMDt5URR6uHTrLDgtjzzBxphE+/rM4siwh/RHq47tY95OT/PEaID3Fc8OYhHz0wE xTqiy13b0kkH+UtC4qHTrohgwqMY7Gjkhnpo31sc6T1rSHyP3DsdSGof+EIraPrBMH YQVSyVDFWCiaP1iME+njq/NEtzzdh97CVvfaVF/DxSjgGDTRSnhah4bEo0q/IcRfIg OSHaroUPjTQcVr+ri/YiK3OkxGcoSmFpjxdF6G1QfExDoCctDUuPRxzVSgTgXYH3tZ 2ye4ZQATgtL5Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1. Change v4l2 from get_user_pages(FOLL_LONGTERM), to pin_longterm_pages(), which sets both FOLL_LONGTERM and FOLL_PIN. 2. Because all FOLL_PIN-acquired pages must be released via put_user_page(), also convert the put_page() call over to put_user_pages_dirty_lock(). Acked-by: Hans Verkuil Reviewed-by: Ira Weiny Cc: Mauro Carvalho Chehab Signed-off-by: John Hubbard --- drivers/media/v4l2-core/videobuf-dma-sg.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2= -core/videobuf-dma-sg.c index 28262190c3ab..9b9c5b37bf59 100644 --- a/drivers/media/v4l2-core/videobuf-dma-sg.c +++ b/drivers/media/v4l2-core/videobuf-dma-sg.c @@ -183,12 +183,12 @@ static int videobuf_dma_init_user_locked(struct video= buf_dmabuf *dma, dprintk(1, "init user [0x%lx+0x%lx =3D> %d pages]\n", data, size, dma->nr_pages); =20 - err =3D get_user_pages(data & PAGE_MASK, dma->nr_pages, - flags | FOLL_LONGTERM, dma->pages, NULL); + err =3D pin_longterm_pages(data & PAGE_MASK, dma->nr_pages, + flags, dma->pages, NULL); =20 if (err !=3D dma->nr_pages) { dma->nr_pages =3D (err >=3D 0) ? err : 0; - dprintk(1, "get_user_pages: err=3D%d [%d]\n", err, + dprintk(1, "pin_longterm_pages: err=3D%d [%d]\n", err, dma->nr_pages); return err < 0 ? err : -EINVAL; } @@ -349,11 +349,8 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma) BUG_ON(dma->sglen); =20 if (dma->pages) { - for (i =3D 0; i < dma->nr_pages; i++) { - if (dma->direction =3D=3D DMA_FROM_DEVICE) - set_page_dirty_lock(dma->pages[i]); - put_page(dma->pages[i]); - } + put_user_pages_dirty_lock(dma->pages, dma->nr_pages, + dma->direction =3D=3D DMA_FROM_DEVICE); kfree(dma->pages); dma->pages =3D NULL; } --=20 2.24.0