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

Commit 79aab093 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by David S. Miller
Browse files

net: Update API for VF vlan protocol 802.1ad support 



Introduce new rtnl UAPI that exposes a list of vlans per VF, giving
the ability for user-space application to specify it for the VF, as an
option to support 802.1ad.
We adjusted IP Link tool to support this option.

For future use cases, the new UAPI supports multiple vlans. For now we
limit the list size to a single vlan in kernel.
Add IFLA_VF_VLAN_LIST in addition to IFLA_VF_VLAN to keep backward
compatibility with older versions of IP Link tool.

Add a vlan protocol parameter to the ndo_set_vf_vlan callback.
We kept 802.1Q as the drivers' default vlan protocol.
Suitable ip link tool command examples:
  Set vf vlan protocol 802.1ad:
    ip link set eth0 vf 1 vlan 100 proto 802.1ad
  Set vf to VST (802.1Q) mode:
    ip link set eth0 vf 1 vlan 100 proto 802.1Q
  Or by omitting the new parameter
    ip link set eth0 vf 1 vlan 100

Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0815fe3a

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,8 @@ int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
int bnx2x_get_vf_config(struct net_device *dev, int vf,

int bnx2x_get_vf_config(struct net_device *dev, int vf,

			struct ifla_vf_info *ivi);

			struct ifla_vf_info *ivi);

int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac);

int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac);

int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos);

int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,

		      __be16 vlan_proto);





/* select_queue callback */

/* select_queue callback */

u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,

u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -2521,7 +2521,8 @@ void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp) 
	for_each_vf(bp, vfidx) {

	for_each_vf(bp, vfidx) {

		bulletin = BP_VF_BULLETIN(bp, vfidx);

		bulletin = BP_VF_BULLETIN(bp, vfidx);

		if (bulletin->valid_bitmap & (1 << VLAN_VALID))

		if (bulletin->valid_bitmap & (1 << VLAN_VALID))

			bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0);

			bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0,

					  htons(ETH_P_8021Q));

	}

	}

}

}
@@ -2781,7 +2782,8 @@ static int bnx2x_set_vf_vlan_filter(struct bnx2x *bp, struct bnx2x_virtf *vf, 
	return 0;

	return 0;

}

}





int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)

int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos,

		      __be16 vlan_proto)

{

{

	struct pf_vf_bulletin_content *bulletin = NULL;

	struct pf_vf_bulletin_content *bulletin = NULL;

	struct bnx2x *bp = netdev_priv(dev);

	struct bnx2x *bp = netdev_priv(dev);
@@ -2796,6 +2798,9 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	if (vlan_proto != htons(ETH_P_8021Q))

		return -EPROTONOSUPPORT;



	DP(BNX2X_MSG_IOV, "configuring VF %d with VLAN %d qos %d\n",

	DP(BNX2X_MSG_IOV, "configuring VF %d with VLAN %d qos %d\n",

	   vfidx, vlan, 0);

	   vfidx, vlan, 0);

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,8 @@ int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac) 
	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

}

}





int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos)

int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,

		     __be16 vlan_proto)

{

{

	struct hwrm_func_cfg_input req = {0};

	struct hwrm_func_cfg_input req = {0};

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt *bp = netdev_priv(dev);
@@ -185,6 +186,9 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos) 
	if (bp->hwrm_spec_code < 0x10201)

	if (bp->hwrm_spec_code < 0x10201)

		return -ENOTSUPP;

		return -ENOTSUPP;





	if (vlan_proto != htons(ETH_P_8021Q))

		return -EPROTONOSUPPORT;



	rc = bnxt_vf_ndo_prep(bp, vf_id);

	rc = bnxt_vf_ndo_prep(bp, vf_id);

	if (rc)

	if (rc)

		return rc;

		return rc;

drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 




int bnxt_get_vf_config(struct net_device *, int, struct ifla_vf_info *);

int bnxt_get_vf_config(struct net_device *, int, struct ifla_vf_info *);

int bnxt_set_vf_mac(struct net_device *, int, u8 *);

int bnxt_set_vf_mac(struct net_device *, int, u8 *);

int bnxt_set_vf_vlan(struct net_device *, int, u16, u8);

int bnxt_set_vf_vlan(struct net_device *, int, u16, u8, __be16);

int bnxt_set_vf_bw(struct net_device *, int, int, int);

int bnxt_set_vf_bw(struct net_device *, int, int, int);

int bnxt_set_vf_link_state(struct net_device *, int, int);

int bnxt_set_vf_link_state(struct net_device *, int, int);

int bnxt_set_vf_spoofchk(struct net_device *, int, bool);

int bnxt_set_vf_spoofchk(struct net_device *, int, bool);

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1895,7 +1895,8 @@ static int be_clear_vf_tvt(struct be_adapter *adapter, int vf) 
	return 0;

	return 0;

}

}





static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)

static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,

			  __be16 vlan_proto)

{

{

	struct be_adapter *adapter = netdev_priv(netdev);

	struct be_adapter *adapter = netdev_priv(netdev);

	struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf];

	struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf];
@@ -1907,6 +1908,9 @@ static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) 
	if (vf >= adapter->num_vfs || vlan > 4095 || qos > 7)

	if (vf >= adapter->num_vfs || vlan > 4095 || qos > 7)

		return -EINVAL;

		return -EINVAL;





	if (vlan_proto != htons(ETH_P_8021Q))

		return -EPROTONOSUPPORT;



	if (vlan || qos) {

	if (vlan || qos) {

		vlan |= qos << VLAN_PRIO_SHIFT;

		vlan |= qos << VLAN_PRIO_SHIFT;

		status = be_set_vf_tvt(adapter, vf, vlan);

		status = be_set_vf_tvt(adapter, vf, vlan);