diff mbox

[dpdk-dev,v2,16/32] net/i40e: add set VF VLAN insert function

Message ID 1481081535-37448-17-git-send-email-wenzhuo.lu@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
checkpatch/checkpatch success coding style OK

Commit Message

Wenzhuo Lu Dec. 7, 2016, 3:31 a.m. UTC 
  Support inserting VF VLAN id from PF.
User can call the API on PF to insert a VLAN id to a
specific VF.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c            | 53 +++++++++++++++++++++++++++++++
 drivers/net/i40e/rte_pmd_i40e.h           | 19 +++++++++++
 drivers/net/i40e/rte_pmd_i40e_version.map |  1 +
 3 files changed, 73 insertions(+)

Comments

Ferruh Yigit Dec. 7, 2016, 2:26 p.m. UTC | #1 
On 12/7/2016 3:31 AM, Wenzhuo Lu wrote:
> Support inserting VF VLAN id from PF.
> User can call the API on PF to insert a VLAN id to a
> specific VF.

Same comment with prev patch, does it make sense to insert " from PF" to
patch title?

> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  drivers/net/i40e/i40e_ethdev.c            | 53 +++++++++++++++++++++++++++++++
>  drivers/net/i40e/rte_pmd_i40e.h           | 19 +++++++++++
>  drivers/net/i40e/rte_pmd_i40e_version.map |  1 +
>  3 files changed, 73 insertions(+)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 253209b..c571d8b 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -10361,3 +10361,56 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
>  	else
>  		return -EINVAL;
>  }
> +
> +int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,
> +				    uint16_t vlan_id)
> +{
> +	struct rte_eth_dev *dev;
> +	struct rte_eth_dev_info dev_info;
> +	struct i40e_pf *pf;
> +	struct i40e_pf_vf *vf;
> +	struct i40e_hw *hw;
> +	struct i40e_vsi *vsi;
> +	struct i40e_vsi_context ctxt;
> +	int ret;
> +
> +	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
> +
> +	dev = &rte_eth_devices[port];
> +	rte_eth_dev_info_get(port, &dev_info);
> +
> +	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
> +	hw = I40E_PF_TO_HW(pf);
> +
> +	/**
> +	 * return -ENODEV if SRIOV not enabled, VF number not configured
> +	 * or no queue assigned.
> +	 */
> +	if (!hw->func_caps.sr_iov_1_1 || pf->vf_num == 0 ||
> +	    pf->vf_nb_qps == 0)
> +		return -ENODEV;
> +
> +	if (vf_id > pf->vf_num)

This check was [1] in prev patches:
[1]
	if (vf_id > pf->vf_num - 1 || !pf->vfs)

> +		return -EINVAL;
> +
> +	if (vlan_id > 4095)

Can there be any define in base driver for this? Or ETH_VLAN_ID_MAX perhaps?

> +		return -EINVAL;
> +
> +	vf = &pf->vfs[vf_id];
> +	vsi = vf->vsi;
> +
> +	vsi->info.valid_sections = cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID);
> +	vsi->info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_INSERT_PVID;
> +	vsi->info.pvid = vlan_id;
> +

