mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
domctl: handle XEN_DOMCTL_get_device_group without acquiring domctl lock
iommu_get_device_group() uses its own locking. Thus, with caller side
locking irrelevant, it can as well be called with the domctl lock not
held.
Move the handling not only ahead of acquiring the lock, but also ahead
of the XSM check, leveraging that the sub-op has its own hook.
This is part of XSA-492.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
(cherry picked from commit 471b377747)
This commit is contained in:
Jan Beulich authored and Andrew Cooper committed
1 parent
4aa3ccc4f9
commit
9609fecb5b
4 files changed
+9
-5
No files matched your search
+4
-1
@@ -527,6 +527,10 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
|
||||
/* Other sub-ops handled further down. */
|
||||
break;
|
||||
|
||||
case XEN_DOMCTL_get_device_group:
|
||||
ret = iommu_do_domctl(op, d, u_domctl);
|
||||
goto domctl_out_unlock_domonly;
|
||||
|
||||
case XEN_DOMCTL_ioport_permission:
|
||||
case XEN_DOMCTL_ioport_mapping:
|
||||
case XEN_DOMCTL_bind_pt_irq:
|
||||
@@ -949,7 +953,6 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
|
||||
case XEN_DOMCTL_assign_device:
|
||||
case XEN_DOMCTL_test_assign_device:
|
||||
case XEN_DOMCTL_deassign_device:
|
||||
case XEN_DOMCTL_get_device_group:
|
||||
ret = iommu_do_domctl(op, d, u_domctl);
|
||||
break;
|
||||
|
||||
|
||||
@@ -1513,7 +1513,7 @@ static int iommu_get_device_group(
|
||||
if ( (pdev->seg != seg) || ((b == bus) && (df == devfn)) )
|
||||
continue;
|
||||
|
||||
if ( xsm_get_device_group(XSM_HOOK, (seg << 16) | (b << 8) | df) )
|
||||
if ( xsm_get_device_group(XSM_PRIV, (seg << 16) | (b << 8) | df) )
|
||||
continue;
|
||||
|
||||
sdev_id = iommu_call(ops, get_device_group_id, seg, b, df);
|
||||
@@ -1583,7 +1583,7 @@ int iommu_do_pci_domctl(
|
||||
u32 max_sdevs;
|
||||
XEN_GUEST_HANDLE_64(uint32) sdevs;
|
||||
|
||||
ret = xsm_get_device_group(XSM_HOOK, domctl->u.get_device_group.machine_sbdf);
|
||||
ret = xsm_get_device_group(XSM_PRIV, domctl->u.get_device_group.machine_sbdf);
|
||||
if ( ret )
|
||||
break;
|
||||
|
||||
|
||||
@@ -162,6 +162,7 @@ static XSM_INLINE int cf_check xsm_domctl(
|
||||
{
|
||||
case XEN_DOMCTL_bind_pt_irq:
|
||||
case XEN_DOMCTL_getdomaininfo:
|
||||
case XEN_DOMCTL_get_device_group:
|
||||
case XEN_DOMCTL_iomem_permission:
|
||||
case XEN_DOMCTL_ioport_mapping:
|
||||
case XEN_DOMCTL_ioport_permission:
|
||||
@@ -399,7 +400,7 @@ static XSM_INLINE int cf_check xsm_get_vnumainfo(
|
||||
static XSM_INLINE int cf_check xsm_get_device_group(
|
||||
XSM_DEFAULT_ARG uint32_t machine_bdf)
|
||||
{
|
||||
XSM_ASSERT_ACTION(XSM_HOOK);
|
||||
XSM_ASSERT_ACTION(XSM_PRIV);
|
||||
return xsm_default_action(action, current->domain, NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -682,6 +682,7 @@ static int cf_check flask_domctl(struct domain *d, struct xen_domctl *op)
|
||||
/* These have individual XSM hooks and don't make it here. */
|
||||
case XEN_DOMCTL_bind_pt_irq:
|
||||
case XEN_DOMCTL_getdomaininfo:
|
||||
case XEN_DOMCTL_get_device_group:
|
||||
case XEN_DOMCTL_iomem_permission:
|
||||
case XEN_DOMCTL_ioport_mapping:
|
||||
case XEN_DOMCTL_ioport_permission:
|
||||
@@ -699,7 +700,6 @@ static int cf_check flask_domctl(struct domain *d, struct xen_domctl *op)
|
||||
* These have individual XSM hooks
|
||||
* (drivers/passthrough/{pci,device_tree.c)
|
||||
*/
|
||||
case XEN_DOMCTL_get_device_group:
|
||||
case XEN_DOMCTL_test_assign_device:
|
||||
case XEN_DOMCTL_assign_device:
|
||||
case XEN_DOMCTL_deassign_device:
|
||||
|
||||