renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-27 03:55:37 +08:00
Code

ipc/util.c: use binary search for max_idx

Browse Source 
If semctl(), msgctl() and shmctl() are called with IPC_INFO, SEM_INFO,
MSG_INFO or SHM_INFO, then the return value is the index of the highest
used index in the kernel's internal array recording information about all
SysV objects of the requested type for the current namespace.  (This
information can be used with repeated ..._STAT or ..._STAT_ANY operations
to obtain information about all SysV objects on the system.)

There is a cache for this value.  But when the cache needs up be updated,
then the highest used index is determined by looping over all possible
values.  With the introduction of IPCMNI_EXTEND_SHIFT, this could be a
loop over 16 million entries.  And due to /proc/sys/kernel/*next_id, the
index values do not need to be consecutive.

With <write 16000000 to msg_next_id>, msgget(), msgctl(,IPC_RMID) in a
loop, I have observed a performance increase of around factor 13000.

As there is no get_last() function for idr structures: Implement a
"get_last()" using a binary search.

As far as I see, ipc is the only user that needs get_last(), thus
implement it in ipc/util.c and not in a central location.

[akpm@linux-foundation.org: tweak comment, fix typo]

Link: https://lkml.kernel.org/r/20210425075208.11777-2-manfred@colorfullife.com
Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
Acked-by: Davidlohr Bueso <dbueso@suse.de>
Cc: <1vier1@web.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Manfred Spraul 2021-06-30 18:57:18 -07:00 committed by Linus Torvalds
parent 17d056e0bd
commit b869d5be0a
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ipc/util.c
View File

@ -64,6 +64,7 @@
#include <linux/memory.h>
#include <linux/ipc_namespace.h>
#include <linux/rhashtable.h>
#include <linux/log2.h>
#include <asm/unistd.h>
@ -450,6 +451,41 @@ static void ipc_kht_remove(struct ipc_ids *ids, struct kern_ipc_perm *ipcp)
ipc_kht_params);
}
/**
* ipc_search_maxidx - search for the highest assigned index
* @ids: ipc identifier set
* @limit: known upper limit for highest assigned index
*
* The function determines the highest assigned index in @ids. It is intended
* to be called when ids->max_idx needs to be updated.
* Updating ids->max_idx is necessary when the current highest index ipc
* object is deleted.
* If no ipc object is allocated, then -1 is returned.
*
* ipc_ids.rwsem needs to be held by the caller.
*/
static int ipc_search_maxidx(struct ipc_ids *ids, int limit)
{
int tmpidx;
int i;
int retval;
i = ilog2(limit+1);
retval = 0;
for (; i >= 0; i--) {
tmpidx = retval | (1<<i);
/*
* "0" is a possible index value, thus search using
* e.g. 15,7,3,1,0 instead of 16,8,4,2,1.
*/
tmpidx = tmpidx-1;
if (idr_get_next(&ids->ipcs_idr, &tmpidx))
retval |= (1<<i);
}
return retval - 1;
}
/**
* ipc_rmid - remove an ipc identifier
* @ids: ipc identifier set
@ -468,11 +504,9 @@ void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp)
ipcp->deleted = true;
if (unlikely(idx == ids->max_idx)) {
do {
idx--;
if (idx == -1)
break;
} while (!idr_find(&ids->ipcs_idr, idx));
idx = ids->max_idx-1;
if (idx >= 0)
idx = ipc_search_maxidx(ids, idx);
ids->max_idx = idx;
}
}

3
ipc/util.h
View File

@ -145,6 +145,9 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flg);
* ipc_get_maxidx - get the highest assigned index
* @ids: ipc identifier set
*
* The function returns the highest assigned index for @ids. The function
* doesn't scan the idr tree, it uses a cached value.
*
* Called with ipc_ids.rwsem held for reading.
*/
static inline int ipc_get_maxidx(struct ipc_ids *ids)