All of lore.kernel.org
 help / color / mirror / Atom feed
From: john.hubbard@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Christoph Hellwig" <hch@infradead.org>,
	"Dan Williams" <dan.j.williams@intel.com>,
	"Dave Chinner" <david@fromorbit.com>,
	"Dave Hansen" <dave.hansen@linux.intel.com>,
	"Ira Weiny" <ira.weiny@intel.com>, "Jan Kara" <jack@suse.cz>,
	"Jason Gunthorpe" <jgg@ziepe.ca>,
	"Jérôme Glisse" <jglisse@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>,
	amd-gfx@lists.freedesktop.org, ceph-devel@vger.kernel.org,
	devel@driverdev.osuosl.org, devel@lists.orangefs.org,
	dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
	kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-block@vger.kernel.org, linux-crypto@vger.kernel.org,
	linux-fbdev@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-media@vger.kernel.org, linux-mm@kvack.org,
	linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org,
	linux-rpi-kernel@lists.infradead.org, linux-xfs@vger.kernel.org,
	netdev@vger.kernel.org, rds-devel@oss.oracle.com,
	sparclinux@vger.kernel.org, x86@kernel.org,
	xen-devel@lists.xenproject.org,
	"John Hubbard" <jhubbard@nvidia.com>,
	"Matt Porter" <mporter@kernel.crashing.org>,
	"Alexandre Bounine" <alex.bou9@gmail.com>,
	"Al Viro" <viro@zeniv.linux.org.uk>,
	"Logan Gunthorpe" <logang@deltatee.com>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	"Ioan Nicu" <ioan.nicu.ext@nokia.com>,
	"Kees Cook" <keescook@chromium.org>,
	"Tvrtko Ursulin" <tvrtko.ursulin@intel.com>
Subject: [PATCH v2 13/34] rapidio: convert put_page() to put_user_page*()
Date: Sun,  4 Aug 2019 15:48:54 -0700	[thread overview]
Message-ID: <20190804224915.28669-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com>

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Ioan Nicu <ioan.nicu.ext@nokia.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 8155f59ece38..0e8ea0e5a89e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref)
 	struct mport_dma_req *req = container_of(ref, struct mport_dma_req,
 			refcount);
 	struct mport_cdev_priv *priv = req->priv;
-	unsigned int i;
 
 	dma_unmap_sg(req->dmach->device->dev,
 		     req->sgt.sgl, req->sgt.nents, req->dir);
 	sg_free_table(&req->sgt);
 	if (req->page_list) {
-		for (i = 0; i < req->nr_pages; i++)
-			put_page(req->page_list[i]);
+		put_user_pages(req->page_list, req->nr_pages);
 		kfree(req->page_list);
 	}
 
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 	struct mport_dma_req *req;
 	struct mport_dev *md = priv->md;
 	struct dma_chan *chan;
-	int i, ret;
+	int ret;
 	int nents;
 
 	if (xfer->length == 0)
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 err_pg:
 	if (!req->page_list) {
-		for (i = 0; i < nr_pages; i++)
-			put_page(page_list[i]);
+		put_user_pages(page_list, nr_pages);
 		kfree(page_list);
 	}
 err_req:
-- 
2.22.0


WARNING: multiple messages have this Message-ID (diff)
From: john.hubbard@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
	kvm@vger.kernel.org, "Dave Hansen" <dave.hansen@linux.intel.com>,
	"Dave Chinner" <david@fromorbit.com>,
	dri-devel@lists.freedesktop.org, linux-mm@kvack.org,
	sparclinux@vger.kernel.org, ceph-devel@vger.kernel.org,
	devel@driverdev.osuosl.org, rds-devel@oss.oracle.com,
	linux-rdma@vger.kernel.org, x86@kernel.org,
	amd-gfx@lists.freedesktop.org,
	"Christoph Hellwig" <hch@infradead.org>,
	"Jason Gunthorpe" <jgg@ziepe.ca>,
	xen-devel@lists.xenproject.org,
	"Matt Porter" <mporter@kernel.crashing.org>,
	devel@lists.orangefs.org, linux-media@vger.kernel.org,
	"Kees Cook" <keescook@chromium.org>,
	"John Hubbard" <jhubbard@nvidia.com>,
	intel-gfx@lists.freedesktop.org, linux-block@vger.kernel.org,
	"Jérôme Glisse" <jglisse@redhat.com>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	linux-rpi-kernel@lists.infradead.org
