Skip to content

Commit e8432ac

Browse files
committed
minmax: avoid overly complex min()/max() macro arguments in xen
We have some very fancy min/max macros that have tons of sanity checking to warn about mixed signedness etc. This is all things that a sane compiler should warn about, but there are no sane compiler interfaces for this, and '-Wsign-compare' is broken [1] and not useful. So then we compensate (some would say over-compensate) by doing the checks manually with some truly horrid macro games. And no, we can't just use __builtin_types_compatible_p(), because the whole question of "does it make sense to compare these two values" is a lot more complicated than that. For example, it makes a ton of sense to compare unsigned values with simple constants like "5", even if that is indeed a signed type. So we have these very strange macros to try to make sensible type checking decisions on the arguments to 'min()' and 'max()'. But that can cause enormous code expansion if the min()/max() macros are used with complicated expressions, and particularly if you nest these things so that you get the first big expansion then expanded again. The xen setup.c file ended up ballooning to over 50MB of preprocessed noise that takes 15s to compile (obviously depending on the build host), largely due to one single line. So let's split that one single line to just be simpler. I think it ends up being more legible to humans too at the same time. Now that single file compiles in under a second. Reported-and-reviewed-by: Lorenzo Stoakes <[email protected]> Link: https://lore.kernel.org/all/[email protected]/ Link: https://staticthinking.wordpress.com/2023/07/25/wsign-compare-is-garbage/ [1] Cc: David Laight <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 2f8c4f5 commit e8432ac

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

arch/x86/xen/setup.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,7 @@ char * __init xen_memory_setup(void)
690690
struct xen_memory_map memmap;
691691
unsigned long max_pages;
692692
unsigned long extra_pages = 0;
693+
unsigned long maxmem_pages;
693694
int i;
694695
int op;
695696

@@ -761,8 +762,8 @@ char * __init xen_memory_setup(void)
761762
* Make sure we have no memory above max_pages, as this area
762763
* isn't handled by the p2m management.
763764
*/
764-
extra_pages = min3(EXTRA_MEM_RATIO * min(max_pfn, PFN_DOWN(MAXMEM)),
765-
extra_pages, max_pages - max_pfn);
765+
maxmem_pages = EXTRA_MEM_RATIO * min(max_pfn, PFN_DOWN(MAXMEM));
766+
extra_pages = min3(maxmem_pages, extra_pages, max_pages - max_pfn);
766767
i = 0;
767768
addr = xen_e820_table.entries[0].addr;
768769
size = xen_e820_table.entries[0].size;

0 commit comments

Comments
 (0)