Re: [dpdk-dev] [PATCH v10 4/6] net/bnx2x: use common rte bit operation APIs instead
On 2020-04-27 09:58, Joyce Kong wrote:
Remove its own bit operation APIs and use the common one,
this can reduce the code duplication largely.
In an attempt to backtrack what the semantics of
should/need actually be (because the API documentation doesn't say
anything regarding atomicity), I found this commmit.
Joyce, you are replacing a set of atomic bit operations in this PMD, all
of which are also full barriers, with a set of functions (from
rte_bitops.h), all of which are *neither* guarateeed to be atomic *nor*
has any memory ordering implications.
Either the Broadcom authors of this PMD put way too much restrictions on
its bit operations, or this commit broke this driver.
I had a quick look in the Linux kernel bnx2x driver, and there was a
mixture of __set_bit() (non-ordering, non-atomic) and set_bit() (full
barrier, atomic).
Signed-off-by: Joyce Kong
Reviewed-by: Gavin Hu
---
drivers/net/bnx2x/bnx2x.c| 271 +--
drivers/net/bnx2x/bnx2x.h| 10 +-
drivers/net/bnx2x/ecore_sp.c | 68 -
drivers/net/bnx2x/ecore_sp.h | 106 +++---
4 files changed, 221 insertions(+), 234 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index ff7646b25..8eb6d609b 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#define BNX2X_PMD_VER_PREFIX "BNX2X PMD"
@@ -129,32 +130,6 @@ static void bnx2x_ack_sb(struct bnx2x_softc *sc, uint8_t
igu_sb_id,
uint8_t storm, uint16_t index, uint8_t op,
uint8_t update);
-int bnx2x_test_bit(int nr, volatile unsigned long *addr)
-{
- int res;
-
- mb();
- res = ((*addr) & (1UL << nr)) != 0;
- mb();
- return res;
-}
-
-void bnx2x_set_bit(unsigned int nr, volatile unsigned long *addr)
-{
- __sync_fetch_and_or(addr, (1UL << nr));
-}
-
-void bnx2x_clear_bit(int nr, volatile unsigned long *addr)
-{
- __sync_fetch_and_and(addr, ~(1UL << nr));
-}
-
-int bnx2x_test_and_clear_bit(int nr, volatile unsigned long *addr)
-{
- unsigned long mask = (1UL << nr);
- return __sync_fetch_and_and(addr, ~mask) & mask;
-}
-
int bnx2x_cmpxchg(volatile int *addr, int old, int new)
{
return __sync_val_compare_and_swap(addr, old, new);
@@ -1434,16 +1409,16 @@ static int
bnx2x_del_all_macs(struct bnx2x_softc *sc, struct ecore_vlan_mac_obj *mac_obj,
int mac_type, uint8_t wait_for_comp)
{
- unsigned long ramrod_flags = 0, vlan_mac_flags = 0;
+ uint32_t ramrod_flags = 0, vlan_mac_flags = 0;
int rc;
/* wait for completion of requested */
if (wait_for_comp) {
- bnx2x_set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
+ rte_bit_relaxed_set32(RAMROD_COMP_WAIT, &ramrod_flags);
}
/* Set the mac type of addresses we want to clear */
- bnx2x_set_bit(mac_type, &vlan_mac_flags);
+ rte_bit_relaxed_set32(mac_type, &vlan_mac_flags);
rc = mac_obj->delete_all(sc, mac_obj, &vlan_mac_flags, &ramrod_flags);
if (rc < 0)
@@ -1454,8 +1429,7 @@ bnx2x_del_all_macs(struct bnx2x_softc *sc, struct
ecore_vlan_mac_obj *mac_obj,
static int
bnx2x_fill_accept_flags(struct bnx2x_softc *sc, uint32_t rx_mode,
- unsigned long *rx_accept_flags,
- unsigned long *tx_accept_flags)
+ uint32_t *rx_accept_flags, uint32_t *tx_accept_flags)
{
/* Clear the flags first */
*rx_accept_flags = 0;
@@ -1470,26 +1444,28 @@ bnx2x_fill_accept_flags(struct bnx2x_softc *sc,
uint32_t rx_mode,
break;
case BNX2X_RX_MODE_NORMAL:
- bnx2x_set_bit(ECORE_ACCEPT_UNICAST, rx_accept_flags);
- bnx2x_set_bit(ECORE_ACCEPT_MULTICAST, rx_accept_flags);
- bnx2x_set_bit(ECORE_ACCEPT_BROADCAST, rx_accept_flags);
+ rte_bit_relaxed_set32(ECORE_ACCEPT_UNICAST, rx_accept_flags);
+ rte_bit_relaxed_set32(ECORE_ACCEPT_MULTICAST, rx_accept_flags);
+ rte_bit_relaxed_set32(ECORE_ACCEPT_BROADCAST, rx_accept_flags);
/* internal switching mode */
- bnx2x_set_bit(ECORE_ACCEPT_UNICAST, tx_accept_flags);
- bnx2x_set_bit(ECORE_ACCEPT_MULTICAST, tx_accept_flags);
- bnx2x_set_bit(ECORE_ACCEPT_BROADCAST, tx_accept_flags);
+ rte_bit_relaxed_set32(ECORE_ACCEPT_UNICAST, tx_accept_flags);
+ rte_bit_relaxed_set32(ECORE_ACCEPT_MULTICAST, tx_accept_flags);
+ rte_bit_relaxed_set32(ECORE_ACCEPT_BROADCAST, tx_accept_flags);
break;
case BNX2X_RX_MODE_ALLMULTI:
- bnx2x_set_bit(ECORE_ACCEPT_UNICAST, rx_accept_flags);
- bnx2x_set_bit(ECORE_ACCEPT_ALL_MULTICAST, rx_accept_flags);
- bnx2x_set_bit(ECORE_ACCEPT_BROADCAST, rx_accept_flags);
+
Re: [dpdk-dev] [PATCH v10 4/6] net/bnx2x: use common rte bit operation APIs instead
+Cc Julien Aube
17/02/2024 13:01, Mattias Rönnblom:
> On 2020-04-27 09:58, Joyce Kong wrote:
> > Remove its own bit operation APIs and use the common one,
> > this can reduce the code duplication largely.
> >
>
> In an attempt to backtrack what the semantics of
> should/need actually be (because the API documentation doesn't say
> anything regarding atomicity), I found this commmit.
>
> Joyce, you are replacing a set of atomic bit operations in this PMD, all
> of which are also full barriers, with a set of functions (from
> rte_bitops.h), all of which are *neither* guarateeed to be atomic *nor*
> has any memory ordering implications.
>
> Either the Broadcom authors of this PMD put way too much restrictions on
> its bit operations, or this commit broke this driver.
>
> I had a quick look in the Linux kernel bnx2x driver, and there was a
> mixture of __set_bit() (non-ordering, non-atomic) and set_bit() (full
> barrier, atomic).
>
> > Signed-off-by: Joyce Kong
> > Reviewed-by: Gavin Hu
> > ---
> > drivers/net/bnx2x/bnx2x.c| 271 +--
> > drivers/net/bnx2x/bnx2x.h| 10 +-
> > drivers/net/bnx2x/ecore_sp.c | 68 -
> > drivers/net/bnx2x/ecore_sp.h | 106 +++---
> > 4 files changed, 221 insertions(+), 234 deletions(-)
> >
> > diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
> > index ff7646b25..8eb6d609b 100644
> > --- a/drivers/net/bnx2x/bnx2x.c
> > +++ b/drivers/net/bnx2x/bnx2x.c
> > @@ -25,6 +25,7 @@
> > #include
> > #include
> > #include
> > +#include
> > #include
> >
> > #define BNX2X_PMD_VER_PREFIX "BNX2X PMD"
> > @@ -129,32 +130,6 @@ static void bnx2x_ack_sb(struct bnx2x_softc *sc,
> > uint8_t igu_sb_id,
> > uint8_t storm, uint16_t index, uint8_t op,
> > uint8_t update);
> >
> > -int bnx2x_test_bit(int nr, volatile unsigned long *addr)
> > -{
> > - int res;
> > -
> > - mb();
> > - res = ((*addr) & (1UL << nr)) != 0;
> > - mb();
> > - return res;
> > -}
> > -
> > -void bnx2x_set_bit(unsigned int nr, volatile unsigned long *addr)
> > -{
> > - __sync_fetch_and_or(addr, (1UL << nr));
> > -}
> > -
> > -void bnx2x_clear_bit(int nr, volatile unsigned long *addr)
> > -{
> > - __sync_fetch_and_and(addr, ~(1UL << nr));
> > -}
> > -
> > -int bnx2x_test_and_clear_bit(int nr, volatile unsigned long *addr)
> > -{
> > - unsigned long mask = (1UL << nr);
> > - return __sync_fetch_and_and(addr, ~mask) & mask;
> > -}
> > -
> > int bnx2x_cmpxchg(volatile int *addr, int old, int new)
> > {
> > return __sync_val_compare_and_swap(addr, old, new);
> > @@ -1434,16 +1409,16 @@ static int
> > bnx2x_del_all_macs(struct bnx2x_softc *sc, struct ecore_vlan_mac_obj
> > *mac_obj,
> > int mac_type, uint8_t wait_for_comp)
> > {
> > - unsigned long ramrod_flags = 0, vlan_mac_flags = 0;
> > + uint32_t ramrod_flags = 0, vlan_mac_flags = 0;
> > int rc;
> >
> > /* wait for completion of requested */
> > if (wait_for_comp) {
> > - bnx2x_set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
> > + rte_bit_relaxed_set32(RAMROD_COMP_WAIT, &ramrod_flags);
> > }
> >
> > /* Set the mac type of addresses we want to clear */
> > - bnx2x_set_bit(mac_type, &vlan_mac_flags);
> > + rte_bit_relaxed_set32(mac_type, &vlan_mac_flags);
> >
> > rc = mac_obj->delete_all(sc, mac_obj, &vlan_mac_flags, &ramrod_flags);
> > if (rc < 0)
> > @@ -1454,8 +1429,7 @@ bnx2x_del_all_macs(struct bnx2x_softc *sc, struct
> > ecore_vlan_mac_obj *mac_obj,
> >
> > static int
> > bnx2x_fill_accept_flags(struct bnx2x_softc *sc, uint32_t rx_mode,
> > - unsigned long *rx_accept_flags,
> > - unsigned long *tx_accept_flags)
> > + uint32_t *rx_accept_flags, uint32_t *tx_accept_flags)
> > {
> > /* Clear the flags first */
> > *rx_accept_flags = 0;
> > @@ -1470,26 +1444,28 @@ bnx2x_fill_accept_flags(struct bnx2x_softc *sc,
> > uint32_t rx_mode,
> > break;
> >
> > case BNX2X_RX_MODE_NORMAL:
> > - bnx2x_set_bit(ECORE_ACCEPT_UNICAST, rx_accept_flags);
> > - bnx2x_set_bit(ECORE_ACCEPT_MULTICAST, rx_accept_flags);
> > - bnx2x_set_bit(ECORE_ACCEPT_BROADCAST, rx_accept_flags);
> > + rte_bit_relaxed_set32(ECORE_ACCEPT_UNICAST, rx_accept_flags);
> > + rte_bit_relaxed_set32(ECORE_ACCEPT_MULTICAST, rx_accept_flags);
> > + rte_bit_relaxed_set32(ECORE_ACCEPT_BROADCAST, rx_accept_flags);
> >
> > /* internal switching mode */
> > - bnx2x_set_bit(ECORE_ACCEPT_UNICAST, tx_accept_flags);
> > - bnx2x_set_bit(ECORE_ACCEPT_MULTICAST, tx_accept_flags);
> > - bnx2x_set_bit(ECORE_ACCEPT_BROADCAST, tx_accept_flags);
> > + rte_bit_relaxed_set32(ECORE_ACCEPT_UNICAST, tx_accept_flags);
> > + rte_bit_relaxed_set32(ECORE_ACCEPT_MULTICAST, tx_accept_flags
Re: [PATCH] net/nfp: add support of UDP fragmentation offload
On Sat, 17 Feb 2024 09:54:10 +0800 Chaoyong He wrote: > Add the support of UDP fragmentation offload feature. > > Signed-off-by: Chaoyong He > Reviewed-by: Long Wu > Reviewed-by: Peng Zhang > --- > drivers/common/nfp/nfp_common_ctrl.h | 1 + > drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 7 ++- > drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 8 +--- > drivers/net/nfp/nfp_net_common.c | 8 ++-- > 4 files changed, 18 insertions(+), 6 deletions(-) Looks like this depends on earlier patch, it does not apply directly to main branch. > - if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0) > + if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0 && > + (ol_flags & RTE_MBUF_F_TX_UDP_SEG) == 0) > goto clean_txd; That is odd indentation style. Should be: if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0 && (ol_flags & RTE_MBUF_F_TX_UDP_SEG) == 0) goto clean_txd;
RE: [PATCH] net/nfp: add support of UDP fragmentation offload
> From: Stephen Hemminger [mailto:step...@networkplumber.org] > Sent: Saturday, 17 February 2024 17.47 > > On Sat, 17 Feb 2024 09:54:10 +0800 > Chaoyong He wrote: > > > Add the support of UDP fragmentation offload feature. > > > > Signed-off-by: Chaoyong He > > Reviewed-by: Long Wu > > Reviewed-by: Peng Zhang > > --- > > drivers/common/nfp/nfp_common_ctrl.h | 1 + > > drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 7 ++- > > drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 8 +--- > > drivers/net/nfp/nfp_net_common.c | 8 ++-- > > 4 files changed, 18 insertions(+), 6 deletions(-) > > Looks like this depends on earlier patch, it does not apply directly to > main branch. > > > - if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0) > > + if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0 && > > + (ol_flags & RTE_MBUF_F_TX_UDP_SEG) == 0) > > goto clean_txd; > > That is odd indentation style. Not formally... it follows the official DPDK Coding Style [1]. [1]: https://doc.dpdk.org/guides/contributing/coding_style.html#general > Should be: > > if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0 && > (ol_flags & RTE_MBUF_F_TX_UDP_SEG) == 0) > goto clean_txd; This indentation style is mentioned as an alternative in the guide. But the example in the guide also uses two tabs for a similar long comparison. Personally, I also prefer the style suggested by Stephen, so we might want to update the Coding Style. ;-)
Re: [PATCH] net/nfp: add support of UDP fragmentation offload
On Sat, 17 Feb 2024 19:02:30 +0100 Morten Brørup wrote: > Not formally... it follows the official DPDK Coding Style [1]. > > [1]: https://doc.dpdk.org/guides/contributing/coding_style.html#general > > > Should be: > > > > if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) == 0 && > > (ol_flags & RTE_MBUF_F_TX_UDP_SEG) == 0) > > goto clean_txd; > > This indentation style is mentioned as an alternative in the guide. But the > example in the guide also uses two tabs for a similar long comparison. > > Personally, I also prefer the style suggested by Stephen, so we might want to > update the Coding Style. ;-) The two tabs is an Intel thing, and I prefer the kernel, line up the conditional style. We really should have a style that can be describe by clang format. Other projects like VPP have a target that reformats the code and uses one of the clang format templates.
Re: [PATCH] doc: update minimum Linux kernel version
+Gao, DaxueX +Mcnamara, John Hello, As you say the Community Lab dropped main and next-* testing for RHEL7 when the requirement for a C11 compliant compiler was added last year, so we should already be good to go. We don't have any centos7 testing (centos8 was the first centos introduced for testing at the Community Lab). Adding Daxue and John so they are aware the Intel Lab will want to (probably) drop the centos7 testing by 24.07. Thanks! On Fri, Feb 16, 2024 at 12:42 PM Stephen Hemminger < step...@networkplumber.org> wrote: > On Fri, 16 Feb 2024 09:29:47 +0100 > Morten Brørup wrote: > > > The system requirements in the Getting Started Guide [1] says: > > > > Kernel version >= 4.14 > > The kernel version required is based on the oldest long term stable > kernel available at kernel.org when the DPDK version is in development. > > Compatibility for recent distribution kernels will be kept, notably > RHEL/CentOS 7. > > > > [1]: https://doc.dpdk.org/guides/linux_gsg/sys_reqs.html#system-software > > > > If we consider it API breakage to change that, we have to wait until the > 24.11 release. > > For future DPDK LTS releases, we should be more careful about what we > claim to support. And again: If we claim to support something, people > expect it to be tested in CI. > > > > Disregarding the API breakage by stopping support for a system we claim > to support... RHEL7 testing was changed to LTS only [2], that should > probably have been applied to CentOS 7 too. > > > > [2]: > https://inbox.dpdk.org/dev/CAJvnSUBcq3gznQD4k=krQ+gu2OxTxA2YJBc=J=ltidfxqgg...@mail.gmail.com/ > > > > This patch is too late for 24.03 release, by the time the next one happens, > we can drop CentOS 7 as well as the old kernel. >
Re: [PATCH v4 01/18] mbuf: deprecate GCC marker in rte mbuf struct
Some minor comments style may need adjust.
With above fixed,
Acked-by: Chengwen Feng
On 2024/2/15 14:21, Tyler Retzlaff wrote:
> Provide a macro that allows conditional expansion of RTE_MARKER fields
> to empty to allow rte_mbuf to be used with MSVC. It is proposed that
> we announce the fields to be __rte_deprecated (currently disabled).
>
> Introduce C11 anonymous unions to permit aliasing of well-known
> offsets by name into the rte_mbuf structure by a *new* name and to
> provide padding for cache alignment.
>
> Signed-off-by: Tyler Retzlaff
> ---
...
>
> - /* remaining bytes are set on RX when pulling packet from descriptor */
> - RTE_MARKER rx_descriptor_fields1;
> + uint64_t ol_flags;/**< Offload features. */
>
> - /*
> - * The packet type, which is the combination of outer/inner L2, L3, L4
> - * and tunnel types. The packet_type is about data really present in the
> - * mbuf. Example: if vlan stripping is enabled, a received vlan packet
> - * would have RTE_PTYPE_L2_ETHER and not RTE_PTYPE_L2_VLAN because the
> - * vlan is stripped from the data.
> - */
> - union {
> - uint32_t packet_type; /**< L2/L3/L4 and tunnel information. */
> - __extension__
> - struct {
> - uint8_t l2_type:4; /**< (Outer) L2 type. */
> - uint8_t l3_type:4; /**< (Outer) L3 type. */
> - uint8_t l4_type:4; /**< (Outer) L4 type. */
> - uint8_t tun_type:4; /**< Tunnel type. */
> + /* remaining bytes are set on RX when pulling packet
> from descriptor */
> + __rte_marker(RTE_MARKER, rx_descriptor_fields1);
> union {
> - uint8_t inner_esp_next_proto;
> - /**< ESP next protocol type, valid if
> - * RTE_PTYPE_TUNNEL_ESP tunnel type is set
> - * on both Tx and Rx.
> - */
> + char mbuf_rx_descriptor_fields1[8];
> __extension__
> struct {
> - uint8_t inner_l2_type:4;
> - /**< Inner L2 type. */
> - uint8_t inner_l3_type:4;
> - /**< Inner L3 type. */
> + /*
> + * The packet type, which is the
> combination of outer/inner
> + * L2, L3, L4 and tunnel types. The
> packet_type is about
> + * data really present in the mbuf.
> Example: if vlan
> + * stripping is enabled, a received
> vlan packet would have
> + * RTE_PTYPE_L2_ETHER and not
> RTE_PTYPE_L2_VLAN because the
> + * vlan is stripped from the data.
> + */
> + union {
> + uint32_t packet_type;
> + /**< L2/L3/L4 and tunnel
> information. */
According dpdk doxygen guidelines [1], prefer prefix comment in above case.
[1]
https://doc.dpdk.org/guides/contributing/documentation.html#doxygen-guidelines
> + __extension__
> + struct {
> + uint8_t l2_type:4;
> + /**< (Outer) L2 type. */
> + uint8_t l3_type:4;
> + /**< (Outer) L3 type. */
> + uint8_t l4_type:4;
> + /**< (Outer) L4 type. */
> + uint8_t tun_type:4;
> + /**< Tunnel type. */
> + union {
> + uint8_t
> inner_esp_next_proto;
> + /**< ESP next
> protocol type, valid
> + * if
> RTE_PTYPE_TUNNEL_ESP tunnel
> + * type is set
> on both Tx and Rx.
> + */
> + __extension__
> + struct {
> +
Re: [PATCH v4 02/18] mbuf: stop using zero sized marker fields
Acked-by: Chengwen Feng
On 2024/2/15 14:21, Tyler Retzlaff wrote:
> Update to reference newly named anonymous union markers supported by
> standard C and stop referencing zero sized compiler extension markers.
>
> Signed-off-by: Tyler Retzlaff
> ---
> lib/mbuf/rte_mbuf.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
> index 286b32b..963f713 100644
> --- a/lib/mbuf/rte_mbuf.h
> +++ b/lib/mbuf/rte_mbuf.h
> @@ -108,7 +108,7 @@
> static inline void
> rte_mbuf_prefetch_part1(struct rte_mbuf *m)
> {
> - rte_prefetch0(&m->cacheline0);
> + rte_prefetch0(&m->mbuf_cacheline0);
> }
>
> /**
> @@ -126,7 +126,7 @@
> rte_mbuf_prefetch_part2(struct rte_mbuf *m)
> {
> #if RTE_CACHE_LINE_SIZE == 64
> - rte_prefetch0(&m->cacheline1);
> + rte_prefetch0(&m->mbuf_cacheline1);
> #else
> RTE_SET_USED(m);
> #endif
>
Re: [PATCH v4 12/18] net/hns3: stop using zero sized marker fields
Acked-by: Chengwen Feng On 2024/2/15 14:21, Tyler Retzlaff wrote: > Update to reference newly named anonymous union markers supported by > standard C and stop referencing zero sized compiler extension markers. > > Signed-off-by: Tyler Retzlaff > --- ...
Re: [PATCH v2 3/3] add extension keyword to GCC statement expressions
For drivers/dma/hisilicon/hisi_dmadev.c part, Acked-by: Chengwen Feng On 2024/2/16 18:24, David Marchand wrote: > From: Tyler Retzlaff > > Add __extension__ keyword to gcc statement expression extensions. > > Signed-off-by: Tyler Retzlaff > Reviewed-by: Ruifeng Wang > --- > drivers/bus/fslmc/mc/fsl_mc_sys.h | 6 ++-- > drivers/common/cnxk/roc_io.h | 6 ++-- > drivers/common/cnxk/roc_platform.h| 2 +- > drivers/common/dpaax/dpaa_list.h | 2 +- > drivers/common/qat/qat_adf/icp_qat_hw.h | 2 +- > drivers/crypto/armv8/rte_armv8_pmd.c | 4 +-- > drivers/crypto/caam_jr/caam_jr_desc.h | 2 +- > drivers/dma/hisilicon/hisi_dmadev.c | 2 +- > drivers/event/octeontx/ssovf_evdev.h | 4 +-- > drivers/mempool/octeontx/octeontx_fpavf.h | 4 +-- > drivers/ml/cnxk/cn10k_ml_dev.h| 4 +-- > drivers/net/ena/base/ena_plat_dpdk.h | 14 - > drivers/net/ena/ena_ethdev.c | 30 +-- > drivers/net/enetfec/enet_ethdev.h | 2 +- > drivers/net/fm10k/base/fm10k_osdep.h | 2 +- > drivers/net/octeontx/base/octeontx_io.h | 6 ++-- > drivers/net/pfe/base/cbus.h | 2 +- > drivers/net/pfe/base/pfe.h| 12 > drivers/net/tap/bpf/bpf_api.h | 2 +- > drivers/net/thunderx/base/nicvf_plat.h| 4 +-- > drivers/net/txgbe/base/txgbe_osdep.h | 2 +- > drivers/raw/ifpga/afu_pmd_core.h | 2 +- > drivers/raw/ifpga/base/ifpga_compat.h | 2 +- > drivers/raw/ifpga/base/opae_osdep.h | 4 +-- > drivers/raw/ifpga/base/opae_spi_transaction.c | 2 +- > examples/qos_meter/main.h | 2 +- > lib/ethdev/rte_mtr.c | 10 +++ > lib/ethdev/rte_tm.c | 6 ++-- > lib/pipeline/rte_pipeline.c | 8 ++--- > lib/pipeline/rte_swx_pipeline_internal.h | 2 +- > lib/port/rte_port_source_sink.c | 4 +-- > 31 files changed, 78 insertions(+), 78 deletions(-) > ...
Re: [PATCH v2 0/3] replace use of EAL logtype in applications
Series-acked-by: Chengwen Feng On 2024/2/16 11:36, Stephen Hemminger wrote: > There are some places EAL logtype is being used in testpmd > and examples where it should not be. Lets reserve EAL > logtype to only be used by DPDK internals. > > v2 - use TESTPMD_LOG() in testpmd log changes > > Stephen Hemminger (3): > examples/l2fwd-keepalive: don't use EAL logtype > examples/vm_power_manager: do not use EAL logtype > testpmd: replace EAL logtype TESTPMD_LOG > > app/test-pmd/testpmd.c | 42 > examples/l2fwd-keepalive/shm.c | 21 ++-- > examples/vm_power_manager/main.c | 11 +++-- > 3 files changed, 26 insertions(+), 48 deletions(-) >
Re: [PATCH v2 0/6] use rte atomic thread fence
Series-acked-by: Chengwen Feng On 2024/2/15 14:50, Tyler Retzlaff wrote: > Replace use of __atomic_thread_fence with rte_atomic_thread_fence. > > Notes: > > The rest of lib/lpm will be converted to rte_atomic in a separate > series (to be submitted soon). > > There are existing checkpatches checks that catch use of both > __atomic_thread_fence and __rte_atomic_thread_fence in new > submissions. > > v2: > * change series to use rte_atomic_thread_fence instead of > __rte_atomic_thread_fence (internal) > * also change __atomic_thread_fence in lib/lpm > > Tyler Retzlaff (6): > distributor: use rte atomic thread fence > eal: use rte atomic thread fence > hash: use rte atomic thread fence > ring: use rte atomic thread fence > stack: use rte atomic thread fence > lpm: use rte atomic thread fence > > lib/distributor/rte_distributor.c | 2 +- > lib/eal/common/eal_common_trace.c | 2 +- > lib/eal/include/rte_mcslock.h | 4 ++-- > lib/hash/rte_cuckoo_hash.c| 10 +- > lib/lpm/rte_lpm.c | 4 ++-- > lib/ring/rte_ring_c11_pvt.h | 4 ++-- > lib/stack/rte_stack_lf_c11.h | 2 +- > 7 files changed, 14 insertions(+), 14 deletions(-) >
Re: [PATCH v3 0/7] fix race-condition of proactive error handling mode
Hi Ferruh, This patchset will modify lib/ethdev/, Could you help review it before RC1? Thanks On 2024/1/29 9:16, fengchengwen wrote: > Hi Ferruh, > > Kindly ping for review. > > Thanks > > On 2024/1/15 9:44, fengchengwen wrote: >> Kindly ping. >> >> On 2023/12/5 10:30, fengchengwen wrote: >>> Hi Ferruh, >>> >>> I notice this patchset was delegated to you, so could you take a view? >>> >>> Thanks. >>> >>> On 2023/11/6 21:11, Chengwen Feng wrote: This patch fixes race-condition of proactive error handling mode, the discussion thread [1]. [1] http://patchwork.dpdk.org/project/dpdk/patch/20230220060839.1267349-2-ashok.k.kal...@intel.com/ Chengwen Feng (7): ethdev: fix race-condition of proactive error handling mode net/hns3: replace fp ops config function net/bnxt: fix race-condition when report error recovery net/bnxt: use fp ops setup function app/testpmd: add error recovery usage demo app/testpmd: extract event handling to event.c doc: testpmd support event handling section --- v3: - adjust the usage of RTE_ETH_EVENT_QUEUE_STATE in 7/7 commit. - add ack-by from Konstantin Ananyev, Ajit Khaparde and Huisong Li. v2: - extract event handling to event.c and document it, which address Ferruh's comment. - add ack-by from Konstantin Ananyev and Dongdong Liu. app/test-pmd/event.c | 390 +++ app/test-pmd/meson.build | 1 + app/test-pmd/parameters.c| 36 +- app/test-pmd/testpmd.c | 247 +--- app/test-pmd/testpmd.h | 10 +- doc/guides/prog_guide/poll_mode_drv.rst | 20 +- doc/guides/testpmd_app_ug/event_handling.rst | 81 doc/guides/testpmd_app_ug/index.rst | 1 + drivers/net/bnxt/bnxt_cpr.c | 18 +- drivers/net/bnxt/bnxt_ethdev.c | 9 +- drivers/net/hns3/hns3_rxtx.c | 21 +- lib/ethdev/ethdev_driver.c | 8 + lib/ethdev/ethdev_driver.h | 10 + lib/ethdev/rte_ethdev.h | 32 +- lib/ethdev/version.map | 1 + 15 files changed, 552 insertions(+), 333 deletions(-) create mode 100644 app/test-pmd/event.c create mode 100644 doc/guides/testpmd_app_ug/event_handling.rst >>> . >>> >> . >> > . >
[v2 02/10] net/mlx5/hws: add check for not supported fields in VXLAN
From: Erez Shitrit
Don't allow the user to mask over rsvd1 / rsvd2 fields which are not
supported.
Fixes: dbff89ef806f ("net/mlx5/hws: fix tunnel protocol checks")
Signed-off-by: Erez Shitrit
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 79d98bbf78..8b8757ecac 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -1414,6 +1414,13 @@ mlx5dr_definer_conv_item_vxlan(struct
mlx5dr_definer_conv_data *cd,
struct mlx5dr_definer_fc *fc;
bool inner = cd->tunnel;
+ if (m && (m->rsvd0[0] != 0 || m->rsvd0[1] != 0 || m->rsvd0[2] != 0 ||
+ m->rsvd1 != 0)) {
+ DR_LOG(ERR, "reserved fields are not supported");
+ rte_errno = ENOTSUP;
+ return rte_errno;
+ }
+
if (inner) {
DR_LOG(ERR, "Inner VXLAN item not supported");
rte_errno = ENOTSUP;
--
2.39.3
[v2 01/10] net/mlx5/hws: skip RTE item when inserting rules by index
The location of indexed rules is determined by the index, not the item
hash. A matcher test is added to prevent access to non-existent items.
This avoids unnecessary processing and potential segmentation faults.
Fixes: 405242c ("net/mlx5/hws: add rule object")
Signed-off-by: Itamar Gozlan
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr_rule.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c
b/drivers/net/mlx5/hws/mlx5dr_rule.c
index fa19303b91..e39137a6ee 100644
--- a/drivers/net/mlx5/hws/mlx5dr_rule.c
+++ b/drivers/net/mlx5/hws/mlx5dr_rule.c
@@ -23,6 +23,9 @@ static void mlx5dr_rule_skip(struct mlx5dr_matcher *matcher,
*skip_rx = false;
*skip_tx = false;
+ if (unlikely(mlx5dr_matcher_is_insert_by_idx(matcher)))
+ return;
+
if (mt->item_flags & MLX5_FLOW_ITEM_REPRESENTED_PORT) {
v = items[mt->vport_item_id].spec;
vport = flow_hw_conv_port_id(v->port_id);
--
2.39.3
[v2 04/10] net/mlx5/hws: reordering the STE fields to improve hash
Inserting two rules with the same hash calculation result into the same
matcher will cause collisions, which can cause degradation in PPS.
Changing the order of some fields in the STE can change the hash result,
and doing this for every value would give us a different hash distribution
for the inputs. By using precomputed optimal DW locations, we can change
the STE order for a limited set of the most common values to reduce the
number of hash collisions and improve latency.
Signed-off-by: Itamar Gozlan
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 64 +++
1 file changed, 64 insertions(+)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index e564062313..eb788a772a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -100,6 +100,33 @@
__mlx5_dw_off(typ, fld))) >> __mlx5_dw_bit_off(typ, fld)) & \
__mlx5_mask(typ, fld))
+#define MAX_ROW_LOG 31
+
+enum header_layout {
+ MLX5DR_HL_IPV4_SRC = 64,
+ MLX5DR_HL_IPV4_DST = 65,
+ MAX_HL_PRIO,
+};
+
+/* Each row (i) indicates a different matcher size, and each column (j)
+ * represents {DW5, DW4, DW3, DW2, DW1, DW0}.
+ * For values 0,..,2^i, and j (DW) 0,..,5: optimal_dist_dw[i][j] is 1 if the
+ * number of different hash results on these values equals 2^i, meaning this
+ * DW hash distribution is complete.
+ */
+int optimal_dist_dw[MAX_ROW_LOG][DW_SELECTORS_MATCH] = {
+ {1, 1, 1, 1, 1, 1}, {0, 1, 1, 0, 1, 0}, {0, 1, 1, 0, 1, 0},
+ {1, 0, 1, 0, 1, 0}, {0, 0, 0, 1, 1, 0}, {0, 1, 1, 0, 1, 0},
+ {0, 0, 0, 0, 1, 0}, {0, 1, 1, 0, 1, 0}, {0, 0, 0, 0, 0, 0},
+ {1, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 1, 0, 1, 0, 0},
+ {1, 0, 0, 0, 0, 0}, {0, 0, 1, 0, 0, 1}, {1, 1, 1, 0, 0, 0},
+ {1, 1, 1, 0, 1, 0}, {0, 0, 1, 1, 0, 0}, {0, 1, 1, 0, 0, 1},
+ {0, 0, 1, 0, 0, 1}, {0, 0, 1, 0, 0, 0}, {1, 0, 1, 1, 0, 0},
+ {1, 0, 1, 0, 0, 1}, {0, 0, 1, 1, 0, 1}, {1, 1, 1, 0, 0, 0},
+ {0, 1, 0, 1, 0, 1}, {0, 0, 0, 0, 0, 1}, {0, 0, 0, 1, 1, 1},
+ {0, 0, 1, 0, 0, 1}, {1, 1, 0, 1, 1, 0}, {0, 0, 0, 0, 1, 0},
+ {0, 0, 0, 1, 1, 0}};
+
struct mlx5dr_definer_sel_ctrl {
uint8_t allowed_full_dw; /* Full DW selectors cover all offsets */
uint8_t allowed_lim_dw; /* Limited DW selectors cover offset < 64 */
@@ -3185,6 +3212,37 @@ mlx5dr_definer_find_best_range_fit(struct mlx5dr_definer
*definer,
return rte_errno;
}
+static void mlx5dr_definer_optimize_order(struct mlx5dr_definer *definer, int
num_log)
+{
+ uint8_t hl_prio[MAX_HL_PRIO - 1] = {MLX5DR_HL_IPV4_SRC,
+ MLX5DR_HL_IPV4_DST,
+ MAX_HL_PRIO};
+ int dw = 0, i = 0, j;
+ int *dw_flag;
+ uint8_t tmp;
+
+ dw_flag = optimal_dist_dw[num_log];
+
+ while (hl_prio[i] != MAX_HL_PRIO) {
+ j = 0;
+ /* Finding a candidate to improve its hash distribution */
+ while (j < DW_SELECTORS_MATCH && (hl_prio[i] !=
definer->dw_selector[j]))
+ j++;
+
+ /* Finding a DW location with good hash distribution */
+ while (dw < DW_SELECTORS_MATCH && dw_flag[dw] == 0)
+ dw++;
+
+ if (dw < DW_SELECTORS_MATCH && j < DW_SELECTORS_MATCH) {
+ tmp = definer->dw_selector[dw];
+ definer->dw_selector[dw] = definer->dw_selector[j];
+ definer->dw_selector[j] = tmp;
+ dw++;
+ }
+ i++;
+ }
+}
+
static int
mlx5dr_definer_find_best_match_fit(struct mlx5dr_context *ctx,
struct mlx5dr_definer *definer,
@@ -3355,6 +3413,12 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher
*matcher,
goto free_fc;
}
+ if (!mlx5dr_definer_is_jumbo(match_definer) &&
+ !mlx5dr_matcher_req_fw_wqe(matcher) &&
+ !mlx5dr_matcher_is_resizable(matcher) &&
+ !mlx5dr_matcher_is_insert_by_idx(matcher))
+ mlx5dr_definer_optimize_order(match_definer,
matcher->attr.rule.num_log);
+
/* Find the range definer layout for match templates fcrs */
ret = mlx5dr_definer_find_best_range_fit(range_definer, matcher);
if (ret) {
--
2.39.3
[v2 06/10] net/mlx5/hws: fix VLAN item handling on non relaxed mode
From: Hamdan Igbaria
If a VLAN item was passed with null mask, the item handler would
return immediately and thus won't set default values for non relax
mode.
Also change the non relax default set to single-tagged (CVLAN).
Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer")
Signed-off-by: Hamdan Igbaria
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index eb788a772a..b8a546989a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -223,6 +223,7 @@ struct mlx5dr_definer_conv_data {
X(SET, ib_l4_opcode, v->hdr.opcode,
rte_flow_item_ib_bth) \
X(SET, random_number, v->value,
rte_flow_item_random) \
X(SET, ib_l4_bth_a,v->hdr.a,
rte_flow_item_ib_bth) \
+ X(SET, cvlan, STE_CVLAN,
rte_flow_item_vlan) \
/* Item set function format */
#define X(set_type, func_name, value, item_type) \
@@ -864,6 +865,15 @@ mlx5dr_definer_conv_item_vlan(struct
mlx5dr_definer_conv_data *cd,
struct mlx5dr_definer_fc *fc;
bool inner = cd->tunnel;
+ if (!cd->relaxed) {
+ /* Mark packet as tagged (CVLAN) */
+ fc = &cd->fc[DR_CALC_FNAME(VLAN_TYPE, inner)];
+ fc->item_idx = item_idx;
+ fc->tag_mask_set = &mlx5dr_definer_ones_set;
+ fc->tag_set = &mlx5dr_definer_cvlan_set;
+ DR_CALC_SET(fc, eth_l2, first_vlan_qualifier, inner);
+ }
+
if (!m)
return 0;
@@ -872,8 +882,7 @@ mlx5dr_definer_conv_item_vlan(struct
mlx5dr_definer_conv_data *cd,
return rte_errno;
}
- if (!cd->relaxed || m->has_more_vlan) {
- /* Mark packet as tagged (CVLAN or SVLAN) even if TCI is not
specified.*/
+ if (m->has_more_vlan) {
fc = &cd->fc[DR_CALC_FNAME(VLAN_TYPE, inner)];
fc->item_idx = item_idx;
fc->tag_mask_set = &mlx5dr_definer_ones_set;
--
2.39.3
[v2 03/10] net/mlx5/hws: add support for resizable matchers
From: Yevgeny Kliteynik
Add support for matcher resize with the following new API calls:
- mlx5dr_matcher_resize_set_target
- mlx5dr_matcher_resize_rule_move
The first function links two matchers and allows moving rules from src
matcher to dst matcher. Both matchers should have the same characteristics
(e.g. same mt, same at). It is the user's responsibility to make sure that
the dst matcher has enough space for the moved rules.
After this function, the user can move rules from src into dst matcher,
and he is no longer allowed to insert rules to the src matcher.
The second function is used to move the rule from matcher that is being
resized to a bigger matcher. Moving a single rule includes creating a new
rule in the destination matcher, and deleting the rule from the source
matcher. This operation creates a single completion.
Signed-off-by: Yevgeny Kliteynik
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr.h | 39
drivers/net/mlx5/hws/mlx5dr_definer.c | 5 +-
drivers/net/mlx5/hws/mlx5dr_definer.h | 3 +
drivers/net/mlx5/hws/mlx5dr_matcher.c | 181 +++-
drivers/net/mlx5/hws/mlx5dr_matcher.h | 21 ++
drivers/net/mlx5/hws/mlx5dr_rule.c| 290 ++
drivers/net/mlx5/hws/mlx5dr_rule.h| 30 ++-
drivers/net/mlx5/hws/mlx5dr_send.c| 45
8 files changed, 573 insertions(+), 41 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr.h b/drivers/net/mlx5/hws/mlx5dr.h
index 9c5b068c93..49f72118ba 100644
--- a/drivers/net/mlx5/hws/mlx5dr.h
+++ b/drivers/net/mlx5/hws/mlx5dr.h
@@ -139,6 +139,8 @@ struct mlx5dr_matcher_attr {
/* Define the insertion and distribution modes for this matcher */
enum mlx5dr_matcher_insert_mode insert_mode;
enum mlx5dr_matcher_distribute_mode distribute_mode;
+ /* Define whether the created matcher supports resizing into a bigger
matcher */
+ bool resizable;
union {
struct {
uint8_t sz_row_log;
@@ -440,6 +442,43 @@ int mlx5dr_matcher_destroy(struct mlx5dr_matcher *matcher);
int mlx5dr_matcher_attach_at(struct mlx5dr_matcher *matcher,
struct mlx5dr_action_template *at);
+/* Link two matchers and enable moving rules from src matcher to dst matcher.
+ * Both matchers must be in the same table type, must be created with
'resizable'
+ * property, and should have the same characteristics (e.g. same mt, same at).
+ *
+ * It is the user's responsibility to make sure that the dst matcher
+ * was allocated with the appropriate size.
+ *
+ * Once the function is completed, the user is:
+ * - allowed to move rules from src into dst matcher
+ * - no longer allowed to insert rules to the src matcher
+ *
+ * The user is always allowed to insert rules to the dst matcher and
+ * to delete rules from any matcher.
+ *
+ * @param[in] src_matcher
+ * source matcher for moving rules from
+ * @param[in] dst_matcher
+ * destination matcher for moving rules to
+ * @return zero on successful move, non zero otherwise.
+ */
+int mlx5dr_matcher_resize_set_target(struct mlx5dr_matcher *src_matcher,
+struct mlx5dr_matcher *dst_matcher);
+
+/* Enqueue moving rule operation: moving rule from src matcher to a dst matcher
+ *
+ * @param[in] src_matcher
+ * matcher that the rule belongs to
+ * @param[in] rule
+ * the rule to move
+ * @param[in] attr
+ * rule attributes
+ * @return zero on success, non zero otherwise.
+ */
+int mlx5dr_matcher_resize_rule_move(struct mlx5dr_matcher *src_matcher,
+ struct mlx5dr_rule *rule,
+ struct mlx5dr_rule_attr *attr);
+
/* Get the size of the rule handle (mlx5dr_rule) to be used on rule creation.
*
* @return size in bytes of rule handle struct.
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 8b8757ecac..e564062313 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -3296,9 +3296,8 @@ int mlx5dr_definer_get_id(struct mlx5dr_definer *definer)
return definer->obj->id;
}
-static int
-mlx5dr_definer_compare(struct mlx5dr_definer *definer_a,
- struct mlx5dr_definer *definer_b)
+int mlx5dr_definer_compare(struct mlx5dr_definer *definer_a,
+ struct mlx5dr_definer *definer_b)
{
int i;
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h
b/drivers/net/mlx5/hws/mlx5dr_definer.h
index ced9d9da13..71cc0e94de 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.h
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h
@@ -733,4 +733,7 @@ int mlx5dr_definer_init_cache(struct mlx5dr_definer_cache
**cache);
void mlx5dr_definer_uninit_cache(struct mlx5dr_definer_cache *cache);
+int mlx5dr_definer_compare(struct mlx5dr_definer *definer_a,
+ struct mlx5dr_definer *definer_b);
+
#endif
diff --git a/drivers/net/m
[v2 07/10] net/mlx5/hws: extend action template creation API
From: Hamdan Igbaria
Extend mlx5dr_action_template_create function params
to include flags parameter.
Signed-off-by: Hamdan Igbaria
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr.h | 10 +-
drivers/net/mlx5/hws/mlx5dr_action.c | 11 ++-
drivers/net/mlx5/hws/mlx5dr_action.h | 1 +
drivers/net/mlx5/hws/mlx5dr_matcher.c | 16 ++--
drivers/net/mlx5/mlx5_flow_hw.c | 2 +-
5 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr.h b/drivers/net/mlx5/hws/mlx5dr.h
index 49f72118ba..3647e25cf2 100644
--- a/drivers/net/mlx5/hws/mlx5dr.h
+++ b/drivers/net/mlx5/hws/mlx5dr.h
@@ -84,6 +84,11 @@ enum mlx5dr_match_template_flags {
MLX5DR_MATCH_TEMPLATE_FLAG_RELAXED_MATCH = 1,
};
+enum mlx5dr_action_template_flags {
+ /* Allow relaxed actions order. */
+ MLX5DR_ACTION_TEMPLATE_FLAG_RELAXED_ORDER = 1 << 0,
+};
+
enum mlx5dr_send_queue_actions {
/* Start executing all pending queued rules */
MLX5DR_SEND_QUEUE_ACTION_DRAIN_ASYNC = 1 << 0,
@@ -383,10 +388,13 @@ int mlx5dr_match_template_destroy(struct
mlx5dr_match_template *mt);
* An array of actions based on the order of actions which will be provided
* with rule_actions to mlx5dr_rule_create. The last action is marked
* using MLX5DR_ACTION_TYP_LAST.
+ * @param[in] flags
+ * Template creation flags
* @return pointer to mlx5dr_action_template on success NULL otherwise
*/
struct mlx5dr_action_template *
-mlx5dr_action_template_create(const enum mlx5dr_action_type action_type[]);
+mlx5dr_action_template_create(const enum mlx5dr_action_type action_type[],
+ uint32_t flags);
/* Destroy action template.
*
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c
b/drivers/net/mlx5/hws/mlx5dr_action.c
index 862ee3e332..370886907f 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -3385,12 +3385,19 @@ int mlx5dr_action_template_process(struct
mlx5dr_action_template *at)
}
struct mlx5dr_action_template *
-mlx5dr_action_template_create(const enum mlx5dr_action_type action_type[])
+mlx5dr_action_template_create(const enum mlx5dr_action_type action_type[],
+ uint32_t flags)
{
struct mlx5dr_action_template *at;
uint8_t num_actions = 0;
int i;
+ if (flags > MLX5DR_ACTION_TEMPLATE_FLAG_RELAXED_ORDER) {
+ DR_LOG(ERR, "Unsupported action template flag provided");
+ rte_errno = EINVAL;
+ return NULL;
+ }
+
at = simple_calloc(1, sizeof(*at));
if (!at) {
DR_LOG(ERR, "Failed to allocate action template");
@@ -3398,6 +3405,8 @@ mlx5dr_action_template_create(const enum
mlx5dr_action_type action_type[])
return NULL;
}
+ at->flags = flags;
+
while (action_type[num_actions++] != MLX5DR_ACTION_TYP_LAST)
;
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h
b/drivers/net/mlx5/hws/mlx5dr_action.h
index fad35a845b..a8d9720c42 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.h
+++ b/drivers/net/mlx5/hws/mlx5dr_action.h
@@ -119,6 +119,7 @@ struct mlx5dr_action_template {
uint8_t num_of_action_stes;
uint8_t num_actions;
uint8_t only_term;
+ uint32_t flags;
};
struct mlx5dr_action {
diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c
b/drivers/net/mlx5/hws/mlx5dr_matcher.c
index 0d5c462734..402242308d 100644
--- a/drivers/net/mlx5/hws/mlx5dr_matcher.c
+++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c
@@ -686,12 +686,16 @@ static int mlx5dr_matcher_check_and_process_at(struct
mlx5dr_matcher *matcher,
bool valid;
int ret;
- /* Check if action combinabtion is valid */
- valid = mlx5dr_action_check_combo(at->action_type_arr,
matcher->tbl->type);
- if (!valid) {
- DR_LOG(ERR, "Invalid combination in action template");
- rte_errno = EINVAL;
- return rte_errno;
+ if (!(at->flags & MLX5DR_ACTION_TEMPLATE_FLAG_RELAXED_ORDER)) {
+ /* Check if actions combinabtion is valid,
+* in the case of not relaxed actions order.
+*/
+ valid = mlx5dr_action_check_combo(at->action_type_arr,
matcher->tbl->type);
+ if (!valid) {
+ DR_LOG(ERR, "Invalid combination in action template");
+ rte_errno = EINVAL;
+ return rte_errno;
+ }
}
/* Process action template to setters */
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 3bb3a9a178..9d3dad65d4 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -6202,7 +6202,7 @@ flow_hw_dr_actions_template_create(struct rte_eth_dev
*dev,
at->recom_off = recom_off;
action_types[recom_off] = r
[v2 05/10] net/mlx5/hws: check the rule status on rule update
From: Hamdan Igbaria
Only allow rule updates for rules with their status value equal to
MLX5DR_RULE_STATUS_CREATED.
Otherwise, the rule may be in an unstable stage like deleting and
this will result in a faulty unexpected scenario.
Signed-off-by: Hamdan Igbaria
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr_rule.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c
b/drivers/net/mlx5/hws/mlx5dr_rule.c
index 6bf087e187..aa00c54e53 100644
--- a/drivers/net/mlx5/hws/mlx5dr_rule.c
+++ b/drivers/net/mlx5/hws/mlx5dr_rule.c
@@ -977,6 +977,12 @@ int mlx5dr_rule_action_update(struct mlx5dr_rule
*rule_handle,
if (unlikely(mlx5dr_rule_enqueue_precheck_update(rule_handle, attr)))
return -rte_errno;
+ if (rule_handle->status != MLX5DR_RULE_STATUS_CREATED) {
+ DR_LOG(ERR, "Current rule status does not allow update");
+ rte_errno = EBUSY;
+ return -rte_errno;
+ }
+
ret = mlx5dr_rule_create_hws(rule_handle,
attr,
0,
--
2.39.3
[v2 08/10] net/mlx5/hws: add missing actions STE limitation
From: Hamdan Igbaria Today if we pass a remove header action and after it an insert header action then our action template builder will set two different STE setters, because it won't allow insert header in same STE as remove header. But if we have the opposite order of insert header and then remove header actions, then the setter will set both of them on the same STE since the opposite check was missing. This patch added the missing opposite limitation. Signed-off-by: Hamdan Igbaria Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr_action.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 370886907f..8589de5557 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -3308,7 +3308,8 @@ int mlx5dr_action_template_process(struct mlx5dr_action_template *at) case MLX5DR_ACTION_TYP_REMOVE_HEADER: case MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2: /* Single remove header to header */ - setter = mlx5dr_action_setter_find_first(last_setter, ASF_SINGLE1 | ASF_MODIFY); + setter = mlx5dr_action_setter_find_first(last_setter, + ASF_SINGLE1 | ASF_MODIFY | ASF_INSERT); setter->flags |= ASF_SINGLE1 | ASF_REMOVE; setter->set_single = &mlx5dr_action_setter_single; setter->idx_single = i; -- 2.39.3
[v2 09/10] net/mlx5/hws: support push_esp flag for insert header action
From: Hamdan Igbaria
support push_esp flag for insert header action, it must be set when
inserting an ESP header, it's also sets the next_protocol field in
the IPsec trailer.
Signed-off-by: Hamdan Igbaria
Acked-by: Matan Azrad
---
drivers/common/mlx5/mlx5_prm.h | 3 ++-
drivers/net/mlx5/hws/mlx5dr.h| 4
drivers/net/mlx5/hws/mlx5dr_action.c | 4
drivers/net/mlx5/hws/mlx5dr_action.h | 1 +
drivers/net/mlx5/hws/mlx5dr_cmd.c| 2 ++
drivers/net/mlx5/hws/mlx5dr_cmd.h| 1 +
6 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 787211c85c..282e59e52c 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -3616,7 +3616,8 @@ struct mlx5_ifc_stc_ste_param_insert_bits {
u8 action_type[0x4];
u8 encap[0x1];
u8 inline_data[0x1];
- u8 reserved_at_6[0x4];
+ u8 push_esp[0x1];
+ u8 reserved_at_7[0x3];
u8 insert_anchor[0x6];
u8 reserved_at_10[0x1];
u8 insert_offset[0x7];
diff --git a/drivers/net/mlx5/hws/mlx5dr.h b/drivers/net/mlx5/hws/mlx5dr.h
index 3647e25cf2..d612f300c6 100644
--- a/drivers/net/mlx5/hws/mlx5dr.h
+++ b/drivers/net/mlx5/hws/mlx5dr.h
@@ -192,6 +192,10 @@ struct mlx5dr_action_insert_header {
* requiring device to update offloaded fields (for example IPv4 total
length).
*/
bool encap;
+ /* It must be set when adding ESP header.
+* It's also sets the next_protocol value in the ipsec trailer.
+*/
+ bool push_esp;
};
enum mlx5dr_action_remove_header_type {
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c
b/drivers/net/mlx5/hws/mlx5dr_action.c
index 8589de5557..f55069c675 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -598,6 +598,7 @@ static void mlx5dr_action_fill_stc_attr(struct
mlx5dr_action *action,
attr->action_type = MLX5_IFC_STC_ACTION_TYPE_HEADER_INSERT;
attr->action_offset = MLX5DR_ACTION_OFFSET_DW6;
attr->insert_header.encap = action->reformat.encap;
+ attr->insert_header.push_esp = action->reformat.push_esp;
attr->insert_header.insert_anchor = action->reformat.anchor;
attr->insert_header.arg_id = action->reformat.arg_obj->id;
attr->insert_header.header_size = action->reformat.header_size;
@@ -635,6 +636,7 @@ static void mlx5dr_action_fill_stc_attr(struct
mlx5dr_action *action,
attr->action_offset = MLX5DR_ACTION_OFFSET_DW6;
attr->reparse_mode = MLX5_IFC_STC_REPARSE_ALWAYS;
attr->insert_header.encap = 0;
+ attr->insert_header.push_esp = 0;
attr->insert_header.is_inline = 1;
attr->insert_header.insert_anchor =
MLX5_HEADER_ANCHOR_PACKET_START;
attr->insert_header.insert_offset =
MLX5DR_ACTION_HDR_LEN_L2_MACS;
@@ -1340,6 +1342,7 @@ mlx5dr_action_handle_insert_with_ptr(struct mlx5dr_action
*action,
action[i].reformat.anchor =
MLX5_HEADER_ANCHOR_PACKET_START;
action[i].reformat.offset = 0;
action[i].reformat.encap = 1;
+ action[i].reformat.push_esp = 0;
}
if (likely(reparse == MLX5DR_ACTION_STC_REPARSE_DEFAULT))
@@ -2087,6 +2090,7 @@ mlx5dr_action_create_insert_header_reparse(struct
mlx5dr_context *ctx,
action[i].reformat.anchor = hdrs[i].anchor;
action[i].reformat.encap = hdrs[i].encap;
+ action[i].reformat.push_esp = hdrs[i].push_esp;
action[i].reformat.offset = hdrs[i].offset;
reformat_hdrs[i].sz = hdrs[i].hdr.sz;
reformat_hdrs[i].data = hdrs[i].hdr.data;
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h
b/drivers/net/mlx5/hws/mlx5dr_action.h
index a8d9720c42..0c8e4bbb5a 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.h
+++ b/drivers/net/mlx5/hws/mlx5dr_action.h
@@ -149,6 +149,7 @@ struct mlx5dr_action {
uint8_t offset;
bool encap;
uint8_t require_reparse;
+ bool push_esp;
} reformat;
struct {
struct mlx5dr_action
diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c
b/drivers/net/mlx5/hws/mlx5dr_cmd.c
index f77b194708..4676f65d60 100644
--- a/drivers/net/mlx5/hws/mlx5dr_cmd.c
+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c
@@ -486,6 +486,8 @@ mlx5dr_cmd_stc_modify_set_stc_param(struct
mlx5dr_cmd_stc_modify_attr *stc_attr,
MLX5_MODIFICATION_TYPE_INSERT);
MLX5_SET(stc_ste_param_insert, stc_parm, encap,
stc_attr->insert_header.encap);
+
[v2 10/10] net/mlx5/hws: typo fix parm to param
Fixing a typo in mlx5dr_cmd.c file, changing a variable name
from stc_parm to stc_param, as short for parameter.
Signed-off-by: Itamar Gozlan
Acked-by: Matan Azrad
---
drivers/net/mlx5/hws/mlx5dr_cmd.c | 68 +++
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c
b/drivers/net/mlx5/hws/mlx5dr_cmd.c
index 4676f65d60..fd07028e5f 100644
--- a/drivers/net/mlx5/hws/mlx5dr_cmd.c
+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c
@@ -453,66 +453,66 @@ mlx5dr_cmd_stc_create(struct ibv_context *ctx,
static int
mlx5dr_cmd_stc_modify_set_stc_param(struct mlx5dr_cmd_stc_modify_attr
*stc_attr,
- void *stc_parm)
+ void *stc_param)
{
switch (stc_attr->action_type) {
case MLX5_IFC_STC_ACTION_TYPE_COUNTER:
- MLX5_SET(stc_ste_param_flow_counter, stc_parm, flow_counter_id,
stc_attr->id);
+ MLX5_SET(stc_ste_param_flow_counter, stc_param,
flow_counter_id, stc_attr->id);
break;
case MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_TIR:
- MLX5_SET(stc_ste_param_tir, stc_parm, tirn,
stc_attr->dest_tir_num);
+ MLX5_SET(stc_ste_param_tir, stc_param, tirn,
stc_attr->dest_tir_num);
break;
case MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_FT:
- MLX5_SET(stc_ste_param_table, stc_parm, table_id,
stc_attr->dest_table_id);
+ MLX5_SET(stc_ste_param_table, stc_param, table_id,
stc_attr->dest_table_id);
break;
case MLX5_IFC_STC_ACTION_TYPE_ACC_MODIFY_LIST:
- MLX5_SET(stc_ste_param_header_modify_list, stc_parm,
+ MLX5_SET(stc_ste_param_header_modify_list, stc_param,
header_modify_pattern_id,
stc_attr->modify_header.pattern_id);
- MLX5_SET(stc_ste_param_header_modify_list, stc_parm,
+ MLX5_SET(stc_ste_param_header_modify_list, stc_param,
header_modify_argument_id,
stc_attr->modify_header.arg_id);
break;
case MLX5_IFC_STC_ACTION_TYPE_HEADER_REMOVE:
- MLX5_SET(stc_ste_param_remove, stc_parm, action_type,
+ MLX5_SET(stc_ste_param_remove, stc_param, action_type,
MLX5_MODIFICATION_TYPE_REMOVE);
- MLX5_SET(stc_ste_param_remove, stc_parm, decap,
+ MLX5_SET(stc_ste_param_remove, stc_param, decap,
stc_attr->remove_header.decap);
- MLX5_SET(stc_ste_param_remove, stc_parm, remove_start_anchor,
+ MLX5_SET(stc_ste_param_remove, stc_param, remove_start_anchor,
stc_attr->remove_header.start_anchor);
- MLX5_SET(stc_ste_param_remove, stc_parm, remove_end_anchor,
+ MLX5_SET(stc_ste_param_remove, stc_param, remove_end_anchor,
stc_attr->remove_header.end_anchor);
break;
case MLX5_IFC_STC_ACTION_TYPE_HEADER_INSERT:
- MLX5_SET(stc_ste_param_insert, stc_parm, action_type,
+ MLX5_SET(stc_ste_param_insert, stc_param, action_type,
MLX5_MODIFICATION_TYPE_INSERT);
- MLX5_SET(stc_ste_param_insert, stc_parm, encap,
+ MLX5_SET(stc_ste_param_insert, stc_param, encap,
stc_attr->insert_header.encap);
- MLX5_SET(stc_ste_param_insert, stc_parm, push_esp,
+ MLX5_SET(stc_ste_param_insert, stc_param, push_esp,
stc_attr->insert_header.push_esp);
- MLX5_SET(stc_ste_param_insert, stc_parm, inline_data,
+ MLX5_SET(stc_ste_param_insert, stc_param, inline_data,
stc_attr->insert_header.is_inline);
- MLX5_SET(stc_ste_param_insert, stc_parm, insert_anchor,
+ MLX5_SET(stc_ste_param_insert, stc_param, insert_anchor,
stc_attr->insert_header.insert_anchor);
/* HW gets the next 2 sizes in words */
- MLX5_SET(stc_ste_param_insert, stc_parm, insert_size,
+ MLX5_SET(stc_ste_param_insert, stc_param, insert_size,
stc_attr->insert_header.header_size / W_SIZE);
- MLX5_SET(stc_ste_param_insert, stc_parm, insert_offset,
+ MLX5_SET(stc_ste_param_insert, stc_param, insert_offset,
stc_attr->insert_header.insert_offset / W_SIZE);
- MLX5_SET(stc_ste_param_insert, stc_parm, insert_argument,
+ MLX5_SET(stc_ste_param_insert, stc_param, insert_argument,
stc_attr->insert_header.arg_id);
break;
case MLX5_IFC_STC_ACTION_TYPE_COPY:
case MLX5_IFC_STC_ACTION_TYPE_SET:
case MLX5_IFC_STC_ACTION_TYPE_ADD:
case MLX5_IFC_STC_ACTION_TYPE_ADD_FIELD:
- *(__be64 *)stc_parm = stc_attr->mod
