Commit 0634d694 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rtnl-fdb-get' 



Roopa Prabhu says:

====================
rtnl fdb get

This series adds support for rtnl fdb get similar to
route get.

v2: add nda_policy, fixes to exact msgs, strict nlmsg parsing

v3: remove unnecessary attribute length checks + simplify code
as pointed out by david
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5312b93b 31d31951

drivers/net/vxlan.c

+34 −0
Original line number Diff line number Diff line
@@ -1152,6 +1152,39 @@ static int vxlan_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb, 
	return err;

}



static int vxlan_fdb_get(struct sk_buff *skb,

			 struct nlattr *tb[],

			 struct net_device *dev,

			 const unsigned char *addr,

			 u16 vid, u32 portid, u32 seq,

			 struct netlink_ext_ack *extack)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct vxlan_fdb *f;

	__be32 vni;

	int err;



	if (tb[NDA_VNI])

		vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));

	else

		vni = vxlan->default_dst.remote_vni;



	rcu_read_lock();



	f = __vxlan_find_mac(vxlan, addr, vni);

	if (!f) {

		NL_SET_ERR_MSG(extack, "Fdb entry not found");

		err = -ENOENT;

		goto errout;

	}



	err = vxlan_fdb_info(skb, vxlan, f, portid, seq,

			     RTM_NEWNEIGH, 0, first_remote_rcu(f));

errout:

	rcu_read_unlock();

	return err;

}



/* Watch incoming packets to learn mapping between Ethernet address

 * and Tunnel endpoint.

 * Return true if packet is bogus and should be dropped.
@@ -2805,6 +2838,7 @@ static const struct net_device_ops vxlan_netdev_ether_ops = { 
	.ndo_fdb_add		= vxlan_fdb_add,

	.ndo_fdb_del		= vxlan_fdb_delete,

	.ndo_fdb_dump		= vxlan_fdb_dump,

	.ndo_fdb_get		= vxlan_fdb_get,

	.ndo_fill_metadata_dst	= vxlan_fill_metadata_dst,

};

include/linux/netdevice.h

+6 −1
Original line number Diff line number Diff line
@@ -1387,7 +1387,12 @@ struct net_device_ops { 
						struct net_device *dev,

						struct net_device *filter_dev,

						int *idx);



	int			(*ndo_fdb_get)(struct sk_buff *skb,

					       struct nlattr *tb[],

					       struct net_device *dev,

					       const unsigned char *addr,

					       u16 vid, u32 portid, u32 seq,

					       struct netlink_ext_ack *extack);

	int			(*ndo_bridge_setlink)(struct net_device *dev,

						      struct nlmsghdr *nlh,

						      u16 flags,

net/bridge/br_device.c

+1 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ static const struct net_device_ops br_netdev_ops = { 
	.ndo_fdb_add		 = br_fdb_add,

	.ndo_fdb_del		 = br_fdb_delete,

	.ndo_fdb_dump		 = br_fdb_dump,

	.ndo_fdb_get		 = br_fdb_get,

	.ndo_bridge_getlink	 = br_getlink,

	.ndo_bridge_setlink	 = br_setlink,

	.ndo_bridge_dellink	 = br_dellink,

net/bridge/br_fdb.c

+26 −0
Original line number Diff line number Diff line
@@ -773,6 +773,32 @@ int br_fdb_dump(struct sk_buff *skb, 
	return err;

}



int br_fdb_get(struct sk_buff *skb,

	       struct nlattr *tb[],

	       struct net_device *dev,

	       const unsigned char *addr,

	       u16 vid, u32 portid, u32 seq,

	       struct netlink_ext_ack *extack)

{

	struct net_bridge *br = netdev_priv(dev);

	struct net_bridge_fdb_entry *f;

	int err = 0;



	rcu_read_lock();

	f = br_fdb_find_rcu(br, addr, vid);

	if (!f) {

		NL_SET_ERR_MSG(extack, "Fdb entry not found");

		err = -ENOENT;

		goto errout;

	}



	err = fdb_fill_info(skb, br, f, portid, seq,

			    RTM_NEWNEIGH, 0);

errout:

	rcu_read_unlock();

	return err;

}



/* Update (create or replace) forwarding database entry */

static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,

			 const u8 *addr, u16 state, u16 flags, u16 vid,

net/bridge/br_private.h

+3 −0
Original line number Diff line number Diff line
@@ -575,6 +575,9 @@ int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev, 
	       const unsigned char *addr, u16 vid, u16 nlh_flags);

int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,

		struct net_device *dev, struct net_device *fdev, int *idx);

int br_fdb_get(struct sk_buff *skb, struct nlattr *tb[], struct net_device *dev,

	       const unsigned char *addr, u16 vid, u32 portid, u32 seq,

	       struct netlink_ext_ack *extack);

int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p);

void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p);

int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,