* [PATCH] x86,kvm/xen: Remove superfluous .fixup usage
@ 2022-01-23 12:42 Peter Zijlstra
2022-01-24 13:53 ` Paolo Bonzini
2022-01-27 9:40 ` [EXTERNAL] " David Woodhouse
0 siblings, 2 replies; 3+ messages in thread
From: Peter Zijlstra @ 2022-01-23 12:42 UTC (permalink / raw)
To: x86; +Cc: dwmw, pbonzini, linux-kernel
Commit 14243b387137 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and
event channel delivery") adds superfluous .fixup usage after the whole
.fixup section was removed in commit e5eefda5aa51 ("x86: Remove .fixup
section").
Fixes: 14243b387137 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and event channel delivery")
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/kvm/xen.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index 0e3f7d6e9fd7..bad57535fad0 100644
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -316,10 +316,7 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v)
"\tnotq %0\n"
"\t" LOCK_PREFIX "andq %0, %2\n"
"2:\n"
- "\t.section .fixup,\"ax\"\n"
- "3:\tjmp\t2b\n"
- "\t.previous\n"
- _ASM_EXTABLE_UA(1b, 3b)
+ _ASM_EXTABLE_UA(1b, 2b)
: "=r" (evtchn_pending_sel),
"+m" (vi->evtchn_pending_sel),
"+m" (v->arch.xen.evtchn_pending_sel)
@@ -335,10 +332,7 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v)
"\tnotl %0\n"
"\t" LOCK_PREFIX "andl %0, %2\n"
"2:\n"
- "\t.section .fixup,\"ax\"\n"
- "3:\tjmp\t2b\n"
- "\t.previous\n"
- _ASM_EXTABLE_UA(1b, 3b)
+ _ASM_EXTABLE_UA(1b, 2b)
: "=r" (evtchn_pending_sel32),
"+m" (vi->evtchn_pending_sel),
"+m" (v->arch.xen.evtchn_pending_sel)
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] x86,kvm/xen: Remove superfluous .fixup usage
2022-01-23 12:42 [PATCH] x86,kvm/xen: Remove superfluous .fixup usage Peter Zijlstra
@ 2022-01-24 13:53 ` Paolo Bonzini
2022-01-27 9:40 ` [EXTERNAL] " David Woodhouse
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2022-01-24 13:53 UTC (permalink / raw)
To: Peter Zijlstra, x86; +Cc: dwmw, linux-kernel
On 1/23/22 13:42, Peter Zijlstra wrote:
>
> Commit 14243b387137 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and
> event channel delivery") adds superfluous .fixup usage after the whole
> .fixup section was removed in commit e5eefda5aa51 ("x86: Remove .fixup
> section").
>
> Fixes: 14243b387137 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and event channel delivery")
> Reported-by: Borislav Petkov <bp@alien8.de>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> ---
> arch/x86/kvm/xen.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
> index 0e3f7d6e9fd7..bad57535fad0 100644
> --- a/arch/x86/kvm/xen.c
> +++ b/arch/x86/kvm/xen.c
> @@ -316,10 +316,7 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v)
> "\tnotq %0\n"
> "\t" LOCK_PREFIX "andq %0, %2\n"
> "2:\n"
> - "\t.section .fixup,\"ax\"\n"
> - "3:\tjmp\t2b\n"
> - "\t.previous\n"
> - _ASM_EXTABLE_UA(1b, 3b)
> + _ASM_EXTABLE_UA(1b, 2b)
> : "=r" (evtchn_pending_sel),
> "+m" (vi->evtchn_pending_sel),
> "+m" (v->arch.xen.evtchn_pending_sel)
> @@ -335,10 +332,7 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v)
> "\tnotl %0\n"
> "\t" LOCK_PREFIX "andl %0, %2\n"
> "2:\n"
> - "\t.section .fixup,\"ax\"\n"
> - "3:\tjmp\t2b\n"
> - "\t.previous\n"
> - _ASM_EXTABLE_UA(1b, 3b)
> + _ASM_EXTABLE_UA(1b, 2b)
> : "=r" (evtchn_pending_sel32),
> "+m" (vi->evtchn_pending_sel),
> "+m" (v->arch.xen.evtchn_pending_sel)
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [EXTERNAL] [PATCH] x86,kvm/xen: Remove superfluous .fixup usage
2022-01-23 12:42 [PATCH] x86,kvm/xen: Remove superfluous .fixup usage Peter Zijlstra
2022-01-24 13:53 ` Paolo Bonzini
@ 2022-01-27 9:40 ` David Woodhouse
1 sibling, 0 replies; 3+ messages in thread
From: David Woodhouse @ 2022-01-27 9:40 UTC (permalink / raw)
To: Peter Zijlstra, x86; +Cc: pbonzini, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
On Sun, 2022-01-23 at 13:42 +0100, Peter Zijlstra wrote:
> Commit 14243b387137 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and
> event channel delivery") adds superfluous .fixup usage after the whole
> .fixup section was removed in commit e5eefda5aa51 ("x86: Remove .fixup
> section").
>
> Fixes: 14243b387137 ("KVM: x86/xen: Add KVM_IRQ_ROUTING_XEN_EVTCHN and event channel delivery")
> Reported-by: Borislav Petkov <bp@alien8.de>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: David Woodhouse <dwmw@amazon.co.uk>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Thanks.
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-27 9:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-23 12:42 [PATCH] x86,kvm/xen: Remove superfluous .fixup usage Peter Zijlstra
2022-01-24 13:53 ` Paolo Bonzini
2022-01-27 9:40 ` [EXTERNAL] " David Woodhouse
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.