Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sucheta Chakraborty 2014-05-22 09:59:05 -04:00 committed by David S. Miller
parent 307f099520
commit ed616689a3
20 changed files with 158 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
View File

@ -2576,7 +2576,8 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx,
ivi->vf = vfidx; ivi->vf = vfidx;
ivi->qos = 0; 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 */ ivi->spoofchk = 1; /*always enabled */
if (vf->state == VF_ENABLED) { if (vf->state == VF_ENABLED) {
/* mac and vlan are in vlan_mac objects */ /* mac and vlan are in vlan_mac objects */

21
drivers/net/ethernet/emulex/benet/be_main.c
View File

@ -1302,7 +1302,8 @@ static int be_get_vf_config(struct net_device *netdev, int vf,
return -EINVAL; return -EINVAL;
vi->vf = vf; 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->vlan = vf_cfg->vlan_tag & VLAN_VID_MASK;
vi->qos = vf_cfg->vlan_tag >> VLAN_PRIO_SHIFT; vi->qos = vf_cfg->vlan_tag >> VLAN_PRIO_SHIFT;
memcpy(&vi->mac, vf_cfg->mac_addr, ETH_ALEN); 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; 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); struct be_adapter *adapter = netdev_priv(netdev);
int status = 0; 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) if (vf >= adapter->num_vfs)
return -EINVAL; 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, 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; 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) if (status)
dev_err(&adapter->pdev->dev, 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 else
adapter->vf_cfg[vf].tx_rate = rate; adapter->vf_cfg[vf].tx_rate = max_tx_rate;
return status; return status;
} }
static int be_set_vf_link_state(struct net_device *netdev, int vf, 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_vlan_rx_kill_vid = be_vlan_rem_vid,
.ndo_set_vf_mac = be_set_vf_mac, .ndo_set_vf_mac = be_set_vf_mac,
.ndo_set_vf_vlan = be_set_vf_vlan, .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_get_vf_config = be_get_vf_config,
.ndo_set_vf_link_state = be_set_vf_link_state, .ndo_set_vf_link_state = be_set_vf_link_state,
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER

2
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -6724,7 +6724,7 @@ static const struct net_device_ops i40e_netdev_ops = {
.ndo_set_features = i40e_set_features, .ndo_set_features = i40e_set_features,
.ndo_set_vf_mac = i40e_ndo_set_vf_mac, .ndo_set_vf_mac = i40e_ndo_set_vf_mac,
.ndo_set_vf_vlan = i40e_ndo_set_vf_port_vlan, .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_get_vf_config = i40e_ndo_get_vf_config,
.ndo_set_vf_link_state = i40e_ndo_set_vf_link_state, .ndo_set_vf_link_state = i40e_ndo_set_vf_link_state,
#ifdef CONFIG_I40E_VXLAN #ifdef CONFIG_I40E_VXLAN

26
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
View File

@ -2205,7 +2205,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
* *
* configure vf tx rate * 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_netdev_priv *np = netdev_priv(netdev);
struct i40e_pf *pf = np->vsi->back; 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; 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]); vf = &(pf->vf[vf_id]);
vsi = pf->vsi[vf->lan_vsi_index]; vsi = pf->vsi[vf->lan_vsi_index];
if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states)) { 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; break;
} }
if (tx_rate > speed) { if (max_tx_rate > speed) {
dev_err(&pf->pdev->dev, "Invalid tx rate %d specified for vf %d.", dev_err(&pf->pdev->dev, "Invalid max tx rate %d specified for vf %d.",
tx_rate, vf->vf_id); max_tx_rate, vf->vf_id);
ret = -EINVAL; ret = -EINVAL;
goto error; goto error;
} }
/* Tx rate credits are in values of 50Mbps, 0 is disabled*/ /* 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, ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid, max_tx_rate / 50,
NULL); 0, NULL);
if (ret) { 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);
ret = -EIO; ret = -EIO;
goto error; goto error;
} }
vf->tx_rate = tx_rate; vf->tx_rate = max_tx_rate;
error: error:
return ret; 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); 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->vlan = le16_to_cpu(vsi->info.pvid) & I40E_VLAN_MASK;
ivi->qos = (le16_to_cpu(vsi->info.pvid) & I40E_PRIORITY_MASK) >> ivi->qos = (le16_to_cpu(vsi->info.pvid) & I40E_PRIORITY_MASK) >>
I40E_VLAN_PRIORITY_SHIFT; I40E_VLAN_PRIORITY_SHIFT;

3
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
View File

@ -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_mac(struct net_device *netdev, int vf_id, u8 *mac);
int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
int vf_id, u16 vlan_id, u8 qos); 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 i40e_ndo_get_vf_config(struct net_device *netdev,
int vf_id, struct ifla_vf_info *ivi); int vf_id, struct ifla_vf_info *ivi);
int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link); int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link);

20
drivers/net/ethernet/intel/igb/igb_main.c
View File

@ -169,7 +169,7 @@ static void igb_restore_vf_multicasts(struct igb_adapter *adapter);
static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac); static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
static int igb_ndo_set_vf_vlan(struct net_device *netdev, static int igb_ndo_set_vf_vlan(struct net_device *netdev,
int vf, u16 vlan, u8 qos); int vf, u16 vlan, u8 qos);
static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate); static int igb_ndo_set_vf_bw(struct net_device *, int, int, int);
static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
bool setting); bool setting);
static int igb_ndo_get_vf_config(struct net_device *netdev, int vf, static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,
@ -2084,7 +2084,7 @@ static const struct net_device_ops igb_netdev_ops = {
.ndo_vlan_rx_kill_vid = igb_vlan_rx_kill_vid, .ndo_vlan_rx_kill_vid = igb_vlan_rx_kill_vid,
.ndo_set_vf_mac = igb_ndo_set_vf_mac, .ndo_set_vf_mac = igb_ndo_set_vf_mac,
.ndo_set_vf_vlan = igb_ndo_set_vf_vlan, .ndo_set_vf_vlan = igb_ndo_set_vf_vlan,
.ndo_set_vf_tx_rate = igb_ndo_set_vf_bw, .ndo_set_vf_rate = igb_ndo_set_vf_bw,
.ndo_set_vf_spoofchk = igb_ndo_set_vf_spoofchk, .ndo_set_vf_spoofchk = igb_ndo_set_vf_spoofchk,
.ndo_get_vf_config = igb_ndo_get_vf_config, .ndo_get_vf_config = igb_ndo_get_vf_config,
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
@ -7879,7 +7879,8 @@ static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
} }
} }
static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate) static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf,
int min_tx_rate, int max_tx_rate)
{ {
struct igb_adapter *adapter = netdev_priv(netdev); struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
@ -7888,15 +7889,19 @@ static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
if (hw->mac.type != e1000_82576) if (hw->mac.type != e1000_82576)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (min_tx_rate)
return -EINVAL;
actual_link_speed = igb_link_mbps(adapter->link_speed); actual_link_speed = igb_link_mbps(adapter->link_speed);
if ((vf >= adapter->vfs_allocated_count) || if ((vf >= adapter->vfs_allocated_count) ||
(!(rd32(E1000_STATUS) & E1000_STATUS_LU)) || (!(rd32(E1000_STATUS) & E1000_STATUS_LU)) ||
(tx_rate < 0) || (tx_rate > actual_link_speed)) (max_tx_rate < 0) ||
(max_tx_rate > actual_link_speed))
return -EINVAL; return -EINVAL;
adapter->vf_rate_link_speed = actual_link_speed; adapter->vf_rate_link_speed = actual_link_speed;
adapter->vf_data[vf].tx_rate = (u16)tx_rate; adapter->vf_data[vf].tx_rate = (u16)max_tx_rate;
igb_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed); igb_set_vf_rate_limit(hw, vf, max_tx_rate, actual_link_speed);
return 0; return 0;
} }
@ -7936,7 +7941,8 @@ static int igb_ndo_get_vf_config(struct net_device *netdev,
return -EINVAL; return -EINVAL;
ivi->vf = vf; ivi->vf = vf;
memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN); memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
ivi->tx_rate = adapter->vf_data[vf].tx_rate; ivi->max_tx_rate = adapter->vf_data[vf].tx_rate;
ivi->min_tx_rate = 0;
ivi->vlan = adapter->vf_data[vf].pf_vlan; ivi->vlan = adapter->vf_data[vf].pf_vlan;
ivi->qos = adapter->vf_data[vf].pf_qos; ivi->qos = adapter->vf_data[vf].pf_qos;
ivi->spoofchk = adapter->vf_data[vf].spoofchk_enabled; ivi->spoofchk = adapter->vf_data[vf].spoofchk_enabled;

2
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View File

@ -7926,7 +7926,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_do_ioctl = ixgbe_ioctl, .ndo_do_ioctl = ixgbe_ioctl,
.ndo_set_vf_mac = ixgbe_ndo_set_vf_mac, .ndo_set_vf_mac = ixgbe_ndo_set_vf_mac,
.ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan,
.ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw, .ndo_set_vf_rate = ixgbe_ndo_set_vf_bw,
.ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk, .ndo_set_vf_spoofchk = ixgbe_ndo_set_vf_spoofchk,
.ndo_get_vf_config = ixgbe_ndo_get_vf_config, .ndo_get_vf_config = ixgbe_ndo_get_vf_config,
.ndo_get_stats64 = ixgbe_get_stats64, .ndo_get_stats64 = ixgbe_get_stats64,

13
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
View File

@ -1222,7 +1222,8 @@ void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter)
} }
} }
int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate) int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate,
int max_tx_rate)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
int link_speed; int link_speed;
@ -1240,13 +1241,16 @@ int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
if (link_speed != 10000) if (link_speed != 10000)
return -EINVAL; return -EINVAL;
if (min_tx_rate)
return -EINVAL;
/* rate limit cannot be less than 10Mbs or greater than link speed */ /* rate limit cannot be less than 10Mbs or greater than link speed */
if (tx_rate && ((tx_rate <= 10) || (tx_rate > link_speed))) if (max_tx_rate && ((max_tx_rate <= 10) || (max_tx_rate > link_speed)))
return -EINVAL; return -EINVAL;
/* store values */ /* store values */
adapter->vf_rate_link_speed = link_speed; adapter->vf_rate_link_speed = link_speed;
adapter->vfinfo[vf].tx_rate = tx_rate; adapter->vfinfo[vf].tx_rate = max_tx_rate;
/* update hardware configuration */ /* update hardware configuration */
ixgbe_set_vf_rate_limit(adapter, vf); ixgbe_set_vf_rate_limit(adapter, vf);
@ -1288,7 +1292,8 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev,
return -EINVAL; return -EINVAL;
ivi->vf = vf; ivi->vf = vf;
memcpy(&ivi->mac, adapter->vfinfo[vf].vf_mac_addresses, ETH_ALEN); memcpy(&ivi->mac, adapter->vfinfo[vf].vf_mac_addresses, ETH_ALEN);
ivi->tx_rate = adapter->vfinfo[vf].tx_rate; ivi->max_tx_rate = adapter->vfinfo[vf].tx_rate;
ivi->min_tx_rate = 0;
ivi->vlan = adapter->vfinfo[vf].pf_vlan; ivi->vlan = adapter->vfinfo[vf].pf_vlan;
ivi->qos = adapter->vfinfo[vf].pf_qos; ivi->qos = adapter->vfinfo[vf].pf_qos;
ivi->spoofchk = adapter->vfinfo[vf].spoofchk_enabled; ivi->spoofchk = adapter->vfinfo[vf].spoofchk_enabled;

