Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'fdb' 



Vlad Yasevich says:

====================
This is a short series that now allows mac filter programming on any
card that support IFF_UNICAST_FLT by using the existing FDB interface.

Some existing drivers that had FDB functionality usually supported
it only in SR-IOV mode.  Since that's not always enabled, and
we want to take advantage of IFF_UNICAST_FLT support, these drivers
have been converted to call the default handler when not in SRIOV mode.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6906f4ed 3e5c112f

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −41
Original line number Diff line number Diff line
@@ -7007,7 +7007,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	int err;



	if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

		return -EOPNOTSUPP;

		return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags);



	/* Hardware does not support aging addresses so if a

	 * ndm_state is given only allow permanent addresses
@@ -7038,44 +7038,6 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	return err;

}



static int ixgbe_ndo_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],

			     struct net_device *dev,

			     const unsigned char *addr)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	int err = -EOPNOTSUPP;



	if (ndm->ndm_state & NUD_PERMANENT) {

		pr_info("%s: FDB only supports static addresses\n",

			ixgbe_driver_name);

		return -EINVAL;

	}



	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {

		if (is_unicast_ether_addr(addr))

			err = dev_uc_del(dev, addr);

		else if (is_multicast_ether_addr(addr))

			err = dev_mc_del(dev, addr);

		else

			err = -EINVAL;

	}



	return err;

}



static int ixgbe_ndo_fdb_dump(struct sk_buff *skb,

			      struct netlink_callback *cb,

			      struct net_device *dev,

			      int idx)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);



	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

		idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);



	return idx;

}



static int ixgbe_ndo_bridge_setlink(struct net_device *dev,

				    struct nlmsghdr *nlh)

{
@@ -7171,8 +7133,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_set_features = ixgbe_set_features,

	.ndo_fix_features = ixgbe_fix_features,

	.ndo_fdb_add		= ixgbe_ndo_fdb_add,

	.ndo_fdb_del		= ixgbe_ndo_fdb_del,

	.ndo_fdb_dump		= ixgbe_ndo_fdb_dump,

	.ndo_bridge_setlink	= ixgbe_ndo_bridge_setlink,

	.ndo_bridge_getlink	= ixgbe_ndo_bridge_getlink,

};

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+0 −76
Original line number Diff line number Diff line
@@ -1924,79 +1924,6 @@ static int mlx4_en_set_features(struct net_device *netdev, 


}



static int mlx4_en_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],

			   struct net_device *dev,

			   const unsigned char *addr, u16 flags)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_dev *mdev = priv->mdev->dev;

	int err;



	if (!mlx4_is_mfunc(mdev))

		return -EOPNOTSUPP;



	/* Hardware does not support aging addresses, allow only

	 * permanent addresses if ndm_state is given

	 */

	if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) {

		en_info(priv, "Add FDB only supports static addresses\n");

		return -EINVAL;

	}



	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))

		err = dev_uc_add_excl(dev, addr);

	else if (is_multicast_ether_addr(addr))

		err = dev_mc_add_excl(dev, addr);

	else

		err = -EINVAL;



	/* Only return duplicate errors if NLM_F_EXCL is set */

	if (err == -EEXIST && !(flags & NLM_F_EXCL))

		err = 0;



	return err;

}



static int mlx4_en_fdb_del(struct ndmsg *ndm,

			   struct nlattr *tb[],

			   struct net_device *dev,

			   const unsigned char *addr)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_dev *mdev = priv->mdev->dev;

	int err;



	if (!mlx4_is_mfunc(mdev))

		return -EOPNOTSUPP;



	if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) {

		en_info(priv, "Del FDB only supports static addresses\n");

		return -EINVAL;

	}



	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))

		err = dev_uc_del(dev, addr);

	else if (is_multicast_ether_addr(addr))

		err = dev_mc_del(dev, addr);

	else

		err = -EINVAL;



	return err;

}



static int mlx4_en_fdb_dump(struct sk_buff *skb,

			    struct netlink_callback *cb,

			    struct net_device *dev, int idx)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_dev *mdev = priv->mdev->dev;



	if (mlx4_is_mfunc(mdev))

		idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);



	return idx;

}



