From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] pid: delete struct pidmap::nr_free
Date: Sat, 9 Sep 2017 23:36:49 +0300 [thread overview]
Message-ID: <20170909203649.GB4791@avx2> (raw)
In-Reply-To: <20170909202629.GA4791@avx2>
There is a check in pid allocation code to skip a full page:
if (likely(atomic_read(&map->nr_free))) {
...
In practice it doesn't do anything. To skip a pidmap page
one has to have 32K consecutive pids allocated at the same
time which doesn't happen.
Currently the price is _every_ fork/exit on every system being slower
than necessary.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
include/linux/pid_namespace.h | 1 -
kernel/pid.c | 28 ++++++++++------------------
kernel/pid_namespace.c | 6 ------
3 files changed, 10 insertions(+), 25 deletions(-)
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -11,7 +11,6 @@
#include <linux/ns_common.h>
struct pidmap {
- atomic_t nr_free;
void *page;
};
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -68,9 +68,6 @@ static inline int mk_pid(struct pid_namespace *pid_ns,
*/
struct pid_namespace init_pid_ns = {
.kref = KREF_INIT(2),
- .pidmap = {
- [ 0 ... PIDMAP_ENTRIES-1] = { ATOMIC_INIT(BITS_PER_PAGE), NULL }
- },
.last_pid = 0,
.nr_hashed = PIDNS_HASH_ADDING,
.level = 0,
@@ -106,7 +103,6 @@ static void free_pidmap(struct upid *upid)
int offset = nr & BITS_PER_PAGE_MASK;
clear_bit(offset, map->page);
- atomic_inc(&map->nr_free);
}
/*
@@ -181,20 +177,17 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
if (unlikely(!map->page))
return -ENOMEM;
}
- if (likely(atomic_read(&map->nr_free))) {
- for ( ; ; ) {
- if (!test_and_set_bit(offset, map->page)) {
- atomic_dec(&map->nr_free);
- set_last_pid(pid_ns, last, pid);
- return pid;
- }
- offset = find_next_offset(map, offset);
- if (offset >= BITS_PER_PAGE)
- break;
- pid = mk_pid(pid_ns, map, offset);
- if (pid >= pid_max)
- break;
+ for (;;) {
+ if (!test_and_set_bit(offset, map->page)) {
+ set_last_pid(pid_ns, last, pid);
+ return pid;
}
+ offset = find_next_offset(map, offset);
+ if (offset >= BITS_PER_PAGE)
+ break;
+ pid = mk_pid(pid_ns, map, offset);
+ if (pid >= pid_max)
+ break;
}
if (map < &pid_ns->pidmap[(pid_max-1)/BITS_PER_PAGE]) {
++map;
@@ -591,7 +584,6 @@ void __init pidmap_init(void)
init_pid_ns.pidmap[0].page = kzalloc(PAGE_SIZE, GFP_KERNEL);
/* Reserve PID 0. We never call free_pidmap(0) */
set_bit(0, init_pid_ns.pidmap[0].page);
- atomic_dec(&init_pid_ns.pidmap[0].nr_free);
init_pid_ns.pid_cachep = KMEM_CACHE(pid,
SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT);
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -98,7 +98,6 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
struct pid_namespace *ns;
unsigned int level = parent_pid_ns->level + 1;
struct ucounts *ucounts;
- int i;
int err;
err = -ENOSPC;
@@ -135,11 +134,6 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
INIT_WORK(&ns->proc_work, proc_cleanup_work);
set_bit(0, ns->pidmap[0].page);
- atomic_set(&ns->pidmap[0].nr_free, BITS_PER_PAGE - 1);
-
- for (i = 1; i < PIDMAP_ENTRIES; i++)
- atomic_set(&ns->pidmap[i].nr_free, BITS_PER_PAGE);
-
return ns;
out_free_map:
prev parent reply other threads:[~2017-09-09 20:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-09 20:26 [PATCH 1/2] pid: delete RESERVED_PIDS Alexey Dobriyan
2017-09-09 20:36 ` Alexey Dobriyan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170909203649.GB4791@avx2 \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.