From: Sasha Levin <levinsasha928@gmail.com> To: torvalds@linux-foundation.org Cc: tj@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, paul.gortmaker@windriver.com, davem@davemloft.net, rostedt@goodmis.org, mingo@elte.hu, ebiederm@xmission.com, aarcange@redhat.com, ericvh@gmail.com, netdev@vger.kernel.org, josh@joshtriplett.org, eric.dumazet@gmail.com, mathieu.desnoyers@efficios.com, axboe@kernel.dk, agk@redhat.com, dm-devel@redhat.com, neilb@suse.de, ccaulfie@redhat.com, teigland@redhat.com, Trond.Myklebust@netapp.com, bfields@fieldses.org, fweisbec@gmail.com, jesse@nicira.com, venkat.x.venkatsubra@oracle.com, ejt@redhat.com, snitzer@redhat.com, edumazet@google.com, linux-nfs@vger.kernel.org, dev@openvswitch.org, rds-devel@oss.oracle.com, lw@cn.fujitsu.com, Sasha Levin <levinsasha928@gmail.com> Subject: [PATCH 02/16] user_ns: use new hashtable implementation Date: Sun, 19 Aug 2012 02:52:15 +0200 [thread overview] Message-ID: <1345337550-24304-3-git-send-email-levinsasha928@gmail.com> (raw) In-Reply-To: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> Switch user_ns to use the new hashtable implementation. This reduces the amount of generic unrelated code in user_ns. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- kernel/user.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/kernel/user.c b/kernel/user.c index b815fef..d10c484 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -16,6 +16,7 @@ #include <linux/interrupt.h> #include <linux/export.h> #include <linux/user_namespace.h> +#include <linux/hashtable.h> /* * userns count is 1 for root user, 1 for init_uts_ns, @@ -52,13 +53,9 @@ EXPORT_SYMBOL_GPL(init_user_ns); */ #define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 7) -#define UIDHASH_SZ (1 << UIDHASH_BITS) -#define UIDHASH_MASK (UIDHASH_SZ - 1) -#define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK) -#define uidhashentry(uid) (uidhash_table + __uidhashfn((__kuid_val(uid)))) static struct kmem_cache *uid_cachep; -struct hlist_head uidhash_table[UIDHASH_SZ]; +static DEFINE_HASHTABLE(uidhash_table, UIDHASH_BITS) /* * The uidhash_lock is mostly taken from process context, but it is @@ -84,22 +81,22 @@ struct user_struct root_user = { /* * These routines must be called with the uidhash spinlock held! */ -static void uid_hash_insert(struct user_struct *up, struct hlist_head *hashent) +static void uid_hash_insert(struct user_struct *up) { - hlist_add_head(&up->uidhash_node, hashent); + hash_add(uidhash_table, &up->uidhash_node, __kuid_val(up->uid)); } static void uid_hash_remove(struct user_struct *up) { - hlist_del_init(&up->uidhash_node); + hash_del(&up->uidhash_node); } -static struct user_struct *uid_hash_find(kuid_t uid, struct hlist_head *hashent) +static struct user_struct *uid_hash_find(kuid_t uid) { struct user_struct *user; struct hlist_node *h; - hlist_for_each_entry(user, h, hashent, uidhash_node) { + hash_for_each_possible(uidhash_table, user, h, uidhash_node, __kuid_val(uid)) { if (uid_eq(user->uid, uid)) { atomic_inc(&user->__count); return user; @@ -135,7 +132,7 @@ struct user_struct *find_user(kuid_t uid) unsigned long flags; spin_lock_irqsave(&uidhash_lock, flags); - ret = uid_hash_find(uid, uidhashentry(uid)); + ret = uid_hash_find(uid); spin_unlock_irqrestore(&uidhash_lock, flags); return ret; } @@ -156,11 +153,10 @@ void free_uid(struct user_struct *up) struct user_struct *alloc_uid(kuid_t uid) { - struct hlist_head *hashent = uidhashentry(uid); struct user_struct *up, *new; spin_lock_irq(&uidhash_lock); - up = uid_hash_find(uid, hashent); + up = uid_hash_find(uid); spin_unlock_irq(&uidhash_lock); if (!up) { @@ -176,13 +172,13 @@ struct user_struct *alloc_uid(kuid_t uid) * on adding the same user already.. */ spin_lock_irq(&uidhash_lock); - up = uid_hash_find(uid, hashent); + up = uid_hash_find(uid); if (up) { key_put(new->uid_keyring); key_put(new->session_keyring); kmem_cache_free(uid_cachep, new); } else { - uid_hash_insert(new, hashent); + uid_hash_insert(new); up = new; } spin_unlock_irq(&uidhash_lock); @@ -196,17 +192,14 @@ out_unlock: static int __init uid_cache_init(void) { - int n; - uid_cachep = kmem_cache_create("uid_cache", sizeof(struct user_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); - for(n = 0; n < UIDHASH_SZ; ++n) - INIT_HLIST_HEAD(uidhash_table + n); + hash_init(uidhash_table); /* Insert the root user immediately (init already runs as root) */ spin_lock_irq(&uidhash_lock); - uid_hash_insert(&root_user, uidhashentry(GLOBAL_ROOT_UID)); + uid_hash_insert(&root_user); spin_unlock_irq(&uidhash_lock); return 0; -- 1.7.8.6
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <levinsasha928@gmail.com> To: torvalds@linux-foundation.org Cc: tj@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, paul.gortmaker@windriver.com, davem@davemloft.net, rostedt@goodmis.org, mingo@elte.hu, ebiederm@xmission.com, aarcange@redhat.com, ericvh@gmail.com, netdev@vger.kernel.org, josh@joshtriplett.org, eric.dumazet@gmail.com, mathieu.desnoyers@efficios.com, axboe@kernel.dk, agk@redhat.com, dm-devel@redhat.com, neilb@suse.de, ccaulfie@redhat.com, teigland@redhat.com, Trond.Myklebust@netapp.com, bfields@fieldses.org, fweisbec@gmail.com, jesse@nicira.com, venkat.x.venkatsubra@oracle.com, ejt@redhat.com, snitzer@redhat.com, edumazet@google.com, linux-nfs@vger.kernel.org, dev@openvswitch.org, rds-devel@oss.oracle.com, lw@cn.fujitsu.com, Sasha Levin <levinsasha928@gmail.com> Subject: [PATCH 02/16] user_ns: use new hashtable implementation Date: Sun, 19 Aug 2012 02:52:15 +0200 [thread overview] Message-ID: <1345337550-24304-3-git-send-email-levinsasha928@gmail.com> (raw) In-Reply-To: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> Switch user_ns to use the new hashtable implementation. This reduces the amount of generic unrelated code in user_ns. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- kernel/user.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/kernel/user.c b/kernel/user.c index b815fef..d10c484 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -16,6 +16,7 @@ #include <linux/interrupt.h> #include <linux/export.h> #include <linux/user_namespace.h> +#include <linux/hashtable.h> /* * userns count is 1 for root user, 1 for init_uts_ns, @@ -52,13 +53,9 @@ EXPORT_SYMBOL_GPL(init_user_ns); */ #define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 7) -#define UIDHASH_SZ (1 << UIDHASH_BITS) -#define UIDHASH_MASK (UIDHASH_SZ - 1) -#define __uidhashfn(uid) (((uid >> UIDHASH_BITS) + uid) & UIDHASH_MASK) -#define uidhashentry(uid) (uidhash_table + __uidhashfn((__kuid_val(uid)))) static struct kmem_cache *uid_cachep; -struct hlist_head uidhash_table[UIDHASH_SZ]; +static DEFINE_HASHTABLE(uidhash_table, UIDHASH_BITS) /* * The uidhash_lock is mostly taken from process context, but it is @@ -84,22 +81,22 @@ struct user_struct root_user = { /* * These routines must be called with the uidhash spinlock held! */ -static void uid_hash_insert(struct user_struct *up, struct hlist_head *hashent) +static void uid_hash_insert(struct user_struct *up) { - hlist_add_head(&up->uidhash_node, hashent); + hash_add(uidhash_table, &up->uidhash_node, __kuid_val(up->uid)); } static void uid_hash_remove(struct user_struct *up) { - hlist_del_init(&up->uidhash_node); + hash_del(&up->uidhash_node); } -static struct user_struct *uid_hash_find(kuid_t uid, struct hlist_head *hashent) +static struct user_struct *uid_hash_find(kuid_t uid) { struct user_struct *user; struct hlist_node *h; - hlist_for_each_entry(user, h, hashent, uidhash_node) { + hash_for_each_possible(uidhash_table, user, h, uidhash_node, __kuid_val(uid)) { if (uid_eq(user->uid, uid)) { atomic_inc(&user->__count); return user; @@ -135,7 +132,7 @@ struct user_struct *find_user(kuid_t uid) unsigned long flags; spin_lock_irqsave(&uidhash_lock, flags); - ret = uid_hash_find(uid, uidhashentry(uid)); + ret = uid_hash_find(uid); spin_unlock_irqrestore(&uidhash_lock, flags); return ret; } @@ -156,11 +153,10 @@ void free_uid(struct user_struct *up) struct user_struct *alloc_uid(kuid_t uid) { - struct hlist_head *hashent = uidhashentry(uid); struct user_struct *up, *new; spin_lock_irq(&uidhash_lock); - up = uid_hash_find(uid, hashent); + up = uid_hash_find(uid); spin_unlock_irq(&uidhash_lock); if (!up) { @@ -176,13 +172,13 @@ struct user_struct *alloc_uid(kuid_t uid) * on adding the same user already.. */ spin_lock_irq(&uidhash_lock); - up = uid_hash_find(uid, hashent); + up = uid_hash_find(uid); if (up) { key_put(new->uid_keyring); key_put(new->session_keyring); kmem_cache_free(uid_cachep, new); } else { - uid_hash_insert(new, hashent); + uid_hash_insert(new); up = new; } spin_unlock_irq(&uidhash_lock); @@ -196,17 +192,14 @@ out_unlock: static int __init uid_cache_init(void) { - int n; - uid_cachep = kmem_cache_create("uid_cache", sizeof(struct user_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); - for(n = 0; n < UIDHASH_SZ; ++n) - INIT_HLIST_HEAD(uidhash_table + n); + hash_init(uidhash_table); /* Insert the root user immediately (init already runs as root) */ spin_lock_irq(&uidhash_lock); - uid_hash_insert(&root_user, uidhashentry(GLOBAL_ROOT_UID)); + uid_hash_insert(&root_user); spin_unlock_irq(&uidhash_lock); return 0; -- 1.7.8.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-08-19 0:52 UTC|newest] Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-19 0:52 [PATCH v2 00/16] generic hashtable implementation Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 01/16] hashtable: introduce a small and naive hashtable Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 13:16 ` Mathieu Desnoyers 2012-08-19 13:16 ` Mathieu Desnoyers 2012-08-19 14:16 ` Mathieu Desnoyers 2012-08-19 14:16 ` Mathieu Desnoyers 2012-08-19 14:16 ` Mathieu Desnoyers 2012-08-19 16:17 ` Sasha Levin 2012-08-19 16:17 ` Sasha Levin 2012-08-19 16:17 ` Sasha Levin 2012-08-19 16:08 ` Sasha Levin 2012-08-19 16:08 ` Sasha Levin 2012-08-19 16:08 ` Sasha Levin 2012-08-19 0:52 ` Sasha Levin [this message] 2012-08-19 0:52 ` [PATCH 02/16] user_ns: use new hashtable implementation Sasha Levin 2012-08-19 0:52 ` [PATCH v2 02/16] userns: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 03/16] mm,ksm: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 03/16] mm, ksm: " Sasha Levin 2012-08-19 0:52 ` [PATCH v2 04/16] workqueue: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 05/16] mm/huge_memory: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 06/16] tracepoint: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 07/16] net,9p: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 07/16] net, 9p: " Sasha Levin 2012-08-19 0:52 ` [PATCH v2 08/16] block,elevator: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 08/16] block, elevator: " Sasha Levin 2012-08-19 0:52 ` [PATCH v2 09/16] SUNRPC/cache: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 10/16] dlm: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 11/16] net,l2tp: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 12/16] dm: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 13/16] lockd: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 14/16] net,rds: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 15/16] openvswitch: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` Sasha Levin 2012-08-19 0:52 ` [PATCH v2 16/16] tracing output: " Sasha Levin 2012-08-19 0:52 ` Sasha Levin -- strict thread matches above, loose matches on Subject: below -- 2012-08-14 16:24 [PATCH 00/16] generic " Sasha Levin 2012-08-14 16:24 ` [PATCH 02/16] user_ns: use new " Sasha Levin 2012-08-14 16:24 ` Sasha Levin 2012-08-14 23:52 ` Eric W. Biederman 2012-08-14 23:52 ` Eric W. Biederman 2012-08-14 23:52 ` Eric W. Biederman 2012-08-15 0:47 ` Sasha Levin 2012-08-15 0:47 ` Sasha Levin 2012-08-15 0:47 ` Sasha Levin 2012-08-15 1:08 ` Eric W. Biederman 2012-08-15 1:08 ` Eric W. Biederman 2012-08-15 1:08 ` Eric W. Biederman 2012-08-15 1:35 ` Sasha Levin 2012-08-15 1:35 ` Sasha Levin 2012-08-15 3:13 ` Eric W. Biederman 2012-08-15 3:13 ` Eric W. Biederman 2012-08-15 3:13 ` Eric W. Biederman 2012-08-15 3:31 ` Mathieu Desnoyers 2012-08-15 3:31 ` Mathieu Desnoyers 2012-08-15 13:40 ` Sasha Levin 2012-08-15 13:40 ` Sasha Levin 2012-08-15 13:40 ` Sasha Levin 2012-08-15 8:46 ` David Laight 2012-08-15 8:46 ` David Laight 2012-08-15 8:46 ` David Laight 2012-08-16 14:28 ` Mathieu Desnoyers 2012-08-16 14:28 ` Mathieu Desnoyers 2012-08-16 14:28 ` Mathieu Desnoyers 2012-08-18 21:52 ` Sasha Levin 2012-08-18 22:21 ` Eric W. Biederman
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=1345337550-24304-3-git-send-email-levinsasha928@gmail.com \ --to=levinsasha928@gmail.com \ --cc=Trond.Myklebust@netapp.com \ --cc=aarcange@redhat.com \ --cc=agk@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=axboe@kernel.dk \ --cc=bfields@fieldses.org \ --cc=ccaulfie@redhat.com \ --cc=davem@davemloft.net \ --cc=dev@openvswitch.org \ --cc=dm-devel@redhat.com \ --cc=ebiederm@xmission.com \ --cc=edumazet@google.com \ --cc=ejt@redhat.com \ --cc=eric.dumazet@gmail.com \ --cc=ericvh@gmail.com \ --cc=fweisbec@gmail.com \ --cc=jesse@nicira.com \ --cc=josh@joshtriplett.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nfs@vger.kernel.org \ --cc=lw@cn.fujitsu.com \ --cc=mathieu.desnoyers@efficios.com \ --cc=mingo@elte.hu \ --cc=neilb@suse.de \ --cc=netdev@vger.kernel.org \ --cc=paul.gortmaker@windriver.com \ --cc=rds-devel@oss.oracle.com \ --cc=rostedt@goodmis.org \ --cc=snitzer@redhat.com \ --cc=teigland@redhat.com \ --cc=tj@kernel.org \ --cc=torvalds@linux-foundation.org \ --cc=venkat.x.venkatsubra@oracle.com \ /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: linkBe 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.