| Message ID | 20240122181714.1543738-2-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/entry: ELF fixes and improvments | expand |
On 22.01.2024 19:17, Andrew Cooper wrote: > handle_ist_exception isn't part of the NMI handler, just like handle_exception > isn't part of #PF. > > Fixes: b3a9037550df ("x86: annotate entry points with type and size") > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> It's a matter of consistency, yes, but personally I wouldn't consider this a bug (and hence I see no reason for Fixes:). But I can see how different perspectives here are possible. One this went in, I'll have to remember to also deal with this case in "common: honor CONFIG_CC_SPLIT_SECTIONS also for assembly functions". Jan
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 482c91d4f533..c3f6b667a72a 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -1023,7 +1023,9 @@ FUNC(entry_NMI) ENDBR64 pushq $0 movl $X86_EXC_NMI, 4(%rsp) -handle_ist_exception: +END(entry_NMI) + +FUNC(handle_ist_exception) ALTERNATIVE "", clac, X86_FEATURE_XEN_SMAP SAVE_ALL @@ -1150,7 +1152,7 @@ handle_ist_exception: ASSERT_CONTEXT_IS_XEN jmp restore_all_xen #endif -END(entry_NMI) +END(handle_ist_exception) FUNC(entry_MC) ENDBR64
handle_ist_exception isn't part of the NMI handler, just like handle_exception isn't part of #PF. Fixes: b3a9037550df ("x86: annotate entry points with type and size") Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Wei Liu <wl@xen.org> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> CC: Ross Lagerwall <ross.lagerwall@citrix.com> --- xen/arch/x86/x86_64/entry.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)