* [PATCH v2 2/2] selinux: improve symtab string hashing
@ 2024-03-15 18:14 Christian Göttsche
2024-03-15 18:14 ` [PATCH v2 1/2] selinux: dump statistics for more hash tables Christian Göttsche
2024-03-27 23:26 ` [PATCH v2 2/2] selinux: improve symtab string hashing Paul Moore
0 siblings, 2 replies; 4+ messages in thread
From: Christian Göttsche @ 2024-03-15 18:14 UTC (permalink / raw
To: selinux; +Cc: Paul Moore, Stephen Smalley, Ondrej Mosnacek, linux-kernel
The number of buckets is calculated by performing a binary AND against
the mask of the hash table, which is one less than its size (which is a
power of two). This leads to all top bits being discarded, requiring
for short or similar inputs a hash function with a good avalanche
effect.
Use djb2a:
# current
common prefixes: 7 entries and 5/8 buckets used, longest chain length 2, sum of chain length^2 11
classes: 134 entries and 100/256 buckets used, longest chain length 5, sum of chain length^2 234
roles: 15 entries and 6/16 buckets used, longest chain length 5, sum of chain length^2 57
types: 4448 entries and 3016/8192 buckets used, longest chain length 41, sum of chain length^2 14922
users: 7 entries and 3/8 buckets used, longest chain length 3, sum of chain length^2 17
bools: 306 entries and 221/512 buckets used, longest chain length 4, sum of chain length^2 524
levels: 1 entries and 1/1 buckets used, longest chain length 1, sum of chain length^2 1
categories: 1024 entries and 400/1024 buckets used, longest chain length 4, sum of chain length^2 2740
# patch
common prefixes: 7 entries and 5/8 buckets used, longest chain length 2, sum of chain length^2 11
classes: 134 entries and 101/256 buckets used, longest chain length 3, sum of chain length^2 210
roles: 15 entries and 9/16 buckets used, longest chain length 3, sum of chain length^2 31
types: 4448 entries and 3459/8192 buckets used, longest chain length 5, sum of chain length^2 6778
users: 7 entries and 5/8 buckets used, longest chain length 3, sum of chain length^2 13
bools: 306 entries and 236/512 buckets used, longest chain length 5, sum of chain length^2 470
levels: 1 entries and 1/1 buckets used, longest chain length 1, sum of chain length^2 1
categories: 1024 entries and 518/1024 buckets used, longest chain length 7, sum of chain length^2 2992
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
v2:
add licensing note
---
security/selinux/ss/symtab.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/security/selinux/ss/symtab.c b/security/selinux/ss/symtab.c
index c04f8d447873..832660fd84a9 100644
--- a/security/selinux/ss/symtab.c
+++ b/security/selinux/ss/symtab.c
@@ -12,17 +12,17 @@
static unsigned int symhash(const void *key)
{
- const char *p, *keyp;
- unsigned int size;
- unsigned int val;
-
- val = 0;
- keyp = key;
- size = strlen(keyp);
- for (p = keyp; (p - keyp) < size; p++)
- val = (val << 4 | (val >> (8 * sizeof(unsigned int) - 4))) ^
- (*p);
- return val;
+ /*
+ * djb2a
+ * Public domain from cdb v0.75
+ */
+ unsigned int hash = 5381;
+ unsigned char c;
+
+ while ((c = *(const unsigned char *)key++))
+ hash = ((hash << 5) + hash) ^ c;
+
+ return hash;
}
static int symcmp(const void *key1, const void *key2)
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] selinux: dump statistics for more hash tables
2024-03-15 18:14 [PATCH v2 2/2] selinux: improve symtab string hashing Christian Göttsche
@ 2024-03-15 18:14 ` Christian Göttsche
2024-03-27 23:26 ` Paul Moore
2024-03-27 23:26 ` [PATCH v2 2/2] selinux: improve symtab string hashing Paul Moore
1 sibling, 1 reply; 4+ messages in thread
From: Christian Göttsche @ 2024-03-15 18:14 UTC (permalink / raw
To: selinux; +Cc: Paul Moore, Stephen Smalley, Ondrej Mosnacek, linux-kernel
Dump in the SELinux debug configuration the statistics for the
conditional rules avtab, the role transition, and class and common
permission hash tables.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
---
v2:
print key in hash_eval() for class and common tables
---
security/selinux/ss/conditional.c | 3 +++
security/selinux/ss/policydb.c | 23 ++++++++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index f12476855b27..e868fc403d75 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -169,6 +169,9 @@ int cond_init_bool_indexes(struct policydb *p)
p->p_bools.nprim, sizeof(*p->bool_val_to_struct), GFP_KERNEL);
if (!p->bool_val_to_struct)
return -ENOMEM;
+
+ avtab_hash_eval(&p->te_cond_avtab, "conditional_rules");
+
return 0;
}
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 3d22d5baa829..b0f688fe0737 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -672,14 +672,17 @@ static int (*const index_f[SYM_NUM])(void *key, void *datum, void *datap) = {
/* clang-format on */
#ifdef CONFIG_SECURITY_SELINUX_DEBUG
-static void hash_eval(struct hashtab *h, const char *hash_name)
+static void hash_eval(struct hashtab *h, const char *hash_name, const char *hash_details)
{
struct hashtab_info info;
hashtab_stat(h, &info);
pr_debug(
- "SELinux: %s: %d entries and %d/%d buckets used, longest chain length %d, sum of chain length^2 %llu\n",
- hash_name, h->nel, info.slots_used, h->size, info.max_chain_len,
+ "SELinux: %s%s%s: %d entries and %d/%d buckets used, longest chain length %d, sum of chain length^2 %llu\n",
+ hash_name,
+ hash_details ? "@" : "",
+ hash_details ?: "",
+ h->nel, info.slots_used, h->size, info.max_chain_len,
info.chain2_len_sum);
}
@@ -688,11 +691,11 @@ static void symtab_hash_eval(struct symtab *s)
int i;
for (i = 0; i < SYM_NUM; i++)
- hash_eval(&s[i].table, symtab_name[i]);
+ hash_eval(&s[i].table, symtab_name[i], NULL);
}
#else
-static inline void hash_eval(struct hashtab *h, const char *hash_name)
+static inline void hash_eval(struct hashtab *h, const char *hash_name, const char *hash_details)
{
}
static inline void symtab_hash_eval(struct symtab *s)
@@ -1178,6 +1181,8 @@ static int common_read(struct policydb *p, struct symtab *s, void *fp)
goto bad;
}
+ hash_eval(&comdatum->permissions.table, "common_permissions", key);
+
rc = symtab_insert(s, key, comdatum);
if (rc)
goto bad;
@@ -1358,6 +1363,8 @@ static int class_read(struct policydb *p, struct symtab *s, void *fp)
goto bad;
}
+ hash_eval(&cladatum->permissions.table, "class_permissions", key);
+
rc = read_cons_helper(p, &cladatum->constraints, ncons, 0, fp);
if (rc)
goto bad;
@@ -1898,7 +1905,7 @@ static int range_read(struct policydb *p, void *fp)
rt = NULL;
r = NULL;
}
- hash_eval(&p->range_tr, "rangetr");
+ hash_eval(&p->range_tr, "rangetr", NULL);
rc = 0;
out:
kfree(rt);
@@ -2116,7 +2123,7 @@ static int filename_trans_read(struct policydb *p, void *fp)
return rc;
}
}
- hash_eval(&p->filename_trans, "filenametr");
+ hash_eval(&p->filename_trans, "filenametr", NULL);
return 0;
}
@@ -2649,6 +2656,8 @@ int policydb_read(struct policydb *p, void *fp)
rtd = NULL;
}
+ hash_eval(&p->role_tr, "roletr", NULL);
+
rc = next_entry(buf, fp, sizeof(u32));
if (rc)
goto bad;
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] selinux: dump statistics for more hash tables
2024-03-15 18:14 ` [PATCH v2 1/2] selinux: dump statistics for more hash tables Christian Göttsche
@ 2024-03-27 23:26 ` Paul Moore
0 siblings, 0 replies; 4+ messages in thread
From: Paul Moore @ 2024-03-27 23:26 UTC (permalink / raw
To: Christian Göttsche, selinux
Cc: Stephen Smalley, Ondrej Mosnacek, linux-kernel
On Mar 15, 2024 =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com> wrote:
>
> Dump in the SELinux debug configuration the statistics for the
> conditional rules avtab, the role transition, and class and common
> permission hash tables.
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
> ---
> v2:
> print key in hash_eval() for class and common tables
> ---
> security/selinux/ss/conditional.c | 3 +++
> security/selinux/ss/policydb.c | 23 ++++++++++++++++-------
> 2 files changed, 19 insertions(+), 7 deletions(-)
Merged into selinux/dev, thanks.
--
paul-moore.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] selinux: improve symtab string hashing
2024-03-15 18:14 [PATCH v2 2/2] selinux: improve symtab string hashing Christian Göttsche
2024-03-15 18:14 ` [PATCH v2 1/2] selinux: dump statistics for more hash tables Christian Göttsche
@ 2024-03-27 23:26 ` Paul Moore
1 sibling, 0 replies; 4+ messages in thread
From: Paul Moore @ 2024-03-27 23:26 UTC (permalink / raw
To: Christian Göttsche, selinux
Cc: Stephen Smalley, Ondrej Mosnacek, linux-kernel
On Mar 15, 2024 =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com> wrote:
>
> The number of buckets is calculated by performing a binary AND against
> the mask of the hash table, which is one less than its size (which is a
> power of two). This leads to all top bits being discarded, requiring
> for short or similar inputs a hash function with a good avalanche
> effect.
>
> Use djb2a:
>
> # current
> common prefixes: 7 entries and 5/8 buckets used, longest chain length 2, sum of chain length^2 11
> classes: 134 entries and 100/256 buckets used, longest chain length 5, sum of chain length^2 234
> roles: 15 entries and 6/16 buckets used, longest chain length 5, sum of chain length^2 57
> types: 4448 entries and 3016/8192 buckets used, longest chain length 41, sum of chain length^2 14922
> users: 7 entries and 3/8 buckets used, longest chain length 3, sum of chain length^2 17
> bools: 306 entries and 221/512 buckets used, longest chain length 4, sum of chain length^2 524
> levels: 1 entries and 1/1 buckets used, longest chain length 1, sum of chain length^2 1
> categories: 1024 entries and 400/1024 buckets used, longest chain length 4, sum of chain length^2 2740
>
> # patch
> common prefixes: 7 entries and 5/8 buckets used, longest chain length 2, sum of chain length^2 11
> classes: 134 entries and 101/256 buckets used, longest chain length 3, sum of chain length^2 210
> roles: 15 entries and 9/16 buckets used, longest chain length 3, sum of chain length^2 31
> types: 4448 entries and 3459/8192 buckets used, longest chain length 5, sum of chain length^2 6778
> users: 7 entries and 5/8 buckets used, longest chain length 3, sum of chain length^2 13
> bools: 306 entries and 236/512 buckets used, longest chain length 5, sum of chain length^2 470
> levels: 1 entries and 1/1 buckets used, longest chain length 1, sum of chain length^2 1
> categories: 1024 entries and 518/1024 buckets used, longest chain length 7, sum of chain length^2 2992
>
> Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
> ---
> v2:
> add licensing note
> ---
> security/selinux/ss/symtab.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
Merged into selinux/dev, thanks.
--
paul-moore.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-27 23:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-15 18:14 [PATCH v2 2/2] selinux: improve symtab string hashing Christian Göttsche
2024-03-15 18:14 ` [PATCH v2 1/2] selinux: dump statistics for more hash tables Christian Göttsche
2024-03-27 23:26 ` Paul Moore
2024-03-27 23:26 ` [PATCH v2 2/2] selinux: improve symtab string hashing Paul Moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).