xsm: refactoring xsm hooks
v6 cover xsm: refactoring xsm hooks
Based on feedback from 2021 Xen Developers Summit the xsm-roles RFC patch set is being split into two separate patch sets. This is the first patch set and is focused purely on the clean up and refactoring of the XSM hooks.
This patch set refactors the xsm_ops wrapper hooks to use the alternative_call infrastructure. Then proceeds to move and realign the headers to simplify the unnecessarily complicated header inclusions, remove the facad of being able to enable/disable XSM, and simplify the XSM hooks down to a single interface and implementation. The remainder of the changes are clean up and removing no longer necessary abstractions.
v2:
- restructured the patches, breaking them up as needed
- incorporate Andrew Cooper's alternative call common code
- change XSM module registration, removing register_xsm
- incoporate KConfig recommendations
- reworded commit messages
- incorporate macro expansion recommendations
- misc clean-up fallout from recommendations
v3:
- renamed struct xsm_operations to struct xsm_ops
- flask and silo ops structs made __initconst
- fixed misplacement of __init on flask/silo_init
- lots of coding style alignment
- further clean up from FLASK_DISABLE removal
- addressed commit message comments
- removed missed guard around alternative-call include
- reworked approach to XSM hooks, merging the two interfaces instead of dropping one
v4:
- make __alt_call_maybe_initdata resolve to __read_mostly when CONFIG_ALTERNATIVE_CALL is not set
- removed the masking of void with xsm_op_t
- moved all the coding style conformity to an early commit
- fixed declaration on real and stub declarations in xsm.h
- corrected to __initconstrel
- made the xsm_ops global __read_mostly
- adjusted blank lines in xsm_ops struct to provide consistent grouping
- moved extern references to built in policy to where they are used
- Added back in the #ifdef CONFIG_XSM into struct evtchn
- split the patch removing the duplicate interface up further
v5
- changed 80 col wrapping style to preferred style
- a few additional code style cleanups caught in v4 review
- made xsm_ops_registered __initdata
- pulled duplicate if out of switch cases in xsm_core_init()
- dropped struct evtchn commit
- dropped silo hooks direct calls to xsm_default_action
v6
- adjusted alt call documentation comment
- fixed the leak of hard tabs into the commits
Andrew Cooper (1):
xen: Implement xen/alternative-call.h for use in common code
Daniel P. Smith (9):
xsm: remove the ability to disable flask
xsm: remove remnants of xsm_memtype hook
xsm: drop dubious xsm_op_t type
xsm: apply coding style
xsm: refactor xsm_ops handling
xsm: convert xsm_ops hook calls to alternative call
xsm: decouple xsm header inclusion selection
kconfig: update xsm config to reflect reality
xsm: remove alternate xsm hook interface
xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 52 +- xen/include/public/xsm/flask_op.h | 2 +- xen/include/xen/alternative-call.h | 63 +++ xen/include/xen/hypercall.h | 4 +- xen/include/xen/sched.h | 2 +- xen/include/xsm/dummy.h | 215 +++++--- xen/include/xsm/xsm-core.h | 266 ++++++++++ xen/include/xsm/xsm.h | 802 +++++++++++++---------------- xen/xsm/Makefile | 4 +- xen/xsm/dummy.c | 7 +- xen/xsm/dummy.h | 659 ++++++++++++++++++++++++ xen/xsm/flask/flask_op.c | 32 +- xen/xsm/flask/hooks.c | 16 +- xen/xsm/silo.c | 11 +- xen/xsm/xsm_core.c | 93 ++-- xen/xsm/xsm_policy.c | 7 +- 17 files changed, 1564 insertions(+), 672 deletions(-) create mode 100644 xen/include/xen/alternative-call.h create mode 100644 xen/include/xsm/xsm-core.h create mode 100644 xen/xsm/dummy.h
Signature · 1 line
2.20.1
PATCH v6 1/10 xen: Implement xen/alternative-call.h for use in common code
From: Andrew Cooper <[email protected]>
The alternative call infrastructure is x86-only for now, but the common iommu code has a variant and more common code wants to use the infrastructure.
Introduce CONFIG_ALTERNATIVE_CALL and a conditional implemetnation so common code can use the optimisation when available, without requiring all architectures to implement no-op stubs.
Write some documentation, which was thus far entirely absent, covering the requirements for an architecture to implement this optimsiation, and how to use the infrastructure in general code.
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Volodymyr Babchuk <[email protected]>
CC: Bob Eshleman <[email protected]>
CC: Alistair Francis <[email protected]>
CC: Connor Davis <[email protected]>
CC: Daniel P. Smith <[email protected]>
v3:
* Drop __alt_call_maybe_initconst
This is a pre-requisite to "xsm: refactor xsm_ops handling" to avoid breaking the ARM build.
Build test for the XSM code:
diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c
index 5eab21e1b168..592074e8f41c 100644
--- a/xen/xsm/xsm_core.c
+++ b/xen/xsm/xsm_core.c
@@ -195,6 +195,16 @@ bool __init has_xsm_magic(paddr_t start)
}
#endif +#include <xen/alternative-call.h>
+struct foo {
+ int (*bar)(void *);
+} foo __alt_call_maybe_initdata;
+
+int test_alternative_call(void)
+{
+ return alternative_call(foo.bar, NULL);
+}
+
int __init register_xsm(struct xsm_operations *ops)
{
if ( verify(ops) )
--- xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 3 ++ xen/include/xen/alternative-call.h | 63 ++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 xen/include/xen/alternative-call.h
xen/arch/x86/Kconfig +1 -0
@@ -6,6 +6,7 @@ config X86 def_bool y select ACPI select ACPI_LEGACY_TABLES_LOOKUP + select ALTERNATIVE_CALL select ARCH_SUPPORTS_INT128 select CORE_PARKING select HAS_ALTERNATIVE
xen/common/Kconfig +3 -0
@@ -22,6 +22,9 @@ config GRANT_TABLE If unsure, say Y. +config ALTERNATIVE_CALL + bool + config HAS_ALTERNATIVE bool
xen/include/xen/alternative-call.h new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v6 2/10 xsm: remove the ability to disable flask
In reply to Daniel P. SmithOn Linux when SELinux is put into permissive mode the descretionary access controls are still in place. Whereas for Xen when the enforcing state of flask is set to permissive, all operations for all domains would succeed, i.e. it does not fall back to the default access controls. To provide a means to mimic a similar but not equivalent behavior, a flask op is present to allow a one-time switch back to the default access controls, aka the "dummy policy".
While this may be desirable for an OS, Xen is a hypervisor and should not allow the switching of which security policy framework is being enforced after boot. This patch removes the flask op to enforce the desired XSM usage model requiring a reboot of Xen to change the XSM policy module in use.
--- xen/include/public/xsm/flask_op.h | 2 +- xen/xsm/flask/flask_op.c | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-)
xen/include/public/xsm/flask_op.h +1 -1
@@ -188,7 +188,7 @@ struct xen_flask_op {#define FLASK_SETBOOL 12#define FLASK_COMMITBOOLS 13#define FLASK_MLS 14 -#define FLASK_DISABLE 15 +#define FLASK_DISABLE 15/* No longer implemented */ #define FLASK_GETAVC_THRESHOLD 16#define FLASK_SETAVC_THRESHOLD 17#define FLASK_AVC_HASHSTATS 18
xen/xsm/flask/flask_op.c +0 -30
@@ -223,32 +223,6 @@ static int flask_security_sid(struct xen_flask_sid_context *arg)#ifndef COMPAT -static int flask_disable (void ) -{ -static int flask_disabled =0 ; - -if ( ss_initialized ) - { -/* Not permitted after initial policy load. */ -return -EINVAL ; - } - -if ( flask_disabled ) - { -/* Only do this once. */ -return -EINVAL ; - } - -printk ("Flask: Disabled at runtime.\n" ); - - flask_disabled =1 ; - -/* Reset xsm_ops to the original module. */ - xsm_ops = &dummy_xsm_ops; - -return 0 ; -} -static int flask_security_setavc_threshold (struct xen_flask_setavc_threshold *arg) {int rv =0 ;
@@ -698,10 +672,6 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) u_flask_op) rv = flask_mls_enabled;break ; -case FLASK_DISABLE : - rv =flask_disable (); -break ; -case FLASK_GETAVC_THRESHOLD : rv = avc_cache_threshold;break ;
Signature · 1 line
2.20.1
PATCH v6 3/10 xsm: remove remnants of xsm_memtype hook
In reply to Daniel P. SmithIn c/s fcb8baddf00e the xsm_memtype hook was removed but some remnants were left behind. This commit cleans up those remnants.
--- xen/include/xsm/xsm.h | 6 ------ 1 file changed, 6 deletions(-)
xen/include/xsm/xsm.h +0 -6
@@ -161,7 +161,6 @@ struct xsm_operations {int (*shadow_control) (struct domain *d,uint32_t op);int (*mem_sharing_op) (struct domain *d,struct domain *cd,int op);int (*apic) (struct domain *d,int cmd); -int (*memtype) (uint32_t access);int (*machine_memory_map) (void );int (*domain_memory_map) (struct domain *d);#define XSM_MMU_UPDATE_READ 1
@@ -632,11 +631,6 @@ static inline int xsm_apic (xsm_default_t def, struct domain *d, int cmd)return xsm_ops->apic (d, cmd); } -static inline int xsm_memtype (xsm_default_t def,uint32_t access) -{ -return xsm_ops->memtype (access); -} -static inline int xsm_machine_memory_map (xsm_default_t def) {return xsm_ops->machine_memory_map ();
Signature · 1 line
2.20.1
PATCH v6 4/10 xsm: drop dubious xsm_op_t type
In reply to Daniel P. SmithThe type xsm_op_t masks the use of void pointers. This commit drops the xsm_op_t type and replaces it and all its uses with an explicit void.
--- xen/include/xen/hypercall.h | 4 ++-- xen/include/xsm/dummy.h | 4 ++-- xen/include/xsm/xsm.h | 11 ++++------- xen/xsm/flask/flask_op.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- xen/xsm/xsm_core.c | 4 ++-- 6 files changed, 13 insertions(+), 16 deletions(-)
xen/include/xen/hypercall.h +2 -2
@@ -127,7 +127,7 @@ do_kexec_op(extern long do_xsm_op ( -XEN_GUEST_HANDLE_PARAM (xsm_op_t) u_xsm_op); +XEN_GUEST_HANDLE_PARAM (void ) u_xsm_op);#ifdef CONFIG_ARGO extern long do_argo_op(
@@ -198,7 +198,7 @@ compat_set_timer_op( s32 hi);extern int compat_xsm_op ( -XEN_GUEST_HANDLE_PARAM (xsm_op_t) op); +XEN_GUEST_HANDLE_PARAM (void ) op);extern int compat_kexec_op (unsigned long op,XEN_GUEST_HANDLE_PARAM (void ) uarg);
xen/include/xsm/dummy.h +2 -2
@@ -442,13 +442,13 @@ static XSM_INLINE int xsm_hypfs_op(XSM_DEFAULT_VOID)return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op) +static XSM_INLINE long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) {return -ENOSYS ; }#ifdef CONFIG_COMPAT -static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) +static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op) {return -ENOSYS ; }
xen/include/xsm/xsm.h +4 -7
@@ -18,9 +18,6 @@#include <xen/sched.h> #include <xen/multiboot.h> -typedef void xsm_op_t ; -DEFINE_XEN_GUEST_HANDLE (xsm_op_t); -/* policy magic number (defined by XSM_MAGIC) */ typedef u32 xsm_magic_t ;
@@ -129,9 +126,9 @@ struct xsm_operations {int (*page_offline)(uint32_t cmd);int (*hypfs_op)(void ); -long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op); +long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM (void ) op);#ifdef CONFIG_COMPAT -int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op); +int (*do_compat_op) (XEN_GUEST_HANDLE_PARAM (void ) op);#endif int (*hvm_param) (struct domain *d,unsigned long op);
@@ -542,13 +539,13 @@ static inline int xsm_hypfs_op(xsm_default_t def)return xsm_ops->hypfs_op (); } -static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op) +static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) {return xsm_ops->do_xsm_op (op); }#ifdef CONFIG_COMPAT -static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op) +static inline int xsm_do_compat_op (XEN_GUEST_HANDLE_PARAM (void ) op) {return xsm_ops->do_compat_op (op); }
xen/xsm/flask/flask_op.c +1 -1
@@ -607,7 +607,7 @@ static int flask_relabel_domain(struct xen_flask_relabel *arg)#endif /* !COMPAT */ -ret_t do_flask_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) u_flask_op) +ret_t do_flask_op (XEN_GUEST_HANDLE_PARAM (void ) u_flask_op) {xen_flask_op_t op;int rv;
xen/xsm/flask/hooks.c +2 -2
@@ -1742,8 +1742,8 @@ static int flask_argo_send(const struct domain *d, const struct domain *t)#endif -long do_flask_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) u_flask_op); -int compat_flask_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) u_flask_op); +long do_flask_op (XEN_GUEST_HANDLE_PARAM (void ) u_flask_op); +int compat_flask_op (XEN_GUEST_HANDLE_PARAM (void ) u_flask_op);static struct xsm_operations flask_ops = { .security_domaininfo = flask_security_domaininfo,
xen/xsm/xsm_core.c +2 -2
@@ -213,13 +213,13 @@ int __init register_xsm(struct xsm_operations *ops)#endif -long do_xsm_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op) +long do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) {return xsm_do_xsm_op (op); }#ifdef CONFIG_COMPAT -int compat_xsm_op (XEN_GUEST_HANDLE_PARAM (xsm_op_t) op) +int compat_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) {return xsm_do_compat_op (op); }
Signature · 1 line
2.20.1
PATCH v6 5/10 xsm: apply coding style
In reply to Daniel P. SmithInstead of intermixing coding style changes with code changes as they are come upon in this patch set, moving all coding style changes into a single commit. The focus of coding style changes here are,
- move trailing comments to line above
- ensuring line length does not exceed 80 chars
- ensuring proper indentation for 80 char wrapping
- covert u32 type statements to uint32_t
- remove space between closing and opening parens
- drop extern on function declarations
--- xen/include/xsm/dummy.h | 190 +++++++++------ xen/include/xsm/xsm.h | 495 ++++++++++++++++++++++------------------ xen/xsm/xsm_core.c | 8 +- xen/xsm/xsm_policy.c | 7 +- 4 files changed, 396 insertions(+), 304 deletions(-)
xen/include/xsm/dummy.h +117 -73
@@ -19,7 +19,8 @@#include <xsm/xsm.h> #include <public/hvm/params.h> -/* Cannot use BUILD_BUG_ON here because the expressions we check are not +/* +* Cannot use BUILD_BUG_ON here because the expressions we check are not * considered constant at compile time. Instead, rely on constant propagation to * inline out the calls to this invalid function, which will cause linker errors * if references remain at link time.
@@ -44,7 +45,8 @@ void __xsm_action_mismatch_detected(void);#ifdef CONFIG_XSM -/* In CONFIG_XSM builds, this header file is included from xsm/dummy.c, and +/* +* In CONFIG_XSM builds, this header file is included from xsm/dummy.c, and * contains static (not inline) functions compiled to the dummy XSM module. * There is no xsm_default_t argument available, so the value from the assertion * is used to initialize the variable.
@@ -57,7 +59,8 @@ void __xsm_action_mismatch_detected(void);#else /* CONFIG_XSM */ -/* In !CONFIG_XSM builds, this header file is included from xsm/xsm.h, and +/* +* In !CONFIG_XSM builds, this header file is included from xsm/xsm.h, and * contains inline functions for each XSM hook. These functions also perform * compile-time checks on the xsm_default_t argument to ensure that the behavior * of the dummy XSM module is the same as the behavior with XSM disabled.
@@ -98,13 +101,14 @@ static always_inline int xsm_default_action( } } -static XSM_INLINE void xsm_security_domaininfo(struct domain *d, -struct xen_domctl_getdomaininfo *info) +static XSM_INLINE void xsm_security_domaininfo( +struct domain *d,struct xen_domctl_getdomaininfo *info) {return ; } -static XSM_INLINE int xsm_domain_create(XSM_DEFAULT_ARG struct domain *d, u32 ssidref) +static XSM_INLINE int xsm_domain_create( + XSM_DEFAULT_ARG struct domain *d, uint32_t ssidref) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d);
@@ -116,7 +120,8 @@ static XSM_INLINE int xsm_getdomaininfo(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_domctl_scheduler_op(XSM_DEFAULT_ARG struct domain *d, int cmd) +static XSM_INLINE int xsm_domctl_scheduler_op( + XSM_DEFAULT_ARG struct domain *d, int cmd) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d);
@@ -128,7 +133,8 @@ static XSM_INLINE int xsm_sysctl_scheduler_op(XSM_DEFAULT_ARG int cmd)return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_set_target(XSM_DEFAULT_ARG struct domain *d, struct domain *e) +static XSM_INLINE int xsm_set_target( + XSM_DEFAULT_ARG struct domain *d, struct domain *e) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain,NULL );
@@ -173,38 +179,43 @@ static XSM_INLINE void xsm_free_security_domain(struct domain *d)return ; } -static XSM_INLINE int xsm_grant_mapref(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, -uint32_t flags) +static XSM_INLINE int xsm_grant_mapref( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, uint32_t flags) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_grant_unmapref(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_unmapref( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_grant_setup(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_setup( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_grant_transfer(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_transfer( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_grant_copy(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_copy( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_grant_query_size(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_grant_query_size( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2);
@@ -216,14 +227,15 @@ static XSM_INLINE int xsm_memory_exchange(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_memory_adjust_reservation(XSM_DEFAULT_ARG struct domain *d1, -struct domain *d2) +static XSM_INLINE int xsm_memory_adjust_reservation( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_memory_stat_reservation(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_memory_stat_reservation( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2);
@@ -253,14 +265,16 @@ static XSM_INLINE int xsm_kexec(XSM_DEFAULT_VOID)return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_schedop_shutdown(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_schedop_shutdown( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_DM_PRIV );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_memory_pin_page(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, -struct page_info *page) +static XSM_INLINE int xsm_memory_pin_page( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, +struct page_info *page) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d1, d2);
@@ -272,15 +286,16 @@ static XSM_INLINE int xsm_claim_pages(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_evtchn_unbound(XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn, -domid_t id2) +static XSM_INLINE int xsm_evtchn_unbound( + XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn, domid_t id2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_evtchn_interdomain(XSM_DEFAULT_ARG struct domain *d1, struct evtchn - *chan1,struct domain *d2,struct evtchn *chan2) +static XSM_INLINE int xsm_evtchn_interdomain( + XSM_DEFAULT_ARG struct domain *d1, struct evtchn *chan1, struct domain *d2, +struct evtchn *chan2) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d1, d2);
@@ -291,19 +306,22 @@ static XSM_INLINE void xsm_evtchn_close_post(struct evtchn *chn)return ; } -static XSM_INLINE int xsm_evtchn_send(XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) +static XSM_INLINE int xsm_evtchn_send( + XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, d,NULL ); } -static XSM_INLINE int xsm_evtchn_status(XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) +static XSM_INLINE int xsm_evtchn_status( + XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_evtchn_reset( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2);
@@ -321,7 +339,8 @@ static XSM_INLINE void xsm_free_security_evtchns(return ; } -static XSM_INLINE char *xsm_show_security_evtchn(struct domain *d, const struct evtchn *chn) +static XSM_INLINE char *xsm_show_security_evtchn( +struct domain *d,const struct evtchn *chn) {return NULL ; }
@@ -357,13 +376,15 @@ static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf)return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_assign_device(XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) +static XSM_INLINE int xsm_assign_device( + XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) +static XSM_INLINE int xsm_deassign_device( + XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d);
@@ -372,15 +393,15 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint#endif /* HAS_PASSTHROUGH && HAS_PCI */ #if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_DEVICE_TREE ) -static XSM_INLINE int xsm_assign_dtdevice(XSM_DEFAULT_ARG struct domain *d, -const char *dtpath) +static XSM_INLINE int xsm_assign_dtdevice( + XSM_DEFAULT_ARG struct domain *d, const char *dtpath) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_deassign_dtdevice(XSM_DEFAULT_ARG struct domain *d, -const char *dtpath) +static XSM_INLINE int xsm_deassign_dtdevice( + XSM_DEFAULT_ARG struct domain *d, const char *dtpath) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d);
@@ -400,19 +421,22 @@ static XSM_INLINE int xsm_resource_unplug_core(XSM_DEFAULT_VOID)return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_resource_plug_pci(XSM_DEFAULT_ARG uint32_t machine_bdf) +static XSM_INLINE int xsm_resource_plug_pci( + XSM_DEFAULT_ARG uint32_t machine_bdf) {XSM_ASSERT_ACTION (XSM_PRIV );return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_resource_unplug_pci(XSM_DEFAULT_ARG uint32_t machine_bdf) +static XSM_INLINE int xsm_resource_unplug_pci( + XSM_DEFAULT_ARG uint32_t machine_bdf) {XSM_ASSERT_ACTION (XSM_PRIV );return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_resource_setup_pci(XSM_DEFAULT_ARG uint32_t machine_bdf) +static XSM_INLINE int xsm_resource_setup_pci( + XSM_DEFAULT_ARG uint32_t machine_bdf) {XSM_ASSERT_ACTION (XSM_PRIV );return xsm_default_action (action, current->domain,NULL );
@@ -465,8 +489,8 @@ static XSM_INLINE int xsm_map_domain_pirq(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_map_domain_irq(XSM_DEFAULT_ARG struct domain *d, -int irq,const void *data) +static XSM_INLINE int xsm_map_domain_irq( + XSM_DEFAULT_ARG struct domain *d, int irq, const void *data) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d);
@@ -478,76 +502,86 @@ static XSM_INLINE int xsm_unmap_domain_pirq(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_bind_pt_irq(XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) +static XSM_INLINE int xsm_bind_pt_irq( + XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_unbind_pt_irq(XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) +static XSM_INLINE int xsm_unbind_pt_irq( + XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_unmap_domain_irq(XSM_DEFAULT_ARG struct domain *d, -int irq,const void *data) +static XSM_INLINE int xsm_unmap_domain_irq( + XSM_DEFAULT_ARG struct domain *d, int irq, const void *data) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_irq_permission(XSM_DEFAULT_ARG struct domain *d, int pirq, uint8_t allow) +static XSM_INLINE int xsm_irq_permission( + XSM_DEFAULT_ARG struct domain *d, int pirq, uint8_t allow) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_iomem_permission(XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) +static XSM_INLINE int xsm_iomem_permission( + XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_iomem_mapping(XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) +static XSM_INLINE int xsm_iomem_mapping( + XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_pci_config_permission(XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf, -uint16_t start,uint16_t end, -uint8_t access) +static XSM_INLINE int xsm_pci_config_permission( + XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf, uint16_t start, +uint16_t end,uint8_t access) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_add_to_physmap(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_add_to_physmap( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_remove_from_physmap(XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) +static XSM_INLINE int xsm_remove_from_physmap( + XSM_DEFAULT_ARG struct domain *d1, struct domain *d2) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_map_gmfn_foreign(XSM_DEFAULT_ARG struct domain *d, struct domain *t) +static XSM_INLINE int xsm_map_gmfn_foreign( + XSM_DEFAULT_ARG struct domain *d, struct domain *t) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d, t); } -static XSM_INLINE int xsm_hvm_param(XSM_DEFAULT_ARG struct domain *d, unsigned long op) +static XSM_INLINE int xsm_hvm_param( + XSM_DEFAULT_ARG struct domain *d, unsigned long op) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_hvm_control(XSM_DEFAULT_ARG struct domain *d, unsigned long op) +static XSM_INLINE int xsm_hvm_control( + XSM_DEFAULT_ARG struct domain *d, unsigned long op) {XSM_ASSERT_ACTION (XSM_DM_PRIV );return xsm_default_action (action, current->domain, d);
@@ -559,7 +593,8 @@ static XSM_INLINE int xsm_hvm_param_altp2mhvm(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_hvm_altp2mhvm_op(XSM_DEFAULT_ARG struct domain *d, uint64_t mode, uint32_t op) +static XSM_INLINE int xsm_hvm_altp2mhvm_op( + XSM_DEFAULT_ARG struct domain *d, uint64_t mode, uint32_t op) {XSM_ASSERT_ACTION (XSM_OTHER );
@@ -578,7 +613,8 @@ static XSM_INLINE int xsm_hvm_altp2mhvm_op(XSM_DEFAULT_ARG struct domain *d, uin } } -static XSM_INLINE int xsm_vm_event_control(XSM_DEFAULT_ARG struct domain *d, int mode, int op) +static XSM_INLINE int xsm_vm_event_control( + XSM_DEFAULT_ARG struct domain *d, int mode, int op) {XSM_ASSERT_ACTION (XSM_PRIV );return xsm_default_action (action, current->domain, d);
@@ -621,13 +657,15 @@ static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID)return xsm_default_action (action, current->domain,NULL ); } -static XSM_INLINE int xsm_shadow_control(XSM_DEFAULT_ARG struct domain *d, uint32_t op) +static XSM_INLINE int xsm_shadow_control( + XSM_DEFAULT_ARG struct domain *d, uint32_t op) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_mem_sharing_op(XSM_DEFAULT_ARG struct domain *d, struct domain *cd, int op) +static XSM_INLINE int xsm_mem_sharing_op( + XSM_DEFAULT_ARG struct domain *d, struct domain *cd, int op) {XSM_ASSERT_ACTION (XSM_DM_PRIV );return xsm_default_action (action, current->domain, cd);
@@ -651,8 +689,9 @@ static XSM_INLINE int xsm_domain_memory_map(XSM_DEFAULT_ARG struct domain *d)return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct domain *t, -struct domain *f,uint32_t flags) +static XSM_INLINE int xsm_mmu_update( + XSM_DEFAULT_ARG struct domain *d, struct domain *t, struct domain *f, +uint32_t flags) {int rc =0 ;XSM_ASSERT_ACTION (XSM_TARGET );
@@ -663,38 +702,43 @@ static XSM_INLINE int xsm_mmu_update(XSM_DEFAULT_ARG struct domain *d, struct doreturn rc; } -static XSM_INLINE int xsm_mmuext_op(XSM_DEFAULT_ARG struct domain *d, struct domain *f) +static XSM_INLINE int xsm_mmuext_op( + XSM_DEFAULT_ARG struct domain *d, struct domain *f) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d, f); } -static XSM_INLINE int xsm_update_va_mapping(XSM_DEFAULT_ARG struct domain *d, struct domain *f, -l1_pgentry_t pte) +static XSM_INLINE int xsm_update_va_mapping( + XSM_DEFAULT_ARG struct domain *d, struct domain *f, l1_pgentry_t pte) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d, f); } -static XSM_INLINE int xsm_priv_mapping(XSM_DEFAULT_ARG struct domain *d, struct domain *t) +static XSM_INLINE int xsm_priv_mapping( + XSM_DEFAULT_ARG struct domain *d, struct domain *t) {XSM_ASSERT_ACTION (XSM_TARGET );return xsm_default_action (action, d, t); } -static XSM_INLINE int xsm_ioport_permission(XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) +static XSM_INLINE int xsm_ioport_permission( + XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_ioport_mapping(XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) +static XSM_INLINE int xsm_ioport_mapping( + XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow) {XSM_ASSERT_ACTION (XSM_HOOK );return xsm_default_action (action, current->domain, d); } -static XSM_INLINE int xsm_pmu_op (XSM_DEFAULT_ARG struct domain *d, unsigned int op) +static XSM_INLINE int xsm_pmu_op( + XSM_DEFAULT_ARG struct domain *d, unsigned int op) {XSM_ASSERT_ACTION (XSM_OTHER ); switch ( op )
@@ -723,8 +767,8 @@ static XSM_INLINE int xsm_argo_enable(const struct domain *d)return 0 ; } -static XSM_INLINE int xsm_argo_register_single_source(const struct domain *d, -const struct domain *t) +static XSM_INLINE int xsm_argo_register_single_source( +const struct domain *d,const struct domain *t) {return 0 ; }
@@ -734,8 +778,8 @@ static XSM_INLINE int xsm_argo_register_any_source(const struct domain *d)return 0 ; } -static XSM_INLINE int xsm_argo_send(const struct domain *d, -const struct domain *t) +static XSM_INLINE int xsm_argo_send( +const struct domain *d,const struct domain *t) {return 0 ; }
@@ -743,7 +787,7 @@ static XSM_INLINE int xsm_argo_send(const struct domain *d,#endif /* CONFIG_ARGO */ #include <public/version.h> -static XSM_INLINE int xsm_xen_version (XSM_DEFAULT_ARG uint32_t op) +static XSM_INLINE int xsm_xen_version(XSM_DEFAULT_ARG uint32_t op) {XSM_ASSERT_ACTION (XSM_OTHER ); switch ( op )
xen/include/xsm/xsm.h +272 -223
942 lines not on this page · raw message
xen/xsm/xsm_core.c +4 -4
@@ -117,8 +117,8 @@ static int __init xsm_core_init(const void *policy_buffer, size_t policy_size) }#ifdef CONFIG_MULTIBOOT -int __init xsm_multiboot_init (unsigned long *module_map, -const multiboot_info_t *mbi) +int __init xsm_multiboot_init ( +unsigned long *module_map,const multiboot_info_t *mbi) {int ret =0 ;void *policy_buffer =NULL ;
@@ -128,8 +128,8 @@ int __init xsm_multiboot_init(unsigned long *module_map,if (XSM_MAGIC ) { - ret =xsm_multiboot_policy_init (module_map, mbi, - &policy_buffer, &policy_size); + ret =xsm_multiboot_policy_init (module_map, mbi, &policy_buffer, + &policy_size);if ( ret ) {bootstrap_map (NULL );
xen/xsm/xsm_policy.c +3 -4
@@ -30,10 +30,9 @@#endif #ifdef CONFIG_MULTIBOOT -int __init xsm_multiboot_policy_init (unsigned long *module_map, -const multiboot_info_t *mbi, -void **policy_buffer, -size_t *policy_size) +int __init xsm_multiboot_policy_init ( +unsigned long *module_map,const multiboot_info_t *mbi, +void **policy_buffer,size_t *policy_size) {int i;module_t *mod = (module_t *)__va (mbi->mods_addr);
Signature · 1 line
2.20.1
Re: [PATCH v6 05/10] xsm: apply coding style
Quoted 4 lines · Daniel P. Smith
Instead of intermixing coding style changes with code changes as they are come upon in this patch set, moving all coding style changes into a single commit. The focus of coding style changes here are,
Quoted 8 lines
- move trailing comments to line above
- ensuring line length does not exceed 80 chars
- ensuring proper indentation for 80 char wrapping
- covert u32 type statements touint32_t
- remove space between closing and opening parens
- drop extern on function declarationsSigned-off-by Daniel P. Smith <[email protected]>
PATCH v6 6/10 xsm: refactor xsm_ops handling
In reply to Daniel P. SmithThis renames the struct xsm_operations to the shorter struct xsm_ops and converts the global xsm_ops from being a pointer to an explicit instance. As part of this conversion, it reworks the XSM modules init function to return their xsm_ops struct which is copied in to the global xsm_ops instance.
--- xen/include/xsm/xsm.h | 220 +++++++++++++++++++++--------------------- xen/xsm/dummy.c | 4 +- xen/xsm/flask/hooks.c | 12 +-- xen/xsm/silo.c | 7 +- xen/xsm/xsm_core.c | 72 +++++++------- 5 files changed, 161 insertions(+), 154 deletions(-)
xen/include/xsm/xsm.h +112 -108
@@ -41,7 +41,7 @@ enum xsm_default { };typedef enum xsm_default xsm_default_t ; -struct xsm_operations { +struct xsm_ops {void (*security_domaininfo)(struct domain *d,struct xen_domctl_getdomaininfo *info);int (*domain_create)(struct domain *d,uint32_t ssidref);
@@ -195,322 +195,322 @@ struct xsm_operations {#ifdef CONFIG_XSM -extern struct xsm_operations *xsm_ops; +extern struct xsm_ops xsm_ops;#ifndef XSM_NO_WRAPPERS static inline void xsm_security_domaininfo (struct domain *d,struct xen_domctl_getdomaininfo *info) { - xsm_ops->security_domaininfo (d, info); + xsm_ops.security_domaininfo (d, info); }static inline int xsm_domain_create (xsm_default_t def,struct domain *d,uint32_t ssidref) { -return xsm_ops->domain_create (d, ssidref); +return xsm_ops.domain_create (d, ssidref); }static inline int xsm_getdomaininfo (xsm_default_t def,struct domain *d) { -return xsm_ops->getdomaininfo (d); +return xsm_ops.getdomaininfo (d); }static inline int xsm_domctl_scheduler_op (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops->domctl_scheduler_op (d, cmd); +return xsm_ops.domctl_scheduler_op (d, cmd); }static inline int xsm_sysctl_scheduler_op (xsm_default_t def,int cmd) { -return xsm_ops->sysctl_scheduler_op (cmd); +return xsm_ops.sysctl_scheduler_op (cmd); }static inline int xsm_set_target (xsm_default_t def,struct domain *d,struct domain *e) { -return xsm_ops->set_target (d, e); +return xsm_ops.set_target (d, e); }static inline int xsm_domctl (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops->domctl (d, cmd); +return xsm_ops.domctl (d, cmd); }static inline int xsm_sysctl (xsm_default_t def,int cmd) { -return xsm_ops->sysctl (cmd); +return xsm_ops.sysctl (cmd); }static inline int xsm_readconsole (xsm_default_t def,uint32_t clear) { -return xsm_ops->readconsole (clear); +return xsm_ops.readconsole (clear); }static inline int xsm_evtchn_unbound (xsm_default_t def,struct domain *d1,struct evtchn *chn,domid_t id2) { -return xsm_ops->evtchn_unbound (d1, chn, id2); +return xsm_ops.evtchn_unbound (d1, chn, id2); }static inline int xsm_evtchn_interdomain (xsm_default_t def,struct domain *d1,struct evtchn *chan1,struct domain *d2,struct evtchn *chan2) { -return xsm_ops->evtchn_interdomain (d1, chan1, d2, chan2); +return xsm_ops.evtchn_interdomain (d1, chan1, d2, chan2); }static inline void xsm_evtchn_close_post (struct evtchn *chn) { - xsm_ops->evtchn_close_post (chn); + xsm_ops.evtchn_close_post (chn); }static inline int xsm_evtchn_send (xsm_default_t def,struct domain *d,struct evtchn *chn) { -return xsm_ops->evtchn_send (d, chn); +return xsm_ops.evtchn_send (d, chn); }static inline int xsm_evtchn_status (xsm_default_t def,struct domain *d,struct evtchn *chn) { -return xsm_ops->evtchn_status (d, chn); +return xsm_ops.evtchn_status (d, chn); }static inline int xsm_evtchn_reset (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->evtchn_reset (d1, d2); +return xsm_ops.evtchn_reset (d1, d2); }static inline int xsm_grant_mapref (xsm_default_t def,struct domain *d1,struct domain *d2,uint32_t flags) { -return xsm_ops->grant_mapref (d1, d2, flags); +return xsm_ops.grant_mapref (d1, d2, flags); }static inline int xsm_grant_unmapref (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->grant_unmapref (d1, d2); +return xsm_ops.grant_unmapref (d1, d2); }static inline int xsm_grant_setup (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->grant_setup (d1, d2); +return xsm_ops.grant_setup (d1, d2); }static inline int xsm_grant_transfer (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->grant_transfer (d1, d2); +return xsm_ops.grant_transfer (d1, d2); }static inline int xsm_grant_copy (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->grant_copy (d1, d2); +return xsm_ops.grant_copy (d1, d2); }static inline int xsm_grant_query_size (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->grant_query_size (d1, d2); +return xsm_ops.grant_query_size (d1, d2); }static inline int xsm_alloc_security_domain (struct domain *d) { -return xsm_ops->alloc_security_domain (d); +return xsm_ops.alloc_security_domain (d); }static inline void xsm_free_security_domain (struct domain *d) { - xsm_ops->free_security_domain (d); + xsm_ops.free_security_domain (d); }static inline int xsm_alloc_security_evtchns (struct evtchn chn[],unsigned int nr) { -return xsm_ops->alloc_security_evtchns (chn, nr); +return xsm_ops.alloc_security_evtchns (chn, nr); }static inline void xsm_free_security_evtchns (struct evtchn chn[],unsigned int nr) { - xsm_ops->free_security_evtchns (chn, nr); + xsm_ops.free_security_evtchns (chn, nr); }static inline char *xsm_show_security_evtchn (struct domain *d,const struct evtchn *chn) { -return xsm_ops->show_security_evtchn (d, chn); +return xsm_ops.show_security_evtchn (d, chn); }static inline int xsm_init_hardware_domain (xsm_default_t def,struct domain *d) { -return xsm_ops->init_hardware_domain (d); +return xsm_ops.init_hardware_domain (d); }static inline int xsm_get_pod_target (xsm_default_t def,struct domain *d) { -return xsm_ops->get_pod_target (d); +return xsm_ops.get_pod_target (d); }static inline int xsm_set_pod_target (xsm_default_t def,struct domain *d) { -return xsm_ops->set_pod_target (d); +return xsm_ops.set_pod_target (d); }static inline int xsm_memory_exchange (xsm_default_t def,struct domain *d) { -return xsm_ops->memory_exchange (d); +return xsm_ops.memory_exchange (d); }static inline int xsm_memory_adjust_reservation (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->memory_adjust_reservation (d1, d2); +return xsm_ops.memory_adjust_reservation (d1, d2); }static inline int xsm_memory_stat_reservation (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->memory_stat_reservation (d1, d2); +return xsm_ops.memory_stat_reservation (d1, d2); }static inline int xsm_memory_pin_page (xsm_default_t def,struct domain *d1,struct domain *d2,struct page_info *page) { -return xsm_ops->memory_pin_page (d1, d2, page); +return xsm_ops.memory_pin_page (d1, d2, page); }static inline int xsm_add_to_physmap (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->add_to_physmap (d1, d2); +return xsm_ops.add_to_physmap (d1, d2); }static inline int xsm_remove_from_physmap (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->remove_from_physmap (d1, d2); +return xsm_ops.remove_from_physmap (d1, d2); }static inline int xsm_map_gmfn_foreign (xsm_default_t def,struct domain *d,struct domain *t) { -return xsm_ops->map_gmfn_foreign (d, t); +return xsm_ops.map_gmfn_foreign (d, t); }static inline int xsm_claim_pages (xsm_default_t def,struct domain *d) { -return xsm_ops->claim_pages (d); +return xsm_ops.claim_pages (d); }static inline int xsm_console_io (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops->console_io (d, cmd); +return xsm_ops.console_io (d, cmd); }static inline int xsm_profile (xsm_default_t def,struct domain *d,int op) { -return xsm_ops->profile (d, op); +return xsm_ops.profile (d, op); }static inline int xsm_kexec (xsm_default_t def) { -return xsm_ops->kexec (); +return xsm_ops.kexec (); }static inline int xsm_schedop_shutdown (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops->schedop_shutdown (d1, d2); +return xsm_ops.schedop_shutdown (d1, d2); }static inline char *xsm_show_irq_sid (int irq) { -return xsm_ops->show_irq_sid (irq); +return xsm_ops.show_irq_sid (irq); }static inline int xsm_map_domain_pirq (xsm_default_t def,struct domain *d) { -return xsm_ops->map_domain_pirq (d); +return xsm_ops.map_domain_pirq (d); }static inline int xsm_map_domain_irq (xsm_default_t def,struct domain *d,int irq,void *data) { -return xsm_ops->map_domain_irq (d, irq, data); +return xsm_ops.map_domain_irq (d, irq, data); }static inline int xsm_unmap_domain_pirq (xsm_default_t def,struct domain *d) { -return xsm_ops->unmap_domain_pirq (d); +return xsm_ops.unmap_domain_pirq (d); }static inline int xsm_unmap_domain_irq (xsm_default_t def,struct domain *d,int irq,void *data) { -return xsm_ops->unmap_domain_irq (d, irq, data); +return xsm_ops.unmap_domain_irq (d, irq, data); }static inline int xsm_bind_pt_irq (xsm_default_t def,struct domain *d,struct xen_domctl_bind_pt_irq *bind) { -return xsm_ops->bind_pt_irq (d, bind); +return xsm_ops.bind_pt_irq (d, bind); }static inline int xsm_unbind_pt_irq (xsm_default_t def,struct domain *d,struct xen_domctl_bind_pt_irq *bind) { -return xsm_ops->unbind_pt_irq (d, bind); +return xsm_ops.unbind_pt_irq (d, bind); }static inline int xsm_irq_permission (xsm_default_t def,struct domain *d,int pirq,uint8_t allow) { -return xsm_ops->irq_permission (d, pirq, allow); +return xsm_ops.irq_permission (d, pirq, allow); }static inline int xsm_iomem_permission (xsm_default_t def,struct domain *d,uint64_t s,uint64_t e,uint8_t allow) { -return xsm_ops->iomem_permission (d, s, e, allow); +return xsm_ops.iomem_permission (d, s, e, allow); }static inline int xsm_iomem_mapping (xsm_default_t def,struct domain *d,uint64_t s,uint64_t e,uint8_t allow) { -return xsm_ops->iomem_mapping (d, s, e, allow); +return xsm_ops.iomem_mapping (d, s, e, allow); }static inline int xsm_pci_config_permission (xsm_default_t def,struct domain *d,uint32_t machine_bdf,uint16_t start,uint16_t end,uint8_t access) { -return xsm_ops->pci_config_permission (d, machine_bdf, start, end, access); +return xsm_ops.pci_config_permission (d, machine_bdf, start, end, access); }#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_PCI )static inline int xsm_get_device_group (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops->get_device_group (machine_bdf); +return xsm_ops.get_device_group (machine_bdf); }static inline int xsm_assign_device (xsm_default_t def,struct domain *d,uint32_t machine_bdf) { -return xsm_ops->assign_device (d, machine_bdf); +return xsm_ops.assign_device (d, machine_bdf); }static inline int xsm_deassign_device (xsm_default_t def,struct domain *d,uint32_t machine_bdf) { -return xsm_ops->deassign_device (d, machine_bdf); +return xsm_ops.deassign_device (d, machine_bdf); }#endif /* HAS_PASSTHROUGH && HAS_PCI) */
@@ -518,249 +518,249 @@ static inline int xsm_deassign_device(static inline int xsm_assign_dtdevice (xsm_default_t def,struct domain *d,const char *dtpath) { -return xsm_ops->assign_dtdevice (d, dtpath); +return xsm_ops.assign_dtdevice (d, dtpath); }static inline int xsm_deassign_dtdevice (xsm_default_t def,struct domain *d,const char *dtpath) { -return xsm_ops->deassign_dtdevice (d, dtpath); +return xsm_ops.deassign_dtdevice (d, dtpath); }#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ static inline int xsm_resource_plug_pci (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops->resource_plug_pci (machine_bdf); +return xsm_ops.resource_plug_pci (machine_bdf); }static inline int xsm_resource_unplug_pci (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops->resource_unplug_pci (machine_bdf); +return xsm_ops.resource_unplug_pci (machine_bdf); }static inline int xsm_resource_plug_core (xsm_default_t def) { -return xsm_ops->resource_plug_core (); +return xsm_ops.resource_plug_core (); }static inline int xsm_resource_unplug_core (xsm_default_t def) { -return xsm_ops->resource_unplug_core (); +return xsm_ops.resource_unplug_core (); }static inline int xsm_resource_setup_pci (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops->resource_setup_pci (machine_bdf); +return xsm_ops.resource_setup_pci (machine_bdf); }static inline int xsm_resource_setup_gsi (xsm_default_t def,int gsi) { -return xsm_ops->resource_setup_gsi (gsi); +return xsm_ops.resource_setup_gsi (gsi); }static inline int xsm_resource_setup_misc (xsm_default_t def) { -return xsm_ops->resource_setup_misc (); +return xsm_ops.resource_setup_misc (); }static inline int xsm_page_offline (xsm_default_t def,uint32_t cmd) { -return xsm_ops->page_offline (cmd); +return xsm_ops.page_offline (cmd); }static inline int xsm_hypfs_op (xsm_default_t def) { -return xsm_ops->hypfs_op (); +return xsm_ops.hypfs_op (); }static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) { -return xsm_ops->do_xsm_op (op); +return 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 xsm_ops.do_compat_op (op); }#endif static inline int xsm_hvm_param (xsm_default_t def,struct domain *d,unsigned long op) { -return xsm_ops->hvm_param (d, op); +return xsm_ops.hvm_param (d, op); }static inline int xsm_hvm_control (xsm_default_t def,struct domain *d,unsigned long op) { -return xsm_ops->hvm_control (d, op); +return xsm_ops.hvm_control (d, op); }static inline int xsm_hvm_param_altp2mhvm (xsm_default_t def,struct domain *d) { -return xsm_ops->hvm_param_altp2mhvm (d); +return xsm_ops.hvm_param_altp2mhvm (d); }static inline int xsm_hvm_altp2mhvm_op (xsm_default_t def,struct domain *d,uint64_t mode,uint32_t op) { -return xsm_ops->hvm_altp2mhvm_op (d, mode, op); +return xsm_ops.hvm_altp2mhvm_op (d, mode, op); }static inline int xsm_get_vnumainfo (xsm_default_t def,struct domain *d) { -return xsm_ops->get_vnumainfo (d); +return xsm_ops.get_vnumainfo (d); }static inline int xsm_vm_event_control (xsm_default_t def,struct domain *d,int mode,int op) { -return xsm_ops->vm_event_control (d, mode, op); +return xsm_ops.vm_event_control (d, mode, op); }#ifdef CONFIG_MEM_ACCESS static inline int xsm_mem_access (xsm_default_t def,struct domain *d) { -return xsm_ops->mem_access (d); +return xsm_ops.mem_access (d); }#endif #ifdef CONFIG_MEM_PAGING static inline int xsm_mem_paging (xsm_default_t def,struct domain *d) { -return xsm_ops->mem_paging (d); +return xsm_ops.mem_paging (d); }#endif #ifdef CONFIG_MEM_SHARING static inline int xsm_mem_sharing (xsm_default_t def,struct domain *d) { -return xsm_ops->mem_sharing (d); +return xsm_ops.mem_sharing (d); }#endif static inline int xsm_platform_op (xsm_default_t def,uint32_t op) { -return xsm_ops->platform_op (op); +return xsm_ops.platform_op (op); }#ifdef CONFIG_X86 static inline int xsm_do_mca (xsm_default_t def) { -return xsm_ops->do_mca (); +return xsm_ops.do_mca (); }static inline int xsm_shadow_control (xsm_default_t def,struct domain *d,uint32_t op) { -return xsm_ops->shadow_control (d, op); +return xsm_ops.shadow_control (d, op); }static inline int xsm_mem_sharing_op (xsm_default_t def,struct domain *d,struct domain *cd,int op) { -return xsm_ops->mem_sharing_op (d, cd, op); +return xsm_ops.mem_sharing_op (d, cd, op); }static inline int xsm_apic (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops->apic (d, cmd); +return xsm_ops.apic (d, cmd); }static inline int xsm_machine_memory_map (xsm_default_t def) { -return xsm_ops->machine_memory_map (); +return xsm_ops.machine_memory_map (); }static inline int xsm_domain_memory_map (xsm_default_t def,struct domain *d) { -return xsm_ops->domain_memory_map (d); +return xsm_ops.domain_memory_map (d); }static inline int xsm_mmu_update (xsm_default_t def,struct domain *d,struct domain *t,struct domain *f,uint32_t flags) { -return xsm_ops->mmu_update (d, t, f, flags); +return xsm_ops.mmu_update (d, t, f, flags); }static inline int xsm_mmuext_op (xsm_default_t def,struct domain *d,struct domain *f) { -return xsm_ops->mmuext_op (d, f); +return xsm_ops.mmuext_op (d, f); }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 xsm_ops.update_va_mapping (d, f, pte); }static inline int xsm_priv_mapping (xsm_default_t def,struct domain *d,struct domain *t) { -return xsm_ops->priv_mapping (d, t); +return xsm_ops.priv_mapping (d, t); }static inline int xsm_ioport_permission (xsm_default_t def,struct domain *d,uint32_t s,uint32_t e,uint8_t allow) { -return xsm_ops->ioport_permission (d, s, e, allow); +return xsm_ops.ioport_permission (d, s, e, allow); }static inline int xsm_ioport_mapping (xsm_default_t def,struct domain *d,uint32_t s,uint32_t e,uint8_t allow) { -return xsm_ops->ioport_mapping (d, s, e, allow); +return xsm_ops.ioport_mapping (d, s, e, allow); }static inline int xsm_pmu_op (xsm_default_t def,struct domain *d,unsigned int op) { -return xsm_ops->pmu_op (d, op); +return xsm_ops.pmu_op (d, op); }#endif /* CONFIG_X86 */ static inline int xsm_dm_op (xsm_default_t def,struct domain *d) { -return xsm_ops->dm_op (d); +return xsm_ops.dm_op (d); }static inline int xsm_xen_version (xsm_default_t def,uint32_t op) { -return xsm_ops->xen_version (op); +return xsm_ops.xen_version (op); }static inline int xsm_domain_resource_map (xsm_default_t def,struct domain *d) { -return xsm_ops->domain_resource_map (d); +return xsm_ops.domain_resource_map (d); }#ifdef CONFIG_ARGO static inline int xsm_argo_enable (const struct domain *d) { -return xsm_ops->argo_enable (d); +return xsm_ops.argo_enable (d); }static inline int xsm_argo_register_single_source (const struct domain *d,const struct domain *t) { -return xsm_ops->argo_register_single_source (d, t); +return xsm_ops.argo_register_single_source (d, t); }static inline int xsm_argo_register_any_source (const struct domain *d) { -return xsm_ops->argo_register_any_source (d); +return xsm_ops.argo_register_any_source (d); }static inline int xsm_argo_send (const struct domain *d,const struct domain *t) { -return xsm_ops->argo_send (d, t); +return xsm_ops.argo_send (d, t); }#endif /* CONFIG_ARGO */
@@ -786,17 +786,18 @@ int xsm_dt_policy_init(void **policy_buffer, size_t *policy_size);bool has_xsm_magic (paddr_t );#endif -int register_xsm (struct xsm_operations *ops); +extern struct xsm_ops dummy_xsm_ops; -extern struct xsm_operations dummy_xsm_ops; - -void xsm_fixup_ops (struct xsm_operations *ops); +void xsm_fixup_ops (struct xsm_ops *ops);#ifdef CONFIG_XSM_FLASK -void flask_init (const void *policy_buffer,size_t policy_size); +extern const struct xsm_ops *flask_init (const void *policy_buffer, +size_t policy_size);#else -static inline void flask_init (const void *policy_buffer,size_t policy_size) +static const inline struct xsm_ops *flask_init (const void *policy_buffer, +size_t policy_size) { +return NULL ; }#endif
@@ -806,9 +807,12 @@ extern const unsigned int xsm_flask_init_policy_size;#endif #ifdef CONFIG_XSM_SILO -void silo_init (void ); +extern const struct xsm_ops *silo_init (void );#else -static inline void silo_init (void ) {} +static const inline struct xsm_ops *silo_init (void ) +{ +return NULL ; +}#endif #else /* CONFIG_XSM */
xen/xsm/dummy.c +1 -3
@@ -13,15 +13,13 @@#define XSM_NO_WRAPPERS #include <xsm/dummy.h> -struct xsm_operations dummy_xsm_ops; -#define set_to_dummy_if_null (ops, function) \ do { \ if ( !ops->function ) \ ops->function = xsm_##function; \ } while (0) -void __init xsm_fixup_ops (struct xsm_operations *ops) +void __init xsm_fixup_ops (struct xsm_ops *ops) {set_to_dummy_if_null (ops, security_domaininfo);set_to_dummy_if_null (ops, domain_create);
xen/xsm/flask/hooks.c +6 -6
@@ -1745,7 +1745,7 @@ static int flask_argo_send(const struct domain *d, const struct domain *t)long do_flask_op (XEN_GUEST_HANDLE_PARAM (void ) u_flask_op);int compat_flask_op (XEN_GUEST_HANDLE_PARAM (void ) u_flask_op); -static struct xsm_operations flask_ops = { +static const struct xsm_ops __initconstrel flask_ops = { .security_domaininfo = flask_security_domaininfo, .domain_create = flask_domain_create, .getdomaininfo = flask_getdomaininfo,
@@ -1883,7 +1883,8 @@ static struct xsm_operations flask_ops = {#endif }; -void __init flask_init (const void *policy_buffer,size_t policy_size) +const struct xsm_ops *__init flask_init (const void *policy_buffer, +size_t policy_size) {int ret = -ENOENT ;
@@ -1891,7 +1892,7 @@ void __init flask_init(const void *policy_buffer, size_t policy_size) {case FLASK_BOOTPARAM_DISABLED :printk (XENLOG_INFO "Flask: Disabled at boot.\n" ); -return ; +return NULL ;case FLASK_BOOTPARAM_PERMISSIVE : flask_enforcing =0 ;
@@ -1908,9 +1909,6 @@ void __init flask_init(const void *policy_buffer, size_t policy_size)avc_init (); -if (register_xsm (&flask_ops) ) -panic ("Flask: Unable to register with XSM\n" ); -if ( policy_size && flask_bootparam !=FLASK_BOOTPARAM_LATELOAD ) ret =security_load_policy (policy_buffer, policy_size);
@@ -1923,6 +1921,8 @@ void __init flask_init(const void *policy_buffer, size_t policy_size)printk (XENLOG_INFO "Flask: Starting in enforcing mode.\n" ); else printk(XENLOG_INFO "Flask: Starting in permissive mode.\n"); + +return &flask_ops; }/*
xen/xsm/silo.c +3 -4
@@ -100,7 +100,7 @@ static int silo_argo_send(const struct domain *d1, const struct domain *d2)#endif -static struct xsm_operations silo_xsm_ops = { +static const struct xsm_ops __initconstrel silo_xsm_ops = { .evtchn_unbound = silo_evtchn_unbound, .evtchn_interdomain = silo_evtchn_interdomain, .grant_mapref = silo_grant_mapref,
@@ -112,12 +112,11 @@ static struct xsm_operations silo_xsm_ops = {#endif }; -void __init silo_init (void ) +const struct xsm_ops *__init silo_init (void ) {printk ("Initialising XSM SILO mode\n" ); -if (register_xsm (&silo_xsm_ops) ) -panic ("SILO: Unable to register with XSM\n" ); +return &silo_xsm_ops; }/*
xen/xsm/xsm_core.c +39 -33
118 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v6 7/10 xsm: convert xsm_ops hook calls to alternative call
In reply to Daniel P. SmithTo reduce retpolines convert all the pointer function calls of the xsm_ops hooks over to the alternative_call infrastructure.
--- xen/include/xsm/xsm.h | 191 +++++++++++++++++++++--------------------- 1 file changed, 96 insertions(+), 95 deletions(-)
xen/include/xsm/xsm.h +96 -95
@@ -15,6 +15,7 @@#ifndef __XSM_H__#define __XSM_H__ +#include <xen/alternative-call.h> #include <xen/sched.h> #include <xen/multiboot.h>
@@ -202,315 +203,315 @@ extern struct xsm_ops xsm_ops;static inline void xsm_security_domaininfo (struct domain *d,struct xen_domctl_getdomaininfo *info) { - xsm_ops.security_domaininfo (d, info); +alternative_vcall (xsm_ops.security_domaininfo, d, info); }static inline int xsm_domain_create (xsm_default_t def,struct domain *d,uint32_t ssidref) { -return xsm_ops.domain_create (d, ssidref); +return alternative_call (xsm_ops.domain_create, d, ssidref); }static inline int xsm_getdomaininfo (xsm_default_t def,struct domain *d) { -return xsm_ops.getdomaininfo (d); +return alternative_call (xsm_ops.getdomaininfo, d); }static inline int xsm_domctl_scheduler_op (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops.domctl_scheduler_op (d, cmd); +return alternative_call (xsm_ops.domctl_scheduler_op, d, cmd); }static inline int xsm_sysctl_scheduler_op (xsm_default_t def,int cmd) { -return xsm_ops.sysctl_scheduler_op (cmd); +return alternative_call (xsm_ops.sysctl_scheduler_op, cmd); }static inline int xsm_set_target (xsm_default_t def,struct domain *d,struct domain *e) { -return xsm_ops.set_target (d, e); +return alternative_call (xsm_ops.set_target, d, e); }static inline int xsm_domctl (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops.domctl (d, cmd); +return alternative_call (xsm_ops.domctl, d, cmd); }static inline int xsm_sysctl (xsm_default_t def,int cmd) { -return xsm_ops.sysctl (cmd); +return alternative_call (xsm_ops.sysctl, cmd); }static inline int xsm_readconsole (xsm_default_t def,uint32_t clear) { -return xsm_ops.readconsole (clear); +return alternative_call (xsm_ops.readconsole, clear); }static inline int xsm_evtchn_unbound (xsm_default_t def,struct domain *d1,struct evtchn *chn,domid_t id2) { -return xsm_ops.evtchn_unbound (d1, chn, id2); +return alternative_call (xsm_ops.evtchn_unbound, d1, chn, id2); }static inline int xsm_evtchn_interdomain (xsm_default_t def,struct domain *d1,struct evtchn *chan1,struct domain *d2,struct evtchn *chan2) { -return xsm_ops.evtchn_interdomain (d1, chan1, d2, chan2); +return alternative_call (xsm_ops.evtchn_interdomain, d1, chan1, d2, chan2); }static inline void xsm_evtchn_close_post (struct evtchn *chn) { - xsm_ops.evtchn_close_post (chn); +alternative_vcall (xsm_ops.evtchn_close_post, chn); }static inline int xsm_evtchn_send (xsm_default_t def,struct domain *d,struct evtchn *chn) { -return xsm_ops.evtchn_send (d, chn); +return alternative_call (xsm_ops.evtchn_send, d, chn); }static inline int xsm_evtchn_status (xsm_default_t def,struct domain *d,struct evtchn *chn) { -return xsm_ops.evtchn_status (d, chn); +return alternative_call (xsm_ops.evtchn_status, d, chn); }static inline int xsm_evtchn_reset (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.evtchn_reset (d1, d2); +return alternative_call (xsm_ops.evtchn_reset, d1, d2); }static inline int xsm_grant_mapref (xsm_default_t def,struct domain *d1,struct domain *d2,uint32_t flags) { -return xsm_ops.grant_mapref (d1, d2, flags); +return alternative_call (xsm_ops.grant_mapref, d1, d2, flags); }static inline int xsm_grant_unmapref (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.grant_unmapref (d1, d2); +return alternative_call (xsm_ops.grant_unmapref, d1, d2); }static inline int xsm_grant_setup (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.grant_setup (d1, d2); +return alternative_call (xsm_ops.grant_setup, d1, d2); }static inline int xsm_grant_transfer (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.grant_transfer (d1, d2); +return alternative_call (xsm_ops.grant_transfer, d1, d2); }static inline int xsm_grant_copy (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.grant_copy (d1, d2); +return alternative_call (xsm_ops.grant_copy, d1, d2); }static inline int xsm_grant_query_size (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.grant_query_size (d1, d2); +return alternative_call (xsm_ops.grant_query_size, d1, d2); }static inline int xsm_alloc_security_domain (struct domain *d) { -return xsm_ops.alloc_security_domain (d); +return alternative_call (xsm_ops.alloc_security_domain, d); }static inline void xsm_free_security_domain (struct domain *d) { - xsm_ops.free_security_domain (d); +alternative_vcall (xsm_ops.free_security_domain, d); }static inline int xsm_alloc_security_evtchns (struct evtchn chn[],unsigned int nr) { -return xsm_ops.alloc_security_evtchns (chn, nr); +return alternative_call (xsm_ops.alloc_security_evtchns, chn, nr); }static inline void xsm_free_security_evtchns (struct evtchn chn[],unsigned int nr) { - xsm_ops.free_security_evtchns (chn, nr); +alternative_vcall (xsm_ops.free_security_evtchns, chn, nr); }static inline char *xsm_show_security_evtchn (struct domain *d,const struct evtchn *chn) { -return xsm_ops.show_security_evtchn (d, chn); +return alternative_call (xsm_ops.show_security_evtchn, d, chn); }static inline int xsm_init_hardware_domain (xsm_default_t def,struct domain *d) { -return xsm_ops.init_hardware_domain (d); +return alternative_call (xsm_ops.init_hardware_domain, d); }static inline int xsm_get_pod_target (xsm_default_t def,struct domain *d) { -return xsm_ops.get_pod_target (d); +return alternative_call (xsm_ops.get_pod_target, d); }static inline int xsm_set_pod_target (xsm_default_t def,struct domain *d) { -return xsm_ops.set_pod_target (d); +return alternative_call (xsm_ops.set_pod_target, d); }static inline int xsm_memory_exchange (xsm_default_t def,struct domain *d) { -return xsm_ops.memory_exchange (d); +return alternative_call (xsm_ops.memory_exchange, d); }static inline int xsm_memory_adjust_reservation (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.memory_adjust_reservation (d1, d2); +return alternative_call (xsm_ops.memory_adjust_reservation, d1, d2); }static inline int xsm_memory_stat_reservation (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.memory_stat_reservation (d1, d2); +return alternative_call (xsm_ops.memory_stat_reservation, d1, d2); }static inline int xsm_memory_pin_page (xsm_default_t def,struct domain *d1,struct domain *d2,struct page_info *page) { -return xsm_ops.memory_pin_page (d1, d2, page); +return alternative_call (xsm_ops.memory_pin_page, d1, d2, page); }static inline int xsm_add_to_physmap (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.add_to_physmap (d1, d2); +return alternative_call (xsm_ops.add_to_physmap, d1, d2); }static inline int xsm_remove_from_physmap (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.remove_from_physmap (d1, d2); +return alternative_call (xsm_ops.remove_from_physmap, d1, d2); }static inline int xsm_map_gmfn_foreign (xsm_default_t def,struct domain *d,struct domain *t) { -return xsm_ops.map_gmfn_foreign (d, t); +return alternative_call (xsm_ops.map_gmfn_foreign, d, t); }static inline int xsm_claim_pages (xsm_default_t def,struct domain *d) { -return xsm_ops.claim_pages (d); +return alternative_call (xsm_ops.claim_pages, d); }static inline int xsm_console_io (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops.console_io (d, cmd); +return alternative_call (xsm_ops.console_io, d, cmd); }static inline int xsm_profile (xsm_default_t def,struct domain *d,int op) { -return xsm_ops.profile (d, op); +return alternative_call (xsm_ops.profile, d, op); }static inline int xsm_kexec (xsm_default_t def) { -return xsm_ops.kexec (); +return alternative_call (xsm_ops.kexec); }static inline int xsm_schedop_shutdown (xsm_default_t def,struct domain *d1,struct domain *d2) { -return xsm_ops.schedop_shutdown (d1, d2); +return alternative_call (xsm_ops.schedop_shutdown, d1, d2); }static inline char *xsm_show_irq_sid (int irq) { -return xsm_ops.show_irq_sid (irq); +return alternative_call (xsm_ops.show_irq_sid, irq); }static inline int xsm_map_domain_pirq (xsm_default_t def,struct domain *d) { -return xsm_ops.map_domain_pirq (d); +return alternative_call (xsm_ops.map_domain_pirq, d); }static inline int xsm_map_domain_irq (xsm_default_t def,struct domain *d,int irq,void *data) { -return xsm_ops.map_domain_irq (d, irq, data); +return alternative_call (xsm_ops.map_domain_irq, d, irq, data); }static inline int xsm_unmap_domain_pirq (xsm_default_t def,struct domain *d) { -return xsm_ops.unmap_domain_pirq (d); +return alternative_call (xsm_ops.unmap_domain_pirq, d); }static inline int xsm_unmap_domain_irq (xsm_default_t def,struct domain *d,int irq,void *data) { -return xsm_ops.unmap_domain_irq (d, irq, data); +return alternative_call (xsm_ops.unmap_domain_irq, d, irq, data); }static inline int xsm_bind_pt_irq (xsm_default_t def,struct domain *d,struct xen_domctl_bind_pt_irq *bind) { -return xsm_ops.bind_pt_irq (d, bind); +return alternative_call (xsm_ops.bind_pt_irq, d, bind); }static inline int xsm_unbind_pt_irq (xsm_default_t def,struct domain *d,struct xen_domctl_bind_pt_irq *bind) { -return xsm_ops.unbind_pt_irq (d, bind); +return alternative_call (xsm_ops.unbind_pt_irq, d, bind); }static inline int xsm_irq_permission (xsm_default_t def,struct domain *d,int pirq,uint8_t allow) { -return xsm_ops.irq_permission (d, pirq, allow); +return alternative_call (xsm_ops.irq_permission, d, pirq, allow); }static inline int xsm_iomem_permission (xsm_default_t def,struct domain *d,uint64_t s,uint64_t e,uint8_t allow) { -return xsm_ops.iomem_permission (d, s, e, allow); +return alternative_call (xsm_ops.iomem_permission, d, s, e, allow); }static inline int xsm_iomem_mapping (xsm_default_t def,struct domain *d,uint64_t s,uint64_t e,uint8_t allow) { -return xsm_ops.iomem_mapping (d, s, e, allow); +return alternative_call (xsm_ops.iomem_mapping, d, s, e, allow); }static inline int xsm_pci_config_permission (xsm_default_t def,struct domain *d,uint32_t machine_bdf,uint16_t start,uint16_t end,uint8_t access) { -return xsm_ops.pci_config_permission (d, machine_bdf, start, end, access); +return alternative_call (xsm_ops.pci_config_permission, d, machine_bdf, start, end, access); }#if defined(CONFIG_HAS_PASSTHROUGH ) && defined(CONFIG_HAS_PCI )static inline int xsm_get_device_group (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops.get_device_group (machine_bdf); +return alternative_call (xsm_ops.get_device_group, machine_bdf); }static inline int xsm_assign_device (xsm_default_t def,struct domain *d,uint32_t machine_bdf) { -return xsm_ops.assign_device (d, machine_bdf); +return alternative_call (xsm_ops.assign_device, d, machine_bdf); }static inline int xsm_deassign_device (xsm_default_t def,struct domain *d,uint32_t machine_bdf) { -return xsm_ops.deassign_device (d, machine_bdf); +return alternative_call (xsm_ops.deassign_device, d, machine_bdf); }#endif /* HAS_PASSTHROUGH && HAS_PCI) */
@@ -518,62 +519,62 @@ static inline int xsm_deassign_device(static inline int xsm_assign_dtdevice (xsm_default_t def,struct domain *d,const char *dtpath) { -return xsm_ops.assign_dtdevice (d, dtpath); +return alternative_call (xsm_ops.assign_dtdevice, d, dtpath); }static inline int xsm_deassign_dtdevice (xsm_default_t def,struct domain *d,const char *dtpath) { -return xsm_ops.deassign_dtdevice (d, dtpath); +return alternative_call (xsm_ops.deassign_dtdevice, d, dtpath); }#endif /* HAS_PASSTHROUGH && HAS_DEVICE_TREE */ static inline int xsm_resource_plug_pci (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops.resource_plug_pci (machine_bdf); +return alternative_call (xsm_ops.resource_plug_pci, machine_bdf); }static inline int xsm_resource_unplug_pci (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops.resource_unplug_pci (machine_bdf); +return alternative_call (xsm_ops.resource_unplug_pci, machine_bdf); }static inline int xsm_resource_plug_core (xsm_default_t def) { -return xsm_ops.resource_plug_core (); +return alternative_call (xsm_ops.resource_plug_core); }static inline int xsm_resource_unplug_core (xsm_default_t def) { -return xsm_ops.resource_unplug_core (); +return alternative_call (xsm_ops.resource_unplug_core); }static inline int xsm_resource_setup_pci (xsm_default_t def,uint32_t machine_bdf) { -return xsm_ops.resource_setup_pci (machine_bdf); +return alternative_call (xsm_ops.resource_setup_pci, machine_bdf); }static inline int xsm_resource_setup_gsi (xsm_default_t def,int gsi) { -return xsm_ops.resource_setup_gsi (gsi); +return alternative_call (xsm_ops.resource_setup_gsi, gsi); }static inline int xsm_resource_setup_misc (xsm_default_t def) { -return xsm_ops.resource_setup_misc (); +return alternative_call (xsm_ops.resource_setup_misc); }static inline int xsm_page_offline (xsm_default_t def,uint32_t cmd) { -return xsm_ops.page_offline (cmd); +return alternative_call (xsm_ops.page_offline, cmd); }static inline int xsm_hypfs_op (xsm_default_t def) { -return xsm_ops.hypfs_op (); +return alternative_call (xsm_ops.hypfs_op); }static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op)
@@ -591,107 +592,107 @@ static inline int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op)static inline int xsm_hvm_param (xsm_default_t def,struct domain *d,unsigned long op) { -return xsm_ops.hvm_param (d, op); +return alternative_call (xsm_ops.hvm_param, d, op); }static inline int xsm_hvm_control (xsm_default_t def,struct domain *d,unsigned long op) { -return xsm_ops.hvm_control (d, op); +return alternative_call (xsm_ops.hvm_control, d, op); }static inline int xsm_hvm_param_altp2mhvm (xsm_default_t def,struct domain *d) { -return xsm_ops.hvm_param_altp2mhvm (d); +return alternative_call (xsm_ops.hvm_param_altp2mhvm, d); }static inline int xsm_hvm_altp2mhvm_op (xsm_default_t def,struct domain *d,uint64_t mode,uint32_t op) { -return xsm_ops.hvm_altp2mhvm_op (d, mode, op); +return alternative_call (xsm_ops.hvm_altp2mhvm_op, d, mode, op); }static inline int xsm_get_vnumainfo (xsm_default_t def,struct domain *d) { -return xsm_ops.get_vnumainfo (d); +return alternative_call (xsm_ops.get_vnumainfo, d); }static inline int xsm_vm_event_control (xsm_default_t def,struct domain *d,int mode,int op) { -return xsm_ops.vm_event_control (d, mode, op); +return alternative_call (xsm_ops.vm_event_control, d, mode, op); }#ifdef CONFIG_MEM_ACCESS static inline int xsm_mem_access (xsm_default_t def,struct domain *d) { -return xsm_ops.mem_access (d); +return alternative_call (xsm_ops.mem_access, d); }#endif #ifdef CONFIG_MEM_PAGING static inline int xsm_mem_paging (xsm_default_t def,struct domain *d) { -return xsm_ops.mem_paging (d); +return alternative_call (xsm_ops.mem_paging, d); }#endif #ifdef CONFIG_MEM_SHARING static inline int xsm_mem_sharing (xsm_default_t def,struct domain *d) { -return xsm_ops.mem_sharing (d); +return alternative_call (xsm_ops.mem_sharing, d); }#endif static inline int xsm_platform_op (xsm_default_t def,uint32_t op) { -return xsm_ops.platform_op (op); +return alternative_call (xsm_ops.platform_op, op); }#ifdef CONFIG_X86 static inline int xsm_do_mca (xsm_default_t def) { -return xsm_ops.do_mca (); +return alternative_call (xsm_ops.do_mca); }static inline int xsm_shadow_control (xsm_default_t def,struct domain *d,uint32_t op) { -return xsm_ops.shadow_control (d, op); +return alternative_call (xsm_ops.shadow_control, d, op); }static inline int xsm_mem_sharing_op (xsm_default_t def,struct domain *d,struct domain *cd,int op) { -return xsm_ops.mem_sharing_op (d, cd, op); +return alternative_call (xsm_ops.mem_sharing_op, d, cd, op); }static inline int xsm_apic (xsm_default_t def,struct domain *d,int cmd) { -return xsm_ops.apic (d, cmd); +return alternative_call (xsm_ops.apic, d, cmd); }static inline int xsm_machine_memory_map (xsm_default_t def) { -return xsm_ops.machine_memory_map (); +return alternative_call (xsm_ops.machine_memory_map); }static inline int xsm_domain_memory_map (xsm_default_t def,struct domain *d) { -return xsm_ops.domain_memory_map (d); +return alternative_call (xsm_ops.domain_memory_map, d); }static inline int xsm_mmu_update (xsm_default_t def,struct domain *d,struct domain *t,struct domain *f,uint32_t flags) { -return xsm_ops.mmu_update (d, t, f, flags); +return alternative_call (xsm_ops.mmu_update, d, t, f, flags); }static inline int xsm_mmuext_op (xsm_default_t def,struct domain *d,struct domain *f) { -return xsm_ops.mmuext_op (d, f); +return alternative_call (xsm_ops.mmuext_op, d, f); } static inline int xsm_update_va_mapping(
@@ -703,64 +704,64 @@ static inline int xsm_update_va_mapping(static inline int xsm_priv_mapping (xsm_default_t def,struct domain *d,struct domain *t) { -return xsm_ops.priv_mapping (d, t); +return alternative_call (xsm_ops.priv_mapping, d, t); }static inline int xsm_ioport_permission (xsm_default_t def,struct domain *d,uint32_t s,uint32_t e,uint8_t allow) { -return xsm_ops.ioport_permission (d, s, e, allow); +return alternative_call (xsm_ops.ioport_permission, d, s, e, allow); }static inline int xsm_ioport_mapping (xsm_default_t def,struct domain *d,uint32_t s,uint32_t e,uint8_t allow) { -return xsm_ops.ioport_mapping (d, s, e, allow); +return alternative_call (xsm_ops.ioport_mapping, d, s, e, allow); }static inline int xsm_pmu_op (xsm_default_t def,struct domain *d,unsigned int op) { -return xsm_ops.pmu_op (d, op); +return alternative_call (xsm_ops.pmu_op, d, op); }#endif /* CONFIG_X86 */ static inline int xsm_dm_op (xsm_default_t def,struct domain *d) { -return xsm_ops.dm_op (d); +return alternative_call (xsm_ops.dm_op, d); }static inline int xsm_xen_version (xsm_default_t def,uint32_t op) { -return xsm_ops.xen_version (op); +return alternative_call (xsm_ops.xen_version, op); }static inline int xsm_domain_resource_map (xsm_default_t def,struct domain *d) { -return xsm_ops.domain_resource_map (d); +return alternative_call (xsm_ops.domain_resource_map, d); }#ifdef CONFIG_ARGO static inline int xsm_argo_enable (const struct domain *d) { -return xsm_ops.argo_enable (d); +return alternative_call (xsm_ops.argo_enable, d); }static inline int xsm_argo_register_single_source (const struct domain *d,const struct domain *t) { -return xsm_ops.argo_register_single_source (d, t); +return alternative_call (xsm_ops.argo_register_single_source, d, t); }static inline int xsm_argo_register_any_source (const struct domain *d) { -return xsm_ops.argo_register_any_source (d); +return alternative_call (xsm_ops.argo_register_any_source, d); }static inline int xsm_argo_send (const struct domain *d,const struct domain *t) { -return xsm_ops.argo_send (d, t); +return alternative_call (xsm_ops.argo_send, d, t); }#endif /* CONFIG_ARGO */
Signature · 1 line
2.20.1
PATCH v6 8/10 xsm: decouple xsm header inclusion selection
In reply to Daniel P. SmithMultiple preprocessor defines were used as a mechanism to selective include parts of the xsm.h header file. This makes it difficult to know which portion is being included at any one time. This commit works to simplify this by separating the core structures and functions of XSM into xsm-core.h away from the wrapper functions which remain in xsm.h and dummy.h.
--- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm-core.h | 267 +++++++++++++++++++++++++++++++++++++ xen/include/xsm/xsm.h | 248 +--------------------------------- xen/xsm/dummy.c | 1 - xen/xsm/silo.c | 2 +- xen/xsm/xsm_core.c | 5 + 6 files changed, 275 insertions(+), 250 deletions(-) create mode 100644 xen/include/xsm/xsm-core.h
xen/include/xsm/dummy.h +1 -1
@@ -16,7 +16,7 @@*/ #include <xen/sched.h> -#include <xsm/xsm.h> +#include <xsm/xsm-core.h> #include <public/hvm/params.h> /*
xen/include/xsm/xsm-core.h new file +267 -0
267 lines not on this page · raw message
xen/include/xsm/xsm.h +1 -247
269 lines not on this page · raw message
xen/xsm/dummy.c +0 -1
@@ -10,7 +10,6 @@* as published by the Free Software Foundation. */ -#define XSM_NO_WRAPPERS #include <xsm/dummy.h> #define set_to_dummy_if_null (ops, function) \
xen/xsm/silo.c +1 -1
@@ -17,7 +17,7 @@* You should have received a copy of the GNU General Public License along with * this program; If not, see <http://www.gnu.org/licenses/>. */ -#define XSM_NO_WRAPPERS +#include <xsm/xsm-core.h> #include <xsm/dummy.h> /*
xen/xsm/xsm_core.c +5 -0
@@ -32,6 +32,11 @@struct xsm_ops __read_mostly xsm_ops; +#ifdef CONFIG_XSM_FLASK_POLICY +extern const unsigned char xsm_flask_init_policy[]; +extern const unsigned int xsm_flask_init_policy_size; +#endif +enum xsm_ops_state {XSM_OPS_UNREGISTERED ,XSM_OPS_REG_FAILED ,
Signature · 1 line
2.20.1
PATCH v6 9/10 kconfig: update xsm config to reflect reality
In reply to Daniel P. SmithIt has been a very long time since XSM Flask was the only XSM module, yet the concenpt of turning XSM on/off continues to be synonymous with enabling and disabling XSM Flask. Even when XSM Flask was the only module, turning XSM on/off did not disable or remove the XSM hooks but simply controlled whether they were implemented as direct inline functions or dispatch calls.
This commit updates XSM kconfig to ensure that it is clear in the code as well to the user, via the help messages, that the option is about configuring which XSM policy module(s) are available and which is the default.
--- xen/common/Kconfig | 49 ++++++++++++++++++-------------------- xen/include/xen/sched.h | 2 +- xen/include/xsm/dummy.h | 23 +++++++++--------- xen/include/xsm/xsm-core.h | 6 ++--- xen/include/xsm/xsm.h | 6 ++--- xen/xsm/Makefile | 4 ++-- xen/xsm/xsm_core.c | 4 ++-- 7 files changed, 46 insertions(+), 48 deletions(-)
xen/common/Kconfig +23 -26
@@ -200,23 +200,20 @@ config XENOPROF If unsure, say Y. -config XSM - bool "Xen Security Modules support" +config XSM_CONFIGURABLE + bool "Configure Xen Security Modules" default ARM - ---help--- - Enables the security framework known as Xen Security Modules which - allows administrators fine-grained control over a Xen domain and - its capabilities by defining permissible interactions between domains, - the hypervisor itself, and related resources such as memory and - devices. + help + Allows for configuring the Xen Security Modules (XSM) policy or policies + modules that will be availble and which will be the default. If unsure, say N. config XSM_FLASK - def_bool y - prompt "FLux Advanced Security Kernel support" - depends on XSM - ---help--- + bool "FLux Advanced Security Kernel support" + depends on XSM_CONFIGURABLE + select XSM_EVTCHN_LABELING + help Enables FLASK (FLux Advanced Security Kernel) as the access control mechanism used by the XSM framework. This provides a mandatory access control framework by which security enforcement, isolation, and
@@ -226,10 +223,10 @@ config XSM_FLASK If unsure, say Y. config XSM_FLASK_AVC_STATS - def_bool y - prompt "Maintain statistics on the FLASK access vector cache" if EXPERT + bool "Maintain statistics on the FLASK access vector cache" if EXPERT + default y depends on XSM_FLASK - ---help--- + help Maintain counters on the access vector cache that can be viewed using the FLASK_AVC_CACHESTATS sub-op of the xsm_op hypercall. Disabling this will save a tiny amount of memory and time to update the stats.
@@ -240,7 +237,7 @@ config XSM_FLASK_POLICY bool "Compile Xen with a built-in FLASK security policy" default y if "$(XEN_HAS_CHECKPOLICY)" = "y" depends on XSM_FLASK - ---help--- + help This includes a default XSM policy in the hypervisor so that the bootloader does not need to load a policy to get sane behavior from an XSM-enabled hypervisor. If this is disabled, a policy must be
@@ -253,10 +250,10 @@ config XSM_FLASK_POLICY If unsure, say Y. config XSM_SILO - def_bool y - prompt "SILO support" - depends on XSM - ---help--- + bool "SILO support" + default y if ARM + depends on XSM_CONFIGURABLE + help Enables SILO as the access control mechanism used by the XSM framework. This is not the default module, add boot parameter xsm=silo to choose it. This will deny any unmediated communication channels (grant tables
@@ -265,14 +262,14 @@ config XSM_SILO If unsure, say Y. choice - prompt "Default XSM implementation" - depends on XSM + prompt "Default XSM module" + depends on XSM_CONFIGURABLE default XSM_SILO_DEFAULT if XSM_SILO && ARM default XSM_FLASK_DEFAULT if XSM_FLASK default XSM_SILO_DEFAULT if XSM_SILO default XSM_DUMMY_DEFAULT config XSM_DUMMY_DEFAULT - bool "Match non-XSM behavior" + bool "Classic Dom0 behavior" config XSM_FLASK_DEFAULT bool "FLux Advanced Security Kernel" if XSM_FLASK config XSM_SILO_DEFAULT
@@ -282,15 +279,15 @@ endchoice config LATE_HWDOM bool "Dedicated hardware domain" default n - depends on XSM && X86 - ---help--- + depends on XSM_FLASK && X86 + help Allows the creation of a dedicated hardware domain distinct from domain 0 that manages devices without needing access to other privileged functionality such as the ability to manage domains. This requires that the actual domain 0 be a stub domain that constructs the actual hardware domain instead of initializing the hardware itself. Because the hardware domain needs access to - hypercalls not available to unprivileged guests, an XSM policy + hypercalls not available to unprivileged guests, an XSM Flask policy is required to properly define the privilege of these domains. This feature does nothing if the "hardware_dom" boot parameter is
xen/include/xen/sched.h +1 -1
@@ -120,7 +120,7 @@ struct evtchnunsigned short notify_vcpu_id;/* VCPU for local delivery notification */ uint32_t fifo_lastq;/* Data for identifying last queue. */ -#ifdef CONFIG_XSM +#ifdef CONFIG_XSM_CONFIGURABLE union { #ifdef XSM_NEED_GENERIC_EVTCHN_SSID /*
xen/include/xsm/dummy.h +12 -11
@@ -43,13 +43,13 @@ static inline void __xsm_action_mismatch_detected(void)void __xsm_action_mismatch_detected (void );#endif -#ifdef CONFIG_XSM +#ifdef CONFIG_XSM_CONFIGURABLE /* -* In CONFIG_XSM builds, this header file is included from xsm/dummy.c, and -* contains static (not inline) functions compiled to the dummy XSM module. -* There is no xsm_default_t argument available, so the value from the assertion -* is used to initialize the variable. +* In CONFIG_XSM_CONFIGURABLE builds, this header file is included from +* xsm/dummy.c, and contains static (not inline) functions compiled to the +* dummy XSM module. There is no xsm_default_t argument available, so the +* value from the assertion is used to initialize the variable. */ #define XSM_INLINE __maybe_unused
@@ -57,20 +57,21 @@ void __xsm_action_mismatch_detected(void);#define XSM_DEFAULT_VOID void#define XSM_ASSERT_ACTION (def) xsm_default_t action = def; (void)action -#else /* CONFIG_XSM */ +#else /* CONFIG_XSM_CONFIGURABLE */ /* -* In !CONFIG_XSM builds, this header file is included from xsm/xsm.h, and -* contains inline functions for each XSM hook. These functions also perform -* compile-time checks on the xsm_default_t argument to ensure that the behavior -* of the dummy XSM module is the same as the behavior with XSM disabled. +* In !CONFIG_XSM_CONFIGURABLE builds, this header file is included from +* xsm/xsm.h, and contains inline functions for each XSM hook. These functions +* also perform compile-time checks on the xsm_default_t argument to ensure +* that the behavior of the dummy XSM module is the same as the behavior with +* XSM disabled. */ #define XSM_INLINE always_inline#define XSM_DEFAULT_ARG xsm_default_t action,#define XSM_DEFAULT_VOID xsm_default_t action#define XSM_ASSERT_ACTION (def) LINKER_BUG_ON(def != action) -#endif /* CONFIG_XSM */ +#endif /* CONFIG_XSM_CONFIGURABLE */ static always_inline int xsm_default_action(xsm_default_t action,struct domain *src,struct domain *target)
xen/include/xsm/xsm-core.h +3 -3
@@ -199,7 +199,7 @@ struct xsm_ops {void xsm_fixup_ops (struct xsm_ops *ops); -#ifdef CONFIG_XSM +#ifdef CONFIG_XSM_CONFIGURABLE #ifdef CONFIG_MULTIBOOT int xsm_multiboot_init(
@@ -240,7 +240,7 @@ static const inline struct xsm_ops *silo_init(void) }#endif -#else /* CONFIG_XSM */ +#else /* CONFIG_XSM_CONFIGURABLE */ #ifdef CONFIG_MULTIBOOT static inline int xsm_multiboot_init(
@@ -262,6 +262,6 @@ static inline bool has_xsm_magic(paddr_t start) }#endif /* CONFIG_HAS_DEVICE_TREE */ -#endif /* CONFIG_XSM */ +#endif /* CONFIG_XSM_CONFIGURABLE */ #endif /* __XSM_CORE_H */
xen/include/xsm/xsm.h +3 -3
@@ -20,7 +20,7 @@#include <xen/multiboot.h> #include <xsm/xsm-core.h> -#ifdef CONFIG_XSM +#ifdef CONFIG_XSM_CONFIGURABLE extern struct xsm_ops xsm_ops;
@@ -590,10 +590,10 @@ static inline int xsm_argo_send(const struct domain *d, const struct domain *t)#endif /* CONFIG_ARGO */ -#else /* CONFIG_XSM */ +#else /* CONFIG_XSM_CONFIGURABLE */ #include <xsm/dummy.h> -#endif /* CONFIG_XSM */ +#endif /* CONFIG_XSM_CONFIGURABLE */ #endif /* __XSM_H */
xen/xsm/Makefile +2 -2
@@ -1,6 +1,6 @@ obj-y += xsm_core.o -obj-$(CONFIG_XSM) += xsm_policy.o -obj-$(CONFIG_XSM) += dummy.o +obj-$(CONFIG_XSM_CONFIGURABLE) += xsm_policy.o +obj-$(CONFIG_XSM_CONFIGURABLE) += dummy.o obj-$(CONFIG_XSM_SILO) += silo.o obj-$(CONFIG_XSM_FLASK) += flask/
xen/xsm/xsm_core.c +2 -2
@@ -18,7 +18,7 @@#include <xen/hypercall.h> #include <xsm/xsm.h> -#ifdef CONFIG_XSM +#ifdef CONFIG_XSM_CONFIGURABLE #ifdef CONFIG_MULTIBOOT #include <asm/setup.h>
@@ -222,7 +222,7 @@ bool __init has_xsm_magic(paddr_t start) }#endif -#endif +#endif /* CONFIG_XSM_CONFIGURABLE */ long do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) {
Signature · 1 line
2.20.1
Re: [PATCH v6 09/10] kconfig: update xsm config to reflect reality
Quoted 25 lines · Daniel P. Smith
xen/common/Kconfig +5
-9@@ -200,23 +200,20 @@ config XENOPROF If unsure, say Y. -config XSM - bool "Xen Security Modules support" +config XSM_CONFIGURABLE + bool "Configure Xen Security Modules" default ARM - ---help--- - Enables the security framework known as Xen Security Modules which - allows administrators fine-grained control over a Xen domain and - its capabilities by defining permissible interactions between domains, - the hypervisor itself, and related resources such as memory and - devices. + help + Allows for configuring the Xen Security Modules (XSM) policy or policies + modules that will be availble and which will be the default. If unsure, say N. config XSM_FLASK - def_bool y
xen/common/Kconfig config XENOPROF · line 219
Quoted 10 lines
xen/common/Kconfig +4
-3- prompt "FLux Advanced Security Kernel support" - depends on XSM - ---help--- + bool "FLux Advanced Security Kernel support" + depends on XSM_CONFIGURABLE + select XSM_EVTCHN_LABELING + help Enables FLASK (FLux Advanced Security Kernel) as the access control mechanism used by the XSM framework. This provides a mandatory access control framework by which security enforcement, isolation, and
I continue to think that the default here and ...
Quoted 5 lines
xen/common/Kconfig +0
-1@@ -253,10 +250,10 @@ config XSM_FLASK_POLICY If unsure, say Y. config XSM_SILO - def_bool y
xen/common/Kconfig config XSM_FLASK_POLICY · line 259
Quoted 10 lines
xen/common/Kconfig +4
-3- prompt "SILO support" - depends on XSM - ---help--- + bool "SILO support" + default y if ARM + depends on XSM_CONFIGURABLE + help Enables SILO as the access control mechanism used by the XSM framework. This is not the default module, add boot parameter xsm=silo to choose it. This will deny any unmediated communication channels (grant tables
... here should not change. If it changes, the change needs justifying in the description.
Quoted 7 lines
xen/common/Kconfig +1
-2@@ -282,15 +279,15 @@ endchoice config LATE_HWDOM bool "Dedicated hardware domain" default n - depends on XSM && X86 - ---help--- + depends on XSM_FLASK && X86
xen/common/Kconfig endchoice · line 291
Quoted 10 lines
xen/common/Kconfig +2
-1+ help Allows the creation of a dedicated hardware domain distinct from domain 0 that manages devices without needing access to other privileged functionality such as the ability to manage domains. This requires that the actual domain 0 be a stub domain that constructs the actual hardware domain instead of initializing the hardware itself. Because the hardware domain needs access to - hypercalls not available to unprivileged guests, an XSM policy + hypercalls not available to unprivileged guests, an XSM Flask policy is required to properly define the privilege of these domains.
I also continue to think that this would better be a separate change. Or if not, the seemingly unrelated change needs mentioning in the description (to make clear it's not a stray change).
Jan
Re: [PATCH v6 09/10] kconfig: update xsm config to reflect reality
Quoted 42 lines · Jan Beulich
Quoted 25 lines · Daniel P. Smith
xen/common/Kconfig +5
-9@@ -200,23 +200,20 @@ config XENOPROF If unsure, say Y. -config XSM - bool "Xen Security Modules support" +config XSM_CONFIGURABLE + bool "Configure Xen Security Modules" default ARM - ---help--- - Enables the security framework known as Xen Security Modules which - allows administrators fine-grained control over a Xen domain and - its capabilities by defining permissible interactions between domains, - the hypervisor itself, and related resources such as memory and - devices. + help + Allows for configuring the Xen Security Modules (XSM) policy or policies + modules that will be availble and which will be the default. If unsure, say N. config XSM_FLASK - def_bool yxen/common/Kconfig config XENOPROF · line 219
Quoted 10 lines
xen/common/Kconfig +4
-3- prompt "FLux Advanced Security Kernel support" - depends on XSM - ---help--- + bool "FLux Advanced Security Kernel support" + depends on XSM_CONFIGURABLE + select XSM_EVTCHN_LABELING + help Enables FLASK (FLux Advanced Security Kernel) as the access control mechanism used by the XSM framework. This provides a mandatory access control framework by which security enforcement, isolation, andI continue to think that the default here and ...
Quoted 3 lines
xen/common/Kconfig +0
-0@@ -253,10 +250,10 @@ config XSM_FLASK_POLICY If unsure, say Y.
Quoted 15 lines
xen/common/Kconfig config XSM_FLASK_POLICY · line 259
Quoted 12 lines
xen/common/Kconfig +4
-4config XSM_SILO - def_bool y - prompt "SILO support" - depends on XSM - ---help--- + bool "SILO support" + default y if ARM + depends on XSM_CONFIGURABLE + help Enables SILO as the access control mechanism used by the XSM framework. This is not the default module, add boot parameter xsm=silo to choose it. This will deny any unmediated communication channels (grant tables... here should not change. If it changes, the change needs justifying in the description.
IMHO the configure system should not presumptuously assume that if a user selects XSM_CONFIGURABLE that the Flask module, which is not currently security supported, should be enabled. I would agree that we could turn on the SILO module since it is security supported. Later when I am able to get Flask into a security supported state, I would be all for enabling it as well. A more roadmap-ish idea is to see SILO subsumed as a select-able policy under Flask, but that is a bit of a digression.
I will add to the commit message to clarify this position that is being encoded.
Quoted 13 lines
Quoted 13 lines
xen/common/Kconfig +2
-2@@ -282,15 +279,15 @@ endchoice config LATE_HWDOM bool "Dedicated hardware domain" default n - depends on XSM && X86 - ---help--- + depends on XSM_FLASK && X86 + help Allows the creation of a dedicated hardware domain distinct from domain 0 that manages devices without needing access to other privileged functionality such as the ability to manage domains. This requires that the actual domain 0 be a stub domain that constructs the actual hardware domain instead of initializing the
Quoted 8 lines
xen/common/Kconfig endchoice · line 291
Quoted 4 lines
xen/common/Kconfig +1
-1hardware itself. Because the hardware domain needs access to - hypercalls not available to unprivileged guests, an XSM policy + hypercalls not available to unprivileged guests, an XSM Flask policy is required to properly define the privilege of these domains.I also continue to think that this would better be a separate change. Or if not, the seemingly unrelated change needs mentioning in the description (to make clear it's not a stray change).
Apologies that I missed the suggestion to break this out. Since this really is more of a general clean-up over being part of the intended improvement for this patch set, I will break it out and move it to the front of the patch set.
v/r,
dps
PATCH v6 10/10 xsm: remove alternate xsm hook interface
In reply to Daniel P. SmithHidden behind macro magic is an alternative xsm hook interface dedicated for use when the dummy/default policy is the only one built. This alternative interface increases code complexity and code size in the core security framework of Xen. This results in code requiring additional maintanence and additional risk for securit-relevant bugs.
This patch removes this additional interface, making Xen's security framework have a single, consistent interface that works in a single and consistent manner regardless of which XSM policy is in use.
--- xen/include/xsm/xsm-core.h | 51 ++- xen/include/xsm/xsm.h | 275 ++++++++++------ xen/xsm/Makefile | 2 +- xen/xsm/dummy.c | 2 +- xen/xsm/dummy.h | 659 +++++++++++++++++++++++++++++++++++++ xen/xsm/silo.c | 2 +- xen/xsm/xsm_core.c | 4 - 7 files changed, 868 insertions(+), 127 deletions(-) create mode 100644 xen/xsm/dummy.h
xen/include/xsm/xsm-core.h +25 -26
@@ -18,6 +18,31 @@#include <xen/sched.h> #include <xen/multiboot.h> +/* Cannot use BUILD_BUG_ON here because the expressions we check are not +* considered constant at compile time. Instead, rely on constant propagation to +* inline out the calls to this invalid function, which will cause linker errors +* if references remain at link time. +*/ +#define XSM_LINKER_BUG_ON (x) do { if (x) __xsm_action_mismatch_detected(); } while (0) + +#if defined(CONFIG_COVERAGE ) && defined(__clang__) +/* +* LLVM coverage support seems to disable some of the optimizations needed in +* order for XSM to compile. Since coverage should not be used in production +* provide an implementation of __xsm_action_mismatch_detected to satisfy the +* linker. +*/ +static inline void __xsm_action_mismatch_detected (void ) +{ +ASSERT_UNREACHABLE (); +} +#else +/* DO NOT implement this function; it is supposed to trigger link errors */ +void __xsm_action_mismatch_detected (void ); +#endif + +#define XSM_ASSERT_ACTION (def) XSM_LINKER_BUG_ON(def != action) +/* policy magic number */ typedef uint32_t xsm_magic_t ;
@@ -199,8 +224,6 @@ struct xsm_ops {void xsm_fixup_ops (struct xsm_ops *ops); -#ifdef CONFIG_XSM_CONFIGURABLE -#ifdef CONFIG_MULTIBOOT int xsm_multiboot_init (unsigned long *module_map,const multiboot_info_t *mbi);
@@ -240,28 +263,4 @@ static const inline struct xsm_ops *silo_init(void) }#endif -#else /* CONFIG_XSM_CONFIGURABLE */ - -#ifdef CONFIG_MULTIBOOT -static inline int xsm_multiboot_init ( -unsigned long *module_map,const multiboot_info_t *mbi) -{ -return 0 ; -} -#endif - -#ifdef CONFIG_HAS_DEVICE_TREE -static inline int xsm_dt_init (void ) -{ -return 0 ; -} - -static inline bool has_xsm_magic (paddr_t start) -{ -return false; -} -#endif /* CONFIG_HAS_DEVICE_TREE */ - -#endif /* CONFIG_XSM_CONFIGURABLE */ -#endif /* __XSM_CORE_H */
xen/include/xsm/xsm.h +181 -94
697 lines not on this page · raw message
xen/xsm/Makefile +1 -1
@@ -1,6 +1,6 @@ obj-y += xsm_core.o +obj-y += dummy.o obj-$(CONFIG_XSM_CONFIGURABLE) += xsm_policy.o -obj-$(CONFIG_XSM_CONFIGURABLE) += dummy.o obj-$(CONFIG_XSM_SILO) += silo.o obj-$(CONFIG_XSM_FLASK) += flask/
xen/xsm/dummy.c +1 -1
@@ -10,7 +10,7 @@* as published by the Free Software Foundation. */ -#include <xsm/dummy.h> +#include "dummy.h" #define set_to_dummy_if_null (ops, function) \ do { \
xen/xsm/dummy.h new file +659 -0
659 lines not on this page · raw message
xen/xsm/silo.c +1 -1
@@ -18,7 +18,7 @@* this program; If not, see <http://www.gnu.org/licenses/>. */ #include <xsm/xsm-core.h> -#include <xsm/dummy.h> +#include "dummy.h" /* * Check if inter-domain communication is allowed.
xen/xsm/xsm_core.c +0 -4
@@ -18,8 +18,6 @@#include <xen/hypercall.h> #include <xsm/xsm.h> -#ifdef CONFIG_XSM_CONFIGURABLE -#ifdef CONFIG_MULTIBOOT #include <asm/setup.h> #endif
@@ -222,8 +220,6 @@ bool __init has_xsm_magic(paddr_t start) }#endif -#endif /* CONFIG_XSM_CONFIGURABLE */ -long do_xsm_op (XEN_GUEST_HANDLE_PARAM (void ) op) {return xsm_do_xsm_op (op);
Signature · 1 line
2.20.1
Re: [PATCH v6 10/10] xsm: remove alternate xsm hook interface
Quoted 4 lines · Daniel P. Smith
Hidden behind macro magic is an alternative xsm hook interface dedicated for use when the dummy/default policy is the only one built. This alternative interface increases code complexity and code size in the core security framework of Xen.
What does "code size" refer to here? I would have expected the binaries to be smaller with inline functions in use. And ...
Quoted 10 lines
--- xen/include/xsm/xsm-core.h | 51 ++- xen/include/xsm/xsm.h | 275 ++++++++++------ xen/xsm/Makefile | 2 +- xen/xsm/dummy.c | 2 +- xen/xsm/dummy.h | 659 +++++++++++++++++++++++++++++++++++++ xen/xsm/silo.c | 2 +- xen/xsm/xsm_core.c | 4 - 7 files changed, 868 insertions(+), 127 deletions(-) create mode 100644 xen/xsm/dummy.h
... the statistics here suggest an increase in source code size.
Jan