diff mbox

[dpdk-dev,v7,17/27] net/i40e: set VF VLAN filter from PF

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

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation success Compilation OK

Commit Message

Wenzhuo Lu Jan. 3, 2017, 6:54 a.m. UTC 
  From: Bernard Iremonger <bernard.iremonger@intel.com>

add rte_pmd_i40e_set_vf_vlan_filter API.
User can call the API on PF to enable/disable
a set of VF's VLAN filters.

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

Comments

Jingjing Wu Jan. 6, 2017, 12:36 a.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wenzhuo Lu
> Sent: Tuesday, January 3, 2017 2:55 PM
> To: dev@dpdk.org
> Cc: Iremonger, Bernard <bernard.iremonger@intel.com>
> Subject: [dpdk-dev] [PATCH v7 17/27] net/i40e: set VF VLAN filter from PF
> 
> From: Bernard Iremonger <bernard.iremonger@intel.com>
> 
> add rte_pmd_i40e_set_vf_vlan_filter API.
> User can call the API on PF to enable/disable a set of VF's VLAN filters.
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  drivers/net/i40e/i40e_ethdev.c            | 52
> +++++++++++++++++++++++++++++++
>  drivers/net/i40e/rte_pmd_i40e.h           | 22 +++++++++++++
>  drivers/net/i40e/rte_pmd_i40e_version.map |  1 +
>  3 files changed, 75 insertions(+)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 4d2fb20..47e03d6 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -10428,3 +10428,55 @@ int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port,
> uint16_t vf_id, uint8_t on)
> 
>  	return ret;
>  }
> +
> +int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
> +				    uint64_t vf_mask, uint8_t on)
> +{
> +	struct rte_eth_dev *dev;
> +	struct rte_eth_dev_info dev_info;
> +	struct i40e_pf *pf;
> +	uint16_t pool_idx;
> +	int ret = I40E_SUCCESS;
> +
> +	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
> +
> +	dev = &rte_eth_devices[port];
> +	rte_eth_dev_info_get(port, &dev_info);
> +
> +	if (vlan_id > ETHER_MAX_VLAN_ID)
> +		return -EINVAL;
> +
> +	if (on > 1)
> +		return -EINVAL;
> +
> +	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
> +	if ((pf->flags & I40E_FLAG_VMDQ) == 0) {
> +		PMD_INIT_LOG(ERR, "Firmware doesn't support VMDQ");
> +		return -ENOTSUP;
> +	}
> +
> +	if (!pf->vmdq) {
> +		PMD_INIT_LOG(INFO, "VMDQ not configured");
> +		return -ENOTSUP;
> +	}
> +
> +	for (pool_idx = 0;
> +	     pool_idx < ETH_64_POOLS &&
> +	     pool_idx < pf->nb_cfg_vmdq_vsi &&
> +	     ret == I40E_SUCCESS;
> +	     pool_idx++) {
> +		if (vf_mask & ((uint64_t)(1ULL << pool_idx))) {
> +			if (on)
> +				ret = i40e_vsi_add_vlan(pf->vmdq[pool_idx].vsi,
> +							vlan_id);
> +			else
> +				ret = i40e_vsi_delete_vlan(
> +					pf->vmdq[pool_idx].vsi, vlan_id);
> +		}
> +	}

The head is saying "set VF VLAN filter", why do you deal with VMDQ VSIs?
Iremonger, Bernard Jan. 6, 2017, 11:38 a.m. UTC | #2 
Hi Jinqjing,

> -----Original Message-----
> From: Wu, Jingjing
> Sent: Friday, January 6, 2017 12:37 AM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; dev@dpdk.org
> Cc: Iremonger, Bernard <bernard.iremonger@intel.com>
> Subject: RE: [dpdk-dev] [PATCH v7 17/27] net/i40e: set VF VLAN filter from
> PF
> 
> 
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Wenzhuo Lu
> > Sent: Tuesday, January 3, 2017 2:55 PM
> > To: dev@dpdk.org
> > Cc: Iremonger, Bernard <bernard.iremonger@intel.com>
> > Subject: [dpdk-dev] [PATCH v7 17/27] net/i40e: set VF VLAN filter from
> > PF
> >
> > From: Bernard Iremonger <bernard.iremonger@intel.com>
> >
> > add rte_pmd_i40e_set_vf_vlan_filter API.
> > User can call the API on PF to enable/disable a set of VF's VLAN filters.
> >
> > Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> > ---
> >  drivers/net/i40e/i40e_ethdev.c            | 52
> > +++++++++++++++++++++++++++++++
> >  drivers/net/i40e/rte_pmd_i40e.h           | 22 +++++++++++++
> >  drivers/net/i40e/rte_pmd_i40e_version.map |  1 +
> >  3 files changed, 75 insertions(+)
> >
> > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > b/drivers/net/i40e/i40e_ethdev.c index 4d2fb20..47e03d6 100644
> > --- a/drivers/net/i40e/i40e_ethdev.c
> > +++ b/drivers/net/i40e/i40e_ethdev.c
> > @@ -10428,3 +10428,55 @@ int rte_pmd_i40e_set_vf_vlan_tag(uint8_t
> > port, uint16_t vf_id, uint8_t on)
> >
> >  	return ret;
> >  }
> > +
> > +int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
> > +				    uint64_t vf_mask, uint8_t on) {
> > +	struct rte_eth_dev *dev;
> > +	struct rte_eth_dev_info dev_info;
> > +	struct i40e_pf *pf;
> > +	uint16_t pool_idx;
> > +	int ret = I40E_SUCCESS;
> > +
> > +	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
> > +
> > +	dev = &rte_eth_devices[port];
> > +	rte_eth_dev_info_get(port, &dev_info);
> > +
> > +	if (vlan_id > ETHER_MAX_VLAN_ID)
> > +		return -EINVAL;
> > +
> > +	if (on > 1)
> > +		return -EINVAL;
> > +
> > +	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
> > +	if ((pf->flags & I40E_FLAG_VMDQ) == 0) {
> > +		PMD_INIT_LOG(ERR, "Firmware doesn't support VMDQ");
> > +		return -ENOTSUP;
> > +	}
> > +
> > +	if (!pf->vmdq) {
> > +		PMD_INIT_LOG(INFO, "VMDQ not configured");
> > +		return -ENOTSUP;
> > +	}
> > +
> > +	for (pool_idx = 0;
> > +	     pool_idx < ETH_64_POOLS &&
> > +	     pool_idx < pf->nb_cfg_vmdq_vsi &&
> > +	     ret == I40E_SUCCESS;
> > +	     pool_idx++) {
> > +		if (vf_mask & ((uint64_t)(1ULL << pool_idx))) {
> > +			if (on)
> > +				ret = i40e_vsi_add_vlan(pf-
> >vmdq[pool_idx].vsi,
> > +							vlan_id);
> > +			else
> > +				ret = i40e_vsi_delete_vlan(
> > +					pf->vmdq[pool_idx].vsi, vlan_id);
> > +		}
> > +	}
> 
> The head is saying "set VF VLAN filter", why do you deal with VMDQ VSIs?

This API is modelled on the rte_pmd_ixgbe_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,   uint64_t vf_mask, uint8_t on)  which seems to use VMDq. More investigation is needed here.

