RE: [PATCH 20/34] xen: convert put_page() to put_user_page*()

On 02.08.19 07:48, John Hubbard wrote:

quoted

On 8/1/19 9:36 PM, Juergen Gross wrote:

quoted

On 02.08.19 04:19, john.hubbard@gmail.com wrote:

quoted

From: John Hubbard <jhubbard@nvidia.com>

...

quoted

quoted

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?

Hi Juergen,

You are correct--this no longer handles the cases where pages[i] is
NULL. It's intentional, though possibly wrong. :)

I see that I should have added my standard blurb to this commit
description. I missed this one, but some of the other patches have it.
It makes the following, possibly incorrect claim:

"This changes the release code slightly, because each page slot in the
page_list[] array is no longer checked for NULL. However, that check
was wrong anyway, because the get_user_pages() pattern of usage here
never allowed for NULL entries within a range of pinned pages."

The way I've seen these page arrays used with get_user_pages(), things
are either done single page, or with a contiguous range. So unless I'm
missing a case where someone is either

a) releasing individual pages within a range (and thus likely messing
up their count of pages they have), or

b) allocating two gup ranges within the same pages[] array, with a gap
between the allocations,

...then it should be correct. If so, then I'll add the above blurb to
this patch's commit description.

If that's not the case (both here, and in 3 or 4 other patches in this
series, then as you said, I should add NULL checks to put_user_pages()
and put_user_pages_dirty_lock().

In this case it is not correct, but can easily be handled. The NULL case can
occur only in an error case with the pages array filled partially or not at all.

I'd prefer something like the attached patch here.

I'm not an expert in this code and have not looked at it carefully but that patch does seem to be the better fix than forcing NULL checks on everyone.

Ira