xen/xsm: Improve alloc/free of evtchn buckets
PATCH 1/1 xen/xsm: Improve alloc/free of evtchn buckets
Currently, flask_alloc_security_evtchn() is called in loops of 64 (EVTCHNS_PER_BUCKET), which for non-dummy implementations is a function pointer call even in the no-op case. The non no-op case only sets a single constant, and doesn't actually fail.
Spectre v2 protections has made function pointer calls far more expensive, and 64 back-to-back calls is a waste. Rework the APIs to pass the size of the bucket instead, and call them once.
No practical change, but {alloc,free}_evtchn_bucket() should be rather more efficient now.
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>
CC: Daniel De Graaf <[email protected]>
CC: Daniel P. Smith <[email protected]>
Spotted while fixing up evtchn to use fault-ttl semantics for testing the error handling logic.
--- xen/common/event_channel.c | 36 ++++++++++++++++-------------------- xen/include/xsm/dummy.h | 4 ++-- xen/include/xsm/xsm.h | 12 ++++++------ xen/xsm/dummy.c | 4 ++-- xen/xsm/flask/hooks.c | 20 +++++++++++++------- 5 files changed, 39 insertions(+), 37 deletions(-)
xen/common/event_channel.c +16 -20
@@ -147,6 +147,14 @@ static bool virq_is_global(unsigned int virq)return true; } +static void free_evtchn_bucket (struct domain *d,struct evtchn *bucket) +{ +if ( !bucket ) +return ; + +xsm_free_security_evtchns (bucket,EVTCHNS_PER_BUCKET ); +xfree (bucket); +}static struct evtchn *alloc_evtchn_bucket (struct domain *d,unsigned int port) {
@@ -155,34 +163,22 @@ static struct evtchn *alloc_evtchn_bucket(struct domain *d, unsigned int port) chn = xzalloc_array(struct evtchn, EVTCHNS_PER_BUCKET);if ( !chn ) -return NULL ; + goto err; + +if (xsm_alloc_security_evtchns (chn,EVTCHNS_PER_BUCKET ) ) + goto err;for ( i =0 ; i <EVTCHNS_PER_BUCKET ; i++ ) { -if (xsm_alloc_security_evtchn (&chn[i]) ) - { -while ( i-- ) -xsm_free_security_evtchn (&chn[i]); -xfree (chn); -return NULL ; - } chn[i].port = port + i;rwlock_init (&chn[i].lock); } -return chn; -} - -static void free_evtchn_bucket (struct domain *d,struct evtchn *bucket) -{ -unsigned int i; -if ( !bucket ) -return ; - -for ( i =0 ; i <EVTCHNS_PER_BUCKET ; i++ ) -xsm_free_security_evtchn (bucket + i); +return chn; -xfree (bucket); + err: +free_evtchn_bucket (d, chn); +return NULL ; }int evtchn_allocate_port (struct domain *d,evtchn_port_t port)
xen/include/xsm/dummy.h +2 -2
@@ -309,12 +309,12 @@ static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, structreturn xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_alloc_security_evtchn(struct evtchn *chn) +static XSM_INLINE int xsm_alloc_security_evtchns(struct evtchn *chn, unsigned int nr) {return 0 ; } -static XSM_INLINE void xsm_free_security_evtchn(struct evtchn *chn) +static XSM_INLINE void xsm_free_security_evtchns(struct evtchn *chn, unsigned int nr) {return ; }
xen/include/xsm/xsm.h +6 -6
@@ -72,8 +72,8 @@ struct xsm_operations {int (*alloc_security_domain) (struct domain *d);void (*free_security_domain) (struct domain *d); -int (*alloc_security_evtchn) (struct evtchn *chn); -void (*free_security_evtchn) (struct evtchn *chn); +int (*alloc_security_evtchns) (struct evtchn *chn,unsigned int nr); +void (*free_security_evtchns) (struct evtchn *chn,unsigned int nr);char *(*show_security_evtchn) (struct domain *d,const struct evtchn *chn);int (*init_hardware_domain) (struct domain *d);
@@ -314,14 +314,14 @@ static inline void xsm_free_security_domain (struct domain *d) xsm_ops->free_security_domain (d); } -static inline int xsm_alloc_security_evtchn (struct evtchn *chn) +static inline int xsm_alloc_security_evtchns (struct evtchn *chn,unsigned int nr) { -return xsm_ops->alloc_security_evtchn (chn); +return xsm_ops->alloc_security_evtchns (chn, nr); } -static inline void xsm_free_security_evtchn (struct evtchn *chn) +static inline void xsm_free_security_evtchns (struct evtchn *chn,unsigned int nr) { - (void )xsm_ops->free_security_evtchn (chn); + xsm_ops->free_security_evtchns (chn, nr); }static inline char *xsm_show_security_evtchn (struct domain *d,const struct evtchn *chn)
xen/xsm/dummy.c +2 -2
@@ -49,8 +49,8 @@ void __init xsm_fixup_ops (struct xsm_operations *ops)set_to_dummy_if_null (ops, alloc_security_domain);set_to_dummy_if_null (ops, free_security_domain); -set_to_dummy_if_null (ops, alloc_security_evtchn); -set_to_dummy_if_null (ops, free_security_evtchn); +set_to_dummy_if_null (ops, alloc_security_evtchns); +set_to_dummy_if_null (ops, free_security_evtchns);set_to_dummy_if_null (ops, show_security_evtchn);set_to_dummy_if_null (ops, init_hardware_domain);
xen/xsm/flask/hooks.c +13 -7
@@ -307,19 +307,25 @@ static int flask_evtchn_reset(struct domain *d1, struct domain *d2)return domain_has_perm (d1, d2,SECCLASS_EVENT ,EVENT__RESET ); } -static int flask_alloc_security_evtchn (struct evtchn *chn) +static int flask_alloc_security_evtchns (struct evtchn *chn,unsigned int nr) { - chn->ssid.flask_sid =SECINITSID_UNLABELED ; +unsigned int i; + +for ( i =0 ; i < nr; ++i ) + chn[i].ssid.flask_sid =SECINITSID_UNLABELED ; -return 0 ; +return 0 ; } -static void flask_free_security_evtchn (struct evtchn *chn) +static void flask_free_security_evtchns (struct evtchn *chn,unsigned int nr) { +unsigned int i; +if ( !chn )return ; - chn->ssid.flask_sid =SECINITSID_UNLABELED ; +for ( i =0 ; i < nr; ++i ) + chn[i].ssid.flask_sid =SECINITSID_UNLABELED ; }static char *flask_show_security_evtchn (struct domain *d,const struct evtchn *chn)
@@ -1766,8 +1772,8 @@ static struct xsm_operations flask_ops = { .alloc_security_domain = flask_domain_alloc_security, .free_security_domain = flask_domain_free_security, - .alloc_security_evtchn = flask_alloc_security_evtchn, - .free_security_evtchn = flask_free_security_evtchn, + .alloc_security_evtchns = flask_alloc_security_evtchns, + .free_security_evtchns = flask_free_security_evtchns, .show_security_evtchn = flask_show_security_evtchn, .init_hardware_domain = flask_init_hardware_domain,
Signature · 1 line
2.11.0
xen/common/event_channel.c static bool virq_is_global(unsigned int virq) · line 153
Quoted 10 lines · Andrew Cooper
xen/common/event_channel.c +4
-0@@ -147,6 +147,14 @@ static bool virq_is_global(unsigned int virq)return true; } +static void free_evtchn_bucket (struct domain *d,struct evtchn *bucket) +{ +if ( !bucket ) +return ;
You could avoid this since flask_free_security_evtchns() has a similar check. Alternatively it could be dropped from there. But even if you want to keep the duplication
One further aspect to consider though:
xen/include/xsm/dummy.h static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, struct · line 312
Quoted 8 lines
xen/include/xsm/dummy.h +1
-1@@ -309,12 +309,12 @@ static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, structreturn xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_alloc_security_evtchn(struct evtchn *chn) +static XSM_INLINE int xsm_alloc_security_evtchns(struct evtchn *chn, unsigned int nr)
I wonder whether we wouldn't better identify the difference between pointer (to individual element) and array by writing this (and others below) as
static XSM_INLINE int xsm_alloc_security_evtchns(struct evtchn chn[], unsigned int nr)
I think we've done so in a few places already, but of course it would be a long way to get the entire code base consistent in this regard. Plus of course while this works fine in function declarations / definitions, it won't be possible to use for struct / union fields.
Also it looks like this and further lines have become overly long.
Jan
Quoted 7 lines · Jan Beulich
Quoted 6 lines · Andrew Cooper
xen/common/event_channel.c +0
-0@@ -147,6 +147,14 @@ static bool virq_is_global(unsigned int virq)return true; }
Quoted 6 lines
xen/common/event_channel.c static bool virq_is_global(unsigned int virq) · line 153
Quoted 4 lines
xen/common/event_channel.c +4
-0+static void free_evtchn_bucket (struct domain *d,struct evtchn *bucket) +{ +if ( !bucket ) +return ;You could avoid this since
flask_free_security_evtchns()has a similar check. Alternatively it could be dropped from there.
I considered altering both. However, all functions like this really should be idempotent.
For this case, the compiler can drop the check from both callsites, and its safer if the structure of the callers change in the future.
Quoted 2 lines
But even if you want to keep the duplication
Reviewed-by Jan Beulich <[email protected]>
Thanks.
Quoted 9 lines
One further aspect to consider though:
Quoted 6 lines
xen/include/xsm/dummy.h +0
-0@@ -309,12 +309,12 @@ static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, structreturn xsm_default_action (action, d1, d2); }
Quoted 7 lines
xen/include/xsm/dummy.h static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, struct · line 312
Quoted 2 lines
xen/include/xsm/dummy.h +1
-1-static XSM_INLINE int xsm_alloc_security_evtchn(struct evtchn *chn) +static XSM_INLINE int xsm_alloc_security_evtchns(struct evtchn *chn, unsigned int nr)I wonder whether we wouldn't better identify the difference between pointer (to individual element) and array by writing this (and others below) as
static
XSM_INLINEintxsm_alloc_security_evtchns(struct evtchn chn[], unsigned int nr)
In which case want we want is (unsigned int nr, struct evtchn chn[nr]) which I think is the C99 way of writing this to help static analysis.
Quoted 8 lines
I think we've done so in a few places already, but of course it would be a long way to get the entire code base consistent in this regard. Plus of course while this works fine in function declarations / definitions, it won't be possible to use for struct / union fields.
Also it looks like this and further lines have become overly long.
Everything is long lines in this area of code. Its all due an overhaul.
~Andrew
Daniel P. Smith
Reviewed-byQuoted 18 lines · Andrew Cooper
Quoted 7 lines · Jan Beulich
Quoted 6 lines · Andrew Cooper
xen/common/event_channel.c +0
-0@@ -147,6 +147,14 @@ static bool virq_is_global(unsigned int virq)return true; }Quoted 6 lines
xen/common/event_channel.c static bool virq_is_global(unsigned int virq) · line 153
Quoted 4 lines
xen/common/event_channel.c +4
-0+static void free_evtchn_bucket (struct domain *d,struct evtchn *bucket) +{ +if ( !bucket ) +return ;You could avoid this since
flask_free_security_evtchns()has a similar check. Alternatively it could be dropped from there.I considered altering both. However, all functions like this really should be idempotent.
Quoted 7 lines
For this case, the compiler can drop the check from both callsites, and its safer if the structure of the callers change in the future.
Quoted 2 lines
But even if you want to keep the duplication
Reviewed-by Jan Beulich <[email protected]>Thanks.
You can add,
Quoted 15 lines
Quoted 15 lines
One further aspect to consider though:
xen/include/xsm/dummy.h static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, struct · line 312
Quoted 8 lines
xen/include/xsm/dummy.h +1
-1@@ -309,12 +309,12 @@ static XSM_INLINE int xsm_evtchn_reset(XSM_DEFAULT_ARG struct domain *d1, structreturn xsm_default_action (action, d1, d2); } -static XSM_INLINE int xsm_alloc_security_evtchn(struct evtchn *chn) +static XSM_INLINE int xsm_alloc_security_evtchns(struct evtchn *chn, unsigned int nr)I wonder whether we wouldn't better identify the difference between pointer (to individual element) and array by writing this (and others below) as
Quoted 4 lines
Quoted 1 line
static
XSM_INLINEintxsm_alloc_security_evtchns(struct evtchn chn[], unsigned int nr)In which case want we want is (unsigned int nr, struct evtchn chn[nr]) which I think is the C99 way of writing this to help static analysis.
Would it be better to switch this to the (unsigned int nr, struct evtchn chn[nr]) you suggested now or wait to make the change uniform? IMHO it is probably better for the sake of existing consistency to keep what you have here, with the understanding that this might get redone as part of a larger function semantic change.
Quoted 13 lines
Quoted 8 lines
I think we've done so in a few places already, but of course it would be a long way to get the entire code base consistent in this regard. Plus of course while this works fine in function declarations / definitions, it won't be possible to use for struct / union fields.
Also it looks like this and further lines have become overly long.
Everything is long lines in this area of code. Its all due an overhaul.
~Andrew