Commit e87f4152 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

task_stack, x86/cea: Force-inline stack helpers 



Force-inline two stack helpers to fix the following objtool warnings:

  vmlinux.o: warning: objtool: in_task_stack()+0xc: call to task_stack_page() leaves .noinstr.text section
  vmlinux.o: warning: objtool: in_entry_stack()+0x10: call to cpu_entry_stack() leaves .noinstr.text section

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220324183607.31717-2-bp@alien8.de
parent 31231092

arch/x86/include/asm/cpu_entry_area.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ extern void cea_set_pte(void *cea_vaddr, phys_addr_t pa, pgprot_t flags); 


extern struct cpu_entry_area *get_cpu_entry_area(int cpu);



static inline struct entry_stack *cpu_entry_stack(int cpu)

static __always_inline struct entry_stack *cpu_entry_stack(int cpu)

{

	return &get_cpu_entry_area(cpu)->entry_stack_page.stack;

}

include/linux/sched/task_stack.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * try_get_task_stack() instead.  task_stack_page will return a pointer

 * that could get freed out from under you.

 */

static inline void *task_stack_page(const struct task_struct *task)

static __always_inline void *task_stack_page(const struct task_struct *task)

{

	return task->stack;

}