From: Pavel Tatashin <pasha.tatashin@soleen.com>
To: pasha.tatashin@soleen.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, akpm@linux-foundation.org, vbabka@suse.cz,
mhocko@suse.com, david@redhat.com, osalvador@suse.de,
dan.j.williams@intel.com, sashal@kernel.org,
tyhicks@linux.microsoft.com, iamjoonsoo.kim@lge.com,
mike.kravetz@oracle.com, rostedt@goodmis.org, mingo@redhat.com,
jgg@ziepe.ca, peterz@infradead.org, mgorman@suse.de,
willy@infradead.org, rientjes@google.com, jhubbard@nvidia.com,
linux-doc@vger.kernel.org
Subject: [PATCH v2 3/8] mm/gup: make __gup_longterm_locked common
Date: Wed, 9 Dec 2020 19:43:30 -0500 [thread overview]
Message-ID: <20201210004335.64634-4-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20201210004335.64634-1-pasha.tatashin@soleen.com>
__gup_longterm_locked() has CMA || FS_DAX version and a common stub
version. In the preparation of prohibiting longterm pinning of pages from
movable zone make the CMA || FS_DAX version common, and delete the stub
version.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
---
mm/gup.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c
index 3a76c005a3e2..0e2de888a8b0 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1567,7 +1567,6 @@ struct page *get_dump_page(unsigned long addr)
}
#endif /* CONFIG_ELF_CORE */
-#if defined(CONFIG_FS_DAX) || defined (CONFIG_CMA)
#ifdef CONFIG_FS_DAX
static bool check_dax_vmas(struct vm_area_struct **vmas, long nr_pages)
{
@@ -1757,18 +1756,6 @@ static long __gup_longterm_locked(struct mm_struct *mm,
kfree(vmas_tmp);
return rc;
}
-#else /* !CONFIG_FS_DAX && !CONFIG_CMA */
-static __always_inline long __gup_longterm_locked(struct mm_struct *mm,
- unsigned long start,
- unsigned long nr_pages,
- struct page **pages,
- struct vm_area_struct **vmas,
- unsigned int flags)
-{
- return __get_user_pages_locked(mm, start, nr_pages, pages, vmas,
- NULL, flags);
-}
-#endif /* CONFIG_FS_DAX || CONFIG_CMA */
static bool is_valid_gup_flags(unsigned int gup_flags)
{
--
2.25.1
next prev parent reply other threads:[~2020-12-10 0:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 0:43 [PATCH v2 0/8] prohibit pinning pages in ZONE_MOVABLE Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 1/8] mm/gup: perform check_dax_vmas only when FS_DAX is enabled Pavel Tatashin
2020-12-10 6:36 ` Pankaj Gupta
2020-12-10 13:30 ` Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 2/8] mm/gup: don't pin migrated cma pages in movable zone Pavel Tatashin
2020-12-10 0:43 ` Pavel Tatashin [this message]
2020-12-10 4:06 ` [PATCH v2 3/8] mm/gup: make __gup_longterm_locked common Ira Weiny
2020-12-10 13:30 ` Pavel Tatashin
2020-12-10 17:44 ` Ira Weiny
2020-12-10 18:57 ` Pavel Tatashin
2020-12-10 19:53 ` Jason Gunthorpe
2020-12-10 19:54 ` Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 4/8] mm cma: rename PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 5/8] mm: apply per-task gfp constraints in fast path Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 6/8] mm: honor PF_MEMALLOC_PIN for all movable pages Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 7/8] mm/gup: migrate pinned pages out of movable zone Pavel Tatashin
2020-12-10 0:43 ` [PATCH v2 8/8] memory-hotplug.rst: add a note about ZONE_MOVABLE and page pinning Pavel Tatashin
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=20201210004335.64634-4-pasha.tatashin@soleen.com \
--to=pasha.tatashin@soleen.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=david@redhat.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=osalvador@suse.de \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=rostedt@goodmis.org \
--cc=sashal@kernel.org \
--cc=tyhicks@linux.microsoft.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.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 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).