Regards,

Bernard.
diff mbox

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 4d2fb20..47e03d6 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -10428,3 +10428,55 @@  int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on)
 
 	return ret;
 }
+
+int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
+				    uint64_t vf_mask, uint8_t on)
+{
+	struct rte_eth_dev *dev;
+	struct rte_eth_dev_info dev_info;
+	struct i40e_pf *pf;
+	uint16_t pool_idx;
+	int ret = I40E_SUCCESS;
+
+	RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+
+	dev = &rte_eth_devices[port];
+	rte_eth_dev_info_get(port, &dev_info);
+
+	if (vlan_id > ETHER_MAX_VLAN_ID)
+		return -EINVAL;
+
+	if (on > 1)
+		return -EINVAL;
+
+	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+	if ((pf->flags & I40E_FLAG_VMDQ) == 0) {
+		PMD_INIT_LOG(ERR, "Firmware doesn't support VMDQ");
+		return -ENOTSUP;
+	}
+
+	if (!pf->vmdq) {
+		PMD_INIT_LOG(INFO, "VMDQ not configured");
+		return -ENOTSUP;
+	}
+
+	for (pool_idx = 0;
+	     pool_idx < ETH_64_POOLS &&
+	     pool_idx < pf->nb_cfg_vmdq_vsi &&
+	     ret == I40E_SUCCESS;
+	     pool_idx++) {
+		if (vf_mask & ((uint64_t)(1ULL << pool_idx))) {
+			if (on)
+				ret = i40e_vsi_add_vlan(pf->vmdq[pool_idx].vsi,
+							vlan_id);
+			else
+				ret = i40e_vsi_delete_vlan(
+					pf->vmdq[pool_idx].vsi, vlan_id);
+		}
+	}
+
+	if (ret != I40E_SUCCESS)
+		PMD_DRV_LOG(ERR, "Failed to set VF VLAN filter, on = %d", on);
+
+	return ret;
+}
diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index 4fdddef..b71bba6 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -262,4 +262,26 @@  int rte_pmd_i40e_set_vf_broadcast(uint8_t port, uint16_t vf_id,
  */
 int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on);
 
+/**
+ * Enable/Disable VF VLAN filter
+ *
+ * @param port
+ *    The port identifier of the Ethernet device.
+ * @param vlan_id
+ *    ID specifying VLAN
+ * @param vf_mask
+ *    Mask to filter VF's
+ * @param on
+ *    0 - Disable VF's VLAN filter.
+ *    1 - Enable VF's VLAN filter.
+ *
+ * @return
+ *   - (0) if successful.
+ *   - (-ENODEV) if *port* invalid.
+ *   - (-EINVAL) if bad parameter.
+ *   - (-ENOTSUP) VMDq not configured of not supported by firmware.
+ */
+int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
+				    uint64_t vf_mask, uint8_t on);
+
 #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 f0632ff..8ac1bc8 100644
--- a/drivers/net/i40e/rte_pmd_i40e_version.map
+++ b/drivers/net/i40e/rte_pmd_i40e_version.map
@@ -14,6 +14,7 @@  DPDK_17.02 {
 	rte_pmd_i40e_set_vf_multicast_promisc;
 	rte_pmd_i40e_set_vf_unicast_promisc;
 	rte_pmd_i40e_set_vf_vlan_anti_spoof;
+	rte_pmd_i40e_set_vf_vlan_filter;
 	rte_pmd_i40e_set_vf_vlan_insert;
 	rte_pmd_i40e_set_vf_vlan_stripq;
 	rte_pmd_i40e_set_vf_vlan_tag;