3
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
View File

@ -44,7 +44,8 @@ void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);
int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac); int ixgbe_ndo_set_vf_mac(struct net_device *netdev, int queue, u8 *mac);
int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan, int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,
u8 qos); u8 qos);
int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate); int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int min_tx_rate,
int max_tx_rate);
int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting); int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);
int ixgbe_ndo_get_vf_config(struct net_device *netdev, int ixgbe_ndo_get_vf_config(struct net_device *netdev,
int vf, struct ifla_vf_info *ivi); int vf, struct ifla_vf_info *ivi);

11
drivers/net/ethernet/mellanox/mlx4/cmd.c
View File

@ -2486,11 +2486,12 @@ int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_in
ivf->mac[4] = ((s_info->mac >> (1*8)) & 0xff); ivf->mac[4] = ((s_info->mac >> (1*8)) & 0xff);
ivf->mac[5] = ((s_info->mac) & 0xff); ivf->mac[5] = ((s_info->mac) & 0xff);
ivf->vlan = s_info->default_vlan; ivf->vlan = s_info->default_vlan;
ivf->qos = s_info->default_qos; ivf->qos = s_info->default_qos;
ivf->tx_rate = s_info->tx_rate; ivf->max_tx_rate = s_info->tx_rate;
ivf->spoofchk = s_info->spoofchk; ivf->min_tx_rate = 0;
ivf->linkstate = s_info->link_state; ivf->spoofchk = s_info->spoofchk;
ivf->linkstate = s_info->link_state;
return 0; return 0;
} }

