Provide default fdb operation to allow mac filter setting
Subsystems (6)
v2 cover Provide default fdb operation to allow mac filter setting
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.
Changes since v1:
- Restore ixgbe implementation of fdb_add since it needs to enforce the limit of addresses in SR-IOV case.
Changes since RFC:
- Removed ixgbe and mlx versions of fdb calls as recommened.
- Added qlogic patch to use default calls when module parameter is not turned on.
Vlad Yasevich (4):
net: generic fdb support for drivers without ndo_fdb_<op>
ixgbe: Remove driver specific fdb handlers.
mlx4: Remove driver specific fdb handlers.
qlcnic: Use generic fdb handler when driver options are not enabled.
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +----------- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 76 -------------------- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 21 ++---- include/linux/rtnetlink.h | 9 +++ net/core/rtnetlink.c | 81 ++++++++++++++++++++-- 5 files changed, 91 insertions(+), 138 deletions(-)
Signature · 1 line
1.7.7.6
PATCH v2 1/4 net: generic fdb support for drivers without ndo_fdb_<op>
If the driver does not support the ndo_op use the generic handler for it. This should work in the majority of cases. Eventually the fdb_dflt_add call gets translated into a __dev_set_rx_mode() call which should handle hardware support for filtering via the IFF_UNICAST_FLT flag.
Namely IFF_UNICAST_FLT indicates if the hardware can do unicast address filtering. If no support is available the device is put into promisc mode.
--- include/linux/rtnetlink.h | 9 +++++ net/core/rtnetlink.c | 81 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 84 insertions(+), 6 deletions(-)
include/linux/rtnetlink.h +9 -0
@@ -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
111 lines not on this page · raw message
Signature · 1 line
1.7.7.6
Re: [PATCH v2 net-next 1/4] net: generic fdb support for drivers without ndo_fdb_<op>
Quoted 10 lines · Vlad Yasevich
If the driver does not support the
ndo_opuse the generic handler for it. This should work in the majority of cases. Eventually thefdb_dflt_addcall gets translated into a__dev_set_rx_mode()call which should handle hardware support for filtering via theIFF_UNICAST_FLTflag.Namely
IFF_UNICAST_FLTindicates if the hardware can do unicast address filtering. If no support is available the device is put into promisc mode.
Quoted 6 lines
CC John Fastabend <[email protected]>Signed-off-by Vlad Yasevich <[email protected]>--- include/linux/rtnetlink.h | 9 +++++ net/core/rtnetlink.c | 81 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 84 insertions(+), 6 deletions(-)
Feel free to carry the line forward when you submit these after net-next opens.
PATCH v2 2/4 ixgbe: Remove driver specific fdb handlers.
In reply to Vlad YasevichRemove driver specific fdb handlers since they are the same as the default ones.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +------------------------ 1 files changed, 1 insertions(+), 41 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -41
@@ -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, };
Signature · 1 line
1.7.7.6
Re: [PATCH v2 net-next 2/4] ixgbe: Remove driver specific fdb handlers.
Quoted 9 lines · Vlad Yasevich
Remove driver specific fdb handlers since they are the same as the default ones.
CC John Fastabend <[email protected]>CC Gregory Rose <[email protected]>Signed-off-by Vlad Yasevich <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +------------------------ 1 files changed, 1 insertions(+), 41 deletions(-)
^^^^^^^^^^^^^^^^
nice.
PATCH v2 3/4 mlx4: Remove driver specific fdb handlers.
In reply to Vlad YasevichRemove driver specific fdb hadlers since they are the same as the default ones.
--- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 76 ------------------------ 1 files changed, 0 insertions(+), 76 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +0 -76
@@ -1925,79 +1925,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,
@@ -2019,9 +1946,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,
Signature · 1 line
1.7.7.6
PATCH v2 4/4 qlcnic: Use generic fdb handler when driver options are not enabled.
In reply to Vlad YasevichAllow qlcnic to use the generic fdb handler when the driver options
are not enabled. Untill the driver is fully fixed, this allows
the use of the FDB interface with qlogic driver, but simply puts the driver into promisc mode since the driver currently does not support IFF_UNICAST_FLT.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +6 -15
@@ -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);
Signature · 1 line
1.7.7.6
David Miller
maintainerFrom: Vlad Yasevich <[email protected]>
Date: Fri, 1 Mar 2013 10:31:42 -0500
Quoted 7 lines
This is a short series that now allows mac filter programming on any card that support
IFF_UNICAST_FLTby 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_FLTsupport, these drivers have been converted to call the default handler when not in SRIOV mode.
These changes look great, please resubmit them once I open net-next back up.
Thanks.
Quoted 1 line · David Miller
These changes look great, please resubmit them once I open net-next back up.
yep, once this resubmission is done, we'd like to test the patches before actually acknowledging them for net-next
Or.