--->
> +	memset(&ctxt, 0, sizeof(ctxt));
> +	(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
> +	ctxt.seid = vsi->seid;
> +
> +	hw = I40E_VSI_TO_HW(vsi);
> +	ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
> +	if (ret != I40E_SUCCESS)
> +		PMD_DRV_LOG(ERR, "Failed to update VSI params");
<-----

If Wenzhuo prefers to extract this part into a function, it can be
re-used here too.

<...>
Ferruh Yigit Dec. 7, 2016, 2:42 p.m. UTC | #2 
On 12/7/2016 2:26 PM, Ferruh Yigit wrote:
> On 12/7/2016 3:31 AM, Wenzhuo Lu wrote:
>> Support inserting VF VLAN id from PF.
>> User can call the API on PF to insert a VLAN id to a
>> specific VF.
> 
> Same comment with prev patch, does it make sense to insert " from PF" to
> patch title?
> 
>>
>> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
>> ---
>>  drivers/net/i40e/i40e_ethdev.c            | 53 +++++++++++++++++++++++++++++++
>>  drivers/net/i40e/rte_pmd_i40e.h           | 19 +++++++++++
>>  drivers/net/i40e/rte_pmd_i40e_version.map |  1 +
>>  3 files changed, 73 insertions(+)
>>
>> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
>> index 253209b..c571d8b 100644
>> --- a/drivers/net/i40e/i40e_ethdev.c
>> +++ b/drivers/net/i40e/i40e_ethdev.c
>> @@ -10361,3 +10361,56 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
>>  	else
>>  		return -EINVAL;
>>  }
>> +
>> +int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,
>> +				    uint16_t vlan_id)
>> +{
>> +	struct rte_eth_dev *dev;
>> +	struct rte_eth_dev_info dev_info;
>> +	struct i40e_pf *pf;
>> +	struct i40e_pf_vf *vf;
>> +	struct i40e_hw *hw;
>> +	struct i40e_vsi *vsi;
>> +	struct i40e_vsi_context ctxt;
>> +	int ret;
>> +
>> +	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
>> +
>> +	dev = &rte_eth_devices[port];
>> +	rte_eth_dev_info_get(port, &dev_info);
>> +
>> +	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
>> +	hw = I40E_PF_TO_HW(pf);
>> +
>> +	/**
>> +	 * return -ENODEV if SRIOV not enabled, VF number not configured
>> +	 * or no queue assigned.
>> +	 */
>> +	if (!hw->func_caps.sr_iov_1_1 || pf->vf_num == 0 ||
>> +	    pf->vf_nb_qps == 0)
>> +		return -ENODEV;
>> +
>> +	if (vf_id > pf->vf_num)
> 
> This check was [1] in prev patches:
> [1]
> 	if (vf_id > pf->vf_num - 1 || !pf->vfs)
> 
>> +		return -EINVAL;
>> +
>> +	if (vlan_id > 4095)
> 
> Can there be any define in base driver for this? Or ETH_VLAN_ID_MAX perhaps?

Answer was in next patches, it seems we have two options (which is bad)

lib/librte_net/rte_ether.h
#define ETHER_MAX_VLAN_ID  4095 /**< Maximum VLAN ID. */

lib/librte_ether/rte_ethdev.h
#define ETH_VLAN_ID_MAX       0x0FFF /**< VLAN ID is in lower 12 bits*/

> 
>> +		return -EINVAL;
>> +
>> +	vf = &pf->vfs[vf_id];
>> +	vsi = vf->vsi;
>> +
>> +	vsi->info.valid_sections = cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID);
>> +	vsi->info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_INSERT_PVID;
>> +	vsi->info.pvid = vlan_id;
>> +
> 
> --->
>> +	memset(&ctxt, 0, sizeof(ctxt));
>> +	(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
>> +	ctxt.seid = vsi->seid;
>> +
>> +	hw = I40E_VSI_TO_HW(vsi);
>> +	ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
>> +	if (ret != I40E_SUCCESS)
>> +		PMD_DRV_LOG(ERR, "Failed to update VSI params");
> <-----
> 
> If Wenzhuo prefers to extract this part into a function, it can be
> re-used here too.
> 
> <...>
>
Iremonger, Bernard Dec. 7, 2016, 5:36 p.m. UTC | #3 
Hi Ferruh,

> -----Original Message-----
> From: Yigit, Ferruh
> Sent: Wednesday, December 7, 2016 2:26 PM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; dev@dpdk.org
> Cc: Iremonger, Bernard <bernard.iremonger@intel.com>
> Subject: Re: [dpdk-dev] [PATCH v2 16/32] net/i40e: add set VF VLAN insert
> function
> 
> On 12/7/2016 3:31 AM, Wenzhuo Lu wrote:
> > Support inserting VF VLAN id from PF.
> > User can call the API on PF to insert a VLAN id to a specific VF.
> 
> Same comment with prev patch, does it make sense to insert " from PF" to
> patch title?

Consistency in the patch titles makes sense.
"set VF VLAN filter from PF"  might be better. 
 
> >
> > Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> > ---
> >  drivers/net/i40e/i40e_ethdev.c            | 53
> +++++++++++++++++++++++++++++++
> >  drivers/net/i40e/rte_pmd_i40e.h           | 19 +++++++++++
> >  drivers/net/i40e/rte_pmd_i40e_version.map |  1 +
> >  3 files changed, 73 insertions(+)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > b/drivers/net/i40e/i40e_ethdev.c index 253209b..c571d8b 100644
> > --- a/drivers/net/i40e/i40e_ethdev.c
> > +++ b/drivers/net/i40e/i40e_ethdev.c
> > @@ -10361,3 +10361,56 @@ static void i40e_set_default_mac_addr(struct
> rte_eth_dev *dev,
> >  	else
> >  		return -EINVAL;
> >  }
> > +
> > +int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,
> > +				    uint16_t vlan_id)
> > +{
> > +	struct rte_eth_dev *dev;
> > +	struct rte_eth_dev_info dev_info;
> > +	struct i40e_pf *pf;
> > +	struct i40e_pf_vf *vf;
> > +	struct i40e_hw *hw;
> > +	struct i40e_vsi *vsi;
> > +	struct i40e_vsi_context ctxt;
> > +	int ret;
> > +
> > +	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
> > +
> > +	dev = &rte_eth_devices[port];
> > +	rte_eth_dev_info_get(port, &dev_info);
> > +
> > +	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
> > +	hw = I40E_PF_TO_HW(pf);
> > +
> > +	/**
> > +	 * return -ENODEV if SRIOV not enabled, VF number not configured
> > +	 * or no queue assigned.
> > +	 */
> > +	if (!hw->func_caps.sr_iov_1_1 || pf->vf_num == 0 ||
> > +	    pf->vf_nb_qps == 0)
> > +		return -ENODEV;
> > +
> > +	if (vf_id > pf->vf_num)

if (vf_id >= pf->vf_num)  

would be better.
 
> This check was [1] in prev patches:
> [1]
> 	if (vf_id > pf->vf_num - 1 || !pf->vfs)

if (vf_id >= pf->vf_num  || !pf->vfs)

would be better.

> 
> > +		return -EINVAL;
> > +
> > +	if (vlan_id > 4095)
> 
> Can there be any define in base driver for this? Or ETH_VLAN_ID_MAX
> perhaps?

ETHER_MAX_VLAN_ID in rte_ether.h should be used .
 
> > +		return -EINVAL;
> > +
> > +	vf = &pf->vfs[vf_id];
> > +	vsi = vf->vsi;
> > +
> > +	vsi->info.valid_sections =
> cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID);
> > +	vsi->info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_INSERT_PVID;
> > +	vsi->info.pvid = vlan_id;
> > +
> 
> --->
> > +	memset(&ctxt, 0, sizeof(ctxt));
> > +	(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
> > +	ctxt.seid = vsi->seid;
> > +
> > +	hw = I40E_VSI_TO_HW(vsi);
> > +	ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
> > +	if (ret != I40E_SUCCESS)
> > +		PMD_DRV_LOG(ERR, "Failed to update VSI params");
> <-----
> 
> If Wenzhuo prefers to extract this part into a function, it can be re-used here
> too.
> 
> <...>
diff mbox

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 253209b..c571d8b 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -10361,3 +10361,56 @@  static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 	else
 		return -EINVAL;
 }
