selinux: avoid unnecessary avc cache stat hit count

There is no point in counting hits - we can calculate it from the number of lookups and misses. This makes the avc statistics a bit smaller, and makes the code generation better too. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

selinux: avoid unnecessary avc cache stat hit count
There is no point in counting hits - we can calculate it from the number of lookups and misses. This makes the avc statistics a bit smaller, and makes the code generation better too. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds
1 parent 044aea9b83
Showing 3 changed files with 11 additions and 9 deletions Side-by-side Diff
security/selinux/avc.c
security/selinux/include/avc.h
security/selinux/selinuxfs.c
@@ -343,11 +343,10 @@
 	node = avc_search_node(ssid, tsid, tclass);
  
 	if (node)
-		avc_cache_stats_incr(hits);
-	else
-		avc_cache_stats_incr(misses);
+		return node;
  
-	return node;
+	avc_cache_stats_incr(misses);
+	return NULL;
 }
  
 static int avc_latest_notif_update(int seqno, int is_insert)
@@ -765,7 +764,7 @@
 	rcu_read_lock();
  
 	node = avc_lookup(ssid, tsid, tclass);
-	if (!node) {
+	if (unlikely(!node)) {
 		rcu_read_unlock();
  
 		if (in_avd)
@@ -41,7 +41,6 @@
  */
 struct avc_cache_stats {
 	unsigned int lookups;
-	unsigned int hits;
 	unsigned int misses;
 	unsigned int allocations;
 	unsigned int reclaims;
@@ -1380,10 +1380,14 @@
 	if (v == SEQ_START_TOKEN)
 		seq_printf(seq, "lookups hits misses allocations reclaims "
 			   "frees\n");
-	else
-		seq_printf(seq, "%u %u %u %u %u %u\n", st->lookups,
-			   st->hits, st->misses, st->allocations,
+	else {
+		unsigned int lookups = st->lookups;
+		unsigned int misses = st->misses;
+		unsigned int hits = lookups - misses;
+		seq_printf(seq, "%u %u %u %u %u %u\n", lookups,
+			   hits, misses, st->allocations,
 			   st->reclaims, st->frees);
+	}
 	return 0;
 }
...	...	@@ -343,11 +343,10 @@
343	343	node = avc_search_node(ssid, tsid, tclass);
344	344
345	345	if (node)
346		- avc_cache_stats_incr(hits);
347		- else
348		- avc_cache_stats_incr(misses);
	346	+ return node;
349	347
350		- return node;
	348	+ avc_cache_stats_incr(misses);
	349	+ return NULL;
351	350	}
352	351
353	352	static int avc_latest_notif_update(int seqno, int is_insert)
...	...	@@ -765,7 +764,7 @@
765	764	rcu_read_lock();
766	765
767	766	node = avc_lookup(ssid, tsid, tclass);
768		- if (!node) {
	767	+ if (unlikely(!node)) {
769	768	rcu_read_unlock();
770	769
771	770	if (in_avd)
...	...	@@ -41,7 +41,6 @@
41	41	*/
42	42	struct avc_cache_stats {
43	43	unsigned int lookups;
44		- unsigned int hits;
45	44	unsigned int misses;
46	45	unsigned int allocations;
47	46	unsigned int reclaims;
...	...	@@ -1380,10 +1380,14 @@
1380	1380	if (v == SEQ_START_TOKEN)
1381	1381	seq_printf(seq, "lookups hits misses allocations reclaims "
1382	1382	"frees\n");
1383		- else
1384		- seq_printf(seq, "%u %u %u %u %u %u\n", st->lookups,
1385		- st->hits, st->misses, st->allocations,
	1383	+ else {
	1384	+ unsigned int lookups = st->lookups;
	1385	+ unsigned int misses = st->misses;
	1386	+ unsigned int hits = lookups - misses;
	1387	+ seq_printf(seq, "%u %u %u %u %u %u\n", lookups,
	1388	+ hits, misses, st->allocations,
1386	1389	st->reclaims, st->frees);
	1390	+ }
1387	1391	return 0;
1388	1392	}
1389	1393