From: "tip-bot for Kirill A. Shutemov" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: torvalds@linux-foundation.org, dann.frazier@canonical.com,
hpa@zytor.com, mingo@kernel.org, dave.hansen@intel.com,
steve.capper@linaro.org, peterz@infradead.org,
linux-kernel@vger.kernel.org, tglx@linutronix.de,
dan.j.williams@intel.com, aneesh.kumar@linux.vnet.ibm.com,
akpm@linux-foundation.org, catalin.marinas@arm.com,
kirill.shutemov@linux.intel.com, bp@alien8.de, riel@redhat.com
Subject: [tip:x86/mm] mm/gup: Implement the dev_pagemap() logic in the generic get_user_pages_fast() function
Date: Sat, 18 Mar 2017 02:51:47 -0700 [thread overview]
Message-ID: <tip-b59f65fa076a8eac2ff3a8ab7f8e1705b9fa86cb@git.kernel.org> (raw)
In-Reply-To: <20170316152655.37789-6-kirill.shutemov@linux.intel.com>
Commit-ID: b59f65fa076a8eac2ff3a8ab7f8e1705b9fa86cb
Gitweb: http://git.kernel.org/tip/b59f65fa076a8eac2ff3a8ab7f8e1705b9fa86cb
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Thu, 16 Mar 2017 18:26:53 +0300
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 18 Mar 2017 09:48:02 +0100
mm/gup: Implement the dev_pagemap() logic in the generic get_user_pages_fast() function
This is a preparation patch for the transition of x86 to the generic GUP_fast()
implementation.
Prepare generic GUP_fast() to handle dev_pagemap(). At the moment, it's
only implemented on x86. On non-x86, the new code will be compiled out.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Aneesh Kumar K . V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dann Frazier <dann.frazier@canonical.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20170316152655.37789-6-kirill.shutemov@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/mm.h | 4 +++
mm/gup.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5f01c88..e197d3c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -430,6 +430,10 @@ static inline int pud_devmap(pud_t pud)
{
return 0;
}
+static inline int pgd_devmap(pgd_t pgd)
+{
+ return 0;
+}
#endif
/*
diff --git a/mm/gup.c b/mm/gup.c
index 2b6cd357..e3d1e80 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1200,12 +1200,23 @@ static inline pte_t gup_get_pte(pte_t *ptep)
}
#endif
+static void undo_dev_pagemap(int *nr, int nr_start, struct page **pages)
+{
+ while ((*nr) - nr_start) {
+ struct page *page = pages[--(*nr)];
+
+ ClearPageReferenced(page);
+ put_page(page);
+ }
+}
+
#ifdef __HAVE_ARCH_PTE_SPECIAL
static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
int write, struct page **pages, int *nr)
{
+ struct dev_pagemap *pgmap = NULL;
+ int nr_start = *nr, ret = 0;
pte_t *ptep, *ptem;
- int ret = 0;
ptem = ptep = pte_offset_map(&pmd, addr);
do {
@@ -1222,7 +1233,13 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
if (!pte_access_permitted(pte, write))
goto pte_unmap;
- if (pte_special(pte))
+ if (pte_devmap(pte)) {
+ pgmap = get_dev_pagemap(pte_pfn(pte), pgmap);
+ if (unlikely(!pgmap)) {
+ undo_dev_pagemap(nr, nr_start, pages);
+ goto pte_unmap;
+ }
+ } else if (pte_special(pte))
goto pte_unmap;
VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
@@ -1239,6 +1256,7 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
VM_BUG_ON_PAGE(compound_head(page) != head, page);
+ put_dev_pagemap(pgmap);
SetPageReferenced(page);
pages[*nr] = page;
(*nr)++;
@@ -1269,6 +1287,64 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
}
#endif /* __HAVE_ARCH_PTE_SPECIAL */
+#ifdef __HAVE_ARCH_PTE_DEVMAP
+static int __gup_device_huge(unsigned long pfn, unsigned long addr,
+ unsigned long end, struct page **pages, int *nr)
+{
+ int nr_start = *nr;
+ struct dev_pagemap *pgmap = NULL;
+
+ do {
+ struct page *page = pfn_to_page(pfn);
+
+ pgmap = get_dev_pagemap(pfn, pgmap);
+ if (unlikely(!pgmap)) {
+ undo_dev_pagemap(nr, nr_start, pages);
+ return 0;
+ }
+ SetPageReferenced(page);
+ pages[*nr] = page;
+ get_page(page);
+ put_dev_pagemap(pgmap);
+ (*nr)++;
+ pfn++;
+ } while (addr += PAGE_SIZE, addr != end);
+ return 1;
+}
+
+static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,
+ unsigned long end, struct page **pages, int *nr)
+{
+ unsigned long fault_pfn;
+
+ fault_pfn = pmd_pfn(pmd) + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
+ return __gup_device_huge(fault_pfn, addr, end, pages, nr);
+}
+
+static int __gup_device_huge_pud(pud_t pud, unsigned long addr,
+ unsigned long end, struct page **pages, int *nr)
+{
+ unsigned long fault_pfn;
+
+ fault_pfn = pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
+ return __gup_device_huge(fault_pfn, addr, end, pages, nr);
+}
+#else
+static int __gup_device_huge_pmd(pmd_t pmd, unsigned long addr,
+ unsigned long end, struct page **pages, int *nr)
+{
+ BUILD_BUG();
+ return 0;
+}
+
+static int __gup_device_huge_pud(pud_t pud, unsigned long addr,
+ unsigned long end, struct page **pages, int *nr)
+{
+ BUILD_BUG();
+ return 0;
+}
+#endif
+
static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
unsigned long end, int write, struct page **pages, int *nr)
{
@@ -1278,6 +1354,9 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
if (!pmd_access_permitted(orig, write))
return 0;
+ if (pmd_devmap(orig))
+ return __gup_device_huge_pmd(orig, addr, end, pages, nr);
+
refs = 0;
head = pmd_page(orig);
page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
@@ -1314,6 +1393,9 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr,
if (!pud_access_permitted(orig, write))
return 0;
+ if (pud_devmap(orig))
+ return __gup_device_huge_pud(orig, addr, end, pages, nr);
+
refs = 0;
head = pud_page(orig);
page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
@@ -1351,6 +1433,7 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr,
if (!pgd_access_permitted(orig, write))
return 0;
+ BUILD_BUG_ON(pgd_devmap(orig));
refs = 0;
head = pgd_page(orig);
page = head + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT);
next prev parent reply other threads:[~2017-03-18 9:52 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 15:26 [PATCH 0/7] Switch x86 to generic get_user_pages_fast() implementation Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-16 15:26 ` [PATCH 1/7] mm: Drop arch_pte_access_permitted() mmu hook Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-18 9:49 ` [tip:x86/mm] mm/gup: Drop the arch_pte_access_permitted() MMU callback tip-bot for Kirill A. Shutemov
2017-03-16 15:26 ` [PATCH 2/7] mm/gup: Move permission checks into helpers Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-18 9:50 ` [tip:x86/mm] " tip-bot for Kirill A. Shutemov
2017-03-16 15:26 ` [PATCH 3/7] mm/gup: Move page table entry dereference into helper Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-18 9:50 ` [tip:x86/mm] mm/gup: Move page table entry dereference into helper function tip-bot for Kirill A. Shutemov
2017-03-16 15:26 ` [PATCH 4/7] mm/gup: Make pages referenced during generic get_user_pages_fast() Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-18 9:51 ` [tip:x86/mm] mm/gup: Mark all pages PageReferenced in " tip-bot for Kirill A. Shutemov
2017-03-16 15:26 ` [PATCH 5/7] mm/gup: Implement dev_pagemap logic " Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-17 17:27 ` Kirill A. Shutemov
2017-03-17 17:27 ` Kirill A. Shutemov
2017-03-18 9:51 ` tip-bot for Kirill A. Shutemov [this message]
2017-03-16 15:26 ` [PATCH 6/7] mm/gup: Provide hook to check if __GUP_fast() is allowed for the range Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-18 9:52 ` [tip:x86/mm] mm/gup: Provide callback " tip-bot for Kirill A. Shutemov
2017-03-16 15:26 ` [PATCH 7/7] x86/mm: Switch to generic get_user_page_fast() implementation Kirill A. Shutemov
2017-03-16 15:26 ` Kirill A. Shutemov
2017-03-16 17:20 ` Peter Zijlstra
2017-03-16 17:20 ` Peter Zijlstra
2017-03-16 19:11 ` Paul E. McKenney
2017-03-16 19:11 ` Paul E. McKenney
2017-03-16 21:39 ` [PATCHv2 " Kirill A. Shutemov
2017-03-16 21:39 ` Kirill A. Shutemov
2017-03-17 17:27 ` Kirill A. Shutemov
2017-03-17 17:27 ` Kirill A. Shutemov
2017-03-18 9:52 ` [tip:x86/mm] x86/mm/gup: Switch GUP to the " tip-bot for Kirill A. Shutemov
2017-03-16 18:03 ` [PATCH 0/7] Switch x86 to generic get_user_pages_fast() implementation Linus Torvalds
2017-03-16 18:03 ` Linus Torvalds
2017-03-17 8:31 ` Ingo Molnar
2017-03-17 8:31 ` Ingo Molnar
2017-03-17 8:31 ` Ingo Molnar
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=tip-b59f65fa076a8eac2ff3a8ab7f8e1705b9fa86cb@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dan.j.williams@intel.com \
--cc=dann.frazier@canonical.com \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=steve.capper@linaro.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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.