Commit eb072c4b authored by Eyal Perry's avatar Eyal Perry Committed by David S. Miller
Browse files

RDMA/cma: Set IBoE SL (user-priority) by egress map when using vlans 



On top of commit 366cddb4 "IB/rdma_cm: TOS <=> UP mapping for IBoE", add
support for case vlan egress map is used.

When the IBoE session is being set over a vlan, inherit the socket priority
to vlan priority mapping which was configured for the vlan device egress map.

Signed-off-by: default avatarEyal Perry <eyalpe@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3243539

drivers/infiniband/core/cma.c

+21 −5
Original line number Diff line number Diff line
@@ -1848,6 +1848,26 @@ static int cma_resolve_iw_route(struct rdma_id_private *id_priv, int timeout_ms) 
	return 0;

}



static int iboe_tos_to_sl(struct net_device *ndev, int tos)

{

	int prio;

	struct net_device *dev;



	prio = rt_tos2priority(tos);

	dev = ndev->priv_flags & IFF_802_1Q_VLAN ?

		vlan_dev_real_dev(ndev) : ndev;



	if (dev->num_tc)

		return netdev_get_prio_tc_map(dev, prio);



#if IS_ENABLED(CONFIG_VLAN_8021Q)

	if (ndev->priv_flags & IFF_802_1Q_VLAN)

		return (vlan_dev_get_egress_qos_mask(ndev, prio) &

			VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;

#endif

	return 0;

}



static int cma_resolve_iboe_route(struct rdma_id_private *id_priv)

{

	struct rdma_route *route = &id_priv->id.route;
@@ -1888,11 +1908,7 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) 
	route->path_rec->reversible = 1;

	route->path_rec->pkey = cpu_to_be16(0xffff);

	route->path_rec->mtu_selector = IB_SA_EQ;

	route->path_rec->sl = netdev_get_prio_tc_map(

			ndev->priv_flags & IFF_802_1Q_VLAN ?

				vlan_dev_real_dev(ndev) : ndev,

			rt_tos2priority(id_priv->tos));



	route->path_rec->sl = iboe_tos_to_sl(ndev, id_priv->tos);

	route->path_rec->mtu = iboe_get_mtu(ndev->mtu);

	route->path_rec->rate_selector = IB_SA_EQ;

	route->path_rec->rate = iboe_get_rate(ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE