| Message ID | 20220517162425.100567-1-mheyne@amazon.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1591a65f55bca5f7e14f9fbca4bd082dc8f4680f |
| Headers | show |
| Series | x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid | expand |
On Tue, May 17, 2022 at 04:24:25PM +0000, Maximilian Heyne wrote: > 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"). > > Signed-off-by: Maximilian Heyne <mheyne@amazon.de> > CC: Josh Poimboeuf <jpoimboe@kernel.org> > > cr: https://code.amazon.com/reviews/CR-69645080 ^^^^^ This looks like an internal amazon link and should be removed. Otherwise, looks good to me. Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
On 17.05.22 18:42, Josh Poimboeuf wrote: > On Tue, May 17, 2022 at 04:24:25PM +0000, Maximilian Heyne wrote: >> 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"). >> >> Signed-off-by: Maximilian Heyne <mheyne@amazon.de> >> CC: Josh Poimboeuf <jpoimboe@kernel.org> >> >> 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. Reviewed-by: Juergen Gross <jgross@suse.com> Juergen
On 17.05.22 18:24, Maximilian Heyne wrote: > 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"). > > Signed-off-by: Maximilian Heyne <mheyne@amazon.de> > CC: Josh Poimboeuf <jpoimboe@kernel.org> Pushed to xen/tip.git for-linus-5.19 Juergen
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 5038edb79ad5..ca85d1409917 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -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) {
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"). Signed-off-by: Maximilian Heyne <mheyne@amazon.de> CC: Josh Poimboeuf <jpoimboe@kernel.org> cr: https://code.amazon.com/reviews/CR-69645080 --- arch/x86/xen/enlighten_pv.c | 2 -- 1 file changed, 2 deletions(-)