| Message ID | 20220425091631.109320-2-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [net,1/4] ipvs: correctly print the memory size of ip_vs_conn_tab | expand |
Hello: This series was applied to netdev/net.git (master) by Pablo Neira Ayuso <pablo@netfilter.org>: On Mon, 25 Apr 2022 11:16:28 +0200 you wrote: > From: Pengcheng Yang <yangpc@wangsu.com> > > The memory size of ip_vs_conn_tab changed after we use hlist > instead of list. > > Fixes: 731109e78415 ("ipvs: use hlist instead of list") > Signed-off-by: Pengcheng Yang <yangpc@wangsu.com> > Acked-by: Julian Anastasov <ja@ssi.bg> > Acked-by: Simon Horman <horms@verge.net.au> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > > [...] Here is the summary with links: - [net,1/4] ipvs: correctly print the memory size of ip_vs_conn_tab https://git.kernel.org/netdev/net/c/eba1a872cb73 - [net,2/4] netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion https://git.kernel.org/netdev/net/c/babc3dc9524f - [net,3/4] netfilter: flowtable: Remove the empty file https://git.kernel.org/netdev/net/c/b9b1e0da5800 - [net,4/4] netfilter: Update ip6_route_me_harder to consider L3 domain https://git.kernel.org/netdev/net/c/8ddffdb9442a You are awesome, thank you!
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 2c467c422dc6..fb67f1ca2495 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -1495,7 +1495,7 @@ int __init ip_vs_conn_init(void) pr_info("Connection hash table configured " "(size=%d, memory=%ldKbytes)\n", ip_vs_conn_tab_size, - (long)(ip_vs_conn_tab_size*sizeof(struct list_head))/1024); + (long)(ip_vs_conn_tab_size*sizeof(*ip_vs_conn_tab))/1024); IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n", sizeof(struct ip_vs_conn));