Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56f36acd authored by Amritha Nambiar's avatar Amritha Nambiar Committed by David S. Miller
Browse files

mqprio: Modify mqprio to pass user parameters via ndo_setup_tc. 



The configurable priority to traffic class mapping and the user specified
queue ranges are used to configure the traffic class, overriding the
hardware defaults when the 'hw' option is set to 0. However, when the 'hw'
option is non-zero, the hardware QOS defaults are used.

This patch makes it so that we can pass the data the user provided to
ndo_setup_tc. This allows us to pull in the queue configuration if the
user requested it as well as any additional hardware offload type
requested by using a value other than 1 for the hw value.

Finally it also provides a means for the device driver to return the level
supported for the offload type via the qopt->hw value. Previously we were
just always assuming the value to be 1, in the future values beyond just 1
may be supported.

Signed-off-by: default avatarAmritha Nambiar <amritha.nambiar@intel.com>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2026fecf

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+2 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,8 @@ static int xgbe_setup_tc(struct net_device *netdev, u32 handle, __be16 proto, 
	if (tc_to_netdev->type != TC_SETUP_MQPRIO)

		return -EINVAL;



	tc = tc_to_netdev->tc;

	tc_to_netdev->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

	tc = tc_to_netdev->mqprio->num_tc;



	if (tc > pdata->hw_feat.tc_cnt)

		return -EINVAL;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+4 −1
Original line number Diff line number Diff line
@@ -4277,7 +4277,10 @@ int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
{

	if (tc->type != TC_SETUP_MQPRIO)

		return -EINVAL;

	return bnx2x_setup_tc(dev, tc->tc);



	tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;



	return bnx2x_setup_tc(dev, tc->mqprio->num_tc);

}



/* called with rtnl_lock */

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+3 −1
Original line number Diff line number Diff line
@@ -6905,7 +6905,9 @@ static int bnxt_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
	if (ntc->type != TC_SETUP_MQPRIO)

		return -EINVAL;



	return bnxt_setup_mq_tc(dev, ntc->tc);

	ntc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;



	return bnxt_setup_mq_tc(dev, ntc->mqprio->num_tc);

}



#ifdef CONFIG_RFS_ACCEL

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+10 −6
Original line number Diff line number Diff line
@@ -346,33 +346,37 @@ static int dpaa_setup_tc(struct net_device *net_dev, u32 handle, __be16 proto, 
			 struct tc_to_netdev *tc)

{

	struct dpaa_priv *priv = netdev_priv(net_dev);

	u8 num_tc;

	int i;



	if (tc->type != TC_SETUP_MQPRIO)

		return -EINVAL;



	if (tc->tc == priv->num_tc)

	tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;

	num_tc = tc->mqprio->num_tc;



	if (num_tc == priv->num_tc)

		return 0;



	if (!tc->tc) {

	if (!num_tc) {

		netdev_reset_tc(net_dev);

		goto out;

	}



	if (tc->tc > DPAA_TC_NUM) {

	if (num_tc > DPAA_TC_NUM) {

		netdev_err(net_dev, "Too many traffic classes: max %d supported.\n",

			   DPAA_TC_NUM);

		return -EINVAL;

	}



	netdev_set_num_tc(net_dev, tc->tc);

	netdev_set_num_tc(net_dev, num_tc);



	for (i = 0; i < tc->tc; i++)

	for (i = 0; i < num_tc; i++)

		netdev_set_tc_queue(net_dev, i, DPAA_TC_TXQ_NUM,

				    i * DPAA_TC_TXQ_NUM);



out:

	priv->num_tc = tc->tc ? tc->tc : 1;

	priv->num_tc = num_tc ? : 1;

	netif_set_real_num_tx_queues(net_dev, priv->num_tc * DPAA_TC_TXQ_NUM);

	return 0;

}

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+3 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,9 @@ static int __fm10k_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
	if (tc->type != TC_SETUP_MQPRIO)

		return -EINVAL;



	return fm10k_setup_tc(dev, tc->tc);

	tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;



	return fm10k_setup_tc(dev, tc->mqprio->num_tc);

}



static void fm10k_assign_l2_accel(struct fm10k_intfc *interface,