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 v2 09/16] SUNRPC/cache: use new hashtable implementation Date: Sun, 19 Aug 2012 02:52:23 +0200 [thread overview] Message-ID: <1345337550-24304-11-git-send-email-levinsasha928@gmail.com> (raw) In-Reply-To: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> Switch cache to use the new hashtable implementation. This reduces the amount of generic unrelated code in the cache implementation. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- net/sunrpc/cache.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 2afd2a8..8a8ef6d 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -28,6 +28,7 @@ #include <linux/workqueue.h> #include <linux/mutex.h> #include <linux/pagemap.h> +#include <linux/hashtable.h> #include <asm/ioctls.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/cache.h> @@ -524,19 +525,18 @@ EXPORT_SYMBOL_GPL(cache_purge); * it to be revisited when cache info is available */ -#define DFR_HASHSIZE (PAGE_SIZE/sizeof(struct list_head)) -#define DFR_HASH(item) ((((long)item)>>4 ^ (((long)item)>>13)) % DFR_HASHSIZE) +#define DFR_HASH_BITS 9 #define DFR_MAX 300 /* ??? */ static DEFINE_SPINLOCK(cache_defer_lock); static LIST_HEAD(cache_defer_list); -static struct hlist_head cache_defer_hash[DFR_HASHSIZE]; +static DEFINE_HASHTABLE(cache_defer_hash, DFR_HASH_BITS) static int cache_defer_cnt; static void __unhash_deferred_req(struct cache_deferred_req *dreq) { - hlist_del_init(&dreq->hash); + hash_del(&dreq->hash); if (!list_empty(&dreq->recent)) { list_del_init(&dreq->recent); cache_defer_cnt--; @@ -545,10 +545,7 @@ static void __unhash_deferred_req(struct cache_deferred_req *dreq) static void __hash_deferred_req(struct cache_deferred_req *dreq, struct cache_head *item) { - int hash = DFR_HASH(item); - - INIT_LIST_HEAD(&dreq->recent); - hlist_add_head(&dreq->hash, &cache_defer_hash[hash]); + hash_add(cache_defer_hash, &dreq->hash, (unsigned long)item); } static void setup_deferral(struct cache_deferred_req *dreq, @@ -600,7 +597,7 @@ static void cache_wait_req(struct cache_req *req, struct cache_head *item) * to clean up */ spin_lock(&cache_defer_lock); - if (!hlist_unhashed(&sleeper.handle.hash)) { + if (hash_hashed(&sleeper.handle.hash)) { __unhash_deferred_req(&sleeper.handle); spin_unlock(&cache_defer_lock); } else { @@ -671,12 +668,11 @@ static void cache_revisit_request(struct cache_head *item) struct cache_deferred_req *dreq; struct list_head pending; struct hlist_node *lp, *tmp; - int hash = DFR_HASH(item); INIT_LIST_HEAD(&pending); spin_lock(&cache_defer_lock); - hlist_for_each_entry_safe(dreq, lp, tmp, &cache_defer_hash[hash], hash) + hash_for_each_possible_safe(cache_defer_hash, dreq, lp, tmp, hash, (unsigned long)item) if (dreq->item == item) { __unhash_deferred_req(dreq); list_add(&dreq->recent, &pending); @@ -1636,6 +1632,8 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net) void __init cache_initialize(void) { INIT_DELAYED_WORK_DEFERRABLE(&cache_cleaner, do_cache_clean); + + hash_init(cache_defer_hash); } int cache_register_net(struct cache_detail *cd, struct net *net) -- 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 v2 09/16] SUNRPC/cache: use new hashtable implementation Date: Sun, 19 Aug 2012 02:52:23 +0200 [thread overview] Message-ID: <1345337550-24304-11-git-send-email-levinsasha928@gmail.com> (raw) In-Reply-To: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> Switch cache to use the new hashtable implementation. This reduces the amount of generic unrelated code in the cache implementation. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- net/sunrpc/cache.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 2afd2a8..8a8ef6d 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -28,6 +28,7 @@ #include <linux/workqueue.h> #include <linux/mutex.h> #include <linux/pagemap.h> +#include <linux/hashtable.h> #include <asm/ioctls.h> #include <linux/sunrpc/types.h> #include <linux/sunrpc/cache.h> @@ -524,19 +525,18 @@ EXPORT_SYMBOL_GPL(cache_purge); * it to be revisited when cache info is available */ -#define DFR_HASHSIZE (PAGE_SIZE/sizeof(struct list_head)) -#define DFR_HASH(item) ((((long)item)>>4 ^ (((long)item)>>13)) % DFR_HASHSIZE) +#define DFR_HASH_BITS 9 #define DFR_MAX 300 /* ??? */ static DEFINE_SPINLOCK(cache_defer_lock); static LIST_HEAD(cache_defer_list); -static struct hlist_head cache_defer_hash[DFR_HASHSIZE]; +static DEFINE_HASHTABLE(cache_defer_hash, DFR_HASH_BITS) static int cache_defer_cnt; static void __unhash_deferred_req(struct cache_deferred_req *dreq) { - hlist_del_init(&dreq->hash); + hash_del(&dreq->hash); if (!list_empty(&dreq->recent)) { list_del_init(&dreq->recent); cache_defer_cnt--; @@ -545,10 +545,7 @@ static void __unhash_deferred_req(struct cache_deferred_req *dreq) static void __hash_deferred_req(struct cache_deferred_req *dreq, struct cache_head *item) { - int hash = DFR_HASH(item); - - INIT_LIST_HEAD(&dreq->recent); - hlist_add_head(&dreq->hash, &cache_defer_hash[hash]); + hash_add(cache_defer_hash, &dreq->hash, (unsigned long)item); } static void setup_deferral(struct cache_deferred_req *dreq, @@ -600,7 +597,7 @@ static void cache_wait_req(struct cache_req *req, struct cache_head *item) * to clean up */ spin_lock(&cache_defer_lock); - if (!hlist_unhashed(&sleeper.handle.hash)) { + if (hash_hashed(&sleeper.handle.hash)) { __unhash_deferred_req(&sleeper.handle); spin_unlock(&cache_defer_lock); } else { @@ -671,12 +668,11 @@ static void cache_revisit_request(struct cache_head *item) struct cache_deferred_req *dreq; struct list_head pending; struct hlist_node *lp, *tmp; - int hash = DFR_HASH(item); INIT_LIST_HEAD(&pending); spin_lock(&cache_defer_lock); - hlist_for_each_entry_safe(dreq, lp, tmp, &cache_defer_hash[hash], hash) + hash_for_each_possible_safe(cache_defer_hash, dreq, lp, tmp, hash, (unsigned long)item) if (dreq->item == item) { __unhash_deferred_req(dreq); list_add(&dreq->recent, &pending); @@ -1636,6 +1632,8 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net) void __init cache_initialize(void) { INIT_DELAYED_WORK_DEFERRABLE(&cache_cleaner, do_cache_clean); + + hash_init(cache_defer_hash); } int cache_register_net(struct cache_detail *cd, struct net *net) -- 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:54 UTC|newest] Thread overview: 54+ 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 ` [PATCH 02/16] user_ns: use new hashtable implementation Sasha Levin 2012-08-19 0:52 ` 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 ` Sasha Levin [this message] 2012-08-19 0:52 ` [PATCH v2 09/16] SUNRPC/cache: " 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
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-11-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.