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

Commit ed616689 authored by Sucheta Chakraborty's avatar Sucheta Chakraborty Committed by David S. Miller
Browse files

net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool. 



o min_tx_rate puts lower limit on the VF bandwidth. VF is guaranteed
  to have a bandwidth of at least this value.
  max_tx_rate puts cap on the VF bandwidth. VF can have a bandwidth
  of up to this value.

o A new handler set_vf_rate for attr IFLA_VF_RATE has been introduced
  which takes 4 arguments:
  netdev, VF number, min_tx_rate, max_tx_rate

o ndo_set_vf_rate replaces ndo_set_vf_tx_rate handler.

o Drivers that currently implement ndo_set_vf_tx_rate should now call
  ndo_set_vf_rate instead and reject attempt to set a minimum bandwidth
  greater than 0 for IFLA_VF_TX_RATE when IFLA_VF_RATE is not yet
  implemented by driver.

o If user enters only one of either min_tx_rate or max_tx_rate, then,
  userland should read back the other value from driver and set both
  for IFLA_VF_RATE.
  Drivers that have not yet implemented IFLA_VF_RATE should always
  return min_tx_rate as 0 when read from ip tool.

o If both IFLA_VF_TX_RATE and IFLA_VF_RATE options are specified, then
  IFLA_VF_RATE should override.

o Idea is to have consistent display of rate values to user.

o Usage example: -

  ./ip link set p4p1 vf 0 rate 900

  ./ip link show p4p1
  32: p4p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode
  DEFAULT qlen 1000
    link/ether 00:0e:1e:08:b0:f0 brd ff:ff:ff:ff:ff:ff
    vf 0 MAC 3e:a0:ca:bd:ae:5a, tx rate 900 (Mbps), max_tx_rate 900Mbps
    vf 1 MAC f6:c6:7c:3f:3d:6c
    vf 2 MAC 56:32:43:98:d7:71
    vf 3 MAC d6:be:c3:b5:85:ff
    vf 4 MAC ee:a9:9a:1e:19:14
    vf 5 MAC 4a:d0:4c:07:52:18
    vf 6 MAC 3a:76:44:93:62:f9
    vf 7 MAC 82:e9:e7:e3:15:1a

  ./ip link set p4p1 vf 0 max_tx_rate 300 min_tx_rate 200

  ./ip link show p4p1
  32: p4p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode
  DEFAULT qlen 1000
    link/ether 00:0e:1e:08:b0:f0 brd ff:ff:ff:ff:ff:ff
    vf 0 MAC 3e:a0:ca:bd:ae:5a, tx rate 300 (Mbps), max_tx_rate 300Mbps,
    min_tx_rate 200Mbps
    vf 1 MAC f6:c6:7c:3f:3d:6c
    vf 2 MAC 56:32:43:98:d7:71
    vf 3 MAC d6:be:c3:b5:85:ff
    vf 4 MAC ee:a9:9a:1e:19:14
    vf 5 MAC 4a:d0:4c:07:52:18
    vf 6 MAC 3a:76:44:93:62:f9
    vf 7 MAC 82:e9:e7:e3:15:1a

  ./ip link set p4p1 vf 0 max_tx_rate 600 rate 300

  ./ip link show p4p1
  32: p4p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode
  DEFAULT qlen 1000
    link/ether 00:0e:1e:08:b0:f brd ff:ff:ff:ff:ff:ff
    vf 0 MAC 3e:a0:ca:bd:ae:5, tx rate 600 (Mbps), max_tx_rate 600Mbps,
    min_tx_rate 200Mbps
    vf 1 MAC f6:c6:7c:3f:3d:6c
    vf 2 MAC 56:32:43:98:d7:71
    vf 3 MAC d6:be:c3:b5:85:ff
    vf 4 MAC ee:a9:9a:1e:19:14
    vf 5 MAC 4a:d0:4c:07:52:18
    vf 6 MAC 3a:76:44:93:62:f9
    vf 7 MAC 82:e9:e7:e3:15:1a

Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 307f0995

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

+2 −1
Original line number Diff line number Diff line
@@ -2576,7 +2576,8 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx, 


	ivi->vf = vfidx;

	ivi->qos = 0;

	ivi->tx_rate = 10000; /* always 10G. TBA take from link struct */

	ivi->max_tx_rate = 10000; /* always 10G. TBA take from link struct */

	ivi->min_tx_rate = 0;

	ivi->spoofchk = 1; /*always enabled */

	if (vf->state == VF_ENABLED) {

		/* mac and vlan are in vlan_mac objects */

drivers/net/ethernet/emulex/benet/be_main.c

+13 −8
Original line number Diff line number Diff line
@@ -1302,7 +1302,8 @@ static int be_get_vf_config(struct net_device *netdev, int vf, 
		return -EINVAL;



	vi->vf = vf;

	vi->tx_rate = vf_cfg->tx_rate;

	vi->max_tx_rate = vf_cfg->tx_rate;

	vi->min_tx_rate = 0;

	vi->vlan = vf_cfg->vlan_tag & VLAN_VID_MASK;

	vi->qos = vf_cfg->vlan_tag >> VLAN_PRIO_SHIFT;

	memcpy(&vi->mac, vf_cfg->mac_addr, ETH_ALEN);
@@ -1342,7 +1343,8 @@ static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) 
	return status;

}



