[v9,08/14] mm/gup: do not migrate zero page
diff mbox series

Message ID 20210201153827.444374-9-pasha.tatashin@soleen.com
State In Next
Commit 983cb10d3f90bdaaa29edc81accd03096530da9c
Headers show
Series
  • prohibit pinning pages in ZONE_MOVABLE
Related show

Commit Message

Pavel Tatashin Feb. 1, 2021, 3:38 p.m. UTC
On some platforms ZERO_PAGE(0) might end-up in a movable zone. Do not
migrate zero page in gup during longterm pinning as migration of zero page
is not allowed.

For example, in x86 QEMU with 16G of memory and kernelcore=5G parameter, I
see the following:

Boot#1: zero_pfn  0x48a8d zero_pfn zone: ZONE_DMA32
Boot#2: zero_pfn 0x20168d zero_pfn zone: ZONE_MOVABLE

On x86, empty_zero_page is declared in .bss and depending on the loader
may end up in different physical locations during boots.

Also, move is_zero_pfn() my_zero_pfn() functions under CONFIG_MMU, because
zero_pfn that they are using is declared in memory.c which is compiled
with CONFIG_MMU.

Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
 include/linux/mm.h      | 3 ++-
 include/linux/mmzone.h  | 4 ++++
 include/linux/pgtable.h | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

Comments

kernel test robot Feb. 2, 2021, 2:41 a.m. UTC | #1
Hi Pavel,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on kselftest/next]
[also build test ERROR on tip/sched/core tip/perf/core linux/master next-20210125]
[cannot apply to hnaz-linux-mm/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Pavel-Tatashin/prohibit-pinning-pages-in-ZONE_MOVABLE/20210201-234048
base:   https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git next
config: arm-randconfig-r031-20210201 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 275c6af7d7f1ed63a03d05b4484413e447133269)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install arm cross compiling tool for clang build
        # apt-get install binutils-arm-linux-gnueabi
        # https://github.com/0day-ci/linux/commit/0871f9d0d8c84d31549b4771af9d60ce3b1aecb2
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Pavel-Tatashin/prohibit-pinning-pages-in-ZONE_MOVABLE/20210201-234048
        git checkout 0871f9d0d8c84d31549b4771af9d60ce3b1aecb2
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   In file included from arch/arm/kernel/asm-offsets.c:12:
>> include/linux/mm.h:1128:3: error: implicit declaration of function 'is_zero_pfn' [-Werror,-Wimplicit-function-declaration]
                   is_zero_pfn(page_to_pfn(page));
                   ^
   include/linux/mm.h:1128:3: note: did you mean 'is_zero_ino'?
   include/linux/fs.h:2926:20: note: 'is_zero_ino' declared here
   static inline bool is_zero_ino(ino_t ino)
                      ^
   1 error generated.
--
   In file included from arch/arm/kernel/asm-offsets.c:12:
>> include/linux/mm.h:1128:3: error: implicit declaration of function 'is_zero_pfn' [-Werror,-Wimplicit-function-declaration]
                   is_zero_pfn(page_to_pfn(page));
                   ^
   include/linux/mm.h:1128:3: note: did you mean 'is_zero_ino'?
   include/linux/fs.h:2926:20: note: 'is_zero_ino' declared here
   static inline bool is_zero_ino(ino_t ino)
                      ^
   1 error generated.
   make[2]: *** [scripts/Makefile.build:117: arch/arm/kernel/asm-offsets.s] Error 1
   make[2]: Target '__build' not remade because of errors.
   make[1]: *** [Makefile:1206: prepare0] Error 2
   make[1]: Target 'modules_prepare' not remade because of errors.
   make: *** [Makefile:185: __sub-make] Error 2
   make: Target 'modules_prepare' not remade because of errors.
--
   In file included from arch/arm/kernel/asm-offsets.c:12:
>> include/linux/mm.h:1128:3: error: implicit declaration of function 'is_zero_pfn' [-Werror,-Wimplicit-function-declaration]
                   is_zero_pfn(page_to_pfn(page));
                   ^
   include/linux/mm.h:1128:3: note: did you mean 'is_zero_ino'?
   include/linux/fs.h:2926:20: note: 'is_zero_ino' declared here
   static inline bool is_zero_ino(ino_t ino)
                      ^
   1 error generated.
   make[2]: *** [scripts/Makefile.build:117: arch/arm/kernel/asm-offsets.s] Error 1
   make[2]: Target '__build' not remade because of errors.
   make[1]: *** [Makefile:1206: prepare0] Error 2
   make[1]: Target 'prepare' not remade because of errors.
   make: *** [Makefile:185: __sub-make] Error 2
   make: Target 'prepare' not remade because of errors.


vim +/is_zero_pfn +1128 include/linux/mm.h

  1123	
  1124	/* MIGRATE_CMA and ZONE_MOVABLE do not allow pin pages */
  1125	static inline bool is_pinnable_page(struct page *page)
  1126	{
  1127		return !(is_zone_movable_page(page) || is_migrate_cma_page(page)) ||
> 1128			is_zero_pfn(page_to_pfn(page));
  1129	}
  1130	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Pavel Tatashin Feb. 2, 2021, 4:05 a.m. UTC | #2
Hi Andrew,

Should I send new patches or is the update for this patch sufficient?

Here is updated patch:


From 9fb856f3a5cfda18a4b84e81dfb0266bee4a4ea6 Mon Sep 17 00:00:00 2001
From: Pavel Tatashin <pasha.tatashin@soleen.com>
Date: Mon, 18 Jan 2021 17:35:18 -0500
Subject: [PATCH v9 08/14] mm/gup: do not migrate zero page

On some platforms ZERO_PAGE(0) might end-up in a movable zone. Do not
migrate zero page in gup during longterm pinning as migration of zero page
is not allowed.

For example, in x86 QEMU with 16G of memory and kernelcore=5G parameter, I
see the following:

Boot#1: zero_pfn  0x48a8d zero_pfn zone: ZONE_DMA32
Boot#2: zero_pfn 0x20168d zero_pfn zone: ZONE_MOVABLE

On x86, empty_zero_page is declared in .bss and depending on the loader
may end up in different physical locations during boots.

Also, move is_zero_pfn() my_zero_pfn() functions under CONFIG_MMU, because
zero_pfn that they are using is declared in memory.c which is compiled
with CONFIG_MMU.

is_pinnable_page() is needed only when CONFIG_MIGRATION is set, because
without page migration all pages are pinnable, so add a stub version of
is_pinnable_page() for !CONFIG_MIGRATION case. This also solves issues
where mm.h is included but is_zero_pfn() is not available because of
CONFIG_MMU is not set.

Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
 include/linux/mm.h      | 10 +++++++++-
 include/linux/mmzone.h  |  4 ++++
 include/linux/pgtable.h |  3 +--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index db228aa8d9f7..a5cb32183ac5 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1127,11 +1127,19 @@ static inline bool is_zone_movable_page(const struct page *page)
 	return page_zonenum(page) == ZONE_MOVABLE;
 }
 
+#ifdef CONFIG_MIGRATION
 /* MIGRATE_CMA and ZONE_MOVABLE do not allow pin pages */
 static inline bool is_pinnable_page(struct page *page)
 {
-	return !is_zone_movable_page(page) && !is_migrate_cma_page(page);
+	return !(is_zone_movable_page(page) || is_migrate_cma_page(page)) ||
+		is_zero_pfn(page_to_pfn(page));
 }
+#else
+static inline bool is_pinnable_page(struct page *page)
+{
+	return true;
+}
+#endif
 
 #ifdef CONFIG_DEV_PAGEMAP_OPS
 void free_devmap_managed_page(struct page *page);
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 87a7f9e2d1c2..aacbed98a1ed 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -427,6 +427,10 @@ enum zone_type {
 	 *    techniques might use alloc_contig_range() to hide previously
 	 *    exposed pages from the buddy again (e.g., to implement some sort
 	 *    of memory unplug in virtio-mem).
+	 * 6. ZERO_PAGE(0), kernelcore/movablecore setups might create
+	 *    situations where ZERO_PAGE(0) which is allocated differently
+	 *    on different platforms may end up in a movable zone. ZERO_PAGE(0)
+	 *    cannot be migrated.
 	 *
 	 * In general, no unmovable allocations that degrade memory offlining
 	 * should end up in ZONE_MOVABLE. Allocators (like alloc_contig_range())
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index 1d3087753426..bad0f417adb3 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -1118,6 +1118,7 @@ extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
 extern void untrack_pfn_moved(struct vm_area_struct *vma);
 #endif
 
+#ifdef CONFIG_MMU
 #ifdef __HAVE_COLOR_ZERO_PAGE
 static inline int is_zero_pfn(unsigned long pfn)
 {
@@ -1142,8 +1143,6 @@ static inline unsigned long my_zero_pfn(unsigned long addr)
 }
 #endif
 
-#ifdef CONFIG_MMU
-
 #ifndef CONFIG_TRANSPARENT_HUGEPAGE
 static inline int pmd_trans_huge(pmd_t pmd)
 {

Patch
diff mbox series

diff --git a/include/linux/mm.h b/include/linux/mm.h
index db228aa8d9f7..67716df9fe1f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1130,7 +1130,8 @@  static inline bool is_zone_movable_page(const struct page *page)
 /* MIGRATE_CMA and ZONE_MOVABLE do not allow pin pages */
 static inline bool is_pinnable_page(struct page *page)
 {
-	return !is_zone_movable_page(page) && !is_migrate_cma_page(page);
+	return !(is_zone_movable_page(page) || is_migrate_cma_page(page)) ||
+		is_zero_pfn(page_to_pfn(page));
 }
 
 #ifdef CONFIG_DEV_PAGEMAP_OPS
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 87a7f9e2d1c2..aacbed98a1ed 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -427,6 +427,10 @@  enum zone_type {
 	 *    techniques might use alloc_contig_range() to hide previously
 	 *    exposed pages from the buddy again (e.g., to implement some sort
 	 *    of memory unplug in virtio-mem).
+	 * 6. ZERO_PAGE(0), kernelcore/movablecore setups might create
+	 *    situations where ZERO_PAGE(0) which is allocated differently
+	 *    on different platforms may end up in a movable zone. ZERO_PAGE(0)
+	 *    cannot be migrated.
 	 *
 	 * In general, no unmovable allocations that degrade memory offlining
 	 * should end up in ZONE_MOVABLE. Allocators (like alloc_contig_range())
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index 1d3087753426..bad0f417adb3 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -1118,6 +1118,7 @@  extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
 extern void untrack_pfn_moved(struct vm_area_struct *vma);
 #endif
 
+#ifdef CONFIG_MMU
 #ifdef __HAVE_COLOR_ZERO_PAGE
 static inline int is_zero_pfn(unsigned long pfn)
 {
@@ -1142,8 +1143,6 @@  static inline unsigned long my_zero_pfn(unsigned long addr)
 }
 #endif
 
-#ifdef CONFIG_MMU
-
 #ifndef CONFIG_TRANSPARENT_HUGEPAGE
 static inline int pmd_trans_huge(pmd_t pmd)
 {