Skip to contentSkip to conversation

x86/shim: Short circuit control/hardware checks in PV_SHIM_EXCLUSIVE builds

PATCH In review Andrew Cooper 4 participants 6 messages Jan 3, 2020 – Jan 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/shim: Short circuit control/hardware checks in PV_SHIM_EXCLUSIVE builds

The net diffstat is:
add/remove: 0/13 grow/shrink: 25/129 up/down: 6297/-20469 (-14172)

With the following objects/functions removed entirely:

  iommu_hwdom_none                               1       -      -1
  hwdom_max_order                                4       -      -4
  extra_hwdom_irqs                               4       -      -4
  ctldom_max_order                               4       -      -4
  acpi_c1e_quirk                                43       -     -43
  hvm_pirq_eoi                                  62       -     -62
  max_order                                     94       -     -94
  conring_puts                                 104       -    -104
  propagate_node                               119       -    -119
  mmio_ro_emulate_ops                          224       -    -224
  mmcfg_intercept_ops                          224       -    -224
  pci_cfg_ok                                   295       -    -295
  p2m_lock                                     546       -    -546

And the following reduced to stubs:

  arch_iommu_hwdom_init                        852       2    -850
  p2m_add_foreign                              880      16    -864

---
CC: Jan Beulich <[email protected]>
CC: Wei Liu <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Sergey Dyasli <[email protected]>

---
 xen/include/xen/sched.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
xen/include/xen/sched.h +14 -2
index a2accd90f6..cc942a3621 100644
@@ -963,10 +963,22 @@ void watchdog_domain_destroy(struct domain *d);
  *    (that is, this would not be suitable for a driver domain)
  *  - There is never a reason to deny the hardware domain access to this
  */
-#define is_hardware_domain(_d) evaluate_nospec((_d) == hardware_domain)
+static always_inline bool is_hardware_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d == hardware_domain);
+}
 
 /* This check is for functionality specific to a control domain */
-#define is_control_domain(_d) evaluate_nospec((_d)->is_privileged)
+static always_inline bool is_control_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d->is_privileged);
+}
 
 #define VM_ASSIST(d, t) (test_bit(VMASST_TYPE_ ## t, &(d)->vm_assist))
 
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Andrew Cooper

The net diffstat is:
add/remove: 0/13 grow/shrink: 25/129 up/down: 6297/-20469 (-14172)

With the following objects/functions removed entirely:

  iommu_hwdom_none                               1       -      -1
  hwdom_max_order                                4       -      -4
  extra_hwdom_irqs                               4       -      -4
  ctldom_max_order                               4       -      -4
  acpi_c1e_quirk                                43       -     -43
  hvm_pirq_eoi                                  62       -     -62
  max_order                                     94       -     -94
  conring_puts                                 104       -    -104
  propagate_node                               119       -    -119
  mmio_ro_emulate_ops                          224       -    -224
  mmcfg_intercept_ops                          224       -    -224
  pci_cfg_ok                                   295       -    -295
  p2m_lock                                     546       -    -546
Quoted 5 lines

And the following reduced to stubs:

  arch_iommu_hwdom_init                        852       2    -850
  p2m_add_foreign                              880      16    -864

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#2 lore raw
In reply to Andrew Cooper
Quoted 14 lines · Andrew Cooper
xen/include/xen/sched.h +7 -1
@@ -963,10 +963,22 @@ void watchdog_domain_destroy(struct domain *d);
  *    (that is, this would not be suitable for a driver domain)
  *  - There is never a reason to deny the hardware domain access to this
  */
-#define is_hardware_domain(_d) evaluate_nospec((_d) == hardware_domain)
+static always_inline bool is_hardware_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d == hardware_domain);
+}

xen/include/xen/sched.h void watchdog_domain_destroy(struct domain *d); · line 981

Quoted 10 lines
xen/include/xen/sched.h +7 -1
 
 /* This check is for functionality specific to a control domain */
-#define is_control_domain(_d) evaluate_nospec((_d)->is_privileged)
+static always_inline bool is_control_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d->is_privileged);
+}

Besides its intended purpose this also fixes (but only for the shim-exclusive case) an interaction issue with LATE_HWDOM: If in shim mode the "hardware_dom=1" command line option was used, misbehavior would result afaict. Therefore I think this wants amending with adjustments to also make the !PV_SHIM_EXCLUSIVE case work correctly (read: ignore that command line option). I guess additionally LATE_HWDOM should also depend on !PV_SHIM_EXCLUSIVE (and/or vice versa).

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#3 lore raw
Quoted 16 lines · Jan Beulich
Quoted 15 lines · Andrew Cooper
xen/include/xen/sched.h +7 -1
@@ -963,10 +963,22 @@ void watchdog_domain_destroy(struct domain *d);
  *    (that is, this would not be suitable for a driver domain)
  *  - There is never a reason to deny the hardware domain access to this
  */