static const struct net_device_ops mlx4_netdev_ops = {

	.ndo_open		= mlx4_en_open,

	.ndo_stop		= mlx4_en_close,
@@ -2018,9 +1945,6 @@ static const struct net_device_ops mlx4_netdev_ops = { 
#ifdef CONFIG_RFS_ACCEL

	.ndo_rx_flow_steer	= mlx4_en_filter_rfs,

#endif

	.ndo_fdb_add		= mlx4_en_fdb_add,

	.ndo_fdb_del		= mlx4_en_fdb_del,

	.ndo_fdb_dump		= mlx4_en_fdb_dump,

};



int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+6 −15
Original line number Diff line number Diff line
@@ -253,11 +253,8 @@ static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], 
	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int err = -EOPNOTSUPP;



	if (!adapter->fdb_mac_learn) {

		pr_info("%s: Driver mac learn is enabled, FDB operation not allowed\n",

			__func__);

		return err;

	}

	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_del(ndm, tb, netdev, addr);



	if (adapter->flags & QLCNIC_ESWITCH_ENABLED) {

		if (is_unicast_ether_addr(addr))
@@ -277,11 +274,8 @@ static int qlcnic_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	int err = 0;



	if (!adapter->fdb_mac_learn) {

		pr_info("%s: Driver mac learn is enabled, FDB operation not allowed\n",

			__func__);

		return -EOPNOTSUPP;

	}

	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_add(ndm, tb, netdev, addr, flags);



	if (!(adapter->flags & QLCNIC_ESWITCH_ENABLED)) {

		pr_info("%s: FDB e-switch is not enabled\n", __func__);
@@ -306,11 +300,8 @@ static int qlcnic_fdb_dump(struct sk_buff *skb, struct netlink_callback *ncb, 
{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);



	if (!adapter->fdb_mac_learn) {

		pr_info("%s: Driver mac learn is enabled, FDB operation not allowed\n",

			__func__);

		return -EOPNOTSUPP;

	}

	if (!adapter->fdb_mac_learn)

		return ndo_dflt_fdb_dump(skb, ncb, netdev, idx);



	if (adapter->flags & QLCNIC_ESWITCH_ENABLED)

		idx = ndo_dflt_fdb_dump(skb, ncb, netdev, idx);

include/linux/rtnetlink.h

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,15 @@ extern int ndo_dflt_fdb_dump(struct sk_buff *skb, 
			     struct netlink_callback *cb,

			     struct net_device *dev,

			     int idx);

extern int ndo_dflt_fdb_add(struct ndmsg *ndm,

			    struct nlattr *tb[],

			    struct net_device *dev,

			    const unsigned char *addr,

			     u16 flags);

extern int ndo_dflt_fdb_del(struct ndmsg *ndm,

			    struct nlattr *tb[],

			    struct net_device *dev,

			    const unsigned char *addr);



extern int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,

				   struct net_device *dev, u16 mode);

net/core/rtnetlink.c

+75 −6
Original line number Diff line number Diff line
@@ -2048,6 +2048,38 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, int type) 
	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);

}



/**

 * ndo_dflt_fdb_add - default netdevice operation to add an FDB entry

 */

int ndo_dflt_fdb_add(struct ndmsg *ndm,

		     struct nlattr *tb[],

		     struct net_device *dev,

		     const unsigned char *addr,

		     u16 flags)

{

	int err = -EINVAL;



	/* If aging addresses are supported device will need to

	 * implement its own handler for this.

	 */

	if (ndm->ndm_state && !(ndm->ndm_state & NUD_PERMANENT)) {

		pr_info("%s: FDB only supports static addresses\n", dev->name);

		return err;

	}



	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))

		err = dev_uc_add_excl(dev, addr);

	else if (is_multicast_ether_addr(addr))

		err = dev_mc_add_excl(dev, addr);



	/* Only return duplicate errors if NLM_F_EXCL is set */

	if (err == -EEXIST && !(flags & NLM_F_EXCL))

		err = 0;



	return err;

}

EXPORT_SYMBOL(ndo_dflt_fdb_add);



static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)

{

	struct net *net = sock_net(skb->sk);
@@ -2100,9 +2132,12 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
	}



	/* Embedded bridge, macvlan, and any other device support */

	if ((ndm->ndm_flags & NTF_SELF) && dev->netdev_ops->ndo_fdb_add) {

		err = dev->netdev_ops->ndo_fdb_add(ndm, tb,

						   dev, addr,

	if ((ndm->ndm_flags & NTF_SELF)) {

		if (dev->netdev_ops->ndo_fdb_add)

			err = dev->netdev_ops->ndo_fdb_add(ndm, tb, dev, addr,

							   nlh->nlmsg_flags);

		else

			err = ndo_dflt_fdb_add(ndm, tb, dev, addr,

					       nlh->nlmsg_flags);



		if (!err) {
@@ -2114,6 +2149,35 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
	return err;

}



/**

 * ndo_dflt_fdb_del - default netdevice operation to delete an FDB entry

 */

int ndo_dflt_fdb_del(struct ndmsg *ndm,

		     struct nlattr *tb[],

		     struct net_device *dev,

		     const unsigned char *addr)

{

	int err = -EOPNOTSUPP;



	/* If aging addresses are supported device will need to

	 * implement its own handler for this.

	 */

	if (ndm->ndm_state & NUD_PERMANENT) {

		pr_info("%s: FDB only supports static addresses\n", dev->name);

		return -EINVAL;

	}



	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))

		err = dev_uc_del(dev, addr);

	else if (is_multicast_ether_addr(addr))

		err = dev_mc_del(dev, addr);

	else

		err = -EINVAL;



	return err;

}

EXPORT_SYMBOL(ndo_dflt_fdb_del);



static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)

{

	struct net *net = sock_net(skb->sk);
@@ -2171,8 +2235,11 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 
	}



	/* Embedded bridge, macvlan, and any other device support */

	if ((ndm->ndm_flags & NTF_SELF) && dev->netdev_ops->ndo_fdb_del) {

	if (ndm->ndm_flags & NTF_SELF) {

		if (dev->netdev_ops->ndo_fdb_del)

			err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr);

		else

			err = ndo_dflt_fdb_del(ndm, tb, dev, addr);



		if (!err) {

			rtnl_fdb_notify(dev, addr, RTM_DELNEIGH);
@@ -2257,6 +2324,8 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb) 


		if (dev->netdev_ops->ndo_fdb_dump)

			idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, idx);

		else

			ndo_dflt_fdb_dump(skb, cb, dev, idx);

	}

	rcu_read_unlock();