| Message ID | 1649761545-1864-1-git-send-email-yangpc@wangsu.com |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [nf,v2] ipvs: correctly print the memory size of ip_vs_conn_tab | expand |
Hello, On Tue, 12 Apr 2022, Pengcheng Yang wrote: > 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> > --- v2 looks better to me for nf-next, thanks! Acked-by: Julian Anastasov <ja@ssi.bg> > v2: use pointer dereference instead of struct types > > net/netfilter/ipvs/ip_vs_conn.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c > index 2c467c4..fb67f1c 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)); > > -- > 1.8.3.1 Regards -- Julian Anastasov <ja@ssi.bg>
On Fri, Apr 15, 2022 at 04:22:47PM +0300, Julian Anastasov wrote: > > Hello, > > On Tue, 12 Apr 2022, Pengcheng Yang wrote: > > > 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> > > --- > > v2 looks better to me for nf-next, thanks! > > Acked-by: Julian Anastasov <ja@ssi.bg> Acked-by: Simon Horman <horms@verge.net.au> > > v2: use pointer dereference instead of struct types > > > > net/netfilter/ipvs/ip_vs_conn.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c > > index 2c467c4..fb67f1c 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)); > > > > -- > > 1.8.3.1 > > Regards > > -- > Julian Anastasov <ja@ssi.bg> >
On Tue, Apr 19, 2022 at 10:57:31AM +0200, Simon Horman wrote: > On Fri, Apr 15, 2022 at 04:22:47PM +0300, Julian Anastasov wrote: > > > > Hello, > > > > On Tue, 12 Apr 2022, Pengcheng Yang wrote: > > > > > 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> > > > --- > > > > v2 looks better to me for nf-next, thanks! > > > > Acked-by: Julian Anastasov <ja@ssi.bg> > > Acked-by: Simon Horman <horms@verge.net.au> Applied to nf.git, thanks
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 2c467c4..fb67f1c 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));
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> --- v2: use pointer dereference instead of struct types net/netfilter/ipvs/ip_vs_conn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)