introduce rocker switch driver with hardware accelerated datapath api - phase 1: bridge fdb offload
Subsystems (12)
Jiri Pirko
maintainerv4 cover introduce rocker switch driver with hardware accelerated datapath api - phase 1: bridge fdb offload
Hi all.
This patchset is just the first phase of switch and switch-ish device support api in kernel. Note that the api will extend.
So what this patchset includes:
- introduce switchdev api skeleton for implementing switch drivers
- introduce rocker switch driver which implements switchdev api fdb and bridge set/get link ndos
As to the discussion if there is need to have specific class of device representing the switch itself, so far we found no need to introduce that. But we are generally ok with the idea and when the time comes and it will be needed, it can be easily introduced without any disturbance.
This patchset introduces switch id export through rtnetlink and sysfs, which is similar to what we have for port id in SR-IOV. I will send iproute2 patchset for showing the switch id for port netdevs once this is applied. This applies also for the PF_BRIDGE and fdb iproute2 patches.
iproute2 patches are now available here:
https://github.com/jpirko/iproute2-rocker
For detailed description and version history, please see individual patches.
In v4 I reordered the patches leaving rocker patches on the end of the patchset.
Jiri Pirko (10):
bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
neigh: sort Neighbor Cache Entry Flags
bridge: convert flags in fbd entry into bitfields
net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del
net: rename netdev_phys_port_id to more generic name
net: introduce generic switch devices support
rtnl: expose physical switch id for particular device
net-sysfs: expose physical switch id for particular device
rocker: introduce rocker switch driver
rocker: implement ndo_fdb_dump
Scott Feldman (9):
bridge: call netdev_sw_port_stp_update when bridge port STP status
changes
bridge: add API to notify bridge driver of learned FBD on offloaded
device
bridge: move private brport flags to if_bridge.h so port drivers can
use flags
bridge: add new brport flag LEARNING_SYNC
bridge: add new hwmode swdev
bridge: add brport flags to dflt bridge_getlink
rocker: implement rocker ofdpa flow table manipulation
rocker: implement L2 bridge offloading
rocker: add ndo_bridge_setlink/getlink support for learning policy
Thomas Graf (2):
rocker: Add proper validation of Netlink attributes
rocker: Use logical operators on booleans
Documentation/ABI/testing/sysfs-class-net | 8 + Documentation/networking/switchdev.txt | 59 + MAINTAINERS | 14 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 11 +- drivers/net/ethernet/rocker/Kconfig | 27 + drivers/net/ethernet/rocker/Makefile | 5 + drivers/net/ethernet/rocker/rocker.c | 4374 ++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 428 +++ drivers/net/macvlan.c | 4 +- drivers/net/vxlan.c | 4 +- include/linux/if_bridge.h | 31 + include/linux/netdevice.h | 39 +- include/linux/rtnetlink.h | 9 +- include/net/switchdev.h | 37 + include/uapi/linux/if_bridge.h | 1 + include/uapi/linux/if_link.h | 2 + include/uapi/linux/neighbour.h | 6 +- net/Kconfig | 1 + net/Makefile | 3 + net/bridge/br_fdb.c | 144 +- net/bridge/br_private.h | 21 +- net/bridge/br_stp.c | 7 + net/core/dev.c | 2 +- net/core/net-sysfs.c | 26 +- net/core/rtnetlink.c | 119 +- net/switchdev/Kconfig | 13 + net/switchdev/Makefile | 5 + net/switchdev/switchdev.c | 52 + 35 files changed, 5366 insertions(+), 105 deletions(-) create mode 100644 Documentation/networking/switchdev.txt create mode 100644 drivers/net/ethernet/rocker/Kconfig create mode 100644 drivers/net/ethernet/rocker/Makefile create mode 100644 drivers/net/ethernet/rocker/rocker.c create mode 100644 drivers/net/ethernet/rocker/rocker.h create mode 100644 include/net/switchdev.h create mode 100644 net/switchdev/Kconfig create mode 100644 net/switchdev/Makefile create mode 100644 net/switchdev/switchdev.c
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 1/21 bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
The current name might seem that this actually offloads the fdb entry to hw. So rename it to clearly present that this for hardware address addition/removal.
---v3->v4:
-no changev2->v3:
-moved the patch to the patchset head
new in v2 as suggested by DaveM
--- net/bridge/br_fdb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/bridge/br_fdb.c +7 -7
@@ -90,7 +90,7 @@ static void fdb_rcu_free(struct rcu_head *head)* are then updated with the new information. * Called under RTNL. */ -static void fdb_add_hw (struct net_bridge *br,const unsigned char *addr) +static void fdb_add_hw_addr (struct net_bridge *br,const unsigned char *addr) {int err;struct net_bridge_port *p;
@@ -118,7 +118,7 @@ undo:* the ports with needed information. * Called under RTNL. */ -static void fdb_del_hw (struct net_bridge *br,const unsigned char *addr) +static void fdb_del_hw_addr (struct net_bridge *br,const unsigned char *addr) {struct net_bridge_port *p;
@@ -133,7 +133,7 @@ static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr)static void fdb_delete (struct net_bridge *br,struct net_bridge_fdb_entry *f) {if (f->is_static) -fdb_del_hw (br, f->addr.addr); +fdb_del_hw_addr (br, f->addr.addr);hlist_del_rcu (&f->hlist);fdb_notify (br, f,RTM_DELNEIGH );
@@ -514,7 +514,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,return -ENOMEM ; fdb->is_local = fdb->is_static =1 ; -fdb_add_hw (br, addr); +fdb_add_hw_addr (br, addr);fdb_notify (br, fdb,RTM_NEWNEIGH );return 0 ; }
@@ -754,19 +754,19 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, fdb->is_local =1 ;if (!fdb->is_static) { fdb->is_static =1 ; -fdb_add_hw (br, addr); +fdb_add_hw_addr (br, addr); } }else if (state &NUD_NOARP ) { fdb->is_local =0 ;if (!fdb->is_static) { fdb->is_static =1 ; -fdb_add_hw (br, addr); +fdb_add_hw_addr (br, addr); } }else { fdb->is_local =0 ;if (fdb->is_static) { fdb->is_static =0 ; -fdb_del_hw (br, addr); +fdb_del_hw_addr (br, addr); } }
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 2/21 neigh: sort Neighbor Cache Entry Flags
In reply to Jiri Pirko---
new in v4
--- include/uapi/linux/neighbour.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/uapi/linux/neighbour.h +2 -3
@@ -35,11 +35,10 @@ enum {*/ #define NTF_USE 0x01 -#define NTF_PROXY 0x08/* == ATF_PUBL */ -#define NTF_ROUTER 0x80 -#define NTF_SELF 0x02#define NTF_MASTER 0x04 +#define NTF_PROXY 0x08/* == ATF_PUBL */ +#define NTF_ROUTER 0x80/* * Neighbor Cache Entry States.
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 3/21 bridge: convert flags in fbd entry into bitfields
In reply to Jiri Pirko---
new in v4
--- net/bridge/br_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/bridge/br_private.h +3 -3
@@ -98,9 +98,9 @@ struct net_bridge_fdb_entryunsigned long updated;unsigned long used;mac_addr addr; -unsigned char is_local; -unsigned char is_static; -unsigned char added_by_user; + unsigned char is_local:1, + is_static:1, + added_by_user:1;__u16 vlan_id; };
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 4/21 net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del
In reply to Jiri PirkoDo the work of parsing NDA_VLAN directly in rtnetlink code, pass simple u16 vid to drivers from there.
---v3->v4:
-fixed spelling of "fdb" pointed out by Andy
new in v3
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 +++-- drivers/net/macvlan.c | 4 +- drivers/net/vxlan.c | 4 +- include/linux/netdevice.h | 8 ++-- include/linux/rtnetlink.h | 6 ++- net/bridge/br_fdb.c | 39 ++---------------- net/bridge/br_private.h | 4 +- net/core/rtnetlink.c | 50 ++++++++++++++++++++---- 10 files changed, 70 insertions(+), 60 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -7536,7 +7536,7 @@ static int i40e_get_phys_port_id(struct net_device *netdev,*/ static int i40e_ndo_fdb_add (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr, +const unsigned char *addr,u16 vid,u16 flags) {struct i40e_netdev_priv *np =netdev_priv (dev);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -2
@@ -7708,7 +7708,7 @@ static int ixgbe_set_features(struct net_device *netdev,static int ixgbe_ndo_fdb_add (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr, +const unsigned char *addr,u16 vid,u16 flags) {/* guarantee we can provide a unique filter for the unicast address */
@@ -7717,7 +7717,7 @@ static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],return -ENOMEM ; } -return ndo_dflt_fdb_add (ndm, tb, dev, addr, flags); +return ndo_dflt_fdb_add (ndm, tb, dev, addr, vid, flags); } static int ixgbe_ndo_bridge_setlink(struct net_device *dev,
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +5 -4
@@ -376,13 +376,14 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p) }static int qlcnic_fdb_del (struct ndmsg *ndm,struct nlattr *tb[], -struct net_device *netdev,const unsigned char *addr) +struct net_device *netdev, +const unsigned char *addr,u16 vid) {struct qlcnic_adapter *adapter =netdev_priv (netdev);int err = -EOPNOTSUPP ;if (!adapter->fdb_mac_learn) -return ndo_dflt_fdb_del (ndm, tb, netdev, addr); +return ndo_dflt_fdb_del (ndm, tb, netdev, addr, vid);if ((adapter->flags &QLCNIC_ESWITCH_ENABLED ) ||qlcnic_sriov_check (adapter)) {
@@ -401,13 +402,13 @@ static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],static int qlcnic_fdb_add (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *netdev, -const unsigned char *addr,u16 flags) +const unsigned char *addr,u16 vid,u16 flags) {struct qlcnic_adapter *adapter =netdev_priv (netdev);int err =0 ;if (!adapter->fdb_mac_learn) -return ndo_dflt_fdb_add (ndm, tb, netdev, addr, flags); +return ndo_dflt_fdb_add (ndm, tb, netdev, addr, vid, flags);if (!(adapter->flags &QLCNIC_ESWITCH_ENABLED ) && !qlcnic_sriov_check (adapter)) {
drivers/net/macvlan.c +2 -2
@@ -872,7 +872,7 @@ static int macvlan_vlan_rx_kill_vid(struct net_device *dev,static int macvlan_fdb_add (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr, +const unsigned char *addr,u16 vid,u16 flags) {struct macvlan_dev *vlan =netdev_priv (dev);
@@ -897,7 +897,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],static int macvlan_fdb_del (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr) +const unsigned char *addr,u16 vid) {struct macvlan_dev *vlan =netdev_priv (dev);int err = -EINVAL ;
drivers/net/vxlan.c +2 -2
@@ -849,7 +849,7 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,/* Add static entry (via netlink) */ static int vxlan_fdb_add (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 flags) +const unsigned char *addr,u16 vid,u16 flags) {struct vxlan_dev *vxlan =netdev_priv (dev);/* struct net *net = dev_net(vxlan->dev); */
@@ -885,7 +885,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],/* Delete entry (via netlink) */ static int vxlan_fdb_delete (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr) +const unsigned char *addr,u16 vid) {struct vxlan_dev *vxlan =netdev_priv (dev);struct vxlan_fdb *f;
include/linux/netdevice.h +5 -3
@@ -951,11 +951,11 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,* * int (*ndo_fdb_add)(struct ndmsg *ndm, struct nlattr *tb[], * struct net_device *dev, -* const unsigned char *addr, u16 flags) +* const unsigned char *addr, u16 vid, u16 flags) * Adds an FDB entry to dev for addr. * int (*ndo_fdb_del)(struct ndmsg *ndm, struct nlattr *tb[], * struct net_device *dev, -* const unsigned char *addr) +* const unsigned char *addr, u16 vid) * Deletes the FDB entry from dev coresponding to addr. * int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb, * struct net_device *dev, struct net_device *filter_dev,
@@ -1128,11 +1128,13 @@ struct net_device_ops {struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, + u16 vid, u16 flags);int (*ndo_fdb_del)(struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr); +const unsigned char *addr, +u16 vid); int (*ndo_fdb_dump)(struct sk_buff *skb, struct netlink_callback *cb, struct net_device *dev,
include/linux/rtnetlink.h +4 -2
@@ -94,11 +94,13 @@ extern int ndo_dflt_fdb_add(struct ndmsg *ndm,struct nlattr *tb[], struct net_device *dev, const unsigned char *addr, - u16 flags); + u16 vid, + u16 flags);extern int ndo_dflt_fdb_del (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr); +const unsigned char *addr, +u16 vid);extern int ndo_dflt_bridge_getlink (struct sk_buff *skb,u32 pid,u32 seq,struct net_device *dev,u16 mode);
net/bridge/br_fdb.c +4 -35
@@ -805,33 +805,17 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge_port *p,/* Add new permanent fdb entry with RTM_NEWNEIGH */ int br_fdb_add (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 nlh_flags) +const unsigned char *addr,u16 vid,u16 nlh_flags) {struct net_bridge_port *p;int err =0 ;struct net_port_vlans *pv; -unsigned short vid =VLAN_N_VID ;if (!(ndm->ndm_state & (NUD_PERMANENT |NUD_NOARP |NUD_REACHABLE ))) {pr_info ("bridge: RTM_NEWNEIGH with invalid state %#x\n" , ndm->ndm_state);return -EINVAL ; } -if (tb[NDA_VLAN ]) { -if (nla_len (tb[NDA_VLAN ]) !=sizeof (unsigned short )) { -pr_info ("bridge: RTM_NEWNEIGH with invalid vlan\n" ); -return -EINVAL ; - } - - vid =nla_get_u16 (tb[NDA_VLAN ]); - -if (!vid || vid >=VLAN_VID_MASK ) { -pr_info ("bridge: RTM_NEWNEIGH with invalid vlan id %d\n" , - vid); -return -EINVAL ; - } - } -if (is_zero_ether_addr (addr)) {pr_info ("bridge: RTM_NEWNEIGH with invalid ether address\n" );return -EINVAL ;
@@ -845,7 +829,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], } pv =nbp_get_vlan_info (p); -if (vid !=VLAN_N_VID ) { +if (vid) {if (!pv || !test_bit (vid, pv->vlan_bitmap)) {pr_info ("bridge: RTM_NEWNEIGH with unconfigured " "vlan %d on port %s\n" , vid, dev->name);
@@ -903,27 +887,12 @@ static int __br_fdb_delete(struct net_bridge_port *p,/* Remove neighbor entry with RTM_DELNEIGH */ int br_fdb_delete (struct ndmsg *ndm,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr) +const unsigned char *addr,u16 vid) {struct net_bridge_port *p;int err;struct net_port_vlans *pv; -unsigned short vid =VLAN_N_VID ; - -if (tb[NDA_VLAN ]) { -if (nla_len (tb[NDA_VLAN ]) !=sizeof (unsigned short )) { -pr_info ("bridge: RTM_NEWNEIGH with invalid vlan\n" ); -return -EINVAL ; - } - vid =nla_get_u16 (tb[NDA_VLAN ]); - -if (!vid || vid >=VLAN_VID_MASK ) { -pr_info ("bridge: RTM_NEWNEIGH with invalid vlan id %d\n" , - vid); -return -EINVAL ; - } - } p =br_port_get_rtnl (dev);if (p ==NULL ) { pr_info("bridge: RTM_DELNEIGH %s not a bridge port\n",
@@ -932,7 +901,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], } pv =nbp_get_vlan_info (p); -if (vid !=VLAN_N_VID ) { +if (vid) {if (!pv || !test_bit (vid, pv->vlan_bitmap)) {pr_info ("bridge: RTM_DELNEIGH with unconfigured " "vlan %d on port %s\n" , vid, dev->name);
net/bridge/br_private.h +2 -2
@@ -404,9 +404,9 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid, bool added_by_user);int br_fdb_delete (struct ndmsg *ndm,struct nlattr *tb[], -struct net_device *dev,const unsigned char *addr); +struct net_device *dev,const unsigned char *addr,u16 vid);int br_fdb_add (struct ndmsg *nlh,struct nlattr *tb[],struct net_device *dev, -const unsigned char *addr,u16 nlh_flags); +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_sync_static (struct net_bridge *br,struct net_bridge_port *p);
net/core/rtnetlink.c +43 -7
125 lines not on this page · raw message
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 5/21 net: rename netdev_phys_port_id to more generic name
In reply to Jiri PirkoSo this can be reused for identification of other "items" as well.
---v1->v2->v3->v4:
-no change
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- include/linux/netdevice.h | 16 ++++++++-------- net/core/dev.c | 2 +- net/core/net-sysfs.c | 2 +- net/core/rtnetlink.c | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
@@ -12537,7 +12537,7 @@ static int bnx2x_validate_addr(struct net_device *dev) }static int bnx2x_get_phys_port_id (struct net_device *netdev, -struct netdev_phys_port_id *ppid) +struct netdev_phys_item_id *ppid) {struct bnx2x *bp =netdev_priv (netdev);
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -7511,7 +7511,7 @@ static void i40e_del_vxlan_port(struct net_device *netdev,#endif static int i40e_get_phys_port_id (struct net_device *netdev, -struct netdev_phys_port_id *ppid) +struct netdev_phys_item_id *ppid) {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_pf *pf = np->vsi->back;
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -2259,7 +2259,7 @@ static int mlx4_en_set_vf_link_state(struct net_device *dev, int vf, int link_st#define PORT_ID_BYTE_LEN 8static int mlx4_en_get_phys_port_id (struct net_device *dev, -struct netdev_phys_port_id *ppid) +struct netdev_phys_item_id *ppid) {struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_dev *mdev = priv->mdev->dev;
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +1 -1
@@ -461,7 +461,7 @@ static void qlcnic_82xx_cancel_idc_work(struct qlcnic_adapter *adapter) }static int qlcnic_get_phys_port_id (struct net_device *netdev, -struct netdev_phys_port_id *ppid) +struct netdev_phys_item_id *ppid) {struct qlcnic_adapter *adapter =netdev_priv (netdev);struct qlcnic_hardware_context *ahw = adapter->ahw;
include/linux/netdevice.h +8 -8
@@ -754,13 +754,13 @@ struct netdev_fcoe_hbainfo { };#endif -#define MAX_PHYS_PORT_ID_LEN 32 +#define MAX_PHYS_ITEM_ID_LEN 32 -/* This structure holds a unique identifier to identify the -* physical port used by a netdevice. +/* This structure holds a unique identifier to identify some +* physical item (port for example) used by a netdevice. */ -struct netdev_phys_port_id { -unsigned char id[MAX_PHYS_PORT_ID_LEN ]; +struct netdev_phys_item_id { +unsigned char id[MAX_PHYS_ITEM_ID_LEN ];unsigned char id_len; };
@@ -976,7 +976,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,* USB_CDC_NOTIFY_NETWORK_CONNECTION) should NOT implement this function. * * int (*ndo_get_phys_port_id)(struct net_device *dev, -* struct netdev_phys_port_id *ppid); +* struct netdev_phys_item_id *ppid); * Called to get ID of physical port of this device. If driver does * not implement this, it is assumed that the hw is not able to have * multiple net devices on single physical port.
@@ -1152,7 +1152,7 @@ struct net_device_ops {int (*ndo_change_carrier)(struct net_device *dev,bool new_carrier);int (*ndo_get_phys_port_id)(struct net_device *dev, -struct netdev_phys_port_id *ppid); +struct netdev_phys_item_id *ppid);void (*ndo_add_vxlan_port)(struct net_device *dev,sa_family_t sa_family,__be16 port);
@@ -2870,7 +2870,7 @@ void dev_set_group(struct net_device *, int);int dev_set_mac_address (struct net_device *,struct sockaddr *);int dev_change_carrier (struct net_device *,bool new_carrier);int dev_get_phys_port_id (struct net_device *dev, -struct netdev_phys_port_id *ppid); +struct netdev_phys_item_id *ppid);struct sk_buff *validate_xmit_skb_list (struct sk_buff *skb,struct net_device *dev);struct sk_buff *dev_hard_start_xmit (struct sk_buff *skb,struct net_device *dev,struct netdev_queue *txq,int *ret);
net/core/dev.c +1 -1
@@ -5846,7 +5846,7 @@ EXPORT_SYMBOL(dev_change_carrier);* Get device physical port ID */ int dev_get_phys_port_id (struct net_device *dev, -struct netdev_phys_port_id *ppid) +struct netdev_phys_item_id *ppid) {const struct net_device_ops *ops = dev->netdev_ops;
net/core/net-sysfs.c +1 -1
@@ -404,7 +404,7 @@ static ssize_t phys_port_id_show(struct device *dev,return restart_syscall ();if (dev_isalive (netdev)) { -struct netdev_phys_port_id ppid; +struct netdev_phys_item_id ppid; ret =dev_get_phys_port_id (netdev, &ppid);if (!ret)
net/core/rtnetlink.c +3 -3
@@ -869,7 +869,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, +rtnl_port_size (dev, ext_filter_mask)/* IFLA_VF_PORTS + IFLA_PORT_SELF */ +rtnl_link_get_size (dev)/* IFLA_LINKINFO */ +rtnl_link_get_af_size (dev)/* IFLA_AF_SPEC */ - +nla_total_size (MAX_PHYS_PORT_ID_LEN );/* IFLA_PHYS_PORT_ID */ + +nla_total_size (MAX_PHYS_ITEM_ID_LEN );/* IFLA_PHYS_PORT_ID */ }static int rtnl_vf_ports_fill (struct sk_buff *skb,struct net_device *dev)
@@ -953,7 +953,7 @@ static int rtnl_port_fill(struct sk_buff *skb, struct net_device *dev,static int rtnl_phys_port_id_fill (struct sk_buff *skb,struct net_device *dev) {int err; -struct netdev_phys_port_id ppid; +struct netdev_phys_item_id ppid; err =dev_get_phys_port_id (dev, &ppid);if (err) {
@@ -1197,7 +1197,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = { [IFLA_PROMISCUITY] = { .type = NLA_U32 }, [IFLA_NUM_TX_QUEUES] = { .type = NLA_U32 }, [IFLA_NUM_RX_QUEUES] = { .type = NLA_U32 }, - [IFLA_PHYS_PORT_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_PORT_ID_LEN }, + [IFLA_PHYS_PORT_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN }, [IFLA_CARRIER_CHANGES] = { .type = NLA_U32 }, /* ignored */ };
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 6/21 net: introduce generic switch devices support
In reply to Jiri PirkoThe goal of this is to provide a possibility to support various switch chips. Drivers should implement relevant ndos to do so. Now there is only one ndo defined:
- for getting physical switch id is in place.
Note that user can use random port netdevice to access the switch.
---v3->v4:
-no changev2->v3:
-fixed documentation typo pointed out by M. Braun -changed "sw" string to "switch" to avoid confusion v1->v2:
-no change
--- Documentation/networking/switchdev.txt | 59 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 7 ++++ include/linux/netdevice.h | 10 ++++++ include/net/switchdev.h | 30 +++++++++++++++++ net/Kconfig | 1 + net/Makefile | 3 ++ net/switchdev/Kconfig | 13 ++++++++ net/switchdev/Makefile | 5 +++ net/switchdev/switchdev.c | 33 +++++++++++++++++++ 9 files changed, 161 insertions(+) create mode 100644 Documentation/networking/switchdev.txt create mode 100644 include/net/switchdev.h create mode 100644 net/switchdev/Kconfig create mode 100644 net/switchdev/Makefile create mode 100644 net/switchdev/switchdev.c
Documentation/networking/switchdev.txt new file +59 -0
@@ -0,0 +1,59 @@ +Switch (and switch-ish) device drivers HOWTO +=========================== + +Please note that the word "switch" is here used in very generic meaning. +This include devices supporting L2/L3 but also various flow offloading chips, +including switches embedded into SR-IOV NICs. + +Lets describe a topology a bit. Imagine the following example: + + +----------------------------+ +---------------+ + | SOME switch chip | | CPU | + +----------------------------+ +---------------+ + port1 port2 port3 port4 MNGMNT | PCI-E | + | | | | | +---------------+ + PHY PHY | | | | NIC0 NIC1 + | | | | | | + | | +- PCI-E -+ | | + | +------- MII -------+ | + +------------- MII ------------+ + +In this example, there are two independent lines between the switch silicon +and CPU. NIC0 and NIC1 drivers are not aware of a switch presence. They are +separate from the switch driver. SOME switch chip is by managed by a driver +via PCI-E device MNGMNT. Note that MNGMNT device, NIC0 and NIC1 may be +connected to some other type of bus. + +Now, for the previous example show the representation in kernel: + + +----------------------------+ +---------------+ + | SOME switch chip | | CPU | + +----------------------------+ +---------------+ + sw0p0 sw0p1 sw0p2 sw0p3 MNGMNT | PCI-E | + | | | | | +---------------+ + PHY PHY | | | | eth0 eth1 + | | | | | | + | | +- PCI-E -+ | | + | +------- MII -------+ | + +------------- MII ------------+ + +Lets call the example switch driver for SOME switch chip "SOMEswitch". This +driver takes care of PCI-E device MNGMNT. There is a netdevice instance sw0pX +created for each port of a switch. These netdevices are instances +of "SOMEswitch" driver. sw0pX netdevices serve as a "representation" +of the switch chip. eth0 and eth1 are instances of some other existing driver. + +The only difference of the switch-port netdevice from the ordinary netdevice +is that is implements couple more NDOs: + + ndo_switch_parent_id_get - This returns the same ID for two port netdevices + of the same physical switch chip. This is + mandatory to be implemented by all switch drivers + and serves the caller for recognition of a port + netdevice. + ndo_switch_parent_* - Functions that serve for a manipulation of the switch + chip itself (it can be though of as a "parent" of the + port, therefore the name). They are not port-specific. + Caller might use arbitrary port netdevice of the same + switch and it will make no difference. + ndo_switch_port_* - Functions that serve for a port-specific manipulation.
MAINTAINERS +7 -0
@@ -9058,6 +9058,13 @@ F: lib/swiotlb.c F: arch/*/kernel/pci-swiotlb.c F: include/linux/swiotlb.h +SWITCHDEV +M: Jiri Pirko <[email protected]> +L: [email protected] +S: Supported +F: net/switchdev/ +F: include/net/switchdev.h + SYNOPSYS ARC ARCHITECTURE M: Vineet Gupta <[email protected]> S: Supported
include/linux/netdevice.h +10 -0
@@ -1018,6 +1018,12 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,* performing GSO on a packet. The device returns true if it is * able to GSO the packet, false otherwise. If the return value is * false the stack will do software GSO. +* +* int (*ndo_switch_parent_id_get)(struct net_device *dev, +* struct netdev_phys_item_id *psid); +* Called to get an ID of the switch chip this port is part of. +* If driver implements this, it indicates that it represents a port +* of a switch chip. */ struct net_device_ops {int (*ndo_init)(struct net_device *dev);
@@ -1171,6 +1177,10 @@ struct net_device_ops {int (*ndo_get_lock_subclass)(struct net_device *dev);bool (*ndo_gso_check) (struct sk_buff *skb,struct net_device *dev); +#ifdef CONFIG_NET_SWITCHDEV +int (*ndo_switch_parent_id_get)(struct net_device *dev, +struct netdev_phys_item_id *psid); +#endif };/**
include/net/switchdev.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* include/net/switchdev.h - Switch device API +* Copyright (c) 2014 Jiri Pirko <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ +#ifndef _LINUX_SWITCHDEV_H_ +#define _LINUX_SWITCHDEV_H_ + +#include <linux/netdevice.h> + +#ifdef CONFIG_NET_SWITCHDEV + +int netdev_switch_parent_id_get (struct net_device *dev, +struct netdev_phys_item_id *psid); + +#else + +static inline int netdev_switch_parent_id_get (struct net_device *dev, +struct netdev_phys_item_id *psid) +{ +return -EOPNOTSUPP ; +} + +#endif + +#endif /* _LINUX_SWITCHDEV_H_ */
net/Kconfig +1 -0
@@ -228,6 +228,7 @@ source "net/vmw_vsock/Kconfig" source "net/netlink/Kconfig" source "net/mpls/Kconfig" source "net/hsr/Kconfig" +source "net/switchdev/Kconfig" config RPS boolean
net/Makefile +3 -0
@@ -73,3 +73,6 @@ obj-$(CONFIG_OPENVSWITCH) += openvswitch/ obj-$(CONFIG_VSOCKETS) += vmw_vsock/ obj-$(CONFIG_NET_MPLS_GSO) += mpls/ obj-$(CONFIG_HSR) += hsr/ +ifneq ($(CONFIG_NET_SWITCHDEV),) +obj-y += switchdev/ +endif
net/switchdev/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +# +# Configuration for Switch device support +# + +config NET_SWITCHDEV + boolean "Switch (and switch-ish) device support (EXPERIMENTAL)" + depends on INET + ---help--- + This module provides glue between core networking code and device + drivers in order to support hardware switch chips in very generic + meaning of the word "switch". This include devices supporting L2/L3 but + also various flow offloading chips, including switches embedded into + SR-IOV NICs.
net/switchdev/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# +# Makefile for the Switch device API +# + +obj-$(CONFIG_NET_SWITCHDEV) += switchdev.o
net/switchdev/switchdev.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* net/switchdev/switchdev.c - Switch device API +* Copyright (c) 2014 Jiri Pirko <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#include <linux/kernel.h> +#include <linux/types.h> +#include <linux/init.h> +#include <linux/netdevice.h> +#include <net/switchdev.h> + +/** +* netdev_switch_parent_id_get - Get ID of a switch +* @dev: port device +* @psid: switch ID +* +* Get ID of a switch this port is part of. +*/ +int netdev_switch_parent_id_get (struct net_device *dev, +struct netdev_phys_item_id *psid) +{ +const struct net_device_ops *ops = dev->netdev_ops; + +if (!ops->ndo_switch_parent_id_get) +return -EOPNOTSUPP ; +return ops->ndo_switch_parent_id_get (dev, psid); +} +EXPORT_SYMBOL (netdev_switch_parent_id_get);
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 7/21 rtnl: expose physical switch id for particular device
In reply to Jiri PirkoThe netdevice represents a port in a switch, it will expose IFLA_PHYS_SWITCH_ID value via rtnl. Two netdevices with the same value belong to one physical switch.
---v3->v4:
-no changev2->v3:
-changed "sw" string to "switch" to avoid confusion v1->v2:
-no change
--- include/uapi/linux/if_link.h | 1 + net/core/rtnetlink.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)
include/uapi/linux/if_link.h +1 -0
@@ -145,6 +145,7 @@ enum {IFLA_CARRIER ,IFLA_PHYS_PORT_ID ,IFLA_CARRIER_CHANGES , +IFLA_PHYS_SWITCH_ID , __IFLA_MAX };
net/core/rtnetlink.c +25 -1
@@ -44,6 +44,7 @@#include <linux/inet.h> #include <linux/netdevice.h> +#include <net/switchdev.h> #include <net/ip.h> #include <net/protocol.h> #include <net/arp.h>
@@ -869,7 +870,8 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, +rtnl_port_size (dev, ext_filter_mask)/* IFLA_VF_PORTS + IFLA_PORT_SELF */ +rtnl_link_get_size (dev)/* IFLA_LINKINFO */ +rtnl_link_get_af_size (dev)/* IFLA_AF_SPEC */ - +nla_total_size (MAX_PHYS_ITEM_ID_LEN );/* IFLA_PHYS_PORT_ID */ + +nla_total_size (MAX_PHYS_ITEM_ID_LEN )/* IFLA_PHYS_PORT_ID */ + +nla_total_size (MAX_PHYS_ITEM_ID_LEN );/* IFLA_PHYS_SWITCH_ID */ }static int rtnl_vf_ports_fill (struct sk_buff *skb,struct net_device *dev)
@@ -968,6 +970,24 @@ static int rtnl_phys_port_id_fill(struct sk_buff *skb, struct net_device *dev)return 0 ; } +static int rtnl_phys_switch_id_fill (struct sk_buff *skb,struct net_device *dev) +{ +int err; +struct netdev_phys_item_id psid; + + err =netdev_switch_parent_id_get (dev, &psid); +if (err) { +if (err == -EOPNOTSUPP ) +return 0 ; +return err; + } + +if (nla_put (skb,IFLA_PHYS_SWITCH_ID , psid.id_len, psid.id)) +return -EMSGSIZE ; + +return 0 ; +} +static int rtnl_fill_ifinfo (struct sk_buff *skb,struct net_device *dev,int type,u32 pid,u32 seq,u32 change,unsigned int flags,u32 ext_filter_mask)
@@ -1040,6 +1060,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,if (rtnl_phys_port_id_fill (skb, dev)) goto nla_put_failure; +if (rtnl_phys_switch_id_fill (skb, dev)) + goto nla_put_failure; + attr =nla_reserve (skb,IFLA_STATS ,sizeof (struct rtnl_link_stats ));if (attr ==NULL )
@@ -1199,6 +1222,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = { [IFLA_NUM_RX_QUEUES] = { .type = NLA_U32 }, [IFLA_PHYS_PORT_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN }, [IFLA_CARRIER_CHANGES] = { .type = NLA_U32 }, /* ignored */ + [IFLA_PHYS_SWITCH_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN }, };static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX +1 ] = {
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 8/21 net-sysfs: expose physical switch id for particular device
In reply to Jiri Pirko---v3->v4:
-added entry to Documentation/ABI/testing/sysfs-class-net as suggested
by Florianv2->v3:
-changed "sw" string to "switch" to avoid confusionv1->v2:
-no change
--- Documentation/ABI/testing/sysfs-class-net | 8 ++++++++ net/core/net-sysfs.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+)
Documentation/ABI/testing/sysfs-class-net +8 -0
@@ -216,3 +216,11 @@ Contact: [email protected] Description: Indicates the interface protocol type as a decimal value. See include/uapi/linux/if_arp.h for all possible values. + +What: /sys/class/net/<iface>/phys_switch_id +Date: November 2014 +KernelVersion: 3.19 +Contact: [email protected] +Description: + Indicates the unique physical switch identifier of a switch this + port belongs to, as a string.
net/core/net-sysfs.c +24 -0
@@ -12,6 +12,7 @@#include <linux/capability.h> #include <linux/kernel.h> #include <linux/netdevice.h> +#include <net/switchdev.h> #include <linux/if_arp.h> #include <linux/slab.h> #include <linux/nsproxy.h>
@@ -416,6 +417,28 @@ static ssize_t phys_port_id_show(struct device *dev, }static DEVICE_ATTR_RO (phys_port_id); +static ssize_t phys_switch_id_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct net_device *netdev =to_net_dev (dev); +ssize_t ret = -EINVAL ; + +if (!rtnl_trylock ()) +return restart_syscall (); + +if (dev_isalive (netdev)) { +struct netdev_phys_item_id ppid; + + ret =netdev_switch_parent_id_get (netdev, &ppid); +if (!ret) + ret =sprintf (buf,"%*phN\n" , ppid.id_len, ppid.id); + } +rtnl_unlock (); + +return ret; +} +static DEVICE_ATTR_RO (phys_switch_id); +static struct attribute *net_class_attrs[] = { &dev_attr_netdev_group.attr, &dev_attr_type.attr,
@@ -441,6 +464,7 @@ static struct attribute *net_class_attrs[] = { &dev_attr_tx_queue_len.attr, &dev_attr_gro_flush_timeout.attr, &dev_attr_phys_port_id.attr, + &dev_attr_phys_switch_id.attr,NULL , };ATTRIBUTE_GROUPS (net_class);
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 9/21 bridge: call netdev_sw_port_stp_update when bridge port STP status changes
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
To notify switch driver of change in STP state of bridge port, add new .ndo op and provide switchdev wrapper func to call ndo op. Use it in bridge code then.
---v3->v4:
-added warning when call to netdev_sw_port_stp_update was not successful
suggested by Andyv2->v3:
-changed "sw" string to "switch" to avoid confusionv1->v2:
-no change
--- include/linux/netdevice.h | 5 +++++ include/net/switchdev.h | 7 +++++++ net/bridge/br_stp.c | 7 +++++++ net/switchdev/switchdev.c | 19 +++++++++++++++++++ 4 files changed, 38 insertions(+)
include/linux/netdevice.h +5 -0
@@ -1024,6 +1024,9 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,* Called to get an ID of the switch chip this port is part of. * If driver implements this, it indicates that it represents a port * of a switch chip. +* int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state); +* Called to notify switch device port of bridge port STP +* state change. */ struct net_device_ops {int (*ndo_init)(struct net_device *dev);
@@ -1180,6 +1183,8 @@ struct net_device_ops {#ifdef CONFIG_NET_SWITCHDEV int (*ndo_switch_parent_id_get)(struct net_device *dev,struct netdev_phys_item_id *psid); +int (*ndo_switch_port_stp_update)(struct net_device *dev, +u8 state);#endif };
include/net/switchdev.h +7 -0
@@ -16,6 +16,7 @@int netdev_switch_parent_id_get (struct net_device *dev,struct netdev_phys_item_id *psid); +int netdev_switch_port_stp_update (struct net_device *dev,u8 state);#else
@@ -25,6 +26,12 @@ static inline int netdev_switch_parent_id_get(struct net_device *dev,return -EOPNOTSUPP ; } +static inline int netdev_switch_port_stp_update (struct net_device *dev, +u8 state) +{ +return -EOPNOTSUPP ; +} +#endif #endif /* _LINUX_SWITCHDEV_H_ */
net/bridge/br_stp.c +7 -0
@@ -12,6 +12,7 @@*/ #include <linux/kernel.h> #include <linux/rculist.h> +#include <net/switchdev.h> #include "br_private.h" #include "br_private_stp.h"
@@ -38,7 +39,13 @@ void br_log_state(const struct net_bridge_port *p)void br_set_state (struct net_bridge_port *p,unsigned int state) { +int err; + p->state = state; + err =netdev_switch_port_stp_update (p->dev, state); +if (err && err != -EOPNOTSUPP ) +br_warn (p->br,"error setting offload STP state on port %u(%s)\n" , + (unsigned int ) p->port_no, p->dev->name); }/* called under bridge lock */
net/switchdev/switchdev.c +19 -0
@@ -31,3 +31,22 @@ int netdev_switch_parent_id_get(struct net_device *dev,return ops->ndo_switch_parent_id_get (dev, psid); }EXPORT_SYMBOL (netdev_switch_parent_id_get); + +/** +* netdev_switch_port_stp_update - Notify switch device port of STP +* state change +* @dev: port device +* @state: port STP state +* +* Notify switch device port of bridge port STP state change. +*/ +int netdev_switch_port_stp_update (struct net_device *dev,u8 state) +{ +const struct net_device_ops *ops = dev->netdev_ops; + +if (!ops->ndo_switch_port_stp_update) +return -EOPNOTSUPP ; +WARN_ON (!ops->ndo_switch_parent_id_get); +return ops->ndo_switch_port_stp_update (dev, state); +} +EXPORT_SYMBOL (netdev_switch_port_stp_update);
Signature · 1 line
1.9.3
Re: [patch net-next v4 09/21] bridge: call netdev_sw_port_stp_update when bridge port STP status changes
Quoted 6 lines · Jiri Pirko
From: Scott Feldman <[email protected]>
To notify switch driver of change in STP state of bridge port, add new .ndo op and provide switchdev wrapper func to call ndo op. Use it in bridge code then.
As it stands right now we are going to pollute the ndo ops and grow it fatter like the skb (its probably as fat).
If i am not mistaken ethtool has some scheme it uses to pass opaque objects to different functions. Having a generic set/get_netdev_offload_attr() would be the right thing to do. An {id, *value} or {id, len, *value} or a void * would do. So not objecting - but not ACKing either.
cheers,
jamal
Jiri Pirko
maintainerRe: [patch net-next v4 09/21] bridge: call netdev_sw_port_stp_update when bridge port STP status changes
Quoted 8 lines · Thu, Nov 27, 2014 at 02:14:20PM CET, [email protected] wrote:
Quoted 6 lines · Jiri Pirko
From: Scott Feldman <[email protected]>
To notify switch driver of change in STP state of bridge port, add new .ndo op and provide switchdev wrapper func to call ndo op. Use it in bridge code then.
Quoted 7 lines
As it stands right now we are going to pollute the ndo ops and grow it fatter like the skb (its probably as fat).
If i am not mistaken ethtool has some scheme it uses to pass opaque objects to different functions. Having a generic set/get_netdev_offload_attr() would be the right thing to do. An {id, *value} or {id, len, *value} or a void * would do. So not objecting - but not ACKing either.
Yeah, this will be changed in future when more and more info will need to be passed to offloads.
Quoted 4 lines
cheers,
jamal
Jiri Pirko
maintainerPATCH v4 10/21 bridge: add API to notify bridge driver of learned FBD on offloaded device
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
When the swdev device learns a new mac/vlan on a port, it sends some async notification to the driver and the driver installs an FDB in the device. To give a holistic system view, the learned mac/vlan should be reflected in the bridge's FBD table, so the user, using normal iproute2 cmds, can view what is currently learned by the device. This API on the bridge driver gives a way for the swdev driver to install an FBD entry in the bridge FBD table. (And remove one).
This is equivalent to the device running these cmds:
bridge fdb [add|del] <mac> dev <dev> vid <vlan id> master
This patch needs some extra eyeballs for review, in paricular around the locking and contexts.
---v3->v4:
-cosmetic changes to resolve conflicts
-call bh version of spinlock for hash_lock to avoid deadlock v2->v3:
-added "external" word into function names to emphasize fdbs are learned
externally
-added "added_by_external_learn" to fbd entry struct indicate the entry
was learned externaly and build some logic around that
-expose the fact that fdb entry was learned externally to userspace v1->v2:
-no change
x
--- include/linux/if_bridge.h | 18 +++++++++ include/uapi/linux/neighbour.h | 1 + net/bridge/br_fdb.c | 91 +++++++++++++++++++++++++++++++++++++++++- net/bridge/br_private.h | 3 +- 4 files changed, 111 insertions(+), 2 deletions(-)
include/linux/if_bridge.h +18 -0
@@ -37,6 +37,24 @@ extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __usetypedef int br_should_route_hook_t (struct sk_buff *skb);extern br_should_route_hook_t __rcu *br_should_route_hook; +#if IS_ENABLED (CONFIG_BRIDGE ) +int br_fdb_external_learn_add (struct net_device *dev, +const unsigned char *addr,u16 vid); +int br_fdb_external_learn_del (struct net_device *dev, +const unsigned char *addr,u16 vid); +#else +static inline int br_fdb_external_learn_add (struct net_device *dev, +const unsigned char *addr,u16 vid) +{ +return 0 ; +} +static inline int br_fdb_external_learn_del (struct net_device *dev, +const unsigned char *addr,u16 vid) +{ +return 0 ; +} +#endif +#if IS_ENABLED (CONFIG_BRIDGE ) &&IS_ENABLED (CONFIG_BRIDGE_IGMP_SNOOPING )int br_multicast_list_adjacent (struct net_device *dev,struct list_head *br_ip_list);
include/uapi/linux/neighbour.h +1 -0
@@ -38,6 +38,7 @@ enum {#define NTF_SELF 0x02#define NTF_MASTER 0x04#define NTF_PROXY 0x08/* == ATF_PUBL */ +#define NTF_EXT_LEARNED 0x10#define NTF_ROUTER 0x80/*
net/bridge/br_fdb.c +90 -1
106 lines not on this page · raw message
net/bridge/br_private.h +2 -1
@@ -100,7 +100,8 @@ struct net_bridge_fdb_entrymac_addr addr; unsigned char is_local:1, is_static:1, - added_by_user:1; + added_by_user:1, + added_by_external_learn:1;__u16 vlan_id; };
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 11/21 bridge: move private brport flags to if_bridge.h so port drivers can use flags
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
---v3->v4:
-used BIT macro as suggested by Thomas
new in v3
--- include/linux/if_bridge.h | 12 ++++++++++++ net/bridge/br_private.h | 10 ---------- 2 files changed, 12 insertions(+), 10 deletions(-)
include/linux/if_bridge.h +12 -0
@@ -15,6 +15,7 @@#include <linux/netdevice.h> #include <uapi/linux/if_bridge.h> +#include <linux/bitops.h> struct br_ip { union {
@@ -32,6 +33,17 @@ struct br_ip_list {struct br_ip addr; }; +#define BR_HAIRPIN_MODE BIT(0) +#define BR_BPDU_GUARD BIT(1) +#define BR_ROOT_BLOCK BIT(2) +#define BR_MULTICAST_FAST_LEAVE BIT(3) +#define BR_ADMIN_COST BIT(4) +#define BR_LEARNING BIT(5) +#define BR_FLOOD BIT(6) +#define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING) +#define BR_PROMISC BIT(7) +#define BR_PROXYARP BIT(8) +extern void brioctl_set (int (*ioctl_hook)(struct net *,unsigned int ,void __user *));typedef int br_should_route_hook_t (struct sk_buff *skb);
net/bridge/br_private.h +0 -10
@@ -164,16 +164,6 @@ struct net_bridge_portstruct rcu_head rcu;unsigned long flags; -#define BR_HAIRPIN_MODE 0x00000001 -#define BR_BPDU_GUARD 0x00000002 -#define BR_ROOT_BLOCK 0x00000004 -#define BR_MULTICAST_FAST_LEAVE 0x00000008 -#define BR_ADMIN_COST 0x00000010 -#define BR_LEARNING 0x00000020 -#define BR_FLOOD 0x00000040 -#define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING) -#define BR_PROMISC 0x00000080 -#define BR_PROXYARP 0x00000100#ifdef CONFIG_BRIDGE_IGMP_SNOOPING struct bridge_mcast_own_query ip4_own_query;
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 12/21 bridge: add new brport flag LEARNING_SYNC
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
This policy flag controls syncing of learned FDB entries to bridge's FDB. If on, FDB entries learned on bridge port device will be synced. If off, device may still learn new FDB entries but they will not be synced with bridge's FDB.
---v3->v4:
-just resolved conflict caused by BIT change of previous patch new in v3
--- include/linux/if_bridge.h | 1 + include/uapi/linux/if_link.h | 1 + 2 files changed, 2 insertions(+)
include/linux/if_bridge.h +1 -0
@@ -43,6 +43,7 @@ struct br_ip_list {#define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING)#define BR_PROMISC BIT(7)#define BR_PROXYARP BIT(8) +#define BR_LEARNING_SYNC BIT(9)extern void brioctl_set (int (*ioctl_hook)(struct net *,unsigned int ,void __user *));
include/uapi/linux/if_link.h +1 -0
@@ -245,6 +245,7 @@ enum {IFLA_BRPORT_LEARNING ,/* mac learning */ IFLA_BRPORT_UNICAST_FLOOD ,/* flood unicast traffic */ IFLA_BRPORT_PROXYARP ,/* proxy ARP */ +IFLA_BRPORT_LEARNING_SYNC ,/* mac learning sync from device */ __IFLA_BRPORT_MAX };#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 13/21 bridge: add new hwmode swdev
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
Current hwmode settings are "vepa" or "veb". These are for NIC interfaces with basic bridging function offloaded to HW. Add new "swdev" for full switch device offloads.
---v3->v4:
-no change
new in v3
--- include/uapi/linux/if_bridge.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/linux/if_bridge.h +1 -0
@@ -105,6 +105,7 @@ struct __fdb_entry {#define BRIDGE_MODE_VEB 0/* Default loopback mode */ #define BRIDGE_MODE_VEPA 1/* 802.1Qbg defined VEPA mode */ +#define BRIDGE_MODE_SWDEV 2/* Full switch device offload */ /* Bridge management nested attributes * [IFLA_AF_SPEC] = {
Signature · 1 line
1.9.3
Re: [patch net-next v4 13/21] bridge: add new hwmode swdev
Hello.
Quoted 21 lines · Jiri Pirko
From: Scott Feldman <[email protected]>
Current hwmode settings are "vepa" or "veb". These are for NIC interfaces with basic bridging function offloaded to HW. Add new "swdev" for full switch device offloads.
Signed-off-by Scott Feldman <[email protected]>Signed-off-by Jiri Pirko <[email protected]>---
v3->v4:
-no change
new in v3--- include/uapi/linux/if_bridge.h | 1 + 1 file changed, 1 insertion(+)include/uapi/linux/if_bridge.h +0
-0
include/uapi/linux/if_bridge.h struct __fdb_entry { · line 108
Quoted 4 lines
include/uapi/linux/if_bridge.h +1
-0@@ -105,6 +105,7 @@ struct __fdb_entry {#define BRIDGE_MODE_VEB 0/* Default loopback mode */ #define BRIDGE_MODE_VEPA 1/* 802.1Qbg defined VEPA mode */ +#define BRIDGE_MODE_SWDEV 2/* Full switch device offload */
Please use tabs for indentation.
[...]
WBR, Sergei
Jiri Pirko
maintainerPATCH v4 14/21 bridge: add brport flags to dflt bridge_getlink
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
To allow brport device to return current brport flags set on port. Add returned flags to nested IFLA_PROTINFO netlink msg built in dflt getlink. With this change, netlink msg returned for bridge_getlink contains the port's offloaded flag settings (the port's SELF settings).
---v3->v4:
-no change
new in v3
--- drivers/net/ethernet/emulex/benet/be_main.c | 3 ++- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- include/linux/rtnetlink.h | 3 ++- net/core/rtnetlink.c | 39 ++++++++++++++++++++++++++- 4 files changed, 43 insertions(+), 4 deletions(-)
drivers/net/ethernet/emulex/benet/be_main.c +2 -1
@@ -4362,7 +4362,8 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,return ndo_dflt_bridge_getlink (skb, pid, seq, dev, hsw_mode ==PORT_FWD_TYPE_VEPA ? -BRIDGE_MODE_VEPA :BRIDGE_MODE_VEB ); +BRIDGE_MODE_VEPA :BRIDGE_MODE_VEB , +0 ,0 ); }#ifdef CONFIG_BE2NET_VXLAN
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
@@ -7773,7 +7773,7 @@ static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,else mode =BRIDGE_MODE_VEPA ; -return ndo_dflt_bridge_getlink (skb, pid, seq, dev, mode); +return ndo_dflt_bridge_getlink (skb, pid, seq, dev, mode,0 ,0 ); }static void *ixgbe_fwd_add (struct net_device *pdev,struct net_device *vdev)
include/linux/rtnetlink.h +2 -1
@@ -103,5 +103,6 @@ extern int ndo_dflt_fdb_del(struct ndmsg *ndm, u16 vid);extern int ndo_dflt_bridge_getlink (struct sk_buff *skb,u32 pid,u32 seq, -struct net_device *dev,u16 mode); +struct net_device *dev,u16 mode, +u32 flags,u32 mask);#endif /* __LINUX_RTNETLINK_H */
net/core/rtnetlink.c +38 -1
@@ -2687,12 +2687,22 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)return skb->len; } +static int brport_nla_put_flag (struct sk_buff *skb,u32 flags,u32 mask, +unsigned int attrnum,unsigned int flag) +{ +if (mask & flag) +return nla_put_u8 (skb, attrnum, !!(flags & flag)); +return 0 ; +} +int ndo_dflt_bridge_getlink (struct sk_buff *skb,u32 pid,u32 seq, -struct net_device *dev,u16 mode) +struct net_device *dev,u16 mode, +u32 flags,u32 mask) {struct nlmsghdr *nlh;struct ifinfomsg *ifm;struct nlattr *br_afspec; +struct nlattr *protinfo;u8 operstate =netif_running (dev) ? dev->operstate :IF_OPER_DOWN ;struct net_device *br_dev =netdev_master_upper_dev_get (dev);
@@ -2731,6 +2741,33 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, }nla_nest_end (skb, br_afspec); + protinfo =nla_nest_start (skb,IFLA_PROTINFO |NLA_F_NESTED ); +if (!protinfo) + goto nla_put_failure; + +if (brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_MODE ,BR_HAIRPIN_MODE ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_GUARD ,BR_BPDU_GUARD ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_FAST_LEAVE , +BR_MULTICAST_FAST_LEAVE ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_PROTECT ,BR_ROOT_BLOCK ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_LEARNING ,BR_LEARNING ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_LEARNING_SYNC ,BR_LEARNING_SYNC ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_UNICAST_FLOOD ,BR_FLOOD ) || +brport_nla_put_flag (skb, flags, mask, +IFLA_BRPORT_PROXYARP ,BR_PROXYARP )) { +nla_nest_cancel (skb, protinfo); + goto nla_put_failure; + } + +nla_nest_end (skb, protinfo); +return nlmsg_end (skb, nlh); nla_put_failure:nlmsg_cancel (skb, nlh);
Signature · 1 line
1.9.3
Re: [patch net-next v4 14/21] bridge: add brport flags to dflt bridge_getlink
Quoted 6 lines · Jiri Pirko
From: Scott Feldman <[email protected]>
To allow brport device to return current brport flags set on port. Add returned flags to nested
IFLA_PROTINFOnetlink msg built in dflt getlink. With this change, netlink msg returned forbridge_getlinkcontains the port's offloaded flag settings (the port's SELF settings).
Am i missing something or we already have this stuff showing up in user space today?
cheers,
jamal
Re: [patch net-next v4 14/21] bridge: add brport flags to dflt bridge_getlink
Quoted 12 lines · Jamal Hadi Salim
Quoted 7 lines · Jiri Pirko
From: Scott Feldman <[email protected]>
To allow brport device to return current brport flags set on port. Add returned flags to nested
IFLA_PROTINFOnetlink msg built in dflt getlink. With this change, netlink msg returned forbridge_getlinkcontains the port's
offloaded flag settings (the port's SELF settings).Am i missing something or we already have this stuff showing up in user space today?
Sorry, in events it does but for some reason not in the GETs even though trying to trace the code ndo_bridge_getlink() i couldnt tell off hand why it is not showing up. look at: br_port_fill_attrs() and its callers.
cheers,
jamal
Re: [patch net-next v4 14/21] bridge: add brport flags to dflt bridge_getlink
In reply to Jamal Hadi SalimQuoted 11 lines · Jamal Hadi Salim
Quoted 8 lines · Jiri Pirko
From: Scott Feldman <[email protected]>
To allow brport device to return current brport flags set on port. Add returned flags to nested
IFLA_PROTINFOnetlink msg built in dflt getlink. With this change, netlink msg returned forbridge_getlinkcontains the port's
offloaded flag settings (the port's SELF settings).
Quoted 2 lines
Am i missing something or we already have this stuff showing up in user space today?
For RTM_GETLINK, rtnl_bridge_getlink() calls ndo_bridge_getlink twice for each dev, once on bridge and second time on dev. Each call adds an RTM_NEWLINK to skb. For the ndo_bridge_getlink() call to bridge, the MASTER port flags are filled in using br_port_fill_attr(). For the second ndo_bridge_getlink() call to dev, the port driver calls ndo_dflt_bridge_getlink() which fills in the SELF port flags. Before this patch, ndo_dflt_bridge_getlink() was only filling in hwmode.
Whew, in any case, I think you'll agree this code needs a refactoring down the road. This change is just the bare minimum building on what's there to get SELF port flags up to user-space. A refactoring effort should get the port drivers out of parsing/filling netlink msg and leave that to the core code in rtnetlink.c. That way we can have one place for policy checks and one place for fill. I think this refactoring effort should be left out in this patch series, otherwise this is going to drag on into the next year.
Quoted 3 lines
cheers,
jamal
Jamal Hadi Salim
Acked-byRe: [patch net-next v4 14/21] bridge: add brport flags to dflt bridge_getlink
Quoted 11 lines · Scott Feldman
On Thu, Nov 27, 2014 at 3:17 AM, Jamal Hadi Salim <[email protected]> wrote:
For
RTM_GETLINK,rtnl_bridge_getlink()callsndo_bridge_getlinktwice for each dev, once on bridge and second time on dev. Each call adds anRTM_NEWLINKto skb. For thendo_bridge_getlink()call to bridge, the MASTER port flags are filled in usingbr_port_fill_attr(). For the secondndo_bridge_getlink()call to dev, the port driver callsndo_dflt_bridge_getlink()which fills in the SELF port flags. Before this patch,ndo_dflt_bridge_getlink()was only filling in hwmode.
Quoted 9 lines
Whew, in any case, I think you'll agree this code needs a refactoring down the road. This change is just the bare minimum building on what's there to get SELF port flags up to user-space. A refactoring effort should get the port drivers out of parsing/filling netlink msg and leave that to the core code in
rtnetlink.c. That way we can have one place for policy checks and one place for fill. I think this refactoring effort should be left out in this patch series, otherwise this is going to drag on into the next year.
I am fine with that. At minimal br_port_fill_attr() is reusable.
There's a lot of stuff i wish would be "fixed" - one is clearly not abusing a u8 just to send one bit to the kernel. You just added one more horn of that sort with the sync learning. I wish i had time to clean it up. In any case:
cheers,
jamal
Jiri Pirko
maintainerPATCH v4 15/21 rocker: introduce rocker switch driver
In reply to Jiri PirkoThis patch introduces the first driver to benefit from the switchdev infrastructure and to implement newly introduced switch ndos. This is a driver for emulated switch chip implemented in qemu:
https://github.com/sfeldma/qemu-rocker/
This patch is a result of joint work with Scott Feldman.
---v3->v4:
-no changev2->v3:
-changed "sw" string to "switch" to avoid confusion v1->v2:
-fixed "unsigned" -> "unsigned int" as suggested by DaveM -removed "ifdef CONFIG_NET_SWITCHDEV" in ndos as suggested by DaveM -removed unnecessary "__packed" annotations as suggested by DaveM
--- MAINTAINERS | 7 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/rocker/Kconfig | 27 + drivers/net/ethernet/rocker/Makefile | 5 + drivers/net/ethernet/rocker/rocker.c | 2060 ++++++++++++++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 427 +++++++ 7 files changed, 2528 insertions(+) create mode 100644 drivers/net/ethernet/rocker/Kconfig create mode 100644 drivers/net/ethernet/rocker/Makefile create mode 100644 drivers/net/ethernet/rocker/rocker.c create mode 100644 drivers/net/ethernet/rocker/rocker.h
MAINTAINERS +7 -0
@@ -7864,6 +7864,13 @@ F: drivers/hid/hid-roccat* F: include/linux/hid-roccat* F: Documentation/ABI/*/sysfs-driver-hid-roccat* +ROCKER DRIVER +M: Jiri Pirko <[email protected]> +M: Scott Feldman <[email protected]> +L: [email protected] +S: Supported +F: drivers/net/ethernet/rocker/ + ROCKETPORT DRIVER P: Comtrol Corp. W: http://www.comtrol.com
drivers/net/ethernet/Kconfig +1 -0
@@ -155,6 +155,7 @@ source "drivers/net/ethernet/qualcomm/Kconfig" source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" +source "drivers/net/ethernet/rocker/Kconfig" config S6GMAC tristate "S6105 GMAC ethernet support"
drivers/net/ethernet/Makefile +1 -0
@@ -65,6 +65,7 @@ obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ +obj-$(CONFIG_NET_VENDOR_ROCKER) += rocker/ obj-$(CONFIG_S6GMAC) += s6gmac.o obj-$(CONFIG_NET_VENDOR_SAMSUNG) += samsung/ obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
drivers/net/ethernet/rocker/Kconfig new file +27 -0
@@ -0,0 +1,27 @@ +# +# Rocker device configuration +# + +config NET_VENDOR_ROCKER + bool "Rocker devices" + default y + ---help--- + If you have a network device belonging to this class, say Y. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Rocker devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_ROCKER + +config ROCKER + tristate "Rocker switch driver (EXPERIMENTAL)" + depends on PCI && NET_SWITCHDEV + ---help--- + This driver supports Rocker switch device. + + To compile this driver as a module, choose M here: the + module will be called rocker. + +endif # NET_VENDOR_ROCKER
drivers/net/ethernet/rocker/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# +# Makefile for the Rocker network device drivers. +# + +obj-$(CONFIG_ROCKER) += rocker.o
drivers/net/ethernet/rocker/rocker.c new file +2060 -0
2,060 lines not on this page · raw message
drivers/net/ethernet/rocker/rocker.h new file +427 -0
427 lines not on this page · raw message
Signature · 1 line
1.9.3
Re: [patch net-next v4 15/21] rocker: introduce rocker switch driver
Quoted 7 lines · Jiri Pirko
This patch introduces the first driver to benefit from the switchdev infrastructure and to implement newly introduced switch ndos. This is a driver for emulated switch chip implemented in qemu:
https://github.com/sfeldma/qemu-rocker/This patch is a result of joint work with Scott Feldman.
I would like to review the rocking rocks rocker later (sorry dont have time right now but would love to).
cheers,
jamal
Jiri Pirko
maintainerPATCH v4 16/21 rocker: implement rocker ofdpa flow table manipulation
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
The rocker driver maintains 4 hash tables: flows, groups, FDB, and VLANs.
Flow and group tables track the entries installed to OF-DPA tables, per the OF-DPA spec. See OF-DPA spec for full description of fields in each flow and group table. New table entries are pushed to the device with ADD cmd. Updated entries are pushed to the device with MOD cmd. For flow table entries, a crc32 key is made from fields of the particular field. For group table entries, the group_id is used as the key.
The FDB table tracks fdb entries learned by the device or manually pushed to the bridge by the user. A crc32 key is made from the port/mac/vlan tuple for the fdb entry.
The VLAN table tracks the ifindex-to-internal-vlan mapping for untagged pkts. On ingress, an untagged pkt is inserted with an internal VLAN ID based on the input port's current internal VLAN ID. The input port's internal VLAN will either be referenced by the port's ifindex, if not bridged, or the containing bridge's ifindex, if bridged. Since the ifindex space isn't within a fixed range, uses a hash table (with ifindex as key) to track internal VLAN ID for a given ifindex. The internal VLAN ID range is fixed and currently uses the upper 255 VLAN IDs, starting at 0xf00.
---v1->v2->v3->v4:
-no change
--- drivers/net/ethernet/rocker/rocker.c | 1469 +++++++++++++++++++++++++++++++++- 1 file changed, 1467 insertions(+), 2 deletions(-)
drivers/net/ethernet/rocker/rocker.c +1467 -2
@@ -16,6 +16,7 @@#include <linux/sched.h> #include <linux/wait.h> #include <linux/spinlock.h> +#include <linux/hashtable.h> #include <linux/crc32.h> #include <linux/sort.h> #include <linux/random.h>
@@ -27,6 +28,7 @@#include <linux/ethtool.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> +#include <linux/bitops.h> #include <net/switchdev.h> #include <net/rtnetlink.h> #include <asm-generic/io-64-nonatomic-lo-hi.h>
@@ -41,6 +43,123 @@ static const struct pci_device_id rocker_pci_id_table[] = { {0, } }; +struct rocker_flow_tbl_key { +u32 priority; +enum rocker_of_dpa_table_id tbl_id; +union { +struct { +u32 in_lport; +u32 in_lport_mask; +enum rocker_of_dpa_table_id goto_tbl; + } ig_port; +struct { +u32 in_lport; +__be16 vlan_id; +__be16 vlan_id_mask; +enum rocker_of_dpa_table_id goto_tbl; +bool untagged; +__be16 new_vlan_id; + } vlan; +struct { +u32 in_lport; +u32 in_lport_mask; +__be16 eth_type; +u8 eth_dst[ETH_ALEN ]; +u8 eth_dst_mask[ETH_ALEN ]; +__be16 vlan_id; +__be16 vlan_id_mask; +enum rocker_of_dpa_table_id goto_tbl; +bool copy_to_cpu; + } term_mac; +struct { +__be16 eth_type; +__be32 dst4; +__be32 dst4_mask; +enum rocker_of_dpa_table_id goto_tbl; +u32 group_id; + } ucast_routing; +struct { +u8 eth_dst[ETH_ALEN ]; +u8 eth_dst_mask[ETH_ALEN ]; +int has_eth_dst; +int has_eth_dst_mask; +__be16 vlan_id; +u32 tunnel_id; +enum rocker_of_dpa_table_id goto_tbl; +u32 group_id; +bool copy_to_cpu; + } bridge; +struct { +u32 in_lport; +u32 in_lport_mask; +u8 eth_src[ETH_ALEN ]; +u8 eth_src_mask[ETH_ALEN ]; +u8 eth_dst[ETH_ALEN ]; +u8 eth_dst_mask[ETH_ALEN ]; +__be16 eth_type; +__be16 vlan_id; +__be16 vlan_id_mask; +u8 ip_proto; +u8 ip_proto_mask; +u8 ip_tos; +u8 ip_tos_mask; +u32 group_id; + } acl; + }; +}; + +struct rocker_flow_tbl_entry { +struct hlist_node entry; +u32 ref_count; +u64 cookie; +struct rocker_flow_tbl_key key; +u32 key_crc32;/* key */ +}; + +struct rocker_group_tbl_entry { +struct hlist_node entry; +u32 cmd; +u32 group_id;/* key */ +u16 group_count; +u32 *group_ids; +union { +struct { +u8 pop_vlan; + } l2_interface; +struct { +u8 eth_src[ETH_ALEN ]; +u8 eth_dst[ETH_ALEN ]; +__be16 vlan_id; +u32 group_id; + } l2_rewrite; +struct { +u8 eth_src[ETH_ALEN ]; +u8 eth_dst[ETH_ALEN ]; +__be16 vlan_id; +bool ttl_check; +u32 group_id; + } l3_unicast; + }; +}; + +struct rocker_fdb_tbl_entry { +struct hlist_node entry; +u32 key_crc32;/* key */ +bool learned; +struct rocker_fdb_tbl_key { +u32 lport; +u8 addr[ETH_ALEN ]; +__be16 vlan_id; + } key; +}; + +struct rocker_internal_vlan_tbl_entry { +struct hlist_node entry; +int ifindex;/* key */ +u32 ref_count; +__be16 vlan_id; +}; +struct rocker_desc_info {char *data;/* mapped */ size_t data_size;
@@ -61,11 +180,28 @@ struct rocker_dma_ring_info {struct rocker ; +enum { +ROCKER_CTRL_LINK_LOCAL_MCAST , +ROCKER_CTRL_LOCAL_ARP , +ROCKER_CTRL_IPV4_MCAST , +ROCKER_CTRL_IPV6_MCAST , +ROCKER_CTRL_DFLT_BRIDGING , +ROCKER_CTRL_MAX , +}; + +#define ROCKER_INTERNAL_VLAN_ID_BASE 0x0f00 +#define ROCKER_N_INTERNAL_VLANS 255 +#define ROCKER_VLAN_BITMAP_LEN BITS_TO_LONGS(VLAN_N_VID) +#define ROCKER_INTERNAL_VLAN_BITMAP_LEN BITS_TO_LONGS(ROCKER_N_INTERNAL_VLANS) +struct rocker_port {struct net_device *dev;struct rocker *rocker;unsigned int port_number;u32 lport; +__be16 internal_vlan_id; +bool ctrls[ROCKER_CTRL_MAX ]; +unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN ];struct napi_struct napi_tx;struct napi_struct napi_rx;struct rocker_dma_ring_info tx_ring;
@@ -84,8 +220,76 @@ struct rocker {spinlock_t cmd_ring_lock;struct rocker_dma_ring_info cmd_ring;struct rocker_dma_ring_info event_ring; +DECLARE_HASHTABLE (flow_tbl,16 ); +spinlock_t flow_tbl_lock; +u64 flow_tbl_next_cookie; +DECLARE_HASHTABLE (group_tbl,16 ); +spinlock_t group_tbl_lock; +DECLARE_HASHTABLE (fdb_tbl,16 ); +spinlock_t fdb_tbl_lock; +unsigned long internal_vlan_bitmap[ROCKER_INTERNAL_VLAN_BITMAP_LEN ]; +DECLARE_HASHTABLE (internal_vlan_tbl,8 ); +spinlock_t internal_vlan_tbl_lock; +}; + +static const u8 zero_mac[ETH_ALEN ] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +static const u8 ff_mac[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; +static const u8 ll_mac[ETH_ALEN ] = {0x01 ,0x80 ,0xc2 ,0x00 ,0x00 ,0x00 }; +static const u8 ll_mask[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xf0 }; +static const u8 mcast_mac[ETH_ALEN ] = {0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +static const u8 ipv4_mcast[ETH_ALEN ] = {0x01 ,0x00 ,0x5e ,0x00 ,0x00 ,0x00 }; +static const u8 ipv4_mask[ETH_ALEN ] = {0xff ,0xff ,0xff ,0x80 ,0x00 ,0x00 }; +static const u8 ipv6_mcast[ETH_ALEN ] = {0x33 ,0x33 ,0x00 ,0x00 ,0x00 ,0x00 }; +static const u8 ipv6_mask[ETH_ALEN ] = {0xff ,0xff ,0x00 ,0x00 ,0x00 ,0x00 }; + +/* Rocker priority levels for flow table entries. Higher +* priority match takes precedence over lower priority match. +*/ + +enum { +ROCKER_PRIORITY_UNKNOWN =0 , +ROCKER_PRIORITY_IG_PORT =1 , +ROCKER_PRIORITY_VLAN =1 , +ROCKER_PRIORITY_TERM_MAC_UCAST =0 , +ROCKER_PRIORITY_TERM_MAC_MCAST =1 , +ROCKER_PRIORITY_UNICAST_ROUTING =1 , +ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT =1 , +ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD =2 , +ROCKER_PRIORITY_BRIDGING_VLAN =3 , +ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT =1 , +ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD =2 , +ROCKER_PRIORITY_BRIDGING_TENANT =3 , +ROCKER_PRIORITY_ACL_CTRL =3 , +ROCKER_PRIORITY_ACL_NORMAL =2 , +ROCKER_PRIORITY_ACL_DFLT =1 , }; +static bool rocker_vlan_id_is_internal (__be16 vlan_id) +{ +u16 start =ROCKER_INTERNAL_VLAN_ID_BASE ; +u16 end =0xffe ; +u16 _vlan_id =ntohs (vlan_id); + +return (_vlan_id >= start && _vlan_id <= end); +} + +static __be16 rocker_port_vid_to_vlan (struct rocker_port *rocker_port, +u16 vid,bool *pop_vlan) +{ +__be16 vlan_id; + +if (pop_vlan) + *pop_vlan = false; + vlan_id =htons (vid); +if (!vlan_id) { + vlan_id = rocker_port->internal_vlan_id; +if (pop_vlan) + *pop_vlan = true; + } + +return vlan_id; +} +struct rocker_wait {wait_queue_head_t wait;bool done;
@@ -1094,6 +1298,10 @@ static int rocker_event_link_change(struct rocker *rocker,return 0 ; } +#define ROCKER_OP_FLAG_REMOVE BIT(0) +#define ROCKER_OP_FLAG_NOWAIT BIT(1) +#define ROCKER_OP_FLAG_LEARNED BIT(2) +static int rocker_event_process (struct rocker *rocker,struct rocker_desc_info *desc_info) {
@@ -1399,6 +1607,1240 @@ static int rocker_cmd_set_port_settings_macaddr(struct rocker_port *rocker_port, macaddr, NULL, NULL, false); } +static int rocker_cmd_flow_tbl_add_ig_port (struct rocker_desc_info *desc_info, +struct rocker_flow_tbl_entry *entry) +{ +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT , + entry->key.ig_port.in_lport)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT_MASK , + entry->key.ig_port.in_lport_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_GOTO_TABLE_ID , + entry->key.ig_port.goto_tbl)) +return -EMSGSIZE ; + +return 0 ; +} + +static int rocker_cmd_flow_tbl_add_vlan (struct rocker_desc_info *desc_info, +struct rocker_flow_tbl_entry *entry) +{ +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT , + entry->key.vlan.in_lport)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID , + entry->key.vlan.vlan_id)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID_MASK , + entry->key.vlan.vlan_id_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_GOTO_TABLE_ID , + entry->key.vlan.goto_tbl)) +return -EMSGSIZE ; +if (entry->key.vlan.untagged && +rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_NEW_VLAN_ID , + entry->key.vlan.new_vlan_id)) +return -EMSGSIZE ; + +return 0 ; +} + +static int rocker_cmd_flow_tbl_add_term_mac (struct rocker_desc_info *desc_info, +struct rocker_flow_tbl_entry *entry) +{ +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT , + entry->key.term_mac.in_lport)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT_MASK , + entry->key.term_mac.in_lport_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_ETHERTYPE , + entry->key.term_mac.eth_type)) +return -EMSGSIZE ; +if (rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC , +ETH_ALEN , entry->key.term_mac.eth_dst)) +return -EMSGSIZE ; +if (rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC_MASK , +ETH_ALEN , entry->key.term_mac.eth_dst_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID , + entry->key.term_mac.vlan_id)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID_MASK , + entry->key.term_mac.vlan_id_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_GOTO_TABLE_ID , + entry->key.term_mac.goto_tbl)) +return -EMSGSIZE ; +if (entry->key.term_mac.copy_to_cpu && +rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_COPY_CPU_ACTION , + entry->key.term_mac.copy_to_cpu)) +return -EMSGSIZE ; + +return 0 ; +} + +static int +rocker_cmd_flow_tbl_add_ucast_routing (struct rocker_desc_info *desc_info, +struct rocker_flow_tbl_entry *entry) +{ +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_ETHERTYPE , + entry->key.ucast_routing.eth_type)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_DST_IP , + entry->key.ucast_routing.dst4)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_DST_IP_MASK , + entry->key.ucast_routing.dst4_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_GOTO_TABLE_ID , + entry->key.ucast_routing.goto_tbl)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID , + entry->key.ucast_routing.group_id)) +return -EMSGSIZE ; + +return 0 ; +} + +static int rocker_cmd_flow_tbl_add_bridge (struct rocker_desc_info *desc_info, +struct rocker_flow_tbl_entry *entry) +{ +if (entry->key.bridge.has_eth_dst && +rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC , +ETH_ALEN , entry->key.bridge.eth_dst)) +return -EMSGSIZE ; +if (entry->key.bridge.has_eth_dst_mask && +rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC_MASK , +ETH_ALEN , entry->key.bridge.eth_dst_mask)) +return -EMSGSIZE ; +if (entry->key.bridge.vlan_id && +rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID , + entry->key.bridge.vlan_id)) +return -EMSGSIZE ; +if (entry->key.bridge.tunnel_id && +rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_TUNNEL_ID , + entry->key.bridge.tunnel_id)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_GOTO_TABLE_ID , + entry->key.bridge.goto_tbl)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID , + entry->key.bridge.group_id)) +return -EMSGSIZE ; +if (entry->key.bridge.copy_to_cpu && +rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_COPY_CPU_ACTION , + entry->key.bridge.copy_to_cpu)) +return -EMSGSIZE ; + +return 0 ; +} + +static int rocker_cmd_flow_tbl_add_acl (struct rocker_desc_info *desc_info, +struct rocker_flow_tbl_entry *entry) +{ +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT , + entry->key.acl.in_lport)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_IN_LPORT_MASK , + entry->key.acl.in_lport_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_SRC_MAC , +ETH_ALEN , entry->key.acl.eth_src)) +return -EMSGSIZE ; +if (rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_SRC_MAC_MASK , +ETH_ALEN , entry->key.acl.eth_src_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC , +ETH_ALEN , entry->key.acl.eth_dst)) +return -EMSGSIZE ; +if (rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC_MASK , +ETH_ALEN , entry->key.acl.eth_dst_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_ETHERTYPE , + entry->key.acl.eth_type)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID , + entry->key.acl.vlan_id)) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID_MASK , + entry->key.acl.vlan_id_mask)) +return -EMSGSIZE ; + +switch (ntohs (entry->key.acl.eth_type)) { +case ETH_P_IP : +case ETH_P_IPV6 : +if (rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_IP_PROTO , + entry->key.acl.ip_proto)) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info, +ROCKER_TLV_OF_DPA_IP_PROTO_MASK , + entry->key.acl.ip_proto_mask)) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_IP_DSCP , + entry->key.acl.ip_tos &0x3f )) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info, +ROCKER_TLV_OF_DPA_IP_DSCP_MASK , + entry->key.acl.ip_tos_mask &0x3f )) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_IP_ECN , + (entry->key.acl.ip_tos &0xc0 ) >>6 )) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info, +ROCKER_TLV_OF_DPA_IP_ECN_MASK , + (entry->key.acl.ip_tos_mask &0xc0 ) >>6 )) +return -EMSGSIZE ; +break ; + } + +if (entry->key.acl.group_id !=ROCKER_GROUP_NONE && +rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID , + entry->key.acl.group_id)) +return -EMSGSIZE ; + +return 0 ; +} + +static int rocker_cmd_flow_tbl_add (struct rocker *rocker, +struct rocker_port *rocker_port, +struct rocker_desc_info *desc_info, +void *priv) +{ +struct rocker_flow_tbl_entry *entry = priv; +struct rocker_tlv *cmd_info; +int err =0 ; + +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_CMD_TYPE , +ROCKER_TLV_CMD_TYPE_OF_DPA_FLOW_ADD )) +return -EMSGSIZE ; + cmd_info =rocker_tlv_nest_start (desc_info,ROCKER_TLV_CMD_INFO ); +if (!cmd_info) +return -EMSGSIZE ; +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_TABLE_ID , + entry->key.tbl_id)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_PRIORITY , + entry->key.priority)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_HARDTIME ,0 )) +return -EMSGSIZE ; +if (rocker_tlv_put_u64 (desc_info,ROCKER_TLV_OF_DPA_COOKIE , + entry->cookie)) +return -EMSGSIZE ; + +switch (entry->key.tbl_id) { +case ROCKER_OF_DPA_TABLE_ID_INGRESS_PORT : + err =rocker_cmd_flow_tbl_add_ig_port (desc_info, entry); +break ; +case ROCKER_OF_DPA_TABLE_ID_VLAN : + err =rocker_cmd_flow_tbl_add_vlan (desc_info, entry); +break ; +case ROCKER_OF_DPA_TABLE_ID_TERMINATION_MAC : + err =rocker_cmd_flow_tbl_add_term_mac (desc_info, entry); +break ; +case ROCKER_OF_DPA_TABLE_ID_UNICAST_ROUTING : + err =rocker_cmd_flow_tbl_add_ucast_routing (desc_info, entry); +break ; +case ROCKER_OF_DPA_TABLE_ID_BRIDGING : + err =rocker_cmd_flow_tbl_add_bridge (desc_info, entry); +break ; +case ROCKER_OF_DPA_TABLE_ID_ACL_POLICY : + err =rocker_cmd_flow_tbl_add_acl (desc_info, entry); +break ; +default : + err = -ENOTSUPP ; +break ; + } + +if (err) +return err; + +rocker_tlv_nest_end (desc_info, cmd_info); + +return 0 ; +} + +static int rocker_cmd_flow_tbl_del (struct rocker *rocker, +struct rocker_port *rocker_port, +struct rocker_desc_info *desc_info, +void *priv) +{ +const struct rocker_flow_tbl_entry *entry = priv; +struct rocker_tlv *cmd_info; + +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_CMD_TYPE , +ROCKER_TLV_CMD_TYPE_OF_DPA_FLOW_DEL )) +return -EMSGSIZE ; + cmd_info =rocker_tlv_nest_start (desc_info,ROCKER_TLV_CMD_INFO ); +if (!cmd_info) +return -EMSGSIZE ; +if (rocker_tlv_put_u64 (desc_info,ROCKER_TLV_OF_DPA_COOKIE , + entry->cookie)) +return -EMSGSIZE ; +rocker_tlv_nest_end (desc_info, cmd_info); + +return 0 ; +} + +static int +rocker_cmd_group_tbl_add_l2_interface (struct rocker_desc_info *desc_info, +struct rocker_group_tbl_entry *entry) +{ +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_OUT_LPORT , +ROCKER_GROUP_PORT_GET (entry->group_id))) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_POP_VLAN , + entry->l2_interface.pop_vlan)) +return -EMSGSIZE ; + +return 0 ; +} + +static int +rocker_cmd_group_tbl_add_l2_rewrite (struct rocker_desc_info *desc_info, +struct rocker_group_tbl_entry *entry) +{ +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID_LOWER , + entry->l2_rewrite.group_id)) +return -EMSGSIZE ; +if (!is_zero_ether_addr (entry->l2_rewrite.eth_src) && +rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_SRC_MAC , +ETH_ALEN , entry->l2_rewrite.eth_src)) +return -EMSGSIZE ; +if (!is_zero_ether_addr (entry->l2_rewrite.eth_dst) && +rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC , +ETH_ALEN , entry->l2_rewrite.eth_dst)) +return -EMSGSIZE ; +if (entry->l2_rewrite.vlan_id && +rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID , + entry->l2_rewrite.vlan_id)) +return -EMSGSIZE ; + +return 0 ; +} + +static int +rocker_cmd_group_tbl_add_group_ids (struct rocker_desc_info *desc_info, +struct rocker_group_tbl_entry *entry) +{ +int i; +struct rocker_tlv *group_ids; + +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_GROUP_COUNT , + entry->group_count)) +return -EMSGSIZE ; + + group_ids =rocker_tlv_nest_start (desc_info, +ROCKER_TLV_OF_DPA_GROUP_IDS ); +if (!group_ids) +return -EMSGSIZE ; + +for (i =0 ; i < entry->group_count; i++) +/* Note TLV array is 1-based */ +if (rocker_tlv_put_u32 (desc_info, i +1 , entry->group_ids[i])) +return -EMSGSIZE ; + +rocker_tlv_nest_end (desc_info, group_ids); + +return 0 ; +} + +static int +rocker_cmd_group_tbl_add_l3_unicast (struct rocker_desc_info *desc_info, +struct rocker_group_tbl_entry *entry) +{ +if (!is_zero_ether_addr (entry->l3_unicast.eth_src) && +rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_SRC_MAC , +ETH_ALEN , entry->l3_unicast.eth_src)) +return -EMSGSIZE ; +if (!is_zero_ether_addr (entry->l3_unicast.eth_dst) && +rocker_tlv_put (desc_info,ROCKER_TLV_OF_DPA_DST_MAC , +ETH_ALEN , entry->l3_unicast.eth_dst)) +return -EMSGSIZE ; +if (entry->l3_unicast.vlan_id && +rocker_tlv_put_u16 (desc_info,ROCKER_TLV_OF_DPA_VLAN_ID , + entry->l3_unicast.vlan_id)) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info,ROCKER_TLV_OF_DPA_TTL_CHECK , + entry->l3_unicast.ttl_check)) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID_LOWER , + entry->l3_unicast.group_id)) +return -EMSGSIZE ; + +return 0 ; +} + +static int rocker_cmd_group_tbl_add (struct rocker *rocker, +struct rocker_port *rocker_port, +struct rocker_desc_info *desc_info, +void *priv) +{ +struct rocker_group_tbl_entry *entry = priv; +struct rocker_tlv *cmd_info; +int err =0 ; + +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_CMD_TYPE , entry->cmd)) +return -EMSGSIZE ; + cmd_info =rocker_tlv_nest_start (desc_info,ROCKER_TLV_CMD_INFO ); +if (!cmd_info) +return -EMSGSIZE ; + +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID , + entry->group_id)) +return -EMSGSIZE ; + +switch (ROCKER_GROUP_TYPE_GET (entry->group_id)) { +case ROCKER_OF_DPA_GROUP_TYPE_L2_INTERFACE : + err =rocker_cmd_group_tbl_add_l2_interface (desc_info, entry); +break ; +case ROCKER_OF_DPA_GROUP_TYPE_L2_REWRITE : + err =rocker_cmd_group_tbl_add_l2_rewrite (desc_info, entry); +break ; +case ROCKER_OF_DPA_GROUP_TYPE_L2_FLOOD : +case ROCKER_OF_DPA_GROUP_TYPE_L2_MCAST : + err =rocker_cmd_group_tbl_add_group_ids (desc_info, entry); +break ; +case ROCKER_OF_DPA_GROUP_TYPE_L3_UCAST : + err =rocker_cmd_group_tbl_add_l3_unicast (desc_info, entry); +break ; +default : + err = -ENOTSUPP ; +break ; + } + +if (err) +return err; + +rocker_tlv_nest_end (desc_info, cmd_info); + +return 0 ; +} + +static int rocker_cmd_group_tbl_del (struct rocker *rocker, +struct rocker_port *rocker_port, +struct rocker_desc_info *desc_info, +void *priv) +{ +const struct rocker_group_tbl_entry *entry = priv; +struct rocker_tlv *cmd_info; + +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_CMD_TYPE , entry->cmd)) +return -EMSGSIZE ; + cmd_info =rocker_tlv_nest_start (desc_info,ROCKER_TLV_CMD_INFO ); +if (!cmd_info) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_OF_DPA_GROUP_ID , + entry->group_id)) +return -EMSGSIZE ; +rocker_tlv_nest_end (desc_info, cmd_info); + +return 0 ; +} + +/***************************************** +* Flow, group, FDB, internal VLAN tables +*****************************************/ + +static int rocker_init_tbls (struct rocker *rocker) +{ +hash_init (rocker->flow_tbl); +spin_lock_init (&rocker->flow_tbl_lock); + +hash_init (rocker->group_tbl); +spin_lock_init (&rocker->group_tbl_lock); + +hash_init (rocker->fdb_tbl); +spin_lock_init (&rocker->fdb_tbl_lock); + +hash_init (rocker->internal_vlan_tbl); +spin_lock_init (&rocker->internal_vlan_tbl_lock); + +return 0 ; +} + +static void rocker_free_tbls (struct rocker *rocker) +{ +unsigned long flags; +struct rocker_flow_tbl_entry *flow_entry; +struct rocker_group_tbl_entry *group_entry; +struct rocker_fdb_tbl_entry *fdb_entry; +struct rocker_internal_vlan_tbl_entry *internal_vlan_entry; +struct hlist_node *tmp; +int bkt; + +spin_lock_irqsave (&rocker->flow_tbl_lock, flags); +hash_for_each_safe (rocker->flow_tbl, bkt, tmp, flow_entry, entry) +hash_del (&flow_entry->entry); +spin_unlock_irqrestore (&rocker->flow_tbl_lock, flags); + +spin_lock_irqsave (&rocker->group_tbl_lock, flags); +hash_for_each_safe (rocker->group_tbl, bkt, tmp, group_entry, entry) +hash_del (&group_entry->entry); +spin_unlock_irqrestore (&rocker->group_tbl_lock, flags); + +spin_lock_irqsave (&rocker->fdb_tbl_lock, flags); +hash_for_each_safe (rocker->fdb_tbl, bkt, tmp, fdb_entry, entry) +hash_del (&fdb_entry->entry); +spin_unlock_irqrestore (&rocker->fdb_tbl_lock, flags); + +spin_lock_irqsave (&rocker->internal_vlan_tbl_lock, flags); +hash_for_each_safe (rocker->internal_vlan_tbl, bkt, + tmp, internal_vlan_entry, entry) +hash_del (&internal_vlan_entry->entry); +spin_unlock_irqrestore (&rocker->internal_vlan_tbl_lock, flags); +} + +static struct rocker_flow_tbl_entry * +rocker_flow_tbl_find (struct rocker *rocker,struct rocker_flow_tbl_entry *match) +{ +struct rocker_flow_tbl_entry *found; + +hash_for_each_possible (rocker->flow_tbl, found, + entry, match->key_crc32) { +if (memcmp (&found->key, &match->key,sizeof (found->key)) ==0 ) +return found; + } + +return NULL ; +} + +static int rocker_flow_tbl_add (struct rocker_port *rocker_port, +struct rocker_flow_tbl_entry *match, +bool nowait) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_flow_tbl_entry *found; +unsigned long flags; +bool add_to_hw = false; +int err =0 ; + + match->key_crc32 =crc32 (~0 , &match->key,sizeof (match->key)); + +spin_lock_irqsave (&rocker->flow_tbl_lock, flags); + + found =rocker_flow_tbl_find (rocker, match); + +if (found) { +kfree (match); + }else { + found = match; + found->cookie = rocker->flow_tbl_next_cookie++; +hash_add (rocker->flow_tbl, &found->entry, found->key_crc32); + add_to_hw = true; + } + + found->ref_count++; + +spin_unlock_irqrestore (&rocker->flow_tbl_lock, flags); + +if (add_to_hw) { + err =rocker_cmd_exec (rocker, rocker_port, + rocker_cmd_flow_tbl_add, + found,NULL ,NULL , nowait); +if (err) { +spin_lock_irqsave (&rocker->flow_tbl_lock, flags); +hash_del (&found->entry); +spin_unlock_irqrestore (&rocker->flow_tbl_lock, flags); +kfree (found); + } + } + +return err; +} + +static int rocker_flow_tbl_del (struct rocker_port *rocker_port, +struct rocker_flow_tbl_entry *match, +bool nowait) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_flow_tbl_entry *found; +unsigned long flags; +bool del_from_hw = false; +int err =0 ; + + match->key_crc32 =crc32 (~0 , &match->key,sizeof (match->key)); + +spin_lock_irqsave (&rocker->flow_tbl_lock, flags); + + found =rocker_flow_tbl_find (rocker, match); + +if (found) { + found->ref_count--; +if (found->ref_count ==0 ) { +hash_del (&found->entry); + del_from_hw = true; + } + } + +spin_unlock_irqrestore (&rocker->flow_tbl_lock, flags); + +kfree (match); + +if (del_from_hw) { + err =rocker_cmd_exec (rocker, rocker_port, + rocker_cmd_flow_tbl_del, + found,NULL ,NULL , nowait); +kfree (found); + } + +return err; +} + +static gfp_t rocker_op_flags_gfp (int flags) +{ +return flags &ROCKER_OP_FLAG_NOWAIT ?GFP_ATOMIC :GFP_KERNEL ; +} + +static int rocker_flow_tbl_do (struct rocker_port *rocker_port, +int flags,struct rocker_flow_tbl_entry *entry) +{ +bool nowait = flags &ROCKER_OP_FLAG_NOWAIT ; + +if (flags &ROCKER_OP_FLAG_REMOVE ) +return rocker_flow_tbl_del (rocker_port, entry, nowait); +else +return rocker_flow_tbl_add (rocker_port, entry, nowait); +} + +static int rocker_flow_tbl_ig_port (struct rocker_port *rocker_port, +int flags,u32 in_lport,u32 in_lport_mask, +enum rocker_of_dpa_table_id goto_tbl) +{ +struct rocker_flow_tbl_entry *entry; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + + entry->key.priority =ROCKER_PRIORITY_IG_PORT ; + entry->key.tbl_id =ROCKER_OF_DPA_TABLE_ID_INGRESS_PORT ; + entry->key.ig_port.in_lport = in_lport; + entry->key.ig_port.in_lport_mask = in_lport_mask; + entry->key.ig_port.goto_tbl = goto_tbl; + +return rocker_flow_tbl_do (rocker_port, flags, entry); +} + +static int rocker_flow_tbl_vlan (struct rocker_port *rocker_port, +int flags,u32 in_lport, +__be16 vlan_id,__be16 vlan_id_mask, +enum rocker_of_dpa_table_id goto_tbl, +bool untagged,__be16 new_vlan_id) +{ +struct rocker_flow_tbl_entry *entry; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + + entry->key.priority =ROCKER_PRIORITY_VLAN ; + entry->key.tbl_id =ROCKER_OF_DPA_TABLE_ID_VLAN ; + entry->key.vlan.in_lport = in_lport; + entry->key.vlan.vlan_id = vlan_id; + entry->key.vlan.vlan_id_mask = vlan_id_mask; + entry->key.vlan.goto_tbl = goto_tbl; + + entry->key.vlan.untagged = untagged; + entry->key.vlan.new_vlan_id = new_vlan_id; + +return rocker_flow_tbl_do (rocker_port, flags, entry); +} + +static int rocker_flow_tbl_term_mac (struct rocker_port *rocker_port, +u32 in_lport,u32 in_lport_mask, +__be16 eth_type,const u8 *eth_dst, +const u8 *eth_dst_mask,__be16 vlan_id, +__be16 vlan_id_mask,bool copy_to_cpu, +int flags) +{ +struct rocker_flow_tbl_entry *entry; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + +if (is_multicast_ether_addr (eth_dst)) { + entry->key.priority =ROCKER_PRIORITY_TERM_MAC_MCAST ; + entry->key.term_mac.goto_tbl = +ROCKER_OF_DPA_TABLE_ID_MULTICAST_ROUTING ; + }else { + entry->key.priority =ROCKER_PRIORITY_TERM_MAC_UCAST ; + entry->key.term_mac.goto_tbl = +ROCKER_OF_DPA_TABLE_ID_UNICAST_ROUTING ; + } + + entry->key.tbl_id =ROCKER_OF_DPA_TABLE_ID_TERMINATION_MAC ; + entry->key.term_mac.in_lport = in_lport; + entry->key.term_mac.in_lport_mask = in_lport_mask; + entry->key.term_mac.eth_type = eth_type; +ether_addr_copy (entry->key.term_mac.eth_dst, eth_dst); +ether_addr_copy (entry->key.term_mac.eth_dst_mask, eth_dst_mask); + entry->key.term_mac.vlan_id = vlan_id; + entry->key.term_mac.vlan_id_mask = vlan_id_mask; + entry->key.term_mac.copy_to_cpu = copy_to_cpu; + +return rocker_flow_tbl_do (rocker_port, flags, entry); +} + +static int rocker_flow_tbl_bridge (struct rocker_port *rocker_port, +int flags, +const u8 *eth_dst,const u8 *eth_dst_mask, +__be16 vlan_id,u32 tunnel_id, +enum rocker_of_dpa_table_id goto_tbl, +u32 group_id,bool copy_to_cpu) +{ +struct rocker_flow_tbl_entry *entry; +u32 priority; +bool vlan_bridging = !!vlan_id; +bool dflt = !eth_dst || (eth_dst && eth_dst_mask); +bool wild = false; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + + entry->key.tbl_id =ROCKER_OF_DPA_TABLE_ID_BRIDGING ; + +if (eth_dst) { + entry->key.bridge.has_eth_dst =1 ; +ether_addr_copy (entry->key.bridge.eth_dst, eth_dst); + } +if (eth_dst_mask) { + entry->key.bridge.has_eth_dst_mask =1 ; +ether_addr_copy (entry->key.bridge.eth_dst_mask, eth_dst_mask); +if (memcmp (eth_dst_mask, ff_mac,ETH_ALEN )) + wild = true; + } + + priority =ROCKER_PRIORITY_UNKNOWN ; +if (vlan_bridging & dflt & wild) + priority =ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD ; +else if (vlan_bridging & dflt & !wild) + priority =ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT ; +else if (vlan_bridging & !dflt) + priority =ROCKER_PRIORITY_BRIDGING_VLAN ; +else if (!vlan_bridging & dflt & wild) + priority =ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD ; +else if (!vlan_bridging & dflt & !wild) + priority =ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT ; +else if (!vlan_bridging & !dflt) + priority =ROCKER_PRIORITY_BRIDGING_TENANT ; + + entry->key.priority = priority; + entry->key.bridge.vlan_id = vlan_id; + entry->key.bridge.tunnel_id = tunnel_id; + entry->key.bridge.goto_tbl = goto_tbl; + entry->key.bridge.group_id = group_id; + entry->key.bridge.copy_to_cpu = copy_to_cpu; + +return rocker_flow_tbl_do (rocker_port, flags, entry); +} + +static int rocker_flow_tbl_acl (struct rocker_port *rocker_port, +int flags,u32 in_lport, +u32 in_lport_mask, +const u8 *eth_src,const u8 *eth_src_mask, +const u8 *eth_dst,const u8 *eth_dst_mask, +__be16 eth_type, +__be16 vlan_id,__be16 vlan_id_mask, +u8 ip_proto,u8 ip_proto_mask, +u8 ip_tos,u8 ip_tos_mask, +u32 group_id) +{ +u32 priority; +struct rocker_flow_tbl_entry *entry; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + + priority =ROCKER_PRIORITY_ACL_NORMAL ; +if (eth_dst && eth_dst_mask) { +if (memcmp (eth_dst_mask, mcast_mac,ETH_ALEN ) ==0 ) + priority =ROCKER_PRIORITY_ACL_DFLT ; +else if (is_link_local_ether_addr (eth_dst)) + priority =ROCKER_PRIORITY_ACL_CTRL ; + } + + entry->key.priority = priority; + entry->key.tbl_id =ROCKER_OF_DPA_TABLE_ID_ACL_POLICY ; + entry->key.acl.in_lport = in_lport; + entry->key.acl.in_lport_mask = in_lport_mask; + +if (eth_src) +ether_addr_copy (entry->key.acl.eth_src, eth_src); +if (eth_src_mask) +ether_addr_copy (entry->key.acl.eth_src_mask, eth_src_mask); +if (eth_dst) +ether_addr_copy (entry->key.acl.eth_dst, eth_dst); +if (eth_dst_mask) +ether_addr_copy (entry->key.acl.eth_dst_mask, eth_dst_mask); + + entry->key.acl.eth_type = eth_type; + entry->key.acl.vlan_id = vlan_id; + entry->key.acl.vlan_id_mask = vlan_id_mask; + entry->key.acl.ip_proto = ip_proto; + entry->key.acl.ip_proto_mask = ip_proto_mask; + entry->key.acl.ip_tos = ip_tos; + entry->key.acl.ip_tos_mask = ip_tos_mask; + entry->key.acl.group_id = group_id; + +return rocker_flow_tbl_do (rocker_port, flags, entry); +} + +static struct rocker_group_tbl_entry * +rocker_group_tbl_find (struct rocker *rocker, +struct rocker_group_tbl_entry *match) +{ +struct rocker_group_tbl_entry *found; + +hash_for_each_possible (rocker->group_tbl, found, + entry, match->group_id) { +if (found->group_id == match->group_id) +return found; + } + +return NULL ; +} + +static void rocker_group_tbl_entry_free (struct rocker_group_tbl_entry *entry) +{ +switch (ROCKER_GROUP_TYPE_GET (entry->group_id)) { +case ROCKER_OF_DPA_GROUP_TYPE_L2_FLOOD : +case ROCKER_OF_DPA_GROUP_TYPE_L2_MCAST : +kfree (entry->group_ids); +break ; +default : +break ; + } +kfree (entry); +} + +static int rocker_group_tbl_add (struct rocker_port *rocker_port, +struct rocker_group_tbl_entry *match, +bool nowait) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_group_tbl_entry *found; +unsigned long flags; +int err =0 ; + +spin_lock_irqsave (&rocker->group_tbl_lock, flags); + + found =rocker_group_tbl_find (rocker, match); + +if (found) { +hash_del (&found->entry); +rocker_group_tbl_entry_free (found); + found = match; + found->cmd =ROCKER_TLV_CMD_TYPE_OF_DPA_GROUP_MOD ; + }else { + found = match; + found->cmd =ROCKER_TLV_CMD_TYPE_OF_DPA_GROUP_ADD ; + } + +hash_add (rocker->group_tbl, &found->entry, found->group_id); + +spin_unlock_irqrestore (&rocker->group_tbl_lock, flags); + +if (found->cmd) + err =rocker_cmd_exec (rocker, rocker_port, + rocker_cmd_group_tbl_add, + found,NULL ,NULL , nowait); + +return err; +} + +static int rocker_group_tbl_del (struct rocker_port *rocker_port, +struct rocker_group_tbl_entry *match, +bool nowait) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_group_tbl_entry *found; +unsigned long flags; +int err =0 ; + +spin_lock_irqsave (&rocker->group_tbl_lock, flags); + + found =rocker_group_tbl_find (rocker, match); + +if (found) { +hash_del (&found->entry); + found->cmd =ROCKER_TLV_CMD_TYPE_OF_DPA_GROUP_DEL ; + } + +spin_unlock_irqrestore (&rocker->group_tbl_lock, flags); + +rocker_group_tbl_entry_free (match); + +if (found) { + err =rocker_cmd_exec (rocker, rocker_port, + rocker_cmd_group_tbl_del, + found,NULL ,NULL , nowait); +rocker_group_tbl_entry_free (found); + } + +return err; +} + +static int rocker_group_tbl_do (struct rocker_port *rocker_port, +int flags,struct rocker_group_tbl_entry *entry) +{ +bool nowait = flags &ROCKER_OP_FLAG_NOWAIT ; + +if (flags &ROCKER_OP_FLAG_REMOVE ) +return rocker_group_tbl_del (rocker_port, entry, nowait); +else +return rocker_group_tbl_add (rocker_port, entry, nowait); +} + +static int rocker_group_l2_interface (struct rocker_port *rocker_port, +int flags,__be16 vlan_id, +u32 out_lport,int pop_vlan) +{ +struct rocker_group_tbl_entry *entry; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + + entry->group_id =ROCKER_GROUP_L2_INTERFACE (vlan_id, out_lport); + entry->l2_interface.pop_vlan = pop_vlan; + +return rocker_group_tbl_do (rocker_port, flags, entry); +} + +static int rocker_group_l2_fan_out (struct rocker_port *rocker_port, +int flags,u8 group_count, +u32 *group_ids,u32 group_id) +{ +struct rocker_group_tbl_entry *entry; + + entry =kzalloc (sizeof (*entry),rocker_op_flags_gfp (flags)); +if (!entry) +return -ENOMEM ; + + entry->group_id = group_id; + entry->group_count = group_count; + + entry->group_ids =kcalloc (group_count,sizeof (u32), +rocker_op_flags_gfp (flags)); +if (!entry->group_ids) { +kfree (entry); +return -ENOMEM ; + } +memcpy (entry->group_ids, group_ids, group_count *sizeof (u32)); + +return rocker_group_tbl_do (rocker_port, flags, entry); +} + +static int rocker_group_l2_flood (struct rocker_port *rocker_port, +int flags,__be16 vlan_id, +u8 group_count,u32 *group_ids, +u32 group_id) +{ +return rocker_group_l2_fan_out (rocker_port, flags, + group_count, group_ids, + group_id); +} + +static struct rocker_ctrl { +const u8 *eth_dst; +const u8 *eth_dst_mask; +u16 eth_type; +bool acl; +bool bridge; +bool term; +bool copy_to_cpu; +} rocker_ctrls[] = { + [ROCKER_CTRL_LINK_LOCAL_MCAST ] = { +/* pass link local multicast pkts up to CPU for filtering */ + .eth_dst = ll_mac, + .eth_dst_mask = ll_mask, + .acl = true, + }, + [ROCKER_CTRL_LOCAL_ARP ] = { +/* pass local ARP pkts up to CPU */ + .eth_dst = zero_mac, + .eth_dst_mask = zero_mac, + .eth_type =htons (ETH_P_ARP ), + .acl = true, + }, + [ROCKER_CTRL_IPV4_MCAST ] = { +/* pass IPv4 mcast pkts up to CPU, RFC 1112 */ + .eth_dst = ipv4_mcast, + .eth_dst_mask = ipv4_mask, + .eth_type =htons (ETH_P_IP ), + .term = true, + .copy_to_cpu = true, + }, + [ROCKER_CTRL_IPV6_MCAST ] = { +/* pass IPv6 mcast pkts up to CPU, RFC 2464 */ + .eth_dst = ipv6_mcast, + .eth_dst_mask = ipv6_mask, + .eth_type =htons (ETH_P_IPV6 ), + .term = true, + .copy_to_cpu = true, + }, + [ROCKER_CTRL_DFLT_BRIDGING ] = { +/* flood any pkts on vlan */ + .bridge = true, + .copy_to_cpu = true, + }, +}; + +static int rocker_port_ctrl_vlan_acl (struct rocker_port *rocker_port, +int flags,struct rocker_ctrl *ctrl, +__be16 vlan_id) +{ +u32 in_lport = rocker_port->lport; +u32 in_lport_mask =0xffffffff ; +u32 out_lport =0 ; +u8 *eth_src =NULL ; +u8 *eth_src_mask =NULL ; +__be16 vlan_id_mask =htons (0xffff ); +u8 ip_proto =0 ; +u8 ip_proto_mask =0 ; +u8 ip_tos =0 ; +u8 ip_tos_mask =0 ; +u32 group_id =ROCKER_GROUP_L2_INTERFACE (vlan_id, out_lport); +int err; + + err =rocker_flow_tbl_acl (rocker_port, flags, + in_lport, in_lport_mask, + eth_src, eth_src_mask, + ctrl->eth_dst, ctrl->eth_dst_mask, + ctrl->eth_type, + vlan_id, vlan_id_mask, + ip_proto, ip_proto_mask, + ip_tos, ip_tos_mask, + group_id); + +if (err) +netdev_err (rocker_port->dev,"Error (%d) ctrl ACL\n" , err); + +return err; +} + +static int rocker_port_ctrl_vlan_term (struct rocker_port *rocker_port, +int flags,struct rocker_ctrl *ctrl, +__be16 vlan_id) +{ +u32 in_lport_mask =0xffffffff ; +__be16 vlan_id_mask =htons (0xffff ); +int err; + +if (ntohs (vlan_id) ==0 ) + vlan_id = rocker_port->internal_vlan_id; + + err =rocker_flow_tbl_term_mac (rocker_port, + rocker_port->lport, in_lport_mask, + ctrl->eth_type, ctrl->eth_dst, + ctrl->eth_dst_mask, vlan_id, + vlan_id_mask, ctrl->copy_to_cpu, + flags); + +if (err) +netdev_err (rocker_port->dev,"Error (%d) ctrl term\n" , err); + +return err; +} + +static int rocker_port_ctrl_vlan (struct rocker_port *rocker_port,int flags, +struct rocker_ctrl *ctrl,__be16 vlan_id) +{ +if (ctrl->acl) +return rocker_port_ctrl_vlan_acl (rocker_port, flags, + ctrl, vlan_id); + +if (ctrl->term) +return rocker_port_ctrl_vlan_term (rocker_port, flags, + ctrl, vlan_id); + +return -EOPNOTSUPP ; +} + +static int rocker_port_ctrl_vlan_add (struct rocker_port *rocker_port, +int flags,__be16 vlan_id) +{ +int err =0 ; +int i; + +for (i =0 ; i <ROCKER_CTRL_MAX ; i++) { +if (rocker_port->ctrls[i]) { + err =rocker_port_ctrl_vlan (rocker_port, flags, + &rocker_ctrls[i], vlan_id); +if (err) +return err; + } + } + +return err; +} + +static int rocker_port_ctrl (struct rocker_port *rocker_port,int flags, +struct rocker_ctrl *ctrl) +{ +u16 vid; +int err =0 ; + +for (vid =1 ; vid <VLAN_N_VID ; vid++) { +if (!test_bit (vid, rocker_port->vlan_bitmap)) +continue ; + err =rocker_port_ctrl_vlan (rocker_port, flags, + ctrl,htons (vid)); +if (err) +break ; + } + +return err; +} + +static int rocker_port_ig_tbl (struct rocker_port *rocker_port,int flags) +{ +enum rocker_of_dpa_table_id goto_tbl; +u32 in_lport; +u32 in_lport_mask; +int err; + +/* Normal Ethernet Frames. Matches pkts from any local physical +* ports. Goto VLAN tbl. +*/ + + in_lport =0 ; + in_lport_mask =0xffff0000 ; + goto_tbl =ROCKER_OF_DPA_TABLE_ID_VLAN ; + + err =rocker_flow_tbl_ig_port (rocker_port, flags, + in_lport, in_lport_mask, + goto_tbl); +if (err) +netdev_err (rocker_port->dev, +"Error (%d) ingress port table entry\n" , err); + +return err; +} + +static int rocker_port_router_mac (struct rocker_port *rocker_port, +int flags,__be16 vlan_id) +{ +u32 in_lport_mask =0xffffffff ; +__be16 eth_type; +const u8 *dst_mac_mask = ff_mac; +__be16 vlan_id_mask =htons (0xffff ); +bool copy_to_cpu = false; +int err; + +if (ntohs (vlan_id) ==0 ) + vlan_id = rocker_port->internal_vlan_id; + + eth_type =htons (ETH_P_IP ); + err =rocker_flow_tbl_term_mac (rocker_port, + rocker_port->lport, in_lport_mask, + eth_type, rocker_port->dev->dev_addr, + dst_mac_mask, vlan_id, vlan_id_mask, + copy_to_cpu, flags); +if (err) +return err; + + eth_type =htons (ETH_P_IPV6 ); + err =rocker_flow_tbl_term_mac (rocker_port, + rocker_port->lport, in_lport_mask, + eth_type, rocker_port->dev->dev_addr, + dst_mac_mask, vlan_id, vlan_id_mask, + copy_to_cpu, flags); + +return err; +} + +static struct rocker_internal_vlan_tbl_entry * +rocker_internal_vlan_tbl_find (struct rocker *rocker,int ifindex) +{ +struct rocker_internal_vlan_tbl_entry *found; + +hash_for_each_possible (rocker->internal_vlan_tbl, found, + entry, ifindex) { +if (found->ifindex == ifindex) +return found; + } + +return NULL ; +} + +static __be16 rocker_port_internal_vlan_id_get (struct rocker_port *rocker_port, +int ifindex) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_internal_vlan_tbl_entry *entry; +struct rocker_internal_vlan_tbl_entry *found; +unsigned long lock_flags; +int i; + + entry =kzalloc (sizeof (*entry),GFP_KERNEL ); +if (!entry) +return 0 ; + + entry->ifindex = ifindex; + +spin_lock_irqsave (&rocker->internal_vlan_tbl_lock, lock_flags); + + found =rocker_internal_vlan_tbl_find (rocker, ifindex); +if (found) { +kfree (entry); + goto found; + } + + found = entry; +hash_add (rocker->internal_vlan_tbl, &found->entry, found->ifindex); + +for (i =0 ; i <ROCKER_N_INTERNAL_VLANS ; i++) { +if (test_and_set_bit (i, rocker->internal_vlan_bitmap)) +continue ; + found->vlan_id =htons (ROCKER_INTERNAL_VLAN_ID_BASE + i); + goto found; + } + +netdev_err (rocker_port->dev,"Out of internal VLAN IDs\n" ); + +found: + found->ref_count++; +spin_unlock_irqrestore (&rocker->internal_vlan_tbl_lock, lock_flags); + +return found->vlan_id; +} + +static void rocker_port_internal_vlan_id_put (struct rocker_port *rocker_port, +int ifindex) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_internal_vlan_tbl_entry *found; +unsigned long lock_flags; +unsigned long bit; + +spin_lock_irqsave (&rocker->internal_vlan_tbl_lock, lock_flags); + + found =rocker_internal_vlan_tbl_find (rocker, ifindex); +if (!found) { +netdev_err (rocker_port->dev, +"ifindex (%d) not found in internal VLAN tbl\n" , + ifindex); + goto not_found; + } + +if (--found->ref_count <=0 ) { + bit =ntohs (found->vlan_id) -ROCKER_INTERNAL_VLAN_ID_BASE ; +clear_bit (bit, rocker->internal_vlan_bitmap); +hash_del (&found->entry); +kfree (found); + } + +not_found: +spin_unlock_irqrestore (&rocker->internal_vlan_tbl_lock, lock_flags); +} +/***************** * Net device ops *****************/
@@ -1768,10 +3210,14 @@ static void rocker_carrier_init(struct rocker_port *rocker_port)static void rocker_remove_ports (struct rocker *rocker) { +struct rocker_port *rocker_port;int i; -for (i =0 ; i < rocker->port_count; i++) -unregister_netdev (rocker->ports[i]->dev); +for (i =0 ; i < rocker->port_count; i++) { + rocker_port = rocker->ports[i]; +rocker_port_ig_tbl (rocker_port,ROCKER_OP_FLAG_REMOVE ); +unregister_netdev (rocker_port->dev); + }kfree (rocker->ports); }
@@ -1823,8 +3269,18 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) } rocker->ports[port_number] = rocker_port; + rocker_port->internal_vlan_id = +rocker_port_internal_vlan_id_get (rocker_port, dev->ifindex); + err =rocker_port_ig_tbl (rocker_port,0 ); +if (err) { +dev_err (&pdev->dev,"install ig port table failed\n" ); + goto err_port_ig_tbl; + } +return 0 ; +err_port_ig_tbl: +unregister_netdev (dev); err_register_netdev:free_netdev (dev);return err;
@@ -1981,6 +3437,12 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id) rocker->hw.id =rocker_read64 (rocker,SWITCH_ID ); + err =rocker_init_tbls (rocker); +if (err) { +dev_err (&pdev->dev,"cannot init rocker tables\n" ); + goto err_init_tbls; + } + err =rocker_probe_ports (rocker);if (err) {dev_err (&pdev->dev,"failed to probe ports\n" );
@@ -1992,6 +3454,8 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; err_probe_ports: +rocker_free_tbls (rocker); +err_init_tbls:free_irq (rocker_msix_vector (rocker,ROCKER_MSIX_VEC_EVENT ), rocker); err_request_event_irq:free_irq (rocker_msix_vector (rocker,ROCKER_MSIX_VEC_CMD ), rocker);
@@ -2017,6 +3481,7 @@ static void rocker_remove(struct pci_dev *pdev) {struct rocker *rocker =pci_get_drvdata (pdev); +rocker_free_tbls (rocker);rocker_write32 (rocker,CONTROL ,ROCKER_CONTROL_RESET );rocker_remove_ports (rocker);free_irq (rocker_msix_vector (rocker,ROCKER_MSIX_VEC_EVENT ), rocker);
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 17/21 rocker: implement L2 bridge offloading
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
Add L2 bridge offloading support to rocker driver. Here, the Linux bridge driver is used to collect swdev ports into a tagged (or untagged) VLAN bridge. The switchdev will offload from the bridge driver the following L2 bridging functions:
- Learning of neighbor MAC addresses on VLAN X Learned mac/vlan is
installed in bridge FDB. (And removed when device unlearns mac/vlan). Learning must be turned off on each bridge port to disable the feature in the bridge driver.
- Flooding of multicast/broadcast and unknown unicast pkts to (STP) active ports in bridge. The bridge driver is unaware of the flooding happening at the device level. Flooding must be turned off on each bridge port to disable the feature on the bridge driver.
- STP port state is pushed down to driver/device. The bridge still processes STP BDPUs and maintains port STP state (for all VLANs in bridge), but the driver/device must be notified of port STP state change to program the device.
Multiple (VLAN) bridges are supported. The device (implemented per the OF-DPA spec) must use a portion of the VLAN namespace for internal VLANs. Right now, the upper 255 VLANs (0xf00 to 0xffe) are used as internal VLAN IDs for untagged traffic and are not available as port VLANs.
The driver uses the following interfaces:
1. To track VLAN add/del on ports in bridge:
.ndo_vlan_rx_add_vid
.ndo_vlan_rx_kill_vid
2. To track port add/del membership in bridge:
NETDEV_CHANGEUPPER netdevice notifier
3. To catch static FDB entries installed on bridge/vlan by user using netlink:
.ndo_fdb_add
.ndo_fdb_del
4. To be notified on port STP state change:
.ndo_switch_port_stp_update
5. To notify bridge driver on learned/forgotten mac/vlans on bridge port:
br_fdb_external_learn_addbr_fdb_external_learn_del
---v3->v4:
-no changev2->v3:
-use renamed br_fdb learn functions
-use ndo_fdb_add/del ops instead on new ones
-pass rocker_port struct to rocker_port_stp_update instead of net_device -allow device to refresh existing learned FDB entries to keep aging
timers activev1->v2:
-no change
--- drivers/net/ethernet/rocker/rocker.c | 670 ++++++++++++++++++++++++++++++++++- 1 file changed, 669 insertions(+), 1 deletion(-)
drivers/net/ethernet/rocker/rocker.c +669 -1
@@ -28,6 +28,7 @@#include <linux/ethtool.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> +#include <linux/if_bridge.h> #include <linux/bitops.h> #include <net/switchdev.h> #include <net/rtnetlink.h>
@@ -196,10 +197,12 @@ enum {struct rocker_port {struct net_device *dev; +struct net_device *bridge_dev;struct rocker *rocker;unsigned int port_number;u32 lport;__be16 internal_vlan_id; +int stp_state;bool ctrls[ROCKER_CTRL_MAX ];unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN ];struct napi_struct napi_tx;
@@ -290,6 +293,20 @@ static __be16 rocker_port_vid_to_vlan(struct rocker_port *rocker_port,return vlan_id; } +static u16 rocker_port_vlan_to_vid (struct rocker_port *rocker_port, +__be16 vlan_id) +{ +if (rocker_vlan_id_is_internal (vlan_id)) +return 0 ; + +return ntohs (vlan_id); +} + +static bool rocker_port_is_bridged (struct rocker_port *rocker_port) +{ +return !!rocker_port->bridge_dev; +} +struct rocker_wait {wait_queue_head_t wait;bool done;
@@ -1301,6 +1318,43 @@ static int rocker_event_link_change(struct rocker *rocker,#define ROCKER_OP_FLAG_REMOVE BIT(0)#define ROCKER_OP_FLAG_NOWAIT BIT(1)#define ROCKER_OP_FLAG_LEARNED BIT(2) +#define ROCKER_OP_FLAG_REFRESH BIT(3) + +static int rocker_port_fdb (struct rocker_port *rocker_port, +const unsigned char *addr, +__be16 vlan_id,int flags); + +static int rocker_event_mac_vlan_seen (struct rocker *rocker, +const struct rocker_tlv *info) +{ +struct rocker_tlv *attrs[ROCKER_TLV_EVENT_MAC_VLAN_MAX +1 ]; +unsigned int port_number; +struct rocker_port *rocker_port; +unsigned char *addr; +int flags =ROCKER_OP_FLAG_NOWAIT |ROCKER_OP_FLAG_LEARNED ; +__be16 vlan_id; + +rocker_tlv_parse_nested (attrs,ROCKER_TLV_EVENT_MAC_VLAN_MAX , info); +if (!attrs[ROCKER_TLV_EVENT_MAC_VLAN_LPORT ] || + !attrs[ROCKER_TLV_EVENT_MAC_VLAN_MAC ] || + !attrs[ROCKER_TLV_EVENT_MAC_VLAN_VLAN_ID ]) +return -EIO ; + port_number = +rocker_tlv_get_u32 (attrs[ROCKER_TLV_EVENT_MAC_VLAN_LPORT ]) -1 ; + addr =rocker_tlv_data (attrs[ROCKER_TLV_EVENT_MAC_VLAN_MAC ]); + vlan_id =rocker_tlv_get_u16 (attrs[ROCKER_TLV_EVENT_MAC_VLAN_VLAN_ID ]); + +if (port_number >= rocker->port_count) +return -EINVAL ; + + rocker_port = rocker->ports[port_number]; + +if (rocker_port->stp_state !=BR_STATE_LEARNING && + rocker_port->stp_state !=BR_STATE_FORWARDING ) +return 0 ; + +return rocker_port_fdb (rocker_port, addr, vlan_id, flags); +}static int rocker_event_process (struct rocker *rocker,struct rocker_desc_info *desc_info)
@@ -1320,6 +1374,8 @@ static int rocker_event_process(struct rocker *rocker,switch (type) {case ROCKER_TLV_EVENT_TYPE_LINK_CHANGED :return rocker_event_link_change (rocker, info); +case ROCKER_TLV_EVENT_TYPE_MAC_VLAN_SEEN : +return rocker_event_mac_vlan_seen (rocker, info); }return -EOPNOTSUPP ;
@@ -2547,6 +2603,104 @@ static int rocker_group_l2_flood(struct rocker_port *rocker_port, group_id); } +static int rocker_port_vlan_flood_group (struct rocker_port *rocker_port, +int flags,__be16 vlan_id) +{ +struct rocker_port *p; +struct rocker *rocker = rocker_port->rocker; +u32 group_id =ROCKER_GROUP_L2_FLOOD (vlan_id,0 ); +u32 group_ids[rocker->port_count]; +u8 group_count =0 ; +int err; +int i; + +/* Adjust the flood group for this VLAN. The flood group +* references an L2 interface group for each port in this +* VLAN. +*/ + +for (i =0 ; i < rocker->port_count; i++) { + p = rocker->ports[i]; +if (!rocker_port_is_bridged (p)) +continue ; +if (test_bit (ntohs (vlan_id), p->vlan_bitmap)) { + group_ids[group_count++] = +ROCKER_GROUP_L2_INTERFACE (vlan_id, + p->lport); + } + } + +/* If there are no bridged ports in this VLAN, we're done */ +if (group_count ==0 ) +return 0 ; + + err =rocker_group_l2_flood (rocker_port, flags, vlan_id, + group_count, group_ids, + group_id); +if (err) +netdev_err (rocker_port->dev, +"Error (%d) port VLAN l2 flood group\n" , err); + +return err; +} + +static int rocker_port_vlan_l2_groups (struct rocker_port *rocker_port, +int flags,__be16 vlan_id, +bool pop_vlan) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_port *p; +bool adding = !(flags &ROCKER_OP_FLAG_REMOVE ); +u32 out_lport; +int ref =0 ; +int err; +int i; + +/* An L2 interface group for this port in this VLAN, but +* only when port STP state is LEARNING|FORWARDING. +*/ + +if (rocker_port->stp_state ==BR_STATE_LEARNING || + rocker_port->stp_state ==BR_STATE_FORWARDING ) { + out_lport = rocker_port->lport; + err =rocker_group_l2_interface (rocker_port, flags, + vlan_id, out_lport, + pop_vlan); +if (err) { +netdev_err (rocker_port->dev, +"Error (%d) port VLAN l2 group for lport %d\n" , + err, out_lport); +return err; + } + } + +/* An L2 interface group for this VLAN to CPU port. +* Add when first port joins this VLAN and destroy when +* last port leaves this VLAN. +*/ + +for (i =0 ; i < rocker->port_count; i++) { + p = rocker->ports[i]; +if (test_bit (ntohs (vlan_id), p->vlan_bitmap)) + ref++; + } + +if ((!adding || ref !=1 ) && (adding || ref !=0 )) +return 0 ; + + out_lport =0 ; + err =rocker_group_l2_interface (rocker_port, flags, + vlan_id, out_lport, + pop_vlan); +if (err) { +netdev_err (rocker_port->dev, +"Error (%d) port VLAN l2 group for CPU port\n" , err); +return err; + } + +return 0 ; +} + static struct rocker_ctrl { const u8 *eth_dst; const u8 *eth_dst_mask;
@@ -2625,6 +2779,30 @@ static int rocker_port_ctrl_vlan_acl(struct rocker_port *rocker_port,return err; } +static int rocker_port_ctrl_vlan_bridge (struct rocker_port *rocker_port, +int flags,struct rocker_ctrl *ctrl, +__be16 vlan_id) +{ +enum rocker_of_dpa_table_id goto_tbl = +ROCKER_OF_DPA_TABLE_ID_ACL_POLICY ; +u32 group_id =ROCKER_GROUP_L2_FLOOD (vlan_id,0 ); +u32 tunnel_id =0 ; +int err; + +if (!rocker_port_is_bridged (rocker_port)) +return 0 ; + + err =rocker_flow_tbl_bridge (rocker_port, flags, + ctrl->eth_dst, ctrl->eth_dst_mask, + vlan_id, tunnel_id, + goto_tbl, group_id, ctrl->copy_to_cpu); + +if (err) +netdev_err (rocker_port->dev,"Error (%d) ctrl FLOOD\n" , err); + +return err; +} +static int rocker_port_ctrl_vlan_term (struct rocker_port *rocker_port,int flags,struct rocker_ctrl *ctrl,__be16 vlan_id)
@@ -2655,6 +2833,9 @@ static int rocker_port_ctrl_vlan(struct rocker_port *rocker_port, int flags,if (ctrl->acl)return rocker_port_ctrl_vlan_acl (rocker_port, flags, ctrl, vlan_id); +if (ctrl->bridge) +return rocker_port_ctrl_vlan_bridge (rocker_port, flags, + ctrl, vlan_id);if (ctrl->term) return rocker_port_ctrl_vlan_term(rocker_port, flags,
@@ -2699,6 +2880,64 @@ static int rocker_port_ctrl(struct rocker_port *rocker_port, int flags,return err; } +static int rocker_port_vlan (struct rocker_port *rocker_port,int flags, +u16 vid) +{ +enum rocker_of_dpa_table_id goto_tbl = +ROCKER_OF_DPA_TABLE_ID_TERMINATION_MAC ; +u32 in_lport = rocker_port->lport; +__be16 vlan_id =htons (vid); +__be16 vlan_id_mask =htons (0xffff ); +__be16 internal_vlan_id; +bool untagged; +bool adding = !(flags &ROCKER_OP_FLAG_REMOVE ); +int err; + + internal_vlan_id =rocker_port_vid_to_vlan (rocker_port, vid, &untagged); + +if (adding &&test_and_set_bit (ntohs (internal_vlan_id), + rocker_port->vlan_bitmap)) +return 0 ;/* already added */ +else if (!adding && !test_and_clear_bit (ntohs (internal_vlan_id), + rocker_port->vlan_bitmap)) +return 0 ;/* already removed */ + +if (adding) { + err =rocker_port_ctrl_vlan_add (rocker_port, flags, + internal_vlan_id); +if (err) { +netdev_err (rocker_port->dev, +"Error (%d) port ctrl vlan add\n" , err); +return err; + } + } + + err =rocker_port_vlan_l2_groups (rocker_port, flags, + internal_vlan_id, untagged); +if (err) { +netdev_err (rocker_port->dev, +"Error (%d) port VLAN l2 groups\n" , err); +return err; + } + + err =rocker_port_vlan_flood_group (rocker_port, flags, + internal_vlan_id); +if (err) { +netdev_err (rocker_port->dev, +"Error (%d) port VLAN l2 flood group\n" , err); +return err; + } + + err =rocker_flow_tbl_vlan (rocker_port, flags, + in_lport, vlan_id, vlan_id_mask, + goto_tbl, untagged, internal_vlan_id); +if (err) +netdev_err (rocker_port->dev, +"Error (%d) port VLAN table\n" , err); + +return err; +} +static int rocker_port_ig_tbl (struct rocker_port *rocker_port,int flags) {enum rocker_of_dpa_table_id goto_tbl;
@@ -2724,6 +2963,163 @@ static int rocker_port_ig_tbl(struct rocker_port *rocker_port, int flags)return err; } +struct rocker_fdb_learn_work { +struct work_struct work; +struct net_device *dev; +int flags; +u8 addr[ETH_ALEN ]; +u16 vid; +}; + +static void rocker_port_fdb_learn_work (struct work_struct *work) +{ +struct rocker_fdb_learn_work *lw = + container_of(work, struct rocker_fdb_learn_work, work); +bool removing = (lw->flags &ROCKER_OP_FLAG_REMOVE ); +bool learned = (lw->flags &ROCKER_OP_FLAG_LEARNED ); + +if (learned & removing) +br_fdb_external_learn_del (lw->dev, lw->addr, lw->vid); +else if (learned & !removing) +br_fdb_external_learn_add (lw->dev, lw->addr, lw->vid); + +kfree (work); +} + +static int rocker_port_fdb_learn (struct rocker_port *rocker_port, +int flags,const u8 *addr,__be16 vlan_id) +{ +struct rocker_fdb_learn_work *lw; +enum rocker_of_dpa_table_id goto_tbl = +ROCKER_OF_DPA_TABLE_ID_ACL_POLICY ; +u32 out_lport = rocker_port->lport; +u32 tunnel_id =0 ; +u32 group_id =ROCKER_GROUP_NONE ; +bool copy_to_cpu = false; +int err; + +if (rocker_port_is_bridged (rocker_port)) + group_id =ROCKER_GROUP_L2_INTERFACE (vlan_id, out_lport); + +if (!(flags &ROCKER_OP_FLAG_REFRESH )) { + err =rocker_flow_tbl_bridge (rocker_port, flags, addr,NULL , + vlan_id, tunnel_id, goto_tbl, + group_id, copy_to_cpu); +if (err) +return err; + } + +if (!rocker_port_is_bridged (rocker_port)) +return 0 ; + + lw =kmalloc (sizeof (*lw),rocker_op_flags_gfp (flags)); +if (!lw) +return -ENOMEM ; + +INIT_WORK (&lw->work, rocker_port_fdb_learn_work); + + lw->dev = rocker_port->dev; + lw->flags = flags; +ether_addr_copy (lw->addr, addr); + lw->vid =rocker_port_vlan_to_vid (rocker_port, vlan_id); + +schedule_work (&lw->work); + +return 0 ; +} + +static struct rocker_fdb_tbl_entry * +rocker_fdb_tbl_find (struct rocker *rocker,struct rocker_fdb_tbl_entry *match) +{ +struct rocker_fdb_tbl_entry *found; + +hash_for_each_possible (rocker->fdb_tbl, found, entry, match->key_crc32) +if (memcmp (&found->key, &match->key,sizeof (found->key)) ==0 ) +return found; + +return NULL ; +} + +static int rocker_port_fdb (struct rocker_port *rocker_port, +const unsigned char *addr, +__be16 vlan_id,int flags) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_fdb_tbl_entry *fdb; +struct rocker_fdb_tbl_entry *found; +bool removing = (flags &ROCKER_OP_FLAG_REMOVE ); +unsigned long lock_flags; + + fdb =kzalloc (sizeof (*fdb),rocker_op_flags_gfp (flags)); +if (!fdb) +return -ENOMEM ; + + fdb->learned = (flags &ROCKER_OP_FLAG_LEARNED ); + fdb->key.lport = rocker_port->lport; +ether_addr_copy (fdb->key.addr, addr); + fdb->key.vlan_id = vlan_id; + fdb->key_crc32 =crc32 (~0 , &fdb->key,sizeof (fdb->key)); + +spin_lock_irqsave (&rocker->fdb_tbl_lock, lock_flags); + + found =rocker_fdb_tbl_find (rocker, fdb); + +if (removing && found) { +kfree (fdb); +hash_del (&found->entry); + }else if (!removing && !found) { +hash_add (rocker->fdb_tbl, &fdb->entry, fdb->key_crc32); + } + +spin_unlock_irqrestore (&rocker->fdb_tbl_lock, lock_flags); + +/* Check if adding and already exists, or removing and can't find */ +if (!found != !removing) { +kfree (fdb); +if (!found && removing) +return 0 ; +/* Refreshing existing to update aging timers */ + flags |=ROCKER_OP_FLAG_REFRESH ; + } + +return rocker_port_fdb_learn (rocker_port, flags, addr, vlan_id); +} + +static int rocker_port_fdb_flush (struct rocker_port *rocker_port) +{ +struct rocker *rocker = rocker_port->rocker; +struct rocker_fdb_tbl_entry *found; +unsigned long lock_flags; +int flags =ROCKER_OP_FLAG_NOWAIT |ROCKER_OP_FLAG_REMOVE ; +struct hlist_node *tmp; +int bkt; +int err =0 ; + +if (rocker_port->stp_state ==BR_STATE_LEARNING || + rocker_port->stp_state ==BR_STATE_FORWARDING ) +return 0 ; + +spin_lock_irqsave (&rocker->fdb_tbl_lock, lock_flags); + +hash_for_each_safe (rocker->fdb_tbl, bkt, tmp, found, entry) { +if (found->key.lport != rocker_port->lport) +continue ; +if (!found->learned) +continue ; + err =rocker_port_fdb_learn (rocker_port, flags, + found->key.addr, + found->key.vlan_id); +if (err) + goto err_out; +hash_del (&found->entry); + } + +err_out: +spin_unlock_irqrestore (&rocker->fdb_tbl_lock, lock_flags); + +return err; +} +static int rocker_port_router_mac (struct rocker_port *rocker_port,int flags,__be16 vlan_id) {
@@ -2756,6 +3152,97 @@ static int rocker_port_router_mac(struct rocker_port *rocker_port,return err; } +static int rocker_port_fwding (struct rocker_port *rocker_port) +{ +bool pop_vlan; +u32 out_lport; +__be16 vlan_id; +u16 vid; +int flags =ROCKER_OP_FLAG_NOWAIT ; +int err; + +/* Port will be forwarding-enabled if its STP state is LEARNING +* or FORWARDING. Traffic from CPU can still egress, regardless of +* port STP state. Use L2 interface group on port VLANs as a way +* to toggle port forwarding: if forwarding is disabled, L2 +* interface group will not exist. +*/ + +if (rocker_port->stp_state !=BR_STATE_LEARNING && + rocker_port->stp_state !=BR_STATE_FORWARDING ) + flags |=ROCKER_OP_FLAG_REMOVE ; + + out_lport = rocker_port->lport; +for (vid =1 ; vid <VLAN_N_VID ; vid++) { +if (!test_bit (vid, rocker_port->vlan_bitmap)) +continue ; + vlan_id =htons (vid); + pop_vlan =rocker_vlan_id_is_internal (vlan_id); + err =rocker_group_l2_interface (rocker_port, flags, + vlan_id, out_lport, + pop_vlan); +if (err) { +netdev_err (rocker_port->dev, +"Error (%d) port VLAN l2 group for lport %d\n" , + err, out_lport); +return err; + } + } + +return 0 ; +} + +static int rocker_port_stp_update (struct rocker_port *rocker_port,u8 state) +{ +bool want[ROCKER_CTRL_MAX ] = {0 , }; +int flags; +int err; +int i; + +if (rocker_port->stp_state == state) +return 0 ; + + rocker_port->stp_state = state; + +switch (state) { +case BR_STATE_DISABLED : +/* port is completely disabled */ +break ; +case BR_STATE_LISTENING : +case BR_STATE_BLOCKING : + want[ROCKER_CTRL_LINK_LOCAL_MCAST ] = true; +break ; +case BR_STATE_LEARNING : +case BR_STATE_FORWARDING : + want[ROCKER_CTRL_LINK_LOCAL_MCAST ] = true; + want[ROCKER_CTRL_IPV4_MCAST ] = true; + want[ROCKER_CTRL_IPV6_MCAST ] = true; +if (rocker_port_is_bridged (rocker_port)) + want[ROCKER_CTRL_DFLT_BRIDGING ] = true; +else + want[ROCKER_CTRL_LOCAL_ARP ] = true; +break ; + } + +for (i =0 ; i <ROCKER_CTRL_MAX ; i++) { +if (want[i] != rocker_port->ctrls[i]) { + flags =ROCKER_OP_FLAG_NOWAIT | + (want[i] ?0 :ROCKER_OP_FLAG_REMOVE ); + err =rocker_port_ctrl (rocker_port, flags, + &rocker_ctrls[i]); +if (err) +return err; + rocker_port->ctrls[i] = want[i]; + } + } + + err =rocker_port_fdb_flush (rocker_port); +if (err) +return err; + +return rocker_port_fwding (rocker_port); +} +static struct rocker_internal_vlan_tbl_entry *rocker_internal_vlan_tbl_find (struct rocker *rocker,int ifindex) {
@@ -2848,6 +3335,8 @@ not_found:static int rocker_port_open (struct net_device *dev) {struct rocker_port *rocker_port =netdev_priv (dev); +u8 stp_state =rocker_port_is_bridged (rocker_port) ? +BR_STATE_BLOCKING :BR_STATE_FORWARDING ;int err; err =rocker_port_dma_rings_init (rocker_port);
@@ -2870,12 +3359,18 @@ static int rocker_port_open(struct net_device *dev) goto err_request_rx_irq; } + err =rocker_port_stp_update (rocker_port, stp_state); +if (err) + goto err_stp_update; +napi_enable (&rocker_port->napi_tx);napi_enable (&rocker_port->napi_rx);rocker_port_set_enable (rocker_port, true);netif_start_queue (dev);return 0 ; +err_stp_update: +free_irq (rocker_msix_rx_vector (rocker_port), rocker_port); err_request_rx_irq:free_irq (rocker_msix_tx_vector (rocker_port), rocker_port); err_request_tx_irq:
@@ -2891,6 +3386,7 @@ static int rocker_port_stop(struct net_device *dev)rocker_port_set_enable (rocker_port, false);napi_disable (&rocker_port->napi_rx);napi_disable (&rocker_port->napi_tx); +rocker_port_stp_update (rocker_port,BR_STATE_DISABLED );free_irq (rocker_msix_rx_vector (rocker_port), rocker_port);free_irq (rocker_msix_tx_vector (rocker_port), rocker_port);rocker_port_dma_rings_fini (rocker_port);
@@ -3035,6 +3531,62 @@ static int rocker_port_set_mac_address(struct net_device *dev, void *p)return 0 ; } +static int rocker_port_vlan_rx_add_vid (struct net_device *dev, +__be16 proto,u16 vid) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +int err; + + err =rocker_port_vlan (rocker_port,0 , vid); +if (err) +return err; + +return rocker_port_router_mac (rocker_port,0 ,htons (vid)); +} + +static int rocker_port_vlan_rx_kill_vid (struct net_device *dev, +__be16 proto,u16 vid) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +int err; + + err =rocker_port_router_mac (rocker_port,ROCKER_OP_FLAG_REMOVE , +htons (vid)); +if (err) +return err; + +return rocker_port_vlan (rocker_port,ROCKER_OP_FLAG_REMOVE , vid); +} + +static int rocker_port_fdb_add (struct ndmsg *ndm,struct nlattr *tb[], +struct net_device *dev, +const unsigned char *addr,u16 vid, +u16 nlm_flags) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +__be16 vlan_id =rocker_port_vid_to_vlan (rocker_port, vid,NULL ); +int flags =0 ; + +if (!rocker_port_is_bridged (rocker_port)) +return -EINVAL ; + +return rocker_port_fdb (rocker_port, addr, vlan_id, flags); +} + +static int rocker_port_fdb_del (struct ndmsg *ndm,struct nlattr *tb[], +struct net_device *dev, +const unsigned char *addr,u16 vid) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +__be16 vlan_id =rocker_port_vid_to_vlan (rocker_port, vid,NULL ); +int flags =ROCKER_OP_FLAG_REMOVE ; + +if (!rocker_port_is_bridged (rocker_port)) +return -EINVAL ; + +return rocker_port_fdb (rocker_port, addr, vlan_id, flags); +} +static int rocker_port_switch_parent_id_get (struct net_device *dev,struct netdev_phys_item_id *psid) {
@@ -3046,12 +3598,24 @@ static int rocker_port_switch_parent_id_get(struct net_device *dev,return 0 ; } +static int rocker_port_switch_port_stp_update (struct net_device *dev,u8 state) +{ +struct rocker_port *rocker_port =netdev_priv (dev); + +return rocker_port_stp_update (rocker_port, state); +} +static const struct net_device_ops rocker_port_netdev_ops = { .ndo_open = rocker_port_open, .ndo_stop = rocker_port_stop, .ndo_start_xmit = rocker_port_xmit, .ndo_set_mac_address = rocker_port_set_mac_address, + .ndo_vlan_rx_add_vid = rocker_port_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = rocker_port_vlan_rx_kill_vid, + .ndo_fdb_add = rocker_port_fdb_add, + .ndo_fdb_del = rocker_port_fdb_del, .ndo_switch_parent_id_get = rocker_port_switch_parent_id_get, + .ndo_switch_port_stp_update = rocker_port_switch_port_stp_update, };/********************
@@ -3501,17 +4065,121 @@ static struct pci_driver rocker_pci_driver = { .remove = rocker_remove, }; +/************************************ +* Net device notifier event handler +************************************/ + +static bool rocker_port_dev_check (struct net_device *dev) +{ +return dev->netdev_ops == &rocker_port_netdev_ops; +} + +static int rocker_port_bridge_join (struct rocker_port *rocker_port, +struct net_device *bridge) +{ +int err; + +rocker_port_internal_vlan_id_put (rocker_port, + rocker_port->dev->ifindex); + + rocker_port->bridge_dev = bridge; + +/* Use bridge internal VLAN ID for untagged pkts */ + err =rocker_port_vlan (rocker_port,ROCKER_OP_FLAG_REMOVE ,0 ); +if (err) +return err; + rocker_port->internal_vlan_id = +rocker_port_internal_vlan_id_get (rocker_port, + bridge->ifindex); + err =rocker_port_vlan (rocker_port,0 ,0 ); + +return err; +} + +static int rocker_port_bridge_leave (struct rocker_port *rocker_port) +{ +int err; + +rocker_port_internal_vlan_id_put (rocker_port, + rocker_port->bridge_dev->ifindex); + + rocker_port->bridge_dev =NULL ; + +/* Use port internal VLAN ID for untagged pkts */ + err =rocker_port_vlan (rocker_port,ROCKER_OP_FLAG_REMOVE ,0 ); +if (err) +return err; + rocker_port->internal_vlan_id = +rocker_port_internal_vlan_id_get (rocker_port, + rocker_port->dev->ifindex); + err =rocker_port_vlan (rocker_port,0 ,0 ); + +return err; +} + +static int rocker_port_master_changed (struct net_device *dev) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +struct net_device *master =netdev_master_upper_dev_get (dev); +int err =0 ; + +if (master && master->rtnl_link_ops && + !strcmp (master->rtnl_link_ops->kind,"bridge" )) + err =rocker_port_bridge_join (rocker_port, master); +else + err =rocker_port_bridge_leave (rocker_port); + +return err; +} + +static int rocker_netdevice_event (struct notifier_block *unused, +unsigned long event,void *ptr) +{ +struct net_device *dev; +int err; + +switch (event) { +case NETDEV_CHANGEUPPER : + dev =netdev_notifier_info_to_dev (ptr); +if (!rocker_port_dev_check (dev)) +return NOTIFY_DONE ; + err =rocker_port_master_changed (dev); +if (err) +netdev_warn (dev, +"failed to reflect master change (err %d)\n" , + err); +break ; + } + +return NOTIFY_DONE ; +} + +static struct notifier_block rocker_netdevice_nb__read_mostly = { + .notifier_call = rocker_netdevice_event, +}; +/*********************** * Module init and exit ***********************/ static int __init rocker_module_init (void ) { -return pci_register_driver (&rocker_pci_driver); +int err; + +register_netdevice_notifier (&rocker_netdevice_nb); + err =pci_register_driver (&rocker_pci_driver); +if (err) + goto err_pci_register_driver; +return 0 ; + +err_pci_register_driver: +unregister_netdevice_notifier (&rocker_netdevice_nb); +return err; } static void __exit rocker_module_exit(void) { +unregister_netdevice_notifier (&rocker_netdevice_nb);pci_unregister_driver (&rocker_pci_driver); }
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 18/21 rocker: implement ndo_fdb_dump
In reply to Jiri Pirko---v3->v4:
-ndm->ndm_flags set to NTF_SELF as pointed out by Scott
-use err to store retval of rocker_fdb_fill_info and break only in case < 0 new in v3
--- drivers/net/ethernet/rocker/rocker.c | 73 ++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
drivers/net/ethernet/rocker/rocker.c +73 -0
@@ -3587,6 +3587,78 @@ static int rocker_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],return rocker_port_fdb (rocker_port, addr, vlan_id, flags); } +static int rocker_fdb_fill_info (struct sk_buff *skb, +struct rocker_port *rocker_port, +const unsigned char *addr,u16 vid, +u32 portid,u32 seq,int type, +unsigned int flags) +{ +struct nlmsghdr *nlh; +struct ndmsg *ndm; + + nlh =nlmsg_put (skb, portid, seq, type,sizeof (*ndm), flags); +if (!nlh) +return -EMSGSIZE ; + + ndm =nlmsg_data (nlh); + ndm->ndm_family =AF_BRIDGE ; + ndm->ndm_pad1 =0 ; + ndm->ndm_pad2 =0 ; + ndm->ndm_flags =NTF_SELF ; + ndm->ndm_type =0 ; + ndm->ndm_ifindex = rocker_port->dev->ifindex; + ndm->ndm_state =NUD_REACHABLE ; + +if (nla_put (skb,NDA_LLADDR ,ETH_ALEN , addr)) + goto nla_put_failure; + +if (vid &&nla_put_u16 (skb,NDA_VLAN , vid)) + goto nla_put_failure; + +return nlmsg_end (skb, nlh); + +nla_put_failure: +nlmsg_cancel (skb, nlh); +return -EMSGSIZE ; +} + +static int rocker_port_fdb_dump (struct sk_buff *skb, +struct netlink_callback *cb, +struct net_device *dev, +struct net_device *filter_dev, +int idx) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +struct rocker *rocker = rocker_port->rocker; +struct rocker_fdb_tbl_entry *found; +struct hlist_node *tmp; +int bkt; +unsigned long lock_flags; +const unsigned char *addr; +u16 vid; +int err; + +spin_lock_irqsave (&rocker->fdb_tbl_lock, lock_flags); +hash_for_each_safe (rocker->fdb_tbl, bkt, tmp, found, entry) { +if (found->key.lport != rocker_port->lport) +continue ; +if (idx < cb->args[0 ]) + goto skip; + addr = found->key.addr; + vid =rocker_port_vlan_to_vid (rocker_port, found->key.vlan_id); + err =rocker_fdb_fill_info (skb, rocker_port, addr, vid, +NETLINK_CB (cb->skb).portid, + cb->nlh->nlmsg_seq, +RTM_NEWNEIGH ,NLM_F_MULTI ); +if (err <0 ) +break ; +skip: + ++idx; + } +spin_unlock_irqrestore (&rocker->fdb_tbl_lock, lock_flags); +return idx; +} +static int rocker_port_switch_parent_id_get (struct net_device *dev,struct netdev_phys_item_id *psid) {
@@ -3614,6 +3686,7 @@ static const struct net_device_ops rocker_port_netdev_ops = { .ndo_vlan_rx_kill_vid = rocker_port_vlan_rx_kill_vid, .ndo_fdb_add = rocker_port_fdb_add, .ndo_fdb_del = rocker_port_fdb_del, + .ndo_fdb_dump = rocker_port_fdb_dump, .ndo_switch_parent_id_get = rocker_port_switch_parent_id_get, .ndo_switch_port_stp_update = rocker_port_switch_port_stp_update, };
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 19/21 rocker: add ndo_bridge_setlink/getlink support for learning policy
In reply to Jiri PirkoFrom: Scott Feldman <[email protected]>
Rocker ports will use new "swdev" hwmode for bridge port offload policy. Current supported policy settings are BR_LEARNING and BR_LEARNING_SYNC. User can turn on/off device port FDB learning and syncing to bridge.
---v3->v4:
-no change
new in v3
--- drivers/net/ethernet/rocker/rocker.c | 99 ++++++++++++++++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 1 + 2 files changed, 100 insertions(+)
drivers/net/ethernet/rocker/rocker.c +99 -0
@@ -203,6 +203,7 @@ struct rocker_port {u32 lport;__be16 internal_vlan_id;int stp_state; +u32 brport_flags;bool ctrls[ROCKER_CTRL_MAX ];unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN ];struct napi_struct napi_tx;
@@ -1629,6 +1630,30 @@ rocker_cmd_set_port_settings_macaddr_prep(struct rocker *rocker,return 0 ; } +static int +rocker_cmd_set_port_learning_prep (struct rocker *rocker, +struct rocker_port *rocker_port, +struct rocker_desc_info *desc_info, +void *priv) +{ +struct rocker_tlv *cmd_info; + +if (rocker_tlv_put_u16 (desc_info,ROCKER_TLV_CMD_TYPE , +ROCKER_TLV_CMD_TYPE_SET_PORT_SETTINGS )) +return -EMSGSIZE ; + cmd_info =rocker_tlv_nest_start (desc_info,ROCKER_TLV_CMD_INFO ); +if (!cmd_info) +return -EMSGSIZE ; +if (rocker_tlv_put_u32 (desc_info,ROCKER_TLV_CMD_PORT_SETTINGS_LPORT , + rocker_port->lport)) +return -EMSGSIZE ; +if (rocker_tlv_put_u8 (desc_info,ROCKER_TLV_CMD_PORT_SETTINGS_LEARNING , + !!(rocker_port->brport_flags &BR_LEARNING ))) +return -EMSGSIZE ; +rocker_tlv_nest_end (desc_info, cmd_info); +return 0 ; +} +static int rocker_cmd_get_port_settings_ethtool (struct rocker_port *rocker_port,struct ethtool_cmd *ecmd) {
@@ -1663,6 +1688,13 @@ static int rocker_cmd_set_port_settings_macaddr(struct rocker_port *rocker_port, macaddr, NULL, NULL, false); } +static int rocker_port_set_learning (struct rocker_port *rocker_port) +{ +return rocker_cmd_exec (rocker_port->rocker, rocker_port, + rocker_cmd_set_port_learning_prep, +NULL ,NULL ,NULL , false); +} +static int rocker_cmd_flow_tbl_add_ig_port (struct rocker_desc_info *desc_info,struct rocker_flow_tbl_entry *entry) {
@@ -2995,6 +3027,7 @@ static int rocker_port_fdb_learn(struct rocker_port *rocker_port,u32 out_lport = rocker_port->lport;u32 tunnel_id =0 ;u32 group_id =ROCKER_GROUP_NONE ; +bool syncing = !!(rocker_port->brport_flags &BR_LEARNING_SYNC );bool copy_to_cpu = false;int err;
@@ -3009,6 +3042,9 @@ static int rocker_port_fdb_learn(struct rocker_port *rocker_port,return err; } +if (!syncing) +return 0 ; +if (!rocker_port_is_bridged (rocker_port))return 0 ;
@@ -3659,6 +3695,64 @@ skip:return idx; } +static int rocker_port_bridge_setlink (struct net_device *dev, +struct nlmsghdr *nlh) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +struct nlattr *protinfo; +struct nlattr *afspec; +struct nlattr *attr; +u16 mode; +int err; + + protinfo =nlmsg_find_attr (nlh,sizeof (struct ifinfomsg ), +IFLA_PROTINFO ); + afspec =nlmsg_find_attr (nlh,sizeof (struct ifinfomsg ),IFLA_AF_SPEC ); + +if (afspec) { + attr =nla_find_nested (afspec,IFLA_BRIDGE_MODE ); +if (attr) { + mode =nla_get_u16 (attr); +if (mode !=BRIDGE_MODE_SWDEV ) +return -EINVAL ; + } + } + +if (protinfo) { + attr =nla_find_nested (protinfo,IFLA_BRPORT_LEARNING ); +if (attr) { +if (nla_get_u8 (attr)) + rocker_port->brport_flags |=BR_LEARNING ; +else + rocker_port->brport_flags &= ~BR_LEARNING ; + err =rocker_port_set_learning (rocker_port); +if (err) +return err; + } + attr =nla_find_nested (protinfo,IFLA_BRPORT_LEARNING_SYNC ); +if (attr) { +if (nla_get_u8 (attr)) + rocker_port->brport_flags |=BR_LEARNING_SYNC ; +else + rocker_port->brport_flags &= ~BR_LEARNING_SYNC ; + } + } + +return 0 ; +} + +static int rocker_port_bridge_getlink (struct sk_buff *skb,u32 pid,u32 seq, +struct net_device *dev, +u32 filter_mask) +{ +struct rocker_port *rocker_port =netdev_priv (dev); +u16 mode =BRIDGE_MODE_SWDEV ; +u32 mask =BR_LEARNING |BR_LEARNING_SYNC ; + +return ndo_dflt_bridge_getlink (skb, pid, seq, dev, mode, + rocker_port->brport_flags, mask); +} +static int rocker_port_switch_parent_id_get (struct net_device *dev,struct netdev_phys_item_id *psid) {
@@ -3687,6 +3781,8 @@ static const struct net_device_ops rocker_port_netdev_ops = { .ndo_fdb_add = rocker_port_fdb_add, .ndo_fdb_del = rocker_port_fdb_del, .ndo_fdb_dump = rocker_port_fdb_dump, + .ndo_bridge_setlink = rocker_port_bridge_setlink, + .ndo_bridge_getlink = rocker_port_bridge_getlink, .ndo_switch_parent_id_get = rocker_port_switch_parent_id_get, .ndo_switch_port_stp_update = rocker_port_switch_port_stp_update, };
@@ -3887,6 +3983,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) rocker_port->rocker = rocker; rocker_port->port_number = port_number; rocker_port->lport = port_number +1 ; + rocker_port->brport_flags =BR_LEARNING |BR_LEARNING_SYNC ;rocker_port_dev_addr_init (rocker, rocker_port); dev->netdev_ops = &rocker_port_netdev_ops;
@@ -3906,6 +4003,8 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) } rocker->ports[port_number] = rocker_port; +rocker_port_set_learning (rocker_port); + rocker_port->internal_vlan_id =rocker_port_internal_vlan_id_get (rocker_port, dev->ifindex); err =rocker_port_ig_tbl (rocker_port,0 );
drivers/net/ethernet/rocker/rocker.h +1 -0
@@ -139,6 +139,7 @@ enum {ROCKER_TLV_CMD_PORT_SETTINGS_AUTONEG ,/* u8 */ ROCKER_TLV_CMD_PORT_SETTINGS_MACADDR ,/* binary */ ROCKER_TLV_CMD_PORT_SETTINGS_MODE ,/* u8 */ +ROCKER_TLV_CMD_PORT_SETTINGS_LEARNING ,/* u8 */ __ROCKER_TLV_CMD_PORT_SETTINGS_MAX, ROCKER_TLV_CMD_PORT_SETTINGS_MAX =
Signature · 1 line
1.9.3
Jiri Pirko
maintainerPATCH v4 20/21 rocker: Add proper validation of Netlink attributes
In reply to Jiri PirkoFrom: Thomas Graf <[email protected]>
---
new in v4
--- drivers/net/ethernet/rocker/rocker.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/rocker/rocker.c +9 -0
@@ -3712,6 +3712,9 @@ static int rocker_port_bridge_setlink(struct net_device *dev,if (afspec) { attr =nla_find_nested (afspec,IFLA_BRIDGE_MODE );if (attr) { +if (nla_len (attr) <sizeof (mode)) +return -EINVAL ; + mode =nla_get_u16 (attr);if (mode !=BRIDGE_MODE_SWDEV )return -EINVAL ;
@@ -3721,6 +3724,9 @@ static int rocker_port_bridge_setlink(struct net_device *dev,if (protinfo) { attr =nla_find_nested (protinfo,IFLA_BRPORT_LEARNING );if (attr) { +if (nla_len (attr) <sizeof (u8)) +return -EINVAL ; +if (nla_get_u8 (attr)) rocker_port->brport_flags |=BR_LEARNING ;else
@@ -3731,6 +3737,9 @@ static int rocker_port_bridge_setlink(struct net_device *dev, } attr =nla_find_nested (protinfo,IFLA_BRPORT_LEARNING_SYNC );if (attr) { +if (nla_len (attr) <sizeof (u8)) +return -EINVAL ; +if (nla_get_u8 (attr)) rocker_port->brport_flags |=BR_LEARNING_SYNC ;else
Signature · 1 line
1.9.3
Re: [patch net-next v4 20/21] rocker: Add proper validation of Netlink attributes
Quoted 47 lines · Jiri Pirko
From: Thomas Graf <[email protected]>
Signed-off-by Thomas Graf <[email protected]>Signed-off-by Jiri Pirko <[email protected]>---
new in v4--- drivers/net/ethernet/rocker/rocker.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/net/ethernet/rocker/rocker.c +9
-1@@ -3712,6 +3712,9 @@ static int rocker_port_bridge_setlink(struct net_device *dev,if (afspec) { attr =nla_find_nested (afspec,IFLA_BRIDGE_MODE );if (attr) { +if (nla_len (attr) <sizeof (mode)) +return -EINVAL ; + mode =nla_get_u16 (attr);if (mode !=BRIDGE_MODE_SWDEV )return -EINVAL ;@@ -3721,6 +3724,9 @@ static int rocker_port_bridge_setlink(struct net_device *dev,if (protinfo) { attr =nla_find_nested (protinfo,IFLA_BRPORT_LEARNING );if (attr) { +if (nla_len (attr) <sizeof (u8)) +return -EINVAL ; +if (nla_get_u8 (attr)) rocker_port->brport_flags |=BR_LEARNING ;else @@ -3731,6 +3737,9 @@ static int rocker_port_bridge_setlink(struct net_device *dev, } attr =nla_find_nested (protinfo,IFLA_BRPORT_LEARNING_SYNC );if (attr) { +if (nla_len (attr) <sizeof (u8)) +return -EINVAL ; +if (nla_get_u8 (attr)) rocker_port->brport_flags |=BR_LEARNING_SYNC ;else --1.9.3
Jiri Pirko
maintainerPATCH v4 21/21 rocker: Use logical operators on booleans
In reply to Jiri PirkoFrom: Thomas Graf <[email protected]>
Silences various sparse warnings
---
new in v4
--- drivers/net/ethernet/rocker/rocker.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/rocker/rocker.c +8 -8
@@ -2404,17 +2404,17 @@ static int rocker_flow_tbl_bridge(struct rocker_port *rocker_port, } priority =ROCKER_PRIORITY_UNKNOWN ; -if (vlan_bridging & dflt & wild) +if (vlan_bridging && dflt && wild) priority =ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD ; -else if (vlan_bridging & dflt & !wild) +else if (vlan_bridging && dflt && !wild) priority =ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT ; -else if (vlan_bridging & !dflt) +else if (vlan_bridging && !dflt) priority =ROCKER_PRIORITY_BRIDGING_VLAN ; -else if (!vlan_bridging & dflt & wild) +else if (!vlan_bridging && dflt && wild) priority =ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD ; -else if (!vlan_bridging & dflt & !wild) +else if (!vlan_bridging && dflt && !wild) priority =ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT ; -else if (!vlan_bridging & !dflt) +else if (!vlan_bridging && !dflt) priority =ROCKER_PRIORITY_BRIDGING_TENANT ; entry->key.priority = priority;
@@ -3010,9 +3010,9 @@ static void rocker_port_fdb_learn_work(struct work_struct *work)bool removing = (lw->flags &ROCKER_OP_FLAG_REMOVE );bool learned = (lw->flags &ROCKER_OP_FLAG_LEARNED ); -if (learned & removing) +if (learned && removing)br_fdb_external_learn_del (lw->dev, lw->addr, lw->vid); -else if (learned & !removing) +else if (learned && !removing)br_fdb_external_learn_add (lw->dev, lw->addr, lw->vid);kfree (work);
Signature · 1 line
1.9.3
Re: [patch net-next v4 21/21] rocker: Use logical operators on booleans
Quoted 55 lines · Jiri Pirko
From: Thomas Graf <[email protected]>
Silences various sparse warnings
Signed-off-by Thomas Graf <[email protected]>Signed-off-by Jiri Pirko <[email protected]>---
new in v4--- drivers/net/ethernet/rocker/rocker.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/net/ethernet/rocker/rocker.c +8
-9@@ -2404,17 +2404,17 @@ static int rocker_flow_tbl_bridge(struct rocker_port *rocker_port, } priority =ROCKER_PRIORITY_UNKNOWN ; -if (vlan_bridging & dflt & wild) +if (vlan_bridging && dflt && wild) priority =ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD ; -else if (vlan_bridging & dflt & !wild) +else if (vlan_bridging && dflt && !wild) priority =ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT ; -else if (vlan_bridging & !dflt) +else if (vlan_bridging && !dflt) priority =ROCKER_PRIORITY_BRIDGING_VLAN ; -else if (!vlan_bridging & dflt & wild) +else if (!vlan_bridging && dflt && wild) priority =ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD ; -else if (!vlan_bridging & dflt & !wild) +else if (!vlan_bridging && dflt && !wild) priority =ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT ; -else if (!vlan_bridging & !dflt) +else if (!vlan_bridging && !dflt) priority =ROCKER_PRIORITY_BRIDGING_TENANT ; entry->key.priority = priority;@@ -3010,9 +3010,9 @@ static void rocker_port_fdb_learn_work(struct work_struct *work)bool removing = (lw->flags &ROCKER_OP_FLAG_REMOVE );bool learned = (lw->flags &ROCKER_OP_FLAG_LEARNED ); -if (learned & removing) +if (learned && removing)br_fdb_external_learn_del (lw->dev, lw->addr, lw->vid); -else if (learned & !removing) +else if (learned && !removing)br_fdb_external_learn_add (lw->dev, lw->addr, lw->vid);kfree (work); --1.9.3
Thanks Jiri for coordinating this effort. It looks like we're close to convergence on this first patch set. I sifted thru review comments and compiled a list of items for follow-on work. I hope it's OK to use etherpad for this:
https://etherpad.wikimedia.org/p/netdev-swdev-todo
Feel free to edit as needed and claim an item if you intend to work on it. Don't turn the etherpad into a discussion board...try to keep it as list of work items. I don't think any of these items should hold up current patch set.
-scott
Quoted 106 lines · Jiri Pirko
Hi all.
This patchset is just the first phase of switch and switch-ish device support api in kernel. Note that the api will extend.
So what this patchset includes:
- introduce switchdev api skeleton for implementing switch drivers
- introduce rocker switch driver which implements switchdev api fdb and bridge set/get link ndosAs to the discussion if there is need to have specific class of device representing the switch itself, so far we found no need to introduce that. But we are generally ok with the idea and when the time comes and it will be needed, it can be easily introduced without any disturbance.
This patchset introduces switch id export through rtnetlink and sysfs, which is similar to what we have for port id in SR-IOV. I will send iproute2 patchset for showing the switch id for port netdevs once this is applied. This applies also for the
PF_BRIDGEand fdb iproute2 patches.iproute2 patches are now available here:
https://github.com/jpirko/iproute2-rockerFor detailed description and version history, please see individual patches.
In v4 I reordered the patches leaving rocker patches on the end of the patchset.
Jiri Pirko (10):
bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
neigh: sort Neighbor Cache Entry Flags
bridge: convert flags in fbd entry into bitfields
net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del
net: renamenetdev_phys_port_idto more generic name
net: introduce generic switch devices support
rtnl: expose physical switch id for particular device
net-sysfs: expose physical switch id for particular device
rocker: introduce rocker switch driver
rocker: implementndo_fdb_dumpScott Feldman (9):
bridge: callnetdev_sw_port_stp_updatewhen bridge port STP status
changes
bridge: add API to notify bridge driver of learned FBD on offloaded
device
bridge: move private brport flags toif_bridge.hso port drivers can
use flags
bridge: add new brport flagLEARNING_SYNC
bridge: add new hwmode swdev
bridge: add brport flags to dfltbridge_getlink
rocker: implement rocker ofdpa flow table manipulation
rocker: implement L2 bridge offloading
rocker: add ndo_bridge_setlink/getlink support for learning policyThomas Graf (2):
rocker: Add proper validation of Netlink attributes
rocker: Use logical operators on booleansDocumentation/ABI/testing/sysfs-class-net | 8 + Documentation/networking/switchdev.txt | 59 + MAINTAINERS | 14 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 11 +- drivers/net/ethernet/rocker/Kconfig | 27 + drivers/net/ethernet/rocker/Makefile | 5 + drivers/net/ethernet/rocker/rocker.c | 4374 ++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 428 +++ drivers/net/macvlan.c | 4 +- drivers/net/vxlan.c | 4 +- include/linux/if_bridge.h | 31 + include/linux/netdevice.h | 39 +- include/linux/rtnetlink.h | 9 +- include/net/switchdev.h | 37 + include/uapi/linux/if_bridge.h | 1 + include/uapi/linux/if_link.h | 2 + include/uapi/linux/neighbour.h | 6 +- net/Kconfig | 1 + net/Makefile | 3 + net/bridge/br_fdb.c | 144 +- net/bridge/br_private.h | 21 +- net/bridge/br_stp.c | 7 + net/core/dev.c | 2 +- net/core/net-sysfs.c | 26 +- net/core/rtnetlink.c | 119 +- net/switchdev/Kconfig | 13 + net/switchdev/Makefile | 5 + net/switchdev/switchdev.c | 52 + 35 files changed, 5366 insertions(+), 105 deletions(-) create mode 100644 Documentation/networking/switchdev.txt create mode 100644 drivers/net/ethernet/rocker/Kconfig create mode 100644 drivers/net/ethernet/rocker/Makefile create mode 100644 drivers/net/ethernet/rocker/rocker.c create mode 100644 drivers/net/ethernet/rocker/rocker.h create mode 100644 include/net/switchdev.h create mode 100644 net/switchdev/Kconfig create mode 100644 net/switchdev/Makefile create mode 100644 net/switchdev/switchdev.c--
1.9.3
Jiri Pirko
maintainerQuoted 11 lines · Fri, Nov 28, 2014 at 12:59:17PM CET, [email protected] wrote:
Thanks Jiri for coordinating this effort. It looks like we're close to convergence on this first patch set. I sifted thru review comments and compiled a list of items for follow-on work. I hope it's OK to use etherpad for this:
https://etherpad.wikimedia.org/p/netdev-swdev-todo
Feel free to edit as needed and claim an item if you intend to work on it. Don't turn the etherpad into a discussion board...try to keep it as list of work items. I don't think any of these items should hold up current patch set.
Agree. Good idea putting the todo list on etherpad.
So I will post v5 just with the whitespace issue fixed (pointed out by Sergei Shtylyov).
Thanks.
Quoted 110 lines
-scott
Quoted 106 lines · Jiri Pirko
Hi all.
This patchset is just the first phase of switch and switch-ish device support api in kernel. Note that the api will extend.
So what this patchset includes:
- introduce switchdev api skeleton for implementing switch drivers
- introduce rocker switch driver which implements switchdev api fdb and bridge set/get link ndosAs to the discussion if there is need to have specific class of device representing the switch itself, so far we found no need to introduce that. But we are generally ok with the idea and when the time comes and it will be needed, it can be easily introduced without any disturbance.
This patchset introduces switch id export through rtnetlink and sysfs, which is similar to what we have for port id in SR-IOV. I will send iproute2 patchset for showing the switch id for port netdevs once this is applied. This applies also for the
PF_BRIDGEand fdb iproute2 patches.iproute2 patches are now available here:
https://github.com/jpirko/iproute2-rockerFor detailed description and version history, please see individual patches.
In v4 I reordered the patches leaving rocker patches on the end of the patchset.
Jiri Pirko (10):
bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
neigh: sort Neighbor Cache Entry Flags
bridge: convert flags in fbd entry into bitfields
net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del
net: renamenetdev_phys_port_idto more generic name
net: introduce generic switch devices support
rtnl: expose physical switch id for particular device
net-sysfs: expose physical switch id for particular device
rocker: introduce rocker switch driver
rocker: implementndo_fdb_dumpScott Feldman (9):
bridge: callnetdev_sw_port_stp_updatewhen bridge port STP status
changes
bridge: add API to notify bridge driver of learned FBD on offloaded
device
bridge: move private brport flags toif_bridge.hso port drivers can
use flags
bridge: add new brport flagLEARNING_SYNC
bridge: add new hwmode swdev
bridge: add brport flags to dfltbridge_getlink
rocker: implement rocker ofdpa flow table manipulation
rocker: implement L2 bridge offloading
rocker: add ndo_bridge_setlink/getlink support for learning policyThomas Graf (2):
rocker: Add proper validation of Netlink attributes
rocker: Use logical operators on booleansDocumentation/ABI/testing/sysfs-class-net | 8 + Documentation/networking/switchdev.txt | 59 + MAINTAINERS | 14 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 11 +- drivers/net/ethernet/rocker/Kconfig | 27 + drivers/net/ethernet/rocker/Makefile | 5 + drivers/net/ethernet/rocker/rocker.c | 4374 ++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 428 +++ drivers/net/macvlan.c | 4 +- drivers/net/vxlan.c | 4 +- include/linux/if_bridge.h | 31 + include/linux/netdevice.h | 39 +- include/linux/rtnetlink.h | 9 +- include/net/switchdev.h | 37 + include/uapi/linux/if_bridge.h | 1 + include/uapi/linux/if_link.h | 2 + include/uapi/linux/neighbour.h | 6 +- net/Kconfig | 1 + net/Makefile | 3 + net/bridge/br_fdb.c | 144 +- net/bridge/br_private.h | 21 +- net/bridge/br_stp.c | 7 + net/core/dev.c | 2 +- net/core/net-sysfs.c | 26 +- net/core/rtnetlink.c | 119 +- net/switchdev/Kconfig | 13 + net/switchdev/Makefile | 5 + net/switchdev/switchdev.c | 52 + 35 files changed, 5366 insertions(+), 105 deletions(-) create mode 100644 Documentation/networking/switchdev.txt create mode 100644 drivers/net/ethernet/rocker/Kconfig create mode 100644 drivers/net/ethernet/rocker/Makefile create mode 100644 drivers/net/ethernet/rocker/rocker.c create mode 100644 drivers/net/ethernet/rocker/rocker.h create mode 100644 include/net/switchdev.h create mode 100644 net/switchdev/Kconfig create mode 100644 net/switchdev/Makefile create mode 100644 net/switchdev/switchdev.c--
1.9.3
Quoted 11 lines · Scott Feldman
Thanks Jiri for coordinating this effort. It looks like we're close to convergence on this first patch set. I sifted thru review comments and compiled a list of items for follow-on work. I hope it's OK to use etherpad for this:
https://etherpad.wikimedia.org/p/netdev-swdev-todo
Feel free to edit as needed and claim an item if you intend to work on it. Don't turn the etherpad into a discussion board...try to keep it as list of work items. I don't think any of these items should hold up current patch set.
Thanks scott/jiri for putting this together. I made sure all my concerns are covered on the ether-pad ;)
Quoted 110 lines · Jiri Pirko
Quoted 103 lines
Hi all.
This patchset is just the first phase of switch and switch-ish device support api in kernel. Note that the api will extend.
So what this patchset includes:
- introduce switchdev api skeleton for implementing switch drivers
- introduce rocker switch driver which implements switchdev api fdb and bridge set/get link ndosAs to the discussion if there is need to have specific class of device representing the switch itself, so far we found no need to introduce that. But we are generally ok with the idea and when the time comes and it will be needed, it can be easily introduced without any disturbance.
This patchset introduces switch id export through rtnetlink and sysfs, which is similar to what we have for port id in SR-IOV. I will send iproute2 patchset for showing the switch id for port netdevs once this is applied. This applies also for the
PF_BRIDGEand fdb iproute2 patches.iproute2 patches are now available here:
https://github.com/jpirko/iproute2-rockerFor detailed description and version history, please see individual patches.
In v4 I reordered the patches leaving rocker patches on the end of the patchset.
Jiri Pirko (10):
bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion
neigh: sort Neighbor Cache Entry Flags
bridge: convert flags in fbd entry into bitfields
net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del
net: renamenetdev_phys_port_idto more generic name
net: introduce generic switch devices support
rtnl: expose physical switch id for particular device
net-sysfs: expose physical switch id for particular device
rocker: introduce rocker switch driver
rocker: implementndo_fdb_dumpScott Feldman (9):
bridge: callnetdev_sw_port_stp_updatewhen bridge port STP status
changes
bridge: add API to notify bridge driver of learned FBD on offloaded
device
bridge: move private brport flags toif_bridge.hso port drivers can
use flags
bridge: add new brport flagLEARNING_SYNC
bridge: add new hwmode swdev
bridge: add brport flags to dfltbridge_getlink
rocker: implement rocker ofdpa flow table manipulation
rocker: implement L2 bridge offloading
rocker: add ndo_bridge_setlink/getlink support for learning policyThomas Graf (2):
rocker: Add proper validation of Netlink attributes
rocker: Use logical operators on booleansDocumentation/ABI/testing/sysfs-class-net | 8 + Documentation/networking/switchdev.txt | 59 + MAINTAINERS | 14 + drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 11 +- drivers/net/ethernet/rocker/Kconfig | 27 + drivers/net/ethernet/rocker/Makefile | 5 + drivers/net/ethernet/rocker/rocker.c | 4374 ++++++++++++++++++++++ drivers/net/ethernet/rocker/rocker.h | 428 +++ drivers/net/macvlan.c | 4 +- drivers/net/vxlan.c | 4 +- include/linux/if_bridge.h | 31 + include/linux/netdevice.h | 39 +- include/linux/rtnetlink.h | 9 +- include/net/switchdev.h | 37 + include/uapi/linux/if_bridge.h | 1 + include/uapi/linux/if_link.h | 2 + include/uapi/linux/neighbour.h | 6 +- net/Kconfig | 1 + net/Makefile | 3 + net/bridge/br_fdb.c | 144 +- net/bridge/br_private.h | 21 +- net/bridge/br_stp.c | 7 + net/core/dev.c | 2 +- net/core/net-sysfs.c | 26 +- net/core/rtnetlink.c | 119 +- net/switchdev/Kconfig | 13 + net/switchdev/Makefile | 5 + net/switchdev/switchdev.c | 52 + 35 files changed, 5366 insertions(+), 105 deletions(-)create mode 100644
Documentation/networking/switchdev.txtcreate mode 100644drivers/net/ethernet/rocker/Kconfigcreate mode 100644drivers/net/ethernet/rocker/Makefilecreate mode 100644drivers/net/ethernet/rocker/rocker.ccreate mode 100644drivers/net/ethernet/rocker/rocker.hcreate mode 100644include/net/switchdev.hcreate mode 100644net/switchdev/Kconfig
create mode 100644net/switchdev/Makefile
create mode 100644net/switchdev/switchdev.cQuoted 3 lines
--
1.9.3--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html