lkml.org 
[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 08/84] net: vrf: Make add_fib_rules per network namespace flag
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: David Ahern <dsahern@gmail.com>


    [ Upstream commit 097d3c9508dc58286344e4a22b300098cf0c1566 ]

    Commit 1aa6c4f6b8cd8 ("net: vrf: Add l3mdev rules on first device create")
    adds the l3mdev FIB rule the first time a VRF device is created. However,
    it only creates the rule once and only in the namespace the first device
    is created - which may not be init_net. Fix by using the net_generic
    capability to make the add_fib_rules flag per network namespace.

    Fixes: 1aa6c4f6b8cd8 ("net: vrf: Add l3mdev rules on first device create")
    Reported-by: Petr Machata <petrm@mellanox.com>
    Signed-off-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/vrf.c | 36 ++++++++++++++++++++++++++++++++----
    1 file changed, 32 insertions(+), 4 deletions(-)

    --- a/drivers/net/vrf.c
    +++ b/drivers/net/vrf.c
    @@ -36,12 +36,14 @@
    #include <net/addrconf.h>
    #include <net/l3mdev.h>
    #include <net/fib_rules.h>
    +#include <net/netns/generic.h>

    #define DRV_NAME "vrf"
    #define DRV_VERSION "1.0"

    #define FIB_RULE_PREF 1000 /* default preference for FIB rules */
    -static bool add_fib_rules = true;
    +
    +static unsigned int vrf_net_id;

    struct net_vrf {
    struct rtable __rcu *rth;
    @@ -1252,6 +1254,8 @@ static int vrf_newlink(struct net *src_n
    struct nlattr *tb[], struct nlattr *data[])
    {
    struct net_vrf *vrf = netdev_priv(dev);
    + bool *add_fib_rules;
    + struct net *net;
    int err;

    if (!data || !data[IFLA_VRF_TABLE])
    @@ -1267,13 +1271,15 @@ static int vrf_newlink(struct net *src_n
    if (err)
    goto out;

    - if (add_fib_rules) {
    + net = dev_net(dev);
    + add_fib_rules = net_generic(net, vrf_net_id);
    + if (*add_fib_rules) {
    err = vrf_add_fib_rules(dev);
    if (err) {
    unregister_netdevice(dev);
    goto out;
    }
    - add_fib_rules = false;
    + *add_fib_rules = false;
    }

    out:
    @@ -1356,16 +1362,38 @@ static struct notifier_block vrf_notifie
    .notifier_call = vrf_device_event,
    };

    +/* Initialize per network namespace state */
    +static int __net_init vrf_netns_init(struct net *net)
    +{
    + bool *add_fib_rules = net_generic(net, vrf_net_id);
    +
    + *add_fib_rules = true;
    +
    + return 0;
    +}
    +
    +static struct pernet_operations vrf_net_ops __net_initdata = {
    + .init = vrf_netns_init,
    + .id = &vrf_net_id,
    + .size = sizeof(bool),
    +};
    +
    static int __init vrf_init_module(void)
    {
    int rc;

    register_netdevice_notifier(&vrf_notifier_block);

    - rc = rtnl_link_register(&vrf_link_ops);
    + rc = register_pernet_subsys(&vrf_net_ops);
    if (rc < 0)
    goto error;

    + rc = rtnl_link_register(&vrf_link_ops);
    + if (rc < 0) {
    + unregister_pernet_subsys(&vrf_net_ops);
    + goto error;
    + }
    +
    return 0;

    error:

    \
     
     \ /
      Last update: 2017-07-03 16:02    [W:4.100 / U:24.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site