+
+int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,
+				    uint16_t vlan_id)
+{
+	struct rte_eth_dev *dev;
+	struct rte_eth_dev_info dev_info;
+	struct i40e_pf *pf;
+	struct i40e_pf_vf *vf;
+	struct i40e_hw *hw;
+	struct i40e_vsi *vsi;
+	struct i40e_vsi_context ctxt;
+	int ret;
+
+	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+	dev = &rte_eth_devices[port];
+	rte_eth_dev_info_get(port, &dev_info);
+
+	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+	hw = I40E_PF_TO_HW(pf);
+
+	/**
+	 * return -ENODEV if SRIOV not enabled, VF number not configured
+	 * or no queue assigned.
+	 */
+	if (!hw->func_caps.sr_iov_1_1 || pf->vf_num == 0 ||
+	    pf->vf_nb_qps == 0)
+		return -ENODEV;
+
+	if (vf_id > pf->vf_num)
+		return -EINVAL;
+
+	if (vlan_id > 4095)
+		return -EINVAL;
+
+	vf = &pf->vfs[vf_id];
+	vsi = vf->vsi;
+
+	vsi->info.valid_sections = cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID);
+	vsi->info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_INSERT_PVID;
+	vsi->info.pvid = vlan_id;
+
+	memset(&ctxt, 0, sizeof(ctxt));
+	(void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
+	ctxt.seid = vsi->seid;
+
+	hw = I40E_VSI_TO_HW(vsi);
+	ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
+	if (ret != I40E_SUCCESS)
+		PMD_DRV_LOG(ERR, "Failed to update VSI params");
+
+	return ret;
+}
diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index 043ae62..8867e9c 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -207,4 +207,23 @@  int rte_pmd_i40e_set_vf_mac_addr(uint8_t port, uint16_t vf_id,
 int
 rte_pmd_i40e_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on);
 
+/**
+ * Enable/Disable vf vlan insert
+ *
+ * @param port
+ *    The port identifier of the Ethernet device.
+ * @param vf
+ *    ID specifying VF.
+ * @param vlan_id
+ *    0 - Disable VF's vlan insert.
+ *    n - Enable; n is inserted as the vlan id.
+ *
+ * @return
+ *   - (0) if successful.
+ *   - (-ENODEV) if *port* invalid.
+ *   - (-EINVAL) if bad parameter.
+ */
+int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,
+				    uint16_t vlan_id);
+
 #endif /* _PMD_I40E_H_ */
diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
index 2497b3e..e5e70e9 100644
--- a/drivers/net/i40e/rte_pmd_i40e_version.map
+++ b/drivers/net/i40e/rte_pmd_i40e_version.map
@@ -14,5 +14,6 @@  DPDK_17.02 {
 	rte_pmd_i40e_set_vf_multicast_promisc;
 	rte_pmd_i40e_set_vf_mac_addr;
 	rte_pmd_i40e_set_vf_vlan_stripq;
+	rte_pmd_i40e_set_vf_vlan_insert;
 
 } DPDK_2.0;