xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/mm: Simplify RESERVE_BRK()

Browse Source 
commit a1e2c031ec3949b8c039b739c0b5bf9c30007b00 upstream.

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
[nathan: Resolve conflict due to lack of 2b6ff7dea670]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Josh Poimboeuf
2022-05-06 14:14:32 +02:00
committed by Greg Kroah-Hartman
parent 571ce7d944
commit 01a5e17e3e
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/x86/include/asm/setup.h
View File

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