From 9c066b9271493ce3efff0b9d7b6e424990bba3f2 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Thu, 20 Nov 2014 12:26:01 -0800 Subject: [PATCH] idiag: provide a hash function for idiag objects Without ->oo_keygen, libnl will use linear search for cache objects. This is extremely slow for idiag when we have a lot of TCP connections. Provide a hash function for idiag so that libnl will be able to lookup a hashtable. http://lists.infradead.org/pipermail/libnl/2014-November/001715.html Cc: Thomas Graf Cc: Thomas Haller Signed-off-by: Cong Wang Signed-off-by: Thomas Haller --- lib/idiag/idiag_msg_obj.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/idiag/idiag_msg_obj.c b/lib/idiag/idiag_msg_obj.c index 19e6c5b..92a98e9 100644 --- a/lib/idiag/idiag_msg_obj.c +++ b/lib/idiag/idiag_msg_obj.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -710,6 +711,32 @@ errout_nomem: goto errout; } +static void idiagnl_keygen(struct nl_object *obj, uint32_t *hashkey, + uint32_t table_sz) +{ + struct idiagnl_msg *msg = (struct idiagnl_msg *)obj; + unsigned int key_sz; + struct idiagnl_hash_key { + uint8_t family; + uint8_t state; + uint16_t sport; + uint16_t dport; + } __attribute__((packed)) key; + + key_sz = sizeof(key); + key.family = msg->idiag_family; + key.state = msg->idiag_state; + key.sport = msg->idiag_sport; + key.dport = msg->idiag_dport; + + *hashkey = nl_hash(&key, key_sz, 0) % table_sz; + + NL_DBG(5, "idiagnl %p key (fam %d state %d sport %d dport %d) keysz %d, hash 0x%x\n", + msg, key.family, key.state, key.sport, key.dport, key_sz, *hashkey); + + return; +} + /** @cond SKIP */ struct nl_object_ops idiagnl_msg_obj_ops = { .oo_name = "idiag/idiag_msg", @@ -721,6 +748,7 @@ struct nl_object_ops idiagnl_msg_obj_ops = { [NL_DUMP_DETAILS] = idiag_msg_dump_details, [NL_DUMP_STATS] = idiag_msg_dump_stats, }, + .oo_keygen = idiagnl_keygen, .oo_attrs2str = idiagnl_attrs2str, .oo_id_attrs = (IDIAG_ATTR_INFO) }; -- 2.40.0