This is a minor addition to the allocator setup options to provide
a simple way to on demand enable back cache merging for builds
that by default run with CONFIG_SLAB_MERGE_DEFAULT not set.
Signed-off-by: Rafael Aquini <[email protected]>
---
Documentation/admin-guide/kernel-parameters.txt | 7 +++++++
mm/slab_common.c | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 04545725f187..06519eecbfec 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4877,6 +4877,10 @@
slram= [HW,MTD]
+ slab_merge [MM]
+ Enable merging of slabs with similar size when the
+ kernel is built without CONFIG_SLAB_MERGE_DEFAULT.
+
slab_nomerge [MM]
Disable merging of slabs with similar size. May be
necessary if there is some reason to distinguish
@@ -4924,6 +4928,9 @@
lower than slub_max_order.
For more information see Documentation/vm/slub.rst.
+ slub_merge [MM, SLUB]
+ Same with slab_merge.
+
slub_nomerge [MM, SLUB]
Same with slab_nomerge. This is supported for legacy.
See slab_nomerge for more information.
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 88e833986332..30db72269036 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -71,11 +71,19 @@ static int __init setup_slab_nomerge(char *str)
return 1;
}
+static int __init setup_slab_merge(char *str)
+{
+ slab_nomerge = false;
+ return 1;
+}
+
#ifdef CONFIG_SLUB
__setup_param("slub_nomerge", slub_nomerge, setup_slab_nomerge, 0);
+__setup_param("slub_merge", slub_merge, setup_slab_merge, 0);
#endif
__setup("slab_nomerge", setup_slab_nomerge);
+__setup("slab_merge", setup_slab_nomerge);
/*
* Determine the size of a slab object
--
2.26.2
On Fri, Mar 19, 2021 at 03:22:33PM -0400, Rafael Aquini wrote:
> This is a minor addition to the allocator setup options to provide
> a simple way to on demand enable back cache merging for builds
> that by default run with CONFIG_SLAB_MERGE_DEFAULT not set.
>
> Signed-off-by: Rafael Aquini <[email protected]>
> ---
> Documentation/admin-guide/kernel-parameters.txt | 7 +++++++
> mm/slab_common.c | 8 ++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index 04545725f187..06519eecbfec 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -4877,6 +4877,10 @@
>
> slram= [HW,MTD]
>
> + slab_merge [MM]
> + Enable merging of slabs with similar size when the
> + kernel is built without CONFIG_SLAB_MERGE_DEFAULT.
> +
> slab_nomerge [MM]
> Disable merging of slabs with similar size. May be
> necessary if there is some reason to distinguish
> @@ -4924,6 +4928,9 @@
> lower than slub_max_order.
> For more information see Documentation/vm/slub.rst.
>
> + slub_merge [MM, SLUB]
> + Same with slab_merge.
> +
> slub_nomerge [MM, SLUB]
> Same with slab_nomerge. This is supported for legacy.
> See slab_nomerge for more information.
> diff --git a/mm/slab_common.c b/mm/slab_common.c
> index 88e833986332..30db72269036 100644
> --- a/mm/slab_common.c
> +++ b/mm/slab_common.c
> @@ -71,11 +71,19 @@ static int __init setup_slab_nomerge(char *str)
> return 1;
> }
>
> +static int __init setup_slab_merge(char *str)
> +{
> + slab_nomerge = false;
> + return 1;
> +}
> +
> #ifdef CONFIG_SLUB
> __setup_param("slub_nomerge", slub_nomerge, setup_slab_nomerge, 0);
> +__setup_param("slub_merge", slub_merge, setup_slab_merge, 0);
> #endif
>
> __setup("slab_nomerge", setup_slab_nomerge);
> +__setup("slab_merge", setup_slab_nomerge);
DOH! I missed the typo here ^^
Sorry.
This is a minor addition to the allocator setup options to provide
a simple way to on demand enable back cache merging for builds
that by default run with CONFIG_SLAB_MERGE_DEFAULT not set.
Signed-off-by: Rafael Aquini <[email protected]>
---
v2 changelog:
* fix __setup("slab_merge", setup_slab_nomerge); typo
Documentation/admin-guide/kernel-parameters.txt | 7 +++++++
mm/slab_common.c | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 04545725f187..06519eecbfec 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4877,6 +4877,10 @@
slram= [HW,MTD]
+ slab_merge [MM]
+ Enable merging of slabs with similar size when the
+ kernel is built without CONFIG_SLAB_MERGE_DEFAULT.
+
slab_nomerge [MM]
Disable merging of slabs with similar size. May be
necessary if there is some reason to distinguish
@@ -4924,6 +4928,9 @@
lower than slub_max_order.
For more information see Documentation/vm/slub.rst.
+ slub_merge [MM, SLUB]
+ Same with slab_merge.
+
slub_nomerge [MM, SLUB]
Same with slab_nomerge. This is supported for legacy.
See slab_nomerge for more information.
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 88e833986332..b84dd734b75f 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -71,11 +71,19 @@ static int __init setup_slab_nomerge(char *str)
return 1;
}
+static int __init setup_slab_merge(char *str)
+{
+ slab_nomerge = false;
+ return 1;
+}
+
#ifdef CONFIG_SLUB
__setup_param("slub_nomerge", slub_nomerge, setup_slab_nomerge, 0);
+__setup_param("slub_merge", slub_merge, setup_slab_merge, 0);
#endif
__setup("slab_nomerge", setup_slab_nomerge);
+__setup("slab_merge", setup_slab_merge);
/*
* Determine the size of a slab object
--
2.26.2
Hi Rafael,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on hnaz-linux-mm/master]
url: https://github.com/0day-ci/linux/commits/Rafael-Aquini/mm-slab_common-provide-slab_merge-option-for-IS_ENABLED-CONFIG_SLAB_MERGE_DEFAULT-builds/20210320-032434
base: https://github.com/hnaz/linux-mm master
config: powerpc-randconfig-r004-20210318 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project fcc1ce00931751ac02498986feb37744e9ace8de)
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 powerpc cross compiling tool for clang build
# apt-get install binutils-powerpc-linux-gnu
# https://github.com/0day-ci/linux/commit/d6cb7528eaf0afbcb48bee452f7fa395938bd559
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rafael-Aquini/mm-slab_common-provide-slab_merge-option-for-IS_ENABLED-CONFIG_SLAB_MERGE_DEFAULT-builds/20210320-032434
git checkout d6cb7528eaf0afbcb48bee452f7fa395938bd559
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
__do_insb
^
arch/powerpc/include/asm/io.h:541:56: note: expanded from macro '__do_insb'
#define __do_insb(p, b, n) readsb((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from mm/slab_common.c:11:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:604:
arch/powerpc/include/asm/io-defs.h:45:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(insw, (unsigned long p, void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:601:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:9:1: note: expanded from here
__do_insw
^
arch/powerpc/include/asm/io.h:542:56: note: expanded from macro '__do_insw'
#define __do_insw(p, b, n) readsw((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from mm/slab_common.c:11:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:604:
arch/powerpc/include/asm/io-defs.h:47:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(insl, (unsigned long p, void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:601:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:11:1: note: expanded from here
__do_insl
^
arch/powerpc/include/asm/io.h:543:56: note: expanded from macro '__do_insl'
#define __do_insl(p, b, n) readsl((PCI_IO_ADDR)_IO_BASE+(p), (b), (n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from mm/slab_common.c:11:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:604:
arch/powerpc/include/asm/io-defs.h:49:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsb, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:601:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:13:1: note: expanded from here
__do_outsb
^
arch/powerpc/include/asm/io.h:544:58: note: expanded from macro '__do_outsb'
#define __do_outsb(p, b, n) writesb((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from mm/slab_common.c:11:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:604:
arch/powerpc/include/asm/io-defs.h:51:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsw, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:601:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:15:1: note: expanded from here
__do_outsw
^
arch/powerpc/include/asm/io.h:545:58: note: expanded from macro '__do_outsw'
#define __do_outsw(p, b, n) writesw((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
In file included from mm/slab_common.c:11:
In file included from include/linux/interrupt.h:11:
In file included from include/linux/hardirq.h:10:
In file included from arch/powerpc/include/asm/hardirq.h:6:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/powerpc/include/asm/io.h:604:
arch/powerpc/include/asm/io-defs.h:53:1: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
DEF_PCI_AC_NORET(outsl, (unsigned long p, const void *b, unsigned long c),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/io.h:601:3: note: expanded from macro 'DEF_PCI_AC_NORET'
__do_##name al; \
^~~~~~~~~~~~~~
<scratch space>:17:1: note: expanded from here
__do_outsl
^
arch/powerpc/include/asm/io.h:546:58: note: expanded from macro '__do_outsl'
#define __do_outsl(p, b, n) writesl((PCI_IO_ADDR)_IO_BASE+(p),(b),(n))
~~~~~~~~~~~~~~~~~~~~~^
>> mm/slab_common.c:84:1: error: redefinition of '__setup_str_setup_slab_nomerge'
__setup("slab_merge", setup_slab_nomerge);
^
include/linux/init.h:262:2: note: expanded from macro '__setup'
__setup_param(str, fn, fn, 0)
^
include/linux/init.h:254:20: note: expanded from macro '__setup_param'
static const char __setup_str_##unique_id[] __initconst \
^
<scratch space>:124:1: note: expanded from here
__setup_str_setup_slab_nomerge
^
mm/slab_common.c:83:1: note: previous definition is here
__setup("slab_nomerge", setup_slab_nomerge);
^
include/linux/init.h:262:2: note: expanded from macro '__setup'
__setup_param(str, fn, fn, 0)
^
include/linux/init.h:254:20: note: expanded from macro '__setup_param'
static const char __setup_str_##unique_id[] __initconst \
^
<scratch space>:119:1: note: expanded from here
__setup_str_setup_slab_nomerge
^
12 warnings and 1 error generated.
vim +/__setup_str_setup_slab_nomerge +84 mm/slab_common.c
82
83 __setup("slab_nomerge", setup_slab_nomerge);
> 84 __setup("slab_merge", setup_slab_nomerge);
85
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
Hi Rafael,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on hnaz-linux-mm/master]
url: https://github.com/0day-ci/linux/commits/Rafael-Aquini/mm-slab_common-provide-slab_merge-option-for-IS_ENABLED-CONFIG_SLAB_MERGE_DEFAULT-builds/20210320-032434
base: https://github.com/hnaz/linux-mm master
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 9.3.0
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
# https://github.com/0day-ci/linux/commit/d6cb7528eaf0afbcb48bee452f7fa395938bd559
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rafael-Aquini/mm-slab_common-provide-slab_merge-option-for-IS_ENABLED-CONFIG_SLAB_MERGE_DEFAULT-builds/20210320-032434
git checkout d6cb7528eaf0afbcb48bee452f7fa395938bd559
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=m68k
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
In file included from include/asm-generic/bug.h:5,
from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/gfp.h:5,
from include/linux/slab.h:15,
from mm/slab_common.c:7:
include/linux/scatterlist.h: In function 'sg_set_buf':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
include/linux/compiler.h:78:42: note: in definition of macro 'unlikely'
78 | # define unlikely(x) __builtin_expect(!!(x), 0)
| ^
include/linux/scatterlist.h:143:2: note: in expansion of macro 'BUG_ON'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~
include/linux/scatterlist.h:143:10: note: in expansion of macro 'virt_addr_valid'
143 | BUG_ON(!virt_addr_valid(buf));
| ^~~~~~~~~~~~~~~
In file included from arch/m68k/include/asm/page.h:60,
from arch/m68k/include/asm/thread_info.h:6,
from include/linux/thread_info.h:38,
from include/asm-generic/preempt.h:5,
from ./arch/m68k/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:51,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:6,
from include/linux/slab.h:15,
from mm/slab_common.c:7:
mm/internal.h: In function 'mem_map_next':
arch/m68k/include/asm/page_mm.h:169:49: warning: ordered comparison of pointer with null pointer [-Wextra]
169 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
| ^~
arch/m68k/include/asm/page_mm.h:170:25: note: in expansion of macro 'virt_addr_valid'
170 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
| ^~~~~~~~~~~~~~~
mm/internal.h:456:8: note: in expansion of macro 'pfn_valid'
456 | if (!pfn_valid(pfn))
| ^~~~~~~~~
In file included from include/linux/printk.h:6,
from include/linux/kernel.h:15,
from include/asm-generic/bug.h:20,
from arch/m68k/include/asm/bug.h:32,
from include/linux/bug.h:5,
from include/linux/mmdebug.h:5,
from include/linux/gfp.h:5,
from include/linux/slab.h:15,
from mm/slab_common.c:7:
mm/slab_common.c: At top level:
>> include/linux/init.h:254:20: error: redefinition of '__setup_str_setup_slab_nomerge'
254 | static const char __setup_str_##unique_id[] __initconst \
| ^~~~~~~~~~~~
include/linux/init.h:262:2: note: in expansion of macro '__setup_param'
262 | __setup_param(str, fn, fn, 0)
| ^~~~~~~~~~~~~
mm/slab_common.c:84:1: note: in expansion of macro '__setup'
84 | __setup("slab_merge", setup_slab_nomerge);
| ^~~~~~~
include/linux/init.h:254:20: note: previous definition of '__setup_str_setup_slab_nomerge' was here
254 | static const char __setup_str_##unique_id[] __initconst \
| ^~~~~~~~~~~~
include/linux/init.h:262:2: note: in expansion of macro '__setup_param'
262 | __setup_param(str, fn, fn, 0)
| ^~~~~~~~~~~~~
mm/slab_common.c:83:1: note: in expansion of macro '__setup'
83 | __setup("slab_nomerge", setup_slab_nomerge);
| ^~~~~~~
>> include/linux/init.h:256:33: error: redefinition of '__setup_setup_slab_nomerge'
256 | static struct obs_kernel_param __setup_##unique_id \
| ^~~~~~~~
include/linux/init.h:262:2: note: in expansion of macro '__setup_param'
262 | __setup_param(str, fn, fn, 0)
| ^~~~~~~~~~~~~
mm/slab_common.c:84:1: note: in expansion of macro '__setup'
84 | __setup("slab_merge", setup_slab_nomerge);
| ^~~~~~~
include/linux/init.h:256:33: note: previous definition of '__setup_setup_slab_nomerge' was here
256 | static struct obs_kernel_param __setup_##unique_id \
| ^~~~~~~~
include/linux/init.h:262:2: note: in expansion of macro '__setup_param'
262 | __setup_param(str, fn, fn, 0)
| ^~~~~~~~~~~~~
mm/slab_common.c:83:1: note: in expansion of macro '__setup'
83 | __setup("slab_nomerge", setup_slab_nomerge);
| ^~~~~~~
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES
Depends on DISCONTIGMEM || NUMA
Selected by
- SINGLE_MEMORY_CHUNK && MMU
vim +/__setup_setup_slab_nomerge +256 include/linux/init.h
^1da177e4c3f41 Linus Torvalds 2005-04-16 246
^1da177e4c3f41 Linus Torvalds 2005-04-16 247 /*
^1da177e4c3f41 Linus Torvalds 2005-04-16 248 * Only for really core code. See moduleparam.h for the normal way.
^1da177e4c3f41 Linus Torvalds 2005-04-16 249 *
^1da177e4c3f41 Linus Torvalds 2005-04-16 250 * Force the alignment so the compiler doesn't space elements of the
^1da177e4c3f41 Linus Torvalds 2005-04-16 251 * obs_kernel_param "array" too far apart in .init.setup.
^1da177e4c3f41 Linus Torvalds 2005-04-16 252 */
^1da177e4c3f41 Linus Torvalds 2005-04-16 253 #define __setup_param(str, unique_id, fn, early) \
fd6c3a8dc44329 Jan Beulich 2009-03-12 @254 static const char __setup_str_##unique_id[] __initconst \
fd6c3a8dc44329 Jan Beulich 2009-03-12 255 __aligned(1) = str; \
^1da177e4c3f41 Linus Torvalds 2005-04-16 @256 static struct obs_kernel_param __setup_##unique_id \
3ff6eecca4e5c4 Adrian Bunk 2008-01-24 257 __used __section(.init.setup) \
^1da177e4c3f41 Linus Torvalds 2005-04-16 258 __attribute__((aligned((sizeof(long))))) \
^1da177e4c3f41 Linus Torvalds 2005-04-16 259 = { __setup_str_##unique_id, fn, early }
^1da177e4c3f41 Linus Torvalds 2005-04-16 260
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]