[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [PATCH 20/34] xen: convert put_page() to put_user_page*()
- To: john.hubbard@xxxxxxxxx, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
- From: Juergen Gross <jgross@xxxxxxxx>
- Date: Fri, 2 Aug 2019 06:36:51 +0200
- Cc: linux-fbdev@xxxxxxxxxxxxxxx, Jan Kara <jack@xxxxxxx>, kvm@xxxxxxxxxxxxxxx, Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>, Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>, Dave Chinner <david@xxxxxxxxxxxxx>, dri-devel@xxxxxxxxxxxxxxxxxxxxx, linux-mm@xxxxxxxxx, sparclinux@xxxxxxxxxxxxxxx, Ira Weiny <ira.weiny@xxxxxxxxx>, Dan Williams <dan.j.williams@xxxxxxxxx>, devel@xxxxxxxxxxxxxxxxxxxx, rds-devel@xxxxxxxxxxxxxx, linux-rdma@xxxxxxxxxxxxxxx, x86@xxxxxxxxxx, amd-gfx@xxxxxxxxxxxxxxxxxxxxx, Christoph Hellwig <hch@xxxxxxxxxxxxx>, Jason Gunthorpe <jgg@xxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx, devel@xxxxxxxxxxxxxxxxxx, linux-media@xxxxxxxxxxxxxxx, John Hubbard <jhubbard@xxxxxxxxxx>, intel-gfx@xxxxxxxxxxxxxxxxxxxxx, linux-block@xxxxxxxxxxxxxxx, Jérôme Glisse <jglisse@xxxxxxxxxx>, linux-rpi-kernel@xxxxxxxxxxxxxxxxxxx, ceph-devel@xxxxxxxxxxxxxxx, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx, linux-nfs@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, LKML <linux-kernel@xxxxxxxxxxxxxxx>, linux-xfs@xxxxxxxxxxxxxxx, linux-crypto@xxxxxxxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx
- Delivery-date: Fri, 02 Aug 2019 04:37:05 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 02.08.19 04:19, john.hubbard@xxxxxxxxx wrote:
From: John Hubbard <jhubbard@xxxxxxxxxx>
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: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
Cc: Juergen Gross <jgross@xxxxxxxx>
Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: John Hubbard <jhubbard@xxxxxxxxxx>
---
drivers/xen/gntdev.c | 5 +----
drivers/xen/privcmd.c | 7 +------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 4c339c7e66e5..2586b3df2bb6 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -864,10 +864,7 @@ static int gntdev_get_page(struct gntdev_copy_batch
*batch, void __user *virt,
static void gntdev_put_pages(struct gntdev_copy_batch *batch)
{
- unsigned int i;
-
- for (i = 0; i < batch->nr_pages; i++)
- put_page(batch->pages[i]);
+ put_user_pages(batch->pages, batch->nr_pages);
batch->nr_pages = 0;
}
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 2f5ce7230a43..29e461dbee2d 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -611,15 +611,10 @@ static int lock_pages(
static void unlock_pages(struct page *pages[], unsigned int nr_pages)
{
- unsigned int i;
-
if (!pages)
return;
- for (i = 0; i < nr_pages; i++) {
- if (pages[i])
- put_page(pages[i]);
- }
+ put_user_pages(pages, nr_pages);
You are not handling the case where pages[i] is NULL here. Or am I
missing a pending patch to put_user_pages() here?
Juergen
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