1
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
View File

@ -1319,6 +1319,7 @@ struct qlcnic_eswitch {
#define QL_STATUS_INVALID_PARAM -1 #define QL_STATUS_INVALID_PARAM -1
#define MAX_BW 100 /* % of link speed */ #define MAX_BW 100 /* % of link speed */
#define MIN_BW 1 /* % of link speed */
#define MAX_VLAN_ID 4095 #define MAX_VLAN_ID 4095
#define MIN_VLAN_ID 2 #define MIN_VLAN_ID 2
#define DEFAULT_MAC_LEARN 1 #define DEFAULT_MAC_LEARN 1

2
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View File

@ -525,7 +525,7 @@ static const struct net_device_ops qlcnic_netdev_ops = {
#endif #endif
#ifdef CONFIG_QLCNIC_SRIOV #ifdef CONFIG_QLCNIC_SRIOV
.ndo_set_vf_mac = qlcnic_sriov_set_vf_mac, .ndo_set_vf_mac = qlcnic_sriov_set_vf_mac,
.ndo_set_vf_tx_rate = qlcnic_sriov_set_vf_tx_rate, .ndo_set_vf_rate = qlcnic_sriov_set_vf_tx_rate,
.ndo_get_vf_config = qlcnic_sriov_get_vf_config, .ndo_get_vf_config = qlcnic_sriov_get_vf_config,
.ndo_set_vf_vlan = qlcnic_sriov_set_vf_vlan, .ndo_set_vf_vlan = qlcnic_sriov_set_vf_vlan,
.ndo_set_vf_spoofchk = qlcnic_sriov_set_vf_spoofchk, .ndo_set_vf_spoofchk = qlcnic_sriov_set_vf_spoofchk,

2
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h
View File

@ -233,7 +233,7 @@ bool qlcnic_sriov_soft_flr_check(struct qlcnic_adapter *,
void qlcnic_sriov_pf_reset(struct qlcnic_adapter *); void qlcnic_sriov_pf_reset(struct qlcnic_adapter *);
int qlcnic_sriov_pf_reinit(struct qlcnic_adapter *); int qlcnic_sriov_pf_reinit(struct qlcnic_adapter *);
int qlcnic_sriov_set_vf_mac(struct net_device *, int, u8 *); int qlcnic_sriov_set_vf_mac(struct net_device *, int, u8 *);
int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int); int qlcnic_sriov_set_vf_tx_rate(struct net_device *, int, int, int);
int qlcnic_sriov_get_vf_config(struct net_device *, int , int qlcnic_sriov_get_vf_config(struct net_device *, int ,
struct ifla_vf_info *); struct ifla_vf_info *);
int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8); int qlcnic_sriov_set_vf_vlan(struct net_device *, int, u16, u8);

1
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
View File

@ -201,6 +201,7 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs)
sriov->vf_info[i].vp = vp; sriov->vf_info[i].vp = vp;
vp->vlan_mode = QLC_GUEST_VLAN_MODE; vp->vlan_mode = QLC_GUEST_VLAN_MODE;
vp->max_tx_bw = MAX_BW; vp->max_tx_bw = MAX_BW;
vp->min_tx_bw = MIN_BW;
vp->spoofchk = false; vp->spoofchk = false;
random_ether_addr(vp->mac); random_ether_addr(vp->mac);
dev_info(&adapter->pdev->dev, dev_info(&adapter->pdev->dev,

56
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
View File

@ -1848,7 +1848,8 @@ int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
return 0; return 0;
} }
int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf, int tx_rate) int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf,
int min_tx_rate, int max_tx_rate)
{ {
struct qlcnic_adapter *adapter = netdev_priv(netdev); struct qlcnic_adapter *adapter = netdev_priv(netdev);
struct qlcnic_sriov *sriov = adapter->ahw->sriov; struct qlcnic_sriov *sriov = adapter->ahw->sriov;
@ -1863,35 +1864,52 @@ int qlcnic_sriov_set_vf_tx_rate(struct net_device *netdev, int vf, int tx_rate)
if (vf >= sriov->num_vfs) if (vf >= sriov->num_vfs)
return -EINVAL; return -EINVAL;
if (tx_rate >= 10000 || tx_rate < 100) {
netdev_err(netdev,
"Invalid Tx rate, allowed range is [%d - %d]",
QLC_VF_MIN_TX_RATE, QLC_VF_MAX_TX_RATE);
return -EINVAL;
}
if (tx_rate == 0)
tx_rate = 10000;
vf_info = &sriov->vf_info[vf]; vf_info = &sriov->vf_info[vf];
vp = vf_info->vp; vp = vf_info->vp;
vpid = vp->handle; vpid = vp->handle;
if (!min_tx_rate)
min_tx_rate = QLC_VF_MIN_TX_RATE;
if (max_tx_rate &&
(max_tx_rate >= 10000 || max_tx_rate < min_tx_rate)) {
netdev_err(netdev,
"Invalid max Tx rate, allowed range is [%d - %d]",
min_tx_rate, QLC_VF_MAX_TX_RATE);
return -EINVAL;
}
if (!max_tx_rate)
max_tx_rate = 10000;
if (min_tx_rate &&
(min_tx_rate > max_tx_rate || min_tx_rate < QLC_VF_MIN_TX_RATE)) {
netdev_err(netdev,
"Invalid min Tx rate, allowed range is [%d - %d]",
QLC_VF_MIN_TX_RATE, max_tx_rate);
return -EINVAL;
}
if (test_bit(QLC_BC_VF_STATE, &vf_info->state)) { if (test_bit(QLC_BC_VF_STATE, &vf_info->state)) {
if (qlcnic_sriov_get_vf_vport_info(adapter, &nic_info, vpid)) if (qlcnic_sriov_get_vf_vport_info(adapter, &nic_info, vpid))
return -EIO; return -EIO;
nic_info.max_tx_bw = tx_rate / 100; nic_info.max_tx_bw = max_tx_rate / 100;
nic_info.min_tx_bw = min_tx_rate / 100;
nic_info.bit_offsets = BIT_0; nic_info.bit_offsets = BIT_0;
if (qlcnic_sriov_pf_set_vport_info(adapter, &nic_info, vpid)) if (qlcnic_sriov_pf_set_vport_info(adapter, &nic_info, vpid))
return -EIO; return -EIO;
} }
vp->max_tx_bw = tx_rate / 100; vp->max_tx_bw = max_tx_rate / 100;
netdev_info(netdev, netdev_info(netdev,
"Setting Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n", "Setting Max Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n",
tx_rate, vp->max_tx_bw, vf); max_tx_rate, vp->max_tx_bw, vf);
vp->min_tx_bw = min_tx_rate / 100;
netdev_info(netdev,
"Setting Min Tx rate %d (Mbps), %d %% of PF bandwidth, for VF %d\n",
min_tx_rate, vp->min_tx_bw, vf);
return 0; return 0;
} }
@ -1990,9 +2008,13 @@ int qlcnic_sriov_get_vf_config(struct net_device *netdev,
ivi->qos = vp->qos; ivi->qos = vp->qos;
ivi->spoofchk = vp->spoofchk; ivi->spoofchk = vp->spoofchk;
if (vp->max_tx_bw == MAX_BW) if (vp->max_tx_bw == MAX_BW)
ivi->tx_rate = 0; ivi->max_tx_rate = 0;
else else
ivi->tx_rate = vp->max_tx_bw * 100; ivi->max_tx_rate = vp->max_tx_bw * 100;
if (vp->min_tx_bw == MIN_BW)
ivi->min_tx_rate = 0;
else
ivi->min_tx_rate = vp->min_tx_bw * 100;
ivi->vf = vf; ivi->vf = vf;
return 0; return 0;

3
drivers/net/ethernet/sfc/siena_sriov.c
View File

@ -1633,7 +1633,8 @@ int efx_sriov_get_vf_config(struct net_device *net_dev, int vf_i,
ivi->vf = vf_i; ivi->vf = vf_i;
ether_addr_copy(ivi->mac, vf->addr.mac_addr); ether_addr_copy(ivi->mac, vf->addr.mac_addr);
ivi->tx_rate = 0; ivi->max_tx_rate = 0;
ivi->min_tx_rate = 0;
tci = ntohs(vf->addr.tci); tci = ntohs(vf->addr.tci);
ivi->vlan = tci & VLAN_VID_MASK; ivi->vlan = tci & VLAN_VID_MASK;
ivi->qos = (tci >> VLAN_PRIO_SHIFT) & 0x7; ivi->qos = (tci >> VLAN_PRIO_SHIFT) & 0x7;

3
include/linux/if_link.h
View File

@ -10,8 +10,9 @@ struct ifla_vf_info {
__u8 mac[32]; __u8 mac[32];
__u32 vlan; __u32 vlan;
__u32 qos; __u32 qos;
__u32 tx_rate;
__u32 spoofchk; __u32 spoofchk;
__u32 linkstate; __u32 linkstate;
__u32 min_tx_rate;
__u32 max_tx_rate;
}; };
#endif /* _LINUX_IF_LINK_H */ #endif /* _LINUX_IF_LINK_H */

8
include/linux/netdevice.h
View File

@ -850,7 +850,8 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
* SR-IOV management functions. * SR-IOV management functions.
* int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac); * int (*ndo_set_vf_mac)(struct net_device *dev, int vf, u8* mac);
* int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos); * int (*ndo_set_vf_vlan)(struct net_device *dev, int vf, u16 vlan, u8 qos);
* int (*ndo_set_vf_tx_rate)(struct net_device *dev, int vf, int rate); * int (*ndo_set_vf_rate)(struct net_device *dev, int vf, int min_tx_rate,
* int max_tx_rate);
* int (*ndo_set_vf_spoofchk)(struct net_device *dev, int vf, bool setting); * int (*ndo_set_vf_spoofchk)(struct net_device *dev, int vf, bool setting);
* int (*ndo_get_vf_config)(struct net_device *dev, * int (*ndo_get_vf_config)(struct net_device *dev,
* int vf, struct ifla_vf_info *ivf); * int vf, struct ifla_vf_info *ivf);
@ -1044,8 +1045,9 @@ struct net_device_ops {
int queue, u8 *mac); int queue, u8 *mac);
int (*ndo_set_vf_vlan)(struct net_device *dev, int (*ndo_set_vf_vlan)(struct net_device *dev,
int queue, u16 vlan, u8 qos); int queue, u16 vlan, u8 qos);
int (*ndo_set_vf_tx_rate)(struct net_device *dev, int (*ndo_set_vf_rate)(struct net_device *dev,
int vf, int rate); int vf, int min_tx_rate,
int max_tx_rate);
int (*ndo_set_vf_spoofchk)(struct net_device *dev, int (*ndo_set_vf_spoofchk)(struct net_device *dev,
int vf, bool setting); int vf, bool setting);
int (*ndo_get_vf_config)(struct net_device *dev, int (*ndo_get_vf_config)(struct net_device *dev,

9
include/uapi/linux/if_link.h
View File

@ -399,9 +399,10 @@ enum {
IFLA_VF_UNSPEC, IFLA_VF_UNSPEC,
IFLA_VF_MAC, /* Hardware queue specific attributes */ IFLA_VF_MAC, /* Hardware queue specific attributes */
IFLA_VF_VLAN, IFLA_VF_VLAN,
IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ IFLA_VF_TX_RATE, /* Max TX Bandwidth Allocation */
IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */ IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */ IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */
IFLA_VF_RATE, /* Min and Max TX Bandwidth Allocation */
__IFLA_VF_MAX, __IFLA_VF_MAX,
}; };
@ -423,6 +424,12 @@ struct ifla_vf_tx_rate {
__u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */ __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
}; };
struct ifla_vf_rate {
__u32 vf;
__u32 min_tx_rate; /* Min Bandwidth in Mbps */
__u32 max_tx_rate; /* Max Bandwidth in Mbps */
};
struct ifla_vf_spoofchk { struct ifla_vf_spoofchk {
__u32 vf; __u32 vf;
__u32 setting; __u32 setting;

38
net/core/rtnetlink.c
View File

@ -767,8 +767,8 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,
size += num_vfs * size += num_vfs *
(nla_total_size(sizeof(struct ifla_vf_mac)) + (nla_total_size(sizeof(struct ifla_vf_mac)) +
nla_total_size(sizeof(struct ifla_vf_vlan)) + nla_total_size(sizeof(struct ifla_vf_vlan)) +
nla_total_size(sizeof(struct ifla_vf_tx_rate)) + nla_total_size(sizeof(struct ifla_vf_spoofchk)) +
nla_total_size(sizeof(struct ifla_vf_spoofchk))); nla_total_size(sizeof(struct ifla_vf_rate)));
return size; return size;
} else } else
return 0; return 0;
@ -1034,6 +1034,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
struct ifla_vf_info ivi; struct ifla_vf_info ivi;
struct ifla_vf_mac vf_mac; struct ifla_vf_mac vf_mac;
struct ifla_vf_vlan vf_vlan; struct ifla_vf_vlan vf_vlan;
struct ifla_vf_rate vf_rate;
struct ifla_vf_tx_rate vf_tx_rate; struct ifla_vf_tx_rate vf_tx_rate;
struct ifla_vf_spoofchk vf_spoofchk; struct ifla_vf_spoofchk vf_spoofchk;
struct ifla_vf_link_state vf_linkstate; struct ifla_vf_link_state vf_linkstate;
@ -1054,6 +1055,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
break; break;
vf_mac.vf = vf_mac.vf =
vf_vlan.vf = vf_vlan.vf =
vf_rate.vf =
vf_tx_rate.vf = vf_tx_rate.vf =
vf_spoofchk.vf = vf_spoofchk.vf =
vf_linkstate.vf = ivi.vf; vf_linkstate.vf = ivi.vf;
@ -1061,7 +1063,9 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac)); memcpy(vf_mac.mac, ivi.mac, sizeof(ivi.mac));
vf_vlan.vlan = ivi.vlan; vf_vlan.vlan = ivi.vlan;
vf_vlan.qos = ivi.qos; vf_vlan.qos = ivi.qos;
vf_tx_rate.rate = ivi.tx_rate; vf_tx_rate.rate = ivi.max_tx_rate;
vf_rate.min_tx_rate = ivi.min_tx_rate;
vf_rate.max_tx_rate = ivi.max_tx_rate;
vf_spoofchk.setting = ivi.spoofchk; vf_spoofchk.setting = ivi.spoofchk;
vf_linkstate.link_state = ivi.linkstate; vf_linkstate.link_state = ivi.linkstate;
vf = nla_nest_start(skb, IFLA_VF_INFO); vf = nla_nest_start(skb, IFLA_VF_INFO);
@ -1071,6 +1075,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
} }
if (nla_put(skb, IFLA_VF_MAC, sizeof(vf_mac), &vf_mac) || if (nla_put(skb, IFLA_VF_MAC, sizeof(vf_mac), &vf_mac) ||
nla_put(skb, IFLA_VF_VLAN, sizeof(vf_vlan), &vf_vlan) || nla_put(skb, IFLA_VF_VLAN, sizeof(vf_vlan), &vf_vlan) ||
nla_put(skb, IFLA_VF_RATE, sizeof(vf_rate),
&vf_rate) ||
nla_put(skb, IFLA_VF_TX_RATE, sizeof(vf_tx_rate), nla_put(skb, IFLA_VF_TX_RATE, sizeof(vf_tx_rate),
&vf_tx_rate) || &vf_tx_rate) ||
nla_put(skb, IFLA_VF_SPOOFCHK, sizeof(vf_spoofchk), nla_put(skb, IFLA_VF_SPOOFCHK, sizeof(vf_spoofchk),
@ -1177,6 +1183,8 @@ static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
.len = sizeof(struct ifla_vf_tx_rate) }, .len = sizeof(struct ifla_vf_tx_rate) },
[IFLA_VF_SPOOFCHK] = { .type = NLA_BINARY, [IFLA_VF_SPOOFCHK] = { .type = NLA_BINARY,
.len = sizeof(struct ifla_vf_spoofchk) }, .len = sizeof(struct ifla_vf_spoofchk) },
[IFLA_VF_RATE] = { .type = NLA_BINARY,
.len = sizeof(struct ifla_vf_rate) },
}; };
static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = { static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {
@ -1336,11 +1344,29 @@ static int do_setvfinfo(struct net_device *dev, struct nlattr *attr)
} }
case IFLA_VF_TX_RATE: { case IFLA_VF_TX_RATE: {
struct ifla_vf_tx_rate *ivt; struct ifla_vf_tx_rate *ivt;
struct ifla_vf_info ivf;
ivt = nla_data(vf); ivt = nla_data(vf);
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
if (ops->ndo_set_vf_tx_rate) if (ops->ndo_get_vf_config)
err = ops->ndo_set_vf_tx_rate(dev, ivt->vf, err = ops->ndo_get_vf_config(dev, ivt->vf,
ivt->rate); &ivf);
if (err)
break;
err = -EOPNOTSUPP;
if (ops->ndo_set_vf_rate)
err = ops->ndo_set_vf_rate(dev, ivt->vf,
ivf.min_tx_rate,
ivt->rate);
break;
}
case IFLA_VF_RATE: {
struct ifla_vf_rate *ivt;
ivt = nla_data(vf);
err = -EOPNOTSUPP;
if (ops->ndo_set_vf_rate)
err = ops->ndo_set_vf_rate(dev, ivt->vf,
ivt->min_tx_rate,
ivt->max_tx_rate);
break; break;
} }
case IFLA_VF_SPOOFCHK: { case IFLA_VF_SPOOFCHK: {