libselinux: cache avc_compute_create results in the avc
PATCH 1/1 libselinux: cache avc_compute_create results in the avc
In one benchmark the X server was found to be extremely slow creating windows with selinux running. Part of the reason for this was because libselinux called into the kernel /selinux/create interface for every object. This patch caches the results of /selinux/create in the userspace avc to significantly increase the speed of these types of operations.
---
include/selinux/avc.h | 1 src/avc.c | 113 ++++++++++++++++++++++++++++++++++++-------------- src/avc_internal.h | 2 3 files changed, 85 insertions(+), 31 deletions(-)
include/selinux/avc.h renamed from include/selinux/avc.h.pre.create +1 -0
@@ -353,6 +353,7 @@ int avc_compute_member(security_id_t ssi#define AVC_CALLBACK_AUDITALLOW_DISABLE 32#define AVC_CALLBACK_AUDITDENY_ENABLE 64#define AVC_CALLBACK_AUDITDENY_DISABLE 128 +#define AVC_CALLBACK_ADD_CREATE 256/** * avc_add_callback - Register a callback for security events.
src/avc.c renamed from src/avc.c.pre.create +82 -31
215 lines not on this page · raw message
src/avc_internal.h renamed from src/avc_internal.h.pre.create +2 -0
@@ -173,6 +173,8 @@ int avc_ss_try_revoke(security_id_t ssid int avc_ss_revoke(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, uint32_t seqno) hidden; +int avc_ss_add_create(security_id_t ssid,security_id_t tsid, + security_class_t tclass, security_id_t csid) hidden; int avc_ss_reset(uint32_t seqno) hidden; int avc_ss_set_auditallow(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms,
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Quoted 9 lines · Eric Paris
In one benchmark the X server was found to be extremely slow creating windows with selinux running. Part of the reason for this was because libselinux called into the kernel /selinux/create interface for every object. This patch caches the results of /selinux/create in the userspace avc to significantly increase the speed of these types of operations.
Signed-off-by Eric Paris <[email protected]>
There's some sloppy locking going on in avc_compute_create(), and I don't think I want the ADD_CREATE command exposed in the header file, since it's just an internal caching operation, not an external stimuli like a revoke or reset. But I'll fix these 2 things up myself and push it tomorrow, along with ajax's socket handoff patches. Thanks for doing this.
Quoted 265 lines
---
include/selinux/avc.h | 1 src/avc.c | 113 ++++++++++++++++++++++++++++++++++++-------------- src/avc_internal.h | 2 3 files changed, 85 insertions(+), 31 deletions(-)diff -up libselinux-2.0.78/include/selinux/avc.h.pre.create
libselinux-2.0.78/include/selinux/avc.hinclude/selinux/avc.h renamed from include/selinux/avc.h.pre.create +1
-0@@ -353,6 +353,7 @@ int avc_compute_member(security_id_t ssi#define AVC_CALLBACK_AUDITALLOW_DISABLE 32#define AVC_CALLBACK_AUDITDENY_ENABLE 64#define AVC_CALLBACK_AUDITDENY_DISABLE 128 +#define AVC_CALLBACK_ADD_CREATE 256/** * avc_add_callback - Register a callback for security events. diff -up libselinux-2.0.78/src/avc.c.pre.create
libselinux-2.0.78/src/avc.csrc/avc.c renamed from src/avc.c.pre.create +82
-31@@ -20,6 +20,7 @@ struct avc_entry {security_id_t tsid;security_class_t tclass;struct av_decision avd; +security_id_t create_sid;int used;/* used recently */ };@@ -340,6 +341,15 @@ static inline struct avc_node *avc_reclareturn cur; } +static inline void avc_clear_avc_entry (struct avc_entry *ae) +{ + ae->ssid = ae->tsid = ae->create_sid =NULL ; + ae->tclass =0 ; + ae->avd.allowed = ae->avd.decided =0 ; + ae->avd.auditallow = ae->avd.auditdeny =0 ; + ae->used =0 ; +} +static inline struct avc_node *avc_claim_node (security_id_t ssid,security_id_t tsid,security_class_t tclass)@@ -361,6 +371,7 @@ static inline struct avc_node *avc_claim } hvalue =avc_hash (ssid, tsid, tclass); +avc_clear_avc_entry (&new->ae); new->ae.used =1 ; new->ae.ssid = ssid; new->ae.tsid = tsid;@@ -498,8 +509,8 @@ static int avc_insert(security_id_t ssid* avc_remove - Remove AVC and sidtab entries for SID. * @sid: security identifier to be removed * -* Remove all AVC entries containing @sid as source -* or target, and remove @sid from the SID table. +* Remove all AVC entries containing @sid as source, target, or +* create_sid, and remove @sid from the SID table. * Free the memory allocated for the structure corresponding * to @sid. After this function has been called, @sid must * not be used until another call to avc_context_to_sid() has @@ -514,19 +525,15 @@ static void avc_remove(security_id_t sid cur = avc_cache.slots[i]; prev =NULL ;while (cur) { -if (sid == cur->ae.ssid || sid == cur->ae.tsid) { +if (sid == cur->ae.ssid || sid == cur->ae.tsid || + sid == cur->ae.create_sid) {if (prev) prev->next = cur->next;else avc_cache.slots[i] = cur->next; tmp = cur; cur = cur->next; - tmp->ae.ssid = tmp->ae.tsid =NULL ; - tmp->ae.tclass =0 ; - tmp->ae.avd.allowed = tmp->ae.avd.decided =0 ; - tmp->ae.avd.auditallow = tmp->ae.avd.auditdeny = -0 ; - tmp->ae.used =0 ; +avc_clear_avc_entry (&tmp->ae); tmp->next = avc_node_freelist; avc_node_freelist = tmp; avc_cache.active_nodes--;@@ -570,11 +577,7 @@ int avc_reset(void)while (node) { tmp = node; node = node->next; - tmp->ae.ssid = tmp->ae.tsid =NULL ; - tmp->ae.tclass =0 ; - tmp->ae.avd.allowed = tmp->ae.avd.decided =0 ; - tmp->ae.avd.auditallow = tmp->ae.avd.auditdeny =0 ; - tmp->ae.used =0 ; +avc_clear_avc_entry (&tmp->ae); tmp->next = avc_node_freelist; avc_node_freelist = tmp; avc_cache.active_nodes--;@@ -896,24 +899,51 @@ int avc_compute_create(security_id_t ssi security_class_t tclass, security_id_t *newsid) { int rc; +struct avc_entry_ref aeref; +security_context_t ctx =NULL ; + *newsid =NULL ; + +avc_entry_ref_init (&aeref); +retry:avc_get_lock (avc_lock); -if (ssid->refcnt >0 && tsid->refcnt >0 ) { -security_context_t ctx =NULL ; - rc =security_compute_create_raw (ssid->ctx, tsid->ctx, tclass, - &ctx); -if (rc) - goto out; - rc =sidtab_context_to_sid (&avc_sidtab, ctx, newsid); -if (!rc) - (*newsid)->refcnt++; -freecon (ctx); - }else { +if (ssid->refcnt <=0 || tsid->refcnt <=0 ) { errno =EINVAL ;/* bad reference count */ rc =-1 ; + goto out; + } + + rc =avc_lookup (ssid, tsid, tclass,0 , &aeref); +if (!rc) { +/* we found something in the avc */ +if (aeref.ae->create_sid) { + *newsid = aeref.ae->create_sid; + goto out; + }else { + goto compute; + } } +/* there is nothing in the avd for this tuple, so, lets get something */ +avc_release_lock (avc_lock); +avc_has_perm_noaudit (ssid, tsid, tclass,0 , &aeref,NULL ); + goto retry; + +compute: + rc =security_compute_create_raw (ssid->ctx, tsid->ctx, tclass, + &ctx); +if (rc) + goto out; + rc =sidtab_context_to_sid (&avc_sidtab, ctx, newsid); +if (rc) + goto out; + +avc_ss_add_create (ssid, tsid, tclass, *newsid); + out: +if (*newsid) + (*newsid)->refcnt++;avc_release_lock (avc_lock); +freecon (ctx);return rc; }@@ -978,7 +1008,8 @@ static inline int avc_sidcmp(security_id }static inline void avc_update_node (uint32_t event,struct avc_node *node, -access_vector_t perms) +access_vector_t perms, +security_id_t create_sid) {switch (event) {case AVC_CALLBACK_GRANT :@@ -1000,12 +1031,15 @@ static inline void avc_update_node(uint3case AVC_CALLBACK_AUDITDENY_DISABLE : node->ae.avd.auditdeny &= ~perms;break ; +case AVC_CALLBACK_ADD_CREATE : + node->ae.create_sid = create_sid; +break ; } }static int avc_update_cache (uint32_t event,security_id_t ssid,security_id_t tsid,security_class_t tclass, -access_vector_t perms) +access_vector_t perms,security_id_t create_sid) {struct avc_node *node;int i;@@ -1019,7 +1053,7 @@ static int avc_update_cache(uint32_t eveif (avc_sidcmp (ssid, node->ae.ssid) &&avc_sidcmp (tsid, node->ae.tsid) && tclass == node->ae.tclass) { -avc_update_node (event, node, perms); +avc_update_node (event, node, perms, create_sid); } } }@@ -1027,7 +1061,7 @@ static int avc_update_cache(uint32_t eve/* apply to one node */ node =avc_search_node (ssid, tsid, tclass,0 );if (node) { -avc_update_node (event, node, perms); +avc_update_node (event, node, perms, create_sid); } }@@ -1058,7 +1092,7 @@ static int avc_control(uint32_t event, s* been invoked to update the cache state. */ if (event !=AVC_CALLBACK_TRY_REVOKE ) -avc_update_cache (event, ssid, tsid, tclass, perms); +avc_update_cache (event, ssid, tsid, tclass, perms,NULL );for (c = avc_callbacks; c; c = c->next) { if ((c->events & event) &&@@ -1080,7 +1114,7 @@ static int avc_control(uint32_t event, sif (event ==AVC_CALLBACK_TRY_REVOKE ) {/* revoke any unretained permissions */ perms &= ~tretained; -avc_update_cache (event, ssid, tsid, tclass, perms); +avc_update_cache (event, ssid, tsid, tclass, perms,NULL ); *out_retained = tretained; }@@ -1150,6 +1184,23 @@ int avc_ss_revoke(security_id_t ssid, se ssid, tsid, tclass, perms, seqno, 0); } +/* +* avc_ss_add_create - Add the create_sid to the avc entry +* @ssid: source security identifier or %SECSID_WILD +* @tsid: target security identifier or %SECSID_WILD +* @tclass: target security class +* @csid: previously calculated create_sid to add to the avc entry +* +* Add the csid to the avc entry for the given tuple. +*/ +int avc_ss_add_create (security_id_t ssid,security_id_t tsid, +security_class_t tclass,security_id_t csid) +{ +return avc_update_cache (AVC_CALLBACK_ADD_CREATE , + ssid, tsid, tclass,0 , csid); + +} +/** * avc_ss_reset - Flush the cache and revalidate migrated permissions. * @seqno: policy sequence number diff -up libselinux-2.0.78/src/avc_internal.h.pre.create
libselinux-2.0.78/src/avc_internal.hsrc/avc_internal.h renamed from src/avc_internal.h.pre.create +2
-0@@ -173,6 +173,8 @@ int avc_ss_try_revoke(security_id_t ssid int avc_ss_revoke(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms, uint32_t seqno) hidden; +int avc_ss_add_create(security_id_t ssid,security_id_t tsid, + security_class_t tclass, security_id_t csid) hidden; int avc_ss_reset(uint32_t seqno) hidden; int avc_ss_set_auditallow(security_id_t ssid, security_id_t tsid, security_class_t tclass, access_vector_t perms,
Signature · 8 lines
Eamon Walsh <[email protected]> National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Eamon Walsh
AppliedQuoted 13 lines · Eamon Walsh
Quoted 10 lines · Eric Paris
In one benchmark the X server was found to be extremely slow creating windows with selinux running. Part of the reason for this was because libselinux called into the kernel /selinux/create interface for every object. This patch caches the results of /selinux/create in the userspace avc to significantly increase the speed of these types of operations.
Signed-off-by Eric Paris <[email protected]>
Quoted 7 lines
There's some sloppy locking going on in
avc_compute_create(), and I don't think I want theADD_CREATEcommand exposed in the header file, since it's just an internal caching operation, not an external stimuli like a revoke or reset. But I'll fix these 2 things up myself and push it tomorrow, along with ajax's socket handoff patches. Thanks for doing this.
Pushed to libselinux 2.0.79.
Signature · 8 lines
Eamon Walsh <[email protected]> National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.