Re: [dpdk-dev] [PATCH v2] net/iavf: fix Rx total stats
On 12/13, Wu, Jingjing wrote:
>
>
>> -Original Message-
>> From: Min, JiaqiX
>> Sent: Friday, December 13, 2019 9:23 AM
>> To: dev@dpdk.org
>> Cc: Wu, Jingjing ; Yang, Qiming
>> ; Min, JiaqiX
>> ; sta...@dpdk.org
>> Subject: [PATCH v2] net/iavf: fix Rx total stats
>>
>> Rx total stats is the total number of successfully received packets,
>> so exclude the number of rx_discards for Rx total stats.
>>
>> Fixes: f4a41a6953af ("net/avf: support stats")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Jiaqi Min
>Acked-by: Jingjing Wu
>
>
Applied to dpdk-next-net-intel, Thanks.
Re: [dpdk-dev] [PATCH] Don't combine '-r' and '--export-dynamic' linker options
On 12/12/2019 16:05, Thomas Monjalon wrote: > 25/10/2019 03:20, Rafael Ávila de Espíndola: >> Running ld with '-r' switches the linker to a very special mode where >> some other linker options don't make sense. >> >> In particular, '--export-dynamic' normally requires that all global >> symbols be included in the dynamic symbol table, but a .o file doesn't >> even have a dynamic symbol table. >> >> When given both options it looks like the gnu linker just ignores >> '--export-dynamic'. >> >> Unfortunately some versions of lld (https://lld.llvm.org/) have a bug >> that causes it to try to create a dynamic symbol table in the output >> .o file and ends up corrupting it >> (https://bugs.llvm.org/show_bug.cgi?id=43552). Current (git) version >> of lld now issues an error. >> >> This patch drops $(LDFLAGS) when using -r. With this patch I can build >> dpdk with lld. > [...] >> -PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@ >> +PMDINFO_LD = $(CROSS)ld -r -o $@.o $@.pmd.o $@ > > Dealing with compiler bugs is really annoying. > I'm afraid removing LDFLAGS may break in some environments. > Could you just filter-out some incompatible options? Right, detect that LLD is the linker and change LDFLAGS accordingly. Painful, but the right approach. > > And what about meson? Is there some similar issue? > > >
Re: [dpdk-dev] [EXT] Re: [PATCH 00/15] add OCTEONTX2 inline IPsec support
13/12/2019 08:41, Anoob Joseph: > Hi Thomas, Jerin, > > Please see inline. > > Thanks, > Anoob > > From: Thomas Monjalon > > 09/12/2019 09:06, Jerin Jacob: > > > On Sun, Dec 8, 2019 at 5:25 PM Anoob Joseph > > wrote: > > > > > > > > This series adds inline IPsec support in OCTEONTX2 PMD. > > > > > > > > In the inbound path, rte_flow framework need to be used to configure > > > > the NPC block, which does the h/w lookup. The packets would get > > > > processed by the crypto block and would submit to the scheduling > > > > block, SSO. So inline IPsec mode can be enabled only when traffic is > > > > received via event device using Rx adapter. > > > > > > > > In the outbound path, the core would submit to the crypto block and > > > > the crypto block would submit the packet for Tx internally. > > > > > > > > > > The release note update is missing. > > > > [Anoob] Will update in v2. > > > Yes, and the MAINTAINERS file as well. > > [Anoob] The required files are added in crypto/octeontx2 directory, which > already specifies the maintainers. Do we need inline ipsec mentioned > separately? No sorry, it's fine.
Re: [dpdk-dev] [PATCH v3 03/17] net/ionic: add log
Hi Ferruh, > -Original Message- > From: Ferruh Yigit > Sent: Wednesday, December 11, 2019 12:19 AM > To: Alfredo Cardigliano > Cc: dev@dpdk.org; Stephen Hemminger ; > Hemant Agrawal > Subject: Re: [dpdk-dev] [PATCH v3 03/17] net/ionic: add log > Importance: High > > On 12/9/2019 9:46 PM, Alfredo Cardigliano wrote: > > Add debug options to the config file. > > Define macros used for logs and make use of config file options to > > enable them. > > > > Signed-off-by: Alfredo Cardigliano > > Reviewed-by: Shannon Nelson > > <...> > > > diff --git a/drivers/net/ionic/ionic_ethdev.c > > b/drivers/net/ionic/ionic_ethdev.c > > new file mode 100644 > > index 0..c706588bc > > --- /dev/null > > +++ b/drivers/net/ionic/ionic_ethdev.c > > @@ -0,0 +1,15 @@ > > +/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) > > + * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. > > + */ > > My understanding was code will be BSD-3 license, but it seems it has been > dual license, BSD-3-Clause OR GPL-2.0 we are doing this for the code that > needs to be shared between kernel space and userspace code, since it is not > the case for this driver not sure if it is acceptable. Cc'ing Hemant and > Stephen > again. [Hemant] BSD-3+GPL2 is acceptable and approved license. W.r.t DPDK this code will be used as BSD-3 licensed in DPDK userspace.
Re: [dpdk-dev] [PATCH v3 02/17] net/ionic: add hardware structures definitions
Hi Ferruh > -Original Message- > From: Ferruh Yigit > Sent: Wednesday, December 11, 2019 12:19 AM > To: Alfredo Cardigliano > Cc: dev@dpdk.org; Hemant Agrawal ; Stephen > Hemminger > Subject: Re: [dpdk-dev] [PATCH v3 02/17] net/ionic: add hardware structures > definitions > Importance: High > > On 12/9/2019 9:46 PM, Alfredo Cardigliano wrote: > > Add hardware structures and message commands definitions for Pensando > > network adapters. > > > > Signed-off-by: Alfredo Cardigliano > > Reviewed-by: Shannon Nelson > > --- > > drivers/net/ionic/ionic_if.h | 2491 > > ++ > > 1 file changed, 2491 insertions(+) > > create mode 100644 drivers/net/ionic/ionic_if.h > > > > diff --git a/drivers/net/ionic/ionic_if.h > > b/drivers/net/ionic/ionic_if.h new file mode 100644 index > > 0..5f31ec034 > > --- /dev/null > > +++ b/drivers/net/ionic/ionic_if.h > > @@ -0,0 +1,2491 @@ > > +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause > > +*/ > > +/* Copyright (c) 2017-2019 Pensando Systems, Inc. All rights > > +reserved. */ > > May need to add this one to the license exceptions, license/exceptions.txt. > > cc'ing Hemant & Stephen for guidance. > [Hemant] " GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause" is not a approved license. 1. DPDK need at least one license to be BSD-3-Clause to go for exception approval 2. Can you make it " GPL-2.0 OR BSD-3-Clause" - it will same time for all to go for approvals.
[dpdk-dev] [PATCH] update Intel roadmap for 20.02
Signed-off-by: Ferruh Yigit
---
Roadmap provided by:
Cc: Tim O'Driscoll
Cc: John Mcnamara
---
content/roadmap/_index.md | 8
1 file changed, 8 insertions(+)
diff --git a/content/roadmap/_index.md b/content/roadmap/_index.md
index ed727f0..ae43c16 100644
--- a/content/roadmap/_index.md
+++ b/content/roadmap/_index.md
@@ -21,6 +21,14 @@ This list is obviously neither complete nor guaranteed.
- regexdev
- template based ring API
- UBSan in build
+- Add cryptodev support for chachapoly symmetric algorithm in Intel QAT devices
+- Flow API support for flow director rules based on Intel DDP profiles
+- Update AESNI-MB PMD and AESNI GCM PMDs to use the latest version of the
IPsec multi-buffer library
+- Add virtio packed ring notification support
+- Add virtio 1.1 server mode support
+- Support crypto Rx and Tx operations on different cores
+- Validate and document basic support for OpenWRT
+- Additional Windows support for EAL functions
### Nice to have - Future {#future}
--
2.21.0
Re: [dpdk-dev] [PATCH] net/i40e: Add new customized pctype for l2tpv3
Hi Beilei,
See comments below.
Regards,
Rory
> > Subject: [PATCH] net/i40e: Add new customized pctype for l2tpv3
> It's not only add new customized pctype, but mainly enable FDIR for l2ipv3,
> so how about " net/i40e: support FDIR for L2TPv3"?
>
> Detailed commit log is also needed.
Of course can update this in v2.
> > +/* A structure used to define the input for L2TPv3 flow */ struct
> > +i40e_l2tpv3_flow {
>
> Seems missed struct rte_eth_ipv4_flow or struct rte_eth_ipv6_flow here?
>
I'm not convinced we need struct rte_eth_ipv4_flow or struct rte_eth_ipv6_flow
to be part of the struct i40e_l2tpv3_flow.
The rte_eth_ipv4/6_flow struct will be included in the flow director pattern
from the following additions.
Please advice so I can update in a v2 of the patch if required.
+static enum rte_flow_item_type pattern_fdir_ipv4_l2tpv3[] = {
+ RTE_FLOW_ITEM_TYPE_ETH,
+ RTE_FLOW_ITEM_TYPE_IPV4,
+ RTE_FLOW_ITEM_TYPE_L2TPV3,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
+static enum rte_flow_item_type pattern_fdir_ipv6_l2tpv3[] = {
+ RTE_FLOW_ITEM_TYPE_ETH,
+ RTE_FLOW_ITEM_TYPE_IPV6,
+ RTE_FLOW_ITEM_TYPE_L2TPV3,
+ RTE_FLOW_ITEM_TYPE_END,
+};
Re: [dpdk-dev] [PATCH v3] build: fix soname info for 19.11 compatiblity
On Thu, Dec 12, 2019 at 11:58:26AM +, Bruce Richardson wrote:
> The soname for each stable ABI version should be just the ABI version major
> number without the minor number. Unfortunately both major and minor were
> used causing version 20.1 to be incompatible with 20.0.
>
> This patch fixes the issue by switching from 2-part to 3-part ABI version
> numbers so that we can keep 20.0 as soname and using the final digits to
> identify the 20.x releases which are ABI compatible. This requires changes
> to both make and meson builds to handle the three-digit version and shrink
> it to 2-digit for soname.
>
> The final fix needed in this patch is to adjust the library version number
> for the ethtool example library, which needs to be upped to 2-digits, as
> external libraries using the DPDK build system also use the logic in this
> file.
>
> Fixes: cba806e07d6f ("build: change ABI versioning to global")
>
> Signed-off-by: Thomas Monjalon
> Signed-off-by: Bruce Richardson
> ---
>
> V3:
> * fixed issues with building ethtool example app.
> V2:
> * adjusted the meson version to work correctly with both 2-part and
> 3-part ABI versions, so it will work correctly even with no changes
> for a 21.x ABI version number
> * adjusted the versions of the experimental libs so that they are
> consistent between meson and make, and also consistent with v19.11
>
> ---
> ABI_VERSION | 2 +-
> config/meson.build| 16 +---
> drivers/meson.build | 4 ++--
> examples/ethtool/lib/Makefile | 2 +-
> lib/meson.build | 4 ++--
> mk/rte.lib.mk | 13 -
> 6 files changed, 27 insertions(+), 14 deletions(-)
>
> diff --git a/ABI_VERSION b/ABI_VERSION
> index 2e73f8d2a..fcc01369a 100644
> --- a/ABI_VERSION
> +++ b/ABI_VERSION
> @@ -1 +1 @@
> -20.1
> +20.0.1
> diff --git a/config/meson.build b/config/meson.build
> index 364a8d739..01911ecf9 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -20,9 +20,19 @@ pver = meson.project_version().split('.')
> major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
> abi_version = run_command(find_program('cat', 'more'),
> abi_version_file).stdout().strip()
> -# experimental libraries are versioned as 0.majorminor versions, e.g. 0.201
> -ever = abi_version.split('.')
> -experimental_abi_version = '0.@0@@1@'.format(ever.get(0), ever.get(1))
> +
> +# Regular libraries have the abi_version as the filename extension
> +# and have the soname be all but the final part of the abi_version.
> +# Experimental libraries have soname with '0.major'
> +# and the filename suffix as 0.majorminor versions,
> +# e.g. v20.1 => librte_stable.so.20.1, librte_experimental.so.0.201
> +#sonames => librte_stable.so.20, librte_experimental.so.0.20
> +# e.g. v20.0.1 => librte_stable.so.20.0.1, librte_experimental.so.0.2001
> +# sonames => librte_stable.so.20.0, librte_experimental.so.0.200
> +abi_va = abi_version.split('.')
> +stable_so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' +
> abi_va[1]
> +experimental_abi_version = '0.' + ''.join(abi_va)
> +experimental_so_version = '0.' + ''.join(stable_so_version.split('.'))
>
> # extract all version information into the build configuration
> dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
> diff --git a/drivers/meson.build b/drivers/meson.build
> index 72eec4608..4b17662b7 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -132,10 +132,10 @@ foreach class:dpdk_driver_classes
>
> if is_experimental != 0
> lib_version = experimental_abi_version
> - so_version = experimental_abi_version
> + so_version = experimental_so_version
> else
> lib_version = abi_version
> - so_version = abi_version
> + so_version = stable_so_version
> endif
>
> # now build the static driver
> diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile
> index 9da7dc3ba..649474127 100644
> --- a/examples/ethtool/lib/Makefile
> +++ b/examples/ethtool/lib/Makefile
> @@ -18,7 +18,7 @@ endif
> # library name
> LIB = librte_ethtool.a
>
> -LIBABIVER := 1
> +LIBABIVER := 0.1
>
> # all source are stored in SRC-Y
> SRCS-y := rte_ethtool.c
> diff --git a/lib/meson.build b/lib/meson.build
> index 6ceb5e756..0af3efab2 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -113,10 +113,10 @@ foreach l:libraries
>
> if is_experimental != 0
> lib_version = experimental_abi_version
> - so_version = experimental_abi_version
> + so_version = experimental_so_version
> else
> lib_version = abi_ver
[dpdk-dev] [PATCH v2] examples/ipsec-secgw: return on encountering algo as NULL
if algo is NULL set the status to error and return. This change
prevent crashing of ipsec-secgw application when a specific
cipher/auth/aead algo are not supported by application.
Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file")
Signed-off-by: Savinay Dharmappa
Acked-by: Konstantin Ananyev
---
examples/ipsec-secgw/sa.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 7f046e3ed..c75a5a15f 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -314,6 +314,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
APP_CHECK(algo != NULL, status, "unrecognized "
"input \"%s\"", tokens[ti]);
+ if (status->status < 0)
+ return;
+
rule->cipher_algo = algo->algo;
rule->block_size = algo->block_size;
rule->iv_len = algo->iv_len;
@@ -378,6 +381,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
APP_CHECK(algo != NULL, status, "unrecognized "
"input \"%s\"", tokens[ti]);
+ if (status->status < 0)
+ return;
+
rule->auth_algo = algo->algo;
rule->auth_key_len = algo->key_len;
rule->digest_len = algo->digest_len;
@@ -433,6 +439,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
APP_CHECK(algo != NULL, status, "unrecognized "
"input \"%s\"", tokens[ti]);
+ if (status->status < 0)
+ return;
+
rule->aead_algo = algo->algo;
rule->cipher_key_len = algo->key_len;
rule->digest_len = algo->digest_len;
--
2.17.1
Re: [dpdk-dev] [PATCH] ethdev: allow multiple security sessions to use one rte flow
> > > > > The rte_security API which enables inline protocol/crypto feature
> > > > > mandates that for every security session an rte_flow is created.
> > > > > This would internally translate to a rule in the hardware which
> > > > > would do packet classification.
> > > > >
> > > > > In rte_securty, one SA would be one security session. And if an
> > > > > rte_flow need to be created for every session, the number of SAs
> > > > > supported by an inline implementation would be limited by the
> > > > > number of rte_flows the PMD would be able to support.
> > > > >
> > > > > If the fields SPI & IP addresses are allowed to be a range, then
> > > > > this limitation can be overcome. Multiple flows will be able to
> > > > > use one rule for SECURITY processing. In this case, the security
> > > > > session provided as conf would be NULL.
> > > >
> > > > Wonder what will be the usage model for it?
> > > > AFAIK, RFC 4301 clearly states that either SPI value alone or in
> > > > conjunction with dst (and src) IP should clearly identify SA for
> > > > inbound SAD
> > lookup.
> > > > Am I missing something obvious here?
> > >
> > > [Anoob] Existing SECURITY action type requires application to create
> > > an 'rte_flow' per SA, which is not really required if h/w can use SPI to
> > > uniquely
> > identify the security session/SA.
> > >
> > > Existing rte_flow usage: IP (dst,src) + ESP + SPI -> security
> > > processing enabled on one security session (ie on SA)
> > >
> > > The above rule would uniquely identify packets for an SA. But with the
> > > above usage, we would quickly exhaust entries available in h/w lookup
> > > tables (which are limited on our hardware). But if h/w can use SPI field
> > > to index
> > into a table (for example), then the above requirement of one rte_flow per
> > SA is
> > not required.
> > >
> > > Proposed rte_flow usage: IP (any) + ESP + SPI (any) -> security
> > > processing enabled on all ESP packets
> > >
> > > Now h/w could use SPI to index into a pre-populated table to get
> > > security session. Please do note that, SPI is not ignored during the
> > > actual
> > lookup. Just that it is not used while creating 'rte_flow'.
> >
> > And this table will be prepopulated by user and pointer to it will be
> > somehow
> > passed via rte_flow API?
> > If yes, then what would be the mechanism?
>
> [Anoob] I'm not sure what exactly you meant by user. But may be I'll explain
> how it's done in OCTEONTX2 PMD.
>
> The application would create security_session for every SA. SPI etc would be
> available to PMD (in conf) when the session is created.
> Now the PMD would populate SA related params in a specific location that h/w
> would access. This memory is allocated during device
> configure and h/w would have the pointer after the initialization is done.
>
> PMD uses SPI as index to write into specific locations(during session create)
> and h/w would use it when it sees an ESP packet eligible
> for SECURITY (in receive path, per packet). As long as session creation could
> populate at memory locations that h/w would look at, this
> scheme would work.
Thanks for explanation, few more questions:
Ok, so the table will be allocated at device init() somehow (nothing to do with
rte_flow).
Then PMD will be able to write/update entries in that table and HW will be able
to read (to get SPI, keys, etc), correct?
Now if upper layer (ipsec-secgw for example) would like to create new ESP
session on that device, what it would need to do?
Would it still need to use rte_flow API for that?
Or just call rte_security_session_create() and PMD will take update this HW/SW
table for it?
>
> >
> > >
> > > The usage of one 'rte_flow' for multiple SAs is not mandatory. It is
> > > only required when application requires large number of SAs. The proposed
> > change is to allow more efficient usage of h/w resources where it's
> > permitted by
> > the PMD.
> > >
> > > >
> > > > >
> > > > > Application should do an rte_flow_validate() to make sure the flow
> > > > > is supported on the PMD.
> > > > >
> > > > > Signed-off-by: Anoob Joseph
> > > > > ---
> > > > > lib/librte_ethdev/rte_flow.h | 6 ++
> > > > > 1 file changed, 6 insertions(+)
> > > > >
> > > > > diff --git a/lib/librte_ethdev/rte_flow.h
> > > > > b/lib/librte_ethdev/rte_flow.h index 452d359..21fa7ed 100644
> > > > > --- a/lib/librte_ethdev/rte_flow.h
> > > > > +++ b/lib/librte_ethdev/rte_flow.h
> > > > > @@ -2239,6 +2239,12 @@ struct rte_flow_action_meter {
> > > > > * direction.
> > > > > *
> > > > > * Multiple flows can be configured to use the same security session.
> > > > > + *
> > > > > + * The NULL value is allowed for security session. If security
> > > > > + session is NULL,
> > > > > + * then SPI field in ESP flow item and IP addresses in flow items
> > > > > + 'IPv4' and
> > > > > + * 'IPv6' will be allowed to be a range. The rule thus created
> > > > > + can enable
> > > > > + * SECURITY processing on multiple flows.
Re: [dpdk-dev] [PATCH v2] examples/ipsec-secgw: return on encountering algo as NULL
Hi,
> if algo is NULL set the status to error and return. This change
> prevent crashing of ipsec-secgw application when a specific
> cipher/auth/aead algo are not supported by application.
It seems you forgot 'fix' in the header 😊
examples/ipsec-secgw: fix ...
>
> Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file")
>
> Signed-off-by: Savinay Dharmappa
> Acked-by: Konstantin Ananyev
> ---
> examples/ipsec-secgw/sa.c | 9 +
> 1 file changed, 9 insertions(+)
>
> diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
> index 7f046e3ed..c75a5a15f 100644
> --- a/examples/ipsec-secgw/sa.c
> +++ b/examples/ipsec-secgw/sa.c
> @@ -314,6 +314,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
> APP_CHECK(algo != NULL, status, "unrecognized "
> "input \"%s\"", tokens[ti]);
>
> + if (status->status < 0)
> + return;
> +
> rule->cipher_algo = algo->algo;
> rule->block_size = algo->block_size;
> rule->iv_len = algo->iv_len;
> @@ -378,6 +381,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
> APP_CHECK(algo != NULL, status, "unrecognized "
> "input \"%s\"", tokens[ti]);
>
> + if (status->status < 0)
> + return;
> +
> rule->auth_algo = algo->algo;
> rule->auth_key_len = algo->key_len;
> rule->digest_len = algo->digest_len;
> @@ -433,6 +439,9 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
> APP_CHECK(algo != NULL, status, "unrecognized "
> "input \"%s\"", tokens[ti]);
>
> + if (status->status < 0)
> + return;
> +
> rule->aead_algo = algo->algo;
> rule->cipher_key_len = algo->key_len;
> rule->digest_len = algo->digest_len;
> --
> 2.17.1
[dpdk-dev] [PATCH 1/2] net/ena: upgrade HAL for new HW features
This version of the HAL allows to use the latest HW features, like
rx offsets.
Driver was adjusted to the new version to fix the build.
Signed-off-by: Michal Krawczyk
Signed-off-by: Maciej Bielski
---
drivers/net/ena/base/ena_com.c| 154 +++---
drivers/net/ena/base/ena_com.h| 26 ++-
.../net/ena/base/ena_defs/ena_admin_defs.h| 69 +++-
.../net/ena/base/ena_defs/ena_common_defs.h | 8 +-
.../net/ena/base/ena_defs/ena_eth_io_defs.h | 8 +-
drivers/net/ena/base/ena_defs/ena_gen_info.h | 4 +-
drivers/net/ena/base/ena_defs/ena_regs_defs.h | 3 +-
drivers/net/ena/base/ena_eth_com.c| 111 -
drivers/net/ena/base/ena_eth_com.h| 77 +++--
drivers/net/ena/base/ena_plat_dpdk.h | 7 +-
drivers/net/ena/ena_ethdev.c | 6 +-
11 files changed, 286 insertions(+), 187 deletions(-)
diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 8b51660a4..eb41bcf19 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -14,7 +14,6 @@
#define ENA_ASYNC_QUEUE_DEPTH 16
#define ENA_ADMIN_QUEUE_DEPTH 32
-
#define ENA_CTRL_MAJOR 0
#define ENA_CTRL_MINOR 0
#define ENA_CTRL_SUB_MINOR 1
@@ -64,7 +63,7 @@ struct ena_com_stats_ctx {
struct ena_admin_acq_get_stats_resp get_resp;
};
-static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
+static int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
struct ena_common_mem_addr *ena_addr,
dma_addr_t addr)
{
@@ -74,7 +73,7 @@ static inline int ena_com_mem_addr_set(struct ena_com_dev
*ena_dev,
}
ena_addr->mem_addr_low = lower_32_bits(addr);
- ena_addr->mem_addr_high = (u16)upper_32_bits(addr);
+ ena_addr->mem_addr_high = upper_32_bits(addr);
return 0;
}
@@ -88,7 +87,7 @@ static int ena_com_admin_init_sq(struct ena_com_admin_queue
*queue)
sq->mem_handle);
if (!sq->entries) {
- ena_trc_err("memory allocation failed");
+ ena_trc_err("memory allocation failed\n");
return ENA_COM_NO_MEM;
}
@@ -110,7 +109,7 @@ static int ena_com_admin_init_cq(struct ena_com_admin_queue
*queue)
cq->mem_handle);
if (!cq->entries) {
- ena_trc_err("memory allocation failed");
+ ena_trc_err("memory allocation failed\n");
return ENA_COM_NO_MEM;
}
@@ -135,7 +134,7 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *dev,
aenq->mem_handle);
if (!aenq->entries) {
- ena_trc_err("memory allocation failed");
+ ena_trc_err("memory allocation failed\n");
return ENA_COM_NO_MEM;
}
@@ -165,7 +164,7 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *dev,
return 0;
}
-static inline void comp_ctxt_release(struct ena_com_admin_queue *queue,
+static void comp_ctxt_release(struct ena_com_admin_queue *queue,
struct ena_comp_ctx *comp_ctx)
{
comp_ctx->occupied = false;
@@ -181,6 +180,11 @@ static struct ena_comp_ctx *get_comp_ctxt(struct
ena_com_admin_queue *queue,
return NULL;
}
+ if (unlikely(!queue->comp_ctx)) {
+ ena_trc_err("Completion context is NULL\n");
+ return NULL;
+ }
+
if (unlikely(queue->comp_ctx[command_id].occupied && capture)) {
ena_trc_err("Completion context is occupied\n");
return NULL;
@@ -254,7 +258,7 @@ static struct ena_comp_ctx
*__ena_com_submit_admin_cmd(struct ena_com_admin_queu
return comp_ctx;
}
-static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
+static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
{
size_t size = queue->q_depth * sizeof(struct ena_comp_ctx);
struct ena_comp_ctx *comp_ctx;
@@ -262,7 +266,7 @@ static inline int ena_com_init_comp_ctxt(struct
ena_com_admin_queue *queue)
queue->comp_ctx = ENA_MEM_ALLOC(queue->q_dmadev, size);
if (unlikely(!queue->comp_ctx)) {
- ena_trc_err("memory allocation failed");
+ ena_trc_err("memory allocation failed\n");
return ENA_COM_NO_MEM;
}
@@ -335,18 +339,21 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,
}
if (!io_sq->desc_addr.virt_addr) {
- ena_trc_err("memory allocation failed");
+ ena_trc_err("memory allocation failed\n");
return ENA_COM_NO_MEM;
}
}
if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {
/* Allocate bounce buffers */
-
[dpdk-dev] [PATCH 2/2] net/ena: add support for RX_OFFSET feature
From: Maciej Bielski
Allow the data in the first buffer to be shifted by `pkt_offset` after
the header room. The offset value is provided by `ena_rx_ctx`.
As part of this update, the version of the ENA was upgraded to v2.0.3.
Signed-off-by: Maciej Bielski
Acked-by: Michal Krawczyk
---
drivers/net/ena/ena_ethdev.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index f32963558..665afee4f 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -27,7 +27,7 @@
#define DRV_MODULE_VER_MAJOR 2
#define DRV_MODULE_VER_MINOR 0
-#define DRV_MODULE_VER_SUBMINOR2
+#define DRV_MODULE_VER_SUBMINOR3
#define ENA_IO_TXQ_IDX(q) (2 * (q))
#define ENA_IO_RXQ_IDX(q) (2 * (q) + 1)
@@ -409,6 +409,9 @@ static void ena_config_host_info(struct ena_com_dev
*ena_dev)
ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT);
host_info->num_cpus = rte_lcore_count();
+ host_info->driver_supported_features =
+ ENA_ADMIN_HOST_INFO_RX_OFFSET_MASK;
+
rc = ena_com_set_host_attributes(ena_dev);
if (rc) {
if (rc == -ENA_COM_UNSUPPORTED)
@@ -2013,6 +2016,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct
rte_mbuf **rx_pkts,
ena_rx_ctx.max_bufs = rx_ring->sgl_size;
ena_rx_ctx.ena_bufs = rx_ring->ena_bufs;
ena_rx_ctx.descs = 0;
+ ena_rx_ctx.pkt_offset = 0;
/* receive packet context */
rc = ena_com_rx_pkt(rx_ring->ena_com_io_cq,
rx_ring->ena_com_io_sq,
@@ -2048,6 +2052,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct
rte_mbuf **rx_pkts,
mbuf->nb_segs = ena_rx_ctx.descs;
mbuf->port = rx_ring->port_id;
mbuf->pkt_len = 0;
+ mbuf->data_off += ena_rx_ctx.pkt_offset;
mbuf_head = mbuf;
} else {
/* for multi-segment pkts create mbuf chain */
--
2.20.1
[dpdk-dev] [PATCH 0/2] net/ena: add support for Rx offsets
Hi, Those 2 patches are adding support for the device to set "Rx offsets". It is supported on the newest generation and driver should support it as well. Maciej Bielski (1): net/ena: add support for RX_OFFSET feature Michal Krawczyk (1): net/ena: upgrade HAL for new HW features drivers/net/ena/base/ena_com.c| 154 +++--- drivers/net/ena/base/ena_com.h| 26 ++- .../net/ena/base/ena_defs/ena_admin_defs.h| 69 +++- .../net/ena/base/ena_defs/ena_common_defs.h | 8 +- .../net/ena/base/ena_defs/ena_eth_io_defs.h | 8 +- drivers/net/ena/base/ena_defs/ena_gen_info.h | 4 +- drivers/net/ena/base/ena_defs/ena_regs_defs.h | 3 +- drivers/net/ena/base/ena_eth_com.c| 111 - drivers/net/ena/base/ena_eth_com.h| 77 +++-- drivers/net/ena/base/ena_plat_dpdk.h | 7 +- drivers/net/ena/ena_ethdev.c | 13 +- 11 files changed, 292 insertions(+), 188 deletions(-) -- 2.20.1
[dpdk-dev] DPDK techboard minutes of Dec 4
Minutes of Technical Board Meeting, 2019-12-04 Members Attending - -Bruce -Ferruh -Hemant -Honnappa -Jerin -Kevin (Chair) -Konstantin -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 2019-12-18 @3pm UTC, and will be chaired by Konstantin Ananyev 1) DPDK Testing. In-house testing will continue to happen regardless of upstream project labs due to HW. Decision to increase participation in UNH labs. Will try to get further resources from contributing companies and also discuss options with the governing board. Thomas will draft some proposals for this. Thanks, Kevin.
[dpdk-dev] [PATCH v5 0/3] Add ABI compatibility checks to the meson build
With the recent changes made to stabilize ABI versioning in DPDK, it will become increasingly important to check patches for ABI compatibility. We propose adding the ABI compatibility checking to be done as part of the build. The advantages to adding the ABI compatibility checking to the build are two-fold. Firstly, developers can easily check their patches to make sure they don’t break the ABI without adding any extra steps. Secondly, it makes the integration into existing CI seamless since there are no extra scripts to make the CI run. The build will run as usual and if an incompatibility is detected in the ABI, the build will fail and show the incompatibility. As an added bonus, enabling the ABI compatibility checks does not impact the build speed. The proposed solution works as follows: 1. Generate the ABI dump of the baseline. This can be done with the new script added in this set. This step will only need to be done when the ABI version changes (so once a year) and can be added to master so it exists by default. This step can be skipped if the dump files for the baseline already exist. 2. Build with meson. If there is an ABI incompatibility, the build will fail and print the incompatibility information. The patches in this set include the ABI dump file generating script, the dump files for drivers and libs, the meson option required to enable/disable the checks, and the required meson changes to run the compatibility checks during the build. Note: This patch set depends on: http://patches.dpdk.org/patch/63765/. The generated .dump files in this patch set are based on the changes in the patch "build: fix soname info for 19.11 compatibility". If a decision is made to use a different format for the sonames, then a new version of this patch set will be required as the .dump files will need to be regenerated. Note: The following driver dump files are not included in these patches: common/mvep:missing dependency, "libmusdk" net/mvneta: missing dependency, "libmusdk" net/mvpp2: missing dependency, "libmusdk" net/nfb:missing dependency, "libnfb" crypto/mvsam: missing dependency, "libmusdk" They have not been included as I do not have access to these dependencies. Please feel free to add them if you can! (Maintainers of the above Cc'ed). --- v2: - Rebased on master for 19.11. - Moved the experimental syms checks next to the abi checks. This also removed the dependency on the experimental checks from the shared build. - General cleanup. v3: - Fixed typo in meson option name in buildtools/meson.build. v4: - removed commits 1 and 2 from the patch set since they are not needed as part of this change - squash commits 3,4,5,6 into a single commit - changes meson option from type boolean to feature - update travis packages - move check for windows to earlier in build - add abignore file to suppress experimental functions - make the directories we store dump files in hidden - add .dump files for v20.0 ABI to patch set v5: - added more drivers' dump files - removed travis build with abi checks until the issues are resolved. Kevin Laatz (3): build: add dump files for v20.0 ABI build: add abi checks to meson build: clean up experimental syms check buildtools/dpdk.abignore |2 + buildtools/meson.build|3 + config/meson.build| 10 + devtools/gen-abi-dump.sh | 24 + drivers/.abi/librte_bus_dpaa.dump | 5303 ++ drivers/.abi/librte_bus_fslmc.dump| 5084 + drivers/.abi/librte_bus_ifpga.dump| 972 +++ drivers/.abi/librte_bus_pci.dump | 834 +++ drivers/.abi/librte_bus_vdev.dump | 408 ++ drivers/.abi/librte_bus_vmbus.dump| 918 +++ drivers/.abi/librte_common_cpt.dump | 36 + drivers/.abi/librte_common_dpaax.dump | 177 + drivers/.abi/librte_common_octeontx.dump | 77 + drivers/.abi/librte_common_octeontx2.dump | 988 +++ drivers/.abi/librte_mempool_bucket.dump | 15 + drivers/.abi/librte_mempool_dpaa.dump | 323 + drivers/.abi/librte_mempool_dpaa2.dump| 484 ++ drivers/.abi/librte_mempool_octeontx.dump | 22 + drivers/.abi/librte_mempool_octeontx2.dump| 643 ++ drivers/.abi/librte_mempool_ring.dump | 15 + drivers/.abi/librte_mempool_stack.dump| 16 + drivers/.abi/librte_pmd_aesni_gcm.dump| 1315 drivers/.abi/librte_pmd_aesni_mb.dump | 1315 drivers/.abi/librte_pmd_af_packet.dump| 22 + drivers/.abi/librte_pmd_af_xdp.dump | 23 + drivers/.abi/librte_pmd_ark.dump | 26 + drivers/.abi/librte_pmd_atlantic.dump | 1296 drivers/.abi/librte_pmd_avp.dump | 26 + drivers/.abi/librte_pmd_axgbe.dump| 27 +
[dpdk-dev] [PATCH v5 3/3] build: clean up experimental syms check
This patch cleans up the meson build files in lib and drivers by moving the
custom target for checking the experimental syms next to the abi compat
checks. This also removes the dependency on the check for the shared build,
which was not required by anything, but was only added to force the
experimental syms check run.
Signed-off-by: Kevin Laatz
---
drivers/meson.build | 21 +++--
lib/meson.build | 21 +++--
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index db58a67b9..4f4c93b73 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -163,15 +163,6 @@ foreach class:dpdk_driver_classes
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' +
version_map]
- # on unix systems check the output of the
- # experimental syms script, using it as a
- # dependency of the .so build
- lk_deps += custom_target(lib_name + '.exp_chk',
- command: [check_experimental_syms,
- version_map, '@INPUT@'],
- capture: true,
- input: static_lib,
- output: lib_name + '.exp_chk')
endif
shared_lib = shared_library(lib_name,
@@ -181,7 +172,6 @@ foreach class:dpdk_driver_classes
dependencies: shared_deps,
c_args: cflags,
link_args: lk_args,
- link_depends: lk_deps,
version: lib_version,
soversion: so_version,
install: true,
@@ -197,6 +187,17 @@ foreach class:dpdk_driver_classes
dependencies: static_deps)
if abidiff.found()
+ # on unix systems check the output of the
+ # experimental syms script
+ custom_target(lib_name + '.exp_chk',
+ command: [check_experimental_syms,
+ version_map, '@INPUT@'],
+ capture: true,
+ input: static_lib,
+ output: lib_name + '.exp_chk',
+ install: false,
+ build_by_default: true)
+
custom_target('lib' + lib_name + '.abi_chk',
command: [abidiff, '--no-added-syms',
'--suppr', abignore,
diff --git a/lib/meson.build b/lib/meson.build
index f0aba6635..b0f915969 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -154,15 +154,6 @@ foreach l:libraries
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' +
version_map]
- # on unix systems check the output of the
- # experimental syms script, using it as a
- # dependency of the .so build
- lk_deps += custom_target(name + '.exp_chk',
- command: [check_experimental_syms,
- version_map, '@INPUT@'],
- capture: true,
- input: static_lib,
- output: name + '.exp_chk')
endif
shared_lib = shared_library(libname,
@@ -172,7 +163,6 @@ foreach l:libraries
dependencies: shared_deps,
include_directories: includes,
link_args: lk_args,
- link_depends: lk_deps,
version: lib_version,
soversion: so_version,
install: true)
@@ -181,6 +171,17 @@ foreach l:libraries
dependencies: shared_deps)
if abidiff.found()
+ # on unix systems check the output of the
+ # experimental syms script
+ custom_target(name + '.exp_chk',
+ c
[dpdk-dev] [PATCH v5 2/3] build: add abi checks to meson
This patch adds a script to generate ABI dump files. These files will be
required to perform ABI compatibility checks during the build later in the
patchset. This script should be run on a DPDK version with a stable ABI.
Since this is a tool designed for human use, we simplify it to just work
off a whole build directory, taking the parameter of the builddir and
generating the lib|drivers/abi dir. This is hardcoded into the script since
the meson build expects the .dump files in these directories.
The running of the scripts can be enabled/disabled using the new meson
option added in this patch. If enabled, the lib and drivers .so files will
be compared against any existing ABI dump files in lib|drivers/abi of the
source directory. If there are any incompatibilities, the build will fail
and display the incompatibility.
Signed-off-by: Kevin Laatz
Signed-off-by: Bruce Richardson
---
v2:
- fixed conditional around abi check custom target
- fixed conditional around abi check custom target
v3:
- fix typo in meson option name
v4:
- squash commits 3,4,5,6 into a single commit
- changes meson option from type boolean to feature
- update travis packages
- move check for windows to earlier in build
- add abignore file to suppress experimental functions
- make the directories we store dump files in hidden
v5:
- remove travis build with abi checks. This can be added as a separate
patch once the issue are fixed.
---
buildtools/dpdk.abignore | 2 ++
buildtools/meson.build | 3 +++
config/meson.build | 10 ++
devtools/gen-abi-dump.sh | 24
drivers/meson.build | 13 +
lib/meson.build | 13 +
meson.build | 4
meson_options.txt| 2 ++
8 files changed, 71 insertions(+)
create mode 100644 buildtools/dpdk.abignore
create mode 100755 devtools/gen-abi-dump.sh
diff --git a/buildtools/dpdk.abignore b/buildtools/dpdk.abignore
new file mode 100644
index 0..b866b7f26
--- /dev/null
+++ b/buildtools/dpdk.abignore
@@ -0,0 +1,2 @@
+[suppress_function]
+symbol_version = EXPERIMENTAL
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 6ef2c5721..378f8d07e 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -7,6 +7,9 @@ pmdinfo = find_program('gen-pmdinfo-cfile.sh')
check_experimental_syms = find_program('check-experimental-syms.sh')
+abidiff = find_program('abidiff', required: compat_checks)
+abignore = files('dpdk.abignore')
+
# set up map-to-def script using python, either built-in or external
python3 = import('python').find_installation(required: false)
if python3.found()
diff --git a/config/meson.build b/config/meson.build
index 01911ecf9..ea680af33 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -34,6 +34,16 @@ stable_so_version = abi_va.length() == 2 ? abi_va[0] :
abi_va[0] + '.' + abi_va[
experimental_abi_version = '0.' + ''.join(abi_va)
experimental_so_version = '0.' + ''.join(stable_so_version.split('.'))
+# compatibility checks not available on windows
+compat_checks = disabler()
+if not is_windows
+ compat_checks = get_option('compat_checks')
+endif
+
+if not get_option('debug') and compat_checks.enabled()
+ error('Build type must have debug symbols when compat_checks=enabled')
+endif
+
# extract all version information into the build configuration
dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
dpdk_conf.set('RTE_VER_MONTH', pver.get(1).to_int())
diff --git a/devtools/gen-abi-dump.sh b/devtools/gen-abi-dump.sh
new file mode 100755
index 0..bc6eac8c8
--- /dev/null
+++ b/devtools/gen-abi-dump.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+builddir=$1
+
+if [ -z "$builddir" ] ; then
+ echo "Usage: $(basename $0) build_dir"
+ exit 1
+fi
+
+if [ ! -d "$builddir" ] ; then
+ echo "Error: build directory, '$builddir', doesn't exist"
+ exit 1
+fi
+
+for d in lib drivers ; do
+ mkdir -p $d/.abi
+
+ for f in $builddir/$d/*.so* ; do
+ test -L "$f" && continue
+
+ libname=$(basename $f)
+ abidw --out-file $d/.abi/${libname%.so*}.dump $f || exit 1
+ done
+done
diff --git a/drivers/meson.build b/drivers/meson.build
index 4b17662b7..db58a67b9 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -196,6 +196,19 @@ foreach class:dpdk_driver_classes
include_directories: includes,
dependencies: static_deps)
+ if abidiff.found()
+ custom_target('lib' + lib_name + '.abi_chk',
+ command: [abidiff, '--no-added-syms',
+ '--suppr', abignore,
+ files('.abi/lib' + lib_name +
'.dump'),
+ '@INPUT@'],
+
Re: [dpdk-dev] [PATCH] Don't combine '-r' and '--export-dynamic' linker options
Thomas Monjalon writes: > 25/10/2019 03:20, Rafael Ávila de Espíndola: >> Running ld with '-r' switches the linker to a very special mode where >> some other linker options don't make sense. >> >> In particular, '--export-dynamic' normally requires that all global >> symbols be included in the dynamic symbol table, but a .o file doesn't >> even have a dynamic symbol table. >> >> When given both options it looks like the gnu linker just ignores >> '--export-dynamic'. >> >> Unfortunately some versions of lld (https://lld.llvm.org/) have a bug >> that causes it to try to create a dynamic symbol table in the output >> .o file and ends up corrupting it >> (https://bugs.llvm.org/show_bug.cgi?id=43552). Current (git) version >> of lld now issues an error. >> >> This patch drops $(LDFLAGS) when using -r. With this patch I can build >> dpdk with lld. > [...] >> -PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@ >> +PMDINFO_LD = $(CROSS)ld -r -o $@.o $@.pmd.o $@ > > Dealing with compiler bugs is really annoying. > I'm afraid removing LDFLAGS may break in some environments. > Could you just filter-out some incompatible options? Sure, that works. I will send a v2. > And what about meson? Is there some similar issue? As far as I can tell meson produces a .a file instead. In the build.ninja file I see build drivers/librte_pmd_dpaa_event.a: STATIC_LINKER drivers/a715181@@rte_pmd_dpaa_event@sta/meson-generated_.._rte_pmd_dpaa_event.pmd.c.o drivers/a715181@@tmp_rte_pmd_dpaa_event@sta/event_dpaa_dpaa_eventdev.c.o and rule STATIC_LINKER command = rm -f $out && gcc-ar $LINK_ARGS $out $in Cheers, Rafael
[dpdk-dev] [PATCH v2] Don't combine -r and -export-dynamic linker options
Running ld with -r switches the linker to a very special mode where some other linker options don't make sense. In particular, -export-dynamic normally requires that all global symbols be included in the dynamic symbol table, but a .o file doesn't even have a dynamic symbol table. When given both options it looks like the gnu linker just ignores -export-dynamic. Unfortunately some versions of lld (https://lld.llvm.org/) have a bug that causes it to try to create a dynamic symbol table in the output .o file and ends up corrupting it (https://bugs.llvm.org/show_bug.cgi?id=43552). Current (git) version of lld now issues an error. This patch filters out -export-dynamic from $(LDFLAGS) when using -r. With this patch I can build dpdk with lld. Signed-off-by: Rafael Ávila de Espíndola --- mk/internal/rte.compile-pre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk index 0cf3791b4..82fe098f7 100644 --- a/mk/internal/rte.compile-pre.mk +++ b/mk/internal/rte.compile-pre.mk @@ -61,7 +61,7 @@ CHECK_EXPERIMENTAL = $(EXPERIMENTAL_CHECK) $(SRCDIR)/$(EXPORT_MAP) $@ PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c -PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@ +PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@ PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \ echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \ $(PMDINFO_GEN) && \ -- 2.23.0
[dpdk-dev] [PATCH 0/4] Add external contiguous memory support to Virtio-user
Somme applications/frameworks using DPDK allocate their own memory for its buffers. This is the case of Seastar, and also VPP. It is currently not possible to use Virtio-user PMD with these applications because Virtio-user requires file descriptor for this memory to be shared with the vhost-user backend (vDPA in our case [0]). This series introduces a new API in EAL to register external memory that is contiguous in both the VA and the IOVA space. It also enables VDEVs to implement the DMA map/unmap callback, and implement it in Virtio-user PMD. Please note that extmem unit tests are missing. I'm working on it and it will be in v2. Just share this v1 for early reviews. Maxime Coquelin (4): eal: add new API to register contiguous external memory eal: allow getting memory segment FD with external memory bus/vdev: add DMA mapping supprt net/virtio: add DMA mapping callback to virtio-user drivers/bus/vdev/rte_bus_vdev.h | 24 + drivers/bus/vdev/vdev.c | 50 +++ .../net/virtio/virtio_user/virtio_user_dev.c | 10 +-- .../net/virtio/virtio_user/virtio_user_dev.h | 3 + drivers/net/virtio/virtio_user_ethdev.c | 58 + lib/librte_eal/common/eal_common_memory.c | 87 --- lib/librte_eal/common/include/rte_memory.h| 46 ++ lib/librte_eal/common/malloc_heap.c | 17 +++- lib/librte_eal/common/malloc_heap.h | 2 +- lib/librte_eal/common/rte_malloc.c| 2 +- lib/librte_eal/rte_eal_version.map| 3 + 11 files changed, 278 insertions(+), 24 deletions(-) -- 2.21.0
[dpdk-dev] [PATCH 3/4] bus/vdev: add DMA mapping supprt
This patch enables VDEVs to implement their own DMA map
and unmap callbacks.
It will be used by Virtio-user PMD to support external
memory registered by applications like Seastar or VPP.
Signed-off-by: Maxime Coquelin
---
drivers/bus/vdev/rte_bus_vdev.h | 24
drivers/bus/vdev/vdev.c | 50 +
2 files changed, 74 insertions(+)
diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h
index 2bc46530c9..6f920cb064 100644
--- a/drivers/bus/vdev/rte_bus_vdev.h
+++ b/drivers/bus/vdev/rte_bus_vdev.h
@@ -53,6 +53,18 @@ rte_vdev_device_args(const struct rte_vdev_device *dev)
/** Double linked list of virtual device drivers. */
TAILQ_HEAD(vdev_driver_list, rte_vdev_driver);
+/**
+ * Virtual device DMA map function.
+ */
+typedef int (rte_vdev_dma_map_t)(struct rte_vdev_device *dev, void *addr,
+ uint64_t iova, size_t len);
+
+/**
+ * Virtual device DMA unmap function.
+ */
+typedef int (rte_vdev_dma_unmap_t)(struct rte_vdev_device *dev, void *addr,
+ uint64_t iova, size_t len);
+
/**
* Probe function called for each virtual device driver once.
*/
@@ -69,10 +81,22 @@ typedef int (rte_vdev_remove_t)(struct rte_vdev_device
*dev);
struct rte_vdev_driver {
TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */
struct rte_driver driver; /**< Inherited general driver. */
+ rte_vdev_dma_map_t *dma_map; /**name);
}
+static int
+vdev_dma_map(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
+{
+ struct rte_vdev_device *vdev = RTE_DEV_TO_VDEV(dev);
+ const struct rte_vdev_driver *vdrv;
+
+ if (!dev || !dev->driver) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ vdrv = RTE_DRV_TO_VDRV_CONST(dev->driver);
+ if (!vdrv) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ if (vdrv->dma_map)
+ return vdrv->dma_map(vdev, addr, iova, len);
+
+ rte_errno = ENOTSUP;
+ return -1;
+}
+
+static int
+vdev_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
+{
+ struct rte_vdev_device *vdev = RTE_DEV_TO_VDEV(dev);
+ const struct rte_vdev_driver *vdrv;
+
+ if (!dev || !dev->driver) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ vdrv = RTE_DRV_TO_VDRV_CONST(dev->driver);
+ if (!vdrv) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ if (vdrv->dma_map)
+ return vdrv->dma_unmap(vdev, addr, iova, len);
+
+ rte_errno = ENOTSUP;
+ return -1;
+}
+
static struct rte_bus rte_vdev_bus = {
.scan = vdev_scan,
.probe = vdev_probe,
@@ -553,6 +601,8 @@ static struct rte_bus rte_vdev_bus = {
.plug = vdev_plug,
.unplug = vdev_unplug,
.parse = vdev_parse,
+ .dma_map = vdev_dma_map,
+ .dma_unmap = vdev_dma_unmap,
.dev_iterate = rte_vdev_dev_iterate,
};
--
2.21.0
[dpdk-dev] [PATCH 1/4] eal: add new API to register contiguous external memory
This new API allows to pass a file descriptor while
registering external and contiguous memory in the IOVA space.
This is required for using Virtio-user PMD with application
using external memory for the mbuf's buffers, like Seastar
or VPP.
FD is only attached to the segments if single_file_segment
option is enabled.
Signed-off-by: Maxime Coquelin
---
lib/librte_eal/common/eal_common_memory.c | 75 +-
lib/librte_eal/common/include/rte_memory.h | 46 +
lib/librte_eal/common/malloc_heap.c| 17 -
lib/librte_eal/common/malloc_heap.h| 2 +-
lib/librte_eal/common/rte_malloc.c | 2 +-
lib/librte_eal/rte_eal_version.map | 3 +
6 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_memory.c
b/lib/librte_eal/common/eal_common_memory.c
index 4a9cc1f19a..7a4b371828 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -772,6 +772,79 @@ rte_memseg_get_fd_offset(const struct rte_memseg *ms,
size_t *offset)
return ret;
}
+int
+rte_extmem_register_contig(void *va_addr, size_t len, rte_iova_t iova_addr,
+ size_t page_sz, int fd)
+{
+ struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+ rte_iova_t *iova_addrs = NULL;
+ unsigned int socket_id, n, i;
+ int ret = 0;
+
+ if (va_addr == NULL || page_sz == 0 || len == 0 ||
+ !rte_is_power_of_2(page_sz) ||
+ RTE_ALIGN(len, page_sz) != len ||
+ ((len % page_sz) != 0 ||
+ !rte_is_aligned(va_addr, page_sz))) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ n = len / page_sz;
+ if (iova_addr != 0) {
+ iova_addrs = malloc(n * sizeof(*iova_addrs));
+ if (iova_addrs == NULL) {
+ rte_errno = -ENOMEM;
+ return -1;
+ }
+
+ for (i = 0; i < n; i++)
+ iova_addrs[i] = iova_addr + n * page_sz;
+
+ }
+
+
+ if (fd >= 0 && !internal_config.single_file_segments) {
+ RTE_LOG(INFO, EAL, "FD won't be attached to the external
memory," \
+ " requires single file segments\n");
+ fd = -1;
+ }
+ rte_mcfg_mem_write_lock();
+
+ /* make sure the segment doesn't already exist */
+ if (malloc_heap_find_external_seg(va_addr, len) != NULL) {
+ rte_errno = EEXIST;
+ ret = -1;
+ goto unlock;
+ }
+
+ /* get next available socket ID */
+ socket_id = mcfg->next_socket_id;
+ if (socket_id > INT32_MAX) {
+ RTE_LOG(ERR, EAL, "Cannot assign new socket ID's\n");
+ rte_errno = ENOSPC;
+ ret = -1;
+ goto unlock;
+ }
+
+ /* we can create a new memseg */
+ if (malloc_heap_create_external_seg(va_addr, iova_addrs, n,
+ page_sz, "extmem_contig", socket_id, fd) == NULL) {
+ ret = -1;
+ goto unlock;
+ }
+
+ /* memseg list successfully created - increment next socket ID */
+ mcfg->next_socket_id++;
+unlock:
+ rte_mcfg_mem_write_unlock();
+
+ if (iova_addrs != NULL)
+ free(iova_addrs);
+
+ return ret;
+}
+
int
rte_extmem_register(void *va_addr, size_t len, rte_iova_t iova_addrs[],
unsigned int n_pages, size_t page_sz)
@@ -809,7 +882,7 @@ rte_extmem_register(void *va_addr, size_t len, rte_iova_t
iova_addrs[],
/* we can create a new memseg */
n = len / page_sz;
if (malloc_heap_create_external_seg(va_addr, iova_addrs, n,
- page_sz, "extmem", socket_id) == NULL) {
+ page_sz, "extmem", socket_id, -1) == NULL) {
ret = -1;
goto unlock;
}
diff --git a/lib/librte_eal/common/include/rte_memory.h
b/lib/librte_eal/common/include/rte_memory.h
index 3d8d0bd697..e274e47e5e 100644
--- a/lib/librte_eal/common/include/rte_memory.h
+++ b/lib/librte_eal/common/include/rte_memory.h
@@ -451,6 +451,10 @@ rte_memseg_get_fd_offset_thread_unsafe(const struct
rte_memseg *ms,
* is NULL.
* @param page_sz
* Page size of the underlying memory
+ * @param fd
+ * File descriptor for the external memory region registered. Must be set to
+ * -1 if no FD, and ignored if single-segment isn't not used or if iova
+ * aren't contiguous (iova_addrs != NULL).
*
* @return
* - 0 on success
@@ -461,6 +465,48 @@ rte_memseg_get_fd_offset_thread_unsafe(const struct
rte_memseg *ms,
*/
__rte_experimental
int
+rte_extmem_register_contig(void *va_addr, size_t len, rte_iova_t iova_addr,
+ size_t page_sz, int fd);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
[dpdk-dev] [PATCH 4/4] net/virtio: add DMA mapping callback to virtio-user
Signed-off-by: Maxime Coquelin
---
.../net/virtio/virtio_user/virtio_user_dev.c | 10 +---
.../net/virtio/virtio_user/virtio_user_dev.h | 3 +
drivers/net/virtio/virtio_user_ethdev.c | 58 +++
3 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index ea016e85d8..c72a9543cd 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -313,21 +313,15 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)
return 0;
}
-static void
+void
virtio_user_mem_event_cb(enum rte_mem_event type __rte_unused,
-const void *addr,
+const void *addr __rte_unused,
size_t len __rte_unused,
void *arg)
{
struct virtio_user_dev *dev = arg;
- struct rte_memseg_list *msl;
uint16_t i;
- /* ignore externally allocated memory */
- msl = rte_mem_virt2memseg_list(addr);
- if (msl->external)
- return;
-
pthread_mutex_lock(&dev->mutex);
if (dev->started == false)
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h
b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index ad86837717..5a147c74f0 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -67,4 +67,7 @@ void virtio_user_handle_cq(struct virtio_user_dev *dev,
uint16_t queue_idx);
void virtio_user_handle_cq_packed(struct virtio_user_dev *dev,
uint16_t queue_idx);
uint8_t virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs);
+void
+virtio_user_mem_event_cb(enum rte_mem_event type,
+ const void *addr, size_t len , void *arg);
#endif
diff --git a/drivers/net/virtio/virtio_user_ethdev.c
b/drivers/net/virtio/virtio_user_ethdev.c
index 3fc1725736..fd3ce2dfab 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -385,6 +385,62 @@ const struct virtio_pci_ops virtio_user_ops = {
.notify_queue = virtio_user_notify_queue,
};
+static int
+virtio_user_dma_map(struct rte_vdev_device *vdev, void *addr,
+ uint64_t iova __rte_unused, size_t len)
+{
+ const char *name;
+ struct rte_eth_dev *eth_dev;
+ struct virtio_hw *hw;
+ struct virtio_user_dev *dev;
+
+ if (!vdev)
+ return -EINVAL;
+
+ name = rte_vdev_device_name(vdev);
+ eth_dev = rte_eth_dev_allocated(name);
+ if (!eth_dev)
+ return -ENODEV;
+
+ hw = eth_dev->data->dev_private;
+ dev = hw->virtio_user_dev;
+
+ virtio_user_mem_event_cb(RTE_MEM_EVENT_ALLOC,
+addr,
+len,
+(void *)dev);
+
+ return 0;
+}
+
+static int
+virtio_user_dma_unmap(struct rte_vdev_device *vdev, void *addr,
+ uint64_t iova __rte_unused, size_t len)
+{
+ const char *name;
+ struct rte_eth_dev *eth_dev;
+ struct virtio_hw *hw;
+ struct virtio_user_dev *dev;
+
+ if (!vdev)
+ return -EINVAL;
+
+ name = rte_vdev_device_name(vdev);
+ eth_dev = rte_eth_dev_allocated(name);
+ if (!eth_dev)
+ return -ENODEV;
+
+ hw = eth_dev->data->dev_private;
+ dev = hw->virtio_user_dev;
+
+ virtio_user_mem_event_cb(RTE_MEM_EVENT_FREE,
+addr,
+len,
+(void *)dev);
+
+ return 0;
+}
+
static const char *valid_args[] = {
#define VIRTIO_USER_ARG_QUEUES_NUM "queues"
VIRTIO_USER_ARG_QUEUES_NUM,
@@ -717,6 +773,8 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)
}
static struct rte_vdev_driver virtio_user_driver = {
+ .dma_map = virtio_user_dma_map,
+ .dma_unmap = virtio_user_dma_unmap,
.probe = virtio_user_pmd_probe,
.remove = virtio_user_pmd_remove,
};
--
2.21.0
[dpdk-dev] [PATCH 2/4] eal: allow getting memory segment FD with external memory
Now that it is possible to associate a file descriptor when
registering external and contiguous memory, let's allow it.
If no FD is available for the memory segment, ENOENT error
is returned.
Signed-off-by: Maxime Coquelin
---
lib/librte_eal/common/eal_common_memory.c | 12
1 file changed, 12 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_memory.c
b/lib/librte_eal/common/eal_common_memory.c
index 7a4b371828..cc660f5b85 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -691,12 +691,6 @@ rte_memseg_get_fd_thread_unsafe(const struct rte_memseg
*ms)
return -1;
}
- /* segment fd API is not supported for external segments */
- if (msl->external) {
- rte_errno = ENOTSUP;
- return -1;
- }
-
ret = eal_memalloc_get_seg_fd(msl_idx, seg_idx);
if (ret < 0) {
rte_errno = -ret;
@@ -746,12 +740,6 @@ rte_memseg_get_fd_offset_thread_unsafe(const struct
rte_memseg *ms,
return -1;
}
- /* segment fd API is not supported for external segments */
- if (msl->external) {
- rte_errno = ENOTSUP;
- return -1;
- }
-
ret = eal_memalloc_get_seg_fd_offset(msl_idx, seg_idx, offset);
if (ret < 0) {
rte_errno = -ret;
--
2.21.0
[dpdk-dev] [PATCH] net/mlx5: avoid crash when meter action conf is NULL
From: Tonghao Zhang
When offloading the meter, should check the action
conf and make sure it is valid.
Fixes: f46bf7488705 ("net/mlx5: support meter flow action")
Cc: Suanming Mou
Signed-off-by: Tonghao Zhang
---
drivers/net/mlx5/mlx5_flow_dv.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 73aaea4..2c47382 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3402,7 +3402,12 @@ struct field_modify_info modify_tcp[] = {
{
struct mlx5_priv *priv = dev->data->dev_private;
const struct rte_flow_action_meter *am = action->conf;
- struct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am->mtr_id);
+ struct mlx5_flow_meter *fm;
+
+ if (!am)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "meter action conf is NULL");
if (action_flags & MLX5_FLOW_ACTION_METER)
return rte_flow_error_set(error, ENOTSUP,
@@ -3417,6 +3422,8 @@ struct field_modify_info modify_tcp[] = {
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
"meter action not supported");
+
+ fm = mlx5_flow_meter_find(priv, am->mtr_id);
if (!fm)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
--
1.8.3.1
[dpdk-dev] [PATCH v2] net/mlx5: avoid crash when meter action conf is NULL
From: Tonghao Zhang
When offloading the meter, should check the action
conf and make sure it is valid.
Fixes: f46bf7488705 ("net/mlx5: support meter flow action")
Cc: Suanming Mou
Signed-off-by: Tonghao Zhang
---
v2: coding style issues: http://patches.dpdk.org/patch/63849/
---
drivers/net/mlx5/mlx5_flow_dv.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 73aaea4..7528556 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3402,7 +3402,12 @@ struct field_modify_info modify_tcp[] = {
{
struct mlx5_priv *priv = dev->data->dev_private;
const struct rte_flow_action_meter *am = action->conf;
- struct mlx5_flow_meter *fm = mlx5_flow_meter_find(priv, am->mtr_id);
+ struct mlx5_flow_meter *fm;
+
+ if (!am)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "meter action conf is NULL");
if (action_flags & MLX5_FLOW_ACTION_METER)
return rte_flow_error_set(error, ENOTSUP,
@@ -3417,6 +3422,8 @@ struct field_modify_info modify_tcp[] = {
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
"meter action not supported");
+
+ fm = mlx5_flow_meter_find(priv, am->mtr_id);
if (!fm)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
--
1.8.3.1
Re: [dpdk-dev] [PATCH v2] net/ixgbe: fixed port can not link up in FreeBSD
Few small nits below.
s/fixed/fix/
> In FreeBSD environment, nic_uio drivers do not support interrupts,
> rte_intr_callback_register() will fail to register interrupts.
> We can not make link status to change from down to up by interrupt
> callback. So we need to wait for the controller to acquire link
> when ports start. Through multiple tests, 5s should be enough.
>
> Fixes: b9bd0f09fa15 ("ethdev: fix link status query")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Lunyuan Cui
> ---
>
> v2 changes:
> * Put waiting into a separate function to keep start() code clean.
> ---
> drivers/net/ixgbe/ixgbe_ethdev.c | 32
> drivers/net/ixgbe/ixgbe_ethdev.h | 3 +++
> 2 files changed, 35 insertions(+)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 2c6fd0f13..fba666186 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -2801,6 +2801,13 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
> "please call hierarchy_commit() "
> "before starting the port");
>
> +#ifdef RTE_EXEC_ENV_FREEBSD
> + /* wait for the controller to acquire link */
> + err = ixgbe_wait_for_link_up(hw);
> + if (err)
> + goto error;
> +#endif
You can hide ifdef inside the function, see below.
> +
> /*
>* Update link status right before return, because it may
>* start link configuration process in a separate thread.
> @@ -4114,6 +4121,31 @@ ixgbe_dev_setup_link_alarm_handler(void *param)
> intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
> }
>
> +#ifdef RTE_EXEC_ENV_FREEBSD
> +/*
> + * In freebsd environment, nic_uio drivers do not support interrupts,
> + * rte_intr_callback_register() will fail to register interrupts.
> + * We can not make link status to change from down to up by interrupt
> + * callback. So we need to wait for the controller to acquire link
> + * when ports start.
> + * It returns 0 on link up.
> + */
> +int32_t ixgbe_wait_for_link_up(struct ixgbe_hw *hw)
This function can be static, plus pls try to follow dpdk codying style:
static int
ixgbe_wait_for_link_up(struct ixgbe_hw *hw)
{
You can put #ifdef inside the function:
#ifdef RTE_EXEC_ENV_FREEBSD
#else
RTE_SET_USED(hw);
#endif
Or even:
#ifdef RTE_EXEC_ENV_FREEBSD
const uint32_t nb_iter = 25;
#else
const uint32_t nb_iter = 0;
#endif
...
for (i = 0; i < nb_iter; i++) {
...
> +{
> + int err, i, link_up = 0;
> + uint32_t speed = 0;
Empty line here would help readability.
> + for (i = 0; i < 25; i++) {
> + err = ixgbe_check_link(hw, &speed, &link_up, 0);
> + if (err)
> + return err;
> + if (link_up)
> + return 0;
> + msec_delay(200);
> + }
> + return 0;
> +}
> +#endif
> +
> /* return 0 means link status changed, -1 means not changed */
> int
> ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h
> b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 76a1b9d18..9a1d8c54c 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -700,6 +700,9 @@ int
> ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
> int wait_to_complete, int vf);
>
> +#ifdef RTE_EXEC_ENV_FREEBSD
> +int32_t ixgbe_wait_for_link_up(struct ixgbe_hw *hw);
> +#endif
Pls see above, that function can be static.
> /*
> * misc function prototypes
> */
> --
> 2.17.1
[dpdk-dev] [FDIO] dpdk: add devargs support
From: Chenmin Sun
Type: feature
This patch adds the devargs support for dpdk device
The devargs are used as hardware-specific init args for dpdk devices
please refer to the nic guides under
$(DPDK_DIR)/doc/guides/nics/$(NIC_DRIVER).rst
Signed-off-by: Chenmin Sun
Change-Id: Id380d04720090bb66afe5ce09d664e5e248b8eb9
---
src/plugins/dpdk/device/dpdk.h | 2 ++
src/plugins/dpdk/device/format.c | 3 +++
src/plugins/dpdk/device/init.c | 36 +---
src/vpp/conf/startup.conf| 5 +
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h
index d58d2daa7..ab28ac06a 100644
--- a/src/plugins/dpdk/device/dpdk.h
+++ b/src/plugins/dpdk/device/dpdk.h
@@ -336,6 +336,8 @@ typedef struct
u32 hqos_enabled;
dpdk_device_config_hqos_t hqos;
u8 tso;
+ u8 *devargs;
+
#define DPDK_DEVICE_TSO_DEFAULT 0
#define DPDK_DEVICE_TSO_OFF 1
#define DPDK_DEVICE_TSO_ON 2
diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index 292c083fc..20493eb77 100644
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -564,6 +564,9 @@ format_dpdk_device (u8 * s, va_list * args)
format_white_space, indent + 2, format_dpdk_link_status, xd);
s = format (s, "%Uflags: %U\n",
format_white_space, indent + 2, format_dpdk_device_flags, xd);
+ if (di.device->devargs && di.device->devargs->args)
+s = format (s, "%UDevargs: %s\n",
+ format_white_space, indent + 2, di.device->devargs->args);
s = format (s, "%Urx: queues %d (max %d), desc %d "
"(min %d max %d align %d)\n",
format_white_space, indent + 2, xd->rx_q_used, di.max_rx_queues,
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 5a6262c30..d0125e939 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -1118,6 +1118,8 @@ dpdk_device_config (dpdk_config_main_t * conf,
vlib_pci_addr_t pci_addr,
{
devconf->tso = DPDK_DEVICE_TSO_OFF;
}
+ else if (unformat (input, "devargs %s", &devconf->devargs))
+ ;
else
{
error = clib_error_return (0, "unknown input `%U'",
@@ -1428,21 +1430,31 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
/* copy tso config from default device */
_(tso)
+ /* copy tso config from default device */
+ _(devargs)
+
/* add DPDK EAL whitelist/blacklist entry */
if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
- {
- tmp = format (0, "-w%c", 0);
- vec_add1 (conf->eal_init_args, tmp);
- tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
- vec_add1 (conf->eal_init_args, tmp);
- }
+{
+ tmp = format (0, "-w%c", 0);
+ vec_add1 (conf->eal_init_args, tmp);
+ if (devconf->devargs)
+ {
+ tmp = format (0, "%U,%s", format_vlib_pci_addr, &devconf->pci_addr,
devconf->devargs, 0);
+ }
+ else
+ {
+ tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr,
0);
+ }
+ vec_add1 (conf->eal_init_args, tmp);
+}
else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
- {
- tmp = format (0, "-b%c", 0);
- vec_add1 (conf->eal_init_args, tmp);
- tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
- vec_add1 (conf->eal_init_args, tmp);
- }
+{
+ tmp = format (0, "-b%c", 0);
+ vec_add1 (conf->eal_init_args, tmp);
+ tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
+ vec_add1 (conf->eal_init_args, tmp);
+}
}));
/* *INDENT-ON* */
diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
index 3d83a1336..b0d0c8664 100644
--- a/src/vpp/conf/startup.conf
+++ b/src/vpp/conf/startup.conf
@@ -105,6 +105,11 @@ cpu {
## Default is off
## To enable TSO, 'enable-tcp-udp-checksum' must be set
# tso on
+
+ ## Devargs
+## device specific init args
+## Default is NULL
+ # devargs safe-mode-support=1,pipeline-mode-support=1
# }
## Whitelist specific interface by specifying PCI address
--
2.17.1
Re: [dpdk-dev] [PATCH] net/mlx5: fix eagain on admin down
Hi, Mike
In the mlx5_link_update_unlocked_gs() the dev_link.link_speed is set like this:
dev_link.link_speed = (ecmd->speed == UINT32_MAX) ? ETH_SPEED_NUM_NONE :
ecmd->speed;
So, dev_link.link_speed can't be assigned with -1. Do I misunderstand you
commit message?
With best regards, Slava
> -Original Message-
> From: Thomas Monjalon
> Sent: Friday, December 13, 2019 0:31
> To: dev@dpdk.org
> Cc: Mike Manning ; Nélio Laranjeiro
> ; Matan Azrad ; Slava
> Ovsiienko ; Shahaf Shuler
> ; Raslan Darawsheh
> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: fix eagain on admin down
>
> +Cc maintainers
>
> 09/12/2019 19:23, Mike Manning:
> > The check in mlx5_link_update_unlocked_gs() returns -EAGAIN if link
> > status does not correspond to link speed. If status is DOWN, the speed
> > is expected to be ETH_SPEED_NUM_NONE (0). But as the link speed is -1
> > on admin down, modify the check to account for this.
> >
> > Fixes: cfee94752b8f ("net/mlx5: fix link status to use wait to
> > complete")
> > Cc: Nélio Laranjeiro
> >
> > Signed-off-by: Mike Manning
> > ---
> > drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> > b/drivers/net/mlx5/mlx5_ethdev.c index d80ae458b..6ef2dfd74 100644
> > --- a/drivers/net/mlx5/mlx5_ethdev.c
> > +++ b/drivers/net/mlx5/mlx5_ethdev.c
> > @@ -1031,8 +1031,8 @@ mlx5_link_update_unlocked_gs(struct
> rte_eth_dev *dev,
> > ETH_LINK_HALF_DUPLEX :
> ETH_LINK_FULL_DUPLEX);
> > dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
> > ETH_LINK_SPEED_FIXED);
> > - if (((dev_link.link_speed && !dev_link.link_status) ||
> > -(!dev_link.link_speed && dev_link.link_status))) {
> > + if int)dev_link.link_speed > 0 && !dev_link.link_status) ||
> > +((int)dev_link.link_speed <= 0 && dev_link.link_status))) {
> > rte_errno = EAGAIN;
> > return -rte_errno;
> > }
> >
>
>
>
>
[dpdk-dev] [PATCH v2] net/virtio: add link speed tuning
Some applications like pktgen use link_speed to calculate transmit
rate. It limits outcome traffic to hardcoded 10G.
This patch makes link_speed configurable at compile time.
Signed-off-by: Ivan Dyukov
---
config/common_base | 1 +
config/meson.build | 1 +
drivers/net/vhost/rte_eth_vhost.c | 2 +-
drivers/net/virtio/virtio_ethdev.c | 20
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/config/common_base b/config/common_base
index 7dec7ed45..8589ca4ec 100644
--- a/config/common_base
+++ b/config/common_base
@@ -433,6 +433,7 @@ CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
# Compile burst-oriented VIRTIO PMD driver
#
CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
+CONFIG_RTE_LIBRTE_VIRTIO_LINK_SPEED=1
CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
diff --git a/config/meson.build b/config/meson.build
index 364a8d739..78c30f334 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -202,6 +202,7 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
+dpdk_conf.set('RTE_LIBRTE_VIRTIO_LINK_SPEED', 1)
compile_time_cpuflags = []
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 46f01a7f4..38eaa5955 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -115,7 +115,7 @@ static struct internal_list_head internal_list =
static pthread_mutex_t internal_list_lock = PTHREAD_MUTEX_INITIALIZER;
static struct rte_eth_link pmd_link = {
- .link_speed = 1,
+ .link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED,
.link_duplex = ETH_LINK_FULL_DUPLEX,
.link_status = ETH_LINK_DOWN
};
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index 044eb10a7..948091cc2 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -2371,7 +2371,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complet
memset(&link, 0, sizeof(link));
link.link_duplex = ETH_LINK_FULL_DUPLEX;
- link.link_speed = ETH_SPEED_NUM_10G;
+ link.link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED;
link.link_autoneg = ETH_LINK_FIXED;
if (!hw->started) {
@@ -2426,9 +2426,21 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
{
uint64_t tso_mask, host_features;
struct virtio_hw *hw = dev->data->dev_private;
-
- dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */
-
+#if RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_LINK_SPEED_20G
+ dev_info->speed_capa = ETH_LINK_SPEED_20G;
+#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_25G
+ dev_info->speed_capa = ETH_LINK_SPEED_25G;
+#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_40G
+ dev_info->speed_capa = ETH_LINK_SPEED_40G;
+#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_50G
+ dev_info->speed_capa = ETH_LINK_SPEED_50G;
+#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_56G
+ dev_info->speed_capa = ETH_LINK_SPEED_56G;
+#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_100G
+ dev_info->speed_capa = ETH_LINK_SPEED_100G;
+#else
+ dev_info->speed_capa = ETH_LINK_SPEED_10G;
+#endif
dev_info->max_rx_queues =
RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);
dev_info->max_tx_queues =
--
2.17.1
Re: [dpdk-dev] [FDIO] dpdk: add devargs support
> From: Chenmin Sun
>
> Type: feature
>
> This patch adds the devargs support for dpdk device
> The devargs are used as hardware-specific init args for dpdk devices
> please refer to the nic guides under
> $(DPDK_DIR)/doc/guides/nics/$(NIC_DRIVER).rst
>
> Signed-off-by: Chenmin Sun
> Change-Id: Id380d04720090bb66afe5ce09d664e5e248b8eb9
Isn't it patch for vpp?
If so wrong mailing list 😊
> ---
> src/plugins/dpdk/device/dpdk.h | 2 ++
> src/plugins/dpdk/device/format.c | 3 +++
> src/plugins/dpdk/device/init.c | 36 +---
> src/vpp/conf/startup.conf| 5 +
> 4 files changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h
> index d58d2daa7..ab28ac06a 100644
> --- a/src/plugins/dpdk/device/dpdk.h
> +++ b/src/plugins/dpdk/device/dpdk.h
> @@ -336,6 +336,8 @@ typedef struct
>u32 hqos_enabled;
>dpdk_device_config_hqos_t hqos;
>u8 tso;
> + u8 *devargs;
> +
> #define DPDK_DEVICE_TSO_DEFAULT 0
> #define DPDK_DEVICE_TSO_OFF 1
> #define DPDK_DEVICE_TSO_ON 2
> diff --git a/src/plugins/dpdk/device/format.c
> b/src/plugins/dpdk/device/format.c
> index 292c083fc..20493eb77 100644
> --- a/src/plugins/dpdk/device/format.c
> +++ b/src/plugins/dpdk/device/format.c
> @@ -564,6 +564,9 @@ format_dpdk_device (u8 * s, va_list * args)
> format_white_space, indent + 2, format_dpdk_link_status, xd);
>s = format (s, "%Uflags: %U\n",
> format_white_space, indent + 2, format_dpdk_device_flags, xd);
> + if (di.device->devargs && di.device->devargs->args)
> +s = format (s, "%UDevargs: %s\n",
> + format_white_space, indent + 2, di.device->devargs->args);
>s = format (s, "%Urx: queues %d (max %d), desc %d "
> "(min %d max %d align %d)\n",
> format_white_space, indent + 2, xd->rx_q_used, di.max_rx_queues,
> diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
> index 5a6262c30..d0125e939 100644
> --- a/src/plugins/dpdk/device/init.c
> +++ b/src/plugins/dpdk/device/init.c
> @@ -1118,6 +1118,8 @@ dpdk_device_config (dpdk_config_main_t * conf,
> vlib_pci_addr_t pci_addr,
> {
> devconf->tso = DPDK_DEVICE_TSO_OFF;
> }
> + else if (unformat (input, "devargs %s", &devconf->devargs))
> + ;
>else
> {
> error = clib_error_return (0, "unknown input `%U'",
> @@ -1428,21 +1430,31 @@ dpdk_config (vlib_main_t * vm, unformat_input_t *
> input)
> /* copy tso config from default device */
> _(tso)
>
> + /* copy tso config from default device */
> + _(devargs)
> +
> /* add DPDK EAL whitelist/blacklist entry */
> if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
> - {
> - tmp = format (0, "-w%c", 0);
> - vec_add1 (conf->eal_init_args, tmp);
> - tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
> - vec_add1 (conf->eal_init_args, tmp);
> - }
> +{
> + tmp = format (0, "-w%c", 0);
> + vec_add1 (conf->eal_init_args, tmp);
> + if (devconf->devargs)
> + {
> + tmp = format (0, "%U,%s", format_vlib_pci_addr, &devconf->pci_addr,
> devconf->devargs, 0);
> + }
> + else
> + {
> + tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr,
> 0);
> + }
> + vec_add1 (conf->eal_init_args, tmp);
> +}
> else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
> - {
> - tmp = format (0, "-b%c", 0);
> - vec_add1 (conf->eal_init_args, tmp);
> - tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
> - vec_add1 (conf->eal_init_args, tmp);
> - }
> +{
> + tmp = format (0, "-b%c", 0);
> + vec_add1 (conf->eal_init_args, tmp);
> + tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr, 0);
> + vec_add1 (conf->eal_init_args, tmp);
> +}
>}));
>/* *INDENT-ON* */
>
> diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
> index 3d83a1336..b0d0c8664 100644
> --- a/src/vpp/conf/startup.conf
> +++ b/src/vpp/conf/startup.conf
> @@ -105,6 +105,11 @@ cpu {
> ## Default is off
> ## To enable TSO, 'enable-tcp-udp-checksum' must be set
> # tso on
> +
> + ## Devargs
> +## device specific init args
> +## Default is NULL
> + # devargs safe-mode-support=1,pipeline-mode-support=1
> # }
>
> ## Whitelist specific interface by specifying PCI address
> --
> 2.17.1
Re: [dpdk-dev] [FDIO] dpdk: add devargs support
O I'm sorry...
Best Regards,
Sun, Chenmin
-Original Message-
From: Ananyev, Konstantin
Sent: Friday, December 13, 2019 10:51 PM
To: Sun, Chenmin ; dev@dpdk.org
Subject: RE: [dpdk-dev] [FDIO] dpdk: add devargs support
> From: Chenmin Sun
>
> Type: feature
>
> This patch adds the devargs support for dpdk device The devargs are
> used as hardware-specific init args for dpdk devices please refer to
> the nic guides under $(DPDK_DIR)/doc/guides/nics/$(NIC_DRIVER).rst
>
> Signed-off-by: Chenmin Sun
> Change-Id: Id380d04720090bb66afe5ce09d664e5e248b8eb9
Isn't it patch for vpp?
If so wrong mailing list 😊
> ---
> src/plugins/dpdk/device/dpdk.h | 2 ++
> src/plugins/dpdk/device/format.c | 3 +++
> src/plugins/dpdk/device/init.c | 36 +---
> src/vpp/conf/startup.conf| 5 +
> 4 files changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/src/plugins/dpdk/device/dpdk.h
> b/src/plugins/dpdk/device/dpdk.h index d58d2daa7..ab28ac06a 100644
> --- a/src/plugins/dpdk/device/dpdk.h
> +++ b/src/plugins/dpdk/device/dpdk.h
> @@ -336,6 +336,8 @@ typedef struct
>u32 hqos_enabled;
>dpdk_device_config_hqos_t hqos;
>u8 tso;
> + u8 *devargs;
> +
> #define DPDK_DEVICE_TSO_DEFAULT 0
> #define DPDK_DEVICE_TSO_OFF 1
> #define DPDK_DEVICE_TSO_ON 2
> diff --git a/src/plugins/dpdk/device/format.c
> b/src/plugins/dpdk/device/format.c
> index 292c083fc..20493eb77 100644
> --- a/src/plugins/dpdk/device/format.c
> +++ b/src/plugins/dpdk/device/format.c
> @@ -564,6 +564,9 @@ format_dpdk_device (u8 * s, va_list * args)
>format_white_space, indent + 2, format_dpdk_link_status, xd);
>s = format (s, "%Uflags: %U\n",
>format_white_space, indent + 2, format_dpdk_device_flags, xd);
> + if (di.device->devargs && di.device->devargs->args)
> +s = format (s, "%UDevargs: %s\n", format_white_space, indent + 2,
> +di.device->devargs->args);
>s = format (s, "%Urx: queues %d (max %d), desc %d "
>"(min %d max %d align %d)\n",
>format_white_space, indent + 2, xd->rx_q_used,
> di.max_rx_queues, diff --git a/src/plugins/dpdk/device/init.c
> b/src/plugins/dpdk/device/init.c index 5a6262c30..d0125e939 100644
> --- a/src/plugins/dpdk/device/init.c
> +++ b/src/plugins/dpdk/device/init.c
> @@ -1118,6 +1118,8 @@ dpdk_device_config (dpdk_config_main_t * conf,
> vlib_pci_addr_t pci_addr, {
>devconf->tso = DPDK_DEVICE_TSO_OFF; }
> + else if (unformat (input, "devargs %s", &devconf->devargs)) ;
>else
> {
>error = clib_error_return (0, "unknown input `%U'", @@ -1428,21
> +1430,31 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
> /* copy tso config from default device */
> _(tso)
>
> +/* copy tso config from default device */
> +_(devargs)
> +
> /* add DPDK EAL whitelist/blacklist entry */
> if (num_whitelisted > 0 && devconf->is_blacklisted == 0)
> - {
> -tmp = format (0, "-w%c", 0);
> -vec_add1 (conf->eal_init_args, tmp);
> -tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr,
> 0);
> -vec_add1 (conf->eal_init_args, tmp);
> - }
> +{
> + tmp = format (0, "-w%c", 0);
> + vec_add1 (conf->eal_init_args, tmp); if (devconf->devargs) {
> +tmp = format (0, "%U,%s", format_vlib_pci_addr,
> + &devconf->pci_addr, devconf->devargs, 0); } else {
> +tmp = format (0, "%U%c", format_vlib_pci_addr,
> + &devconf->pci_addr, 0); }
> + vec_add1 (conf->eal_init_args, tmp);
> +}
> else if (num_whitelisted == 0 && devconf->is_blacklisted != 0)
> - {
> -tmp = format (0, "-b%c", 0);
> -vec_add1 (conf->eal_init_args, tmp);
> -tmp = format (0, "%U%c", format_vlib_pci_addr, &devconf->pci_addr,
> 0);
> -vec_add1 (conf->eal_init_args, tmp);
> - }
> +{
> + tmp = format (0, "-b%c", 0);
> + vec_add1 (conf->eal_init_args, tmp); tmp = format (0, "%U%c",
> + format_vlib_pci_addr, &devconf->pci_addr, 0);
> + vec_add1 (conf->eal_init_args, tmp);
> +}
>}));
>/* *INDENT-ON* */
>
> diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf
> index 3d83a1336..b0d0c8664 100644
> --- a/src/vpp/conf/startup.conf
> +++ b/src/vpp/conf/startup.conf
> @@ -105,6 +105,11 @@ cpu {
> ## Default is off
> ## To enable TSO, 'enable-tcp-udp-checksum' must be set # tso on
> +
> +## Devargs
> +## device specific init args
> +## Default is NULL
> +# devargs safe-mode-support=1,pipeline-mode-support=1
> # }
>
> ## Whitelist specific interface by specifying PCI address
> --
> 2.17.1
Re: [dpdk-dev] [PATCH v2] net/virtio: add link speed tuning
Hi Ivan,
On 12/13/19 3:44 PM, Ivan Dyukov wrote:
> Some applications like pktgen use link_speed to calculate transmit
> rate. It limits outcome traffic to hardcoded 10G.
>
> This patch makes link_speed configurable at compile time.
>
> Signed-off-by: Ivan Dyukov
> ---
> config/common_base | 1 +
> config/meson.build | 1 +
> drivers/net/vhost/rte_eth_vhost.c | 2 +-
> drivers/net/virtio/virtio_ethdev.c | 20
> 4 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/config/common_base b/config/common_base
> index 7dec7ed45..8589ca4ec 100644
> --- a/config/common_base
> +++ b/config/common_base
> @@ -433,6 +433,7 @@ CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
> # Compile burst-oriented VIRTIO PMD driver
> #
> CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
> +CONFIG_RTE_LIBRTE_VIRTIO_LINK_SPEED=1
> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
> diff --git a/config/meson.build b/config/meson.build
> index 364a8d739..78c30f334 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -202,6 +202,7 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET',
> get_option('use_hpet'))
> dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
> dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
> dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
> +dpdk_conf.set('RTE_LIBRTE_VIRTIO_LINK_SPEED', 1)
>
>
> compile_time_cpuflags = []
> diff --git a/drivers/net/vhost/rte_eth_vhost.c
> b/drivers/net/vhost/rte_eth_vhost.c
> index 46f01a7f4..38eaa5955 100644
> --- a/drivers/net/vhost/rte_eth_vhost.c
> +++ b/drivers/net/vhost/rte_eth_vhost.c
> @@ -115,7 +115,7 @@ static struct internal_list_head internal_list =
> static pthread_mutex_t internal_list_lock = PTHREAD_MUTEX_INITIALIZER;
>
> static struct rte_eth_link pmd_link = {
> - .link_speed = 1,
> + .link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED,
> .link_duplex = ETH_LINK_FULL_DUPLEX,
> .link_status = ETH_LINK_DOWN
> };
> diff --git a/drivers/net/virtio/virtio_ethdev.c
> b/drivers/net/virtio/virtio_ethdev.c
> index 044eb10a7..948091cc2 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -2371,7 +2371,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
> __rte_unused int wait_to_complet
>
> memset(&link, 0, sizeof(link));
> link.link_duplex = ETH_LINK_FULL_DUPLEX;
> - link.link_speed = ETH_SPEED_NUM_10G;
> + link.link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED;
> link.link_autoneg = ETH_LINK_FIXED;
>
> if (!hw->started) {
> @@ -2426,9 +2426,21 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct
> rte_eth_dev_info *dev_info)
> {
> uint64_t tso_mask, host_features;
> struct virtio_hw *hw = dev->data->dev_private;
> -
> - dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */
> -
> +#if RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_LINK_SPEED_20G
> + dev_info->speed_capa = ETH_LINK_SPEED_20G;
> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_25G
> + dev_info->speed_capa = ETH_LINK_SPEED_25G;
> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_40G
> + dev_info->speed_capa = ETH_LINK_SPEED_40G;
> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_50G
> + dev_info->speed_capa = ETH_LINK_SPEED_50G;
> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_56G
> + dev_info->speed_capa = ETH_LINK_SPEED_56G;
> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_100G
> + dev_info->speed_capa = ETH_LINK_SPEED_100G;
> +#else
> + dev_info->speed_capa = ETH_LINK_SPEED_10G;
> +#endif
> dev_info->max_rx_queues =
> RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);
> dev_info->max_tx_queues =
>
I think we may need toi extend the Virtio specification so that the
device can advertise the link speed.
Problem with your proposal is that it is build time only, so:
1. It won't be configurable when using distros DPDK package.
2. All the Virtio devices on a system will have the same value
While any Virtio spec update introduce link speed support, wouldn't it
be preferable to have this as a devarg?
Thanks,
Maxime
Re: [dpdk-dev] [PATCH] net/mlx5: fix eagain on admin down
Hi Slava,
Thanks, you are right - I retract my patch, as this was fixed in v19.08
by 6fd05da9efbd ("net/mlx5: fix link speed info when link is down") as
per the line you indicate.
I should explain that we are using Debian 10 which uses v18.11, here we
had a painful issue with the combination of this -EAGAIN and use of
netlink to obtain the ifindex resulting in concurrent use of the netlink
socket causing the calling thread to block indefinitely.
Regards
Mike
On 13/12/2019 14:43, Slava Ovsiienko wrote:
> Hi, Mike
>
> In the mlx5_link_update_unlocked_gs() the dev_link.link_speed is set like
> this:
>
> dev_link.link_speed = (ecmd->speed == UINT32_MAX) ? ETH_SPEED_NUM_NONE :
> ecmd->speed;
>
> So, dev_link.link_speed can't be assigned with -1. Do I misunderstand you
> commit message?
>
> With best regards, Slava
>
>> -Original Message-
>> From: Thomas Monjalon
>> Sent: Friday, December 13, 2019 0:31
>> To: dev@dpdk.org
>> Cc: Mike Manning ; Nélio Laranjeiro
>> ; Matan Azrad ; Slava
>> Ovsiienko ; Shahaf Shuler
>> ; Raslan Darawsheh
>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: fix eagain on admin down
>>
>> +Cc maintainers
>>
>> 09/12/2019 19:23, Mike Manning:
>>> The check in mlx5_link_update_unlocked_gs() returns -EAGAIN if link
>>> status does not correspond to link speed. If status is DOWN, the speed
>>> is expected to be ETH_SPEED_NUM_NONE (0). But as the link speed is -1
>>> on admin down, modify the check to account for this.
>>>
>>> Fixes: cfee94752b8f ("net/mlx5: fix link status to use wait to
>>> complete")
>>> Cc: Nélio Laranjeiro
>>>
>>> Signed-off-by: Mike Manning
>>> ---
>>> drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/net/mlx5/mlx5_ethdev.c
>>> b/drivers/net/mlx5/mlx5_ethdev.c index d80ae458b..6ef2dfd74 100644
>>> --- a/drivers/net/mlx5/mlx5_ethdev.c
>>> +++ b/drivers/net/mlx5/mlx5_ethdev.c
>>> @@ -1031,8 +1031,8 @@ mlx5_link_update_unlocked_gs(struct
>> rte_eth_dev *dev,
>>> ETH_LINK_HALF_DUPLEX :
>> ETH_LINK_FULL_DUPLEX);
>>> dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
>>> ETH_LINK_SPEED_FIXED);
>>> - if (((dev_link.link_speed && !dev_link.link_status) ||
>>> -(!dev_link.link_speed && dev_link.link_status))) {
>>> + if int)dev_link.link_speed > 0 && !dev_link.link_status) ||
>>> +((int)dev_link.link_speed <= 0 && dev_link.link_status))) {
>>> rte_errno = EAGAIN;
>>> return -rte_errno;
>>> }
>>>
>>
>>
>>
[dpdk-dev] [PATCH v3 0/4] Refactor crypto unit tests.
This patch set is a first step to refactor the overly complex symmetric
crypto unit tests. It merges many separate arrays of the tests
for these PMDs: null, aesni_mb, aesni_gcm, openssl, qat, sw_snow3g,
sw_kasumi, sw_zuc into one big array that's then used when running
unit tests on these PMDs.
Individual test functions check the capabilities and execute the rest
of the test or skip (return -ENOTSUP) based on the particular test
requirements - e.g. test if PMD supports ZUC algo or even a particular
key length in few cases. Few edge cases required to check the PMD
itself (e.g. run on QAT only, or skip on AES NI / AES GCM).
It's the first step of bigger refactoring. Maintainers of other PMDs
are encouraged to add their PMD unit tests also into this big central
array and remove individual test macro arrays.
This patch doesn't address next refactoring steps to be done in the
future: geting rid of many small (usually 1-2 line) test functions,
created separately for every test case; and simplifying many bigger
functions that currently do similar things but work on different
test vector structures.
NOTICE: This patch set depends on the series
http://patches.dpdk.org/project/dpdk/list/?series=7792
that must be applied first.
A simple script to check if symmetric crypto unit tests work properly
on multiple PMDs at once, update the PMDs list to your needs:
for PMD in null aesni_mb aesni_gcm openssl qat scheduler sw_snow3g sw_kasumi
sw_zuc
do
echo + $PMD +
echo cryptodev_${PMD}_autotest | build/app/test -c7 -n1 --log-level=7 |
grep ' Tests [Failed|Passed]'
done
---
v2:
* Update the cover letter, regenerate the patch file.
v3:
* Break very large commit into four smaller commits, easier to review.
* Show in the cover letter how to run unit tests on multiple PMDs at once.
Adam Dybkowski (4):
test/crypto: refactor unit tests
test/crypto: refactor unit tests - continuation
test/crypto: add capability checks
test/crypto: refactor unit tests into one combined array
app/test/test_cryptodev.c | 15891 +--
app/test/test_cryptodev_blockcipher.c | 2 +-
app/test/test_cryptodev_des_test_vectors.h | 6 +-
3 files changed, 7303 insertions(+), 8596 deletions(-)
--
2.17.1
[dpdk-dev] [PATCH v3 1/4] test/crypto: refactor unit tests
This patch gets rid of individual functions that all call
test_blockcipher_all_tests separately for every PMD and instead
provides just one set universal for all PMDs that's basing on the
driver id from the global variable gbl_driver_id.
Signed-off-by: Adam Dybkowski
---
app/test/test_cryptodev.c | 1125 -
1 file changed, 96 insertions(+), 1029 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 9c2b99200..494d3eaf6 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -1591,7 +1591,7 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct
rte_cryptodev_sym_session *sess,
}
static int
-test_AES_cipheronly_mb_all(void)
+test_blockcipher(enum blockcipher_test_type test_type)
{
struct crypto_testsuite_params *ts_params = &testsuite_params;
int status;
@@ -1600,755 +1600,11 @@ test_AES_cipheronly_mb_all(void)
ts_params->op_mpool,
ts_params->session_mpool, ts_params->session_priv_mpool,
ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
- BLKCIPHER_AES_CIPHERONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_AES_docsis_mb_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
- BLKCIPHER_AES_DOCSIS_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_AES_docsis_qat_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
- BLKCIPHER_AES_DOCSIS_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_DES_docsis_qat_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
- BLKCIPHER_DES_DOCSIS_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_authonly_mb_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
- BLKCIPHER_AUTHONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_authonly_qat_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
- BLKCIPHER_AUTHONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_AES_chain_null_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_NULL_PMD)),
- BLKCIPHER_AES_CHAIN_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_AES_cipheronly_null_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
-
[dpdk-dev] [PATCH v3 2/4] test/crypto: refactor unit tests - continuation
Remove the functions that are not used any more
but were left after the previous commit.
Signed-off-by: Adam Dybkowski
---
app/test/test_cryptodev.c | 323 --
1 file changed, 323 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 494d3eaf6..412a24e2f 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -1639,7 +1639,6 @@ static int
test_authonly_all(void)
{
return test_blockcipher(BLKCIPHER_AUTHONLY_TYPE);
-
}
static int
@@ -6405,328 +6404,6 @@ test_verify_auth_aes_cmac_cipher_null_test_case_1(void)
&auth_aes_cmac_cipher_null_test_case_1, OUT_OF_PLACE, 1);
}
-static int
-test_3DES_chain_qat_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
- BLKCIPHER_3DES_CHAIN_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_DES_cipheronly_qat_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
- BLKCIPHER_DES_CIPHERONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_DES_cipheronly_openssl_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
- BLKCIPHER_DES_CIPHERONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_DES_docsis_openssl_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
- BLKCIPHER_DES_DOCSIS_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_DES_cipheronly_mb_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
- BLKCIPHER_DES_CIPHERONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-static int
-test_3DES_cipheronly_mb_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
- BLKCIPHER_3DES_CIPHERONLY_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_DES_docsis_mb_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
- int status;
-
- status = test_blockcipher_all_tests(ts_params->mbuf_pool,
- ts_params->op_mpool,
- ts_params->session_mpool, ts_params->session_priv_mpool,
- ts_params->valid_devs[0],
- rte_cryptodev_driver_id_get(
- RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
- BLKCIPHER_DES_DOCSIS_TYPE);
-
- TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
- return TEST_SUCCESS;
-}
-
-static int
-test_3DES_chain_caam_jr_all(void)
-{
- struct crypto_testsuite_params *ts_params = &testsuite_params;
-
[dpdk-dev] [PATCH v3 4/4] test/crypto: refactor unit tests into one combined array
This patch refactors most of unit tests to be contained in one
combined array, and run depending on the PMD capabilities instead of
providing multiple array with tests for individual PMDs.
Only a subset of unit tests was merged into one array - it combines
all tests originally meant to be run on these PMDs:
null, aesni_mb, aesni_gcm, openssl, qat, sw_snow3g, sw_kasumi, sw_zuc.
Signed-off-by: Adam Dybkowski
---
app/test/test_cryptodev.c | 1121 +---
app/test/test_cryptodev_blockcipher.c |2 +-
app/test/test_cryptodev_des_test_vectors.h |6 +-
3 files changed, 239 insertions(+), 890 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 290df0b69..aa57a4efe 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -6041,11 +6041,9 @@ test_mixed_auth_cipher(const struct
mixed_cipher_auth_test_data *tdata,
uint64_t feat_flags = dev_info.feature_flags;
- if (op_mode == OUT_OF_PLACE) {
- if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
- printf("Device doesn't support digest encrypted.\n");
- return -ENOTSUP;
- }
+ if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+ printf("Device doesn't support digest encrypted.\n");
+ return -ENOTSUP;
}
/* Create the session */
@@ -11550,8 +11548,8 @@ static struct unit_test_suite
cryptodev_scheduler_testsuite = {
#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
-static struct unit_test_suite cryptodev_qat_testsuite = {
- .suite_name = "Crypto QAT Unit Test Suite",
+static struct unit_test_suite cryptodev_testsuite = {
+ .suite_name = "Crypto Unit Test Suite",
.setup = testsuite_setup,
.teardown = testsuite_teardown,
.unit_test_cases = {
@@ -11561,8 +11559,15 @@ static struct unit_test_suite cryptodev_qat_testsuite
= {
test_device_configure_invalid_queue_pair_ids),
TEST_CASE_ST(ut_setup, ut_teardown,
test_queue_pair_descriptor_setup),
+
TEST_CASE_ST(ut_setup, ut_teardown,
test_multi_session),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_multi_session_random_usage),
+
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_null_invalid_operation),
+ TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
@@ -11590,9 +11595,43 @@ static struct unit_test_suite cryptodev_qat_testsuite
= {
TEST_CASE_ST(ut_setup, ut_teardown,
test_AES_CCM_authenticated_decryption_test_case_128_3),
+ /** AES CCM Authenticated Encryption 192 bits key */
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_encryption_test_case_192_1),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_encryption_test_case_192_2),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_encryption_test_case_192_3),
+
+ /** AES CCM Authenticated Decryption 192 bits key*/
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_decryption_test_case_192_1),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_decryption_test_case_192_2),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_decryption_test_case_192_3),
+
+ /** AES CCM Authenticated Encryption 256 bits key */
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_encryption_test_case_256_1),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_encryption_test_case_256_2),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_encryption_test_case_256_3),
+
+ /** AES CCM Authenticated Decryption 256 bits key*/
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_decryption_test_case_256_1),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_decryption_test_case_256_2),
+ TEST_CASE_ST(ut_setup, ut_teardown,
+ test_AES_CCM_authenticated_decryption_test_case_256_3),
+
/** AES GCM Authenticated Encryption */
TEST_CASE_ST(ut_setup, ut_teardown,
test_AES_GCM_auth_encrypt_SGL_in_place_150
[dpdk-dev] [PATCH v3 3/4] test/crypto: add capability checks
This patch adds capability checks to many tests meant to be run in the future on various PMDs. This way the code is prepared for more thorough refactoring in order to create one big central unit tests array. Signed-off-by: Adam Dybkowski --- app/test/test_cryptodev.c | 616 +- 1 file changed, 615 insertions(+), 1 deletion(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 412a24e2f..290df0b69 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -669,6 +669,13 @@ test_device_configure_invalid_queue_pair_ids(void) struct crypto_testsuite_params *ts_params = &testsuite_params; uint16_t orig_nb_qps = ts_params->conf.nb_queue_pairs; + /* This test is for QAT and NITROX PMDs only */ + if (gbl_driver_id != rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)) && + gbl_driver_id != rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_NITROX_PMD))) + return -ENOTSUP; + /* Stop the device in case it's started so it can be configured */ rte_cryptodev_stop(ts_params->valid_devs[0]); @@ -740,6 +747,11 @@ test_queue_pair_descriptor_setup(void) uint16_t qp_id; + /* This test is for QAT PMD only */ + if (gbl_driver_id != rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD))) + return -ENOTSUP; + /* Stop the device in case it's started so it can be configured */ rte_cryptodev_stop(ts_params->valid_devs[0]); @@ -1348,6 +1360,19 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void) struct crypto_testsuite_params *ts_params = &testsuite_params; struct crypto_unittest_params *ut_params = &unittest_params; + /* Verify the capabilities */ + struct rte_cryptodev_sym_capability_idx cap_idx; + cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH; + cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC; + if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], + &cap_idx) == NULL) + return -ENOTSUP; + cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER; + cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC; + if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], + &cap_idx) == NULL) + return -ENOTSUP; + /* Generate test mbuf data and space for digest */ ut_params->ibuf = setup_test_string(ts_params->mbuf_pool, catch_22_quote, QUOTE_512_BYTES, 0); @@ -2314,6 +2339,20 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata) unsigned plaintext_len; uint8_t *plaintext; + /* QAT PMD supports byte-aligned data only */ + if ((tdata->validAuthLenInBits.len % 8 != 0) && + (gbl_driver_id == rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD + return -ENOTSUP; + + /* Verify the capabilities */ + struct rte_cryptodev_sym_capability_idx cap_idx; + cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH; + cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2; + if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], + &cap_idx) == NULL) + return -ENOTSUP; + /* Create SNOW 3G session */ retval = create_wireless_algo_hash_session(ts_params->valid_devs[0], tdata->key.data, tdata->key.len, @@ -2374,6 +2413,20 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata) unsigned plaintext_len; uint8_t *plaintext; + /* QAT PMD supports byte-aligned data only */ + if ((tdata->validAuthLenInBits.len % 8 != 0) && + (gbl_driver_id == rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD + return -ENOTSUP; + + /* Verify the capabilities */ + struct rte_cryptodev_sym_capability_idx cap_idx; + cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH; + cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2; + if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], + &cap_idx) == NULL) + return -ENOTSUP; + /* Create SNOW 3G session */ retval = create_wireless_algo_hash_session(ts_params->valid_devs[0], tdata->key.data, tdata->key.len, @@ -2434,6 +2487,14 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata) unsigned plaintext_len; uint8_t *plaintext; + /* Verify the capabilities */ + struct rte_cryptodev_sym_capability_idx cap_idx; + cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH; + cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9; + if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0], +
Re: [dpdk-dev] [PATCH v2] net/virtio: add link speed tuning
On Fri, 13 Dec 2019 15:59:23 +0100
Maxime Coquelin wrote:
> Hi Ivan,
>
> On 12/13/19 3:44 PM, Ivan Dyukov wrote:
> > Some applications like pktgen use link_speed to calculate transmit
> > rate. It limits outcome traffic to hardcoded 10G.
> >
> > This patch makes link_speed configurable at compile time.
> >
> > Signed-off-by: Ivan Dyukov
> > ---
> > config/common_base | 1 +
> > config/meson.build | 1 +
> > drivers/net/vhost/rte_eth_vhost.c | 2 +-
> > drivers/net/virtio/virtio_ethdev.c | 20
> > 4 files changed, 19 insertions(+), 5 deletions(-)
> >
> > diff --git a/config/common_base b/config/common_base
> > index 7dec7ed45..8589ca4ec 100644
> > --- a/config/common_base
> > +++ b/config/common_base
> > @@ -433,6 +433,7 @@ CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
> > # Compile burst-oriented VIRTIO PMD driver
> > #
> > CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
> > +CONFIG_RTE_LIBRTE_VIRTIO_LINK_SPEED=1
> > CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
> > CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
> > CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
> > diff --git a/config/meson.build b/config/meson.build
> > index 364a8d739..78c30f334 100644
> > --- a/config/meson.build
> > +++ b/config/meson.build
> > @@ -202,6 +202,7 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET',
> > get_option('use_hpet'))
> > dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
> > dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
> > dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
> > +dpdk_conf.set('RTE_LIBRTE_VIRTIO_LINK_SPEED', 1)
> >
> >
> > compile_time_cpuflags = []
> > diff --git a/drivers/net/vhost/rte_eth_vhost.c
> > b/drivers/net/vhost/rte_eth_vhost.c
> > index 46f01a7f4..38eaa5955 100644
> > --- a/drivers/net/vhost/rte_eth_vhost.c
> > +++ b/drivers/net/vhost/rte_eth_vhost.c
> > @@ -115,7 +115,7 @@ static struct internal_list_head internal_list =
> > static pthread_mutex_t internal_list_lock = PTHREAD_MUTEX_INITIALIZER;
> >
> > static struct rte_eth_link pmd_link = {
> > - .link_speed = 1,
> > + .link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED,
> > .link_duplex = ETH_LINK_FULL_DUPLEX,
> > .link_status = ETH_LINK_DOWN
> > };
> > diff --git a/drivers/net/virtio/virtio_ethdev.c
> > b/drivers/net/virtio/virtio_ethdev.c
> > index 044eb10a7..948091cc2 100644
> > --- a/drivers/net/virtio/virtio_ethdev.c
> > +++ b/drivers/net/virtio/virtio_ethdev.c
> > @@ -2371,7 +2371,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
> > __rte_unused int wait_to_complet
> >
> > memset(&link, 0, sizeof(link));
> > link.link_duplex = ETH_LINK_FULL_DUPLEX;
> > - link.link_speed = ETH_SPEED_NUM_10G;
> > + link.link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED;
> > link.link_autoneg = ETH_LINK_FIXED;
> >
> > if (!hw->started) {
> > @@ -2426,9 +2426,21 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct
> > rte_eth_dev_info *dev_info)
> > {
> > uint64_t tso_mask, host_features;
> > struct virtio_hw *hw = dev->data->dev_private;
> > -
> > - dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */
> > -
> > +#if RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_LINK_SPEED_20G
> > + dev_info->speed_capa = ETH_LINK_SPEED_20G;
> > +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_25G
> > + dev_info->speed_capa = ETH_LINK_SPEED_25G;
> > +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_40G
> > + dev_info->speed_capa = ETH_LINK_SPEED_40G;
> > +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_50G
> > + dev_info->speed_capa = ETH_LINK_SPEED_50G;
> > +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_56G
> > + dev_info->speed_capa = ETH_LINK_SPEED_56G;
> > +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_100G
> > + dev_info->speed_capa = ETH_LINK_SPEED_100G;
> > +#else
> > + dev_info->speed_capa = ETH_LINK_SPEED_10G;
> > +#endif
> > dev_info->max_rx_queues =
> > RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);
> > dev_info->max_tx_queues =
> >
>
> I think we may need toi extend the Virtio specification so that the
> device can advertise the link speed.
>
> Problem with your proposal is that it is build time only, so:
> 1. It won't be configurable when using distros DPDK package.
> 2. All the Virtio devices on a system will have the same value
>
> While any Virtio spec update introduce link speed support, wouldn't it
> be preferable to have this as a devarg?
>
> Thanks,
> Maxime
>
Why does link speed matter at all?
If some code is looking at link speed to compute values like QoS then
it will be broken based on how virtualized NIC's work (bytes are free).
It all seems just like a workaround for broke legacy code or
advertising.
Re: [dpdk-dev] [PATCH v2] net/virtio: add link speed tuning
On 12/13/19 5:26 PM, Stephen Hemminger wrote:
> On Fri, 13 Dec 2019 15:59:23 +0100
> Maxime Coquelin wrote:
>
>> Hi Ivan,
>>
>> On 12/13/19 3:44 PM, Ivan Dyukov wrote:
>>> Some applications like pktgen use link_speed to calculate transmit
>>> rate. It limits outcome traffic to hardcoded 10G.
>>>
>>> This patch makes link_speed configurable at compile time.
>>>
>>> Signed-off-by: Ivan Dyukov
>>> ---
>>> config/common_base | 1 +
>>> config/meson.build | 1 +
>>> drivers/net/vhost/rte_eth_vhost.c | 2 +-
>>> drivers/net/virtio/virtio_ethdev.c | 20
>>> 4 files changed, 19 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/config/common_base b/config/common_base
>>> index 7dec7ed45..8589ca4ec 100644
>>> --- a/config/common_base
>>> +++ b/config/common_base
>>> @@ -433,6 +433,7 @@ CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
>>> # Compile burst-oriented VIRTIO PMD driver
>>> #
>>> CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
>>> +CONFIG_RTE_LIBRTE_VIRTIO_LINK_SPEED=1
>>> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
>>> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
>>> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
>>> diff --git a/config/meson.build b/config/meson.build
>>> index 364a8d739..78c30f334 100644
>>> --- a/config/meson.build
>>> +++ b/config/meson.build
>>> @@ -202,6 +202,7 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET',
>>> get_option('use_hpet'))
>>> dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
>>> dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
>>> dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
>>> +dpdk_conf.set('RTE_LIBRTE_VIRTIO_LINK_SPEED', 1)
>>>
>>>
>>> compile_time_cpuflags = []
>>> diff --git a/drivers/net/vhost/rte_eth_vhost.c
>>> b/drivers/net/vhost/rte_eth_vhost.c
>>> index 46f01a7f4..38eaa5955 100644
>>> --- a/drivers/net/vhost/rte_eth_vhost.c
>>> +++ b/drivers/net/vhost/rte_eth_vhost.c
>>> @@ -115,7 +115,7 @@ static struct internal_list_head internal_list =
>>> static pthread_mutex_t internal_list_lock = PTHREAD_MUTEX_INITIALIZER;
>>>
>>> static struct rte_eth_link pmd_link = {
>>> - .link_speed = 1,
>>> + .link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED,
>>> .link_duplex = ETH_LINK_FULL_DUPLEX,
>>> .link_status = ETH_LINK_DOWN
>>> };
>>> diff --git a/drivers/net/virtio/virtio_ethdev.c
>>> b/drivers/net/virtio/virtio_ethdev.c
>>> index 044eb10a7..948091cc2 100644
>>> --- a/drivers/net/virtio/virtio_ethdev.c
>>> +++ b/drivers/net/virtio/virtio_ethdev.c
>>> @@ -2371,7 +2371,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
>>> __rte_unused int wait_to_complet
>>>
>>> memset(&link, 0, sizeof(link));
>>> link.link_duplex = ETH_LINK_FULL_DUPLEX;
>>> - link.link_speed = ETH_SPEED_NUM_10G;
>>> + link.link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED;
>>> link.link_autoneg = ETH_LINK_FIXED;
>>>
>>> if (!hw->started) {
>>> @@ -2426,9 +2426,21 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct
>>> rte_eth_dev_info *dev_info)
>>> {
>>> uint64_t tso_mask, host_features;
>>> struct virtio_hw *hw = dev->data->dev_private;
>>> -
>>> - dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */
>>> -
>>> +#if RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_LINK_SPEED_20G
>>> + dev_info->speed_capa = ETH_LINK_SPEED_20G;
>>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_25G
>>> + dev_info->speed_capa = ETH_LINK_SPEED_25G;
>>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_40G
>>> + dev_info->speed_capa = ETH_LINK_SPEED_40G;
>>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_50G
>>> + dev_info->speed_capa = ETH_LINK_SPEED_50G;
>>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_56G
>>> + dev_info->speed_capa = ETH_LINK_SPEED_56G;
>>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_100G
>>> + dev_info->speed_capa = ETH_LINK_SPEED_100G;
>>> +#else
>>> + dev_info->speed_capa = ETH_LINK_SPEED_10G;
>>> +#endif
>>> dev_info->max_rx_queues =
>>> RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);
>>> dev_info->max_tx_queues =
>>>
>>
>> I think we may need toi extend the Virtio specification so that the
>> device can advertise the link speed.
>>
>> Problem with your proposal is that it is build time only, so:
>> 1. It won't be configurable when using distros DPDK package.
>> 2. All the Virtio devices on a system will have the same value
>>
>> While any Virtio spec update introduce link speed support, wouldn't it
>> be preferable to have this as a devarg?
>>
>> Thanks,
>> Maxime
>>
>
> Why does link speed matter at all?
> If some code is looking at link speed to compute values like QoS then
> it will be broken based on how virtualized NIC's work (bytes are free).
>
> It all seems just like a workaround for broke legacy code or
> advertising.
>
In Ivan's case, I agree it should not matter, we could just default to
the maximum.
I was thinking about vDPA devices, where I think it could make sense to
report the HW link speed.
Re: [dpdk-dev] [PATCH 1/2] net/ena: upgrade HAL for new HW features
On Fri, 13 Dec 2019 14:32:15 +0100 Michal Krawczyk wrote: > This version of the HAL allows to use the latest HW features, like > rx offsets. > > Driver was adjusted to the new version to fix the build. > > Signed-off-by: Michal Krawczyk > Signed-off-by: Maciej Bielski You are mixing multiple changes into one patch. This makes it harder to review (find the real bits) and also harder for bisection. It makes sense to fix whitespace and related stuff in one patch if you are fixing one function and the nearby code already needed work. But please avoid larger scale change put together. In your patch I see: - remove unnecessary whitespace - drop unnecessary inline - add missing newline in log messages - check for NULL pointer If possible could you preserve the per-commit updates for base code, rather than one lump diff.
[dpdk-dev] [PATCH v6 00/11] Add ABI compatibility checks to the meson build
With the recent changes made to stabilize ABI versioning in DPDK, it will become increasingly important to check patches for ABI compatibility. We propose adding the ABI compatibility checking to be done as part of the build. The advantages to adding the ABI compatibility checking to the build are two-fold. Firstly, developers can easily check their patches to make sure they don’t break the ABI without adding any extra steps. Secondly, it makes the integration into existing CI seamless since there are no extra scripts to make the CI run. The build will run as usual and if an incompatibility is detected in the ABI, the build will fail and show the incompatibility. As an added bonus, enabling the ABI compatibility checks does not impact the build speed. The proposed solution works as follows: 1. Generate the ABI dump of the baseline. This can be done with the new script added in this set. This step will only need to be done when the ABI version changes (so once a year) and can be added to master so it exists by default. This step can be skipped if the dump files for the baseline already exist. 2. Build with meson. If there is an ABI incompatibility, the build will fail and print the incompatibility information. The patches in this set include the ABI dump file generating script, the dump files for drivers and libs, the meson option required to enable/disable the checks, and the required meson changes to run the compatibility checks during the build. Note: This patch set depends on: http://patches.dpdk.org/patch/63765/. The generated .dump files in this patch set are based on the changes in the patch "build: fix soname info for 19.11 compatibility". If a decision is made to use a different format for the sonames, then a new version of this patch set will be required as the .dump files will need to be regenerated. Note: The following driver dump files are not included in these patches: common/mvep:missing dependency, "libmusdk" net/mvneta: missing dependency, "libmusdk" net/mvpp2: missing dependency, "libmusdk" net/nfb:missing dependency, "libnfb" crypto/mvsam: missing dependency, "libmusdk" They have not been included as I do not have access to these dependencies. Please feel free to add them if you can! (Maintainers of the above Cc'ed). --- v2: - Rebased on master for 19.11. - Moved the experimental syms checks next to the abi checks. This also removed the dependency on the experimental checks from the shared build. - General cleanup. v3: - Fixed typo in meson option name in buildtools/meson.build. v4: - removed commits 1 and 2 from the patch set since they are not needed as part of this change - squash commits 3,4,5,6 into a single commit - changes meson option from type boolean to feature - update travis packages - move check for windows to earlier in build - add abignore file to suppress experimental functions - make the directories we store dump files in hidden - add .dump files for v20.0 ABI to patch set v5: - added more drivers' dump files - removed travis build with abi checks until the issues are resolved. v6: - split up patch with dump files as it was too big for the ML Kevin Laatz (11): lib: add dump files for v20.0 ABI drivers/bus: add dump files for v20.0 ABI drivers/mempool: add dump files for v20.0 ABI drivers/common: add dump files for v20.0 ABI drivers/raw: add dump files for v20.0 ABI drivers/crypto: add dump files for v20.0 ABI drivers/compress: add dump files for v20.0 ABI drivers/net: add dump files for v20.0 ABI drivers/net/intel: add dump files for v20.0 ABI build: add abi checks to meson build: clean up experimental syms check buildtools/dpdk.abignore |2 + buildtools/meson.build|3 + config/meson.build| 10 + devtools/gen-abi-dump.sh | 24 + drivers/.abi/librte_bus_dpaa.dump | 5303 ++ drivers/.abi/librte_bus_fslmc.dump| 5084 + drivers/.abi/librte_bus_ifpga.dump| 972 +++ drivers/.abi/librte_bus_pci.dump | 834 +++ drivers/.abi/librte_bus_vdev.dump | 408 ++ drivers/.abi/librte_bus_vmbus.dump| 918 +++ drivers/.abi/librte_common_cpt.dump | 36 + drivers/.abi/librte_common_dpaax.dump | 177 + drivers/.abi/librte_common_octeontx.dump | 77 + drivers/.abi/librte_common_octeontx2.dump | 988 +++ drivers/.abi/librte_mempool_bucket.dump | 15 + drivers/.abi/librte_mempool_dpaa.dump | 323 + drivers/.abi/librte_mempool_dpaa2.dump| 484 ++ drivers/.abi/librte_mempool_octeontx.dump | 22 + drivers/.abi/librte_mempool_octeontx2.dump| 643 ++ drivers/.abi/librte_mempool_ring.dump | 15 + drivers/.abi/librte_mempool_stack.dump| 16 + drivers/.abi/lib
[dpdk-dev] [PATCH v6 03/11] drivers/mempool: add dump files for v20.0 ABI
This patch adds the drivers/mempool .dump files generated for the v20.0 ABI. These files will be used to compare the ABI during the meson build when the compat_checks meson is enabled. If there is a mismatch between the .dump files (the baseline, ie. current stable ABI version) and the code being compiled, then abidiff will report an error and the build will fail. The .dump files are stored in the drivers/.abi directory. The directory is hidden to reduce clutter and also to discourage changing these files since they should not be modified. Signed-off-by: Kevin Laatz --- drivers/.abi/librte_mempool_bucket.dump| 15 + drivers/.abi/librte_mempool_dpaa.dump | 323 +++ drivers/.abi/librte_mempool_dpaa2.dump | 484 drivers/.abi/librte_mempool_octeontx.dump | 22 + drivers/.abi/librte_mempool_octeontx2.dump | 643 + drivers/.abi/librte_mempool_ring.dump | 15 + drivers/.abi/librte_mempool_stack.dump | 16 + 7 files changed, 1518 insertions(+) create mode 100644 drivers/.abi/librte_mempool_bucket.dump create mode 100644 drivers/.abi/librte_mempool_dpaa.dump create mode 100644 drivers/.abi/librte_mempool_dpaa2.dump create mode 100644 drivers/.abi/librte_mempool_octeontx.dump create mode 100644 drivers/.abi/librte_mempool_octeontx2.dump create mode 100644 drivers/.abi/librte_mempool_ring.dump create mode 100644 drivers/.abi/librte_mempool_stack.dump diff --git a/drivers/.abi/librte_mempool_bucket.dump b/drivers/.abi/librte_mempool_bucket.dump new file mode 100644 index 0..548256ae7 --- /dev/null +++ b/drivers/.abi/librte_mempool_bucket.dump @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_mempool_dpaa.dump b/drivers/.abi/librte_mempool_dpaa.dump new file mode 100644 index 0..3bdbc43ac --- /dev/null +++ b/drivers/.abi/librte_mempool_dpaa.dump @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_mempool_dpaa2.dump b/drivers/.abi/librte_mempool_dpaa2.dump new file mode 100644 index 0..bbe54f731 --- /dev/null +++ b/drivers/.abi/librte_mempool_dpaa2.dump @@ -0,0 +1,484 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[dpdk-dev] [PATCH v6 04/11] drivers/common: add dump files for v20.0 ABI
This patch adds the drivers/common .dump files generated for the v20.0 ABI. These files will be used to compare the ABI during the meson build when the compat_checks meson is enabled. If there is a mismatch between the .dump files (the baseline, ie. current stable ABI version) and the code being compiled, then abidiff will report an error and the build will fail. The .dump files are stored in the drivers/.abi directory. The directory is hidden to reduce clutter and also to discourage changing these files since they should not be modified. Signed-off-by: Kevin Laatz --- drivers/.abi/librte_common_cpt.dump | 36 + drivers/.abi/librte_common_dpaax.dump | 177 drivers/.abi/librte_common_octeontx.dump | 77 ++ drivers/.abi/librte_common_octeontx2.dump | 988 ++ 4 files changed, 1278 insertions(+) create mode 100644 drivers/.abi/librte_common_cpt.dump create mode 100644 drivers/.abi/librte_common_dpaax.dump create mode 100644 drivers/.abi/librte_common_octeontx.dump create mode 100644 drivers/.abi/librte_common_octeontx2.dump diff --git a/drivers/.abi/librte_common_cpt.dump b/drivers/.abi/librte_common_cpt.dump new file mode 100644 index 0..3b704bf49 --- /dev/null +++ b/drivers/.abi/librte_common_cpt.dump @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_common_dpaax.dump b/drivers/.abi/librte_common_dpaax.dump new file mode 100644 index 0..b2a376046 --- /dev/null +++ b/drivers/.abi/librte_common_dpaax.dump @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_common_octeontx.dump b/drivers/.abi/librte_common_octeontx.dump new file mode 100644 index 0..d84ab5df8 --- /dev/null +++ b/drivers/.abi/librte_common_octeontx.dump @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_common_octeontx2.dump b/drivers/.abi/librte_common_octeontx2.dump new file mode 100644 index 0..3acb66646 --- /dev/null +++ b/drivers/.abi/librte_common_octeontx2.dump @@ -0,0 +1,988 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[dpdk-dev] [PATCH v6 05/11] drivers/raw: add dump files for v20.0 ABI
This patch adds the drivers/raw .dump files generated for the v20.0 ABI. These files will be used to compare the ABI during the meson build when the compat_checks meson is enabled. If there is a mismatch between the .dump files (the baseline, ie. current stable ABI version) and the code being compiled, then abidiff will report an error and the build will fail. The .dump files are stored in the drivers/.abi directory. The directory is hidden to reduce clutter and also to discourage changing these files since they should not be modified. Signed-off-by: Kevin Laatz --- drivers/.abi/librte_rawdev_dpaa2_cmdif.dump | 32 + drivers/.abi/librte_rawdev_dpaa2_qdma.dump| 185 + drivers/.abi/librte_rawdev_ifpga.dump | 779 ++ drivers/.abi/librte_rawdev_ioat.dump | 19 + drivers/.abi/librte_rawdev_ntb.dump | 771 + drivers/.abi/librte_rawdev_octeontx2_dma.dump | 23 + drivers/.abi/librte_rawdev_skeleton.dump | 21 + 7 files changed, 1830 insertions(+) create mode 100644 drivers/.abi/librte_rawdev_dpaa2_cmdif.dump create mode 100644 drivers/.abi/librte_rawdev_dpaa2_qdma.dump create mode 100644 drivers/.abi/librte_rawdev_ifpga.dump create mode 100644 drivers/.abi/librte_rawdev_ioat.dump create mode 100644 drivers/.abi/librte_rawdev_ntb.dump create mode 100644 drivers/.abi/librte_rawdev_octeontx2_dma.dump create mode 100644 drivers/.abi/librte_rawdev_skeleton.dump diff --git a/drivers/.abi/librte_rawdev_dpaa2_cmdif.dump b/drivers/.abi/librte_rawdev_dpaa2_cmdif.dump new file mode 100644 index 0..d5c79dec3 --- /dev/null +++ b/drivers/.abi/librte_rawdev_dpaa2_cmdif.dump @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_rawdev_dpaa2_qdma.dump b/drivers/.abi/librte_rawdev_dpaa2_qdma.dump new file mode 100644 index 0..dfb08883a --- /dev/null +++ b/drivers/.abi/librte_rawdev_dpaa2_qdma.dump @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/drivers/.abi/librte_rawdev_ifpga.dump b/drivers/.abi/librte_rawdev_ifpga.dump new file mode 100644 index 0..8d8e24b70 --- /dev/null +++ b/drivers/.abi/librte_rawdev_ifpga.dump @@ -0,0 +1,779 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[dpdk-dev] [PATCH v6 11/11] build: clean up experimental syms check
This patch cleans up the meson build files in lib and drivers by moving the
custom target for checking the experimental syms next to the abi compat
checks. This also removes the dependency on the check for the shared build,
which was not required by anything, but was only added to force the
experimental syms check run.
Signed-off-by: Kevin Laatz
---
drivers/meson.build | 21 +++--
lib/meson.build | 21 +++--
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index db58a67b9..4f4c93b73 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -163,15 +163,6 @@ foreach class:dpdk_driver_classes
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' +
version_map]
- # on unix systems check the output of the
- # experimental syms script, using it as a
- # dependency of the .so build
- lk_deps += custom_target(lib_name + '.exp_chk',
- command: [check_experimental_syms,
- version_map, '@INPUT@'],
- capture: true,
- input: static_lib,
- output: lib_name + '.exp_chk')
endif
shared_lib = shared_library(lib_name,
@@ -181,7 +172,6 @@ foreach class:dpdk_driver_classes
dependencies: shared_deps,
c_args: cflags,
link_args: lk_args,
- link_depends: lk_deps,
version: lib_version,
soversion: so_version,
install: true,
@@ -197,6 +187,17 @@ foreach class:dpdk_driver_classes
dependencies: static_deps)
if abidiff.found()
+ # on unix systems check the output of the
+ # experimental syms script
+ custom_target(lib_name + '.exp_chk',
+ command: [check_experimental_syms,
+ version_map, '@INPUT@'],
+ capture: true,
+ input: static_lib,
+ output: lib_name + '.exp_chk',
+ install: false,
+ build_by_default: true)
+
custom_target('lib' + lib_name + '.abi_chk',
command: [abidiff, '--no-added-syms',
'--suppr', abignore,
diff --git a/lib/meson.build b/lib/meson.build
index f0aba6635..b0f915969 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -154,15 +154,6 @@ foreach l:libraries
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' +
version_map]
- # on unix systems check the output of the
- # experimental syms script, using it as a
- # dependency of the .so build
- lk_deps += custom_target(name + '.exp_chk',
- command: [check_experimental_syms,
- version_map, '@INPUT@'],
- capture: true,
- input: static_lib,
- output: name + '.exp_chk')
endif
shared_lib = shared_library(libname,
@@ -172,7 +163,6 @@ foreach l:libraries
dependencies: shared_deps,
include_directories: includes,
link_args: lk_args,
- link_depends: lk_deps,
version: lib_version,
soversion: so_version,
install: true)
@@ -181,6 +171,17 @@ foreach l:libraries
dependencies: shared_deps)
if abidiff.found()
+ # on unix systems check the output of the
+ # experimental syms script
+ custom_target(name + '.exp_chk',
+ c
[dpdk-dev] [PATCH v6 10/11] build: add abi checks to meson
This patch adds a script to generate ABI dump files. These files will be
required to perform ABI compatibility checks during the build later in the
patchset. This script should be run on a DPDK version with a stable ABI.
Since this is a tool designed for human use, we simplify it to just work
off a whole build directory, taking the parameter of the builddir and
generating the lib|drivers/abi dir. This is hardcoded into the script since
the meson build expects the .dump files in these directories.
The running of the scripts can be enabled/disabled using the new meson
option added in this patch. If enabled, the lib and drivers .so files will
be compared against any existing ABI dump files in lib|drivers/abi of the
source directory. If there are any incompatibilities, the build will fail
and display the incompatibility.
Signed-off-by: Kevin Laatz
Signed-off-by: Bruce Richardson
---
v2:
- fixed conditional around abi check custom target
- fixed conditional around abi check custom target
v3:
- fix typo in meson option name
v4:
- squash commits 3,4,5,6 into a single commit
- changes meson option from type boolean to feature
- update travis packages
- move check for windows to earlier in build
- add abignore file to suppress experimental functions
- make the directories we store dump files in hidden
v5:
- remove travis build with abi checks. This can be added as a separate
patch once the issue are fixed.
---
buildtools/dpdk.abignore | 2 ++
buildtools/meson.build | 3 +++
config/meson.build | 10 ++
devtools/gen-abi-dump.sh | 24
drivers/meson.build | 13 +
lib/meson.build | 13 +
meson.build | 4
meson_options.txt| 2 ++
8 files changed, 71 insertions(+)
create mode 100644 buildtools/dpdk.abignore
create mode 100755 devtools/gen-abi-dump.sh
diff --git a/buildtools/dpdk.abignore b/buildtools/dpdk.abignore
new file mode 100644
index 0..b866b7f26
--- /dev/null
+++ b/buildtools/dpdk.abignore
@@ -0,0 +1,2 @@
+[suppress_function]
+symbol_version = EXPERIMENTAL
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 6ef2c5721..378f8d07e 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -7,6 +7,9 @@ pmdinfo = find_program('gen-pmdinfo-cfile.sh')
check_experimental_syms = find_program('check-experimental-syms.sh')
+abidiff = find_program('abidiff', required: compat_checks)
+abignore = files('dpdk.abignore')
+
# set up map-to-def script using python, either built-in or external
python3 = import('python').find_installation(required: false)
if python3.found()
diff --git a/config/meson.build b/config/meson.build
index 01911ecf9..ea680af33 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -34,6 +34,16 @@ stable_so_version = abi_va.length() == 2 ? abi_va[0] :
abi_va[0] + '.' + abi_va[
experimental_abi_version = '0.' + ''.join(abi_va)
experimental_so_version = '0.' + ''.join(stable_so_version.split('.'))
+# compatibility checks not available on windows
+compat_checks = disabler()
+if not is_windows
+ compat_checks = get_option('compat_checks')
+endif
+
+if not get_option('debug') and compat_checks.enabled()
+ error('Build type must have debug symbols when compat_checks=enabled')
+endif
+
# extract all version information into the build configuration
dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
dpdk_conf.set('RTE_VER_MONTH', pver.get(1).to_int())
diff --git a/devtools/gen-abi-dump.sh b/devtools/gen-abi-dump.sh
new file mode 100755
index 0..bc6eac8c8
--- /dev/null
+++ b/devtools/gen-abi-dump.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+builddir=$1
+
+if [ -z "$builddir" ] ; then
+ echo "Usage: $(basename $0) build_dir"
+ exit 1
+fi
+
+if [ ! -d "$builddir" ] ; then
+ echo "Error: build directory, '$builddir', doesn't exist"
+ exit 1
+fi
+
+for d in lib drivers ; do
+ mkdir -p $d/.abi
+
+ for f in $builddir/$d/*.so* ; do
+ test -L "$f" && continue
+
+ libname=$(basename $f)
+ abidw --out-file $d/.abi/${libname%.so*}.dump $f || exit 1
+ done
+done
diff --git a/drivers/meson.build b/drivers/meson.build
index 4b17662b7..db58a67b9 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -196,6 +196,19 @@ foreach class:dpdk_driver_classes
include_directories: includes,
dependencies: static_deps)
+ if abidiff.found()
+ custom_target('lib' + lib_name + '.abi_chk',
+ command: [abidiff, '--no-added-syms',
+ '--suppr', abignore,
+ files('.abi/lib' + lib_name +
'.dump'),
+ '@INPUT@'],
+
Re: [dpdk-dev] [PATCH] net/i40e: Add new customized pctype for l2tpv3
> -Original Message-
> From: Sexton, Rory
> Sent: Friday, December 13, 2019 3:18 AM
> To: Xing, Beilei ; dev@dpdk.org
> Cc: Zhang, Qi Z ; adrien.mazarg...@6wind.com;
> Jagus, DariuszX
> Subject: RE: [PATCH] net/i40e: Add new customized pctype for l2tpv3
>
> Hi Beilei,
>
> See comments below.
>
> Regards,
> Rory
>
> > > Subject: [PATCH] net/i40e: Add new customized pctype for l2tpv3
> > It's not only add new customized pctype, but mainly enable FDIR for l2ipv3,
> so how about " net/i40e: support FDIR for L2TPv3"?
> >
> > Detailed commit log is also needed.
>
> Of course can update this in v2.
>
> > > +/* A structure used to define the input for L2TPv3 flow */ struct
> > > +i40e_l2tpv3_flow {
> >
> > Seems missed struct rte_eth_ipv4_flow or struct rte_eth_ipv6_flow here?
> >
>
> I'm not convinced we need struct rte_eth_ipv4_flow or struct
> rte_eth_ipv6_flow to be part of the struct i40e_l2tpv3_flow.
> The rte_eth_ipv4/6_flow struct will be included in the flow director pattern
> from the following additions.
> Please advice so I can update in a v2 of the patch if required.
Please refer to union i40e_fdir_flow: A union contains the inputs for all types
of flow items in flows need to be in big endian.
Pattern is part of rte flow, but not the packet sent to HW to create/destroy a
FDIR rule.
Beilei
>
> +static enum rte_flow_item_type pattern_fdir_ipv4_l2tpv3[] = {
> + RTE_FLOW_ITEM_TYPE_ETH,
> + RTE_FLOW_ITEM_TYPE_IPV4,
> + RTE_FLOW_ITEM_TYPE_L2TPV3,
> + RTE_FLOW_ITEM_TYPE_END,
> +};
> +
> +static enum rte_flow_item_type pattern_fdir_ipv6_l2tpv3[] = {
> + RTE_FLOW_ITEM_TYPE_ETH,
> + RTE_FLOW_ITEM_TYPE_IPV6,
> + RTE_FLOW_ITEM_TYPE_L2TPV3,
> + RTE_FLOW_ITEM_TYPE_END,
> +};
>
Re: [dpdk-dev] [PATCH v2] net/virtio: add link speed tuning
Hi Maxime,
Thank you for comments.
13.12.2019 17:59, Maxime Coquelin пишет:
> Hi Ivan,
>
> On 12/13/19 3:44 PM, Ivan Dyukov wrote:
>> Some applications like pktgen use link_speed to calculate transmit
>> rate. It limits outcome traffic to hardcoded 10G.
>>
>> This patch makes link_speed configurable at compile time.
>>
>> Signed-off-by: Ivan Dyukov
>> ---
>> config/common_base | 1 +
>> config/meson.build | 1 +
>> drivers/net/vhost/rte_eth_vhost.c | 2 +-
>> drivers/net/virtio/virtio_ethdev.c | 20
>> 4 files changed, 19 insertions(+), 5 deletions(-)
>>
>> diff --git a/config/common_base b/config/common_base
>> index 7dec7ed45..8589ca4ec 100644
>> --- a/config/common_base
>> +++ b/config/common_base
>> @@ -433,6 +433,7 @@ CONFIG_RTE_LIBRTE_AVP_DEBUG_BUFFERS=n
>> # Compile burst-oriented VIRTIO PMD driver
>> #
>> CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
>> +CONFIG_RTE_LIBRTE_VIRTIO_LINK_SPEED=1
>> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
>> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
>> CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
>> diff --git a/config/meson.build b/config/meson.build
>> index 364a8d739..78c30f334 100644
>> --- a/config/meson.build
>> +++ b/config/meson.build
>> @@ -202,6 +202,7 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET',
>> get_option('use_hpet'))
>> dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
>> dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
>> dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
>> +dpdk_conf.set('RTE_LIBRTE_VIRTIO_LINK_SPEED', 1)
>>
>>
>> compile_time_cpuflags = []
>> diff --git a/drivers/net/vhost/rte_eth_vhost.c
>> b/drivers/net/vhost/rte_eth_vhost.c
>> index 46f01a7f4..38eaa5955 100644
>> --- a/drivers/net/vhost/rte_eth_vhost.c
>> +++ b/drivers/net/vhost/rte_eth_vhost.c
>> @@ -115,7 +115,7 @@ static struct internal_list_head internal_list =
>> static pthread_mutex_t internal_list_lock = PTHREAD_MUTEX_INITIALIZER;
>>
>> static struct rte_eth_link pmd_link = {
>> -.link_speed = 1,
>> +.link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED,
>> .link_duplex = ETH_LINK_FULL_DUPLEX,
>> .link_status = ETH_LINK_DOWN
>> };
>> diff --git a/drivers/net/virtio/virtio_ethdev.c
>> b/drivers/net/virtio/virtio_ethdev.c
>> index 044eb10a7..948091cc2 100644
>> --- a/drivers/net/virtio/virtio_ethdev.c
>> +++ b/drivers/net/virtio/virtio_ethdev.c
>> @@ -2371,7 +2371,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
>> __rte_unused int wait_to_complet
>>
>> memset(&link, 0, sizeof(link));
>> link.link_duplex = ETH_LINK_FULL_DUPLEX;
>> -link.link_speed = ETH_SPEED_NUM_10G;
>> +link.link_speed = RTE_LIBRTE_VIRTIO_LINK_SPEED;
>> link.link_autoneg = ETH_LINK_FIXED;
>>
>> if (!hw->started) {
>> @@ -2426,9 +2426,21 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct
>> rte_eth_dev_info *dev_info)
>> {
>> uint64_t tso_mask, host_features;
>> struct virtio_hw *hw = dev->data->dev_private;
>> -
>> -dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */
>> -
>> +#if RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_LINK_SPEED_20G
>> +dev_info->speed_capa = ETH_LINK_SPEED_20G;
>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_25G
>> +dev_info->speed_capa = ETH_LINK_SPEED_25G;
>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_40G
>> +dev_info->speed_capa = ETH_LINK_SPEED_40G;
>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_50G
>> +dev_info->speed_capa = ETH_LINK_SPEED_50G;
>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_56G
>> +dev_info->speed_capa = ETH_LINK_SPEED_56G;
>> +#elif RTE_LIBRTE_VIRTIO_LINK_SPEED == ETH_SPEED_NUM_100G
>> +dev_info->speed_capa = ETH_LINK_SPEED_100G;
>> +#else
>> +dev_info->speed_capa = ETH_LINK_SPEED_10G;
>> +#endif
>> dev_info->max_rx_queues =
>> RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);
>> dev_info->max_tx_queues =
>>
> I think we may need toi extend the Virtio specification so that the
> device can advertise the link speed.
I agree. It will be more flexible solution, but it will require another
effort. I'll evalutate virtio spec and check if it's suitable for such
changes.
> Problem with your proposal is that it is build time only, so:
> 1. It won't be configurable when using distros DPDK package.
> 2. All the Virtio devices on a system will have the same value
Current implementation is same. Nothing is broken here. :)
> While any Virtio spec update introduce link speed support, wouldn't it
> be preferable to have this as a devarg?
For my case, compile time configuration is ok. Let me prepare solution
with devarg then we can choose the better one.
> Thanks,
> Maxime
Best regards,
Ivan.
[dpdk-dev] [PATCH] net/ice: correct VSI context
There'll always be a MDD event triggered when adding
a FDIR rule. The root cause is 'LAN enable' is not
configured during control VSI setup.
Besides, correct FDIR fields for both main VSI and
control VSI.
Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
Cc: sta...@dpdk.org
Signed-off-by: Beilei Xing
---
drivers/net/ice/ice_ethdev.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index de189da..8b34ed9 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1573,7 +1573,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
cfg = ICE_AQ_VSI_PROP_SECURITY_VALID |
ICE_AQ_VSI_PROP_FLOW_DIR_VALID;
vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg);
- cfg = ICE_AQ_VSI_FD_ENABLE | ICE_AQ_VSI_FD_PROG_ENABLE;
+ cfg = ICE_AQ_VSI_FD_ENABLE;
vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg);
vsi_ctx.info.max_fd_fltr_dedicated =
rte_cpu_to_le_16(hw->func_caps.fd_fltr_guar);
@@ -1601,9 +1601,10 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
cfg = ICE_AQ_VSI_PROP_FLOW_DIR_VALID;
vsi_ctx.info.valid_sections |= rte_cpu_to_le_16(cfg);
- cfg = ICE_AQ_VSI_FD_ENABLE | ICE_AQ_VSI_FD_PROG_ENABLE;
+ cfg = ICE_AQ_VSI_FD_PROG_ENABLE;
vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg);
vsi_ctx.info.sw_id = hw->port_info->sw_id;
+ vsi_ctx.info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;
ret = ice_vsi_config_tc_queue_mapping(vsi,
&vsi_ctx.info,
ICE_DEFAULT_TCMAP);
--
2.5.5
Re: [dpdk-dev] [PATCH 1/2] net/ena: upgrade HAL for new HW features
pt., 13 gru 2019 o 17:34 Stephen Hemminger napisał(a): > > On Fri, 13 Dec 2019 14:32:15 +0100 > Michal Krawczyk wrote: > > > This version of the HAL allows to use the latest HW features, like > > rx offsets. > > > > Driver was adjusted to the new version to fix the build. > > > > Signed-off-by: Michal Krawczyk > > Signed-off-by: Maciej Bielski > > You are mixing multiple changes into one patch. > This makes it harder to review (find the real bits) and also > harder for bisection. > > It makes sense to fix whitespace and related stuff in one > patch if you are fixing one function and the nearby code > already needed work. But please avoid larger scale change > put together. > > In your patch I see: > - remove unnecessary whitespace > - drop unnecessary inline > - add missing newline in log messages > - check for NULL pointer > > If possible could you preserve the per-commit updates for base > code, rather than one lump diff. Hi Stephen, We are not developing HAL (ena_com) on our own. We are getting it from the Amazon team and we don't have history of it's development. Tha's why we are upstreaming a diff between two versions of the ena_com. Moreover this HAL is common for Linux kernel driver, FreeBSD kernel driver and Windows kernel driver. Because of that, we are trying to avoid to modify it on our side unless it's really necessary (for example, if compilation fails on for the DPDK). In fact, we are doing changes to the PMD and our platform file (ena_plat_dpdk.h which is a glue) in this patch, but that is required in order to do not have patch which is not compiling. Both the PMD code and the glue code can be changed without affecting other platforms. Thanks, Michal
[dpdk-dev] 82599 TX flush on carrier loss
Howdy! I would like to know how to get the TX queue drained when the link is down (rte_eth_link_get_nowait return rte_eth_link.link_status = 0). Background: our appliance has multi-port 82599 multimode-fiber NICs, and acts as a bump-on-a-wire, taking packets off port N, perhaps processing them, and passing them to port N+1. In this particular case, we are a simple packet forwarder. For the test, with a client connected to port N, and the server connected to port N+1: client: ping -i0.2 -f $server_ip server: tcpdump -i $iface Allow the ping flood to run for a while, then pull the cable from port N+1 (link goes down), and the client ping starts printing dots, and the tcpdump on the server stops seeing ICMP-echos from the client. After a few tens of seconds, kill the client ping. After another few tens of seconds, reconnect the cable. Immediately upon link-up, we are seeing ~31 ICMP-echo packets sequentially from the last packet before the cable was pulled. The desire here is all these packets are discarded, or we can flush them somehow. I’ve tried using rte_eth_dev_tx_queue_stop and rte_eth_dev_tx_queue_start, but this makes no difference. I can get these “flushed" by stopping the device: rte_eth_dev_stop and rte_eth_dev_start, but this is undesirable for other reasons. Is there a way to configure an 82599 fiber to discard packets if the device cannot TX them? If not, is there a way to flush all the TX queues so they will not be delivered once the link is restored? — Dave
Re: [dpdk-dev] [PATCH 0/6] bnxt patchset
On Tue, Dec 10, 2019 at 6:48 AM Kalesh A P < kalesh-anakkur.pura...@broadcom.com> wrote: > From: Kalesh AP > > bnxt patchset with bug fixes and enhancements. > > Please apply. > Patchset applied to dpdk-next-net-brcm. Thanks > > Kalesh AP (6): > net/bnxt: restore mac filters during reset recovery > net/bnxt: restore vlan filters during reset recovery > net/bnxt: fix request for hot reset support > net/bnxt: remove unnecessary macro for unused variables > net/bnxt: reset filter indices on free > net/bnxt: add a field for fw capabilities > > drivers/net/bnxt/bnxt.h| 23 ++- > drivers/net/bnxt/bnxt_cpr.c| 2 +- > drivers/net/bnxt/bnxt_ethdev.c | 88 > +++--- > drivers/net/bnxt/bnxt_filter.c | 5 +++ > drivers/net/bnxt/bnxt_flow.c | 3 +- > drivers/net/bnxt/bnxt_hwrm.c | 24 ++-- > drivers/net/bnxt/bnxt_stats.c | 6 +-- > 7 files changed, 110 insertions(+), 41 deletions(-) > > -- > 2.10.1 > >
[dpdk-dev] [PATCH] net/bnxt: add support for flow mark action
Add support for RTE_FLOW_ACTION_TYPE_MARK
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt.h | 1 +
drivers/net/bnxt/bnxt_ethdev.c | 8 ++
drivers/net/bnxt/bnxt_filter.h | 3 ++
drivers/net/bnxt/bnxt_flow.c | 35 ++--
drivers/net/bnxt/bnxt_hwrm.c | 2 ++
drivers/net/bnxt/bnxt_rxr.c | 41 +++-
drivers/net/bnxt/bnxt_rxr.h | 11
drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 8 +-
8 files changed, 98 insertions(+), 11 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index ab18e8acd..bd8f66039 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -653,6 +653,7 @@ struct bnxt {
/* Struct to hold adapter error recovery related info */
struct bnxt_error_recovery_info *recovery_info;
+ uint32_t*mark_table;
};
int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu);
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 1b4ed293d..64f88e968 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -458,6 +458,9 @@ static int bnxt_init_chip(struct bnxt *bp)
}
bnxt_print_link_info(bp->eth_dev);
+ bp->mark_table = rte_zmalloc("bnxt_mark_table",
+sizeof(uint16_t) * 64 * 1024,
+0);
return 0;
err_free:
@@ -956,6 +959,7 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
bnxt_int_handler(eth_dev);
bnxt_shutdown_nic(bp);
bnxt_hwrm_if_change(bp, 0);
+ memset(bp->mark_table, 0, sizeof(uint16_t) * 64 * 1024);
bp->dev_stopped = 1;
bp->rx_cosq_cnt = 0;
}
@@ -975,6 +979,10 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
rte_free(bp->grp_info);
bp->grp_info = NULL;
}
+ if (bp->mark_table != NULL) {
+ rte_free(bp->mark_table);
+ bp->mark_table = NULL;
+ }
bnxt_dev_uninit(eth_dev);
}
diff --git a/drivers/net/bnxt/bnxt_filter.h b/drivers/net/bnxt/bnxt_filter.h
index 9db3e7487..8cafa8fe6 100644
--- a/drivers/net/bnxt/bnxt_filter.h
+++ b/drivers/net/bnxt/bnxt_filter.h
@@ -23,9 +23,11 @@ struct bnxt;
#define BNXT_FLOW_L2_INNER_DST_VALID_FLAG BIT(4)
#define BNXT_FLOW_L2_DROP_FLAG BIT(5)
#define BNXT_FLOW_PARSE_INNER_FLAG BIT(6)
+#define BNXT_FLOW_MARK_FLAGBIT(7)
struct bnxt_filter_info {
STAILQ_ENTRY(bnxt_filter_info) next;
+ uint32_tflow_id;
uint64_tfw_l2_filter_id;
struct bnxt_filter_info *matching_l2_fltr_ptr;
uint64_tfw_em_filter_id;
@@ -77,6 +79,7 @@ struct bnxt_filter_info {
uint16_tip_addr_type;
uint16_tethertype;
uint32_tpriority;
+ uint32_tmark;
};
struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp);
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 7bd6811f1..4381cd73a 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1033,6 +1033,8 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
filter->flags = HWRM_CFA_EM_FLOW_ALLOC_INPUT_FLAGS_PATH_RX;
use_ntuple = bnxt_filter_type_check(pattern, error);
+
+start:
switch (act->type) {
case RTE_FLOW_ACTION_TYPE_QUEUE:
/* Allow this flow. Redirect to a VNIC. */
@@ -1410,6 +1412,12 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
PMD_DRV_LOG(DEBUG, "L2 filter created\n");
bnxt_update_filter_flags_en(filter, filter1, use_ntuple);
break;
+ case RTE_FLOW_ACTION_TYPE_MARK:
+ filter->valid_flags |= BNXT_FLOW_MARK_FLAG;
+ filter->mark = ((const struct rte_flow_action_mark *)
+ act->conf)->id;
+ PMD_DRV_LOG(DEBUG, "Mark the flow %d\n", filter->mark);
+ break;
default:
rte_flow_error_set(error,
EINVAL,
@@ -1427,15 +1435,8 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
done:
act = bnxt_flow_non_void_action(++act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- rte_flow_error_set(error,
- EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act,
- "Invalid action.");
- rc = -rte_errno;
- goto ret;
- }
+ while (act->type != RTE_FLOW_ACTION_TYPE_END)
+ goto start;
return rc;
ret:
@@ -1749,6 +1750,17 @@ bnxt_flow_create(struct rte_eth_dev *dev,
STAILQ_INSERT