Subject: [PATCH v2 13/34] rapidio: convert put_page() to put_user_page*()
Date: Sun, 04 Aug 2019 22:48:54 +0000	[thread overview]
Message-ID: <20190804224915.28669-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com>

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Ioan Nicu <ioan.nicu.ext@nokia.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 8155f59ece38..0e8ea0e5a89e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref)
 	struct mport_dma_req *req = container_of(ref, struct mport_dma_req,
 			refcount);
 	struct mport_cdev_priv *priv = req->priv;
-	unsigned int i;
 
 	dma_unmap_sg(req->dmach->device->dev,
 		     req->sgt.sgl, req->sgt.nents, req->dir);
 	sg_free_table(&req->sgt);
 	if (req->page_list) {
-		for (i = 0; i < req->nr_pages; i++)
-			put_page(req->page_list[i]);
+		put_user_pages(req->page_list, req->nr_pages);
 		kfree(req->page_list);
 	}
 
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 	struct mport_dma_req *req;
 	struct mport_dev *md = priv->md;
 	struct dma_chan *chan;
-	int i, ret;
+	int ret;
 	int nents;
 
 	if (xfer->length = 0)
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 err_pg:
 	if (!req->page_list) {
-		for (i = 0; i < nr_pages; i++)
-			put_page(page_list[i]);
+		put_user_pages(page_list, nr_pages);
 		kfree(page_list);
 	}
 err_req:
-- 
2.22.0

WARNING: multiple messages have this Message-ID (diff)
From: john.hubbard@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
	kvm@vger.kernel.org, "Dave Hansen" <dave.hansen@linux.intel.com>,
	"Dave Chinner" <david@fromorbit.com>,
	dri-devel@lists.freedesktop.org, linux-mm@kvack.org,
	sparclinux@vger.kernel.org, ceph-devel@vger.kernel.org,
	devel@driverdev.osuosl.org, rds-devel@oss.oracle.com,
	linux-rdma@vger.kernel.org, x86@kernel.org,
	amd-gfx@lists.freedesktop.org,
	"Christoph Hellwig" <hch@infradead.org>,
	"Jason Gunthorpe" <jgg@ziepe.ca>,
	xen-devel@lists.xenproject.org,
	"Matt Porter" <mporter@kernel.crashing.org>,
	devel@lists.orangefs.org, linux-media@vger.kernel.org,
	"Kees Cook" <keescook@chromium.org>,
	"John Hubbard" <jhubbard@nvidia.com>,
	intel-gfx@lists.freedesktop.org, linux-block@vger.kernel.org,
	"Jérôme Glisse" <jglisse@redhat.com>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	linux-rpi-kernel@lists.infradead.org
Subject: [PATCH v2 13/34] rapidio: convert put_page() to put_user_page*()
Date: Sun,  4 Aug 2019 15:48:54 -0700	[thread overview]
Message-ID: <20190804224915.28669-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com>

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Ioan Nicu <ioan.nicu.ext@nokia.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 8155f59ece38..0e8ea0e5a89e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref)
 	struct mport_dma_req *req = container_of(ref, struct mport_dma_req,
 			refcount);
 	struct mport_cdev_priv *priv = req->priv;
-	unsigned int i;
 
 	dma_unmap_sg(req->dmach->device->dev,
 		     req->sgt.sgl, req->sgt.nents, req->dir);
 	sg_free_table(&req->sgt);
 	if (req->page_list) {
-		for (i = 0; i < req->nr_pages; i++)
-			put_page(req->page_list[i]);
+		put_user_pages(req->page_list, req->nr_pages);
 		kfree(req->page_list);
 	}
 
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 	struct mport_dma_req *req;
 	struct mport_dev *md = priv->md;
 	struct dma_chan *chan;
-	int i, ret;
+	int ret;
 	int nents;
 
 	if (xfer->length == 0)
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 err_pg:
 	if (!req->page_list) {
-		for (i = 0; i < nr_pages; i++)
-			put_page(page_list[i]);
+		put_user_pages(page_list, nr_pages);
 		kfree(page_list);
 	}
 err_req:
-- 
2.22.0

WARNING: multiple messages have this Message-ID (diff)
From: john.hubbard@gmail.com (john.hubbard@gmail.com)
Subject: [PATCH v2 13/34] rapidio: convert put_page() to put_user_page*()
Date: Sun,  4 Aug 2019 15:48:54 -0700	[thread overview]
Message-ID: <20190804224915.28669-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com>

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Matt Porter <mporter at kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9 at gmail.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Cc: Logan Gunthorpe <logang at deltatee.com>
Cc: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
Cc: Ioan Nicu <ioan.nicu.ext at nokia.com>
Cc: Kees Cook <keescook at chromium.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Signed-off-by: John Hubbard <jhubbard at nvidia.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 8155f59ece38..0e8ea0e5a89e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref)
 	struct mport_dma_req *req = container_of(ref, struct mport_dma_req,
 			refcount);
 	struct mport_cdev_priv *priv = req->priv;
