[PATCH net] vxlan: Remove access to nexthop group struct

[David Ahern]

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 <ro...@cumulusnetworks.com>
Signed-off-by: David Ahern <dsah...@kernel.org>
---
 drivers/net/vxlan.c   |  8 +++-----
 include/net/nexthop.h | 11 +++++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 5bb448ae6c9c..0c6086879ab7 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -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;
diff --git a/include/net/nexthop.h b/include/net/nexthop.h
index c28bed98d211..f452fc6ad742 100644
--- a/include/net/nexthop.h
+++ b/include/net/nexthop.h
@@ -137,6 +137,17 @@ static inline bool nexthop_cmp(const struct nexthop *nh1,
        return nh1 == nh2;
 }
 
+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) {
-- 
2.17.1