Skip to content

Commit

Permalink
vxlan: vxlan_core: Support FDB flushing by nexthop ID
Browse files Browse the repository at this point in the history
Add support for flush VXLAN FDB entries by nexthop ID.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Amit Cohen authored and David S. Miller committed Oct 13, 2023
1 parent a0f89d5 commit 36c1112
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions drivers/net/vxlan/vxlan_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3029,6 +3029,7 @@ struct vxlan_fdb_flush_desc {
unsigned long flags;
unsigned long flags_mask;
__be32 src_vni;
u32 nhid;
};

static bool vxlan_fdb_is_default_entry(const struct vxlan_fdb *f,
Expand All @@ -3037,6 +3038,13 @@ static bool vxlan_fdb_is_default_entry(const struct vxlan_fdb *f,
return is_zero_ether_addr(f->eth_addr) && f->vni == vxlan->cfg.vni;
}

static bool vxlan_fdb_nhid_matches(const struct vxlan_fdb *f, u32 nhid)
{
struct nexthop *nh = rtnl_dereference(f->nh);

return nh && nh->id == nhid;
}

static bool vxlan_fdb_flush_matches(const struct vxlan_fdb *f,
const struct vxlan_dev *vxlan,
const struct vxlan_fdb_flush_desc *desc)
Expand All @@ -3053,6 +3061,9 @@ static bool vxlan_fdb_flush_matches(const struct vxlan_fdb *f,
if (desc->src_vni && f->vni != desc->src_vni)
return false;

if (desc->nhid && !vxlan_fdb_nhid_matches(f, desc->nhid))
return false;

return true;
}

Expand Down Expand Up @@ -3081,6 +3092,7 @@ static void vxlan_flush(struct vxlan_dev *vxlan,

static const struct nla_policy vxlan_del_bulk_policy[NDA_MAX + 1] = {
[NDA_SRC_VNI] = { .type = NLA_U32 },
[NDA_NH_ID] = { .type = NLA_U32 },
[NDA_NDM_STATE_MASK] = { .type = NLA_U16 },
[NDA_NDM_FLAGS_MASK] = { .type = NLA_U8 },
};
Expand Down Expand Up @@ -3128,6 +3140,9 @@ static int vxlan_fdb_delete_bulk(struct nlmsghdr *nlh, struct net_device *dev,
if (tb[NDA_SRC_VNI])
desc.src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI]));

if (tb[NDA_NH_ID])
desc.nhid = nla_get_u32(tb[NDA_NH_ID]);

vxlan_flush(vxlan, &desc);

return 0;
Expand Down

0 comments on commit 36c1112

Please sign in to comment.