Commit 39d64ee5 authored by Uros Bizjak's avatar Uros Bizjak Committed by Ingo Molnar
Browse files

x86/percpu: Correct PER_CPU_VAR() usage to include symbol and its addend 



The PER_CPU_VAR() macro should be applied to a symbol and its addend.
Inconsistent usage is currently harmless, but needs to be corrected
before %rip-relative addressing is introduced to the PER_CPU_VAR() macro.

No functional changes intended.

Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: Brian Gerst <brgerst@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Sean Christopherson <seanjc@google.com>
parent 24b8a236

arch/x86/entry/calling.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ For 32-bit we have the following conventions - kernel is built with 
.endm



#define THIS_CPU_user_pcid_flush_mask   \

	PER_CPU_VAR(cpu_tlbstate) + TLB_STATE_user_pcid_flush_mask

	PER_CPU_VAR(cpu_tlbstate + TLB_STATE_user_pcid_flush_mask)



.macro SWITCH_TO_USER_CR3_NOSTACK scratch_reg:req scratch_reg2:req

	ALTERNATIVE "jmp .Lend_\@", "", X86_FEATURE_PTI

arch/x86/entry/entry_32.S

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ 
.macro CHECK_AND_APPLY_ESPFIX

#ifdef CONFIG_X86_ESPFIX32

#define GDT_ESPFIX_OFFSET (GDT_ENTRY_ESPFIX_SS * 8)

#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + GDT_ESPFIX_OFFSET

#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page + GDT_ESPFIX_OFFSET)



	ALTERNATIVE	"jmp .Lend_\@", "", X86_BUG_ESPFIX

arch/x86/entry/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ SYM_FUNC_START(__switch_to_asm) 


#ifdef CONFIG_STACKPROTECTOR

	movq	TASK_stack_canary(%rsi), %rbx

	movq	%rbx, PER_CPU_VAR(fixed_percpu_data) + FIXED_stack_canary

	movq	%rbx, PER_CPU_VAR(fixed_percpu_data + FIXED_stack_canary)

#endif



	/*

arch/x86/kernel/head_64.S

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ SYM_CODE_START(soft_restart_cpu) 
	UNWIND_HINT_END_OF_STACK



	/* Find the idle task stack */

	movq	PER_CPU_VAR(pcpu_hot) + X86_current_task, %rcx

	movq	PER_CPU_VAR(pcpu_hot + X86_current_task), %rcx

	movq	TASK_threadsp(%rcx), %rsp



	jmp	.Ljump_to_C_code