On 8/25/20 3:42 PM, Mahesh Bandewar wrote: > The sysctl that was added earlier by commit 79134e6ce2c ("net: do > not create fallback tunnels for non-default namespaces") to create > fall-back only in root-ns. This patch enhances that behavior to provide > option not to create fallback tunnels in root-ns as well. Since modules > that create fallback tunnels could be built-in and setting the sysctl > value after booting is pointless, so added a kernel cmdline options to > change this default. The default setting is preseved for backward > compatibility. The kernel command line option of fb_tunnels=initns will > set the sysctl value to 1 and will create fallback tunnels only in initns > while kernel cmdline fb_tunnels=none will set the sysctl value to 2 and > fallback tunnels are skipped in every netns. > > Signed-off-by: Mahesh Bandewar <mahe...@google.com> > Cc: Eric Dumazet <eduma...@google.com> > Cc: Maciej Zenczykowski <m...@google.com> > Cc: Jian Yang <jiany...@google.com> > --- > v1->v2 > Removed the Kconfig option which would force rebuild and replaced with > kcmd-line option > > .../admin-guide/kernel-parameters.txt | 5 +++++ > Documentation/admin-guide/sysctl/net.rst | 20 +++++++++++++------ > include/linux/netdevice.h | 7 ++++++- > net/core/sysctl_net_core.c | 17 ++++++++++++++-- > 4 files changed, 40 insertions(+), 9 deletions(-) > > diff --git a/Documentation/admin-guide/kernel-parameters.txt > b/Documentation/admin-guide/kernel-parameters.txt > index a1068742a6df..09a51598c792 100644 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -801,6 +801,11 @@ > > debug_objects [KNL] Enable object debugging > > + fb_tunnels= [NET] > + Format: { initns | none } > + See Documentation/admin-guide/sysctl/net.rst for > + fb_tunnels_only_for_init_ns > +
Not at this location in this file. Entries in this file are meant to be in alphabetical order (mostly). So leave debug_objects and no_debug_objects together, and insert fb_tunnels between fail_make_request= and floppy=. Thanks. > no_debug_objects > [KNL] Disable object debugging > -- ~Randy