[v2] net/ixgbe: fix multicast table enable error for VF

Message ID 1546590867-7390-1-git-send-email-wei.zhao1@intel.com
State Superseded, archived
Delegated to: Qi Zhang
Headers show
Series
  • [v2] net/ixgbe: fix multicast table enable error for VF
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Wei Zhao Jan. 4, 2019, 8:34 a.m.
In ixgbe PMD code, all vf ars set with bit IXGBE_VMOLR_ROMPE,
which make vf accept packets that match the MTA table,
if some vf update IXGBE_MTA in function ixgbe_vf_set_multicast,
then all vf will receive packets from these address.
So thhere is need to set VMOLR register bit ROPE only after this
vf has been set multicast address. If this bit is set when pf host doing
initialization, this vf will receive multicast packets with address
written in MTA table. Align to ixgbe pf kernel 5.3.7 code to fix this
bug.

Fixes: 00e30184daa0 ("ixgbe: add PF support")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>

---

v2:
change patch name and fix typo in log.
---
 drivers/net/ixgbe/ixgbe_pf.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Zhang, Qi Z Jan. 4, 2019, 12:20 p.m. | #1
> -----Original Message-----
> From: Zhao1, Wei
> Sent: Friday, January 4, 2019 4:34 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>; Zhao1, Wei <wei.zhao1@intel.com>
> Subject: [PATCH v2] net/ixgbe: fix multicast table enable error for VF
> 
> In ixgbe PMD code, all vf ars set with bit IXGBE_VMOLR_ROMPE, which make vf
> accept packets that match the MTA table, if some vf update IXGBE_MTA in
> function ixgbe_vf_set_multicast, then all vf will receive packets from these
> address.
> So thhere is need to set VMOLR register bit ROPE only after this vf has been set

s/thhere/there

> multicast address. If this bit is set when pf host doing initialization, this vf will
> receive multicast packets with address written in MTA table. Align to ixgbe pf
> kernel 5.3.7 code to fix this bug.

Please check my last comment in v1, we need to consider the case to clean all multicast filter.
 
> 
> Fixes: 00e30184daa0 ("ixgbe: add PF support")
> 
> Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> 
> ---
> 
> v2:
> change patch name and fix typo in log.
> ---
>  drivers/net/ixgbe/ixgbe_pf.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c index
> 4b833ff..0f4b96b 100644
> --- a/drivers/net/ixgbe/ixgbe_pf.c
> +++ b/drivers/net/ixgbe/ixgbe_pf.c
> @@ -351,7 +351,7 @@ ixgbe_vf_reset_event(struct rte_eth_dev *dev,
> uint16_t vf)
>  	int rar_entry = hw->mac.num_rar_entries - (vf + 1);
>  	uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
> 
> -	vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_ROMPE |
> +	vmolr |= (IXGBE_VMOLR_ROPE |
>  			IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE);
>  	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
> 
> @@ -503,6 +503,7 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev,
> uint32_t vf, uint32_t *msgbuf)
>  	const uint32_t IXGBE_MTA_BIT_MASK = (0x1 << IXGBE_MTA_BIT_SHIFT) -
> 1;
>  	uint32_t reg_val;
>  	int i;
> +	u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
> 
>  	/* Disable multicast promiscuous first */
>  	ixgbe_disable_vf_mc_promisc(dev, vf);
> @@ -525,6 +526,9 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev,
> uint32_t vf, uint32_t *msgbuf)
>  		IXGBE_WRITE_REG(hw, IXGBE_MTA(mta_idx), reg_val);
>  	}
> 
> +	vmolr |= IXGBE_VMOLR_ROMPE;
> +	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
> +
>  	return 0;
>  }
> 
> --
> 2.7.5
Wei Zhao Jan. 7, 2019, 1:25 a.m. | #2
Hi,qi

> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Friday, January 4, 2019 8:20 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; dev@dpdk.org
> Cc: stable@dpdk.org; Wu, Jingjing <jingjing.wu@intel.com>
> Subject: RE: [PATCH v2] net/ixgbe: fix multicast table enable error for VF
> 
> 
> 
> > -----Original Message-----
> > From: Zhao1, Wei
> > Sent: Friday, January 4, 2019 4:34 PM
> > To: dev@dpdk.org
> > Cc: stable@dpdk.org; Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing
> > <jingjing.wu@intel.com>; Zhao1, Wei <wei.zhao1@intel.com>
> > Subject: [PATCH v2] net/ixgbe: fix multicast table enable error for VF
> >
> > In ixgbe PMD code, all vf ars set with bit IXGBE_VMOLR_ROMPE, which
> > make vf accept packets that match the MTA table, if some vf update
> > IXGBE_MTA in function ixgbe_vf_set_multicast, then all vf will receive
> > packets from these address.
> > So thhere is need to set VMOLR register bit ROPE only after this vf
> > has been set
> 
> s/thhere/there


Sorry, v3 will commit

> 
> > multicast address. If this bit is set when pf host doing
> > initialization, this vf will receive multicast packets with address
> > written in MTA table. Align to ixgbe pf kernel 5.3.7 code to fix this bug.
> 
> Please check my last comment in v1, we need to consider the case to clean all
> multicast filter.

At first, I think we need to clean MTA when unint device, but after test I find that it has been clear after reset of hw reset, so we  do not need to it manually.
 
> 
> >
> > Fixes: 00e30184daa0 ("ixgbe: add PF support")
> >
> > Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> >
> > ---
> >
> > v2:
> > change patch name and fix typo in log.
> > ---
> >  drivers/net/ixgbe/ixgbe_pf.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ixgbe/ixgbe_pf.c
> > b/drivers/net/ixgbe/ixgbe_pf.c index 4b833ff..0f4b96b 100644
> > --- a/drivers/net/ixgbe/ixgbe_pf.c
> > +++ b/drivers/net/ixgbe/ixgbe_pf.c
> > @@ -351,7 +351,7 @@ ixgbe_vf_reset_event(struct rte_eth_dev *dev,
> > uint16_t vf)
> >  	int rar_entry = hw->mac.num_rar_entries - (vf + 1);
> >  	uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
> >
> > -	vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_ROMPE |
> > +	vmolr |= (IXGBE_VMOLR_ROPE |
> >  			IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE);
> >  	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
> >
> > @@ -503,6 +503,7 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev,
> > uint32_t vf, uint32_t *msgbuf)
> >  	const uint32_t IXGBE_MTA_BIT_MASK = (0x1 <<
> IXGBE_MTA_BIT_SHIFT) -
> > 1;
> >  	uint32_t reg_val;
> >  	int i;
> > +	u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
> >
> >  	/* Disable multicast promiscuous first */
> >  	ixgbe_disable_vf_mc_promisc(dev, vf); @@ -525,6 +526,9 @@
> > ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t vf, uint32_t
> > *msgbuf)
> >  		IXGBE_WRITE_REG(hw, IXGBE_MTA(mta_idx), reg_val);
> >  	}
> >
> > +	vmolr |= IXGBE_VMOLR_ROMPE;
> > +	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
> > +
> >  	return 0;
> >  }
> >
> > --
> > 2.7.5

Patch

diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 4b833ff..0f4b96b 100644
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -351,7 +351,7 @@  ixgbe_vf_reset_event(struct rte_eth_dev *dev, uint16_t vf)
 	int rar_entry = hw->mac.num_rar_entries - (vf + 1);
 	uint32_t vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
 
-	vmolr |= (IXGBE_VMOLR_ROPE | IXGBE_VMOLR_ROMPE |
+	vmolr |= (IXGBE_VMOLR_ROPE |
 			IXGBE_VMOLR_BAM | IXGBE_VMOLR_AUPE);
 	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
 
@@ -503,6 +503,7 @@  ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 	const uint32_t IXGBE_MTA_BIT_MASK = (0x1 << IXGBE_MTA_BIT_SHIFT) - 1;
 	uint32_t reg_val;
 	int i;
+	u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
 
 	/* Disable multicast promiscuous first */
 	ixgbe_disable_vf_mc_promisc(dev, vf);
@@ -525,6 +526,9 @@  ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 		IXGBE_WRITE_REG(hw, IXGBE_MTA(mta_idx), reg_val);
 	}
 
+	vmolr |= IXGBE_VMOLR_ROMPE;
+	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+
 	return 0;
 }