-#define is_hardware_domain(_d) evaluate_nospec((_d) == hardware_domain)
+static always_inline bool is_hardware_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d == hardware_domain);
+}
 
Quoted 13 lines

xen/include/xen/sched.h void watchdog_domain_destroy(struct domain *d); · line 981

Quoted 9 lines
xen/include/xen/sched.h +7 -1
 /* This check is for functionality specific to a control domain */
-#define is_control_domain(_d) evaluate_nospec((_d)->is_privileged)
+static always_inline bool is_control_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d->is_privileged);
+}

Besides its intended purpose this also fixes (but only for the shim-exclusive case) an interaction issue with LATE_HWDOM: If in shim mode the "hardware_dom=1" command line option was used, misbehavior would result afaict.

Perhaps, but there are plenty of other ways to break things using the shims command line.

Remember that the shim command line is not under user control at all.

Quoted 5 lines

Therefore I think this wants
amending with adjustments to also make the !PV_SHIM_EXCLUSIVE case work correctly (read: ignore that command line option). I guess additionally LATE_HWDOM should also depend on !PV_SHIM_EXCLUSIVE (and/or vice versa).

No - such a bugfix should be a separate change, because it is not related to this patch.

Fixing it would require extra x86 #ifdef-ary in common code.  While this is doable, there is also work in progress from the OpenXT folk to completely overhaul how that mechanism works (which will in practice remove the command line parameter).

Given both of these aspects, I'm tempted to leave it as-is for now.

~Andrew

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#4 lore raw
Quoted 45 lines · Andrew Cooper
Quoted 16 lines · Jan Beulich
Quoted 15 lines · Andrew Cooper
xen/include/xen/sched.h +7 -1
@@ -963,10 +963,22 @@ void watchdog_domain_destroy(struct domain *d);
  *    (that is, this would not be suitable for a driver domain)
  *  - There is never a reason to deny the hardware domain access to this
  */
-#define is_hardware_domain(_d) evaluate_nospec((_d) == hardware_domain)
+static always_inline bool is_hardware_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d == hardware_domain);
+}
 
Quoted 13 lines

xen/include/xen/sched.h void watchdog_domain_destroy(struct domain *d); · line 981

Quoted 9 lines
xen/include/xen/sched.h +7 -1
 /* This check is for functionality specific to a control domain */
-#define is_control_domain(_d) evaluate_nospec((_d)->is_privileged)
+static always_inline bool is_control_domain(const struct domain *d)
+{
+    if ( IS_ENABLED(CONFIG_PV_SHIM_EXCLUSIVE) )
+        return false;
+
+    return evaluate_nospec(d->is_privileged);
+}

Besides its intended purpose this also fixes (but only for the shim-exclusive case) an interaction issue with LATE_HWDOM: If in shim mode the "hardware_dom=1" command line option was used, misbehavior would result afaict.

Perhaps, but there are plenty of other ways to break things using the shims command line.

Remember that the shim command line is not under user control at all.

Quoted 5 lines

Therefore I think this wants
amending with adjustments to also make the !PV_SHIM_EXCLUSIVE case work correctly (read: ignore that command line option). I guess additionally LATE_HWDOM should also depend on !PV_SHIM_EXCLUSIVE (and/or vice versa).

No - such a bugfix should be a separate change, because it is not related to this patch.

Quoted 6 lines

Fixing it would require extra x86 #ifdef-ary in common code.  While this is doable, there is also work in progress from the OpenXT folk to completely overhaul how that mechanism works (which will in practice remove the command line parameter).

Given both of these aspects, I'm tempted to leave it as-is for now.

Okay, yet may I ask that you mention the partial bug fix in the description?

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Tested-by on v1 1/1
#5 lore raw
In reply to Andrew Cooper
Quoted 18 lines · Andrew Cooper

The net diffstat is:
add/remove: 0/13 grow/shrink: 25/129 up/down: 6297/-20469 (-14172)

With the following objects/functions removed entirely:

  iommu_hwdom_none                               1       -      -1
  hwdom_max_order                                4       -      -4
  extra_hwdom_irqs                               4       -      -4
  ctldom_max_order                               4       -      -4
  acpi_c1e_quirk                                43       -     -43
  hvm_pirq_eoi                                  62       -     -62
  max_order                                     94       -     -94
  conring_puts                                 104       -    -104
  propagate_node                               119       -    -119
  mmio_ro_emulate_ops                          224       -    -224
  mmcfg_intercept_ops                          224       -    -224
  pci_cfg_ok                                   295       -    -295
  p2m_lock                                     546       -    -546
Quoted 5 lines

And the following reduced to stubs:

  arch_iommu_hwdom_init                        852       2    -850
  p2m_add_foreign                              880      16    -864

I tested this patch some time ago on a private branch, so

Thanks,
Sergey

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel