From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 21 Nov 2022 21:54:36 +0000 (+0100)
Subject: Merge tag 'v6.1-rc6' into x86/core, to resolve conflicts
X-Git-Tag: v6.6.7~3899^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ce096db719ebaf46d4faf93e1ed1341c1853919;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'v6.1-rc6' into x86/core, to resolve conflicts

Resolve conflicts between these commits in arch/x86/kernel/asm-offsets.c:

 # upstream:
 debc5a1ec0d1 ("KVM: x86: use a separate asm-offsets.c file")

 # retbleed work in x86/core:
 5d8213864ade ("x86/retbleed: Add SKL return thunk")

... and these commits in include/linux/bpf.h:

  # upstram:
  18acb7fac22f ("bpf: Revert ("Fix dispatcher patchable function entry to 5 bytes nop")")

  # x86/core commits:
  931ab63664f0 ("x86/ibt: Implement FineIBT")
  bea75b33895f ("x86/Kconfig: Introduce function padding")

The latter two modify BPF_DISPATCHER_ATTRIBUTES(), which was removed upstream.

 Conflicts:
	arch/x86/kernel/asm-offsets.c
	include/linux/bpf.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

0ce096db719ebaf46d4faf93e1ed1341c1853919
diff --cc arch/x86/include/asm/qspinlock_paravirt.h
index 082551b,dbb38a6..d861127
--- a/arch/x86/include/asm/qspinlock_paravirt.h
+++ b/arch/x86/include/asm/qspinlock_paravirt.h
@@@ -37,10 -37,10 +37,10 @@@ __PV_CALLEE_SAVE_REGS_THUNK(__pv_queued
   *   rsi = lockval           (second argument)
   *   rdx = internal variable (set to 0)
   */
- asm    (".pushsection .spinlock.text;"
+ asm    (".pushsection .spinlock.text, \"ax\";"
  	".globl " PV_UNLOCK ";"
  	".type " PV_UNLOCK ", @function;"
 -	".align 4,0x90;"
 +	ASM_FUNC_ALIGN
  	PV_UNLOCK ": "
  	ASM_ENDBR
  	FRAME_BEGIN
diff --cc arch/x86/kernel/asm-offsets.c
index 13afdbb,4373080..82c783d
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@@ -108,14 -107,4 +107,9 @@@ static void __used common(void
  	OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
  	OFFSET(TSS_sp1, tss_struct, x86_tss.sp1);
  	OFFSET(TSS_sp2, tss_struct, x86_tss.sp2);
- 
 +	OFFSET(X86_top_of_stack, pcpu_hot, top_of_stack);
 +#ifdef CONFIG_CALL_DEPTH_TRACKING
 +	OFFSET(X86_call_depth, pcpu_hot, call_depth);
 +#endif
 +
- 	if (IS_ENABLED(CONFIG_KVM_INTEL)) {
- 		BLANK();
- 		OFFSET(VMX_spec_ctrl, vcpu_vmx, spec_ctrl);
- 	}
  }