From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 4 Nov 2021 19:36:16 +0000 (+0000)
Subject: xen/xsm: Complete altcall conversion of xsm interface
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~1317
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d868feb95a8a0cfa643427f10a6a540da8061ab5;p=xen.git

xen/xsm: Complete altcall conversion of xsm interface

With alternative_call() capable of handling compound types, the three
remaining hooks can be optimised at boot time too.

Fixes: 164a0b9653f4 ("xsm: refactor xsm_ops handling")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Daniel P. Smith <dpsmith@apertussolutions.com>
---

diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 0b360e1a35..82458066f6 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -579,13 +579,13 @@ static inline int xsm_hypfs_op(xsm_default_t def)
 
 static inline long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op)
 {
-    return xsm_ops.do_xsm_op(op);
+    return alternative_call(xsm_ops.do_xsm_op, op);
 }
 
 #ifdef CONFIG_COMPAT
 static inline int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op)
 {
-    return xsm_ops.do_compat_op(op);
+    return alternative_call(xsm_ops.do_compat_op, op);
 }
 #endif
 
@@ -698,7 +698,7 @@ static inline int xsm_mmuext_op(
 static inline int xsm_update_va_mapping(
     xsm_default_t def, struct domain *d, struct domain *f, l1_pgentry_t pte)
 {
-    return xsm_ops.update_va_mapping(d, f, pte);
+    return alternative_call(xsm_ops.update_va_mapping, d, f, pte);
 }
 
 static inline int xsm_priv_mapping(