lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1351450948-15618-15-git-send-email-levinsasha928@gmail.com> Date: Sun, 28 Oct 2012 15:02:27 -0400 From: Sasha Levin <levinsasha928@...il.com> To: torvalds@...ux-foundation.org Cc: tj@...nel.org, akpm@...ux-foundation.org, linux-kernel@...r.kernel.org, linux-mm@...ck.org, paul.gortmaker@...driver.com, davem@...emloft.net, rostedt@...dmis.org, mingo@...e.hu, ebiederm@...ssion.com, aarcange@...hat.com, ericvh@...il.com, netdev@...r.kernel.org, josh@...htriplett.org, eric.dumazet@...il.com, mathieu.desnoyers@...icios.com, axboe@...nel.dk, agk@...hat.com, dm-devel@...hat.com, neilb@...e.de, ccaulfie@...hat.com, teigland@...hat.com, Trond.Myklebust@...app.com, bfields@...ldses.org, fweisbec@...il.com, jesse@...ira.com, venkat.x.venkatsubra@...cle.com, ejt@...hat.com, snitzer@...hat.com, edumazet@...gle.com, linux-nfs@...r.kernel.org, dev@...nvswitch.org, rds-devel@....oracle.com, lw@...fujitsu.com, Sasha Levin <levinsasha928@...il.com> Subject: [PATCH v7 15/16] openvswitch: use new hashtable implementation Switch openvswitch to use the new hashtable implementation. This reduces the amount of generic unrelated code in openvswitch. Signed-off-by: Sasha Levin <levinsasha928@...il.com> --- net/openvswitch/vport.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 03779e8..3cb9caa 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -28,6 +28,7 @@ #include <linux/rtnetlink.h> #include <linux/compat.h> #include <net/net_namespace.h> +#include <linux/hashtable.h> #include "datapath.h" #include "vport.h" @@ -41,8 +42,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 @@ -51,10 +52,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; } @@ -69,12 +67,6 @@ void ovs_vport_exit(void) kfree(dev_table); } -static struct hlist_head *hash_bucket(struct net *net, const char *name) -{ - unsigned int hash = jhash(name, strlen(name), (unsigned long) net); - return &dev_table[hash & (VPORT_HASH_BUCKETS - 1)]; -} - /** * ovs_vport_locate - find a port that has already been created * @@ -84,13 +76,12 @@ static struct hlist_head *hash_bucket(struct net *net, const char *name) */ struct vport *ovs_vport_locate(struct net *net, const char *name) { - struct hlist_head *bucket = hash_bucket(net, 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) - if (!strcmp(name, vport->ops->get_name(vport)) && - net_eq(ovs_dp_get_net(vport->dp), net)) + hash_for_each_possible_rcu(dev_table, vport, node, hash_node, key) + if (!strcmp(name, vport->ops->get_name(vport))) return vport; return NULL; @@ -174,7 +165,8 @@ 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) { - struct hlist_head *bucket; + int key; + const char *name; vport = vport_ops_list[i]->create(parms); if (IS_ERR(vport)) { @@ -182,9 +174,9 @@ struct vport *ovs_vport_add(const struct vport_parms *parms) goto out; } - bucket = hash_bucket(ovs_dp_get_net(vport->dp), - vport->ops->get_name(vport)); - hlist_add_head_rcu(&vport->hash_node, bucket); + name = vport->ops->get_name(vport); + key = full_name_hash(name, strlen(name)); + hash_add_rcu(dev_table, &vport->hash_node, key); return vport; } } @@ -225,7 +217,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); } -- 1.7.12.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists