Skip to contentSkip to conversation

x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid

PATCH Applied Maximilian Heyne 3 participants 4 messages May 17, 2022 – May 22, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid

Since commit 4d65adfcd119 ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature"), objtool is able to correctly parse the prefixed instruction in xen_cpuid and emit correct orc unwind information. Hence, marking the function as STACKFRAME_NON_STANDARD is no longer needed.

This commit is basically a revert of commit 983bb6d254c7 ("x86/xen: Mark xen_cpuid() stack frame as non-standard").

cr: https://code.amazon.com/reviews/CR-69645080

---
 arch/x86/xen/enlighten_pv.c | 2 --
 1 file changed, 2 deletions(-)
arch/x86/xen/enlighten_pv.c +0 -2
index 5038edb79ad5..ca85d1409917 100644
@@ -30,7 +30,6 @@
 #include <linux/pci.h>
 #include <linux/gfp.h>
 #include <linux/edd.h>
-#include <linux/objtool.h>
 
 #include <xen/xen.h>
 #include <xen/events.h>
@@ -165,7 +164,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
 
 	*bx &= maskebx;
 }
-STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */
 
 static bool __init xen_check_mwait(void)
 {
Signature · 12 lines
2.32.0




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Maximilian Heyne

Since commit 4d65adfcd119 ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature"), objtool is able to correctly parse the prefixed instruction in xen_cpuid and emit correct orc unwind information. Hence, marking the function as STACKFRAME_NON_STANDARD is no longer needed.

Quoted 7 lines

This commit is basically a revert of commit 983bb6d254c7 ("x86/xen: Mark xen_cpuid() stack frame as non-standard").

cr: https://code.amazon.com/reviews/CR-69645080

      ^^^^^

This looks like an internal amazon link and should be removed. Otherwise, looks good to me.

Signature · 1 line
Josh
maintainer Reviewed-by
#2 lore raw
Quoted 10 lines · Josh Poimboeuf
Quoted 9 lines · Maximilian Heyne

Since commit 4d65adfcd119 ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature"), objtool is able to correctly parse the prefixed instruction in xen_cpuid and emit correct orc unwind information. Hence, marking the function as STACKFRAME_NON_STANDARD is no longer needed.

This commit is basically a revert of commit 983bb6d254c7 ("x86/xen: Mark xen_cpuid() stack frame as non-standard").

Quoted 8 lines
Quoted 4 lines

cr: https://code.amazon.com/reviews/CR-69645080

       ^^^^^

This looks like an internal amazon link and should be removed. Otherwise, looks good to me.

Can be done while committing.

Juergen

maintainer Applied
#3 lore raw
In reply to Maximilian Heyne
Quoted 11 lines · Maximilian Heyne

Since commit 4d65adfcd119 ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature"), objtool is able to correctly parse the prefixed instruction in xen_cpuid and emit correct orc unwind information. Hence, marking the function as STACKFRAME_NON_STANDARD is no longer needed.

This commit is basically a revert of commit 983bb6d254c7 ("x86/xen: Mark xen_cpuid() stack frame as non-standard").

Pushed to xen/tip.git for-linus-5.19

Juergen