[dpdk-dev] [PATCH 0/2] fix defects of macro in VF

[dpdk-dev] [PATCH 0/2] fix defects of macro in VF

[Guinan Sun]

The defects of UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
If latest is less than last, we will get wrong result.
The issues exist only in ixgbe and e1000 NICs.

Guinan Sun (2):
  net/ixgbe: fix defects of macro in VF
  net/e1000: fix defects of macro in VF

 drivers/net/e1000/igb_ethdev.c   | 14 +++++++++++---
 drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

-- 
2.17.1

[dpdk-dev] [PATCH 1/2] net/ixgbe: fix defects of macro in VF

[Guinan Sun]

The defects in the macros UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
If latest is less than last, we will get wrong result.
The patch fixes the defect.

Fixes: abf7275bbaa2 ("ixgbe: move to drivers/net/")
Cc: stable@dpdk.org

Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index cf5f1fe70..08a964399 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -94,6 +94,10 @@
 #define IXGBE_4_BIT_MASK   RTE_LEN2MASK(IXGBE_4_BIT_WIDTH, uint8_t)
 #define IXGBE_8_BIT_WIDTH  CHAR_BIT
 #define IXGBE_8_BIT_MASK   UINT8_MAX
+#define IXGBE_32_BIT_WIDTH (CHAR_BIT * 4)
+#define IXGBE_32_BIT_MASK  RTE_LEN2MASK(IXGBE_32_BIT_WIDTH, uint32_t)
+#define IXGBE_36_BIT_WIDTH (CHAR_BIT * 4 + IXGBE_4_BIT_WIDTH)
+#define IXGBE_36_BIT_MASK  RTE_LEN2MASK(IXGBE_36_BIT_WIDTH, uint64_t)
 
 #define IXGBEVF_PMD_NAME "rte_ixgbevf_pmd" /* PMD name */
 
@@ -388,7 +392,13 @@ static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw);
 #define UPDATE_VF_STAT(reg, last, cur)                          \
 {                                                               \
 	uint32_t latest = IXGBE_READ_REG(hw, reg);              \
-	cur += (latest - last) & UINT_MAX;                      \
+	u64 stat = 0;                                           \
+	if (latest >= last)                                     \
+		stat = latest - last;                           \
+	else                                                    \
+		stat = (u64)((latest +                          \
+			((u64)1 << IXGBE_32_BIT_WIDTH)) - last);\
+	cur += stat & IXGBE_32_BIT_MASK;                        \
 	last = latest;                                          \
 }
 
@@ -397,7 +407,13 @@ static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw);
 	u64 new_lsb = IXGBE_READ_REG(hw, lsb);                   \
 	u64 new_msb = IXGBE_READ_REG(hw, msb);                   \
 	u64 latest = ((new_msb << 32) | new_lsb);                \
-	cur += (0x1000000000LL + latest - last) & 0xFFFFFFFFFLL; \
+	u64 stat = 0;                                            \
+	if (latest >= last)                                      \
+		stat = latest - last;                            \
+	else                                                     \
+		stat = (u64)((latest +                           \
+			((u64)1 << IXGBE_36_BIT_WIDTH)) - last); \
+	cur += stat & IXGBE_36_BIT_MASK;                         \
 	last = latest;                                           \
 }
 
-- 
2.17.1

[dpdk-dev] [PATCH 2/2] net/e1000: fix defects of macro in VF

[Guinan Sun]

The defects in the macros UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
If latest is less than last, we will get wrong result.
The patch fixes the defect.

Fixes: d15fcf76c8b7 ("e1000: move to drivers/net/")
Cc: stable@dpdk.org

Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
---
 drivers/net/e1000/igb_ethdev.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 520fba8fa..d6032fd65 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -47,6 +47,8 @@
 #define IGB_4_BIT_MASK   RTE_LEN2MASK(IGB_4_BIT_WIDTH, uint8_t)
 #define IGB_8_BIT_WIDTH  CHAR_BIT
 #define IGB_8_BIT_MASK   UINT8_MAX
+#define IGB_32_BIT_WIDTH (CHAR_BIT * 4)
+#define IGB_32_BIT_MASK  RTE_LEN2MASK(IGB_32_BIT_WIDTH, uint32_t)
 
 /* Additional timesync values. */
 #define E1000_CYCLECOUNTER_MASK      0xffffffffffffffffULL
@@ -263,9 +265,15 @@ static int igb_filter_restore(struct rte_eth_dev *dev);
  */
 #define UPDATE_VF_STAT(reg, last, cur)            \
 {                                                 \
-	u32 latest = E1000_READ_REG(hw, reg);     \
-	cur += (latest - last) & UINT_MAX;        \
-	last = latest;                            \
+	uint64_t latest = E1000_READ_REG(hw, reg);                 \
+	uint64_t stat = 0;                                         \
+	if (latest >= last)                                        \
+		stat = latest - last;                              \
+	else                                                       \
+		stat = (uint64_t)((latest +                        \
+			((uint64_t)1 << IGB_32_BIT_WIDTH)) - last);\
+	cur += stat & IGB_32_BIT_MASK;                             \
+	last = latest;                                             \
 }
 
 #define IGB_FC_PAUSE_TIME 0x0680
