* [dpdk-dev] [PATCH v4 1/2] lib/librte_pmd_i40e: set vlan id filter fix
2014-12-02 9:02 [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix Huawei Xie
@ 2014-12-02 9:02 ` Huawei Xie
2014-12-02 9:02 ` [dpdk-dev] [PATCH v4 2/2] lib/librte_pmd_i40e: add I40E_VFTA_IDX and I40E_VFTA__BIT macros for VFTA related operation Huawei Xie
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Huawei Xie @ 2014-12-02 9:02 UTC (permalink / raw)
To: dev
">> 5" rather than ">> 4"
vlan id is a 12 bit value.
VFTA is 128 x 32 bit array (128 double word array) which could store 2^12 vlan bits.
Each bit represents whether corresponding vlan tag is set in the VSI.
Use high 7 bits as the index for the double word array.
Signed-off-by: Huawei Xie <huawei.xie@intel.com>
---
lib/librte_pmd_i40e/i40e_ethdev.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c
index dacf2db..518597f 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.c
+++ b/lib/librte_pmd_i40e/i40e_ethdev.c
@@ -4172,14 +4172,11 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi,
{
uint32_t vid_idx, vid_bit;
-#define UINT32_BIT_MASK 0x1F
-#define VALID_VLAN_BIT_MASK 0xFFF
/* VFTA is 32-bits size array, each element contains 32 vlan bits, Find the
* element first, then find the bits it belongs to
*/
- vid_idx = (uint32_t) ((vlan_id & VALID_VLAN_BIT_MASK) >>
- sizeof(uint32_t));
- vid_bit = (uint32_t) (1 << (vlan_id & UINT32_BIT_MASK));
+ vid_idx = (uint32_t) ((vlan_id >> 5) & 0x7F);
+ vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
if (on)
vsi->vfta[vid_idx] |= vid_bit;
--
1.8.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [dpdk-dev] [PATCH v4 2/2] lib/librte_pmd_i40e: add I40E_VFTA_IDX and I40E_VFTA__BIT macros for VFTA related operation
2014-12-02 9:02 [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix Huawei Xie
2014-12-02 9:02 ` [dpdk-dev] [PATCH v4 1/2] lib/librte_pmd_i40e: set vlan id " Huawei Xie
@ 2014-12-02 9:02 ` Huawei Xie
2014-12-06 0:25 ` [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix Zhang, Helin
2014-12-06 4:21 ` Chen, Jing D
3 siblings, 0 replies; 6+ messages in thread
From: Huawei Xie @ 2014-12-02 9:02 UTC (permalink / raw)
To: dev
Add two macros I40E_VFTA_IDX and I40E_VFTA_BIT for vlan filter search and set.
Add vlan_id check in vlan filter search and set function.
Signed-off-by: Huawei Xie <huawei.xie@intel.com>
---
lib/librte_pmd_i40e/i40e_ethdev.c | 17 ++++++++++-------
lib/librte_pmd_i40e/i40e_ethdev.h | 9 +++++++++
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c
index 518597f..43b9448 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.c
+++ b/lib/librte_pmd_i40e/i40e_ethdev.c
@@ -4157,8 +4157,11 @@ i40e_find_vlan_filter(struct i40e_vsi *vsi,
{
uint32_t vid_idx, vid_bit;
- vid_idx = (uint32_t) ((vlan_id >> 5) & 0x7F);
- vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
+ if (vlan_id > ETH_VLAN_ID_MAX)
+ return 0;
+
+ vid_idx = I40E_VFTA_IDX(vlan_id);
+ vid_bit = I40E_VFTA_BIT(vlan_id);
if (vsi->vfta[vid_idx] & vid_bit)
return 1;
@@ -4172,11 +4175,11 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi,
{
uint32_t vid_idx, vid_bit;
- /* VFTA is 32-bits size array, each element contains 32 vlan bits, Find the
- * element first, then find the bits it belongs to
- */
- vid_idx = (uint32_t) ((vlan_id >> 5) & 0x7F);
- vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
+ if (vlan_id > ETH_VLAN_ID_MAX)
+ return;
+
+ vid_idx = I40E_VFTA_IDX(vlan_id);
+ vid_bit = I40E_VFTA_BIT(vlan_id);
if (on)
vsi->vfta[vid_idx] |= vid_bit;
diff --git a/lib/librte_pmd_i40e/i40e_ethdev.h b/lib/librte_pmd_i40e/i40e_ethdev.h
index f99fbea..f913ea9 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.h
+++ b/lib/librte_pmd_i40e/i40e_ethdev.h
@@ -50,6 +50,15 @@
#define I40E_DEFAULT_QP_NUM_FDIR 1
#define I40E_UINT32_BIT_SIZE (CHAR_BIT * sizeof(uint32_t))
#define I40E_VFTA_SIZE (4096 / I40E_UINT32_BIT_SIZE)
+/*
+ * vlan_id is a 12 bit number.
+ * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.
+ * 2^5 = 32. The val of lower 5 bits specifies the bit in the 32bit element.
+ * The higher 7 bit val specifies VFTA array index.
+ */
+#define I40E_VFTA_BIT(vlan_id) (1 << ((vlan_id) & 0x1F))
+#define I40E_VFTA_IDX(vlan_id) ((vlan_id) >> 5)
+
/* Default TC traffic in case DCB is not enabled */
#define I40E_DEFAULT_TCMAP 0x1
#define I40E_FDIR_QUEUE_ID 0
--
1.8.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix
2014-12-02 9:02 [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix Huawei Xie
2014-12-02 9:02 ` [dpdk-dev] [PATCH v4 1/2] lib/librte_pmd_i40e: set vlan id " Huawei Xie
2014-12-02 9:02 ` [dpdk-dev] [PATCH v4 2/2] lib/librte_pmd_i40e: add I40E_VFTA_IDX and I40E_VFTA__BIT macros for VFTA related operation Huawei Xie
@ 2014-12-06 0:25 ` Zhang, Helin
2014-12-06 4:21 ` Chen, Jing D
3 siblings, 0 replies; 6+ messages in thread
From: Zhang, Helin @ 2014-12-06 0:25 UTC (permalink / raw)
To: Xie, Huawei, dev
Acked-by: Helin Zhang <helin.zhang@intel.com>
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Huawei Xie
> Sent: Tuesday, December 2, 2014 5:02 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix
>
> This patchset fixes "set vlan filter" issue.
>
> v2 changes:
> * add two macros I40E_VFTA_IDX and I40E_VFTA_BIT for VFTA array operation.
>
> v3 changes:
> * code style fix
> * rebase on latest commit
>
> v4 changes:
> * add more descriptive commit message
>
> Huawei Xie (2):
> vlan id set fix
> add I40E_VFTA_IDX and I40E_VFTA_BIT macros for VFTA related operation
>
> lib/librte_pmd_i40e/i40e_ethdev.c | 20 ++++++++++----------
> lib/librte_pmd_i40e/i40e_ethdev.h | 9 +++++++++
> 2 files changed, 19 insertions(+), 10 deletions(-)
>
> --
> 1.8.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix
2014-12-02 9:02 [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix Huawei Xie
` (2 preceding siblings ...)
2014-12-06 0:25 ` [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix Zhang, Helin
@ 2014-12-06 4:21 ` Chen, Jing D
2014-12-06 10:12 ` Thomas Monjalon
3 siblings, 1 reply; 6+ messages in thread
From: Chen, Jing D @ 2014-12-06 4:21 UTC (permalink / raw)
To: Xie, Huawei, dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Huawei Xie
> Sent: Tuesday, December 2, 2014 5:02 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix
>
> This patchset fixes "set vlan filter" issue.
>
> v2 changes:
> * add two macros I40E_VFTA_IDX and I40E_VFTA_BIT for VFTA array
> operation.
>
> v3 changes:
> * code style fix
> * rebase on latest commit
>
> v4 changes:
> * add more descriptive commit message
>
> Huawei Xie (2):
> vlan id set fix
> add I40E_VFTA_IDX and I40E_VFTA_BIT macros for VFTA related operation
>
> lib/librte_pmd_i40e/i40e_ethdev.c | 20 ++++++++++----------
> lib/librte_pmd_i40e/i40e_ethdev.h | 9 +++++++++
> 2 files changed, 19 insertions(+), 10 deletions(-)
>
Acked-by: Jing Chen <jing.d.chen@intel.com>
> --
> 1.8.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH v4 0/2] lib/librte_pmd_i40e: set vlan filter fix
2014-12-06 4:21 ` Chen, Jing D
@ 2014-12-06 10:12 ` Thomas Monjalon
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Monjalon @ 2014-12-06 10:12 UTC (permalink / raw)
To: Xie, Huawei; +Cc: dev
> > This patchset fixes "set vlan filter" issue.
> >
> > v2 changes:
> > * add two macros I40E_VFTA_IDX and I40E_VFTA_BIT for VFTA array
> > operation.
> >
> > v3 changes:
> > * code style fix
> > * rebase on latest commit
> >
> > v4 changes:
> > * add more descriptive commit message
> >
> > Huawei Xie (2):
> > vlan id set fix
> > add I40E_VFTA_IDX and I40E_VFTA_BIT macros for VFTA related operation
>
> Acked-by: Jing Chen <jing.d.chen@intel.com>
Applied
Thanks
--
Thomas
^ permalink raw reply [flat|nested] 6+ messages in thread