|
Jiri Wiesner |
f56bcd |
From eba1a872cb73314280d5448d934935b23e30b7ca Mon Sep 17 00:00:00 2001
|
|
Jiri Wiesner |
f56bcd |
From: Pengcheng Yang <yangpc@wangsu.com>
|
|
Jiri Wiesner |
f56bcd |
Date: Tue, 12 Apr 2022 19:05:45 +0800
|
|
Jiri Wiesner |
f56bcd |
Subject: [PATCH] ipvs: correctly print the memory size of ip_vs_conn_tab
|
|
Jiri Wiesner |
f56bcd |
Git-commit: eba1a872cb73314280d5448d934935b23e30b7ca
|
|
Jiri Wiesner |
f56bcd |
Patch-mainline: v5.18-rc5
|
|
Jiri Wiesner |
f56bcd |
References: bsc#1207361
|
|
Jiri Wiesner |
f56bcd |
|
|
Jiri Wiesner |
f56bcd |
The memory size of ip_vs_conn_tab changed after we use hlist
|
|
Jiri Wiesner |
f56bcd |
instead of list.
|
|
Jiri Wiesner |
f56bcd |
|
|
Jiri Wiesner |
f56bcd |
Fixes: 731109e78415 ("ipvs: use hlist instead of list")
|
|
Jiri Wiesner |
f56bcd |
Signed-off-by: Pengcheng Yang <yangpc@wangsu.com>
|
|
Jiri Wiesner |
f56bcd |
Acked-by: Julian Anastasov <ja@ssi.bg>
|
|
Jiri Wiesner |
f56bcd |
Acked-by: Simon Horman <horms@verge.net.au>
|
|
Jiri Wiesner |
f56bcd |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Jiri Wiesner |
f56bcd |
Signed-off-by: Jiri Wiesner <jwiesner@suse.de>
|
|
Jiri Wiesner |
f56bcd |
---
|
|
Jiri Wiesner |
f56bcd |
net/netfilter/ipvs/ip_vs_conn.c | 2 +-
|
|
Jiri Wiesner |
f56bcd |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Jiri Wiesner |
f56bcd |
|
|
Jiri Wiesner |
f56bcd |
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
|
|
Jiri Wiesner |
f56bcd |
index 2c467c422dc6..fb67f1ca2495 100644
|
|
Jiri Wiesner |
f56bcd |
--- a/net/netfilter/ipvs/ip_vs_conn.c
|
|
Jiri Wiesner |
f56bcd |
+++ b/net/netfilter/ipvs/ip_vs_conn.c
|
|
Jiri Wiesner |
f56bcd |
@@ -1495,7 +1495,7 @@ int __init ip_vs_conn_init(void)
|
|
Jiri Wiesner |
f56bcd |
pr_info("Connection hash table configured "
|
|
Jiri Wiesner |
f56bcd |
"(size=%d, memory=%ldKbytes)\n",
|
|
Jiri Wiesner |
f56bcd |
ip_vs_conn_tab_size,
|
|
Jiri Wiesner |
f56bcd |
- (long)(ip_vs_conn_tab_size*sizeof(struct list_head))/1024);
|
|
Jiri Wiesner |
f56bcd |
+ (long)(ip_vs_conn_tab_size*sizeof(*ip_vs_conn_tab))/1024);
|
|
Jiri Wiesner |
f56bcd |
IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n",
|
|
Jiri Wiesner |
f56bcd |
sizeof(struct ip_vs_conn));
|
|
Jiri Wiesner |
f56bcd |
|
|
Jiri Wiesner |
f56bcd |
--
|
|
Jiri Wiesner |
f56bcd |
2.35.3
|
|
Jiri Wiesner |
f56bcd |
|