[Xen-changelog] [xen staging] x86/shim: Short circuit control/hardware checks in PV_SHIM_EXCLUSIVE builds

[patchbot@xxxxxxx]

commit 0d48ab9716265857ce26c393eb0bc0bb87b13c91
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Oct 28 10:58:02 2019 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Jan 7 12:34:45 2020 +0000

    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
    
    This patch also has the unintended but useful consequence of stopping
    hardware_dom= functionality from being usable (in at least PV_SHIM_EXCLUSIVE
    builds).
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Wei Liu <wl@xxxxxxx>
    Tested-by: Sergey Dyasli <sergey.dyasli@xxxxxxxxxx>
---
 xen/include/xen/sched.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index a2accd90f6..cc942a3621 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -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))
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog