From patchwork Wed Aug 22 02:27:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 179208 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6F72D2C0094 for ; Wed, 22 Aug 2012 12:29:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755630Ab2HVC2j (ORCPT ); Tue, 21 Aug 2012 22:28:39 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:43131 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755158Ab2HVC2f (ORCPT ); Tue, 21 Aug 2012 22:28:35 -0400 Received: by mail-ob0-f174.google.com with SMTP id uo13so696106obb.19 for ; Tue, 21 Aug 2012 19:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ChduV/To6S5bRuwjDo4dS9VfjOStMXL7uD/y+VOgeQM=; b=RNq/IkW32/7hPLU5bP0s3Dr/am6lQAYrLP67GiOr6mnDnRhuPfuNpRnljUHfDAFT6J cCSUq5yi44JKaFZwW14vzeGiT1lqhVB4OXFKh7/8uLvZbtJozap7n9MHq3EuCrT2LjYt D9Wj9W5D9M1sRwi7y3qWXrpZviC8vCAGGNuJz7knBYg4YU2w/3Uvx4z/PBCYaz3G1tB+ QMT4K9eEe2Pb2g9x1pcHzjTwbcE/BH+0y8Dt07VsXEkERhx+qCxL6nzkWRS3MivdYEPh 4hM0D/qcUpjpWC2hf7Drzcu04ozPkxiCdT8WyQ/RdQ9Yt4tGbLTTWeYXtJcGAv/0mNyd IIPA== Received: by 10.182.8.6 with SMTP id n6mr14426623oba.39.1345602514921; Tue, 21 Aug 2012 19:28:34 -0700 (PDT) Received: from lappy.us.oracle.com (95-89-78-76-dynip.superkabel.de. [95.89.78.76]) by mx.google.com with ESMTPS id c6sm2813551obn.13.2012.08.21.19.28.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 19:28:34 -0700 (PDT) From: Sasha Levin 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 Subject: [PATCH v3 16/17] tracing output: use new hashtable implementation Date: Wed, 22 Aug 2012 04:27:11 +0200 Message-Id: <1345602432-27673-17-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1345602432-27673-1-git-send-email-levinsasha928@gmail.com> References: <1345602432-27673-1-git-send-email-levinsasha928@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Switch tracing to use the new hashtable implementation. This reduces the amount of generic unrelated code in the tracing module. Signed-off-by: Sasha Levin --- kernel/trace/trace_output.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 123b189..1324c1a 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -8,15 +8,15 @@ #include #include #include +#include #include "trace_output.h" -/* must be a power of 2 */ -#define EVENT_HASHSIZE 128 +#define EVENT_HASH_BITS 7 DECLARE_RWSEM(trace_event_mutex); -static struct hlist_head event_hash[EVENT_HASHSIZE] __read_mostly; +static DEFINE_HASHTABLE(event_hash, EVENT_HASH_BITS); static int next_event_type = __TRACE_LAST_TYPE + 1; @@ -712,11 +712,8 @@ struct trace_event *ftrace_find_event(int type) { struct trace_event *event; struct hlist_node *n; - unsigned key; - key = type & (EVENT_HASHSIZE - 1); - - hlist_for_each_entry(event, n, &event_hash[key], node) { + hash_for_each_possible(event_hash, event, n, node, type) { if (event->type == type) return event; } @@ -781,7 +778,6 @@ void trace_event_read_unlock(void) */ int register_ftrace_event(struct trace_event *event) { - unsigned key; int ret = 0; down_write(&trace_event_mutex); @@ -833,9 +829,7 @@ int register_ftrace_event(struct trace_event *event) if (event->funcs->binary == NULL) event->funcs->binary = trace_nop_print; - key = event->type & (EVENT_HASHSIZE - 1); - - hlist_add_head(&event->node, &event_hash[key]); + hash_add(event_hash, &event->node, event->type); ret = event->type; out: @@ -850,7 +844,7 @@ EXPORT_SYMBOL_GPL(register_ftrace_event); */ int __unregister_ftrace_event(struct trace_event *event) { - hlist_del(&event->node); + hash_del(&event->node); list_del(&event->list); return 0; } @@ -1323,6 +1317,8 @@ __init static int init_events(void) } } + hash_init(event_hash); + return 0; } early_initcall(init_events);