Commit d3bd9396 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

IB/cma: Honor traffic class from lower netdevice for RoCE 

When a macvlan netdevice is used for RoCE, consider the tos->prio->tc
mapping as SL using its lower netdevice.

1. If the lower netdevice is a VLAN netdevice, consider the VLAN netdevice
   and it's parent netdevice for mapping
2. If the lower netdevice is not a VLAN netdevice, consider tc mapping
   directly from the lower netdevice

Link: https://lore.kernel.org/r/20191015072058.17347-1-leon@kernel.org


Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 4061ff7a

drivers/infiniband/core/cma.c

+52 −9
Original line number Diff line number Diff line
@@ -2827,21 +2827,64 @@ static int cma_resolve_iw_route(struct rdma_id_private *id_priv) 
	return 0;

}



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

static int get_vlan_ndev_tc(struct net_device *vlan_ndev, int prio)

{

	int prio;

	struct net_device *dev;



	prio = rt_tos2priority(tos);

	dev = is_vlan_dev(ndev) ? vlan_dev_real_dev(ndev) : ndev;

	dev = vlan_dev_real_dev(vlan_ndev);

	if (dev->num_tc)

		return netdev_get_prio_tc_map(dev, prio);



#if IS_ENABLED(CONFIG_VLAN_8021Q)

	if (is_vlan_dev(ndev))

		return (vlan_dev_get_egress_qos_mask(ndev, prio) &

	return (vlan_dev_get_egress_qos_mask(vlan_ndev, prio) &

		VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;

#endif

}



struct iboe_prio_tc_map {

	int input_prio;

	int output_tc;

	bool found;

};



static int get_lower_vlan_dev_tc(struct net_device *dev, void *data)

{

	struct iboe_prio_tc_map *map = data;



	if (is_vlan_dev(dev))

		map->output_tc = get_vlan_ndev_tc(dev, map->input_prio);

	else if (dev->num_tc)

		map->output_tc = netdev_get_prio_tc_map(dev, map->input_prio);

	else

		map->output_tc = 0;

	/* We are interested only in first level VLAN device, so always

	 * return 1 to stop iterating over next level devices.

	 */

	map->found = true;

	return 1;

}



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

{

	struct iboe_prio_tc_map prio_tc_map = {};

	int prio = rt_tos2priority(tos);



	/* If VLAN device, get it directly from the VLAN netdev */

	if (is_vlan_dev(ndev))

		return get_vlan_ndev_tc(ndev, prio);



	prio_tc_map.input_prio = prio;

	rcu_read_lock();

	netdev_walk_all_lower_dev_rcu(ndev,

				      get_lower_vlan_dev_tc,

				      &prio_tc_map);

	rcu_read_unlock();

	/* If map is found from lower device, use it; Otherwise

	 * continue with the current netdevice to get priority to tc map.

	 */

	if (prio_tc_map.found)

		return prio_tc_map.output_tc;

	else if (ndev->num_tc)

		return netdev_get_prio_tc_map(ndev, prio);

	else

		return 0;

}