mlx4: Add vlan support to IBoE
PATCH v8 11/11 mlx4: Add vlan support to IBoE
This patch allows IBoE traffic to be encapsulated in 802.1q tagged VLAN frames. The VLAN tag is encoded in the GID and derived from it by a simple computation. The netdev notifier callback is modified to catch new VLAN devices addition/removal and the port's GID table is updated to reflect the change such that for each netdevice there is an entry in the GID table. When the port's GID table is exhausted, GID entries will not be added. Only children of the main interface's can add to the GID table. If a vlan interface is added on another vlan interface (e.g. vconfig add eth2.6 8), then that interfaces will not add an entry to the GID table.
Signed-off-by Eli Cohen <eli-VPRAkNaXOzVS1MOuV/[email protected]>
--- drivers/infiniband/hw/mlx4/ah.c | 22 +++++++-- drivers/infiniband/hw/mlx4/main.c | 84 +++++++++++++++++++++++++++----- drivers/infiniband/hw/mlx4/mlx4_ib.h | 4 +- drivers/infiniband/hw/mlx4/qp.c | 49 +++++++++++++++--- drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- drivers/net/mlx4/en_netdev.c | 10 ++++ drivers/net/mlx4/mlx4_en.h | 1 + drivers/net/mlx4/port.c | 19 +++++++ include/linux/mlx4/device.h | 1 + include/linux/mlx4/qp.h | 2 +- 10 files changed, 166 insertions(+), 28 deletions(-)
drivers/infiniband/hw/mlx4/ah.c +18 -4
@@ -34,6 +34,7 @@#include <rdma/ib_addr.h> #include <linux/inet.h> #include <linux/string.h> +#include <rdma/ib_cache.h> int mlx4_ib_resolve_grh (struct mlx4_ib_dev *dev,const struct ib_ah_attr *ah_attr,u8 *mac,int *is_mcast,u8 port)
@@ -98,6 +99,8 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attru8 mac[6 ];int err;int is_mcast; +u16 vlan_tag; +union ib_gid sgid; err =mlx4_ib_resolve_grh (ibdev, ah_attr, mac, &is_mcast, ah_attr->port_num);if (err)
@@ -105,8 +108,14 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attrmemcpy (ah->av.eth.mac_0_1, mac,2 );memcpy (ah->av.eth.mac_2_5, mac +2 ,4 ); + err =ib_get_cached_gid (pd->device, ah_attr->port_num, ah_attr->grh.sgid_index, &sgid); +if (err) +return ERR_PTR (err); + vlan_tag =rdma_get_vlan_id (&sgid); + vlan_tag |= (ah_attr->sl &7 ) <<13 ; ah->av.eth.port_pd =cpu_to_be32 (to_mpd (pd)->pdn | (ah_attr->port_num <<24 )); ah->av.eth.gid_index = ah_attr->grh.sgid_index; + ah->av.eth.vlan =cpu_to_be16 (vlan_tag);if (ah_attr->static_rate) { ah->av.eth.stat_rate = ah_attr->static_rate +MLX4_STAT_RATE_OFFSET ; while (ah->av.eth.stat_rate > IB_RATE_2_5_GBPS + MLX4_STAT_RATE_OFFSET &&
@@ -194,8 +203,8 @@ int mlx4_ib_destroy_ah(struct ib_ah *ah)return 0 ; } -int mlx4_ib_get_eth_l2_addr (struct ib_device *device,u8 port,union ib_gid *gid, -int sgid_idx,u8 *mac,u16 *vlan_id) +int mlx4_ib_get_eth_l2_addr (struct ib_device *device,u8 port,union ib_gid *dgid, +int sgid_idx,u8 *mac,u16 *vlan_id,u8 *tagged) {int err;struct mlx4_ib_dev *ibdev =to_mdev (device);
@@ -203,13 +212,18 @@ int mlx4_ib_get_eth_l2_addr(struct ib_device *device, u8 port, union ib_gid *gid .port_num = port, };int is_mcast; +union ib_gid sgid; -memcpy (ah_attr.grh.dgid.raw, gid,16 ); +memcpy (ah_attr.grh.dgid.raw, dgid,16 ); err =mlx4_ib_resolve_grh (ibdev, &ah_attr, mac, &is_mcast, port);if (err)ERR_PTR (err); - *vlan_id =0 ; + err =ib_get_cached_gid (device, port, sgid_idx, &sgid); +if (err) +return err; + *vlan_id =rdma_get_vlan_id (&sgid); + *tagged = !!(*vlan_id);return 0 ; }
drivers/infiniband/hw/mlx4/main.c +72 -12
127 lines not on this page · raw message
drivers/infiniband/hw/mlx4/mlx4_ib.h +2 -2
@@ -334,8 +334,8 @@ int mlx4_ib_fmr_dealloc(struct ib_fmr *fmr);int mlx4_ib_resolve_grh (struct mlx4_ib_dev *dev,const struct ib_ah_attr *ah_attr,u8 *mac,int *is_mcast,u8 port); -int mlx4_ib_get_eth_l2_addr (struct ib_device *device,u8 port,union ib_gid *gid, -int sgid_idx,u8 *mac,u16 *vlan_id); +int mlx4_ib_get_eth_l2_addr (struct ib_device *device,u8 port,union ib_gid *dgid, +int sgid_idx,u8 *mac,u16 *vlan_id,u8 *tagged);static inline int mlx4_ib_ah_grh_present (struct mlx4_ib_ah *ah) {
drivers/infiniband/hw/mlx4/qp.c +41 -8
123 lines not on this page · raw message
drivers/infiniband/hw/mthca/mthca_qp.c +1 -1
@@ -1494,7 +1494,7 @@ static int build_mlx_header(struct mthca_dev *dev, struct mthca_sqp *sqp,u16 pkey;ib_ud_header_init (256 ,/* assume a MAD */ -1 ,0 , +1 ,0 ,0 ,mthca_ah_grh_present (to_mah (wr->wr.ud.ah)),0 , &sqp->ud_header);
drivers/net/mlx4/en_netdev.c +10 -0
@@ -68,6 +68,7 @@ static void mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_en_dev *mdev = priv->mdev;int err; +int idx;if (!priv->vlgrp)return ;
@@ -82,7 +83,10 @@ static void mlx4_en_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)if (err)en_err (priv,"Failed configuring VLAN filter\n" ); } +if (mlx4_register_vlan (mdev->dev, priv->port, vid, &idx)) +en_err (priv,"failed adding vlan %d\n" , vid);mutex_unlock (&mdev->state_lock); + }static void mlx4_en_vlan_rx_kill_vid (struct net_device *dev,unsigned short vid)
@@ -90,6 +94,7 @@ static void mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_en_dev *mdev = priv->mdev;int err; +int idx;if (!priv->vlgrp)return ;
@@ -100,6 +105,11 @@ static void mlx4_en_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)/* Remove VID from port VLAN filter */ mutex_lock (&mdev->state_lock); +if (!mlx4_find_cached_vlan (mdev->dev, priv->port, vid, &idx)) +mlx4_unregister_vlan (mdev->dev, priv->port, idx); +else +en_err (priv,"could not find vid %d in cache\n" , vid); +if (mdev->device_up && priv->port_up) { err =mlx4_SET_VLAN_FLTR (mdev->dev, priv->port, priv->vlgrp);if (err)
drivers/net/mlx4/mlx4_en.h +1 -0
@@ -494,6 +494,7 @@ struct mlx4_en_priv {struct mlx4_en_port_stats port_stats;struct dev_mc_list *mc_list;struct mlx4_en_stat_out_mbox hw_stats; +int vids[128 ]; };
drivers/net/mlx4/port.c +19 -0
@@ -182,6 +182,25 @@ static int mlx4_set_port_vlan_table(struct mlx4_dev *dev, u8 port,return err; } +int mlx4_find_cached_vlan (struct mlx4_dev *dev,u8 port,u16 vid,int *idx) +{ +struct mlx4_vlan_table *table = &mlx4_priv (dev)->port[port].vlan_table; +int i; + +for (i =0 ; i <MLX4_MAX_VLAN_NUM ; ++i) { +if (table->refs[i] && + (vid == (MLX4_VLAN_MASK & +be32_to_cpu (table->entries[i])))) { +/* Vlan already registered, increase refernce count */ + *idx = i; +return 0 ; + } + } + +return -ENOENT ; +} +EXPORT_SYMBOL_GPL (mlx4_find_cached_vlan); +int mlx4_register_vlan (struct mlx4_dev *dev,u8 port,u16 vlan,int *index) {struct mlx4_vlan_table *table = &mlx4_priv (dev)->port[port].vlan_table;
include/linux/mlx4/device.h +1 -0
@@ -497,6 +497,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16]);int mlx4_register_mac (struct mlx4_dev *dev,u8 port,u64 mac,int *index);void mlx4_unregister_mac (struct mlx4_dev *dev,u8 port,int index); +int mlx4_find_cached_vlan (struct mlx4_dev *dev,u8 port,u16 vid,int *idx);int mlx4_register_vlan (struct mlx4_dev *dev,u8 port,u16 vlan,int *index);void mlx4_unregister_vlan (struct mlx4_dev *dev,u8 port,int index);
include/linux/mlx4/qp.h +1 -1
@@ -109,7 +109,7 @@ struct mlx4_qp_path {__be32 tclass_flowlabel;u8 rgid[16 ];u8 sched_queue; -u8 snooper_flags; +u8 vlan_index;u8 reserved3[2 ];u8 counter_index;u8 reserved4;
Signature · 6 lines
1.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html