From patchwork Mon Aug 6 14:14:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Emelyanov X-Patchwork-Id: 175364 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 8A5592C008C for ; Tue, 7 Aug 2012 00:14:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756403Ab2HFOOO (ORCPT ); Mon, 6 Aug 2012 10:14:14 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:13854 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756325Ab2HFOON (ORCPT ); Mon, 6 Aug 2012 10:14:13 -0400 Received: from [10.30.22.37] ([10.30.22.37]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q76EE7Lq031174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 6 Aug 2012 18:14:07 +0400 (MSK) Message-ID: <501FD12F.9080706@parallels.com> Date: Mon, 06 Aug 2012 18:14:07 +0400 From: Pavel Emelyanov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.1) Gecko/20120209 Thunderbird/10.0.1 MIME-Version: 1.0 To: David Miller , Eric Dumazet , "Eric W. Biederman" , Linux Netdev List Subject: [PATCH 2/6] net: Dont use ifindices in hash fns References: <501FD0F2.4040609@parallels.com> In-Reply-To: <501FD0F2.4040609@parallels.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Eric noticed, that when there will be devices with equal indices, some hash functions that use them will become less effective as they could. Fix this in advance by taking the net_device address into calculations instead of the device index. Since the net_device is always aligned in memory, shift the pointer to eliminate always zero bits (like we do it in net_hash_mix). This is true for arp and ndisc hash fns. The netlabel, can and llc ones are also ifindex-based, but that three are init_net-only, thus will not be affected. Signed-off-by: Pavel Emelyanov --- include/net/arp.h | 3 ++- include/net/ndisc.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/net/arp.h b/include/net/arp.h index 7f7df93..b9ce3a9 100644 --- a/include/net/arp.h +++ b/include/net/arp.h @@ -3,6 +3,7 @@ #define _ARP_H #include +#include #include @@ -10,7 +11,7 @@ extern struct neigh_table arp_tbl; static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd) { - u32 val = key ^ dev->ifindex; + u32 val = key ^ ptr_hash_mix(dev); return val * hash_rnd; } diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 96a3b5c..a9b55b2 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -49,6 +49,7 @@ enum { #include #include #include +#include #include @@ -134,7 +135,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _ { const u32 *p32 = pkey; - return (((p32[0] ^ dev->ifindex) * hash_rnd[0]) + + return (((p32[0] ^ ptr_hash_mix(dev)) * hash_rnd[0]) + (p32[1] * hash_rnd[1]) + (p32[2] * hash_rnd[2]) + (p32[3] * hash_rnd[3]));