mm: kmalloc_index: remove case when size is more than 32MB
Subsystems (2)
PATCH 1/1 mm: kmalloc_index: remove case when size is more than 32MB
the return value of kmalloc_index is used as index of kmalloc_caches, which is defined as:
struct kmem_cache * kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1]
and KMALLOC_SHIFT_HIGH is defined as:
#define KMALLOC_SHIFT_HIGH ((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
(MAX_ORDER + PAGE_SHIFT - 1) : 25)KMALLOC_SHIFT_HIGH is maximum 25 by its definition. thus index of kmalloc_caches cannot be 26. so this case should be removed.
--- include/linux/slab.h | 1 - 1 file changed, 1 deletion(-)
include/linux/slab.h +0 -1
@@ -382,7 +382,6 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ;BUG ();/* Will never be reached. Needed because the compiler may complain */
Signature · 1 line
2.25.1
Quoted 1 line · Hyeonggon Yoo
the return value of
kmalloc_indexis used as index ofkmalloc_caches,
it doesn't matter. every few weeks somebody posts a patch to "optimise" kmalloc_index, failing to appreciate that it's only ever run at compile time because it's all under __builtin_constant_p().
Quoted 6 lines · Matthew Wilcox
Quoted 1 line · Hyeonggon Yoo
the return value of
kmalloc_indexis used as index ofkmalloc_caches,it doesn't matter. every few weeks somebody posts a patch to "optimise"
kmalloc_index, failing to appreciate that it's only ever run at compile time because it's all under__builtin_constant_p().
Oh thanks, I didn't know about __builtin_constant_p.
But I was not optimizing kmalloc_index. isn't it confusing that kmalloc_caches alllows maximum size of 32MB, and kmalloc_index allows maximum size of 64MB?
and even if the code I removed is never reached because 64MB is always bigger than KMALLOC_MAX_CACHE_SIZE, it will cause an error if reached.
Quoted 8 lines · Hyeonggon Yoo
Quoted 6 lines · Matthew Wilcox
Quoted 1 line · Hyeonggon Yoo
the return value of
kmalloc_indexis used as index ofkmalloc_caches,it doesn't matter. every few weeks somebody posts a patch to "optimise"
kmalloc_index, failing to appreciate that it's only ever run at compile time because it's all under__builtin_constant_p().
Quoted 8 lines
Oh thanks, I didn't know about
__builtin_constant_p.But I was not optimizing
kmalloc_index. isn't it confusing thatkmalloc_cachesalllows maximum size of 32MB, andkmalloc_indexallows maximum size of 64MB?and even if the code I removed is never reached because 64MB is always bigger than
KMALLOC_MAX_CACHE_SIZE, it will cause an error if reached.
KMALLOC_MAX_CACHE_SIZE depends on KMALLOC_SHIFT_HIGH size of kmalloc_caches array depends on KMALLOC_SHIFT_HIGH
So I don't an easy way how it could become reachable while causing the index to overflow - if someone increased KMALLOC_SHIFT_HIGH from 25 to 26, all should be fine, AFAICS.
The problem would be if someone increased it to 27, then we might suddenly get a BUG() in kmalloc_index(). We should probably replace that BUG() with BUILD_BUG_ON(1) to catch that at compile time. Hopefully no supported compiler will break because it's not able to do the proper compile-time evaluation - but if it does, at least we would know.
So I would accept the patch if it also changed BUG() to e.g. BUILD_BUG_ON_MSG(1, "unexpected size in kmalloc_index()");
and expanded the function's comment that this is always compile-time evaluated and thus no attempts at "optimizing" the code should be made.
Quoted 31 lines · Vlastimil Babka
Quoted 8 lines · Hyeonggon Yoo
Quoted 6 lines · Matthew Wilcox
Quoted 1 line · Hyeonggon Yoo
the return value of
kmalloc_indexis used as index ofkmalloc_caches,it doesn't matter. every few weeks somebody posts a patch to "optimise"
kmalloc_index, failing to appreciate that it's only ever run at compile time because it's all under__builtin_constant_p().Quoted 8 lines
Oh thanks, I didn't know about
__builtin_constant_p.But I was not optimizing
kmalloc_index. isn't it confusing thatkmalloc_cachesalllows maximum size of 32MB, andkmalloc_indexallows maximum size of 64MB?and even if the code I removed is never reached because 64MB is always bigger than
KMALLOC_MAX_CACHE_SIZE, it will cause an error if reached.
KMALLOC_MAX_CACHE_SIZEdepends onKMALLOC_SHIFT_HIGHsize ofkmalloc_cachesarray depends onKMALLOC_SHIFT_HIGHSo I don't an easy way how it could become reachable while causing the index to overflow - if someone increased
KMALLOC_SHIFT_HIGHfrom 25 to 26, all should be fine, AFAICS.The problem would be if someone increased it to 27, then we might suddenly get a
BUG()inkmalloc_index(). We should probably replace thatBUG()withBUILD_BUG_ON(1)to catch that at compile time. Hopefully no supported compiler will break because it's not able to do the proper compile-time evaluation - but if it does, at least we would know.
Quoted 5 lines
So I would accept the patch if it also changed
BUG()to e.g.BUILD_BUG_ON_MSG(1, "unexpected size in kmalloc_index()");
and expanded the function's comment that this is always compile-time evaluated and thus no attempts at "optimizing" the code should be made.
Thank you so much reviewing and replying to my patch. plecase check if I understood well.
Okay, I'll do that work. then the following patch will:
- remove case when size is more than 32MB
- change "BUG to BUILD_BUG_ON to let compiler know when the size is not supported"
- add comment that there's no need to optimize it
is it what you mean. right?
and I have a question. in the lin 751 of mm/slab_common.c,
thre's struct kmalloc_info_struct kmalloc_info. and it initializes kmalloc info up to 64MB, which is currently not supported. should I change it too? in a separate patch?
Quoted 41 lines · Hyeonggon Yoo
Quoted 31 lines · Vlastimil Babka
Quoted 8 lines · Hyeonggon Yoo
Quoted 6 lines · Matthew Wilcox
Quoted 1 line · Hyeonggon Yoo
the return value of
kmalloc_indexis used as index ofkmalloc_caches,it doesn't matter. every few weeks somebody posts a patch to "optimise"
kmalloc_index, failing to appreciate that it's only ever run at compile time because it's all under__builtin_constant_p().Quoted 8 lines
Oh thanks, I didn't know about
__builtin_constant_p.But I was not optimizing
kmalloc_index. isn't it confusing thatkmalloc_cachesalllows maximum size of 32MB, andkmalloc_indexallows maximum size of 64MB?and even if the code I removed is never reached because 64MB is always bigger than
KMALLOC_MAX_CACHE_SIZE, it will cause an error if reached.
KMALLOC_MAX_CACHE_SIZEdepends onKMALLOC_SHIFT_HIGHsize ofkmalloc_cachesarray depends onKMALLOC_SHIFT_HIGHSo I don't an easy way how it could become reachable while causing the index to overflow - if someone increased
KMALLOC_SHIFT_HIGHfrom 25 to 26, all should be fine, AFAICS.The problem would be if someone increased it to 27, then we might suddenly get a
BUG()inkmalloc_index(). We should probably replace thatBUG()withBUILD_BUG_ON(1)to catch that at compile time. Hopefully no supported compiler will break because it's not able to do the proper compile-time evaluation - but if it does, at least we would know.Quoted 5 lines
So I would accept the patch if it also changed
BUG()to e.g.BUILD_BUG_ON_MSG(1, "unexpected size in kmalloc_index()");
and expanded the function's comment that this is always compile-time evaluated and thus no attempts at "optimizing" the code should be made.Thank you so much reviewing and replying to my patch. plecase check if I understood well.
Quoted 6 lines
Okay, I'll do that work. then the following patch will:
- remove case when size is more than 32MB
- change "BUG toBUILD_BUG_ONto let compiler know when the size is not supported"
- add comment that there's no need to optimize itis it what you mean. right?
Exactly.
Quoted 3 lines
and I have a question. in the lin 751 of
mm/slab_common.c,
thre's structkmalloc_info_structkmalloc_info. and it initializes kmalloc info up to 64MB, which is currently not supported. should I change it too? in a separate patch?
Yeah that could be also changed, in the same patch.
PATCH v2 1/1 mm: kmalloc_index: make compiler break when size is not supported
updated patch. let me know if something is wrong!
From 8fe7ecdfb0f5bd5b08771512303d72f1c6447362 Mon Sep 17 00:00:00 2001
From: Hyeonggon Yoo <[email protected]>
Date: Mon, 10 May 2021 23:57:34 +0900
Subject: [PATCH] mm: kmalloc_index: make compiler break when size is not
supported
currently when size is not supported by kmalloc_index, compiler will not break. so changed BUG to BUILD_BUG_ON_MSG to make compiler break if size is wrong. this is done in compile time.
also removed code that allocates more than 32MB because current implementation supports only up to 32MB.
--- include/linux/slab.h | 7 +++++-- mm/slab_common.c | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/slab.h +5 -2
@@ -346,6 +346,9 @@ static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags)* 1 = 65 .. 96 bytes * 2 = 129 .. 192 bytes * n = 2^(n-1)+1 .. 2^n +* +* Note: you don't need to optimize kmalloc_index because it's evaluated +* in compile-time. */ static __always_inline unsigned int kmalloc_index(size_t size) {
@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );/* Will never be reached. Needed because the compiler may complain */ return -1 ;
mm/slab_common.c +3 -4
@@ -745,8 +745,8 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)/* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time. -* kmalloc_index() supports up to 2^26=64MB, so the final entry of the table is -* kmalloc-67108864. +* kmalloc_index() supports up to 2^25=32MB, so the final entry of the table is +* kmalloc-33554432. */ const struct kmalloc_info_struct kmalloc_info[]__initconst = {INIT_KMALLOC_INFO (0 ,0 ),
@@ -774,8 +774,7 @@ const struct kmalloc_info_struct kmalloc_info[] __initconst = { INIT_KMALLOC_INFO(4194304, 4M), INIT_KMALLOC_INFO(8388608, 8M), INIT_KMALLOC_INFO(16777216, 16M), - INIT_KMALLOC_INFO(33554432, 32M), - INIT_KMALLOC_INFO(67108864, 64M) + INIT_KMALLOC_INFO(33554432, 32M) };/*
Signature · 1 line
2.25.1
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
I guess this needs to be reviewed and tested by the users of architectures that can use large MAXORDER pages such as powerpc and Itanium.
Quoted 3 lines · Hyeonggon Yoo
updated patch. let me know if something is wrong!
From
8fe7ecdfb0f5bd5b08771512303d72f1c6447362Mon Sep 17 00:00:00 2001
From: Hyeonggon Yoo <[email protected]>
Date: Mon, 10 May 2021 23:57:34 +0900
Subject: [PATCH] mm: kmalloc_index: make compiler break when size is not
supported
currently when size is not supported by kmalloc_index, compiler will not break. so changed BUG to BUILD_BUG_ON_MSG to make compiler break if size is wrong. this is done in compile time.
also removed code that allocates more than 32MB because current implementation supports only up to 32MB.
--- include/linux/slab.h | 7 +++++-- mm/slab_common.c | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/slab.h +5 -2
@@ -346,6 +346,9 @@ static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags)* 1 = 65 .. 96 bytes * 2 = 129 .. 192 bytes * n = 2^(n-1)+1 .. 2^n +* +* Note: you don't need to optimize kmalloc_index because it's evaluated +* in compile-time. */ static __always_inline unsigned int kmalloc_index(size_t size) {
@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );/* Will never be reached. Needed because the compiler may complain */ return -1 ;
mm/slab_common.c +3 -4
@@ -745,8 +745,8 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)/* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time. -* kmalloc_index() supports up to 2^26=64MB, so the final entry of the table is -* kmalloc-67108864. +* kmalloc_index() supports up to 2^25=32MB, so the final entry of the table is +* kmalloc-33554432. */ const struct kmalloc_info_struct kmalloc_info[]__initconst = {INIT_KMALLOC_INFO (0 ,0 ),
@@ -774,8 +774,7 @@ const struct kmalloc_info_struct kmalloc_info[] __initconst = { INIT_KMALLOC_INFO(4194304, 4M), INIT_KMALLOC_INFO(8388608, 8M), INIT_KMALLOC_INFO(16777216, 16M), - INIT_KMALLOC_INFO(33554432, 32M), - INIT_KMALLOC_INFO(67108864, 64M) + INIT_KMALLOC_INFO(33554432, 32M) };/*
Signature · 1 line
2.25.1
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 2 lines · Christoph Lameter
I guess this needs to be reviewed and tested by the users of architectures that can use large MAXORDER pages such as powerpc and Itanium.
AFAICS large MAX_ORDER should matter as KMALLOC_SHIFT_HIGH will be always capped to 25. But sure, let the bots complain if something is wrong. I'm more interested if we shake out some compiler that can't do the compile-time evaluation properly and we didn't know until now.
Quoted 78 lines · Hyeonggon Yoo
Quoted 3 lines
updated patch. let me know if something is wrong!
0001-mm-kmalloc_index-make-compiler-break-when-size-is-no.patch
Quoted 1 line
From
8fe7ecdfb0f5bd5b08771512303d72f1c6447362Mon Sep 17 00:00:00 2001From: Hyeonggon Yoo <[email protected]>
Date: Mon, 10 May 2021 23:57:34 +0900
Subject: [PATCH] mm:kmalloc_index: make compiler break when size is not
supportedcurrently when size is not supported by
kmalloc_index, compiler will not break. so changed BUG toBUILD_BUG_ON_MSGto make compiler break if size is wrong. this is done in compile time.also removed code that allocates more than 32MB because current implementation supports only up to 32MB.
Signed-off-by Hyeonggon Yoo <[email protected]>--- include/linux/slab.h | 7 +++++-- mm/slab_common.c | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-)include/linux/slab.h +5
-2@@ -346,6 +346,9 @@ static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags)* 1 = 65 .. 96 bytes * 2 = 129 .. 192 bytes * n = 2^(n-1)+1 .. 2^n +* +* Note: you don't need to optimize kmalloc_index because it's evaluated +* in compile-time. */ static __always_inline unsigned int kmalloc_index(size_t size) {@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );/* Will never be reached. Needed because the compiler may complain */ return -1 ;mm/slab_common.c +3
-4@@ -745,8 +745,8 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)/* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time. -* kmalloc_index() supports up to 2^26=64MB, so the final entry of the table is -* kmalloc-67108864. +* kmalloc_index() supports up to 2^25=32MB, so the final entry of the table is +* kmalloc-33554432. */ const struct kmalloc_info_struct kmalloc_info[]__initconst = {INIT_KMALLOC_INFO (0 ,0 ),@@ -774,8 +774,7 @@ const struct kmalloc_info_struct kmalloc_info[] __initconst = { INIT_KMALLOC_INFO(4194304, 4M), INIT_KMALLOC_INFO(8388608, 8M), INIT_KMALLOC_INFO(16777216, 16M), - INIT_KMALLOC_INFO(33554432, 32M), - INIT_KMALLOC_INFO(67108864, 64M) + INIT_KMALLOC_INFO(33554432, 32M) };/*
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
In reply to Christoph LameterQuoted 2 lines · Christoph Lameter
I guess this needs to be reviewed and tested by the users of architectures that can use large MAXORDER pages such as powerpc and Itanium.
as Vlastimil Babka said, I think it's fine too. because KMALLOC_SHIFT_HIGH can't be bigger than 25 regardless of MAX_ORDER
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
In reply to Hyeonggon YooQuoted 10 lines · Hyeonggon Yoo
updated patch. let me know if something is wrong!
0001-mm-kmalloc_index-make-compiler-break-when-size-is-no.patch
From
8fe7ecdfb0f5bd5b08771512303d72f1c6447362Mon Sep 17 00:00:00 2001
From: Hyeonggon Yoo <[email protected]>
Date: Mon, 10 May 2021 23:57:34 +0900
Subject: [PATCH] mm:kmalloc_index: make compiler break when size is not
supported
I'd rephrase the subject:
mm, slub: change run-time assertion in kmalloc_index() to compile-time
Quoted 2 lines
currently when size is not supported by
kmalloc_index, compiler will not break.
"... compiler will generate a run-time BUG() while a compile-time error is also possible, and better"
Quoted 17 lines
so changed BUG to
BUILD_BUG_ON_MSGto make compiler break if size is wrong. this is done in compile time.also removed code that allocates more than 32MB because current implementation supports only up to 32MB.
Signed-off-by Hyeonggon Yoo <[email protected]>--- include/linux/slab.h | 7 +++++-- mm/slab_common.c | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-)include/linux/slab.h +0
-0
include/linux/slab.h static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags) · line 350
Quoted 5 lines
include/linux/slab.h +2
-0@@ -346,6 +346,9 @@ static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags)* 1 = 65 .. 96 bytes * 2 = 129 .. 192 bytes * n = 2^(n-1)+1 .. 2^n +* +* Note: you don't need to optimize kmalloc_index because it's evaluated
"there's no need to..."
Quoted 20 lines
include/linux/slab.h +3
-2+* in compile-time. */ static __always_inline unsigned int kmalloc_index(size_t size) {@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );/* Will never be reached. Needed because the compiler may complain */ return -1 ;mm/slab_common.c +0
-0
mm/slab_common.c struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags) · line 749
Quoted 7 lines
mm/slab_common.c +2
-2@@ -745,8 +745,8 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)/* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time. -* kmalloc_index() supports up to 2^26=64MB, so the final entry of the table is -* kmalloc-67108864. +* kmalloc_index() supports up to 2^25=32MB, so the final entry of the table is +* kmalloc-33554432.
kmalloc-32M
Quoted 5 lines
mm/slab_common.c +0
-0*/ const struct kmalloc_info_struct kmalloc_info[]__initconst = {INIT_KMALLOC_INFO (0 ,0 ),
mm/slab_common.c const struct kmalloc_info_struct kmalloc_info[] __initconst = { · line 780
Quoted 9 lines
mm/slab_common.c +1
-2@@ -774,8 +774,7 @@ const struct kmalloc_info_struct kmalloc_info[] __initconst = { INIT_KMALLOC_INFO(4194304, 4M), INIT_KMALLOC_INFO(8388608, 8M), INIT_KMALLOC_INFO(16777216, 16M), - INIT_KMALLOC_INFO(33554432, 32M), - INIT_KMALLOC_INFO(67108864, 64M) + INIT_KMALLOC_INFO(33554432, 32M) };/*
Thanks
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 9 lines · Vlastimil Babka
I'd rephrase the subject:
mm, slub: change run-time assertion inkmalloc_index()to compile-time"... compiler will generate a run-time
BUG()while a compile-time error is also possible, and better""there's no need to..."
kmalloc-32M
Vlastimil Babka and Christoph Lameter, thank you for reviewing the patch.
I'm not familiar with kernel community yet. should I send patch v3 again, or can you update it directly?
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 9 lines · Hyeonggon Yoo
Quoted 6 lines · Vlastimil Babka
I'd rephrase the subject:
mm, slub: change run-time assertion inkmalloc_index()to compile-time"... compiler will generate a run-time
BUG()while a compile-time error is also possible, and better"
Quoted 8 lines
Quoted 2 lines
"there's no need to..."
kmalloc-32MVlastimil Babka and Christoph Lameter, thank you for reviewing the patch.
I'm not familiar with kernel community yet. should I send patch v3 again, or can you update it directly?
I think it would be best if you sent v3, the way you did with v1 - inline. With v2 it looked like a mail body with you message and patch as attachment. We want the testing bots to pick it up and they might work only with inline patch. Thanks.
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 14 lines · Vlastimil Babka
Quoted 13 lines · Hyeonggon Yoo
Quoted 9 lines · Vlastimil Babka
I'd rephrase the subject:
mm, slub: change run-time assertion inkmalloc_index()to compile-time"... compiler will generate a run-time
BUG()while a compile-time error is also possible, and better""there's no need to..."
kmalloc-32M
Quoted 8 lines
Quoted 4 lines
Vlastimil Babka and Christoph Lameter, thank you for reviewing the patch.
I'm not familiar with kernel community yet. should I send patch v3 again, or can you update it directly?
I think it would be best if you sent v3, the way you did with v1 - inline. With v2 it looked like a mail body with you message and patch as attachment. We want the testing bots to pick it up and they might work only with inline patch. Thanks.
Ah, you already did. Good.
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 7 lines · Vlastimil Babka
Quoted 4 lines
I think it would be best if you sent v3, the way you did with v1 - inline. With v2 it looked like a mail body with you message and patch as attachment. We want the testing bots to pick it up and they might work only with inline patch. Thanks.
Ah, you already did. Good.
OK, I will not send patch as an attachment later. it's first time for me to hear about 'testing bots'. is there a documentation about it?
Re: [PATCH v3] mm: change run-time assertion in kmalloc_index() to compile-time
In reply to Vlastimil BabkaFrom c2b8fc4144f2c44b0ac5957a06207c385cc94d15 Mon Sep 17 00:00:00 2001
From: Hyeonggon Yoo <[email protected]>
Date: Tue, 11 May 2021 11:53:23 +0900
Subject: [PATCH] mm, slub: change run-time assertion in kmalloc_index() to
compile-time
currently when size is not supported by kmalloc_index, compiler will generate a run-time BUG() while compile-time error is also possible, and better. so changed BUG to BUILD_BUG_ON_MSG to make compile-time check possible.
also removed code that allocates more than 32MB because current implementation supports only up to 32MB.
--- include/linux/slab.h | 7 +++++-- mm/slab_common.c | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/slab.h +5 -2
@@ -345,6 +345,9 @@ static __always_inline enum kmalloc_cache_type kmalloc_type(gfp_t flags)* 1 = 65 .. 96 bytes * 2 = 129 .. 192 bytes * n = 2^(n-1)+1 .. 2^n +* +* Note: there's no need to optimize kmalloc_index because it's evaluated +* in compile-time. */ static __always_inline unsigned int kmalloc_index(size_t size) {
@@ -381,8 +384,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );/* Will never be reached. Needed because the compiler may complain */ return -1 ;
mm/slab_common.c +3 -4
@@ -1192,8 +1192,8 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)/* * kmalloc_info[] is to make slub_debug=,kmalloc-xx option work at boot time. -* kmalloc_index() supports up to 2^26=64MB, so the final entry of the table is -* kmalloc-67108864. +* kmalloc_index() supports up to 2^25=32MB, so the final entry of the table is +* kmalloc-32M. */ const struct kmalloc_info_struct kmalloc_info[]__initconst = {INIT_KMALLOC_INFO (0 ,0 ),
@@ -1221,8 +1221,7 @@ const struct kmalloc_info_struct kmalloc_info[] __initconst = { INIT_KMALLOC_INFO(4194304, 4M), INIT_KMALLOC_INFO(8388608, 8M), INIT_KMALLOC_INFO(16777216, 16M), - INIT_KMALLOC_INFO(33554432, 32M), - INIT_KMALLOC_INFO(67108864, 64M) + INIT_KMALLOC_INFO(33554432, 32M) };/*
Signature · 1 line
2.25.1
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
In reply to Hyeonggon Yooinclude/linux/slab.h static __always_inline unsigned int kmalloc_index(size_t size) · line 389
Quoted 8 lines · Hyeonggon Yoo
include/linux/slab.h +2
-2@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );
we're being encouraged to use static_assert() these days.
https://en.cppreference.com/w/c/language/_Static_assert
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 13 lines · Matthew Wilcox
include/linux/slab.h static __always_inline unsigned int kmalloc_index(size_t size) · line 389
Quoted 8 lines · Hyeonggon Yoo
include/linux/slab.h +2
-2@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );we're being encouraged to use
static_assert()these days.
https://en.cppreference.com/w/c/language/_Static_assert
can you tell me difference between static_assert and BUILD_BUG_ON? it seems that mm subsystem does not make use of it now.
Re: [PATCH v2] mm: kmalloc_index: make compiler break when size is not supported
Quoted 15 lines · Hyeonggon Yoo
Quoted 13 lines · Matthew Wilcox
include/linux/slab.h static __always_inline unsigned int kmalloc_index(size_t size) · line 389
Quoted 8 lines · Hyeonggon Yoo
include/linux/slab.h +2
-2@@ -382,8 +385,8 @@ static __always_inline unsigned int kmalloc_index(size_t size)if (size <=8 *1024 *1024 )return 23 ;if (size <=16 *1024 *1024 )return 24 ;if (size <=32 *1024 *1024 )return 25 ; -if (size <=64 *1024 *1024 )return 26 ; -BUG (); + +BUILD_BUG_ON_MSG (1 ,"unexpected size in kmalloc_index()" );we're being encouraged to use
static_assert()these days.
https://en.cppreference.com/w/c/language/_Static_assert
Quoted 2 lines
can you tell me difference between
static_assertandBUILD_BUG_ON? it seems that mm subsystem does not make use of it now.
Some difference is explained in include/linux/build_bug.h near static_assert definition.
But importantly it seems it's not possible to place static_assert(false) in place of the BUG() because it will trigger despite not being reachable. BUILD_BUG_ON_MSG(1 "..."); worked as expected for me.