Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp320846ybx;
        Wed, 30 Oct 2019 15:51:29 -0700 (PDT)
X-Google-Smtp-Source: APXvYqyU1hqBMcPKA/+wR8cfzxvKXlK4sK7VQe18gJNEjWRQGVdEDvq4aMrTUijedOBgmtT/24yK
X-Received: by 2002:a17:906:85d3:: with SMTP id i19mr691767ejy.69.1572475889818;
        Wed, 30 Oct 2019 15:51:29 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1572475889; cv=none;
        d=google.com; s=arc-20160816;
        b=MVvMRdjn0lAMIEZn67GsyaN+R8PRdS1QdUIXD54PkAB033FErANc9Jwty/brr/ePMC
         2BimzLqqC4Z1gENu36Kwdldf+sjQdU0/f9TEUoHVbVp4D8jeOQpQJL54upthLqo5zq3o
         vhmCOtVOpWOjmOd9w0Ke3S6QOnKnuWshJBwkX9RPyv+ciGZkLfuVifT4jCCFhK+xzPvn
         +KonEUAzNIKaSPqAFws2GV8KQM5ev4e/vM7uDZqmbI70NuWjKAjL082j7PhLs94q36E0
         fp+8XMh8uaOi+t6Rdc3bBH3D8JRB+1U8LF+U6rJ/AlrERwYKw9/OoSC11mV6eleRan/w
         afZw==
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=liO76MrwJT5y5IUfrUHPe1ML08BZFmwb/vxBRrGctqM=;
        b=BrjXpFQCwxV5C6oIBnw/FAcQPlADEkSkRGfDogN0zJKbP9L0UjhTvVhtg3auvg9hx/
         ycU9tx2lQwPVuJaKfVbgbbA5LL/TuJuN0qtfQD2uM6EBWIilOawiD89AfimN0n7h/UnW
         Hikv3BolSrLoe3PNt9pJofsXOZYQZG+sq4pRBitKzIUAgJubO0Vt6+VAm222wbldD184
         i1gt6QAG3Fmm+i82dfTQ8HDh9fX45eEPMxGqd60yIA5Dy+agX6wHrWSI8o2W4IVrBOJq
         lbZptzqtNfeLgfOWF/a+/302KT6YGPxajahPzEgTUSXmdxGKFPsUOtWmKRlmaqWMANNW
         EdUQ==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b="n/jU6RrW";
       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: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id x14si2807831edl.128.2019.10.30.15.51.06;
        Wed, 30 Oct 2019 15:51:29 -0700 (PDT)
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="n/jU6RrW";
       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 S1727782AbfJ3WuA (ORCPT <rfc822;xiaochao379261131@gmail.com>
        + 99 others); Wed, 30 Oct 2019 18:50:00 -0400
Received: from hqemgate14.nvidia.com ([216.228.121.143]:1459 "EHLO
        hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727731AbfJ3Wt4 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 30 Oct 2019 18:49:56 -0400
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5dba13950000>; Wed, 30 Oct 2019 15:49:57 -0700
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Wed, 30 Oct 2019 15:49:51 -0700
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Wed, 30 Oct 2019 15:49:51 -0700
Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL107.nvidia.com
 (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 30 Oct
 2019 22:49:50 +0000
Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL111.nvidia.com
 (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Wed, 30 Oct 2019 22:49:49 +0000
Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5dba138c0001>; Wed, 30 Oct 2019 15:49:49 -0700
From:   John Hubbard <jhubbard@nvidia.com>
To:     Andrew Morton <akpm@linux-foundation.org>
CC:     Al Viro <viro@zeniv.linux.org.uk>,
        Alex Williamson <alex.williamson@redhat.com>,
        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= <bjorn.topel@intel.com>,
        Christoph Hellwig <hch@infradead.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Dave Chinner <david@fromorbit.com>,
        David Airlie <airlied@linux.ie>,
        "David S . Miller" <davem@davemloft.net>,
        Ira Weiny <ira.weiny@intel.com>, Jan Kara <jack@suse.cz>,
        Jason Gunthorpe <jgg@ziepe.ca>, Jens Axboe <axboe@kernel.dk>,
        Jonathan Corbet <corbet@lwn.net>,
        =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse@redhat.com>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Michal Hocko <mhocko@suse.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Paul Mackerras <paulus@samba.org>,
        Shuah Khan <shuah@kernel.org>,
        Vlastimil Babka <vbabka@suse.cz>, <bpf@vger.kernel.org>,
        <dri-devel@lists.freedesktop.org>, <kvm@vger.kernel.org>,
        <linux-block@vger.kernel.org>, <linux-doc@vger.kernel.org>,
        <linux-fsdevel@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
        <linux-media@vger.kernel.org>, <linux-rdma@vger.kernel.org>,
        <linuxppc-dev@lists.ozlabs.org>, <netdev@vger.kernel.org>,
        <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>,
        John Hubbard <jhubbard@nvidia.com>
Subject: [PATCH 13/19] media/v4l2-core: pin_longterm_pages (FOLL_PIN) and put_user_page() conversion
Date:   Wed, 30 Oct 2019 15:49:24 -0700
Message-ID: <20191030224930.3990755-14-jhubbard@nvidia.com>
X-Mailer: git-send-email 2.23.0
In-Reply-To: <20191030224930.3990755-1-jhubbard@nvidia.com>
References: <20191030224930.3990755-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=1572475797; bh=liO76MrwJT5y5IUfrUHPe1ML08BZFmwb/vxBRrGctqM=;
        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=n/jU6RrW0ZjttNabcpGwQPPab1gIeZFpT4fnLGvVm243QsafiVbh9DI2+2S4wRLXV
         muZvRf/8uBCxVsC+mzS9tiK6baXFDniJzFsfdLPJcrW9n74Tt2fvUV/p3gtTXpB/mV
         tvZO4ZDCmJbUhjlTXXb3QYEDe1CQZAWnPCmuKToxabj6E+MYjYQozWYENsHdKPq6A7
         L546SbyRShX9dmy+dRTwnDa6eyRVCLbCMk5HVM8PUGjOk3PV94wUozgY11xDMrcKrH
         PDcINmVzC2eOVqxsHyv4UF+YTfsp0jwhRmqltzQUSz2iYiUp2Sax48itEzhx5AdORO
         bd9OAN2qf8zWw==
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
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().

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 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.23.0