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 v3 06/17] tracepoint: use new hashtable implementation
Date: Wed, 22 Aug 2012 04:27:01 +0200 [thread overview]
Message-ID: <1345602432-27673-7-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1345602432-27673-1-git-send-email-levinsasha928@gmail.com>
Switch tracepoints to use the new hashtable implementation. This reduces the amount of
generic unrelated code in the tracepoints.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
kernel/tracepoint.c | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index d96ba22..854df92 100644
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/sched.h>
#include <linux/static_key.h>
+#include <linux/hashtable.h>
extern struct tracepoint * const __start___tracepoints_ptrs[];
extern struct tracepoint * const __stop___tracepoints_ptrs[];
@@ -49,8 +50,7 @@ static LIST_HEAD(tracepoint_module_list);
* Protected by tracepoints_mutex.
*/
#define TRACEPOINT_HASH_BITS 6
-#define TRACEPOINT_TABLE_SIZE (1 << TRACEPOINT_HASH_BITS)
-static struct hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE];
+static DEFINE_HASHTABLE(tracepoint_table, TRACEPOINT_HASH_BITS);
/*
* Note about RCU :
@@ -191,16 +191,15 @@ tracepoint_entry_remove_probe(struct tracepoint_entry *entry,
*/
static struct tracepoint_entry *get_tracepoint(const char *name)
{
- struct hlist_head *head;
struct hlist_node *node;
struct tracepoint_entry *e;
u32 hash = jhash(name, strlen(name), 0);
- head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
- hlist_for_each_entry(e, node, head, hlist) {
+ hash_for_each_possible(tracepoint_table, e, node, hlist, hash) {
if (!strcmp(name, e->name))
return e;
}
+
return NULL;
}
@@ -210,19 +209,13 @@ static struct tracepoint_entry *get_tracepoint(const char *name)
*/
static struct tracepoint_entry *add_tracepoint(const char *name)
{
- struct hlist_head *head;
- struct hlist_node *node;
struct tracepoint_entry *e;
size_t name_len = strlen(name) + 1;
u32 hash = jhash(name, name_len-1, 0);
- head = &tracepoint_table[hash & (TRACEPOINT_TABLE_SIZE - 1)];
- hlist_for_each_entry(e, node, head, hlist) {
- if (!strcmp(name, e->name)) {
- printk(KERN_NOTICE
- "tracepoint %s busy\n", name);
- return ERR_PTR(-EEXIST); /* Already there */
- }
+ if (get_tracepoint(name)) {
+ printk(KERN_NOTICE "tracepoint %s busy\n", name);
+ return ERR_PTR(-EEXIST); /* Already there */
}
/*
* Using kmalloc here to allocate a variable length element. Could
@@ -234,7 +227,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name)
memcpy(&e->name[0], name, name_len);
e->funcs = NULL;
e->refcount = 0;
- hlist_add_head(&e->hlist, head);
+ hash_add(tracepoint_table, &e->hlist, hash);
return e;
}
@@ -244,7 +237,7 @@ static struct tracepoint_entry *add_tracepoint(const char *name)
*/
static inline void remove_tracepoint(struct tracepoint_entry *e)
{
- hlist_del(&e->hlist);
+ hash_del(&e->hlist);
kfree(e);
}
@@ -722,6 +715,8 @@ struct notifier_block tracepoint_module_nb = {
static int init_tracepoints(void)
{
+ hash_init(tracepoint_table);
+
return register_module_notifier(&tracepoint_module_nb);
}
__initcall(init_tracepoints);
--
1.7.8.6
next prev parent reply other threads:[~2012-08-22 2:27 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 2:26 [PATCH v3 00/17] generic hashtable implementation Sasha Levin
2012-08-22 2:26 ` [PATCH v3 01/17] hashtable: introduce a small and naive hashtable Sasha Levin
2012-08-22 18:01 ` Tejun Heo
2012-08-22 23:54 ` Ryan Mallon
2012-08-23 0:24 ` Sasha Levin
2012-08-23 20:04 ` Tejun Heo
2012-08-24 19:47 ` Sasha Levin
2012-08-24 19:59 ` Tejun Heo
2012-08-24 20:11 ` Sasha Levin
2012-08-24 20:33 ` Tejun Heo
2012-08-24 20:53 ` Sasha Levin
2012-08-24 21:23 ` Tejun Heo
2012-08-24 22:59 ` Sasha Levin
2012-08-24 23:07 ` Tejun Heo
2012-08-25 4:24 ` Mathieu Desnoyers
2012-08-28 9:56 ` Sasha Levin
2012-08-28 10:11 ` Mathieu Desnoyers
2012-08-28 11:27 ` Sasha Levin
2012-08-28 11:56 ` Mathieu Desnoyers
2012-08-28 23:00 ` Mathieu Desnoyers
2012-09-04 15:35 ` Steven Rostedt
2012-09-04 16:30 ` Pedro Alves
2012-09-04 16:40 ` Pedro Alves
2012-09-04 17:01 ` Mathieu Desnoyers
2012-09-06 13:53 ` Sasha Levin
2012-09-06 14:19 ` Pedro Alves
2012-09-06 14:33 ` Mathieu Desnoyers
2012-09-06 14:36 ` David Laight
2012-09-06 14:55 ` Josh Triplett
2012-09-06 15:11 ` Steven Rostedt
2012-09-06 15:49 ` Sasha Levin
2012-09-06 16:00 ` Steven Rostedt
2012-09-06 16:21 ` Sasha Levin
2012-09-06 16:50 ` Mathieu Desnoyers
2012-09-06 17:01 ` Sasha Levin
2012-09-06 17:02 ` Mathieu Desnoyers
2012-09-06 17:15 ` Steven Rostedt
2012-09-04 17:17 ` Steven Rostedt
2012-09-04 17:21 ` Pedro Alves
2012-09-04 20:59 ` Steven Rostedt
2012-09-04 21:51 ` Pedro Alves
2012-09-04 22:41 ` Steven Rostedt
2012-09-04 22:58 ` Pedro Alves
2012-09-04 23:27 ` Steven Rostedt
2012-09-04 16:32 ` Mathieu Desnoyers
2012-08-22 2:26 ` [PATCH v3 02/17] userns: use new hashtable implementation Sasha Levin
2012-08-22 2:26 ` [PATCH v3 03/17] mm,ksm: " Sasha Levin
2012-08-22 2:26 ` [PATCH v3 04/17] workqueue: " Sasha Levin
2012-08-22 18:05 ` Tejun Heo
2012-08-22 2:27 ` [PATCH v3 05/17] mm/huge_memory: " Sasha Levin
2012-08-22 2:27 ` Sasha Levin [this message]
2012-08-22 2:27 ` [PATCH v3 07/17] net,9p: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 08/17] block,elevator: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 09/17] SUNRPC/cache: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 10/17] dlm: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 11/17] net,l2tp: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 12/17] dm: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 13/17] lockd: " Sasha Levin
2012-08-22 11:47 ` J. Bruce Fields
2012-08-22 12:13 ` Sasha Levin
2012-08-22 13:12 ` J. Bruce Fields
2012-08-22 13:22 ` Mathieu Desnoyers
2012-08-22 17:32 ` Sasha Levin
2012-08-22 2:27 ` [PATCH v3 14/17] net,rds: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 15/17] openvswitch: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 16/17] tracing output: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 17/17] SUNRPC: use new hashtable implementation in auth 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=1345602432-27673-7-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).