Commit 906dc186 authored by Thomas Richter's avatar Thomas Richter Committed by David S. Miller
Browse files

vxlan fdb replace an existing entry 



Add support to replace an existing entry found in the
vxlan fdb database. The entry in question is identified
by its unicast mac address and the destination information
is changed. If the entry is not found, it is added in the
forwarding database. This is similar to changing an entry
in the neighbour table.

Multicast mac addresses can not be changed with the replace
option.

This is useful for virtual machine migration when the
destination of a target virtual machine changes. The replace
feature can be used instead of delete followed by add.

Resubmitted because net-next was closed last week.

Signed-off-by: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20ff44aa

drivers/net/vxlan.c

+38 −0
Original line number Diff line number Diff line
@@ -407,6 +407,26 @@ static struct vxlan_rdst *vxlan_fdb_find_rdst(struct vxlan_fdb *f, 
	return NULL;

}



/* Replace destination of unicast mac */

static int vxlan_fdb_replace(struct vxlan_fdb *f,

			    __be32 ip, __be16 port, __u32 vni, __u32 ifindex)

{

	struct vxlan_rdst *rd;



	rd = vxlan_fdb_find_rdst(f, ip, port, vni, ifindex);

	if (rd)

		return 0;



	rd = list_first_entry_or_null(&f->remotes, struct vxlan_rdst, list);

	if (!rd)

		return 0;

	rd->remote_ip = ip;

	rd->remote_port = port;

	rd->remote_vni = vni;

	rd->remote_ifindex = ifindex;

	return 1;

}



/* Add/update destinations for multicast */

static int vxlan_fdb_append(struct vxlan_fdb *f,

			    __be32 ip, __be16 port, __u32 vni, __u32 ifindex)
@@ -457,6 +477,19 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan, 
			f->updated = jiffies;

			notify = 1;

		}

		if ((flags & NLM_F_REPLACE)) {

			/* Only change unicasts */

			if (!(is_multicast_ether_addr(f->eth_addr) ||

			     is_zero_ether_addr(f->eth_addr))) {

				int rc = vxlan_fdb_replace(f, ip, port, vni,

							   ifindex);



				if (rc < 0)

					return rc;

				notify |= rc;

			} else

				return -EOPNOTSUPP;

		}

		if ((flags & NLM_F_APPEND) &&

		    (is_multicast_ether_addr(f->eth_addr) ||

		     is_zero_ether_addr(f->eth_addr))) {
@@ -473,6 +506,11 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan, 
		if (vxlan->addrmax && vxlan->addrcnt >= vxlan->addrmax)

			return -ENOSPC;



		/* Disallow replace to add a multicast entry */

		if ((flags & NLM_F_REPLACE) &&

		    (is_multicast_ether_addr(mac) || is_zero_ether_addr(mac)))

			return -EOPNOTSUPP;



		netdev_dbg(vxlan->dev, "add %pM -> %pI4\n", mac, &ip);

		f = kmalloc(sizeof(*f), GFP_ATOMIC);

		if (!f)

CRA Git | Maintained and supported by SUSTech CRA and CCSE