| Message ID | 20241001024837.96425-5-kuniyu@amazon.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ipv4: Namespacify IPv4 address hash table. | expand |
On Tue, Oct 1, 2024 at 4:51 AM Kuniyuki Iwashima <kuniyu@amazon.com> wrote: > > No one uses inet_addr_lst anymore, so let's remove it. > > While at it, we can remove net_hash_mix() from the hash calculation. > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Eric Dumazet <edumazet@google.com>
Hi Kuniyuki, kernel test robot noticed the following build warnings: [auto build test WARNING on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Kuniyuki-Iwashima/ipv4-Link-IPv4-address-to-per-net-hash-table/20241001-105607 base: net-next/main patch link: https://lore.kernel.org/r/20241001024837.96425-5-kuniyu%40amazon.com patch subject: [PATCH v1 net-next 4/5] ipv4: Retire global IPv4 hash table inet_addr_lst. config: x86_64-randconfig-122-20241001 (https://download.01.org/0day-ci/archive/20241002/202410020334.VOgHq3VG-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241002/202410020334.VOgHq3VG-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202410020334.VOgHq3VG-lkp@intel.com/ sparse warnings: (new ones prefixed by >>) >> net/ipv4/devinet.c:124:24: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected unsigned int [usertype] val @@ got restricted __be32 [usertype] addr @@ net/ipv4/devinet.c:124:24: sparse: expected unsigned int [usertype] val net/ipv4/devinet.c:124:24: sparse: got restricted __be32 [usertype] addr vim +124 net/ipv4/devinet.c 121 122 static u32 inet_addr_hash(const struct net *net, __be32 addr) 123 { > 124 return hash_32(addr, IN4_ADDR_HSIZE_SHIFT); 125 } 126
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index d0c2bf67a9b0..d9c690c8c80b 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -141,7 +141,6 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev) ARP_EVICT_NOCARRIER) struct in_ifaddr { - struct hlist_node hash; struct hlist_node addr_lst; struct in_ifaddr __rcu *ifa_next; struct in_device *ifa_dev; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index ac245944e89e..96fc4aacc539 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -119,13 +119,9 @@ struct inet_fill_args { #define IN4_ADDR_HSIZE_SHIFT 8 #define IN4_ADDR_HSIZE (1U << IN4_ADDR_HSIZE_SHIFT) -static struct hlist_head inet_addr_lst[IN4_ADDR_HSIZE]; - static u32 inet_addr_hash(const struct net *net, __be32 addr) { - u32 val = (__force u32) addr ^ net_hash_mix(net); - - return hash_32(val, IN4_ADDR_HSIZE_SHIFT); + return hash_32(addr, IN4_ADDR_HSIZE_SHIFT); } static void inet_hash_insert(struct net *net, struct in_ifaddr *ifa) @@ -133,7 +129,6 @@ static void inet_hash_insert(struct net *net, struct in_ifaddr *ifa) u32 hash = inet_addr_hash(net, ifa->ifa_local); ASSERT_RTNL(); - hlist_add_head_rcu(&ifa->hash, &inet_addr_lst[hash]); hlist_add_head_rcu(&ifa->addr_lst, &net->ipv4.inet_addr_lst[hash]); } @@ -141,7 +136,6 @@ static void inet_hash_remove(struct in_ifaddr *ifa) { ASSERT_RTNL(); hlist_del_init_rcu(&ifa->addr_lst); - hlist_del_init_rcu(&ifa->hash); } /** @@ -228,7 +222,6 @@ static struct in_ifaddr *inet_alloc_ifa(struct in_device *in_dev) in_dev_hold(in_dev); ifa->ifa_dev = in_dev; - INIT_HLIST_NODE(&ifa->hash); INIT_HLIST_NODE(&ifa->addr_lst); return ifa; @@ -2804,11 +2797,6 @@ static struct rtnl_af_ops inet_af_ops __read_mostly = { void __init devinet_init(void) { - int i; - - for (i = 0; i < IN4_ADDR_HSIZE; i++) - INIT_HLIST_HEAD(&inet_addr_lst[i]); - register_pernet_subsys(&devinet_ops); register_netdevice_notifier(&ip_netdev_notifier);
No one uses inet_addr_lst anymore, so let's remove it. While at it, we can remove net_hash_mix() from the hash calculation. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> --- include/linux/inetdevice.h | 1 - net/ipv4/devinet.c | 14 +------------- 2 files changed, 1 insertion(+), 14 deletions(-)