x86: Fix XEN_DOMCTL_gdbsx_guestmemio crash
PATCH v3 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.
v3:
* Switch to int.
* Insert missing break.
* static inline for stub.
--- xen/arch/x86/domctl.c | 61 +--------------------------------- xen/arch/x86/gdbsx.c | 70 +++++++++++++++++++++++++++++++++++++++- xen/arch/x86/include/asm/gdbsx.h | 16 +++++++-- 3 files changed, 83 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 +69 -1
82 lines not on this page · raw message
xen/arch/x86/include/asm/gdbsx.h +13 -3
@@ -2,18 +2,28 @@#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 ); +int gdbsx_domctl (struct domain *d,struct xen_domctl *domctl,bool *copyback); +#else +#include <xen/errno.h> +static inline void domain_pause_for_debugger (void ) {} +static inline int 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
Quoted 4 lines · Andrew Cooper
When
CONFIG_GDBSXis 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.
Quoted 8 lines
Remove the
CONFIG_GDBSXifdefary inarch_do_domctl()by implementinggdbsx_domctl()and moving the logic across.As minor cleanup,
*gdbsx_guest_mem_io()can become static
* Remove opencoding ofdomain_vcpu()and %pdSigned-off-by Andrew Cooper <[email protected]>
Technically
Yet as mentioned before, ...
Quoted 62 lines
xen/arch/x86/domctl.c +0
-52@@ -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;
xen/arch/x86/domctl.c long arch_do_domctl( · line 883
Quoted 10 lines
xen/arch/x86/domctl.c +1
-8- v->arch.gdbsx_vcpu_event =0 ; - break; - } - } - } - copyback = true; + ret =gdbsx_domctl (d, domctl, ©back);break ; - } -#endif
... I'm not overly happy with the retaining of the case labels here (and the knock on effect it'll have for other subsystem domctl-s), so unlike usually this R-b isn't implicitly an A-b. Which doesn't matter in practice, aiui ...
Jan
Quoted 9 lines · Jan Beulich
Quoted 8 lines · Andrew Cooper
When
CONFIG_GDBSXis 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_GDBSXifdefary inarch_do_domctl()by implementinggdbsx_domctl()and moving the logic across.
Quoted 8 lines
Quoted 5 lines
As minor cleanup,
*gdbsx_guest_mem_io()can become static
* Remove opencoding ofdomain_vcpu()and %pdSigned-off-by Andrew Cooper <[email protected]>Technically
Reviewed-by Jan Beulich <[email protected]>
Thanks.
I'll tweak the commit message now that the IOMMU fix has gone in.
Quoted 79 lines
Yet as mentioned before, ...
Quoted 68 lines
xen/arch/x86/domctl.c +0
-0@@ -816,71 +816,12 @@ long arch_do_domctl( } #endif
-#ifdefCONFIG_GDBSX
caseXEN_DOMCTL_gdbsx_guestmemio:
- ret =gdbsx_guest_mem_io(d, &domctl->u.gdbsx_guest_memio); - if ( !ret )
- copyback = true;
- break;
-
caseXEN_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;
- }
-
caseXEN_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;
- }
-
caseXEN_DOMCTL_gdbsx_domstatus:
- {
- struct vcpu *v;
-
-domctl->u.gdbsx_domstatus.vcpu_id= -1;
-domctl->u.gdbsx_domstatus.paused=d->controller_pause_countQuoted 1 line
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;Quoted 8 lines
- }
- }
- }
- copyback = true;
+ ret =gdbsx_domctl(d, domctl, ©back); break;
- }
-#endif
Quoted 2 lines
... I'm not overly happy with the retaining of the case labels here (and the knock on effect it'll have for other subsystem domctl-s),
The crash in do_iommu_op() happened because things which weren't iommu subops ended up in a function only expecting iommu subops, *because* unrelated case labels got compiled out.
We've also had multiple XSAs elsewhere created by related "just chain everything through default:" patterns. The legacy MSR paths are still especially guilty of doing this.
The case labels need to never ever get compiled out, even if their subsystem has been.
So you have a choice between this patch, or a pattern of the form:
case XEN_DOMCTL_gdbsx_domstatus:
if ( !IS_ENABLED(CONFIG_GDBSX) )
{
ret = -Exxx;
break;
}
...
but the top level case labels need to stay one way or another.
For this patch, it moves a chunk of logic out of a fairly generic file into its proper subsystem file, and a few extra case labels is a very cheap price to pay.
~Andrew