From: ira.weiny@intel.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Michal Hocko" <mhocko@suse.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
"John Hubbard" <jhubbard@nvidia.com>,
"Ira Weiny" <ira.weiny@intel.com>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Dan Williams" <dan.j.williams@intel.com>
Subject: [PATCH v2] mm/swap: Fix release_pages() when releasing devmap pages
Date: Fri, 24 May 2019 10:36:56 -0700 [thread overview]
Message-ID: <20190524173656.8339-1-ira.weiny@intel.com> (raw)
From: Ira Weiny <ira.weiny@intel.com>
Device pages can be more than type MEMORY_DEVICE_PUBLIC.
Handle all device pages within release_pages()
This was found via code inspection while determining if release_pages()
and the new put_user_pages() could be interchangeable.
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from V1:
Add comment clarifying that put_devmap_managed_page() can still
fail.
Add Reviewed-by tags.
mm/swap.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/mm/swap.c b/mm/swap.c
index 9d0432baddb0..f03b7b4bfb4f 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -740,15 +740,18 @@ void release_pages(struct page **pages, int nr)
if (is_huge_zero_page(page))
continue;
- /* Device public page can not be huge page */
- if (is_device_public_page(page)) {
+ if (is_zone_device_page(page)) {
if (locked_pgdat) {
spin_unlock_irqrestore(&locked_pgdat->lru_lock,
flags);
locked_pgdat = NULL;
}
- put_devmap_managed_page(page);
- continue;
+ /*
+ * zone-device-pages can still fail here and will
+ * therefore need put_page_testzero()
+ */
+ if (put_devmap_managed_page(page))
+ continue;
}
page = compound_head(page);
--
2.20.1
next reply other threads:[~2019-05-24 17:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 17:36 ira.weiny [this message]
2019-05-27 15:01 ` [PATCH v2] mm/swap: Fix release_pages() when releasing devmap pages Michal Hocko
2019-05-29 3:56 ` Ira Weiny
2019-06-04 12:35 ` Michal Hocko
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=20190524173656.8339-1-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).