netfilter: conntrack: allow increasing bucket size via sysctl too
Subsystems (3)
Florian Westphal
maintainerPATCH 1/1 netfilter: conntrack: allow increasing bucket size via sysctl too
No need to restrict this to module parameter.
We export a copy of the real hash size -- when user alters the value we allocate the new table, copy entries etc before we update the real size to the requested one.
This is also needed because the real size is used by concurrent readers and cannot be changed without synchronizing the conntrack generation seqcnt.
We only allow changing this value from the initial net namespace.
Tested using http-client-benchmark vs. httpterm with concurrent
while true; do
echo $RANDOM > /proc/sys/net/netfilter/nf_conntrack_buckets
done
--- Documentation/networking/nf_conntrack-sysctl.txt | 3 +- include/net/netfilter/nf_conntrack.h | 1 + net/netfilter/nf_conntrack_core.c | 41 ++++++++++++++++-------- net/netfilter/nf_conntrack_standalone.c | 35 +++++++++++++++++--- 4 files changed, 61 insertions(+), 19 deletions(-)
Documentation/networking/nf_conntrack-sysctl.txt +2 -1
@@ -7,12 +7,13 @@ nf_conntrack_acct - BOOLEAN Enable connection tracking flow accounting. 64-bit byte and packet counters per flow are added. -nf_conntrack_buckets - INTEGER (read-only) +nf_conntrack_buckets - INTEGER Size of hash table. If not specified as parameter during module loading, the default size is calculated by dividing total memory by 16384 to determine the number of buckets but the hash table will never have fewer than 32 and limited to 16384 buckets. For systems with more than 4GB of memory it will be 65536 buckets. + This sysctl is only writeable in the initial net namespace. nf_conntrack_checksum - BOOLEAN 0 - disabled
include/net/netfilter/nf_conntrack.h +1 -0
@@ -287,6 +287,7 @@ static inline bool nf_is_loopback_packet(const struct sk_buff *skb)struct kernel_param ;int nf_conntrack_set_hashsize (const char *val,struct kernel_param *kp); +int nf_conntrack_hash_resize (unsigned int hashsize);extern unsigned int nf_conntrack_htable_size;extern unsigned int nf_conntrack_max;
net/netfilter/nf_conntrack_core.c +28 -13
64 lines not on this page · raw message
net/netfilter/nf_conntrack_standalone.c +30 -5
@@ -434,8 +434,29 @@ static void nf_conntrack_standalone_fini_proc(struct net *net)#ifdef CONFIG_SYSCTL /* Log invalid packets of a given protocol */ -static int log_invalid_proto_min =0 ; -static int log_invalid_proto_max =255 ; +static int log_invalid_proto_min__read_mostly ; +static int log_invalid_proto_max__read_mostly =255 ; + +/* size the user *wants to set */ +static unsigned int nf_conntrack_htable_size_user__read_mostly ; + +static int +nf_conntrack_hash_sysctl (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +int ret; + + ret =proc_dointvec (table, write, buffer, lenp, ppos); +if (ret <0 || !write) +return ret; + +/* update ret, we might not be able to satisfy request */ + ret =nf_conntrack_hash_resize (nf_conntrack_htable_size_user); + +/* update it to the actual value used by conntrack */ + nf_conntrack_htable_size_user = nf_conntrack_htable_size; +return ret; +}static struct ctl_table_header *nf_ct_netfilter_header;
@@ -456,10 +477,10 @@ static struct ctl_table nf_ct_sysctl_table[] = { }, { .procname = "nf_conntrack_buckets", - .data = &nf_conntrack_htable_size, + .data = &nf_conntrack_htable_size_user, .maxlen = sizeof(unsigned int), - .mode = 0444, - .proc_handler = proc_dointvec, + .mode = 0644, + .proc_handler = nf_conntrack_hash_sysctl, }, { .procname = "nf_conntrack_checksum",
@@ -515,6 +536,9 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net)if (net->user_ns != &init_user_ns) table[0 ].procname =NULL ; +if (!net_eq (&init_net, net)) + table[2 ].mode =0444 ; + net->ct.sysctl_header =register_net_sysctl (net,"net/netfilter" , table);if (!net->ct.sysctl_header) goto out_unregister_netfilter;
@@ -611,6 +635,7 @@ static int __init nf_conntrack_standalone_init(void) goto out_pernet;nf_conntrack_init_end (); + nf_conntrack_htable_size_user = nf_conntrack_htable_size;return 0 ; out_pernet:
Signature · 1 line
2.7.3
kbuild test robot
build botreproduce:
Hi,
[auto build test ERROR on nf-next/master]
url: https://github.com/0day-ci/linux/commits/Florian-Westphal/netfilter-conntrack-allow-increasing-bucket-size-via-sysctl-too/20160516-014623 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next master config: x86_64-randconfig-n0-05251422 (attached as .config) compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
Note: the linux-review/Florian-Westphal/netfilter-conntrack-allow-increasing-bucket-size-via-sysctl-too/20160516-014623 HEAD 5f39f4af5e5d9cf4d678faa29015e6aa5b89513d builds fine.
It only hurts bisectibility.
All errors (new ones prefixed by >>):
net/netfilter/nf_conntrack_standalone.c: In function 'nf_conntrack_standalone_init':
>> net/netfilter/nf_conntrack_standalone.c:640:2: error: 'nf_conntrack_htable_size_user' undeclared (first use in this function)
nf_conntrack_htable_size_user = nf_conntrack_htable_size;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ net/netfilter/nf_conntrack_standalone.c:640:2: note: each undeclared identifier is reported only once for each function it appears in
vim +/nf_conntrack_htable_size_user +640 net/netfilter/nf_conntrack_standalone.c
634
635 ret = register_pernet_subsys(&nf_conntrack_net_ops);
636 if (ret < 0)
637 goto out_pernet;
638
639 nf_conntrack_init_end();
> 640 nf_conntrack_htable_size_user = nf_conntrack_htable_size;
641 return 0;
642
643 out_pernet:
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Florian Westphal
maintainerQuoted 11 lines · kbuild test robot
url: https://github.com/0day-ci/linux/commits/Florian-Westphal/netfilter-conntrack-allow-increasing-bucket-size-via-sysctl-too/20160516-014623 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next master config: x86_64-randconfig-n0-05251422 (attached as .config) compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430 reproduce: # save the attached .config to linux build tree make ARCH=x86_64Note: the linux-review/Florian-Westphal/netfilter-conntrack-allow-increasing-bucket-size-via-sysctl-too/20160516-014623 HEAD
5f39f4af5e5d9cf4d678faa29015e6aa5b89513dbuilds fine.
It only hurts bisectibility.
Quoted 7 lines
All errors (new ones prefixed by >>):
net/netfilter/nf_conntrack_standalone.c: In function 'nf_conntrack_standalone_init':Quoted 1 line
Quoted 1 line
net/netfilter/nf_conntrack_standalone.c:640:2: error: 'nf_conntrack_htable_size_user' undeclared (first use in this function)nf_conntrack_htable_size_user = nf_conntrack_htable_size; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
net/netfilter/nf_conntrack_standalone.c:640:2: note: each undeclared identifier is reported only once for each function it appears in
I'll send a v2 once -next is open again.