[dpdk-dev] [PATCH 1/3] mk: introduce helper to check valid compiler argument
Introduce rte_cc_has_argument() Makefile helper to check a given argument is support by the compiler. Example Usage: include $(RTE_SDK)/mk/rte.helper.mk MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2) This would allow adding -mcpu=octeontx2 in MACHINE_CFLAGS if it is only supported by the compiler. The use case for such scheme is to enable the mcpu optimization if the compiler supports else it needs to compile the source code without any errors. This patch also moves inclusion of toolchain's rte.vars.mk to before the machine's rte.vars.mk inclusion to make correct CC available for the cross compile case. Signed-off-by: Jerin Jacob --- mk/rte.helper.mk | 12 mk/target/generic/rte.vars.mk | 22 +++--- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 mk/rte.helper.mk diff --git a/mk/rte.helper.mk b/mk/rte.helper.mk new file mode 100644 index 0..2c5d5275e --- /dev/null +++ b/mk/rte.helper.mk @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd + +# rte_cc_has_argument +# Usage: MACHINE_CFLAGS += $(call rte_cc_has_argument, -mno-avx512f) +# Return the argument if the argument is supported by the compiler. +# +define rte_cc_has_argument + $(shell $(CC) -Werror $(1) -c -x c /dev/null -o tmp$$ 2> /dev/null && rm -f tmp$$ && echo $(1) | xargs echo -n) +endef + + diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk index dd149acc9..25a578ad7 100644 --- a/mk/target/generic/rte.vars.mk +++ b/mk/target/generic/rte.vars.mk @@ -7,6 +7,17 @@ # executive environment. # +# +# toolchain: +# +# - define CC, LD, AR, AS, ... +# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) +# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) +# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) +# - may override any previously defined variable +# +include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk + # # machine: # @@ -45,17 +56,6 @@ endif # include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk -# -# toolchain: -# -# - define CC, LD, AR, AS, ... -# - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value) -# - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value) -# - may override any previously defined variable -# -include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk - # # exec-env: # -- 2.20.1
[dpdk-dev] [PATCH 2/3] config: add thunderx2 machine config
Optimized configuration for Marvell thunderx2 SoC. Product details are here: https://www.marvell.com/server-processors/thunderx2-arm-processors/ Signed-off-by: Jerin Jacob --- config/defconfig_arm64-thunderx2-linuxapp-gcc | 11 ++ mk/machine/thunderx2/rte.vars.mk | 34 +++ 2 files changed, 45 insertions(+) create mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc create mode 100644 mk/machine/thunderx2/rte.vars.mk diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc b/config/defconfig_arm64-thunderx2-linuxapp-gcc new file mode 100644 index 0..27db58e50 --- /dev/null +++ b/config/defconfig_arm64-thunderx2-linuxapp-gcc @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd +# + +#include "defconfig_arm64-armv8a-linuxapp-gcc" + +CONFIG_RTE_MACHINE="thunderx2" + +CONFIG_RTE_CACHE_LINE_SIZE=64 +CONFIG_RTE_MAX_NUMA_NODES=2 +CONFIG_RTE_MAX_LCORE=256 diff --git a/mk/machine/thunderx2/rte.vars.mk b/mk/machine/thunderx2/rte.vars.mk new file mode 100644 index 0..b80dc8680 --- /dev/null +++ b/mk/machine/thunderx2/rte.vars.mk @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd +# + +# +# machine: +# +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - may override any previously defined variable +# + +# ARCH = +# CROSS = +# MACHINE_CFLAGS = +# MACHINE_LDFLAGS = +# MACHINE_ASFLAGS = +# CPU_CFLAGS = +# CPU_LDFLAGS = +# CPU_ASFLAGS = + +include $(RTE_SDK)/mk/rte.helper.mk + +MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1-a+crc+crypto) +MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99) -- 2.20.1
[dpdk-dev] [PATCH 3/3] config: add octeontx2 machine config
Optimized configuration for Marvell octeontx2 SoC. Signed-off-by: Jerin Jacob --- config/defconfig_arm64-octeontx2-linuxapp-gcc | 18 ++ mk/machine/octeontx2/rte.vars.mk | 34 +++ 2 files changed, 52 insertions(+) create mode 100644 config/defconfig_arm64-octeontx2-linuxapp-gcc create mode 100644 mk/machine/octeontx2/rte.vars.mk diff --git a/config/defconfig_arm64-octeontx2-linuxapp-gcc b/config/defconfig_arm64-octeontx2-linuxapp-gcc new file mode 100644 index 0..9a99eada1 --- /dev/null +++ b/config/defconfig_arm64-octeontx2-linuxapp-gcc @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd +# + +#include "defconfig_arm64-armv8a-linuxapp-gcc" + +CONFIG_RTE_MACHINE="octeontx2" + +CONFIG_RTE_CACHE_LINE_SIZE=128 +CONFIG_RTE_MAX_NUMA_NODES=1 +CONFIG_RTE_MAX_LCORE=24 + +# Doesn't support NUMA +CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n +CONFIG_RTE_LIBRTE_VHOST_NUMA=n + +# Recommend to use VFIO as co-processors needs SMMU/IOMMU +CONFIG_RTE_EAL_IGB_UIO=n diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.mk new file mode 100644 index 0..e209cf492 --- /dev/null +++ b/mk/machine/octeontx2/rte.vars.mk @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Marvell International Ltd +# + +# +# machine: +# +# - can define ARCH variable (overridden by cmdline value) +# - can define CROSS variable (overridden by cmdline value) +# - define MACHINE_CFLAGS variable (overridden by cmdline value) +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) +# - can define CPU_CFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that +# overrides the one defined in arch. +# - may override any previously defined variable +# + +# ARCH = +# CROSS = +# MACHINE_CFLAGS = +# MACHINE_LDFLAGS = +# MACHINE_ASFLAGS = +# CPU_CFLAGS = +# CPU_LDFLAGS = +# CPU_ASFLAGS = + +include $(RTE_SDK)/mk/rte.helper.mk + +MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto+lse) +MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2) -- 2.20.1
Re: [dpdk-dev] [PATCH 2/3] config: add thunderx2 machine config
Hi Jerin, 06/01/2019 14:20, Jerin Jacob Kollanukkaran: > Optimized configuration for Marvell thunderx2 SoC. > > Product details are here: > > https://www.marvell.com/server-processors/thunderx2-arm-processors/ > > Signed-off-by: Jerin Jacob > --- > config/defconfig_arm64-thunderx2-linuxapp-gcc | 11 ++ > mk/machine/thunderx2/rte.vars.mk | 34 +++ You should enable meson build at the same time.
Re: [dpdk-dev] [PATCH 2/3] config: add thunderx2 machine config
> -Original Message- > From: Jerin Jacob Kollanukkaran > Sent: Sunday, January 6, 2019 9:20 PM > To: tho...@monjalon.net > Cc: dev@dpdk.org; Gavin Hu (Arm Technology China) ; > jer...@marvell.com > Subject: [dpdk-dev] [PATCH 2/3] config: add thunderx2 machine config > > Optimized configuration for Marvell thunderx2 SoC. > > Product details are here: > > https://www.marvell.com/server-processors/thunderx2-arm-processors/ > > Signed-off-by: Jerin Jacob > --- > config/defconfig_arm64-thunderx2-linuxapp-gcc | 11 ++ > mk/machine/thunderx2/rte.vars.mk | 34 +++ > 2 files changed, 45 insertions(+) > create mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc > create mode 100644 mk/machine/thunderx2/rte.vars.mk > > diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc > b/config/defconfig_arm64-thunderx2-linuxapp-gcc > new file mode 100644 > index 0..27db58e50 > --- /dev/null > +++ b/config/defconfig_arm64-thunderx2-linuxapp-gcc > @@ -0,0 +1,11 @@ > +# SPDX-License-Identifier: BSD-3-Clause > +# Copyright(c) 2018 Marvell International Ltd > +# > + > +#include "defconfig_arm64-armv8a-linuxapp-gcc" > + > +CONFIG_RTE_MACHINE="thunderx2" > + > +CONFIG_RTE_CACHE_LINE_SIZE=64 ThunderX is 128, ThunderX2 downsized the cache line? > +CONFIG_RTE_MAX_NUMA_NODES=2 > +CONFIG_RTE_MAX_LCORE=256 > diff --git a/mk/machine/thunderx2/rte.vars.mk > b/mk/machine/thunderx2/rte.vars.mk > new file mode 100644 > index 0..b80dc8680 > --- /dev/null > +++ b/mk/machine/thunderx2/rte.vars.mk > @@ -0,0 +1,34 @@ > +# SPDX-License-Identifier: BSD-3-Clause > +# Copyright(c) 2018 Marvell International Ltd > +# > + > +# > +# machine: > +# > +# - can define ARCH variable (overridden by cmdline value) > +# - can define CROSS variable (overridden by cmdline value) > +# - define MACHINE_CFLAGS variable (overridden by cmdline value) > +# - define MACHINE_LDFLAGS variable (overridden by cmdline value) > +# - define MACHINE_ASFLAGS variable (overridden by cmdline value) > +# - can define CPU_CFLAGS variable (overridden by cmdline value) that > +# overrides the one defined in arch. > +# - can define CPU_LDFLAGS variable (overridden by cmdline value) that > +# overrides the one defined in arch. > +# - can define CPU_ASFLAGS variable (overridden by cmdline value) that > +# overrides the one defined in arch. > +# - may override any previously defined variable > +# > + > +# ARCH = > +# CROSS = > +# MACHINE_CFLAGS = > +# MACHINE_LDFLAGS = > +# MACHINE_ASFLAGS = > +# CPU_CFLAGS = > +# CPU_LDFLAGS = > +# CPU_ASFLAGS = > + > +include $(RTE_SDK)/mk/rte.helper.mk > + > +MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1- > a+crc+crypto) > +MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99) > -- > 2.20.1
Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix multicast table enable error for VF
Hi，qi
> -Original Message-
> From: Zhang, Qi Z
> Sent: Friday, January 4, 2019 8:20 PM
> To: Zhao1, Wei ; dev@dpdk.org
> Cc: sta...@dpdk.org; Wu, Jingjing
> 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: sta...@dpdk.org; Zhang, Qi Z ; Wu, Jingjing
> > ; Zhao1, Wei
> > 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
> >
> > ---
> >
> > 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
[dpdk-dev] [PATCH] doc: fix a typo in programmer's guide
This patch fixes a typo in programmer's guide. It should be Frequence,
not Fequence.
Fixes: 450f0791312c ("power: add traffic pattern aware power control")
Signed-off-by: Yong Wang
---
doc/guides/prog_guide/power_man.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/guides/prog_guide/power_man.rst
b/doc/guides/prog_guide/power_man.rst
index 68b7e8b..f59e2c3 100644
--- a/doc/guides/prog_guide/power_man.rst
+++ b/doc/guides/prog_guide/power_man.rst
@@ -184,7 +184,7 @@ API Overview for Empty Poll Power Management
* **Update Valid Poll Counter**: update the valid poll counter.
-* **Set the Fequence Index**: update the power state/frequency mapping.
+* **Set the Frequence Index**: update the power state/frequency mapping.
* **Detect empty poll state change**: empty poll state change detection
algorithm then take action.
--
1.8.3.1
Re: [dpdk-dev] [EXT] Re: [PATCH 2/3] config: add thunderx2 machine config
On Sun, 2019-01-06 at 21:56 +0100, Thomas Monjalon wrote: > Hi Jerin, Hi Thomas, > 06/01/2019 14:20, Jerin Jacob Kollanukkaran: > > Optimized configuration for Marvell thunderx2 SoC. > > > > Product details are here: > > > > https://www.marvell.com/server-processors/thunderx2-arm-processors/ > > > > Signed-off-by: Jerin Jacob > > --- > > config/defconfig_arm64-thunderx2-linuxapp-gcc | 11 ++ > > mk/machine/thunderx2/rte.vars.mk | 34 > > +++ > > You should enable meson build at the same time. OK. Will send the v2. > > >
Re: [dpdk-dev] [EXT] RE: [PATCH 2/3] config: add thunderx2 machine config
On Mon, 2019-01-07 at 00:21 +, Gavin Hu (Arm Technology China) wrote: > > -Original Message- > > From: Jerin Jacob Kollanukkaran > > Sent: Sunday, January 6, 2019 9:20 PM > > To: tho...@monjalon.net > > Cc: dev@dpdk.org; Gavin Hu (Arm Technology China) > >; > > jer...@marvell.com > > Subject: [dpdk-dev] [PATCH 2/3] config: add thunderx2 machine > > config > > > > Optimized configuration for Marvell thunderx2 SoC. > > > > Product details are here: > > > > https://www.marvell.com/server-processors/thunderx2-arm-processors/ > > > > Signed-off-by: Jerin Jacob > > --- > > config/defconfig_arm64-thunderx2-linuxapp-gcc | 11 ++ > > mk/machine/thunderx2/rte.vars.mk | 34 > > +++ > > 2 files changed, 45 insertions(+) > > create mode 100644 config/defconfig_arm64-thunderx2-linuxapp-gcc > > create mode 100644 mk/machine/thunderx2/rte.vars.mk > > > > diff --git a/config/defconfig_arm64-thunderx2-linuxapp-gcc > > b/config/defconfig_arm64-thunderx2-linuxapp-gcc > > new file mode 100644 > > index 0..27db58e50 > > --- /dev/null > > +++ b/config/defconfig_arm64-thunderx2-linuxapp-gcc > > @@ -0,0 +1,11 @@ > > +# SPDX-License-Identifier: BSD-3-Clause > > +# Copyright(c) 2018 Marvell International Ltd > > +# > > + > > +#include "defconfig_arm64-armv8a-linuxapp-gcc" > > + > > +CONFIG_RTE_MACHINE="thunderx2" > > + > > +CONFIG_RTE_CACHE_LINE_SIZE=64 > > ThunderX is 128, ThunderX2 downsized the cache line? Yes. Tunned for server work load.
[dpdk-dev] [PATCH v3] 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 there 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.And also disable MTA when detect
all zero MAC address configuration from vf.
Align to ixgbe pf kernel 5.3.7 code to fix this bug.
Fixes: 00e30184daa0 ("ixgbe: add PF support")
Signed-off-by: Wei Zhao
---
v2:
change patch name and fix typo in log.
v3:
fix typo and disable MTA when detect
all zero MAC address configuration.
---
drivers/net/ixgbe/ixgbe_pf.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 4b833ff..392e4a1 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);
@@ -516,6 +517,12 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t
vf, uint32_t *msgbuf)
vfinfo->vf_mc_hashes[i] = hash_list[i];
}
+ if (nb_entries == 1 && !vfinfo->vf_mc_hashes[0]) {
+ vmolr &= ~IXGBE_VMOLR_ROMPE;
+ IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+ return 0;
+ }
+
for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)
& IXGBE_MTA_INDEX_MASK;
@@ -525,6 +532,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
[dpdk-dev] [Bug 182] make doc-guides-pdf fails with error 'make[3]: latexmk: Command not found'
https://bugs.dpdk.org/show_bug.cgi?id=182 Bug ID: 182 Summary: make doc-guides-pdf fails with error 'make[3]: latexmk: Command not found' Product: DPDK Version: 19.02 Hardware: All OS: All Status: CONFIRMED Severity: normal Priority: Normal Component: doc Assignee: dev@dpdk.org Reporter: vipin.vargh...@intel.com Target Milestone: --- Issue: 1. Install all packages for Ubuntu 'http://doc.dpdk.org/guides/contributing/documentation.html' for documentation 2. for target 'make doc-guides-pdf' Error: pdflatex processing guides-pdf-faq... make[3]: latexmk: Command not found Makefile:33: recipe for target 'doc.pdf' failed make[3]: *** [doc.pdf] Error 127 Work around: apt install latexmk (for ubuntu) Request: update section to install 'latexmk' for ubuntu -- You are receiving this mail because: You are the assignee for the bug.
[dpdk-dev] [PATCH v4] 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 there 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.And also disable MTA when detect
entry number of MAC address is 0 of configuration from vf.
Align to ixgbe pf kernel 5.3.7 code to fix this bug.
Fixes: 00e30184daa0 ("ixgbe: add PF support")
Signed-off-by: Wei Zhao
---
v2:
change patch name and fix typo in log.
v3:
fix typo and disable MTA when detect
all zero MAC address configuration.
v4:
change code to disable MTA when detect
entry number of MAC address is 0 of configuration from vf.
---
drivers/net/ixgbe/ixgbe_pf.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 4b833ff..4e4d39a 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);
@@ -516,6 +517,12 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t
vf, uint32_t *msgbuf)
vfinfo->vf_mc_hashes[i] = hash_list[i];
}
+ if (!nb_entries) {
+ vmolr &= ~IXGBE_VMOLR_ROMPE;
+ IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+ return 0;
+ }
+
for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)
& IXGBE_MTA_INDEX_MASK;
@@ -525,6 +532,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
Re: [dpdk-dev] [PATCH] net/ixgbe: add support of loopback for X540/X550
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Julien Meunier
> Sent: Thursday, January 3, 2019 12:01 AM
> To: Ananyev, Konstantin ; Lu, Wenzhuo
>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/ixgbe: add support of loopback for X540/X550
>
> Loopback mode is also supported on X540 and X550 NICs, according to their
> datasheet (section 15.2). The way to set it up is a little different of the
> 82599.
Thanks for enable this.
one question is, Datasheet also mentioned that auto negotiation should be
disabled
but I didn't see any related change with it.
Would you share more insight on this?
>
> Signed-off-by: Julien Meunier
> ---
> drivers/net/ixgbe/ixgbe_ethdev.c | 10 ++---
> drivers/net/ixgbe/ixgbe_ethdev.h | 5 ++---
> drivers/net/ixgbe/ixgbe_rxtx.c | 47
> ++--
> 3 files changed, 49 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 7493110..7eb3303 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -2652,9 +2652,13 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
> goto error;
> }
>
> - /* Skip link setup if loopback mode is enabled for 82599. */
> - if (hw->mac.type == ixgbe_mac_82599EB &&
> - dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX)
> + /* Skip link setup if loopback mode is enabled. */
> + if ((hw->mac.type == ixgbe_mac_82599EB ||
> + hw->mac.type == ixgbe_mac_X540 ||
> + hw->mac.type == ixgbe_mac_X550 ||
> + hw->mac.type == ixgbe_mac_X550EM_x ||
> + hw->mac.type == ixgbe_mac_X550EM_a) &&
> + dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_TX_RX)
> goto skip_link_setup;
>
> if (ixgbe_is_sfp(hw) && hw->phy.multispeed_fiber) { diff --git
> a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 565c69c..c60a697 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -65,9 +65,8 @@
> #define IXGBE_QUEUE_ITR_INTERVAL_DEFAULT 500 /* 500us */
>
> /* Loopback operation modes */
> -/* 82599 specific loopback operation types */
> -#define IXGBE_LPBK_82599_NONE 0x0 /* Default value. Loopback is disabled.
> */
> -#define IXGBE_LPBK_82599_TX_RX 0x1 /* Tx->Rx loopback operation is
> enabled. */
> +#define IXGBE_LPBK_NONE 0x0 /* Default value. Loopback is disabled. */
> +#define IXGBE_LPBK_TX_RX 0x1 /* Tx->Rx loopback operation is enabled.
> +*/
>
> #define IXGBE_MAX_JUMBO_FRAME_SIZE 0x2600 /* Maximum Jumbo
> frame size. */
>
> diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
> index 9a79d18..0ef7fdf 100644
> --- a/drivers/net/ixgbe/ixgbe_rxtx.c
> +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
> @@ -4879,10 +4879,14 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev)
> hlreg0 &= ~IXGBE_HLREG0_JUMBOEN;
>
> /*
> - * If loopback mode is configured for 82599, set LPBK bit.
> + * If loopback mode is configured, set LPBK bit.
>*/
> - if (hw->mac.type == ixgbe_mac_82599EB &&
> - dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX)
> + if ((hw->mac.type == ixgbe_mac_82599EB ||
> + hw->mac.type == ixgbe_mac_X540 ||
> + hw->mac.type == ixgbe_mac_X550 ||
> + hw->mac.type == ixgbe_mac_X550EM_x ||
> + hw->mac.type == ixgbe_mac_X550EM_a) &&
> + dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_TX_RX)
> hlreg0 |= IXGBE_HLREG0_LPBK;
> else
> hlreg0 &= ~IXGBE_HLREG0_LPBK;
> @@ -5088,6 +5092,29 @@ ixgbe_setup_loopback_link_82599(struct ixgbe_hw
> *hw)
> msec_delay(50);
> }
>
> +/*
> + * Set up link loopback for X540 / X550 mode Tx->Rx.
> + */
> +static inline void __attribute__((cold))
> +ixgbe_setup_loopback_link_x540_x550(struct ixgbe_hw *hw) {
> + uint32_t macc;
> + PMD_INIT_FUNC_TRACE();
> +
> + /* datasheet 15.2.1: MACC.FLU = 1 (force link up) */
> + macc = IXGBE_READ_REG(hw, IXGBE_MACC);
> + macc |= IXGBE_MACC_FLU;
> + IXGBE_WRITE_REG(hw, IXGBE_MACC, macc);
> +
> + /* Restart link */
> + IXGBE_WRITE_REG(hw,
> + IXGBE_AUTOC,
> + IXGBE_AUTOC_LMS_10G_LINK_NO_AN | IXGBE_AUTOC_FLU);
> +
> + hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
> + msec_delay(50);
> +}
> +
>
> /*
> * Start Transmit and Receive Units.
> @@ -5148,10 +5175,16 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev)
> rxctrl |= IXGBE_RXCTRL_RXEN;
> hw->mac.ops.enable_rx_dma(hw, rxctrl);
>
> - /* If loopback mode is enabled for 82599, set up the link accordingly */
> - if (hw->mac.type == ixgbe_mac_82599EB &&
> - dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX)
> - ixgbe_setup_loopback_link_82599(hw);
> + /*
[dpdk-dev] [PATCH v2] eal: fix core number validation
From: Hari kumar Vemula
When incorrect core value or range provided,
as part of -l command line option, a crash occurs.
Added valid range checks to fix the crash.
Added ut check for negative core values.
Added unit test case for invalid core number range.
Fixes: d888cb8b9613 ("eal: add core list input format")
Cc: sta...@dpdk.org
Signed-off-by: Hari kumar Vemula
---
lib/librte_eal/common/eal_common_options.c | 10 --
test/test/test_eal_flags.c | 14 +-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 6e3a83b98..4a900c548 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -592,7 +592,9 @@ eal_parse_corelist(const char *corelist)
if (*corelist == '\0')
return -1;
errno = 0;
- idx = strtoul(corelist, &end, 10);
+ idx = strtol(corelist, &end, 10);
+ if (idx < 0 || idx >= (int)cfg->lcore_count)
+ return -1;
if (errno || end == NULL)
return -1;
while (isblank(*end))
@@ -603,6 +605,7 @@ eal_parse_corelist(const char *corelist)
max = idx;
if (min == RTE_MAX_LCORE)
min = idx;
for (idx = min; idx <= max; idx++) {
if (cfg->lcore_role[idx] != ROLE_RTE) {
cfg->lcore_role[idx] = ROLE_RTE;
@@ -1103,6 +1106,7 @@ eal_parse_common_option(int opt, const char *optarg,
{
static int b_used;
static int w_used;
+ struct rte_config *cfg = rte_eal_get_configuration();
switch (opt) {
/* blacklist */
@@ -1145,7 +1149,9 @@ eal_parse_common_option(int opt, const char *optarg,
/* corelist */
case 'l':
if (eal_parse_corelist(optarg) < 0) {
- RTE_LOG(ERR, EAL, "invalid core list\n");
+ RTE_LOG(ERR, EAL,
+ "Invalid core number, core range should be (0,
%u)\n",
+ cfg->lcore_count-1);
return -1;
}
diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c
index 2acab9d69..ec79b2242 100644
--- a/test/test/test_eal_flags.c
+++ b/test/test/test_eal_flags.c
@@ -513,6 +513,16 @@ test_missing_c_flag(void)
const char *argv25[] = { prgname, prefix, mp_flag,
"-n", "3", "--lcores",
"0-1,2@(5-7),(3-5)@(0,2),(0,6),7"};
+ /* when core number is negative value*/
+ const char * const argv26[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "-5" };
+ const char * const argv27[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "-5-7" };
+ /* when core number is maximum value*/
+ const char * const argv28[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "9" };
+ const char * const argv29[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "1-999" };
if (launch_proc(argv2) != 0) {
printf("Error - "
@@ -556,7 +566,9 @@ test_missing_c_flag(void)
launch_proc(argv18) == 0 || launch_proc(argv19) == 0 ||
launch_proc(argv20) == 0 || launch_proc(argv21) == 0 ||
launch_proc(argv21) == 0 || launch_proc(argv22) == 0 ||
- launch_proc(argv23) == 0 || launch_proc(argv24) == 0) {
+ launch_proc(argv23) == 0 || launch_proc(argv24) == 0 ||
+ launch_proc(argv26) == 0 || launch_proc(argv27) == 0 ||
+ launch_proc(argv28) == 0 || launch_proc(argv29) == 0) {
printf("Error - "
"process ran without error with invalid --lcore flag\n");
return -1;
--
2.17.2
Re: [dpdk-dev] [PATCH v4] net/ixgbe: fix multicast table enable error for VF
> -Original Message-
> From: Zhao1, Wei
> Sent: Monday, January 7, 2019 2:16 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Qi Z ; Wu, Jingjing
> ; Zhao1, Wei
> Subject: [PATCH v4] net/ixgbe: fix multicast table enable error for VF
How about change the title to:
"fix over using multicast table 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 there 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.And also disable
> MTA when detect entry number of MAC address is 0 of configuration from vf.
> Align to ixgbe pf kernel 5.3.7 code to fix this bug.
I did below re-word to make it easy to understand.
According to the current implementation, all VFs will set bit
IXGBE_VMOLR_ROMPE during initialization, this cause any VF will
accept packets that match the MTA table. Since the MTA table is shared by
all VFs which means if one VF update MTA table in function
ixgbe_vf_set_multicast, then all other VFs will receive multicast packets
which cause unnecessary performance overhead.
So it's better to set VF's ROPE bit of register VMOLR only if multicast
address filter is required on that VF. Also, the ROPE bit should
be reset when multicast address filter is requested to clean.
This patch also aligns to the related fix on ixgbe kernel driver 5.3.7.
>
> Fixes: 00e30184daa0 ("ixgbe: add PF support")
>
> Signed-off-by: Wei Zhao
>
> ---
>
> v2:
> change patch name and fix typo in log.
>
> v3:
> fix typo and disable MTA when detect
> all zero MAC address configuration.
>
> v4:
> change code to disable MTA when detect
> entry number of MAC address is 0 of configuration from vf.
> ---
> drivers/net/ixgbe/ixgbe_pf.c | 12 +++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c index
> 4b833ff..4e4d39a 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);
> @@ -516,6 +517,12 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev,
> uint32_t vf, uint32_t *msgbuf)
> vfinfo->vf_mc_hashes[i] = hash_list[i];
> }
>
> + if (!nb_entries) {
It's better to write as
If (nb_entries == 0)
to follow the coding guideline.
> + vmolr &= ~IXGBE_VMOLR_ROMPE;
> + IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
> + return 0;
> + }
> +
> for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
> mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)
> & IXGBE_MTA_INDEX_MASK;
> @@ -525,6 +532,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
Re: [dpdk-dev] [PATCH v4 1/2] lib/librte_meter: add RFC4115 trTCM meter support
On 4 Jan 2019, at 20:42, Stephen Hemminger wrote: On Fri, 4 Jan 2019 13:59:42 + Eelco Chaudron wrote: This patch adds support for RFC4115 trTCM meters. Signed-off-by: Eelco Chaudron Fix comment formatting. Hi Stephen, I left these warnings in on purpose, to match the existing comment style in the file. These specific warnings are from a structure copied from one right above which also has the same style and line lengths. As they are warning I though I should leave it as is, Christian what are your thoughts on this? ### [dpdk-dev] [PATCH v4 1/2] lib/librte_meter: add RFC4115 trTCM meter support WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #172: FILE: lib/librte_meter/rte_meter.h:59: +/** trTCM parameters per metered traffic flow. The CIR, EIR, CBS and EBS +parameters only count bytes of IP packets and do not include link specific WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #174: FILE: lib/librte_meter/rte_meter.h:61: +none-zero respectively.*/ WARNING:LONG_LINE_COMMENT: line over 80 characters #176: FILE: lib/librte_meter/rte_meter.h:63: + uint64_t cir; /**< Committed Information Rate (CIR). Measured in bytes per second. */ WARNING:LONG_LINE_COMMENT: line over 80 characters #177: FILE: lib/librte_meter/rte_meter.h:64: + uint64_t eir; /**< Excess Information Rate (EIR). Measured in bytes per second. */ WARNING:LONG_LINE_COMMENT: line over 80 characters #355: FILE: lib/librte_meter/rte_meter.h:406: + /**< Number of bytes currently available in the excess(E) token bucket */ total: 0 errors, 5 warnings, 356 lines checked
[dpdk-dev] [PATCH v5] net/ixgbe: fix over using multicast table for VF
From: Zhao Wei
According to the current implementation, all VFs will set bit
IXGBE_VMOLR_ROMPE during initialization, this cause any VF
will accept packets that match the MTA table. Since the MTA
table is shared by all VFs which means if one VF update MTA
table in function ixgbe_vf_set_multicast, then all other VFs
will receive multicast packets which cause unnecessary
performance overhead.
So it's better to set VF's ROPE bit of register VMOLR only
if multicast address filter is required on that VF.
Also, the ROPE bit should be reset when multicast address
filter is requested to clean.
This patch also aligns to the related fix on ixgbe
kernel driver 5.3.7.
Fixes: 00e30184daa0 ("ixgbe: add PF support")
Signed-off-by: Wei Zhao
---
v2:
change patch name and fix typo in log.
v3:
fix typo and disable MTA when detect
all zero MAC address configuration.
v4:
change code to disable MTA when detect
entry number of MAC address is 0 of configuration from vf.
v5:
change git log comment, title and code format.
---
drivers/net/ixgbe/ixgbe_pf.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 4b833ff..be0c076 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);
@@ -516,6 +517,12 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t
vf, uint32_t *msgbuf)
vfinfo->vf_mc_hashes[i] = hash_list[i];
}
+ if (nb_entries == 0) {
+ vmolr &= ~IXGBE_VMOLR_ROMPE;
+ IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+ return 0;
+ }
+
for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)
& IXGBE_MTA_INDEX_MASK;
@@ -525,6 +532,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
[dpdk-dev] [PATCH v5] net/ixgbe: fix over using multicast table for VF
According to the current implementation, all VFs will set bit
IXGBE_VMOLR_ROMPE during initialization, this cause any VF
will accept packets that match the MTA table. Since the MTA
table is shared by all VFs which means if one VF update MTA
table in function ixgbe_vf_set_multicast, then all other VFs
will receive multicast packets which cause unnecessary
performance overhead.
So it's better to set VF's ROPE bit of register VMOLR only
if multicast address filter is required on that VF.
Also, the ROPE bit should be reset when multicast address
filter is requested to clean.
This patch also aligns to the related fix on ixgbe
kernel driver 5.3.7.
Fixes: 00e30184daa0 ("ixgbe: add PF support")
Signed-off-by: Wei Zhao
---
v2:
change patch name and fix typo in log.
v3:
fix typo and disable MTA when detect
all zero MAC address configuration.
v4:
change code to disable MTA when detect
entry number of MAC address is 0 of configuration from vf.
v5:
change git log comment, title and code format.
---
drivers/net/ixgbe/ixgbe_pf.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 4b833ff..be0c076 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);
@@ -516,6 +517,12 @@ ixgbe_vf_set_multicast(struct rte_eth_dev *dev, uint32_t
vf, uint32_t *msgbuf)
vfinfo->vf_mc_hashes[i] = hash_list[i];
}
+ if (nb_entries == 0) {
+ vmolr &= ~IXGBE_VMOLR_ROMPE;
+ IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);
+ return 0;
+ }
+
for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
mta_idx = (vfinfo->vf_mc_hashes[i] >> IXGBE_MTA_BIT_SHIFT)
& IXGBE_MTA_INDEX_MASK;
@@ -525,6 +532,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
