diff options
author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-02-21 21:53:11 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2020-02-21 21:53:11 +0100 |
commit | aa035df78aa6a2b14b4722a681d3c051bc9cf92e (patch) | |
tree | 287a34d79cfae84ee25e59c4c80a35a53fc90315 | |
parent | 6da3aeb4aedb944dfe2a711bf7e41dbdf6abeb5d (diff) |
netfilter: ipset: Correct the reported memory size
The patch
netfilter: ipset: Fix "INFO: rcu detected stall in hash_xxx" reports
did not include the size of the comment extensions from the memory size
for set listing. Add it, so the proper size is printed.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
-rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_gen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h index 9ba0b99..e5f99ec 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h @@ -1284,7 +1284,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb) rcu_read_lock_bh(); t = rcu_dereference_bh(h->table); mtype_ext_size(set, &elements, &ext_size); - memsize = mtype_ahash_memsize(h, t) + ext_size; + memsize = mtype_ahash_memsize(h, t) + ext_size + set->ext_size; htable_bits = t->htable_bits; rcu_read_unlock_bh(); |