-	unsigned int i;
 
 	dma_unmap_sg(req->dmach->device->dev,
 		     req->sgt.sgl, req->sgt.nents, req->dir);
 	sg_free_table(&req->sgt);
 	if (req->page_list) {
-		for (i = 0; i < req->nr_pages; i++)
-			put_page(req->page_list[i]);
+		put_user_pages(req->page_list, req->nr_pages);
 		kfree(req->page_list);
 	}
 
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 	struct mport_dma_req *req;
 	struct mport_dev *md = priv->md;
 	struct dma_chan *chan;
-	int i, ret;
+	int ret;
 	int nents;
 
 	if (xfer->length == 0)
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 err_pg:
 	if (!req->page_list) {
-		for (i = 0; i < nr_pages; i++)
-			put_page(page_list[i]);
+		put_user_pages(page_list, nr_pages);
 		kfree(page_list);
 	}
 err_req:
-- 
2.22.0

WARNING: multiple messages have this Message-ID (diff)
From: john.hubbard@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
	kvm@vger.kernel.org, "Dave Hansen" <dave.hansen@linux.intel.com>,
	"Dave Chinner" <david@fromorbit.com>,
	dri-devel@lists.freedesktop.org, linux-mm@kvack.org,
	sparclinux@vger.kernel.org, "Ira Weiny" <ira.weiny@intel.com>,
	ceph-devel@vger.kernel.org, devel@driverdev.osuosl.org,
	rds-devel@oss.oracle.com, linux-rdma@vger.kernel.org,
	x86@kernel.org, amd-gfx@lists.freedesktop.org,
	"Christoph Hellwig" <hch@infradead.org>,
	"Jason Gunthorpe" <jgg@ziepe.ca>,
	xen-devel@lists.xenproject.org,
	"Matt Porter" <mporter@kernel.crashing.org>,
	devel@lists.orangefs.org, linux-media@vger.kernel.org,
	"Kees Cook" <keescook@chromium.org>,
	"John Hubbard" <jhubbard@nvidia.com>,
	intel-gfx@lists.freedesktop.org, linux-block@vger.kernel.org,
	"Jérôme Glisse" <jglisse@redhat.com>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	linux-rpi-kernel@lists.infradead.org,
	"Dan Williams" <dan.j.williams@intel.com>,
	linux-arm-kernel@lists.infradead.org, linux-nfs@vger.kernel.org,
	"Tvrtko Ursulin" <tvrtko.ursulin@intel.com>,
	netdev@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	linux-xfs@vger.kernel.org,
	"Alexandre Bounine" <alex.bou9@gmail.com>,
	linux-crypto@vger.kernel.org,
	"Ioan Nicu" <ioan.nicu.ext@nokia.com>,
	linux-fsdevel@vger.kernel.org,
	"Logan Gunthorpe" <logang@deltatee.com>,
	"Al Viro" <viro@zeniv.linux.org.uk>
Subject: [PATCH v2 13/34] rapidio: convert put_page() to put_user_page*()
Date: Sun,  4 Aug 2019 15:48:54 -0700	[thread overview]
Message-ID: <20190804224915.28669-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com>

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Ioan Nicu <ioan.nicu.ext@nokia.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 8155f59ece38..0e8ea0e5a89e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref)
 	struct mport_dma_req *req = container_of(ref, struct mport_dma_req,
 			refcount);
 	struct mport_cdev_priv *priv = req->priv;
-	unsigned int i;
 
 	dma_unmap_sg(req->dmach->device->dev,
 		     req->sgt.sgl, req->sgt.nents, req->dir);
 	sg_free_table(&req->sgt);
 	if (req->page_list) {
-		for (i = 0; i < req->nr_pages; i++)
-			put_page(req->page_list[i]);
+		put_user_pages(req->page_list, req->nr_pages);
 		kfree(req->page_list);
 	}
 
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 	struct mport_dma_req *req;
 	struct mport_dev *md = priv->md;
 	struct dma_chan *chan;
-	int i, ret;
+	int ret;
 	int nents;
 
 	if (xfer->length == 0)
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 err_pg:
 	if (!req->page_list) {
-		for (i = 0; i < nr_pages; i++)
-			put_page(page_list[i]);
+		put_user_pages(page_list, nr_pages);
 		kfree(page_list);
 	}
 err_req:
-- 
2.22.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: john.hubbard@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-fbdev@vger.kernel.org, "Jan Kara" <jack@suse.cz>,
	kvm@vger.kernel.org, "Dave Hansen" <dave.hansen@linux.intel.com>,
	"Dave Chinner" <david@fromorbit.com>,
	dri-devel@lists.freedesktop.org, linux-mm@kvack.org,
	sparclinux@vger.kernel.org, "Ira Weiny" <ira.weiny@intel.com>,
	ceph-devel@vger.kernel.org, devel@driverdev.osuosl.org,
	rds-devel@oss.oracle.com, linux-rdma@vger.kernel.org,
	x86@kernel.org, amd-gfx@lists.freedesktop.org,
	"Christoph Hellwig" <hch@infradead.org>,
	"Jason Gunthorpe" <jgg@ziepe.ca>,
	xen-devel@lists.xenproject.org,
	"Matt Porter" <mporter@kernel.crashing.org>,
	devel@lists.orangefs.org, linux-media@vger.kernel.org,
	"Kees Cook" <keescook@chromium.org>,
	"John Hubbard" <jhubbard@nvidia.com>,
	intel-gfx@lists.freedesktop.org, linux-block@vger.kernel.org,
	"Jérôme Glisse" <jglisse@redhat.com>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	linux-rpi-kernel@lists.infradead.org,
	"Dan Williams" <dan.j.williams@intel.com>,
	linux-arm-kernel@lists.infradead.org, linux-nfs@vger.kernel.org,
	"Tvrtko Ursulin" <tvrtko.ursulin@intel.com>,
	netdev@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	linux-xfs@vger.kernel.org,
	"Alexandre Bounine" <alex.bou9@gmail.com>,
	linux-crypto@vger.kernel.org,
	"Ioan Nicu" <ioan.nicu.ext@nokia.com>,
	linux-fsdevel@vger.kernel.org,
	"Logan Gunthorpe" <logang@deltatee.com>,
	"Al Viro" <viro@zeniv.linux.org.uk>
Subject: [Xen-devel] [PATCH v2 13/34] rapidio: convert put_page() to put_user_page*()
Date: Sun,  4 Aug 2019 15:48:54 -0700	[thread overview]
Message-ID: <20190804224915.28669-14-jhubbard@nvidia.com> (raw)
In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com>

From: John Hubbard <jhubbard@nvidia.com>

For pages that were retained via get_user_pages*(), release those pages
via the new put_user_page*() routines, instead of via put_page() or
release_pages().

This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
("mm: introduce put_user_page*(), placeholder versions").

Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Ioan Nicu <ioan.nicu.ext@nokia.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 8155f59ece38..0e8ea0e5a89e 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref)
 	struct mport_dma_req *req = container_of(ref, struct mport_dma_req,
 			refcount);
 	struct mport_cdev_priv *priv = req->priv;
-	unsigned int i;
 
 	dma_unmap_sg(req->dmach->device->dev,
 		     req->sgt.sgl, req->sgt.nents, req->dir);
 	sg_free_table(&req->sgt);
 	if (req->page_list) {
-		for (i = 0; i < req->nr_pages; i++)
-			put_page(req->page_list[i]);
+		put_user_pages(req->page_list, req->nr_pages);
 		kfree(req->page_list);
 	}
 
@@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 	struct mport_dma_req *req;
 	struct mport_dev *md = priv->md;
 	struct dma_chan *chan;
-	int i, ret;
+	int ret;
 	int nents;
 
 	if (xfer->length == 0)
@@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
 
 err_pg:
 	if (!req->page_list) {
-		for (i = 0; i < nr_pages; i++)
-			put_page(page_list[i]);
+		put_user_pages(page_list, nr_pages);
 		kfree(page_list);
 	}
 err_req:
-- 
2.22.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

  parent reply	other threads:[~2019-08-04 22:55 UTC|newest]

