]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
vxlan: Remove access to nexthop group struct
authorDavid Ahern <dsahern@kernel.org>
Tue, 9 Jun 2020 23:27:28 +0000 (17:27 -0600)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Jun 2020 20:20:20 +0000 (13:20 -0700)
vxlan driver should be using helpers to access nexthop struct
internals. Remove open check if whether nexthop is multipath in
favor of the existing nexthop_is_multipath helper. Add a new
helper, nexthop_has_v4, to cover the need to check has_v4 in
a group.

Fixes: 1274e1cc4226 ("vxlan: ecmp support for mac fdb entries")
Cc: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxlan.c
include/net/nexthop.h

index 8a39e8047f144c5d3b09cb9ecfbc928fc786e638..e8085ab6d4849b89e70aba97d6f0f6e343c002fa 100644 (file)
@@ -857,7 +857,6 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                               u32 nhid, struct netlink_ext_ack *extack)
 {
        struct nexthop *old_nh = rtnl_dereference(fdb->nh);
-       struct nh_group *nhg;
        struct nexthop *nh;
        int err = -EINVAL;
 
@@ -881,8 +880,7 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                        goto err_inval;
                }
 
-               nhg = rtnl_dereference(nh->nh_grp);
-               if (!nh->is_group || !nhg->mpath) {
+               if (!nexthop_is_multipath(nh)) {
                        NL_SET_ERR_MSG(extack, "Nexthop is not a multipath group");
                        goto err_inval;
                }
@@ -890,14 +888,14 @@ static int vxlan_fdb_nh_update(struct vxlan_dev *vxlan, struct vxlan_fdb *fdb,
                /* check nexthop group family */
                switch (vxlan->default_dst.remote_ip.sa.sa_family) {
                case AF_INET:
-                       if (!nhg->has_v4) {
+                       if (!nexthop_has_v4(nh)) {
                                err = -EAFNOSUPPORT;
                                NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
                                goto err_inval;
                        }
                        break;
                case AF_INET6:
-                       if (nhg->has_v4) {
+                       if (nexthop_has_v4(nh)) {
                                err = -EAFNOSUPPORT;
                                NL_SET_ERR_MSG(extack, "Nexthop group family not supported");
                                goto err_inval;
index 3f9e0ca2dc4d965f2ef5fd78d6665abc41b9862a..3a4f9e3b91a55e077d6bb3fef0400ff17bbcad77 100644 (file)
@@ -151,6 +151,17 @@ static inline bool nexthop_is_fdb(const struct nexthop *nh)
        }
 }
 
+static inline bool nexthop_has_v4(const struct nexthop *nh)
+{
+       if (nh->is_group) {
+               struct nh_group *nh_grp;
+
+               nh_grp = rcu_dereference_rtnl(nh->nh_grp);
+               return nh_grp->has_v4;
+       }
+       return false;
+}
+
 static inline bool nexthop_is_multipath(const struct nexthop *nh)
 {
        if (nh->is_group) {