-- 
2.17.1

Re: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF

[Zhao1, Wei]

> -----Original Message-----
> From: Sun, GuinanX <guinanx.sun@intel.com>
> Sent: Friday, May 8, 2020 1:07 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Cc: Guo, Jia <jia.guo@intel.com>
> Subject: RE: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF
> 
> Hi ZhaoWei
> 
> > -----Original Message-----
> > From: Zhao1, Wei
> > Sent: Friday, May 8, 2020 10:19 AM
> > To: Sun, GuinanX <guinanx.sun@intel.com>; dev@dpdk.org
> > Cc: Sun, GuinanX <guinanx.sun@intel.com>; Guo, Jia <jia.guo@intel.com>
> > Subject: RE: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF
> >
> > Hi,
> > Please alaign " \" in each line.
> 
> It will be modified in V2 patch.
> Remark: It can't be aligned in vim tool and email at the same time.
> It will be aligned in vim tool in v2 patch.
> 
> >

Ok.

> >
> > > -----Original Message-----
> > > From: dev <dev-bounces@dpdk.org> On Behalf Of Guinan Sun
> > > Sent: Friday, May 8, 2020 9:59 AM
> > > To: dev@dpdk.org
> > > Cc: Sun, GuinanX <guinanx.sun@intel.com>
> > > Subject: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF
> > >
> > > The defects of UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
> > > If latest is less than last, we will get wrong result.
> > > The issues exist only in ixgbe and e1000 NICs.
> > >
> > > Guinan Sun (2):
> > >   net/ixgbe: fix defects of macro in VF
> > >   net/e1000: fix defects of macro in VF
> > >
> > >  drivers/net/e1000/igb_ethdev.c   | 14 +++++++++++---
> > >  drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++--
> > >  2 files changed, 29 insertions(+), 5 deletions(-)
> > >
> > > --
> > > 2.17.1
> >
> 

Re: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF

[Sun, GuinanX]

Hi ZhaoWei

> -----Original Message-----
> From: Zhao1, Wei
> Sent: Friday, May 8, 2020 10:19 AM
> To: Sun, GuinanX <guinanx.sun@intel.com>; dev@dpdk.org
> Cc: Sun, GuinanX <guinanx.sun@intel.com>; Guo, Jia <jia.guo@intel.com>
> Subject: RE: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF
> 
> Hi,
> Please alaign " \" in each line.

It will be modified in V2 patch.
Remark: It can't be aligned in vim tool and email at the same time.
It will be aligned in vim tool in v2 patch.

> 
> 
> > -----Original Message-----
> > From: dev <dev-bounces@dpdk.org> On Behalf Of Guinan Sun
> > Sent: Friday, May 8, 2020 9:59 AM
> > To: dev@dpdk.org
> > Cc: Sun, GuinanX <guinanx.sun@intel.com>
> > Subject: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF
> >
> > The defects of UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
> > If latest is less than last, we will get wrong result.
> > The issues exist only in ixgbe and e1000 NICs.
> >
> > Guinan Sun (2):
> >   net/ixgbe: fix defects of macro in VF
> >   net/e1000: fix defects of macro in VF
> >
> >  drivers/net/e1000/igb_ethdev.c   | 14 +++++++++++---
> >  drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++--
> >  2 files changed, 29 insertions(+), 5 deletions(-)
> >
> > --
> > 2.17.1
> 

Re: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF

[Zhao1, Wei]

Hi,
	Please alaign " \" in each line.


> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Guinan Sun
> Sent: Friday, May 8, 2020 9:59 AM
> To: dev@dpdk.org
> Cc: Sun, GuinanX <guinanx.sun@intel.com>
> Subject: [dpdk-dev] [PATCH 0/2] fix defects of macro in VF
> 
> The defects of UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
> If latest is less than last, we will get wrong result.
> The issues exist only in ixgbe and e1000 NICs.
> 
> Guinan Sun (2):
>   net/ixgbe: fix defects of macro in VF
>   net/e1000: fix defects of macro in VF
> 
>  drivers/net/e1000/igb_ethdev.c   | 14 +++++++++++---
>  drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++--
>  2 files changed, 29 insertions(+), 5 deletions(-)
> 
> --
> 2.17.1

[dpdk-dev] [PATCH 0/2] fix defects of macro in VF

[Guinan Sun]

The defects of UPDATE_VF_STAT and UPDATE_VF_STAT_36BIT exist.
If latest is less than last, we will get wrong result.
The issues exist only in ixgbe and e1000 NICs.

Guinan Sun (2):
  net/ixgbe: fix defects of macro in VF
  net/e1000: fix defects of macro in VF

 drivers/net/e1000/igb_ethdev.c   | 14 +++++++++++---
 drivers/net/ixgbe/ixgbe_ethdev.c | 20 ++++++++++++++++++--
 2 files changed, 29 insertions(+), 5 deletions(-)

-- 
2.17.1