From patchwork Wed Aug 22 02:27:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1358651 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 84C6CDFB34 for ; Wed, 22 Aug 2012 02:29:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754620Ab2HVC30 (ORCPT ); Tue, 21 Aug 2012 22:29:26 -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 S1754596Ab2HVC23 (ORCPT ); Tue, 21 Aug 2012 22:28:29 -0400 Received: by mail-ob0-f174.google.com with SMTP id uo13so696106obb.19 for ; Tue, 21 Aug 2012 19:28:29 -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=8ODPTK9JBdPGR3bAicX53IQsAxtN7CfuRuwAlzto8xg=; b=w+KmYXaTG8yfHXLl9m37e7apJE6VCzZNz9T+3NNCgz4obrY0REo4akqHtVwRE27qHp zRtRAdzCu6CSH4E2q8hAK5awIiLG/SY17+L0IkieCMeIl9uF6bDSOtfHm+PQX4BqLmRO lhEX7oFyIHmJL/g0E2Vq98rTHF0RK3x+U5Nd9w1sgWytjPyw71X5ZUlcruA6gUG5S+nm DY9XPl+RnacIYIu2k/Zt8P5ncbqBK3GdAyxXjJxnZiwsMYy/R8+oqtlUUTfUezUi2kBG CG6zHiPKTawTnuY7kH6WVwEGai5cAftmcQxMuO4bH9te1c1KEJ4lK6DzSSNUieAExVPW wANg== Received: by 10.60.32.33 with SMTP id f1mr530908oei.71.1345602508987; Tue, 21 Aug 2012 19:28:28 -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.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 19:28:28 -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 15/17] openvswitch: use new hashtable implementation Date: Wed, 22 Aug 2012 04:27:10 +0200 Message-Id: <1345602432-27673-16-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: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Switch openvswitch to use the new hashtable implementation. This reduces the amount of generic unrelated code in openvswitch. Signed-off-by: Sasha Levin --- net/openvswitch/vport.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 6140336..3484120 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "vport.h" #include "vport-internal_dev.h" @@ -39,8 +40,8 @@ static const struct vport_ops *vport_ops_list[] = { }; /* Protected by RCU read lock for reading, RTNL lock for writing. */ -static struct hlist_head *dev_table; -#define VPORT_HASH_BUCKETS 1024 +#define VPORT_HASH_BITS 10 +static DEFINE_HASHTABLE(dev_table, VPORT_HASH_BITS); /** * ovs_vport_init - initialize vport subsystem @@ -49,10 +50,7 @@ static struct hlist_head *dev_table; */ int ovs_vport_init(void) { - dev_table = kzalloc(VPORT_HASH_BUCKETS * sizeof(struct hlist_head), - GFP_KERNEL); - if (!dev_table) - return -ENOMEM; + hash_init(dev_table); return 0; } @@ -67,12 +65,6 @@ void ovs_vport_exit(void) kfree(dev_table); } -static struct hlist_head *hash_bucket(const char *name) -{ - unsigned int hash = full_name_hash(name, strlen(name)); - return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)]; -} - /** * ovs_vport_locate - find a port that has already been created * @@ -82,11 +74,11 @@ static struct hlist_head *hash_bucket(const char *name) */ struct vport *ovs_vport_locate(const char *name) { - struct hlist_head *bucket = hash_bucket(name); struct vport *vport; struct hlist_node *node; + int key = full_name_hash(name, strlen(name)); - hlist_for_each_entry_rcu(vport, node, bucket, hash_node) + hash_for_each_possible_rcu(dev_table, vport, node, hash_node, key) if (!strcmp(name, vport->ops->get_name(vport))) return vport; @@ -170,14 +162,18 @@ struct vport *ovs_vport_add(const struct vport_parms *parms) for (i = 0; i < ARRAY_SIZE(vport_ops_list); i++) { if (vport_ops_list[i]->type == parms->type) { + int key; + const char *name; + vport = vport_ops_list[i]->create(parms); if (IS_ERR(vport)) { err = PTR_ERR(vport); goto out; } - hlist_add_head_rcu(&vport->hash_node, - hash_bucket(vport->ops->get_name(vport))); + name = vport->ops->get_name(vport); + key = full_name_hash(name, strlen(name)); + hash_add_rcu(dev_table, &vport->hash_node, key); return vport; } } @@ -218,7 +214,7 @@ void ovs_vport_del(struct vport *vport) { ASSERT_RTNL(); - hlist_del_rcu(&vport->hash_node); + hash_del_rcu(&vport->hash_node); vport->ops->destroy(vport); }