Thread overview: 250+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-04 22:48 [PATCH v2 00/34] put_user_pages(): miscellaneous call sites john.hubbard
2019-08-04 22:48 ` [Xen-devel] " john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-06 17:39   ` Ira Weiny
2019-08-06 17:39     ` [Xen-devel] " Ira Weiny
2019-08-06 17:39     ` Ira Weiny
2019-08-06 17:39     ` Ira Weiny
2019-08-06 17:39     ` Ira Weiny
2019-08-06 17:39     ` Ira Weiny
2019-08-06 20:39     ` John Hubbard
2019-08-06 20:39       ` [Xen-devel] " John Hubbard
2019-08-06 20:39       ` John Hubbard
2019-08-06 20:39       ` John Hubbard
2019-08-06 20:39       ` John Hubbard
2019-08-06 20:39       ` John Hubbard
2019-08-06 20:39       ` John Hubbard
2019-08-04 22:48 ` [PATCH v2 02/34] net/rds: convert put_page() to put_user_page*() john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 03/34] net/ceph: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 04/34] x86/kvm: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 05/34] drm/etnaviv: convert release_pages() to put_user_pages() john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*() john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-05 16:53   ` Rodrigo Vivi
2019-08-05 16:53     ` [Xen-devel] " Rodrigo Vivi
2019-08-05 16:53     ` Rodrigo Vivi
2019-08-05 16:53     ` Rodrigo Vivi
2019-08-05 16:53     ` Rodrigo Vivi
2019-08-05 16:53     ` Rodrigo Vivi
2019-08-04 22:48 ` [PATCH v2 07/34] drm/radeon: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 08/34] media/ivtv: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 09/34] media/v4l2-core/mm: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 10/34] genwqe: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 11/34] scif: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 12/34] vmci: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` john.hubbard [this message]
2019-08-04 22:48   ` [Xen-devel] [PATCH v2 13/34] rapidio: " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 14/34] oradax: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 15/34] staging/vc04_services: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-13  5:23   ` Stefan Wahren
2019-08-13  5:23     ` [Xen-devel] " Stefan Wahren
2019-08-13  5:23     ` Stefan Wahren
2019-08-13  5:23     ` Stefan Wahren
2019-08-13  5:23     ` Stefan Wahren
2019-08-13  5:23     ` Stefan Wahren
2019-08-04 22:48 ` [PATCH v2 16/34] drivers/tee: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 17/34] vfio: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48 ` [PATCH v2 18/34] fbdev/pvr2fb: " john.hubbard
2019-08-04 22:48   ` [Xen-devel] " john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:48   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 19/34] fsl_hypervisor: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 20/34] xen: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-05  4:15   ` Juergen Gross
2019-08-05  4:15     ` [Xen-devel] " Juergen Gross
2019-08-05  4:15     ` Juergen Gross
2019-08-05  4:15     ` Juergen Gross
2019-08-05  4:15     ` Juergen Gross
2019-08-05  4:15     ` Juergen Gross
2019-08-04 22:49 ` [PATCH v2 21/34] fs/exec.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 22/34] orangefs: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 23/34] uprobes: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 24/34] futex: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 25/34] mm/frame_vector.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 26/34] mm/gup_benchmark.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 27/34] mm/memory.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 28/34] mm/madvise.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 29/34] mm/process_vm_access.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 30/34] crypt: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 31/34] fs/nfs: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-05  0:26   ` Calum Mackay
2019-08-05  0:26     ` [Xen-devel] " Calum Mackay
2019-08-05  0:26     ` Calum Mackay
2019-08-05  0:26     ` Calum Mackay
2019-08-05  0:26     ` Calum Mackay
2019-08-05  0:26     ` Calum Mackay
2019-08-04 22:49 ` [PATCH v2 32/34] goldfish_pipe: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 33/34] kernel/events/core.c: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49 ` [PATCH v2 34/34] fs/binfmt_elf: " john.hubbard
2019-08-04 22:49   ` [Xen-devel] " john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-04 22:49   ` john.hubbard
2019-08-09 12:42 ` ✗ Fi.CI.CHECKPATCH: warning for put_user_pages(): miscellaneous call sites Patchwork
2019-08-09 13:14 ` ✓ Fi.CI.BAT: success " Patchwork
2019-08-10  5:41 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190804224915.28669-14-jhubbard@nvidia.com \
    --to=john.hubbard@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=alex.bou9@gmail.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=ceph-devel@vger.kernel.org \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=dan.j.williams@intel.com \
    --cc=dave.hansen@linux.intel.com \
    --cc=david@fromorbit.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=devel@lists.orangefs.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hch@infradead.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ioan.nicu.ext@nokia.com \
    --cc=ira.weiny@intel.com \
    --cc=jack@suse.cz \
    --cc=jgg@ziepe.ca \
    --cc=jglisse@redhat.com \
    --cc=jhubbard@nvidia.com \
    --cc=keescook@chromium.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=logang@deltatee.com \
    --cc=mporter@kernel.crashing.org \
    --cc=netdev@vger.kernel.org \
    --cc=rds-devel@oss.oracle.com \
    --cc=sparclinux@vger.kernel.org \
    --cc=tvrtko.ursulin@intel.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.