Re: [dpdk-dev] [RFC PATCH] mbuf: fix to update documentation of PKT_RX_QINQ_STRIPPED
On 12/24/19 6:16 AM, Somnath Kotur wrote: > Given that we haven't heard any objection from anyone in a while on > this ...can we get this in please? I'm sorry, but have you seen below? It means that PKT_RX_QINQ_STRIPPED, PKT_RX_QINQ, PKT_RX_VLAN and PKT_RX_VLAN_STRIPPED must be clarified. It sounds like change of semantics in order to resolve the problem, but anyway it is still a small change of semantics. BTW, it is better to make summary human readable and avoid PKT_RX_QINQ_STRIPPED (I guess check-git-log.sh yells on it). Also RFC patch cannot be applied, non-RFC version is required. CC main tree maintainers. > Thanks > > On Mon, Dec 16, 2019 at 2:43 PM Andrew Rybchenko > wrote: >> >> On 12/16/19 11:47 AM, Somnath Kotur wrote: >>> On Mon, Dec 16, 2019 at 12:01 PM Andrew Rybchenko >>> wrote: On 12/16/19 6:16 AM, Somnath Kotur wrote: > Certain hardware may be able to strip and/or save only the outermost > VLAN instead of both the VLANs in the mbuf in a QinQ scenario. > To handle such cases, we could re-interpret setting of just > PKT_RX_QINQ_STRIPPED > to indicate that only the outermost VLAN has been stripped by the > hardware and > saved in mbuf->vlan_tci_outer. > Only When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the > 2 vlans > have been stripped by the hardware and their tci are saved in > mbuf->vlan_tci (inner) > and mbuf->vlan_tci_outer (outer). > > Signed-off-by: Somnath Kotur > Signed-off-by: JP Lee > --- > lib/librte_mbuf/rte_mbuf_core.h | 15 +++ > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf_core.h > b/lib/librte_mbuf/rte_mbuf_core.h > index 9a8557d..db1070b 100644 > --- a/lib/librte_mbuf/rte_mbuf_core.h > +++ b/lib/librte_mbuf/rte_mbuf_core.h > @@ -124,12 +124,19 @@ > #define PKT_RX_FDIR_FLX (1ULL << 14) > > /** > - * The 2 vlans have been stripped by the hardware and their tci are > - * saved in mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). > + * The outer vlan has been stripped by the hardware and their tci are > + * saved in mbuf->vlan_tci_outer (outer). > * This can only happen if vlan stripping is enabled in the RX > * configuration of the PMD. > - * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN | > - * PKT_RX_VLAN_STRIPPED | PKT_RX_QINQ) must also be set. > + * When PKT_RX_QINQ_STRIPPED is set, the flags (PKT_RX_VLAN | > PKT_RX_QINQ) > + * must also be set. > + * When both PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, the > 2 vlans > + * have been stripped by the hardware and their tci are saved in > + * mbuf->vlan_tci (inner) and mbuf->vlan_tci_outer (outer). > + * This can only happen if vlan stripping is enabled in the RX > configuration > + * of the PMD. > + * When PKT_RX_QINQ_STRIPPED and PKT_RX_VLAN_STRIPPED are set, > + * (PKT_RX_VLAN | PKT_RX_QINQ) must also be set. > */ > #define PKT_RX_QINQ_STRIPPED (1ULL << 15) > I always thought that PKT_RX_VLAN_STRIPPED means *one* VLAN stripped regardless if it is outer (if the packet is double tagged) or inner (if only one VLAN tag was present). That's why PKT_RX_QINQ_STRIPPED description says that *two* VLANs have been stripped. What is the problem with such approach? >>> The problem is that RX_VLAN_STRIPPED implies that the stripped VLAN >>> (outer or inner) is saved in mbuf->vlan_tci, correct? >> >> Yes. >> >>> There is no way to convey that it is in QinQ mode and yet only outer >>> VLAN has been stripped and saved in mbuf->vlan_tci_outer ? >> >> Ah, it looks like I understand now that the problem is in >> PKT_RX_QINQ description which claims that TCI is saved in >> mbuf->vlan_tci_outer and PKT_RX_QINQ_STRIPPED means that >> both VLAN tags are stripped regardless (PKT_RX_VLAN_STRIPPED). >> Moreover PKT_RX_QINQ_STRIPPED requires PKT_RX_VLAN_STRIPPED. >> >> It means that PKT_RX_QINQ_STRIPPED, PKT_RX_QINQ, PKT_RX_VLAN >> and PKT_RX_VLAN_STRIPPED must be clarified. >> >> I'm not sure, but it looks like it could affect net/dpaa2, >> so I'm including driver maintainers in CC.
Re: [dpdk-dev] 18.11.6 (LTS) patches review and test
Kevin, Update the regression test result of Intel part. See the details as below. # Basic Intel(R) NIC testing * PF(i40e): Pass * PF(ixgbe): Pass * VF: Pass * Build or compile: 2 bugs are found. 1. [dpdk-stable 18.11.6-rc1] meson build failed on FreeBSD12.1(See freebsd 12.1.log.txt) 2. [dpdk-stable 18.11.6-rc1] make build failed on fedora31.(See fedora31.log.txt) * Intel NIC single core/NIC performance: Pass #Basic cryptodev and virtio testing * vhost/virtio basic loopback, PVP and performance test: Pass. * cryptodev: 2 bugs are found. 1. [dpdk-stable-18.11.6]Crypto: cryptodev_qat_autotest test failed. PS: issue passed on 18.11.3 and 18.11.5. 2. [dpdk-stable-18.11.6]Crypto: cryptodev_aesni_mb_autotest. Fail on 18.11.2~18.11.6 with latest configuration. Regards, Yu Ping > -Original Message- > From: Kevin Traynor [mailto:ktray...@redhat.com] > Sent: Wednesday, December 18, 2019 7:42 PM > To: sta...@dpdk.org > Cc: dev@dpdk.org; Abhishek Marathe ; > Akhil Goyal ; Ali Alnubani ; > Walker, Benjamin ; David Christensen > ; Hemant Agrawal ; > Stokes, Ian ; Jerin Jacob ; > Mcnamara, John ; Ju-Hyoung Lee > ; Kevin Traynor ; Luca > Boccassi ; Pei Zhang ; Yu, PingX > ; Xu, Qian Q ; Raslan Darawsheh > ; Thomas Monjalon ; Peng, > Yuan ; Chen, Zhaoyan > Subject: 18.11.6 (LTS) patches review and test > > Hi all, > > Here is a list of patches targeted for LTS release 18.11.6. > > The planned date for the final release is 31st January. > > Please help with testing and validation of your use cases and report any > issues/results with reply-all to this mail. For the final release the fixes > and > reported validations will be added to the release notes. > > A release candidate tarball can be found at: > > https://dpdk.org/browse/dpdk-stable/tag/?id=v18.11.6-rc1 > > These patches are located at branch 18.11 of dpdk-stable repo: > https://dpdk.org/browse/dpdk-stable/ > > Thanks. > > Kevin. > > --- > Aaron Conole (1): > test/interrupt: account for race with callback > > Abhishek Sachan (1): > net/af_packet: fix stale sockets > > Adrian Moreno (4): > vhost: fix vring memory partially mapped > vhost: translate incoming log address to GPA > vhost: prevent zero copy mode if IOMMU is on > vhost: convert buffer addresses to GPA for logging > > Ajit Khaparde (9): > net/bnxt: fix setting max RSS contexts > net/bnxt: fix writing MTU to FW > net/bnxt: fix crash in xstats get > net/bnxt: fix resource qcaps with older FW > net/bnxt: fix async link handling and update > net/bnxt: fix flow flush handling > net/bnxt: update trusted VF status only when it changes > net/bnxt: fix doorbell register offset for Tx ring > net/bnxt: get default HWRM command timeout from FW > > Akhil Goyal (1): > crypto/dpaa2_sec: fix length retrieved from hardware > > Ali Alnubani (2): > mk: fix build on arm64 > eal: fix header file install with meson > > Alvin Zhang (1): > net/i40e: fix exception with multi-driver > > Amaranath Somalapuram (5): > doc: fix l2fwd-crypto usage in CCP guide > crypto/ccp: fix maximum queues and burst size > crypto/ccp: fix CPU authentication crash > crypto/ccp: fix scheduling of burst > crypto/ccp: fix digest size capabilities > > Anatoly Burakov (2): > mempool: use actual IOVA addresses when populating > common/octeontx: add missing public symbol > > Andrew Rybchenko (5): > ethdev: fix doc reference to FDIR disabled mode > ethdev: remove redundant device info cleanup before get > net/sfc: fix missing notification on link status change > net/virtio: reject unsupported Tx multi-queue modes > ethdev: avoid undefined behaviour on configuration copy > > Andrzej Ostruszka (4): > doc: fix description of versioning macros > eventdev: fix possible use of uninitialized var > doc: fix tap guide > net/dpaa2: fix possible use of uninitialized vars > > Anoob Joseph (1): > examples/ipsec-secgw: fix access to freed packet > > Archana Muniganti (1): > app/crypto-perf: fix input of AEAD decrypt > > Arek Kusztal (1): > crypto/qat: fix AES CMAC mininum digest size > > Bernard Iremonger (1): > examples/ipsec-secgw: fix unchecked return value > > Bruce Richardson (4): > examples/vm_power: fix type of cmdline token in cli > port: fix pcap support with meson > examples: hide error for missing pkg-config path flag > usertools: fix typo in SPDX tag of telemetry script > > Chaitanya Babu Talluri (1): > examples/fips_validation: fix null dereferences > > Christian Ehrhardt (2): > net/mlx4: fix build on ppc64 > build: avoid overlinking > > Ciara Power (3): > app/testpmd: fix help for loop topology option > ethdev: fix include of ethernet header file > app/procinfo: use strlcpy for copying string > > Congwen Zhang (2):
Re: [dpdk-dev] DPDK techboard minutes @18/12/2019
On Fri, 2019-12-20 at 16:33 +, Ananyev, Konstantin wrote: > Minutes of Technical Board Meeting, 2019-12-18 > > Members Attending > - > -Bruce > -Ferruh > -Hemant > -Honnappa > -Jerin > -Kevin > -Konstantin (Chair) > -Maxime > -Olivier > -Stephen > -Thomas > > NOTE: The technical board meetings every second Wednesday on IRC > channel #dpdk-board, at 3pm UTC. Meetings are public and DPDK > community > members are welcome to attend. > > NOTE: Next meeting will be on Wednesday 2020-01-15 @3pm UTC, and will > be > chaired by Maxime Coquelin > > 1) drivers/vdpa introduction discussion. > Currently, at dpdk.org we have only IFC vDPA driver available > (located in drivers/net), > but more drivers are arriving (Mellanox, Virtio vDPA in v20.02). > Might be some others are expected in later releases. > Mellanox proposal is to introduce a new vDPA subsystem > (drivers/vdpa), > and move code common to both net and vdpa PMDs to the drivers/common > directory. > drivers/net/ifc will be moved entirely into drivers/vdpa/ifc > While it seems to provide better code layout for drivers in long run, > in short term it probably would need significant code refactoring for > both mlx and virtio PMDs, > plus can cause some difficulties for stable release maintainers. > > AR to Maxime (virtio) and Matan (mlx) to estimate how big code > refactoring will be required for such move. > AR to stable release maintainers (Kevin and Luca) to estimate impact > on stable releases. > Decision at next TB meeting based on provided estimations/feedback. Hi, At a glance, the impact will be more time consuming backports, as fewer patches will "cleanly" backport and require manual work, which will lead to fewer patches being integrated directly by ourselves. Are the PMDs devs/maintainers willing/available to do extra work to help backporting fixes? -- Kind regards, Luca Boccassi
Re: [dpdk-dev] [PATCH 09/14] examples/ipsec-secgw: add eventmode to ipsec-secgw
> Add eventmode support to ipsec-secgw. This uses event helper to setup
> and use the eventmode capabilities. Add driver inbound worker.
>
> Example command:
> ./ipsec-secgw -c 0x1 -w 0002:02:00.0,ipsec_in_max_spi=100 -w 0002:07:00.0
> -w 0002:0e:00.0 -w 0002:10:00.1 -- -P -p 0x3 -u 0x1
> --config "(0,0,0),(1,0,0)" -f a-aes-gcm-msa.cfg --transfer-mode 1
> --schedule-type 2 --process-mode drv --process-dir in
As I can see new event mode is totally orthogonal to the existing poll mode.
Event mode has it is own data-path, and it doesn't reuse
any part of poll-mode data-path code.
Plus in event mode many poll-mode options:
libirary/legacy mode, fragment/reassemble,
replay-window, ESN, fall-back session, etc.
are simply ignored.
Also as I can read the current code -
right now these modes can't be mixed and used together.
User has to use either only event based or poll mode API/devices.
If so, then at least we need a check (and report with error exit)
for these mutually exclusive option variants.
Probably even better would be to generate two separate binaries
Let say: ipsec-secgw-event and ipsec-secgw-poll.
We can still keep the same parent directory, makefile,
common src files etc. for both.
>
> Signed-off-by: Anoob Joseph
> Signed-off-by: Lukasz Bartosik
> ---
> examples/ipsec-secgw/Makefile | 1 +
> examples/ipsec-secgw/event_helper.c | 3 +
> examples/ipsec-secgw/event_helper.h | 26 +++
> examples/ipsec-secgw/ipsec-secgw.c | 344
> +++-
> examples/ipsec-secgw/ipsec.h| 7 +
> examples/ipsec-secgw/ipsec_worker.c | 180 +++
> examples/ipsec-secgw/meson.build| 2 +-
> 7 files changed, 555 insertions(+), 8 deletions(-)
> create mode 100644 examples/ipsec-secgw/ipsec_worker.c
>
> diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile
> index 09e3c5a..f6fd94c 100644
> --- a/examples/ipsec-secgw/Makefile
> +++ b/examples/ipsec-secgw/Makefile
> @@ -15,6 +15,7 @@ SRCS-y += sa.c
> SRCS-y += rt.c
> SRCS-y += ipsec_process.c
> SRCS-y += ipsec-secgw.c
> +SRCS-y += ipsec_worker.c
> SRCS-y += event_helper.c
>
> CFLAGS += -gdwarf-2
> diff --git a/examples/ipsec-secgw/event_helper.c
> b/examples/ipsec-secgw/event_helper.c
> index 6549875..44f997d 100644
> --- a/examples/ipsec-secgw/event_helper.c
> +++ b/examples/ipsec-secgw/event_helper.c
> @@ -984,6 +984,9 @@ eh_find_worker(uint32_t lcore_id, struct eh_conf *conf,
> else
> curr_conf.cap.burst = EH_RX_TYPE_NON_BURST;
>
> + curr_conf.cap.ipsec_mode = conf->ipsec_mode;
> + curr_conf.cap.ipsec_dir = conf->ipsec_dir;
> +
> /* Parse the passed list and see if we have matching capabilities */
>
> /* Initialize the pointer used to traverse the list */
> diff --git a/examples/ipsec-secgw/event_helper.h
> b/examples/ipsec-secgw/event_helper.h
> index 2895dfa..07849b0 100644
> --- a/examples/ipsec-secgw/event_helper.h
> +++ b/examples/ipsec-secgw/event_helper.h
> @@ -74,6 +74,22 @@ enum eh_tx_types {
> EH_TX_TYPE_NO_INTERNAL_PORT
> };
>
> +/**
> + * Event mode ipsec mode types
> + */
> +enum eh_ipsec_mode_types {
> + EH_IPSEC_MODE_TYPE_APP = 0,
> + EH_IPSEC_MODE_TYPE_DRIVER
> +};
> +
> +/**
> + * Event mode ipsec direction types
> + */
> +enum eh_ipsec_dir_types {
> + EH_IPSEC_DIR_TYPE_OUTBOUND = 0,
> + EH_IPSEC_DIR_TYPE_INBOUND,
> +};
> +
> /* Event dev params */
> struct eventdev_params {
> uint8_t eventdev_id;
> @@ -183,6 +199,12 @@ struct eh_conf {
>*/
> void *mode_params;
> /**< Mode specific parameters */
> +
> + /** Application specific params */
> + enum eh_ipsec_mode_types ipsec_mode;
> + /**< Mode of ipsec run */
> + enum eh_ipsec_dir_types ipsec_dir;
> + /**< Direction of ipsec processing */
> };
>
> /* Workers registered by the application */
> @@ -194,6 +216,10 @@ struct eh_app_worker_params {
> /**< Specify status of rx type burst */
> uint64_t tx_internal_port : 1;
> /**< Specify whether tx internal port is available */
> + uint64_t ipsec_mode : 1;
> + /**< Specify ipsec processing level */
> + uint64_t ipsec_dir : 1;
> + /**< Specify direction of ipsec */
> };
> uint64_t u64;
> } cap;
> diff --git a/examples/ipsec-secgw/ipsec-secgw.c
> b/examples/ipsec-secgw/ipsec-secgw.c
> index 7506922..c5d95b9 100644
> --- a/examples/ipsec-secgw/ipsec-secgw.c
> +++ b/examples/ipsec-secgw/ipsec-secgw.c
> @@ -2,6 +2,7 @@
> * Copyright(c) 2016 Intel Corporation
> */
>
> +#include
> #include
> #include
> #include
> @@ -14,6 +15,7 @@
> #include
> #include
> #include
> +#include
> #include
>
> #include
> @@ -41,12 +43,17 @@
> #include
> #include
> #include
> +#include
> +#include
> #include
> #include
Re: [dpdk-dev] [PATCH 11/14] examples/ipsec-secgw: add app processing code
> --- a/examples/ipsec-secgw/ipsec_worker.c
> +++ b/examples/ipsec-secgw/ipsec_worker.c
> @@ -15,6 +15,7 @@
> #include
> #include
>
> +#include
> #include
> #include
> #include
> @@ -29,12 +30,51 @@
> #include
> #include
> #include
> +#include
> +#include
>
> #include "ipsec.h"
> +#include "ipsec_worker.h"
> #include "event_helper.h"
>
> extern volatile bool force_quit;
>
> +static inline enum pkt_type
> +process_ipsec_get_pkt_type(struct rte_mbuf *pkt, uint8_t **nlp)
> +{
> + struct rte_ether_hdr *eth;
> +
> + eth = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
> + if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) {
> + *nlp = RTE_PTR_ADD(eth, RTE_ETHER_HDR_LEN +
> + offsetof(struct ip, ip_p));
> + if (**nlp == IPPROTO_ESP)
> + return PKT_TYPE_IPSEC_IPV4;
> + else
> + return PKT_TYPE_PLAIN_IPV4;
> + } else if (eth->ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) {
> + *nlp = RTE_PTR_ADD(eth, RTE_ETHER_HDR_LEN +
> + offsetof(struct ip6_hdr, ip6_nxt));
> + if (**nlp == IPPROTO_ESP)
> + return PKT_TYPE_IPSEC_IPV6;
> + else
> + return PKT_TYPE_PLAIN_IPV6;
> + }
> +
> + /* Unknown/Unsupported type */
> + return PKT_TYPE_INVALID;
> +}
Looking though that file, it seems like you choose to create your own set of
helper functions, instead of trying to reuse existing ones:
process_ipsec_get_pkt_type() VS prepare_one_packet()
update_mac_addrs() VS prepare_tx_pkt()
check_sp() VS inbound_sp_sa()
Obviously there is nothing good in code (and possible bugs) duplication.
Any reason why you can't reuse existing functions and need to reinvent your own?
> +
> +static inline void
> +update_mac_addrs(struct rte_mbuf *pkt, uint16_t portid)
> +{
> + struct rte_ether_hdr *ethhdr;
> +
> + ethhdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *);
> + memcpy(ðhdr->s_addr, ðaddr_tbl[portid].src, RTE_ETHER_ADDR_LEN);
> + memcpy(ðhdr->d_addr, ðaddr_tbl[portid].dst, RTE_ETHER_ADDR_LEN);
> +}
> +
> static inline void
> ipsec_event_pre_forward(struct rte_mbuf *m, unsigned int port_id)
> {
> @@ -45,6 +85,177 @@ ipsec_event_pre_forward(struct rte_mbuf *m, unsigned int
> port_id)
> rte_event_eth_tx_adapter_txq_set(m, 0);
> }
>
> +static inline int
> +check_sp(struct sp_ctx *sp, const uint8_t *nlp, uint32_t *sa_idx)
> +{
> + uint32_t res;
> +
> + if (unlikely(sp == NULL))
> + return 0;
> +
> + rte_acl_classify((struct rte_acl_ctx *)sp, &nlp, &res, 1,
> + DEFAULT_MAX_CATEGORIES);
> +
> + if (unlikely(res == 0)) {
> + /* No match */
> + return 0;
> + }
> +
> + if (res == DISCARD)
> + return 0;
> + else if (res == BYPASS) {
> + *sa_idx = 0;
> + return 1;
> + }
> +
> + *sa_idx = SPI2IDX(res);
> + if (*sa_idx < IPSEC_SA_MAX_ENTRIES)
> + return 1;
> +
> + /* Invalid SA IDX */
> + return 0;
> +}
> +
> +static inline uint16_t
> +route4_pkt(struct rte_mbuf *pkt, struct rt_ctx *rt_ctx)
> +{
> + uint32_t dst_ip;
> + uint16_t offset;
> + uint32_t hop;
> + int ret;
> +
> + offset = RTE_ETHER_HDR_LEN + offsetof(struct ip, ip_dst);
> + dst_ip = *rte_pktmbuf_mtod_offset(pkt, uint32_t *, offset);
> + dst_ip = rte_be_to_cpu_32(dst_ip);
> +
> + ret = rte_lpm_lookup((struct rte_lpm *)rt_ctx, dst_ip, &hop);
> +
> + if (ret == 0) {
> + /* We have a hit */
> + return hop;
> + }
> +
> + /* else */
> + return RTE_MAX_ETHPORTS;
> +}
> +
> +/* TODO: To be tested */
> +static inline uint16_t
> +route6_pkt(struct rte_mbuf *pkt, struct rt_ctx *rt_ctx)
> +{
> + uint8_t dst_ip[16];
> + uint8_t *ip6_dst;
> + uint16_t offset;
> + uint32_t hop;
> + int ret;
> +
> + offset = RTE_ETHER_HDR_LEN + offsetof(struct ip6_hdr, ip6_dst);
> + ip6_dst = rte_pktmbuf_mtod_offset(pkt, uint8_t *, offset);
> + memcpy(&dst_ip[0], ip6_dst, 16);
> +
> + ret = rte_lpm6_lookup((struct rte_lpm6 *)rt_ctx, dst_ip, &hop);
> +
> + if (ret == 0) {
> + /* We have a hit */
> + return hop;
> + }
> +
> + /* else */
> + return RTE_MAX_ETHPORTS;
> +}
> +
> +static inline uint16_t
> +get_route(struct rte_mbuf *pkt, struct route_table *rt, enum pkt_type type)
> +{
> + if (type == PKT_TYPE_PLAIN_IPV4 || type == PKT_TYPE_IPSEC_IPV4)
> + return route4_pkt(pkt, rt->rt4_ctx);
> + else if (type == PKT_TYPE_PLAIN_IPV6 || type == PKT_TYPE_IPSEC_IPV6)
> + return route6_pkt(pkt, rt->rt6_ctx);
> +
> + return RTE_MAX_ETHPORTS;
> +}
> +
> +static inline int
> +process_ipsec_ev_inbound(struct ipsec_ctx *ctx, struct route_table *rt,
> + struct rte_event *ev)
> +{
> + str
[dpdk-dev] [PATCH] net/mlx5: fix metadata item endianness conversion
The metadata register c0 field in the matcher might be split
into two independent fields - the source vport index and META
item value. These fields have no permanent assigned bits, the
configuration is queried from the kernel drivers.
It means the metadata item field might be less than 32 bits.
Also, the metadata are engaged in datapath and there are no
any metadata endianness conversions in datapath to provide the
better performance, all conversions are implemented in rte_flow
engine. If there are less than 32 bits of metadata the extra
right shift is needed after endianness conversion for little-
endian hosts.
Fixes: acfcd5c52f94 ("net/mlx5: update meta register matcher set")
Cc: sta...@dpdk.org
Signed-off-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_flow_dv.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index f8e153c..cb416ca 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -5903,8 +5903,12 @@ struct field_modify_info modify_tcp[] = {
struct mlx5_priv *priv = dev->data->dev_private;
uint32_t msk_c0 = priv->sh->dv_regc0_mask;
uint32_t shl_c0 = rte_bsf32(msk_c0);
+#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
+ uint32_t shr_c0 = __builtin_clz(priv->sh->dv_meta_mask);
- msk_c0 = rte_cpu_to_be_32(msk_c0);
+ value >>= shr_c0;
+ mask >>= shr_c0;
+#endif
value <<= shl_c0;
mask <<= shl_c0;
assert(msk_c0);
--
1.8.3.1
Re: [dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier issue
Hi Xiaoyun,
> -Original Message-
> From: Li, Xiaoyun
> Sent: Monday, December 23, 2019 5:36 PM
> To: Gavin Hu ; Wu, Jingjing
> Cc: dev@dpdk.org; Maslekar, Omkar ;
> sta...@dpdk.org; nd ; jer...@marvell.com; Honnappa
> Nagarahalli ; Richardson, Bruce
> ; nd
> Subject: RE: [dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier issue
>
> Hi
>
> Still, stability and correctness are much more important than performance.
> As I said, with WC can benefit more than 20X perf. Comparing to this benefit,
> the difference between rte_wmb and rte_io_wmb is not that important.
> And in my test, the performance is not that bad with rte_wmb especially with
> large packets which are the normal use cases.
I agree 'sfence' is the correct barrier for WC, as it is a weak memory model.
Rte_io on x86 is a compiler barrier, that is not strong enough.
>
> BTW, I've searched linux kernel codes and don't see any NTB device on arm
> platform.
> So I don't think you need to consider the perf hurt to arm.
Limited the discussion to NTB, I am fine, and since WC in not used for any
other NICs, that's ok.
>
> Best Regards
> Xiaoyun Li
>
> > -Original Message-
> > From: Gavin Hu [mailto:gavin...@arm.com]
> > Sent: Monday, December 23, 2019 16:38
> > To: Li, Xiaoyun ; Wu, Jingjing
>
> > Cc: dev@dpdk.org; Maslekar, Omkar ;
> > sta...@dpdk.org; nd ; jer...@marvell.com; Honnappa
> > Nagarahalli ; Richardson, Bruce
> > ; nd
> > Subject: RE: [dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier issue
> >
> > Hi Xiaoyun,
> >
> > > -Original Message-
> > > From: Li, Xiaoyun
> > > Sent: Monday, December 23, 2019 3:52 PM
> > > To: Gavin Hu ; Wu, Jingjing
> > > Cc: dev@dpdk.org; Maslekar, Omkar ;
> > > sta...@dpdk.org; nd
> > > Subject: RE: [dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier
> > > issue
> > >
> > > Hi
> > > I reconsidered and retested about this issue.
> > > I still need to use rte_wmb instead of using rte_io_wmb.
> > >
> > > Because to achieve high performance, ntb needs to turn on WC(write
> > > combining) feature. The perf difference with and without WC enabled is
> > > more than 20X.
> > > And when WC enabled, rte_io_wmb cannot make sure the instructions
> are
> > > in order only rte_wmb can make sure that.
> > >
> > > And in my retest, when sending 64 bytes packets, using rte_io_wmb will
> > > cause out-of-order issue and cause memory corruption on rx side.
> > > And using rte_wmb is fine.
> > That's true, as it is declared as 'write combine' region, even x86 is known
> > as
> > strong ordered, it is the interconnect or PCI RC may do the reordering,
> > 'write
> > combine', 'write coalescing', which caused this problem.
> > IMO, rte_io_*mb barriers on x86 should be promoted to stronger is WC is
> > involved(but that will sap performance for non-WC memories?).
> >
> https://code.dpdk.org/dpdk/latest/source/lib/librte_eal/common/include/ar
> ch/
> > x86/rte_atomic.h#L78
> >
> > Using rte_wmb will hurt performance for aarch64 also, as pci device
> memory
> > accesses to a single device are strongly ordered therefore the strongest
> > rte_wmb is not necessary.
> > > So I can only use v1 patch and suspend v2 patch in patchwork.
> > >
> > > Best Regards
> > > Xiaoyun Li
> > >
> > > > -Original Message-
> > > > From: Gavin Hu (Arm Technology China) [mailto:gavin...@arm.com]
> > > > Sent: Monday, December 16, 2019 18:50
> > > > To: Li, Xiaoyun ; Wu, Jingjing
> > >
> > > > Cc: dev@dpdk.org; Maslekar, Omkar ;
> > > > sta...@dpdk.org; nd
> > > > Subject: RE: [dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier
> > > issue
> > > >
> > > >
> > > >
> > > > > -Original Message-
> > > > > From: dev On Behalf Of Xiaoyun Li
> > > > > Sent: Monday, December 16, 2019 9:59 AM
> > > > > To: jingjing...@intel.com
> > > > > Cc: dev@dpdk.org; omkar.masle...@intel.com; Xiaoyun Li
> > > > > ; sta...@dpdk.org
> > > > > Subject: [dpdk-dev] [PATCH v2] raw/ntb: fix write memory barrier
> > > > > issue
> > > > >
> > > > > All buffers and ring info should be written before tail register
> > > > > update.
> > > > > This patch relocates the write memory barrier before updating tail
> > > > > register to avoid potential issues.
> > > > >
> > > > > Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")
> > > > > Cc: sta...@dpdk.org
> > > > >
> > > > > Signed-off-by: Xiaoyun Li
> > > > > ---
> > > > > v2:
> > > > > * Replaced rte_wmb with rte_io_wmb since rte_io_wmb is enough.
> > > > > ---
> > > > > drivers/raw/ntb/ntb.c | 4 ++--
> > > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > > >
> > > > > diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c index
> > > > > ad7f6abfd..c7de86f36 100644
> > > > > --- a/drivers/raw/ntb/ntb.c
> > > > > +++ b/drivers/raw/ntb/ntb.c
> > > > > @@ -683,8 +683,8 @@ ntb_enqueue_bufs(struct rte_rawdev *dev,
> > > > > sizeof(struct ntb_used) * nb1);
> > > > > rte_memcpy(txq->tx_used_ring, tx_used
Re: [dpdk-dev] [PATCH v2 2/2] net/i40e: support FDIR for L2TPv3 over IP
> -Original Message-
> From: Sexton, Rory
> Sent: Monday, December 16, 2019 6:15 PM
> To: dev@dpdk.org; or...@mellanox.com; adrien.mazarg...@6wind.com; Xing,
> Beilei ; Zhang, Qi Z
> Cc: Sexton, Rory ; Jagus, DariuszX
>
> Subject: [PATCH v2 2/2] net/i40e: support FDIR for L2TPv3 over IP
>
> Adding FDIR support for L2TPv3 over IP header matching and adding a new
> customized pctype for l2tpv3 over IP.
>
> Signed-off-by: Rory Sexton
> Signed-off-by: Dariusz Jagus
> ---
Version change is needed here.
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++
> drivers/net/i40e/i40e_ethdev.c | 11 +++-
> drivers/net/i40e/i40e_ethdev.h | 48 -
> drivers/net/i40e/i40e_fdir.c| 40 +--
> drivers/net/i40e/i40e_flow.c| 57 +
> 5 files changed, 141 insertions(+), 19 deletions(-)
>
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 73ef0b41d..5e6935829 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3954,6 +3954,10 @@ This section lists supported pattern items and their
> attributes, if any.
>
>- ``proto_id {unsigned}``: PPP protocol identifier.
>
> +- ``l2tpv3oip``: match L2TPv3 over IP header.
> +
> + - ``session_id {unsigned}``: L2TPv3 over IP session identifier.
> +
It should not be a part of this patch, which is focus on i40e PMD.
> Actions list
>
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 5999c964b..80a46916c 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -12351,6 +12351,14 @@ i40e_update_customized_pctype(struct
> rte_eth_dev *dev, uint8_t *pkg,
> new_pctype =
> i40e_find_customized_pctype(pf,
> I40E_CUSTOMIZED_GTPU);
> + else if (!strcmp(name, "IPV4_L2TPV3"))
> + new_pctype =
> + i40e_find_customized_pctype(pf,
> +
> I40E_CUSTOMIZED_IPV4_L2TPV3);
> + else if (!strcmp(name, "IPV6_L2TPV3"))
> + new_pctype =
> + i40e_find_customized_pctype(pf,
> +
> I40E_CUSTOMIZED_IPV6_L2TPV3);
> if (new_pctype) {
> if (op == RTE_PMD_I40E_PKG_OP_WR_ADD) {
> new_pctype->pctype = pctype_value;
> @@ -12544,7 +12552,8 @@ i40e_update_customized_ptype(struct
> rte_eth_dev *dev, uint8_t *pkg,
> RTE_PTYPE_TUNNEL_GRENAT;
> in_tunnel = true;
> } else if (!strncasecmp(name, "L2TPV2CTL", 9)
> ||
> -!strncasecmp(name, "L2TPV2", 6)) {
> +!strncasecmp(name, "L2TPV2", 6) ||
> +!strncasecmp(name, "L2TPV3", 6)) {
> ptype_mapping[i].sw_ptype |=
> RTE_PTYPE_TUNNEL_L2TP;
> in_tunnel = true;
> diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
> index 295ad593b..5b6d43556 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -508,24 +508,43 @@ struct i40e_raw_flow {
> uint32_t length;
> };
>
> +/* A structure used to define the input for L2TPv3 over IP flow */
> +struct i40e_l2tpv3oip_flow {
> + uint32_t session_id; /* Session ID in big endian. */ };
Is this structure needed?
> +
> +/* A structure used to define the input for L2TPv3 over IPv4 flow */
> +struct i40e_ipv4_l2tpv3oip_flow {
> + struct rte_eth_ipv4_flow ip4;
> + uint32_t session_id; /* Session ID in big endian. */ };
> +
> +/* A structure used to define the input for L2TPv3 over IPv6 flow */
> +struct i40e_ipv6_l2tpv3oip_flow {
> + struct rte_eth_ipv6_flow ip6;
> + uint32_t session_id; /* Session ID in big endian. */ };
> +
> /*
> * A union contains the inputs for all types of flow
> * items in flows need to be in big endian
> */
> union i40e_fdir_flow {
> - struct rte_eth_l2_flow l2_flow;
> - struct rte_eth_udpv4_flow udp4_flow;
> - struct rte_eth_tcpv4_flow tcp4_flow;
> - struct rte_eth_sctpv4_flow sctp4_flow;
> - struct rte_eth_ipv4_flow ip4_flow;
> - struct rte_eth_udpv6_flow udp6_flow;
> - struct rte_eth_tcpv6_flow tcp6_flow;
> - struct rte_eth_sctpv6_flow sctp6_flow;
> - struct rte_eth_ipv6_flow ipv6_flow;
> - struct i40e_gtp_flow gtp_flow;
> - struct i40e_gtp_ipv4_flow gtp_ipv4_flow;
> - struct i40e_gtp_ipv6_flow gtp_ipv6_flow;
> - struct i40e_raw_flow raw_flow;
> + struct rte_eth_l2_flow
Re: [dpdk-dev] [PATCH] raw/ntb: fix write memory barrier issue
Reviewed-by: Gavin Hu
Re: [dpdk-dev] 18.11.6 (LTS) patches review and test
Hi Kevin, Testing with 18.11.6-rc1 from Red Hat looks good. We cover below 14 scenarios and and all get PASS: (1)Guest with device assignment(PF) throughput testing(1G hugepage size): PASS (2)Guest with device assignment(PF) throughput testing(2M hugepage size) : PASS (3)Guest with device assignment(VF) throughput testing: PASS (4)PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS (5)PVP vhost-user 2Q throughput testing: PASS (6)PVP vhost-user 1Q - cross numa node throughput testing: PASS (7)Guest with vhost-user 2 queues throughput testing: PASS (8)vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect: PASS (9)vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect: PASS (10)PVP 1Q live migration testing: PASS (11)PVP 1Q cross numa node live migration testing: PASS (12)Guest with ovs+dpdk+vhost-user 1Q live migration testing: PASS (13)Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS (14)Guest with ovs+dpdk+vhost-user 2Q live migration testing: PASS Versions: kernel 3.10 qemu 2.12 dpdk: http://dpdk.org/git/dpdk-stabl remotes/origin/18.11 # git log -1 commit ae63431d6aa03aba1e73f80e797ee0af151adeb5 Author: Kevin Traynor Date: Wed Dec 18 11:24:09 2019 + version: 18.11.6-rc1 Signed-off-by: Kevin Traynor Best regards, Pei - Original Message - From: "Kevin Traynor" To: sta...@dpdk.org Cc: dev@dpdk.org, "Abhishek Marathe" , "Akhil Goyal" , "Ali Alnubani" , "benjamin walker" , "David Christensen" , "Hemant Agrawal" , "Ian Stokes" , "Jerin Jacob" , "John McNamara" , "Ju-Hyoung Lee" , "Kevin Traynor" , "Luca Boccassi" , "Pei Zhang" , "pingx yu" , "qian q xu" , "Raslan Darawsheh" , "Thomas Monjalon" , "yuan peng" , "zhaoyan chen" Sent: Wednesday, December 18, 2019 7:42:03 PM Subject: 18.11.6 (LTS) patches review and test Hi all, Here is a list of patches targeted for LTS release 18.11.6. The planned date for the final release is 31st January. Please help with testing and validation of your use cases and report any issues/results with reply-all to this mail. For the final release the fixes and reported validations will be added to the release notes. A release candidate tarball can be found at: https://dpdk.org/browse/dpdk-stable/tag/?id=v18.11.6-rc1 These patches are located at branch 18.11 of dpdk-stable repo: https://dpdk.org/browse/dpdk-stable/ Thanks. Kevin. --- Aaron Conole (1): test/interrupt: account for race with callback Abhishek Sachan (1): net/af_packet: fix stale sockets Adrian Moreno (4): vhost: fix vring memory partially mapped vhost: translate incoming log address to GPA vhost: prevent zero copy mode if IOMMU is on vhost: convert buffer addresses to GPA for logging Ajit Khaparde (9): net/bnxt: fix setting max RSS contexts net/bnxt: fix writing MTU to FW net/bnxt: fix crash in xstats get net/bnxt: fix resource qcaps with older FW net/bnxt: fix async link handling and update net/bnxt: fix flow flush handling net/bnxt: update trusted VF status only when it changes net/bnxt: fix doorbell register offset for Tx ring net/bnxt: get default HWRM command timeout from FW Akhil Goyal (1): crypto/dpaa2_sec: fix length retrieved from hardware Ali Alnubani (2): mk: fix build on arm64 eal: fix header file install with meson Alvin Zhang (1): net/i40e: fix exception with multi-driver Amaranath Somalapuram (5): doc: fix l2fwd-crypto usage in CCP guide crypto/ccp: fix maximum queues and burst size crypto/ccp: fix CPU authentication crash crypto/ccp: fix scheduling of burst crypto/ccp: fix digest size capabilities Anatoly Burakov (2): mempool: use actual IOVA addresses when populating common/octeontx: add missing public symbol Andrew Rybchenko (5): ethdev: fix doc reference to FDIR disabled mode ethdev: remove redundant device info cleanup before get net/sfc: fix missing notification on link status change net/virtio: reject unsupported Tx multi-queue modes ethdev: avoid undefined behaviour on configuration copy Andrzej Ostruszka (4): doc: fix description of versioning macros eventdev: fix possible use of uninitialized var doc: fix tap guide net/dpaa2: fix possible use of uninitialized vars Anoob Joseph (1): examples/ipsec-secgw: fix access to freed packet Archana Muniganti (1): app/crypto-perf: fix input of AEAD decrypt Arek Kusztal (1): crypto/qat: fix AES CMAC mininum digest size Bernard Iremonger (1): examples/ipsec-secgw: fix unchecked return value Bruce Richardson (4): examples/vm_power: fix type of cmdline token in cli port: fix pcap support with meson examples: hide error for missing pkg-config path flag usertools: fix typo in SPDX tag of telemetry script Chaitanya Babu Talluri (1): examples/fips_validation: fix null
[dpdk-dev] [PATCH] vhost: fix the inflight resubmit check
The frontend may not send the get_inflight_fd and
set_inflight_fd although we negotiate the protocol
feature. When we meet this situation just return OK.
Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information")
Cc: sta...@dpdk.org
Signed-off-by: Jin Yu
---
lib/librte_vhost/vhost_user.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 0cfb8b792..eb0f27c29 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1629,8 +1629,11 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
return RTE_VHOST_MSG_RESULT_OK;
+ /* The frontend may still not support the inflight feature
+* although we negotiate the protocol feature.
+*/
if ((!vq->inflight_split))
- return RTE_VHOST_MSG_RESULT_ERR;
+ return RTE_VHOST_MSG_RESULT_OK;
if (!vq->inflight_split->version) {
vq->inflight_split->version = INFLIGHT_VERSION;
@@ -1710,8 +1713,11 @@ vhost_check_queue_inflights_packed(struct virtio_net
*dev,
(1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
return RTE_VHOST_MSG_RESULT_OK;
+ /* The frontend may still not support the inflight feature
+* although we negotiate the protocol feature.
+*/
if ((!vq->inflight_packed))
- return RTE_VHOST_MSG_RESULT_ERR;
+ return RTE_VHOST_MSG_RESULT_OK;
if (!vq->inflight_packed->version) {
vq->inflight_packed->version = INFLIGHT_VERSION;
--
2.17.2
[dpdk-dev] [PATCH] vhost: add protocol feature check
Add VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD check in
getting inflight ring functions.
Fixes: 4d891f77ddfa ("vhost: add APIs to get inflight ring")
Cc: sta...@dpdk.org
Signed-off-by: Jin Yu
---
lib/librte_vhost/vhost.c | 8
1 file changed, 8 insertions(+)
diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 1cbe948f7..dfb71732b 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -862,6 +862,10 @@ rte_vhost_get_vhost_ring_inflight(int vid, uint16_t
vring_idx,
if (unlikely(!dev))
return -1;
+ if (unlikely(!(dev->protocol_features &
+ (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD
+ return 0;
+
if (vring_idx >= VHOST_MAX_VRING)
return -1;
@@ -1431,6 +1435,10 @@ rte_vhost_get_vring_base_from_inflight(int vid,
if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
return -1;
+ if (unlikely(!(dev->protocol_features &
+ (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD
+ return 0;
+
if (!vq_is_packed(dev))
return -1;
--
2.17.2
