* [PATCH] xenpv: don't BUG when failing to setup NMI callback
@ 2014-06-13 11:26 Vitaly Kuznetsov
2014-06-13 12:45 ` Konrad Rzeszutek Wilk
2014-06-13 13:32 ` David Vrabel
0 siblings, 2 replies; 5+ messages in thread
From: Vitaly Kuznetsov @ 2014-06-13 11:26 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk, Boris Ostrovsky, David Vrabel
Cc: x86, xen-devel, linux-kernel, Andrew Jones
some old Xen hypervisors (prior to 3.2) forbid DomUs to register
NMI callbacks. E.g. we have the following code in xen-3.1:
if ( (d->domain_id != 0) || (v->vcpu_id != 0) )
return -EINVAL;
Commit 6efa20e49b9cb1db1ab66870cc37323474a75a13 introduced kernel
crash in case PV guest fails to register NMI callback. All x86_64
PV guests will fail to boot on top of such hypervisors (RHEL5
example):
(XEN) traps.c:405:d7 Unhandled invalid opcode fault/trap [#6] in domain 7 on VCPU 0 [ec=0000]
(XEN) domain_crash_sync called from entry.S
(XEN) Domain 7 (vcpu#0) crashed on cpu#3:
(XEN) ----[ Xen-3.1.2-389.el5 x86_64 debug=n Not tainted ]----
(XEN) CPU: 3
(XEN) RIP: e033:[<ffffffff81004d96>]
(XEN) RFLAGS: 0000000000000282 CONTEXT: guest
(XEN) rax: ffffffffffffffea rbx: 0000000000000000 rcx: 0000000000000002
(XEN) rdx: 0000000000000001 rsi: ffffffff81b0fe28 rdi: 0000000000000000
(XEN) rbp: ffffffff81b0fe40 rsp: ffffffff81b0fde8 r8: 0000000000000000
(XEN) r9: ffffffff81b0fdd0 r10: 0000000000007ff0 r11: 00000000ffffffff
(XEN) r12: ffffffff81d65900 r13: 0000000000000000 r14: 0000000000000000
(XEN) r15: 0000000000000000 cr0: 0000000080050033 cr4: 00000000000026b0
(XEN) cr3: 000000013a263000 cr2: 0000000000000000
(XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e02b cs: e033
...
However it is possible to proceed without NMI callback registered.
Change BUG() with warning in case of -EINVAL.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
arch/x86/xen/setup.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 821a11a..5b8b180 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -593,8 +593,17 @@ void xen_enable_syscall(void)
void xen_enable_nmi(void)
{
#ifdef CONFIG_X86_64
- if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
+ int ret;
+
+ ret = register_callback(CALLBACKTYPE_nmi, (char *)nmi);
+ if (ret == -EINVAL) {
+ /* Hypervisor probably forbids us to register NMI callback,
+ that is expected when running on top of Xen-3.1 and older */
+ pr_warn("xen: failed to register NMI callback\n");
+ } else if (ret != 0) {
+ /* Other hypervisor failure */
BUG();
+ }
#endif
}
void __init xen_pvmmu_arch_setup(void)
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] xenpv: don't BUG when failing to setup NMI callback
2014-06-13 11:26 [PATCH] xenpv: don't BUG when failing to setup NMI callback Vitaly Kuznetsov
@ 2014-06-13 12:45 ` Konrad Rzeszutek Wilk
2014-06-13 13:14 ` Vitaly Kuznetsov
2014-06-13 13:31 ` Boris Ostrovsky
2014-06-13 13:32 ` David Vrabel
1 sibling, 2 replies; 5+ messages in thread
From: Konrad Rzeszutek Wilk @ 2014-06-13 12:45 UTC (permalink / raw)
To: Vitaly Kuznetsov
Cc: Boris Ostrovsky, David Vrabel, x86, xen-devel, linux-kernel,
Andrew Jones
On Fri, Jun 13, 2014 at 01:26:28PM +0200, Vitaly Kuznetsov wrote:
> some old Xen hypervisors (prior to 3.2) forbid DomUs to register
> NMI callbacks. E.g. we have the following code in xen-3.1:
>
> if ( (d->domain_id != 0) || (v->vcpu_id != 0) )
> return -EINVAL;
>
> Commit 6efa20e49b9cb1db1ab66870cc37323474a75a13 introduced kernel
> crash in case PV guest fails to register NMI callback. All x86_64
> PV guests will fail to boot on top of such hypervisors (RHEL5
> example):
>
> (XEN) traps.c:405:d7 Unhandled invalid opcode fault/trap [#6] in domain 7 on VCPU 0 [ec=0000]
> (XEN) domain_crash_sync called from entry.S
> (XEN) Domain 7 (vcpu#0) crashed on cpu#3:
> (XEN) ----[ Xen-3.1.2-389.el5 x86_64 debug=n Not tainted ]----
> (XEN) CPU: 3
> (XEN) RIP: e033:[<ffffffff81004d96>]
> (XEN) RFLAGS: 0000000000000282 CONTEXT: guest
> (XEN) rax: ffffffffffffffea rbx: 0000000000000000 rcx: 0000000000000002
> (XEN) rdx: 0000000000000001 rsi: ffffffff81b0fe28 rdi: 0000000000000000
> (XEN) rbp: ffffffff81b0fe40 rsp: ffffffff81b0fde8 r8: 0000000000000000
> (XEN) r9: ffffffff81b0fdd0 r10: 0000000000007ff0 r11: 00000000ffffffff
> (XEN) r12: ffffffff81d65900 r13: 0000000000000000 r14: 0000000000000000
> (XEN) r15: 0000000000000000 cr0: 0000000080050033 cr4: 00000000000026b0
> (XEN) cr3: 000000013a263000 cr2: 0000000000000000
> (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e02b cs: e033
> ...
>
> However it is possible to proceed without NMI callback registered.
> Change BUG() with warning in case of -EINVAL.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Oh, we had a similar patch - somebody reported it earlier - and we
just checked the version of Xen:
http://lists.xenproject.org/archives/html/xen-devel/2014-05/msg01474.html
But I can't remember why I didn't post it.
However I do like your path of checking the 'ret'.
Vitaly, could expand your patch to also do a check in cvt_gate_to_trap
so that it won't enable the NMI handler and then lets pick your
patch?
> ---
> arch/x86/xen/setup.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
> index 821a11a..5b8b180 100644
> --- a/arch/x86/xen/setup.c
> +++ b/arch/x86/xen/setup.c
> @@ -593,8 +593,17 @@ void xen_enable_syscall(void)
> void xen_enable_nmi(void)
> {
> #ifdef CONFIG_X86_64
> - if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
> + int ret;
> +
> + ret = register_callback(CALLBACKTYPE_nmi, (char *)nmi);
> + if (ret == -EINVAL) {
> + /* Hypervisor probably forbids us to register NMI callback,
> + that is expected when running on top of Xen-3.1 and older */
> + pr_warn("xen: failed to register NMI callback\n");
> + } else if (ret != 0) {
> + /* Other hypervisor failure */
> BUG();
> + }
> #endif
> }
> void __init xen_pvmmu_arch_setup(void)
> --
> 1.9.3
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] xenpv: don't BUG when failing to setup NMI callback
2014-06-13 12:45 ` Konrad Rzeszutek Wilk
@ 2014-06-13 13:14 ` Vitaly Kuznetsov
2014-06-13 13:31 ` Boris Ostrovsky
1 sibling, 0 replies; 5+ messages in thread
From: Vitaly Kuznetsov @ 2014-06-13 13:14 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Boris Ostrovsky, David Vrabel, x86, xen-devel, linux-kernel,
Andrew Jones
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> writes:
> On Fri, Jun 13, 2014 at 01:26:28PM +0200, Vitaly Kuznetsov wrote:
>> some old Xen hypervisors (prior to 3.2) forbid DomUs to register
>> NMI callbacks. E.g. we have the following code in xen-3.1:
>>
>> if ( (d->domain_id != 0) || (v->vcpu_id != 0) )
>> return -EINVAL;
>>
>> Commit 6efa20e49b9cb1db1ab66870cc37323474a75a13 introduced kernel
>> crash in case PV guest fails to register NMI callback. All x86_64
>> PV guests will fail to boot on top of such hypervisors (RHEL5
>> example):
>>
>> (XEN) traps.c:405:d7 Unhandled invalid opcode fault/trap [#6] in domain 7 on VCPU 0 [ec=0000]
>> (XEN) domain_crash_sync called from entry.S
>> (XEN) Domain 7 (vcpu#0) crashed on cpu#3:
>> (XEN) ----[ Xen-3.1.2-389.el5 x86_64 debug=n Not tainted ]----
>> (XEN) CPU: 3
>> (XEN) RIP: e033:[<ffffffff81004d96>]
>> (XEN) RFLAGS: 0000000000000282 CONTEXT: guest
>> (XEN) rax: ffffffffffffffea rbx: 0000000000000000 rcx: 0000000000000002
>> (XEN) rdx: 0000000000000001 rsi: ffffffff81b0fe28 rdi: 0000000000000000
>> (XEN) rbp: ffffffff81b0fe40 rsp: ffffffff81b0fde8 r8: 0000000000000000
>> (XEN) r9: ffffffff81b0fdd0 r10: 0000000000007ff0 r11: 00000000ffffffff
>> (XEN) r12: ffffffff81d65900 r13: 0000000000000000 r14: 0000000000000000
>> (XEN) r15: 0000000000000000 cr0: 0000000080050033 cr4: 00000000000026b0
>> (XEN) cr3: 000000013a263000 cr2: 0000000000000000
>> (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e02b cs: e033
>> ...
>>
>> However it is possible to proceed without NMI callback registered.
>> Change BUG() with warning in case of -EINVAL.
>>
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>
> Oh, we had a similar patch - somebody reported it earlier - and we
> just checked the version of Xen:
>
> http://lists.xenproject.org/archives/html/xen-devel/2014-05/msg01474.html
>
> But I can't remember why I didn't post it.
>
> However I do like your path of checking the 'ret'.
>
> Vitaly, could expand your patch to also do a check in cvt_gate_to_trap
> so that it won't enable the NMI handler and then lets pick your
> patch?
Sure,
I also suggest we lower the required xen version to 3.2 instead of 4.0
as 3.2 has the following:
commit a2308fa704a40f23916a176d9e06bbc0e3469caf
Author: Keir Fraser <keir@xensource.com>
Date: Mon Oct 22 13:04:32 2007 +0100
x86: Allow NMI callback CS to be specified via set_trap_table()
hypercall.
Based on a patch by Jan Beulich.
Signed-off-by: Keir Fraser <keir@xensource.com>
I'll update my patch and re-send it.
>
>> ---
>> arch/x86/xen/setup.c | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
>> index 821a11a..5b8b180 100644
>> --- a/arch/x86/xen/setup.c
>> +++ b/arch/x86/xen/setup.c
>> @@ -593,8 +593,17 @@ void xen_enable_syscall(void)
>> void xen_enable_nmi(void)
>> {
>> #ifdef CONFIG_X86_64
>> - if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
>> + int ret;
>> +
>> + ret = register_callback(CALLBACKTYPE_nmi, (char *)nmi);
>> + if (ret == -EINVAL) {
>> + /* Hypervisor probably forbids us to register NMI callback,
>> + that is expected when running on top of Xen-3.1 and older */
>> + pr_warn("xen: failed to register NMI callback\n");
>> + } else if (ret != 0) {
>> + /* Other hypervisor failure */
>> BUG();
>> + }
>> #endif
>> }
>> void __init xen_pvmmu_arch_setup(void)
>> --
>> 1.9.3
>>
--
Vitaly
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] xenpv: don't BUG when failing to setup NMI callback
2014-06-13 12:45 ` Konrad Rzeszutek Wilk
2014-06-13 13:14 ` Vitaly Kuznetsov
@ 2014-06-13 13:31 ` Boris Ostrovsky
1 sibling, 0 replies; 5+ messages in thread
From: Boris Ostrovsky @ 2014-06-13 13:31 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Vitaly Kuznetsov, David Vrabel, x86, xen-devel, linux-kernel,
Andrew Jones
On 06/13/2014 08:45 AM, Konrad Rzeszutek Wilk wrote:
> On Fri, Jun 13, 2014 at 01:26:28PM +0200, Vitaly Kuznetsov wrote:
>> some old Xen hypervisors (prior to 3.2) forbid DomUs to register
>> NMI callbacks. E.g. we have the following code in xen-3.1:
>>
>> if ( (d->domain_id != 0) || (v->vcpu_id != 0) )
>> return -EINVAL;
>>
>> Commit 6efa20e49b9cb1db1ab66870cc37323474a75a13 introduced kernel
>> crash in case PV guest fails to register NMI callback. All x86_64
>> PV guests will fail to boot on top of such hypervisors (RHEL5
>> example):
>>
>> (XEN) traps.c:405:d7 Unhandled invalid opcode fault/trap [#6] in domain 7 on VCPU 0 [ec=0000]
>> (XEN) domain_crash_sync called from entry.S
>> (XEN) Domain 7 (vcpu#0) crashed on cpu#3:
>> (XEN) ----[ Xen-3.1.2-389.el5 x86_64 debug=n Not tainted ]----
>> (XEN) CPU: 3
>> (XEN) RIP: e033:[<ffffffff81004d96>]
>> (XEN) RFLAGS: 0000000000000282 CONTEXT: guest
>> (XEN) rax: ffffffffffffffea rbx: 0000000000000000 rcx: 0000000000000002
>> (XEN) rdx: 0000000000000001 rsi: ffffffff81b0fe28 rdi: 0000000000000000
>> (XEN) rbp: ffffffff81b0fe40 rsp: ffffffff81b0fde8 r8: 0000000000000000
>> (XEN) r9: ffffffff81b0fdd0 r10: 0000000000007ff0 r11: 00000000ffffffff
>> (XEN) r12: ffffffff81d65900 r13: 0000000000000000 r14: 0000000000000000
>> (XEN) r15: 0000000000000000 cr0: 0000000080050033 cr4: 00000000000026b0
>> (XEN) cr3: 000000013a263000 cr2: 0000000000000000
>> (XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e02b cs: e033
>> ...
>>
>> However it is possible to proceed without NMI callback registered.
>> Change BUG() with warning in case of -EINVAL.
>>
>> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> Oh, we had a similar patch - somebody reported it earlier - and we
> just checked the version of Xen:
>
> http://lists.xenproject.org/archives/html/xen-devel/2014-05/msg01474.html
>
> But I can't remember why I didn't post it.
>
> However I do like your path of checking the 'ret'.
Should we be checking both ret and version? NMI callback registration
can return -EINVAL for other reasons (non-canonical address, for example).
-boris
>
> Vitaly, could expand your patch to also do a check in cvt_gate_to_trap
> so that it won't enable the NMI handler and then lets pick your
> patch?
>
>> ---
>> arch/x86/xen/setup.c | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
>> index 821a11a..5b8b180 100644
>> --- a/arch/x86/xen/setup.c
>> +++ b/arch/x86/xen/setup.c
>> @@ -593,8 +593,17 @@ void xen_enable_syscall(void)
>> void xen_enable_nmi(void)
>> {
>> #ifdef CONFIG_X86_64
>> - if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
>> + int ret;
>> +
>> + ret = register_callback(CALLBACKTYPE_nmi, (char *)nmi);
>> + if (ret == -EINVAL) {
>> + /* Hypervisor probably forbids us to register NMI callback,
>> + that is expected when running on top of Xen-3.1 and older */
>> + pr_warn("xen: failed to register NMI callback\n");
>> + } else if (ret != 0) {
>> + /* Other hypervisor failure */
>> BUG();
>> + }
>> #endif
>> }
>> void __init xen_pvmmu_arch_setup(void)
>> --
>> 1.9.3
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xenpv: don't BUG when failing to setup NMI callback
2014-06-13 11:26 [PATCH] xenpv: don't BUG when failing to setup NMI callback Vitaly Kuznetsov
2014-06-13 12:45 ` Konrad Rzeszutek Wilk
@ 2014-06-13 13:32 ` David Vrabel
1 sibling, 0 replies; 5+ messages in thread
From: David Vrabel @ 2014-06-13 13:32 UTC (permalink / raw)
To: Vitaly Kuznetsov, Konrad Rzeszutek Wilk, Boris Ostrovsky
Cc: x86, xen-devel, linux-kernel, Andrew Jones
On 13/06/14 12:26, Vitaly Kuznetsov wrote:
>
> --- a/arch/x86/xen/setup.c
> +++ b/arch/x86/xen/setup.c
> @@ -593,8 +593,17 @@ void xen_enable_syscall(void)
> void xen_enable_nmi(void)
> {
> #ifdef CONFIG_X86_64
> - if (register_callback(CALLBACKTYPE_nmi, (char *)nmi))
> + int ret;
> +
> + ret = register_callback(CALLBACKTYPE_nmi, (char *)nmi);
> + if (ret == -EINVAL) {
> + /* Hypervisor probably forbids us to register NMI callback,
> + that is expected when running on top of Xen-3.1 and older */
> + pr_warn("xen: failed to register NMI callback\n");
> + } else if (ret != 0) {
> + /* Other hypervisor failure */
> BUG();
I don't think we ever want to BUG() if this hypercall fails. Just print
a warning.
David
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-13 13:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-13 11:26 [PATCH] xenpv: don't BUG when failing to setup NMI callback Vitaly Kuznetsov
2014-06-13 12:45 ` Konrad Rzeszutek Wilk
2014-06-13 13:14 ` Vitaly Kuznetsov
2014-06-13 13:31 ` Boris Ostrovsky
2014-06-13 13:32 ` David Vrabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox