x86: Fix XEN_DOMCTL_gdbsx_guestmemio crash
PATCH v2 1/1 x86: Fix XEN_DOMCTL_gdbsx_guestmemio crash
When CONFIG_GDBSX is compiled out, iommu_do_domctl() falls over a NULL pointer. One of several bugs here is known-but-compiled-out subops falling into the default chain and hitting unrelated logic.
Remove the CONFIG_GDBSX ifdefary in arch_do_domctl() by implementing gdbsx_domctl() and moving the logic across.
As minor cleanup,
* gdbsx_guest_mem_io() can become static
* Remove opencoding of domain_vcpu() and %pd
---
CC: George Dunlap <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Wei Liu <[email protected]>
CC: Julien Grall <[email protected]>
CC: Juergen Gross <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Volodymyr Babchuk <[email protected]>
CC: Bertrand Marquis <[email protected]>
v2:
* Implement the "split into new function" approach from the RFC.
--- xen/arch/x86/domctl.c | 61 +---------------------------------- xen/arch/x86/gdbsx.c | 68 +++++++++++++++++++++++++++++++++++++++- xen/arch/x86/include/asm/gdbsx.h | 15 +++++++-- 3 files changed, 80 insertions(+), 64 deletions(-)
xen/arch/x86/domctl.c +1 -60
@@ -816,71 +816,12 @@ long arch_do_domctl( }#endif -#ifdef CONFIG_GDBSX case XEN_DOMCTL_gdbsx_guestmemio: - ret =gdbsx_guest_mem_io (d, &domctl->u.gdbsx_guest_memio); -if ( !ret ) - copyback = true; -break ; -case XEN_DOMCTL_gdbsx_pausevcpu: - { -struct vcpu *v; - - ret = -EBUSY ; -if ( !d->controller_pause_count ) -break ; - ret = -EINVAL ; -if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= d->max_vcpus || - (v = d->vcpu[domctl->u.gdbsx_pauseunp_vcpu.vcpu]) ==NULL ) -break ; - ret =vcpu_pause_by_systemcontroller (v); -break ; - } -case XEN_DOMCTL_gdbsx_unpausevcpu: - { -struct vcpu *v; - - ret = -EBUSY ; -if ( !d->controller_pause_count ) -break ; - ret = -EINVAL ; -if ( domctl->u.gdbsx_pauseunp_vcpu.vcpu >= d->max_vcpus || - (v = d->vcpu[domctl->u.gdbsx_pauseunp_vcpu.vcpu]) ==NULL ) -break ; - ret =vcpu_unpause_by_systemcontroller (v); -if ( ret == -EINVAL ) -printk (XENLOG_G_WARNING -"WARN: d%d attempting to unpause %pv which is not paused\n" , - currd->domain_id, v); -break ; - } -case XEN_DOMCTL_gdbsx_domstatus: - { -struct vcpu *v; - - domctl->u.gdbsx_domstatus.vcpu_id =-1 ; - domctl->u.gdbsx_domstatus.paused = d->controller_pause_count >0 ; -if ( domctl->u.gdbsx_domstatus.paused ) - { - for_each_vcpu ( d, v ) - { -if ( v->arch.gdbsx_vcpu_event ) - { - domctl->u.gdbsx_domstatus.vcpu_id = v->vcpu_id; - domctl->u.gdbsx_domstatus.vcpu_ev = - v->arch.gdbsx_vcpu_event; - v->arch.gdbsx_vcpu_event =0 ; -break ; - } - } - } - copyback = true; + ret =gdbsx_domctl (d, domctl, ©back);break ; - } -#endif case XEN_DOMCTL_setvcpuextstate:case XEN_DOMCTL_getvcpuextstate:
xen/arch/x86/gdbsx.c +67 -1
80 lines not on this page · raw message
xen/arch/x86/include/asm/gdbsx.h +12 -3
@@ -2,18 +2,27 @@#ifndef __X86_GDBX_H__#define __X86_GDBX_H__ -#ifdef CONFIG_GDBSX +#include <xen/stdbool.h> struct domain ; -struct xen_domctl_gdbsx_memio ; +struct xen_domctl ; -int gdbsx_guest_mem_io (struct domain *d,struct xen_domctl_gdbsx_memio *iop); +#ifdef CONFIG_GDBSX void domain_pause_for_debugger (void ); +long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback); +#else +#include <xen/errno.h> +static inline void domain_pause_for_debugger (void ) {} +long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback) +{ +return -ENOSYS ; +} +#endif /* CONFIG_GDBSX */ #endif /* __X86_GDBX_H__ */
Signature · 1 line
2.11.0
xen/arch/x86/gdbsx.c void domain_pause_for_debugger(void) · line 182
Quoted 5 lines · Andrew Cooper
xen/arch/x86/gdbsx.c +1
-0@@ -178,6 +179,71 @@ void domain_pause_for_debugger(void)send_global_virq (VIRQ_DEBUGGER ); } +long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback)
Is there anything that requires "long" (and not just "int") here and ...
xen/arch/x86/gdbsx.c void domain_pause_for_debugger(void) · line 185
Quoted 3 lines
xen/arch/x86/gdbsx.c +3
-0+{ +struct vcpu *v; +long ret =0 ;
... here?
Quoted 46 lines
xen/arch/x86/gdbsx.c +46
-0+switch ( domctl->cmd ) + { +case XEN_DOMCTL_gdbsx_guestmemio: + ret =gdbsx_guest_mem_io (d, &domctl->u.gdbsx_guest_memio); +if ( !ret ) + *copyback = true; +break ; + +case XEN_DOMCTL_gdbsx_pausevcpu: + ret = -EBUSY ; +if ( !d->controller_pause_count ) +break ; + ret = -EINVAL ; +if ( (v =domain_vcpu (d, domctl->u.gdbsx_pauseunp_vcpu.vcpu)) ==NULL ) +break ; + ret =vcpu_pause_by_systemcontroller (v); +break ; + +case XEN_DOMCTL_gdbsx_unpausevcpu: + ret = -EBUSY ; +if ( !d->controller_pause_count ) +break ; + ret = -EINVAL ; +if ( (v =domain_vcpu (d, domctl->u.gdbsx_pauseunp_vcpu.vcpu)) ==NULL ) +break ; + ret =vcpu_unpause_by_systemcontroller (v); +if ( ret == -EINVAL ) +printk (XENLOG_G_WARNING +"WARN: %pd attempting to unpause %pv which is not paused\n" , + current->domain, v); +break ; + +case XEN_DOMCTL_gdbsx_domstatus: + domctl->u.gdbsx_domstatus.vcpu_id =-1 ; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count >0 ; +if ( domctl->u.gdbsx_domstatus.paused ) + { + for_each_vcpu ( d, v ) + { +if ( v->arch.gdbsx_vcpu_event ) + { + domctl->u.gdbsx_domstatus.vcpu_id = v->vcpu_id; + domctl->u.gdbsx_domstatus.vcpu_ev = + v->arch.gdbsx_vcpu_event; + v->arch.gdbsx_vcpu_event =0 ; +break ;
xen/arch/x86/gdbsx.c void domain_pause_for_debugger(void) · line 242
Quoted 10 lines
xen/arch/x86/gdbsx.c +10
-0+ } + } + } + *copyback = true; +break ; + +default : +ASSERT_UNREACHABLE (); + ret = -ENOSYS ; + }
Just as a remark: It's never really clear to me whether we actually want to permit omitting "break" in cases like this one. It always feels slightly risky towards someone subsequently adding another case label below here without adding the suddenly necessary "break". While for sentinel code like this doing so may be okay, it would seem to me that we might be better off not allowing omission of "break" anywhere.
Quoted 17 lines
xen/arch/x86/include/asm/gdbsx.h +3
-3@@ -2,18 +2,27 @@#ifndef __X86_GDBX_H__#define __X86_GDBX_H__ -#ifdef CONFIG_GDBSX +#include <xen/stdbool.h> struct domain ; -struct xen_domctl_gdbsx_memio ; +struct xen_domctl ; -int gdbsx_guest_mem_io (struct domain *d,struct xen_domctl_gdbsx_memio *iop); +#ifdef CONFIG_GDBSX void domain_pause_for_debugger (void );
xen/arch/x86/include/asm/gdbsx.h line 22
Quoted 10 lines
xen/arch/x86/include/asm/gdbsx.h +5
-0+long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback); +#else +#include <xen/errno.h> +static inline void domain_pause_for_debugger (void ) {} +long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback)
static inline?
Jan
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Andrew Cooper
xen/arch/x86/gdbsx.c +0
-0@@ -178,6 +179,71 @@ void domain_pause_for_debugger(void)send_global_virq (VIRQ_DEBUGGER ); }
Quoted 7 lines
Review void domain_pause_for_debugger(void) · line 182
Quoted 1 line
(quoted diff) +1
-0+long gdbsx_domctl(struct domain *d, struct xen_domctl *domctl, bool *copyback)Is there anything that requires "long" (and not just "int") here and ...
xen/arch/x86/gdbsx.c void domain_pause_for_debugger(void) · line 185
Quoted 3 lines
xen/arch/x86/gdbsx.c +3
-0+{ +struct vcpu *v; +long ret =0 ;... here?
Consistency with its caller.
Although I can't actually see a good reason for arch_do_domctl() to use long's either, and that would at least mean we've only got one place doing extension of ret.
Quoted 51 lines
Quoted 51 lines
xen/arch/x86/gdbsx.c +50
-0+switch ( domctl->cmd ) + { +case XEN_DOMCTL_gdbsx_guestmemio: + ret =gdbsx_guest_mem_io (d, &domctl->u.gdbsx_guest_memio); +if ( !ret ) + *copyback = true; +break ; + +case XEN_DOMCTL_gdbsx_pausevcpu: + ret = -EBUSY ; +if ( !d->controller_pause_count ) +break ; + ret = -EINVAL ; +if ( (v =domain_vcpu (d, domctl->u.gdbsx_pauseunp_vcpu.vcpu)) ==NULL ) +break ; + ret =vcpu_pause_by_systemcontroller (v); +break ; + +case XEN_DOMCTL_gdbsx_unpausevcpu: + ret = -EBUSY ; +if ( !d->controller_pause_count ) +break ; + ret = -EINVAL ; +if ( (v =domain_vcpu (d, domctl->u.gdbsx_pauseunp_vcpu.vcpu)) ==NULL ) +break ; + ret =vcpu_unpause_by_systemcontroller (v); +if ( ret == -EINVAL ) +printk (XENLOG_G_WARNING +"WARN: %pd attempting to unpause %pv which is not paused\n" , + current->domain, v); +break ; + +case XEN_DOMCTL_gdbsx_domstatus: + domctl->u.gdbsx_domstatus.vcpu_id =-1 ; + domctl->u.gdbsx_domstatus.paused = d->controller_pause_count >0 ; +if ( domctl->u.gdbsx_domstatus.paused ) + { + for_each_vcpu ( d, v ) + { +if ( v->arch.gdbsx_vcpu_event ) + { + domctl->u.gdbsx_domstatus.vcpu_id = v->vcpu_id; + domctl->u.gdbsx_domstatus.vcpu_ev = + v->arch.gdbsx_vcpu_event; + v->arch.gdbsx_vcpu_event =0 ; +break ; + } + } + } + *copyback = true;
Quoted 8 lines
xen/arch/x86/gdbsx.c void domain_pause_for_debugger(void) · line 242
Quoted 6 lines
xen/arch/x86/gdbsx.c +6
-0+break ; + +default : +ASSERT_UNREACHABLE (); + ret = -ENOSYS ; + }Just as a remark: It's never really clear to me whether we actually want to permit omitting "break" in cases like this one.
That was an oversight. I'd intended to include one.
Quoted 22 lines
Quoted 22 lines
xen/arch/x86/include/asm/gdbsx.h +5
-3@@ -2,18 +2,27 @@#ifndef __X86_GDBX_H__#define __X86_GDBX_H__ -#ifdef CONFIG_GDBSX +#include <xen/stdbool.h> struct domain ; -struct xen_domctl_gdbsx_memio ; +struct xen_domctl ; -int gdbsx_guest_mem_io (struct domain *d,struct xen_domctl_gdbsx_memio *iop); +#ifdef CONFIG_GDBSX void domain_pause_for_debugger (void ); +long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback); +#else
Quoted 6 lines
xen/arch/x86/include/asm/gdbsx.h line 22
Quoted 5 lines
xen/arch/x86/include/asm/gdbsx.h +3
-0+#include <xen/errno.h> +static inline void domain_pause_for_debugger (void ) {} +long gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback)static inline?
Oops yes. I clearly need more coffee.
~Andrew