]> granicus.if.org Git - ipset/commit
Count non-static extension memory into the set memory size for userspace
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Fri, 26 Jun 2015 07:40:14 +0000 (09:40 +0200)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Fri, 26 Jun 2015 07:40:14 +0000 (09:40 +0200)
commit5a5688893ae312faf2574e7c707a78c225256973
treeb870b69f3db9f4ff0fd1722230aada6801332d73
parentff0f4b65fb95474890301c2c10133f2d071ad360
Count non-static extension memory into the set memory size for userspace

Non-static (i.e. comment) extension was not counted into the memory
size. A new internal counter is introduced for this. In the case of
the hash types the sizes of the arrays are counted there as well so
that we can avoid to scan the whole set when just the header data
is requested.
kernel/include/linux/netfilter/ipset/ip_set.h
kernel/include/linux/netfilter/ipset/ip_set_comment.h
kernel/net/netfilter/ipset/ip_set_bitmap_gen.h
kernel/net/netfilter/ipset/ip_set_core.c
kernel/net/netfilter/ipset/ip_set_hash_gen.h
kernel/net/netfilter/ipset/ip_set_list_set.c