* [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid
@ 2022-05-17 16:24 ` Maximilian Heyne
0 siblings, 0 replies; 5+ messages in thread
From: Maximilian Heyne @ 2022-05-17 16:24 UTC (permalink / raw)
Cc: Maximilian Heyne, Josh Poimboeuf, Boris Ostrovsky, Juergen Gross,
Stefano Stabellini, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin, xen-devel,
linux-kernel
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(-)
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)
{
--
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid
@ 2022-05-17 16:24 ` Maximilian Heyne
0 siblings, 0 replies; 5+ messages in thread
From: Maximilian Heyne @ 2022-05-17 16:24 UTC (permalink / raw)
Cc: Maximilian Heyne, Josh Poimboeuf, Boris Ostrovsky, Juergen Gross,
Stefano Stabellini, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin, xen-devel,
linux-kernel
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(-)
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)
{
--
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid
2022-05-17 16:24 ` Maximilian Heyne
(?)
@ 2022-05-17 16:42 ` Josh Poimboeuf
2022-05-18 6:51 ` Juergen Gross
-1 siblings, 1 reply; 5+ messages in thread
From: Josh Poimboeuf @ 2022-05-17 16:42 UTC (permalink / raw)
To: Maximilian Heyne
Cc: Boris Ostrovsky, Juergen Gross, Stefano Stabellini,
Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, xen-devel, linux-kernel
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>
--
Josh
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid
2022-05-17 16:42 ` Josh Poimboeuf
@ 2022-05-18 6:51 ` Juergen Gross
0 siblings, 0 replies; 5+ messages in thread
From: Juergen Gross @ 2022-05-18 6:51 UTC (permalink / raw)
To: Josh Poimboeuf, Maximilian Heyne
Cc: Boris Ostrovsky, Stefano Stabellini, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
xen-devel, linux-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 912 bytes --]
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
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 491 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid
2022-05-17 16:24 ` Maximilian Heyne
(?)
(?)
@ 2022-05-22 11:08 ` Juergen Gross
-1 siblings, 0 replies; 5+ messages in thread
From: Juergen Gross @ 2022-05-22 11:08 UTC (permalink / raw)
To: Maximilian Heyne
Cc: Josh Poimboeuf, Boris Ostrovsky, Stefano Stabellini,
Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86,
H. Peter Anvin, xen-devel, linux-kernel
[-- Attachment #1.1.1: Type: text/plain, Size: 621 bytes --]
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
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-22 11:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-17 16:24 [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid Maximilian Heyne
2022-05-17 16:24 ` Maximilian Heyne
2022-05-17 16:42 ` Josh Poimboeuf
2022-05-18 6:51 ` Juergen Gross
2022-05-22 11:08 ` Juergen Gross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.