x86/mm: Simplify RESERVE_BRK()

RESERVE_BRK() reserves data in the .brk_reservation section.  The data
is initialized to zero, like BSS, so the macro specifies 'nobits' to
prevent the data from taking up space in the vmlinux binary.  The only
way to get the compiler to do that (without putting the variable in .bss
proper) is to use inline asm.

The macro also has a hack which encloses the inline asm in a discarded
function, which allows the size to be passed (global inline asm doesn't
allow inputs).

Remove the need for the discarded function hack by just stringifying the
size rather than supplying it as an input to the inline asm.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220506121631.133110232@infradead.org

diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 896e48d45828cba79d15d5d9a98ea55fc62f9bbe..bec5ff4d6d987afc256f73a961d6206c136ff507 100644 (file)
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -109,27 +109,19 @@ extern unsigned long _brk_end;
 void *extend_brk(size_t size, size_t align);
 
 /*
- * Reserve space in the brk section.  The name must be unique within
- * the file, and somewhat descriptive.  The size is in bytes.  Must be
- * used at file scope.
+ * Reserve space in the brk section.  The name must be unique within the file,
+ * and somewhat descriptive.  The size is in bytes.
  *
- * (This uses a temp function to wrap the asm so we can pass it the
- * size parameter; otherwise we wouldn't be able to.  We can't use a
- * "section" attribute on a normal variable because it always ends up
- * being @progbits, which ends up allocating space in the vmlinux
- * executable.)
+ * The allocation is done using inline asm (rather than using a section
+ * attribute on a normal variable) in order to allow the use of @nobits, so
+ * that it doesn't take up any space in the vmlinux file.
  */
-#define RESERVE_BRK(name,sz)                                           \
-       static void __section(".discard.text") __noendbr __used notrace \
-       __brk_reservation_fn_##name##__(void) {                         \
-               asm volatile (                                          \
-                       ".pushsection .brk_reservation,\"aw\",@nobits;" \
-                       ".brk." #name ":"                               \
-                       " 1:.skip %c0;"                                 \
-                       " .size .brk." #name ", . - 1b;"                \
-                       " .popsection"                                  \
-                       : : "i" (sz));                                  \
-       }
+#define RESERVE_BRK(name, size)                                                \
+       asm(".pushsection .brk_reservation,\"aw\",@nobits\n\t"          \
+           ".brk." #name ":\n\t"                                       \
+           ".skip " __stringify(size) "\n\t"                           \
+           ".size .brk." #name ", " __stringify(size) "\n\t"           \
+           ".popsection\n\t")
 
 extern void probe_roms(void);
 #ifdef __i386__