static int be_set_vf_tx_rate(struct net_device *netdev, int vf, int rate)

static int be_set_vf_tx_rate(struct net_device *netdev, int vf,

			     int min_tx_rate, int max_tx_rate)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	int status = 0;
@@ -1353,18 +1355,21 @@ static int be_set_vf_tx_rate(struct net_device *netdev, int vf, int rate) 
	if (vf >= adapter->num_vfs)

		return -EINVAL;



	if (rate < 100 || rate > 10000) {

	if (min_tx_rate)

		return -EINVAL;



	if (max_tx_rate < 100 || max_tx_rate > 10000) {

		dev_err(&adapter->pdev->dev,

			"tx rate must be between 100 and 10000 Mbps\n");

			"max tx rate must be between 100 and 10000 Mbps\n");

		return -EINVAL;

	}



	status = be_cmd_config_qos(adapter, rate / 10, vf + 1);

	status = be_cmd_config_qos(adapter, max_tx_rate / 10, vf + 1);

	if (status)

		dev_err(&adapter->pdev->dev,

			"tx rate %d on VF %d failed\n", rate, vf);

			"max tx rate %d on VF %d failed\n", max_tx_rate, vf);

	else

		adapter->vf_cfg[vf].tx_rate = rate;

		adapter->vf_cfg[vf].tx_rate = max_tx_rate;

	return status;

}

static int be_set_vf_link_state(struct net_device *netdev, int vf,
@@ -4257,7 +4262,7 @@ static const struct net_device_ops be_netdev_ops = { 
	.ndo_vlan_rx_kill_vid	= be_vlan_rem_vid,

	.ndo_set_vf_mac		= be_set_vf_mac,

	.ndo_set_vf_vlan	= be_set_vf_vlan,

	.ndo_set_vf_tx_rate	= be_set_vf_tx_rate,

	.ndo_set_vf_rate	= be_set_vf_tx_rate,

	.ndo_get_vf_config	= be_get_vf_config,

	.ndo_set_vf_link_state  = be_set_vf_link_state,

#ifdef CONFIG_NET_POLL_CONTROLLER

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -6724,7 +6724,7 @@ static const struct net_device_ops i40e_netdev_ops = { 
	.ndo_set_features	= i40e_set_features,

	.ndo_set_vf_mac		= i40e_ndo_set_vf_mac,

	.ndo_set_vf_vlan	= i40e_ndo_set_vf_port_vlan,

	.ndo_set_vf_tx_rate	= i40e_ndo_set_vf_bw,

	.ndo_set_vf_rate	= i40e_ndo_set_vf_bw,

	.ndo_get_vf_config	= i40e_ndo_get_vf_config,

	.ndo_set_vf_link_state	= i40e_ndo_set_vf_link_state,

#ifdef CONFIG_I40E_VXLAN

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+17 −9
Original line number Diff line number Diff line
@@ -2205,7 +2205,8 @@ error_pvid: 
 *

 * configure vf tx rate

 **/

int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate)

int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,

		       int max_tx_rate)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_pf *pf = np->vsi->back;
@@ -2221,6 +2222,12 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate) 
		goto error;

	}



	if (min_tx_rate) {

		dev_err(&pf->pdev->dev, "Invalid min tx rate (%d) (greater than 0) specified for vf %d.\n",

			min_tx_rate, vf_id);

		return -EINVAL;

	}



	vf = &(pf->vf[vf_id]);

	vsi = pf->vsi[vf->lan_vsi_index];

	if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) {
@@ -2243,23 +2250,23 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate) 
		break;

	}



	if (tx_rate > speed) {

		dev_err(&pf->pdev->dev, "Invalid tx rate %d specified for vf %d.",

			tx_rate, vf->vf_id);

	if (max_tx_rate > speed) {

		dev_err(&pf->pdev->dev, "Invalid max tx rate %d specified for vf %d.",

			max_tx_rate, vf->vf_id);

		ret = -EINVAL;

		goto error;

	}



	/* Tx rate credits are in values of 50Mbps, 0 is disabled*/

	ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid, tx_rate / 50, 0,

					  NULL);

	ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid, max_tx_rate / 50,

					  0, NULL);

	if (ret) {

		dev_err(&pf->pdev->dev, "Unable to set tx rate, error code %d.\n",

		dev_err(&pf->pdev->dev, "Unable to set max tx rate, error code %d.\n",

			ret);

		ret = -EIO;

		goto error;

	}

	vf->tx_rate = tx_rate;

	vf->tx_rate = max_tx_rate;

error:

	return ret;

}
@@ -2301,7 +2308,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, 


	memcpy(&ivi->mac, vf->default_lan_addr.addr, ETH_ALEN);



	ivi->tx_rate = vf->tx_rate;

	ivi->max_tx_rate = vf->tx_rate;

	ivi->min_tx_rate = 0;

	ivi->vlan = le16_to_cpu(vsi->info.pvid) & I40E_VLAN_MASK;

	ivi->qos = (le16_to_cpu(vsi->info.pvid) & I40E_PRIORITY_MASK) >>

		   I40E_VLAN_PRIORITY_SHIFT;

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf); 
int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac);

int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,

			      int vf_id, u16 vlan_id, u8 qos);

int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int tx_rate);

int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,

		       int max_tx_rate);

int i40e_ndo_get_vf_config(struct net_device *netdev,

			   int vf_id, struct ifla_vf_info *ivi);

int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link);