Re: [dpdk-dev] [PATCH 2/2] ethdev: use strlcpy instead of snprintf on initialization
On 3/1/19 9:42 PM, Stephen Hemminger wrote: On Fri, 1 Mar 2019 10:48:58 +0300 Andrew Rybchenko wrote: On 3/1/19 1:47 AM, Stephen Hemminger wrote: Don't need to use snprintf for simple name copy. Signed-off-by: Stephen Hemminger --- lib/librte_ethdev/rte_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 95889ed206db..8bd54dcf58c1 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -459,7 +459,7 @@ rte_eth_dev_allocate(const char *name) } eth_dev = eth_dev_get(port_id); - snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name); + strlcpy(eth_dev->data->name, name, RTE_ETH_NAME_MAX_LEN); Why is sizeof() substituted with RTE_ETH_NAME_MAX_LEN? Same thing, I just wanted to make the length obvious to the reader. I thought that sizeof() is the first choice in such cases since it is a bit more safer vs possible changes in the code. BTW, wouldn't it be more friendly to check name length on entry and reject if it is too long? (and same for rte_eth_dev_create()) It is impossible for name to long since since both structures are the same. Which structures? name is an input parameter of the function.
Re: [dpdk-dev] [PATCH 00/10] net/atlantic: bugfixes and code cleanup
On Sat, Mar 2, 2019 at 1:10 PM Igor Russkikh wrote: > The patchset mainly fixes some Coverity issues, > couple of minor bugs and overflows. > > It also improves eeprom get/set logic with ability of custom > device address and dump length. > > Igor Russkikh (7): > net/atlantic: Fix negative error codes > net/atlantic: remove unused variable > net/atlantic: check for error codes > net/atlantic: fix link configuration > net/atlantic: eliminate excessive log levels on rx/tx > net/atlantic: fix missing vlan filter offload > net/atlantic: fix xstats to return correct number of requested items > > Pavel Belous (3): > net/atlantic: fix buffer overflow > net/atlantic: use eeprom magic as a device address > net/atlantic: fix eeprom fetching for small and uneven lengths > > drivers/net/atlantic/atl_ethdev.c | 71 ++- > drivers/net/atlantic/atl_rxtx.c | 20 ++ > drivers/net/atlantic/atl_types.h | 5 +- > drivers/net/atlantic/hw_atl/hw_atl_b0.c | 6 +- > drivers/net/atlantic/hw_atl/hw_atl_utils.c| 9 +-- > drivers/net/atlantic/hw_atl/hw_atl_utils.h| 23 +++--- > .../net/atlantic/hw_atl/hw_atl_utils_fw2x.c | 59 ++- > 7 files changed, 105 insertions(+), 88 deletions(-) > Those patches are missing Fixes: tags and copying stable where appropriate. The commitlogs also need some work. It looks like those patches were neither checked against checkpatch nor check-git-log.sh. Here is what I see (extended the max line length to 100 to avoid all those 80 columns warnings, but this is worth fixing as well). [dmarchan@dmarchan dpdk]$ DPDK_CHECKPATCH_LINE_LENGTH=100 ./devtools/checkpatches.sh ### net/atlantic: Fix negative error codes WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one total: 0 errors, 1 warnings, 0 checks, 14 lines checked ### net/atlantic: use eeprom magic as a device address WARNING:LONG_LINE: line over 100 characters #163: FILE: drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c:134: +u32 val = rate_mask | ((BIT(CAPS_LO_SMBUS_READ) | BIT(CAPS_LO_SMBUS_WRITE) | BIT(CAPS_LO_MACSEC)) & reg_val); total: 0 errors, 1 warnings, 0 checks, 194 lines checked ### net/atlantic: fix eeprom fetching for small and uneven lengths WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one ERROR:POINTER_LOCATION: "(foo*)" should be "(foo *)" #46: FILE: drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c:558: +rte_memcpy((u8*)data + len - bytes_remains, &val, bytes_remains); total: 1 errors, 1 warnings, 0 checks, 36 lines checked ### net/atlantic: fix missing vlan filter offload WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one total: 0 errors, 1 warnings, 0 checks, 9 lines checked ### net/atlantic: fix xstats to return correct number of requested items WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one total: 0 errors, 1 warnings, 0 checks, 16 lines checked 5/10 valid patches [dmarchan@dmarchan dpdk]$ ./devtools/check-git-log.sh Wrong headline uppercase: net/atlantic: Fix negative error codes Wrong headline lowercase: net/atlantic: use eeprom magic as a device address net/atlantic: fix eeprom fetching for small and uneven lengths net/atlantic: eliminate excessive log levels on rx/tx net/atlantic: fix missing vlan filter offload Headline too long: net/atlantic: fix eeprom fetching for small and uneven lengths net/atlantic: fix xstats to return correct number of requested items Missing 'Fixes' tag: net/atlantic: Fix negative error codes net/atlantic: fix buffer overflow net/atlantic: fix eeprom fetching for small and uneven lengths net/atlantic: fix link configuration net/atlantic: fix missing vlan filter offload net/atlantic: fix xstats to return correct number of requested items -- David Marchand
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
On Fri, Mar 1, 2019 at 7:50 PM Stephen Hemminger
wrote:
> On Fri, 1 Mar 2019 15:37:34 +0100
> Rastislav Cernay wrote:
>
> > From: Rastislav Cernay
> >
> > Added new net driver for Netcope nfb cards
> >
> > Signed-off-by: Rastislav Cernay
> > ---
>
> Please fix these obvious style issues from checkpatches
>
> ERROR:SPACING: space required before the open brace '{'
> #934: FILE: drivers/net/nfb/nfb_ethdev.c:380:
> + if (!is_valid_assigned_ether_addr(mac_addr)){
>
> WARNING:ONE_SEMICOLON: Statements terminations use 1 semicolon
> #935: FILE: drivers/net/nfb/nfb_ethdev.c:381:
> + return -EINVAL;;
>
And if you look carefully at checkpatches.sh output, you can see:
[dmarchan@dmarchan dpdk]$ ./devtools/checkpatches.sh
### net/nfb: new netcope driver
[snip]
total: 1 errors, 2 warnings, 1884 lines checked
./devtools/checkpatches.sh: line 65: res: command not found
I will post a fix on checkpatches.sh for this, then a new warning appears:
Warning in /doc/guides/nics/nfb.rst:
Using explicit .svg extension instead of .*
--
David Marchand
[dpdk-dev] [PATCH] devtools: fix incorrect shell assignment
No space needed here:
./devtools/checkpatches.sh: line 65: res: command not found
Fixes: dafc04c15174 ("devtools: fix return of forbidden addition checks")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
devtools/checkpatches.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 3b03b7e..02d1c30 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -62,7 +62,7 @@ check_forbidden_additions() { #
-v RET_ON_FAIL=1 \
-v MESSAGE='Using explicit .svg extension instead of .*' \
-f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
- "$1" || res = 1
+ "$1" || res=1
return $res
}
--
1.8.3.1
Re: [dpdk-dev] [PATCH] devtools: fix incorrect shell assignment
04/03/2019 10:57, David Marchand:
> No space needed here:
> ./devtools/checkpatches.sh: line 65: res: command not found
>
> Fixes: dafc04c15174 ("devtools: fix return of forbidden addition checks")
> Cc: sta...@dpdk.org
> Signed-off-by: David Marchand
Thank you
It is already submitted:
https://patches.dpdk.org/patch/50727/
It is part of a patchset, waiting for a new version (for codespell feature).
Re: [dpdk-dev] [PATCH 0/6] HelloWorld example for Windows
On Fri, Mar 1, 2019 at 2:48 PM Bruce Richardson wrote: > On Thu, Feb 28, 2019 at 11:18:41PM -0800, Anand Rawat wrote: > > Helloworld example for Windows. > > Includes Windows-specific EAL changes and meson > > changes to build the code on Windows. > > > > Anand Rawat (6): > > eal: eal stub to add windows support > > eal: Add header files to support windows > > eal: Add headers for compatibility with windows environment > > eal: add minimum viable code for eal on windows > > examples: Add meson changes for windows > > doc: add documention for windows > > > Thanks for this, it's good to see some progress here with small managable > patches. > > I've just tried this on my laptop using clang + meson + ninja. I see some > warnings at the link phase due to unknown flags, but otherwise things > compile and link ok and I get helloworld app running and printing hello > from all cores. Specifying a coremask doesn't seem to work though - perhaps > something to look at for a V2. > Some easy warnings to fix: [dmarchan@dmarchan dpdk]$ ./devtools/checkpatches.sh ### eal: eal stub to add windows support WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #402: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:9: +eal_cpu_core_id(unsigned lcore_id) total: 0 errors, 1 warnings, 461 lines checked Warning in /lib/librte_eal/winapp/eal/eal_debug.c: Using rte_panic/rte_exit ### eal: add minimum viable code for eal on windows WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #239: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:10: +unsigned numTotalProcessors; WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #240: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:11: +unsigned numProcessorSockets; WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #241: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:12: +unsigned numProcessorCores; WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #242: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:13: +unsigned reserved; WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #280: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:50: +unsigned lcore = 0; WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #281: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:51: +for (unsigned socket = 0; socket < WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #283: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:53: +for (unsigned core = 0; core < (win_cpu_map.numProcessorCores / WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #304: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:73: +eal_cpu_detected(unsigned lcore_id) WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #313: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:80: +eal_cpu_socket_id(unsigned lcore_id) WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #320: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:87: +eal_cpu_core_id(unsigned lcore_id) WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #348: FILE: lib/librte_eal/winapp/eal/eal_thread.c:15: +RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY; WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #356: FILE: lib/librte_eal/winapp/eal/eal_thread.c:23: +rte_eal_remote_launch(lcore_function_t *f, void *arg, unsigned slave_id) WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #388: FILE: lib/librte_eal/winapp/eal/eal_thread.c:55: +eal_thread_init_master(unsigned lcore_id) WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #406: FILE: lib/librte_eal/winapp/eal/eal_thread.c:73: +unsigned lcore_id; total: 0 errors, 14 warnings, 502 lines checked Warning in /lib/librte_eal/winapp/eal/eal.c: Using rte_panic/rte_exit 4/6 valid patches [dmarchan@dmarchan dpdk]$ ./devtools/check-git-log.sh Wrong headline uppercase: eal: Add header files to support windows eal: Add headers for compatibility with windows environment examples: Add meson changes for windows Wrong tag: Signed-off-by: Kadam, Pallavi Signed-off-by: Kadam, Pallavi Signed-off-by: Kadam, Pallavi Signed-off-by: Kadam, Pallavi Signed-off-by: Kadam, Pallavi Signed-off-by: Kadam, Pallavi -- David Marchand
Re: [dpdk-dev] [PATCH 0/6] HelloWorld example for Windows
Sorry Bruce, wrong dest :-) -- David Marchand On Mon, Mar 4, 2019 at 11:13 AM David Marchand wrote: > > > On Fri, Mar 1, 2019 at 2:48 PM Bruce Richardson < > bruce.richard...@intel.com> wrote: > >> On Thu, Feb 28, 2019 at 11:18:41PM -0800, Anand Rawat wrote: >> > Helloworld example for Windows. >> > Includes Windows-specific EAL changes and meson >> > changes to build the code on Windows. >> > >> > Anand Rawat (6): >> > eal: eal stub to add windows support >> > eal: Add header files to support windows >> > eal: Add headers for compatibility with windows environment >> > eal: add minimum viable code for eal on windows >> > examples: Add meson changes for windows >> > doc: add documention for windows >> > >> Thanks for this, it's good to see some progress here with small managable >> patches. >> >> I've just tried this on my laptop using clang + meson + ninja. I see some >> warnings at the link phase due to unknown flags, but otherwise things >> compile and link ok and I get helloworld app running and printing hello >> from all cores. Specifying a coremask doesn't seem to work though - >> perhaps >> something to look at for a V2. >> > > Some easy warnings to fix: > > [dmarchan@dmarchan dpdk]$ ./devtools/checkpatches.sh > > ### eal: eal stub to add windows support > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #402: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:9: > +eal_cpu_core_id(unsigned lcore_id) > > total: 0 errors, 1 warnings, 461 lines checked > Warning in /lib/librte_eal/winapp/eal/eal_debug.c: > Using rte_panic/rte_exit > > ### eal: add minimum viable code for eal on windows > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #239: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:10: > +unsigned numTotalProcessors; > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #240: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:11: > +unsigned numProcessorSockets; > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #241: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:12: > +unsigned numProcessorCores; > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #242: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:13: > +unsigned reserved; > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #280: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:50: > +unsigned lcore = 0; > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #281: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:51: > +for (unsigned socket = 0; socket < > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #283: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:53: > +for (unsigned core = 0; core < (win_cpu_map.numProcessorCores / > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #304: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:73: > +eal_cpu_detected(unsigned lcore_id) > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #313: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:80: > +eal_cpu_socket_id(unsigned lcore_id) > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #320: FILE: lib/librte_eal/winapp/eal/eal_lcore.c:87: > +eal_cpu_core_id(unsigned lcore_id) > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #348: FILE: lib/librte_eal/winapp/eal/eal_thread.c:15: > +RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY; > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #356: FILE: lib/librte_eal/winapp/eal/eal_thread.c:23: > +rte_eal_remote_launch(lcore_function_t *f, void *arg, unsigned slave_id) > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #388: FILE: lib/librte_eal/winapp/eal/eal_thread.c:55: > +eal_thread_init_master(unsigned lcore_id) > > WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' > #406: FILE: lib/librte_eal/winapp/eal/eal_thread.c:73: > +unsigned lcore_id; > > total: 0 errors, 14 warnings, 502 lines checked > Warning in /lib/librte_eal/winapp/eal/eal.c: > Using rte_panic/rte_exit > > 4/6 valid patches > > [dmarchan@dmarchan dpdk]$ ./devtools/check-git-log.sh > Wrong headline uppercase: > eal: Add header files to support windows > eal: Add headers for compatibility with windows environment > examples: Add meson changes for windows > Wrong tag: > Signed-off-by: Kadam, Pallavi > Signed-off-by: Kadam, Pallavi > Signed-off-by: Kadam, Pallavi > Signed-off-by: Kadam, Pallavi > Signed-off-by: Kadam, Pallavi > Signed-off-by: Kadam, Pallavi > > > -- > David Marchand >
Re: [dpdk-dev] [PATCH] devtools: fix incorrect shell assignment
On Mon, Mar 4, 2019 at 11:13 AM Thomas Monjalon wrote:
> 04/03/2019 10:57, David Marchand:
> > No space needed here:
> > ./devtools/checkpatches.sh: line 65: res: command not found
> >
> > Fixes: dafc04c15174 ("devtools: fix return of forbidden addition checks")
> > Cc: sta...@dpdk.org
> > Signed-off-by: David Marchand
>
> Thank you
> It is already submitted:
> https://patches.dpdk.org/patch/50727/
> It is part of a patchset, waiting for a new version (for codespell
> feature).
>
Indeed, thanks.
--
David Marchand
Re: [dpdk-dev] [dpdk-stable] [PATCH v3 2/2] devtools: fix result of svg include check
On Fri, Mar 1, 2019 at 6:52 PM Thomas Monjalon wrote:
> 01/03/2019 18:08, Michael Santana:
> > Fix trivial bug. In sh shell, 'foo = 1' is not the same as
> > 'foo=1'. Using 'foo = 1' makes the shell attempt to interpret foo
> > as a command, rather than a simple variable assignment.
> >
> > Signed-off-by: Michael Santana
> > Fixes: dafc04c15174 ("devtools: fix return of forbidden addition checks")
>
> CC: sta...@dpdk.org must be inserted below Fixes for the record in git.
>
> Note also that Signed-off-by must be below with a blank line.
>
Ah ah, great that we won't have to check this manually soon :-)
Reviewed-by: David Marchand
--
David Marchand
[dpdk-dev] [PATCH] devtools: fix index generation
build-tags.sh is broken because of removed 'test' folder, this breaks
helper make targets like 'make cscope', 'make tags', etc...
Fixing it by removing 'test' from source directories list.
Fixes: a9de470cc7c0 ("test: move to app directory")
Signed-off-by: Ferruh Yigit
---
Cc: bruce.richard...@intel.com
---
devtools/build-tags.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 78001f048..03ba1853b 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -38,7 +38,7 @@ shift $(($OPTIND - 1))
#ignore version control files
ignore="( -name .svn -o -name CVS -o -name .hg -o -name .git ) -prune -o"
-source_dirs="test app buildtools drivers examples lib"
+source_dirs="app buildtools drivers examples lib"
skip_bsd="( -name bsdapp ) -prune -o"
skip_linux="( -name linuxapp ) -prune -o"
--
2.20.1
[dpdk-dev] [PATCH 00/12] rxq q_errors[] statistics fixes
According to the api, the q_errors[] per queue statistic is for reception errors not transmit errors. This is a first cleanup on statistics before looking at oerrors. -- David Marchand David Marchand (12): net/af_packet: fix incorrect rxq errors stat net/avp: fix incorrect rxq errors stat net/bnxt: fix incorrect rxq errors stat net/cxgbe: fix incorrect rxq errors stat net/kni: fix incorrect rxq errors stat net/mlx4: fix incorrect rxq errors stat net/mlx5: fix incorrect rxq errors stat net/null: fix incorrect rxq errors stat net/pcap: fix incorrect rxq errors stat net/ring: fix incorrect rxq errors stat net/szedata2: fix incorrect rxq errors stat net/tap: fix incorrect rxq errors stat drivers/net/af_packet/rte_eth_af_packet.c | 3 +-- drivers/net/avp/avp_ethdev.c | 1 - drivers/net/bnxt/bnxt_hwrm.c | 1 - drivers/net/cxgbe/cxgbe_ethdev.c | 1 - drivers/net/cxgbe/cxgbevf_ethdev.c| 1 - drivers/net/kni/rte_eth_kni.c | 3 +-- drivers/net/mlx4/mlx4_ethdev.c| 1 - drivers/net/mlx5/mlx5_stats.c | 1 - drivers/net/null/rte_eth_null.c | 4 +--- drivers/net/pcap/rte_eth_pcap.c | 3 +-- drivers/net/ring/rte_eth_ring.c | 3 +-- drivers/net/szedata2/rte_eth_szedata2.c | 1 - drivers/net/tap/rte_eth_tap.c | 3 +-- 13 files changed, 6 insertions(+), 20 deletions(-) -- 1.8.3.1
[dpdk-dev] [PATCH 03/12] net/bnxt: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 577d3dced0dc ("net/bnxt: refactor the query stats")
Cc: sta...@dpdk.org
Cc: Ajit Khaparde
Cc: Somnath Kotur
Signed-off-by: David Marchand
---
drivers/net/bnxt/bnxt_hwrm.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 760..8853391 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3186,7 +3186,6 @@ int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid,
int idx,
stats->q_obytes[idx] = rte_le_to_cpu_64(resp->tx_ucast_bytes);
stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_mcast_bytes);
stats->q_obytes[idx] += rte_le_to_cpu_64(resp->tx_bcast_bytes);
- stats->q_errors[idx] += rte_le_to_cpu_64(resp->tx_err_pkts);
}
--
1.8.3.1
[dpdk-dev] [PATCH 01/12] net/af_packet: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual devices")
Cc: sta...@dpdk.org
Cc: John W. Linville
Signed-off-by: David Marchand
---
drivers/net/af_packet/rte_eth_af_packet.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
b/drivers/net/af_packet/rte_eth_af_packet.c
index 264cfc0..ec90cc0 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -328,10 +328,9 @@ struct pmd_internals {
internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);
for (i = 0; i < imax; i++) {
igb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts;
- igb_stats->q_errors[i] = internal->tx_queue[i].err_pkts;
igb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes;
tx_total += igb_stats->q_opackets[i];
- tx_err_total += igb_stats->q_errors[i];
+ tx_err_total += internal->tx_queue[i].err_pkts;
tx_bytes_total += igb_stats->q_obytes[i];
}
--
1.8.3.1
[dpdk-dev] [PATCH 02/12] net/avp: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 5a5abe2de94b ("net/avp: add device statistics operations")
Cc: sta...@dpdk.org
Cc: Allain Legacy
Cc: Matt Peters
Signed-off-by: David Marchand
---
drivers/net/avp/avp_ethdev.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 09388d0..5d069a2 100644
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -2228,7 +2228,6 @@ struct avp_queue {
stats->q_opackets[i] += txq->packets;
stats->q_obytes[i] += txq->bytes;
- stats->q_errors[i] += txq->errors;
}
}
--
1.8.3.1
[dpdk-dev] [PATCH 04/12] net/cxgbe: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 856505d303f4 ("cxgbe: add port statistics")
Fixes: a0a344a8f728 ("net/cxgbe: add VF port statistics")
Cc: sta...@dpdk.org
Cc: Rahul Lakkireddy
Signed-off-by: David Marchand
---
drivers/net/cxgbe/cxgbe_ethdev.c | 1 -
drivers/net/cxgbe/cxgbevf_ethdev.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index 010a818..7c7a51d 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -705,7 +705,6 @@ static int cxgbe_dev_stats_get(struct rte_eth_dev *eth_dev,
eth_stats->q_opackets[i] = txq->stats.pkts;
eth_stats->q_obytes[i] = txq->stats.tx_bytes;
- eth_stats->q_errors[i] = txq->stats.mapping_err;
}
return 0;
}
diff --git a/drivers/net/cxgbe/cxgbevf_ethdev.c
b/drivers/net/cxgbe/cxgbevf_ethdev.c
index 0e93d99..0af9dd9 100644
--- a/drivers/net/cxgbe/cxgbevf_ethdev.c
+++ b/drivers/net/cxgbe/cxgbevf_ethdev.c
@@ -69,7 +69,6 @@ static int cxgbevf_dev_stats_get(struct rte_eth_dev *eth_dev,
eth_stats->q_opackets[i] = txq->stats.pkts;
eth_stats->q_obytes[i] = txq->stats.tx_bytes;
- eth_stats->q_errors[i] = txq->stats.mapping_err;
}
return 0;
}
--
1.8.3.1
[dpdk-dev] [PATCH 06/12] net/mlx4: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 7fae69eeff13 ("mlx4: new poll mode driver")
Cc: sta...@dpdk.org
Cc: Matan Azrad
Cc: Shahaf Shuler
Signed-off-by: David Marchand
---
drivers/net/mlx4/mlx4_ethdev.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
index 4dae67a..41c46d3 100644
--- a/drivers/net/mlx4/mlx4_ethdev.c
+++ b/drivers/net/mlx4/mlx4_ethdev.c
@@ -661,7 +661,6 @@ int mlx4_fw_version_get(struct rte_eth_dev *dev, char
*fw_ver, size_t fw_size)
if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
tmp.q_opackets[idx] += txq->stats.opackets;
tmp.q_obytes[idx] += txq->stats.obytes;
- tmp.q_errors[idx] += txq->stats.odropped;
}
tmp.opackets += txq->stats.opackets;
tmp.obytes += txq->stats.obytes;
--
1.8.3.1
[dpdk-dev] [PATCH 05/12] net/kni: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 75e2bc54c018 ("net/kni: add KNI PMD")
Cc: sta...@dpdk.org
Cc: Ferruh Yigit
Signed-off-by: David Marchand
---
drivers/net/kni/rte_eth_kni.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index a1e9970..363f80d 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -285,10 +285,9 @@ struct pmd_internals {
q = data->tx_queues[i];
stats->q_opackets[i] = q->tx.pkts;
stats->q_obytes[i] = q->tx.bytes;
- stats->q_errors[i] = q->tx.err_pkts;
tx_packets_total += stats->q_opackets[i];
tx_bytes_total += stats->q_obytes[i];
- tx_packets_err_total += stats->q_errors[i];
+ tx_packets_err_total += q->tx.err_pkts;
}
stats->ipackets = rx_packets_total;
--
1.8.3.1
[dpdk-dev] [PATCH 07/12] net/mlx5: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 87011737b715 ("mlx5: add software counters")
Fixes: 9f9a48eb2978 ("net/mlx5: fix Tx stats error counter definition")
Cc: sta...@dpdk.org
Cc: Shahaf Shuler
Cc: Yongseok Koh
Signed-off-by: David Marchand
---
drivers/net/mlx5/mlx5_stats.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index 6906dc8..ef7bc14 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -409,7 +409,6 @@
tmp.q_opackets[idx] += txq->stats.opackets;
tmp.q_obytes[idx] += txq->stats.obytes;
#endif
- tmp.q_errors[idx] += txq->stats.oerrors;
}
#ifdef MLX5_PMD_SOFT_COUNTERS
tmp.opackets += txq->stats.opackets;
--
1.8.3.1
[dpdk-dev] [PATCH 09/12] net/pcap: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 4c173302c307 ("pcap: add new driver")
Cc: sta...@dpdk.org
Cc: Ferruh Yigit
Signed-off-by: David Marchand
---
drivers/net/pcap/rte_eth_pcap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 65bbd7e..4d5e6ba 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -605,10 +605,9 @@ struct pmd_devargs {
i < dev->data->nb_tx_queues; i++) {
stats->q_opackets[i] = internal->tx_queue[i].tx_stat.pkts;
stats->q_obytes[i] = internal->tx_queue[i].tx_stat.bytes;
- stats->q_errors[i] = internal->tx_queue[i].tx_stat.err_pkts;
tx_packets_total += stats->q_opackets[i];
tx_bytes_total += stats->q_obytes[i];
- tx_packets_err_total += stats->q_errors[i];
+ tx_packets_err_total += internal->tx_queue[i].tx_stat.err_pkts;
}
stats->ipackets = rx_packets_total;
--
1.8.3.1
[dpdk-dev] [PATCH 08/12] net/null: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: c743e50c475f ("null: new poll mode driver")
Cc: sta...@dpdk.org
Cc: Tetsuya Mukawa
Signed-off-by: David Marchand
---
drivers/net/null/rte_eth_null.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 159c1c1..0e30886 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -333,10 +333,8 @@ struct pmd_internals {
for (i = 0; i < num_stats; i++) {
igb_stats->q_opackets[i] =
internal->tx_null_queues[i].tx_pkts.cnt;
- igb_stats->q_errors[i] =
- internal->tx_null_queues[i].err_pkts.cnt;
tx_total += igb_stats->q_opackets[i];
- tx_err_total += igb_stats->q_errors[i];
+ tx_err_total += internal->tx_null_queues[i].err_pkts.cnt;
}
igb_stats->ipackets = rx_total;
--
1.8.3.1
[dpdk-dev] [PATCH 10/12] net/ring: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: e1e4017751f1 ("ring: add new driver")
Cc: sta...@dpdk.org
Cc: Bruce Richardson
Signed-off-by: David Marchand
---
drivers/net/ring/rte_eth_ring.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index aeb48f5..4865763 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -182,9 +182,8 @@ struct pmd_internals {
for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&
i < dev->data->nb_tx_queues; i++) {
stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt;
- stats->q_errors[i] = internal->tx_ring_queues[i].err_pkts.cnt;
tx_total += stats->q_opackets[i];
- tx_err_total += stats->q_errors[i];
+ tx_err_total += internal->tx_ring_queues[i].err_pkts.cnt;
}
stats->ipackets = rx_total;
--
1.8.3.1
[dpdk-dev] [PATCH 11/12] net/szedata2: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: abef3dd62e7a ("szedata2: add new poll mode driver")
Cc: sta...@dpdk.org
Cc: Jan Remes
Signed-off-by: David Marchand
---
drivers/net/szedata2/rte_eth_szedata2.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/szedata2/rte_eth_szedata2.c
b/drivers/net/szedata2/rte_eth_szedata2.c
index 88448ef..a6fbfe3 100644
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -1093,7 +1093,6 @@ struct szedata2_tx_queue {
if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
stats->q_opackets[i] = txq->tx_pkts;
stats->q_obytes[i] = txq->tx_bytes;
- stats->q_errors[i] = txq->err_pkts;
}
tx_total += txq->tx_pkts;
tx_total_bytes += txq->tx_bytes;
--
1.8.3.1
[dpdk-dev] [PATCH 12/12] net/tap: fix incorrect rxq errors stat
Transmit errors must not be reported in q_errors[] which is for
reception.
Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")
Cc: sta...@dpdk.org
Cc: Keith Wiles
Signed-off-by: David Marchand
---
drivers/net/tap/rte_eth_tap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 6f5109f..94c728f 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -968,10 +968,9 @@ struct ipc_queues {
for (i = 0; i < imax; i++) {
tap_stats->q_opackets[i] = pmd->txq[i].stats.opackets;
- tap_stats->q_errors[i] = pmd->txq[i].stats.errs;
tap_stats->q_obytes[i] = pmd->txq[i].stats.obytes;
tx_total += tap_stats->q_opackets[i];
- tx_err_total += tap_stats->q_errors[i];
+ tx_err_total += pmd->txq[i].stats.errs;
tx_bytes_total += tap_stats->q_obytes[i];
}
--
1.8.3.1
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
On Fri, Mar 1, 2019 at 3:38 PM Rastislav Cernay wrote:
> diff --git a/drivers/net/nfb/nfb_stats.c b/drivers/net/nfb/nfb_stats.c
> new file mode 100644
> index 000..ffc27a5
> --- /dev/null
> +++ b/drivers/net/nfb/nfb_stats.c
> @@ -0,0 +1,78 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2018 Cesnet
> + * Copyright(c) 2018 Netcope Technologies, a.s.
> + * All rights reserved.
> + */
> +
> +#include "nfb_stats.h"
> +#include "nfb.h"
> +
> +int
> +nfb_eth_stats_get(struct rte_eth_dev *dev,
> + struct rte_eth_stats *stats)
> +{
> + uint16_t i;
> + uint16_t nb_rx = dev->data->nb_rx_queues;
> + uint16_t nb_tx = dev->data->nb_tx_queues;
> + uint64_t rx_total = 0;
> + uint64_t tx_total = 0;
> + uint64_t tx_err_total = 0;
> + uint64_t rx_total_bytes = 0;
> + uint64_t tx_total_bytes = 0;
> +
> + struct ndp_rx_queue *rx_queue = *((struct ndp_rx_queue **)
> + dev->data->rx_queues);
> + struct ndp_tx_queue *tx_queue = *((struct ndp_tx_queue **)
> + dev->data->tx_queues);
> +
> + for (i = 0; i < nb_rx; i++) {
> + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
> + stats->q_ipackets[i] = rx_queue[i].rx_pkts;
> + stats->q_ibytes[i] = rx_queue[i].rx_bytes;
> + }
> + rx_total += stats->q_ipackets[i];
> + rx_total_bytes += stats->q_ibytes[i];
> + }
>
What is the point of adding when i >= RTE_ETHDEV_QUEUE_STAT_CNTRS ?
Hopefully, ethdev passes a zero'd structure, but still I find it confusing.
> +
> + for (i = 0; i < nb_tx; i++) {
> + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
> + stats->q_opackets[i] = tx_queue[i].tx_pkts;
> + stats->q_obytes[i] = tx_queue[i].tx_bytes;
> + stats->q_errors[i] = tx_queue[i].err_pkts;
> + }
> + tx_total += stats->q_opackets[i];
> + tx_total_bytes += stats->q_obytes[i];
> + tx_err_total += stats->q_errors[i];
> + }
>
Idem.
Besides, q_errors[] is for reception errors.
+
> + stats->ipackets = rx_total;
> + stats->opackets = tx_total;
> + stats->ibytes = rx_total_bytes;
> + stats->obytes = tx_total_bytes;
> + stats->oerrors = tx_err_total;
> + return 0;
> +}
>
>
--
David Marchand
Re: [dpdk-dev] [EXT] [PATCH] devtools: fix index generation
On Mon, 2019-03-04 at 11:04 +, Ferruh Yigit wrote:
>
> ---
> build-tags.sh is broken because of removed 'test' folder, this breaks
> helper make targets like 'make cscope', 'make tags', etc...
>
> Fixing it by removing 'test' from source directories list.
>
> Fixes: a9de470cc7c0 ("test: move to app directory")
>
> Signed-off-by: Ferruh Yigit
> ---
> Cc: bruce.richard...@intel.com
> ---
Acked-by: Jerin Jacob
[dpdk-dev] [PATCH] crypto/aesni_mb: support newer version library only
As stated in 19.02 deprecation notice, this patch updates the
aesni_mb PMD to remove the support of older Intel-ipsec-mb
library version eariler than 0.52.
Signed-off-by: Fan Zhang
---
Although the PMD dependency to the library is changed, the ABI/API
are not updated as the APIs to access the PMD remains intact. When
the user compile the PMD a error message "IPSec MB version >=
0.52" will be displayed to inform the user to update the library.
doc/guides/cryptodevs/aesni_mb.rst |8 +-
doc/guides/rel_notes/deprecation.rst |3 -
drivers/crypto/aesni_mb/Makefile | 21 +-
drivers/crypto/aesni_mb/aesni_mb_ops.h | 302 -
drivers/crypto/aesni_mb/meson.build| 13 +-
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_compat.c | 1313
.../crypto/aesni_mb/rte_aesni_mb_pmd_ops_compat.c | 745 ---
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 37 -
8 files changed, 16 insertions(+), 2426 deletions(-)
delete mode 100644 drivers/crypto/aesni_mb/aesni_mb_ops.h
delete mode 100644 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_compat.c
delete mode 100644 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops_compat.c
diff --git a/doc/guides/cryptodevs/aesni_mb.rst
b/doc/guides/cryptodevs/aesni_mb.rst
index 47f2ecc2f..d3567d279 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -57,10 +57,7 @@ Limitations
* Chained mbufs are not supported.
* Only in-place is currently supported (destination address is the same as
source address).
-* RTE_CRYPTO_AEAD_AES_GCM only works properly when the multi-buffer library is
- 0.51.0 or newer.
-* RTE_CRYPTO_HASH_AES_GMAC is supported by library version v0.51 or later.
-* RTE_CRYPTO_HASH_SHA* is supported by library version v0.52 or later.
+* Only support Intel multi buffer library version 0.52 or later.
Installation
@@ -92,7 +89,8 @@ and the Multi-Buffer library version supported by them:
17.05 - 17.08 0.45 - 0.48
17.11 0.47 - 0.48
18.02 0.48
- 18.05+ 0.49+
+ 18.05 0.49
+ 19.02+ 0.52+
==
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 1b4fcb7e6..8adeaa552 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -72,6 +72,3 @@ Deprecation Notices
replace ``enum rte_meter_color`` in meter library in 19.05. This will help
to consolidate color definition, which is currently replicated in many
places,
such as: rte_meter.h, rte_mtr.h, rte_tm.h.
-
-* crypto/aesni_mb: the minimum supported intel-ipsec-mb library version will be
- changed from 0.49.0 to 0.52.0.
diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile
index 8d2024c9e..f3035340a 100644
--- a/drivers/crypto/aesni_mb/Makefile
+++ b/drivers/crypto/aesni_mb/Makefile
@@ -32,19 +32,14 @@ IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR)
| cut -d'"' -f2)
IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
ifeq ($(IMB_VERSION),)
- # files for older version of IMB
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_compat.c
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops_compat.c
-else
- ifeq ($(shell expr $(IMB_VERSION_NUM) \>= 0x3400), 1)
- # files for a new version of IMB
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c
- else
- # files for older version of IMB
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) +=
rte_aesni_mb_pmd_compat.c
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) +=
rte_aesni_mb_pmd_ops_compat.c
- endif
+$(error "IPSec_MB version >= 0.52 is required")
endif
+ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
+$(error "IPSec_MB version >= 0.52 is required")
+endif
+
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c
+
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/aesni_mb/aesni_mb_ops.h
b/drivers/crypto/aesni_mb/aesni_mb_ops.h
deleted file mode 100644
index 575d6a5b8..0
--- a/drivers/crypto/aesni_mb/aesni_mb_ops.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015 Intel Corporation
- */
-
-#ifndef _AESNI_MB_OPS_H_
-#define _AESNI_MB_OPS_H_
-
-#ifndef LINUX
-#define LINUX
-#endif
-
-#include
-
-/*
- * IMB_VERSION_NUM macro was introduced in version Multi-buffer 0.50,
- * so if macro is not defined, it means that the version is 0.49.
- */
-#if !defined(IMB_VERSION_NUM)
-#define IMB_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define IMB_VERSION_NUM IMB_VERSION(0, 49, 0)
-#endif
-
-enum aesni_mb_vector_mode {
-
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
Typically device works in promiscuous mode and filtering/processing is done
after
packets are received, use of MACS is a marginal case so we are not exactly
focused
on it. I will add random ethernet address so card can work in initial state
with multiple
devices.
On Fri, Mar 1, 2019 at 7:47 PM Stephen Hemminger
wrote:
> On Fri, 1 Mar 2019 15:37:34 +0100
> Rastislav Cernay wrote:
>
> > +/**
> > + * Default MAC addr
> > + */
> > +static struct ether_addr eth_addr = {
> > + .addr_bytes = { 0x00, 0x11, 0x17, 0x00, 0x00, 0x00 }
>
> You might want to consider using a random ethernet address.
> What does the device do on Linux?
>
Re: [dpdk-dev] [PATCH 02/12] net/avp: fix incorrect rxq errors stat
> -Original Message-
> From: David Marchand [mailto:david.march...@redhat.com]
> Sent: Monday, March 04, 2019 6:18 AM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Legacy, Allain; Peters, Matt
> Subject: [PATCH 02/12] net/avp: fix incorrect rxq errors stat
>
> Transmit errors must not be reported in q_errors[] which is for reception.
>
> Fixes: 5a5abe2de94b ("net/avp: add device statistics operations")
> Cc: sta...@dpdk.org
> Cc: Allain Legacy
> Cc: Matt Peters
> Signed-off-by: David Marchand
> ---
Acked-by: Allain Legacy
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
>>> What is the point of adding when i >= RTE_ETHDEV_QUEUE_STAT_CNTRS ?
struct rte_eth_stats {
...
uint64_t q_opackets[RTE_ETHDEV_QUEUE_STAT_CNTRS]
...
}
As there can be more queues (nb_tx) then RTE_ETHDEV_QUEUE_STAT_CNTRS (16)
and struct rte_eth_stats eth_stats is allocated statically,
there is need to check so it does not write garbage somewhere.
>>> Besides, q_errors[] is for reception errors.
I will fix that, meanwhile could q_errors[] be renamed to q_ierrors[]? Also
could there be a way to publish output errors per queue, for example
q_oerrors[]?
On Mon, Mar 4, 2019 at 12:35 PM David Marchand
wrote:
>
> On Fri, Mar 1, 2019 at 3:38 PM Rastislav Cernay
> wrote:
>
>> diff --git a/drivers/net/nfb/nfb_stats.c b/drivers/net/nfb/nfb_stats.c
>> new file mode 100644
>> index 000..ffc27a5
>> --- /dev/null
>> +++ b/drivers/net/nfb/nfb_stats.c
>> @@ -0,0 +1,78 @@
>> +/* SPDX-License-Identifier: BSD-3-Clause
>> + * Copyright(c) 2018 Cesnet
>> + * Copyright(c) 2018 Netcope Technologies, a.s.
>> + * All rights reserved.
>> + */
>> +
>> +#include "nfb_stats.h"
>> +#include "nfb.h"
>> +
>> +int
>> +nfb_eth_stats_get(struct rte_eth_dev *dev,
>> + struct rte_eth_stats *stats)
>> +{
>> + uint16_t i;
>> + uint16_t nb_rx = dev->data->nb_rx_queues;
>> + uint16_t nb_tx = dev->data->nb_tx_queues;
>> + uint64_t rx_total = 0;
>> + uint64_t tx_total = 0;
>> + uint64_t tx_err_total = 0;
>> + uint64_t rx_total_bytes = 0;
>> + uint64_t tx_total_bytes = 0;
>> +
>> + struct ndp_rx_queue *rx_queue = *((struct ndp_rx_queue **)
>> + dev->data->rx_queues);
>> + struct ndp_tx_queue *tx_queue = *((struct ndp_tx_queue **)
>> + dev->data->tx_queues);
>> +
>> + for (i = 0; i < nb_rx; i++) {
>> + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
>> + stats->q_ipackets[i] = rx_queue[i].rx_pkts;
>> + stats->q_ibytes[i] = rx_queue[i].rx_bytes;
>> + }
>> + rx_total += stats->q_ipackets[i];
>> + rx_total_bytes += stats->q_ibytes[i];
>> + }
>>
>
> What is the point of adding when i >= RTE_ETHDEV_QUEUE_STAT_CNTRS ?
> Hopefully, ethdev passes a zero'd structure, but still I find it confusing.
>
>
>
>> +
>> + for (i = 0; i < nb_tx; i++) {
>> + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
>> + stats->q_opackets[i] = tx_queue[i].tx_pkts;
>> + stats->q_obytes[i] = tx_queue[i].tx_bytes;
>> + stats->q_errors[i] = tx_queue[i].err_pkts;
>> + }
>> + tx_total += stats->q_opackets[i];
>> + tx_total_bytes += stats->q_obytes[i];
>> + tx_err_total += stats->q_errors[i];
>> + }
>>
>
> Idem.
> Besides, q_errors[] is for reception errors.
>
> +
>> + stats->ipackets = rx_total;
>> + stats->opackets = tx_total;
>> + stats->ibytes = rx_total_bytes;
>> + stats->obytes = tx_total_bytes;
>> + stats->oerrors = tx_err_total;
>> + return 0;
>> +}
>>
>>
> --
> David Marchand
>
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
On Mon, Mar 4, 2019 at 1:30 PM Rastislav Černay wrote:
> >>> What is the point of adding when i >= RTE_ETHDEV_QUEUE_STAT_CNTRS ?
>
> struct rte_eth_stats {
> ...
> uint64_t q_opackets[RTE_ETHDEV_QUEUE_STAT_CNTRS]
> ...
> }
>
> As there can be more queues (nb_tx) then RTE_ETHDEV_QUEUE_STAT_CNTRS (16)
> and struct rte_eth_stats eth_stats is allocated statically,
> there is need to check so it does not write garbage somewhere.
>
How about looping on min(nb_tx, RTE_ETHDEV_QUEUE_STAT_CNTRS) ?
> >>> Besides, q_errors[] is for reception errors.
> I will fix that, meanwhile could q_errors[] be renamed to q_ierrors[]?
> Also could there be a way to publish output errors per queue, for example
> q_oerrors[]?
>
At the moment, no, this would be a api breakage, and adding oerrors would
be a abi breakage.
This can be discussed yes, I just sent a series about q_errors[].
You can still export this via xstats.
--
David Marchand
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
On Mon, Mar 4, 2019 at 1:35 PM David Marchand
wrote:
>
>
> On Mon, Mar 4, 2019 at 1:30 PM Rastislav Černay
> wrote:
>
>> >>> What is the point of adding when i >= RTE_ETHDEV_QUEUE_STAT_CNTRS ?
>>
>> struct rte_eth_stats {
>> ...
>> uint64_t q_opackets[RTE_ETHDEV_QUEUE_STAT_CNTRS]
>> ...
>> }
>>
>> As there can be more queues (nb_tx) then RTE_ETHDEV_QUEUE_STAT_CNTRS
>> (16) and struct rte_eth_stats eth_stats is allocated statically,
>> there is need to check so it does not write garbage somewhere.
>>
>
> How about looping on min(nb_tx, RTE_ETHDEV_QUEUE_STAT_CNTRS) ?
>
Or add the tx_queue[i].tx_xxx; to the associated global stats and only
fills q_xxx depending on the check.
--
David Marchand
Re: [dpdk-dev] [PATCH v3] net/nfb: new netcope driver
>>>How about looping on min(nb_tx, RTE_ETHDEV_QUEUE_STAT_CNTRS) ?
This would lead to incomplete tx_total (and other total) stats. Maybe I
could just
add commentary, why it is written like this and leave it be?
On Mon, Mar 4, 2019 at 1:48 PM David Marchand
wrote:
> On Mon, Mar 4, 2019 at 1:35 PM David Marchand
> wrote:
>
>>
>>
>> On Mon, Mar 4, 2019 at 1:30 PM Rastislav Černay
>> wrote:
>>
>>> >>> What is the point of adding when i >= RTE_ETHDEV_QUEUE_STAT_CNTRS ?
>>>
>>> struct rte_eth_stats {
>>> ...
>>> uint64_t q_opackets[RTE_ETHDEV_QUEUE_STAT_CNTRS]
>>> ...
>>> }
>>>
>>> As there can be more queues (nb_tx) then RTE_ETHDEV_QUEUE_STAT_CNTRS
>>> (16) and struct rte_eth_stats eth_stats is allocated statically,
>>> there is need to check so it does not write garbage somewhere.
>>>
>>
>> How about looping on min(nb_tx, RTE_ETHDEV_QUEUE_STAT_CNTRS) ?
>>
>
> Or add the tx_queue[i].tx_xxx; to the associated global stats and only
> fills q_xxx depending on the check.
>
>
> --
> David Marchand
>
Re: [dpdk-dev] [PATCH 12/12] net/tap: fix incorrect rxq errors stat
> On Mar 4, 2019, at 5:18 AM, David Marchand wrote:
>
> Transmit errors must not be reported in q_errors[] which is for
> reception.
>
> Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")
> Cc: sta...@dpdk.org
> Cc: Keith Wiles
> Signed-off-by: David Marchand
> ---
> drivers/net/tap/rte_eth_tap.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index 6f5109f..94c728f 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -968,10 +968,9 @@ struct ipc_queues {
>
> for (i = 0; i < imax; i++) {
> tap_stats->q_opackets[i] = pmd->txq[i].stats.opackets;
> - tap_stats->q_errors[i] = pmd->txq[i].stats.errs;
> tap_stats->q_obytes[i] = pmd->txq[i].stats.obytes;
> tx_total += tap_stats->q_opackets[i];
> - tx_err_total += tap_stats->q_errors[i];
> + tx_err_total += pmd->txq[i].stats.errs;
> tx_bytes_total += tap_stats->q_obytes[i];
> }
>
> --
> 1.8.3.1
>
Acked-by: Keith Wiles
Regards,
Keith
Re: [dpdk-dev] [PATCH] crypto/aesni_mb: support newer version library only
Hi Fan, > -Original Message- > From: Zhang, Roy Fan > Sent: Monday, March 4, 2019 11:47 AM > To: dev@dpdk.org > Cc: akhil.go...@nxp.com; Zhang, Roy Fan ; Kusztal, > ArkadiuszX > ; Trahe, Fiona > Subject: [PATCH] crypto/aesni_mb: support newer version library only > > As stated in 19.02 deprecation notice, this patch updates the > aesni_mb PMD to remove the support of older Intel-ipsec-mb > library version eariler than 0.52. > > Signed-off-by: Fan Zhang > --- > Although the PMD dependency to the library is changed, the ABI/API > are not updated as the APIs to access the PMD remains intact. When > the user compile the PMD a error message "IPSec MB version >= > 0.52" will be displayed to inform the user to update the library. > > doc/guides/cryptodevs/aesni_mb.rst |8 +- > doc/guides/rel_notes/deprecation.rst |3 - > drivers/crypto/aesni_mb/Makefile | 21 +- > drivers/crypto/aesni_mb/aesni_mb_ops.h | 302 - > drivers/crypto/aesni_mb/meson.build| 13 +- > drivers/crypto/aesni_mb/rte_aesni_mb_pmd_compat.c | 1313 > > .../crypto/aesni_mb/rte_aesni_mb_pmd_ops_compat.c | 745 --- > drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 37 - > 8 files changed, 16 insertions(+), 2426 deletions(-) > delete mode 100644 drivers/crypto/aesni_mb/aesni_mb_ops.h > delete mode 100644 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_compat.c > delete mode 100644 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops_compat.c > > diff --git a/doc/guides/cryptodevs/aesni_mb.rst > b/doc/guides/cryptodevs/aesni_mb.rst > index 47f2ecc2f..d3567d279 100644 > --- a/doc/guides/cryptodevs/aesni_mb.rst > +++ b/doc/guides/cryptodevs/aesni_mb.rst > @@ -57,10 +57,7 @@ Limitations > > * Chained mbufs are not supported. > * Only in-place is currently supported (destination address is the same as > source address). > -* RTE_CRYPTO_AEAD_AES_GCM only works properly when the multi-buffer library > is > - 0.51.0 or newer. > -* RTE_CRYPTO_HASH_AES_GMAC is supported by library version v0.51 or later. > -* RTE_CRYPTO_HASH_SHA* is supported by library version v0.52 or later. > +* Only support Intel multi buffer library version 0.52 or later. > > > Installation > @@ -92,7 +89,8 @@ and the Multi-Buffer library version supported by them: > 17.05 - 17.08 0.45 - 0.48 > 17.11 0.47 - 0.48 > 18.02 0.48 > - 18.05+ 0.49+ > + 18.05 0.49 > + 19.02+ 0.52+ [Fiona] shouldn't this be 19.05+ 0.52+
[dpdk-dev] [PATCH v2] crypto/aesni_mb: support newer version library only
As stated in 19.02 deprecation notice, this patch updates the
aesni_mb PMD to remove the support of older Intel-ipsec-mb
library version eariler than 0.52.
Signed-off-by: Fan Zhang
---
v2:
- fixed incorrect version in documentation.
doc/guides/cryptodevs/aesni_mb.rst |8 +-
doc/guides/rel_notes/deprecation.rst |3 -
drivers/crypto/aesni_mb/Makefile | 21 +-
drivers/crypto/aesni_mb/aesni_mb_ops.h | 302 -
drivers/crypto/aesni_mb/meson.build| 13 +-
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_compat.c | 1313
.../crypto/aesni_mb/rte_aesni_mb_pmd_ops_compat.c | 745 ---
drivers/crypto/aesni_mb/rte_aesni_mb_pmd_private.h | 37 -
8 files changed, 16 insertions(+), 2426 deletions(-)
delete mode 100644 drivers/crypto/aesni_mb/aesni_mb_ops.h
delete mode 100644 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_compat.c
delete mode 100644 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops_compat.c
diff --git a/doc/guides/cryptodevs/aesni_mb.rst
b/doc/guides/cryptodevs/aesni_mb.rst
index 47f2ecc2f..66c44e03a 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -57,10 +57,7 @@ Limitations
* Chained mbufs are not supported.
* Only in-place is currently supported (destination address is the same as
source address).
-* RTE_CRYPTO_AEAD_AES_GCM only works properly when the multi-buffer library is
- 0.51.0 or newer.
-* RTE_CRYPTO_HASH_AES_GMAC is supported by library version v0.51 or later.
-* RTE_CRYPTO_HASH_SHA* is supported by library version v0.52 or later.
+* Only support Intel multi buffer library version 0.52 or later.
Installation
@@ -92,7 +89,8 @@ and the Multi-Buffer library version supported by them:
17.05 - 17.08 0.45 - 0.48
17.11 0.47 - 0.48
18.02 0.48
- 18.05+ 0.49+
+ 18.05 0.49
+ 19.05+ 0.52+
==
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 1b4fcb7e6..8adeaa552 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -72,6 +72,3 @@ Deprecation Notices
replace ``enum rte_meter_color`` in meter library in 19.05. This will help
to consolidate color definition, which is currently replicated in many
places,
such as: rte_meter.h, rte_mtr.h, rte_tm.h.
-
-* crypto/aesni_mb: the minimum supported intel-ipsec-mb library version will be
- changed from 0.49.0 to 0.52.0.
diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile
index 8d2024c9e..f3035340a 100644
--- a/drivers/crypto/aesni_mb/Makefile
+++ b/drivers/crypto/aesni_mb/Makefile
@@ -32,19 +32,14 @@ IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR)
| cut -d'"' -f2)
IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
ifeq ($(IMB_VERSION),)
- # files for older version of IMB
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_compat.c
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops_compat.c
-else
- ifeq ($(shell expr $(IMB_VERSION_NUM) \>= 0x3400), 1)
- # files for a new version of IMB
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c
- else
- # files for older version of IMB
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) +=
rte_aesni_mb_pmd_compat.c
- SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) +=
rte_aesni_mb_pmd_ops_compat.c
- endif
+$(error "IPSec_MB version >= 0.52 is required")
endif
+ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
+$(error "IPSec_MB version >= 0.52 is required")
+endif
+
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c
+
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/aesni_mb/aesni_mb_ops.h
b/drivers/crypto/aesni_mb/aesni_mb_ops.h
deleted file mode 100644
index 575d6a5b8..0
--- a/drivers/crypto/aesni_mb/aesni_mb_ops.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015 Intel Corporation
- */
-
-#ifndef _AESNI_MB_OPS_H_
-#define _AESNI_MB_OPS_H_
-
-#ifndef LINUX
-#define LINUX
-#endif
-
-#include
-
-/*
- * IMB_VERSION_NUM macro was introduced in version Multi-buffer 0.50,
- * so if macro is not defined, it means that the version is 0.49.
- */
-#if !defined(IMB_VERSION_NUM)
-#define IMB_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define IMB_VERSION_NUM IMB_VERSION(0, 49, 0)
-#endif
-
-enum aesni_mb_vector_mode {
- RTE_AESNI_MB_NOT_SUPPORTED = 0,
- RTE_AESNI_MB_SSE,
- RTE_AESNI_MB_AVX,
- RTE_AESNI_MB_AVX2,
- RTE_AESNI_MB_AVX512
-};
-
-typedef void (*md5_one_block_t)(const void *data, void *digest);
Re: [dpdk-dev] [RFC v2 2/2] vhost: support requests only handled by external backend
On 28.02.2019 18:31, Maxime Coquelin wrote:
> External backends may have specific requests to handle, and so
> we don't want the vhost-user lib to handle these requests as
> errors.
>
> This patch also changes the experimental API by introducing
> RTE_VHOST_MSG_RESULT_NOT_HANDLED so that vhost-user lib
> can report an error if a message is handled neither by
> the vhost-user library nor by the external backend.
>
> The logic changes a bit so that if the callback returns
> with ERR, OK or REPLY, it is considered the message
> is handled by the external backend so it won't be
> handled by the vhost-user library.
> It is still possible for an external backend to listen
> to requests that have to be handled by the vhost-user
> library like SET_MEM_TABLE, but the callback have to
> return NOT_HANDLED in that case.
>
> Suggested-by: Ilya Maximets
> Signed-off-by: Maxime Coquelin
> ---
> lib/librte_vhost/rte_vhost.h | 16 +---
> lib/librte_vhost/vhost_user.c | 75 +++
> 2 files changed, 60 insertions(+), 31 deletions(-)
>
> diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
> index c9c392975..b1c5a0908 100644
> --- a/lib/librte_vhost/rte_vhost.h
> +++ b/lib/librte_vhost/rte_vhost.h
> @@ -121,6 +121,8 @@ enum rte_vhost_msg_result {
> RTE_VHOST_MSG_RESULT_OK = 0,
> /* Message handling successful and reply prepared */
> RTE_VHOST_MSG_RESULT_REPLY = 1,
> + /* Message not handled */
> + RTE_VHOST_MSG_RESULT_NOT_HANDLED,
> };
>
> /**
> @@ -135,11 +137,13 @@ enum rte_vhost_msg_result {
> * If the handler requires skipping the master message handling, this
> variable
> * shall be written 1, otherwise 0.
> * @return
> - * VH_RESULT_OK on success, VH_RESULT_REPLY on success with reply,
> - * VH_RESULT_ERR on failure
> + * RTE_VHOST_MSG_RESULT_OK on success,
> + * RTE_VHOST_MSG_RESULT_REPLY on success with reply,
> + * RTE_VHOST_MSG_RESULT_ERR on failure,
> + * RTE_VHOST_MSG_RESULT_NOT_HANDLED if message was not handled.
> */
> typedef enum rte_vhost_msg_result (*rte_vhost_msg_pre_handle)(int vid,
> - void *msg, uint32_t *skip_master);
> + void *msg);
>
> /**
> * Function prototype for the vhost backend to handler specific vhost user
> @@ -150,8 +154,10 @@ typedef enum rte_vhost_msg_result
> (*rte_vhost_msg_pre_handle)(int vid,
> * @param msg
> * Message pointer.
> * @return
> - * VH_RESULT_OK on success, VH_RESULT_REPLY on success with reply,
> - * VH_RESULT_ERR on failure
> + * RTE_VHOST_MSG_RESULT_OK on success,
> + * RTE_VHOST_MSG_RESULT_REPLY on success with reply,
> + * RTE_VHOST_MSG_RESULT_ERR on failure,
> + * RTE_VHOST_MSG_RESULT_NOT_HANDLED if message was not handled.
> */
> typedef enum rte_vhost_msg_result (*rte_vhost_msg_post_handle)(int vid,
> void *msg);
According to above definition, we should make corresponding change in
vhost_crypto.
Something like this:
---
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index 0f437c4a1..f0eedd422 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -453,14 +453,20 @@ vhost_crypto_msg_post_handler(int vid, void *msg)
return RTE_VHOST_MSG_RESULT_ERR;
}
- if (vmsg->request.master == VHOST_USER_CRYPTO_CREATE_SESS) {
+ switch (vmsg->request.master) {
+ VHOST_USER_CRYPTO_CREATE_SESS:
vhost_crypto_create_sess(vcrypto,
&vmsg->payload.crypto_session);
vmsg->fd_num = 0;
ret = RTE_VHOST_MSG_RESULT_REPLY;
- } else if (vmsg->request.master == VHOST_USER_CRYPTO_CLOSE_SESS) {
+ break;
+ VHOST_USER_CRYPTO_CLOSE_SESS:
if (vhost_crypto_close_sess(vcrypto, vmsg->payload.u64))
ret = RTE_VHOST_MSG_RESULT_ERR;
+ break;
+ default:
+ ret = RTE_VHOST_MSG_RESULT_NOT_HANDLED;
+ break;
}
return ret;
---
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 36c0c676d..ca9167f1d 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -1906,7 +1906,7 @@ vhost_user_msg_handler(int vid, int fd)
> int did = -1;
> int ret;
> int unlock_required = 0;
> - uint32_t skip_master = 0;
> + bool handled;
In below code 'handled' equals to 'false' only if 'ret' equals to
'RTE_VHOST_MSG_RESULT_NOT_HANDLED'. Looks like we don't need this
variable.
> int request;
>
> dev = get_device(vid);
> @@ -1924,27 +1924,29 @@ vhost_user_msg_handler(int vid, int fd)
> }
>
> ret = read_vhost_message(fd, &msg);
> - if (ret <= 0 || msg.request.master >= VHOST_USER_MAX) {
> + if (ret <= 0) {
> if (ret < 0)
> RTE_LOG(ERR, VHOST_CONFIG,
> "vhost read messa
Re: [dpdk-dev] [RFC v2 2/2] vhost: support requests only handled by external backend
On 3/4/19 4:25 PM, Ilya Maximets wrote:
On 28.02.2019 18:31, Maxime Coquelin wrote:
External backends may have specific requests to handle, and so
we don't want the vhost-user lib to handle these requests as
errors.
This patch also changes the experimental API by introducing
RTE_VHOST_MSG_RESULT_NOT_HANDLED so that vhost-user lib
can report an error if a message is handled neither by
the vhost-user library nor by the external backend.
The logic changes a bit so that if the callback returns
with ERR, OK or REPLY, it is considered the message
is handled by the external backend so it won't be
handled by the vhost-user library.
It is still possible for an external backend to listen
to requests that have to be handled by the vhost-user
library like SET_MEM_TABLE, but the callback have to
return NOT_HANDLED in that case.
Suggested-by: Ilya Maximets
Signed-off-by: Maxime Coquelin
---
lib/librte_vhost/rte_vhost.h | 16 +---
lib/librte_vhost/vhost_user.c | 75 +++
2 files changed, 60 insertions(+), 31 deletions(-)
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index c9c392975..b1c5a0908 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -121,6 +121,8 @@ enum rte_vhost_msg_result {
RTE_VHOST_MSG_RESULT_OK = 0,
/* Message handling successful and reply prepared */
RTE_VHOST_MSG_RESULT_REPLY = 1,
+ /* Message not handled */
+ RTE_VHOST_MSG_RESULT_NOT_HANDLED,
};
/**
@@ -135,11 +137,13 @@ enum rte_vhost_msg_result {
* If the handler requires skipping the master message handling, this
variable
* shall be written 1, otherwise 0.
* @return
- * VH_RESULT_OK on success, VH_RESULT_REPLY on success with reply,
- * VH_RESULT_ERR on failure
+ * RTE_VHOST_MSG_RESULT_OK on success,
+ * RTE_VHOST_MSG_RESULT_REPLY on success with reply,
+ * RTE_VHOST_MSG_RESULT_ERR on failure,
+ * RTE_VHOST_MSG_RESULT_NOT_HANDLED if message was not handled.
*/
typedef enum rte_vhost_msg_result (*rte_vhost_msg_pre_handle)(int vid,
- void *msg, uint32_t *skip_master);
+ void *msg);
/**
* Function prototype for the vhost backend to handler specific vhost user
@@ -150,8 +154,10 @@ typedef enum rte_vhost_msg_result
(*rte_vhost_msg_pre_handle)(int vid,
* @param msg
* Message pointer.
* @return
- * VH_RESULT_OK on success, VH_RESULT_REPLY on success with reply,
- * VH_RESULT_ERR on failure
+ * RTE_VHOST_MSG_RESULT_OK on success,
+ * RTE_VHOST_MSG_RESULT_REPLY on success with reply,
+ * RTE_VHOST_MSG_RESULT_ERR on failure,
+ * RTE_VHOST_MSG_RESULT_NOT_HANDLED if message was not handled.
*/
typedef enum rte_vhost_msg_result (*rte_vhost_msg_post_handle)(int vid,
void *msg);
According to above definition, we should make corresponding change in
vhost_crypto.
Something like this:
---
diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypto.c
index 0f437c4a1..f0eedd422 100644
--- a/lib/librte_vhost/vhost_crypto.c
+++ b/lib/librte_vhost/vhost_crypto.c
@@ -453,14 +453,20 @@ vhost_crypto_msg_post_handler(int vid, void *msg)
return RTE_VHOST_MSG_RESULT_ERR;
}
- if (vmsg->request.master == VHOST_USER_CRYPTO_CREATE_SESS) {
+ switch (vmsg->request.master) {
+ VHOST_USER_CRYPTO_CREATE_SESS:
vhost_crypto_create_sess(vcrypto,
&vmsg->payload.crypto_session);
vmsg->fd_num = 0;
ret = RTE_VHOST_MSG_RESULT_REPLY;
- } else if (vmsg->request.master == VHOST_USER_CRYPTO_CLOSE_SESS) {
+ break;
+ VHOST_USER_CRYPTO_CLOSE_SESS:
if (vhost_crypto_close_sess(vcrypto, vmsg->payload.u64))
ret = RTE_VHOST_MSG_RESULT_ERR;
+ break;
+ default:
+ ret = RTE_VHOST_MSG_RESULT_NOT_HANDLED;
+ break;
}
return ret;
---
Indeed, it will be part of v1 if Changpeng confirms this RFC is working
for his usecase.
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 36c0c676d..ca9167f1d 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1906,7 +1906,7 @@ vhost_user_msg_handler(int vid, int fd)
int did = -1;
int ret;
int unlock_required = 0;
- uint32_t skip_master = 0;
+ bool handled;
In below code 'handled' equals to 'false' only if 'ret' equals to
'RTE_VHOST_MSG_RESULT_NOT_HANDLED'. Looks like we don't need this
variable.
Actually I think it is necessary, more below.
int request;
dev = get_device(vid);
@@ -1924,27 +1924,29 @@ vhost_user_msg_handler(int vid, int fd)
}
ret = read_vhost_message(fd, &msg);
- if (ret <= 0 || msg.request.master >= VHOST_USER_MAX) {
+ if (ret <= 0) {
if (ret < 0)
RTE_LOG(ERR, VH
[dpdk-dev] [PATCH v2] test: add new test structure for asymmetric cryptography
This patch adds new test structure for modexp and modinv
Signed-off-by: Damian Nowak
---
v2:
- coding style improved
---
test/test/test_cryptodev_asym.c | 278 ++
test/test/test_cryptodev_mod_test_vectors.h | 954
2 files changed, 1232 insertions(+)
diff --git a/test/test/test_cryptodev_asym.c b/test/test/test_cryptodev_asym.c
index 0f6fc5767..9d703c259 100644
--- a/test/test/test_cryptodev_asym.c
+++ b/test/test/test_cryptodev_asym.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2018 Cavium Networks
+ * Copyright (c) 2019 Intel Corporation
*/
#include
@@ -25,6 +26,12 @@
#define TEST_NUM_BUFS 10
#define TEST_NUM_SESSIONS 4
+#ifndef TEST_DATA_SIZE
+ #define TEST_DATA_SIZE 4096
+#endif
+#define ASYM_TEST_MSG_LEN 256
+#define TEST_VECTOR_SIZE 256
+
static int gbl_driver_id;
struct crypto_testsuite_params {
struct rte_mempool *op_mpool;
@@ -40,8 +47,275 @@ struct crypto_unittest_params {
struct rte_crypto_op *op;
};
+union test_case_structure {
+ struct modex_test_data modex;
+ struct modinv_test_data modinv;
+};
+
+struct test_cases_array {
+ uint32_t size;
+ const void *address[TEST_VECTOR_SIZE];
+};
+static struct test_cases_array test_vector = {0, { NULL } };
+
+static uint32_t test_index;
+
static struct crypto_testsuite_params testsuite_params = { NULL };
+static int
+test_cryptodev_asym_ver(union test_case_structure *data_tc,
+ struct rte_crypto_op *result_op)
+{
+ int status = TEST_SUCCESS;
+ int ret = 0;
+ uint8_t *data_expected = NULL, *data_received = NULL;
+ size_t data_size = 0;
+
+ switch (data_tc->modex.xform_type) {
+ case RTE_CRYPTO_ASYM_XFORM_MODEX:
+ data_expected = data_tc->modex.reminder.data;
+ data_received = result_op->asym->modex.base.data;
+ data_size = result_op->asym->modex.base.length;
+ break;
+ case RTE_CRYPTO_ASYM_XFORM_MODINV:
+ data_expected = data_tc->modinv.inverse.data;
+ data_received = result_op->asym->modinv.base.data;
+ data_size = result_op->asym->modinv.base.length;
+ break;
+ case RTE_CRYPTO_ASYM_XFORM_DH:
+ case RTE_CRYPTO_ASYM_XFORM_DSA:
+ case RTE_CRYPTO_ASYM_XFORM_RSA:
+ case RTE_CRYPTO_ASYM_XFORM_NONE:
+ case RTE_CRYPTO_ASYM_XFORM_UNSPECIFIED:
+ default:
+ break;
+ }
+ ret = memcmp(data_expected, data_received, data_size);
+ if (ret)
+ status = TEST_FAILED;
+
+ return status;
+}
+
+static int
+test_cryptodev_asym_op(struct crypto_testsuite_params *ts_params,
+ union test_case_structure *data_tc,
+ char *test_msg)
+{
+ struct rte_crypto_asym_op *asym_op = NULL;
+ struct rte_crypto_op *op = NULL;
+ struct rte_crypto_op *result_op = NULL;
+ struct rte_crypto_asym_xform xform_tc;
+ struct rte_cryptodev_asym_session *sess = NULL;
+ struct rte_cryptodev_asym_capability_idx cap_idx;
+ const struct rte_cryptodev_asymmetric_xform_capability *capability;
+ uint8_t dev_id = ts_params->valid_devs[0];
+ uint8_t input[TEST_DATA_SIZE] = {0};
+
+ int status = TEST_SUCCESS;
+
+ /* Generate crypto op data structure */
+ op = rte_crypto_op_alloc(ts_params->op_mpool,
+ RTE_CRYPTO_OP_TYPE_ASYMMETRIC);
+
+ if (!op) {
+ snprintf(test_msg, ASYM_TEST_MSG_LEN,
+ "line %u FAILED: %s",
+ __LINE__, "Failed to allocate asymmetric crypto "
+ "operation struct");
+ status = TEST_FAILED;
+ goto error_exit;
+ }
+
+ asym_op = op->asym;
+ xform_tc.next = NULL;
+ xform_tc.xform_type = data_tc->modex.xform_type;
+
+ cap_idx.type = xform_tc.xform_type;
+ capability = rte_cryptodev_asym_capability_get(dev_id, &cap_idx);
+
+ switch (xform_tc.xform_type) {
+ case RTE_CRYPTO_ASYM_XFORM_MODEX:
+ xform_tc.modex.modulus.data = data_tc->modex.modulus.data;
+ xform_tc.modex.modulus.length = data_tc->modex.modulus.len;
+ xform_tc.modex.exponent.data = data_tc->modex.exponent.data;
+ xform_tc.modex.exponent.length = data_tc->modex.exponent.len;
+ memcpy(input, data_tc->modex.base.data,
+ data_tc->modex.base.len);
+ asym_op->modex.base.data = input;
+ asym_op->modex.base.length = data_tc->modex.base.len;
+ if (rte_cryptodev_asym_xform_capability_check_modlen(capability,
+ xform_tc.modex.modulus.length)) {
+ snprintf(test_msg, ASYM_TEST_MSG_LEN,
+ "line %u "
+ "FAILED: %s", __LINE__,
+
[dpdk-dev] [PATCH v6 0/1] Introduce travis support
This series introduces the ability for any github mirrors of the DPDK project, including developer mirrors, to kick off builds under the travis CI infrastructure. For now, this just means compilation - no other kinds of automated run exists yet. In the future, this can be expanded to execute and report results for any test-suites that might exist. The series includes support for both the 'classic make' style builds (which are set to be deprecated at some undetermined point in the future), as well as the modern meson+ninja build system. Additionally, there is support for building the ARM64 target with both the meson and make systems. The files added under .ci/ exist so that in the future, other CI support platforms (such as cirrus, appveyor, etc.) could have a common place to put their requisite scripts without polluting the main tree. Some documentation is updated, making developers aware of the new travis integration. The integration can also be included on the official DPDK mirror. Build reports can be enabled by subscribing the travis build email to the test-reports mailing list (this can be done independent of this series being applied). v5->v6: - Removed all classic make builds v4->v5: - Renamed ARM64 to AARCH64. v3->v4: - Remove non-existing file form maintainers list: meson_cross_aarch64_gcc.txt - Renamed ARM64 to AARCH64 for travis environment variable v2->v3: - Removed duplicate file meson_cross_aarch64_gcc.txt. Used arm64_armv8_linuxapp_gcc file instead - Renamed ambiguous variable names and comments, including the variable KERNEL to DISABLE_KERNEL_MODULES and comment 'source for python' to 'Repo for python' - Removed an already-defined variable v1 -> v2: - Added patch 1/2, "examples/vhost_scsi: don't build..." - Included arm64 builds - Included multiple meson+ninja builds (full library, minimal library) - Included multiple 'classic make' builds Michael Santana (1): ci: Introduce travis builds for github repositories .ci/linux-build.sh | 21 + .ci/linux-setup.sh | 3 ++ .travis.yml | 73 + MAINTAINERS | 6 +++ doc/guides/contributing/patches.rst | 4 ++ 5 files changed, 107 insertions(+) create mode 100755 .ci/linux-build.sh create mode 100755 .ci/linux-setup.sh create mode 100644 .travis.yml -- 2.20.1
[dpdk-dev] [PATCH v6 1/1] ci: Introduce travis builds for github repositories
GitHub is a service used by developers to store repositories. GitHub
provides service integrations that allow 3rd party services to access
developer repositories and perform actions. One of these services is
Travis-CI, a simple continuous integration platform.
This is a simple initial implementation of a travis build for the DPDK
project. It doesn't require any changes from individual developers to
enable, but will allow those developers who opt-in to GitHub and the
travis service to get automatic builds for every push they make.
Additionally, the travis service will send an email to the test-report
list informing anyone interested in the automated build (including a
result).
Signed-off-by: Aaron Conole
Signed-off-by: Michael Santana
---
v6:
Removed all classic make builds
.ci/linux-build.sh | 21 +
.ci/linux-setup.sh | 3 ++
.travis.yml | 73 +
MAINTAINERS | 6 +++
doc/guides/contributing/patches.rst | 4 ++
5 files changed, 107 insertions(+)
create mode 100755 .ci/linux-build.sh
create mode 100755 .ci/linux-setup.sh
create mode 100644 .travis.yml
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
new file mode 100755
index 0..6b65ad31b
--- /dev/null
+++ b/.ci/linux-build.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -xe
+
+function on_error() {
+FILES_TO_PRINT=( "build/meson-logs/testlog.txt" "build/.ninja_log"
"build/meson-logs/meson-log.txt")
+
+for pr_file in "${FILES_TO_PRINT[@]}"; do
+if [ -e "$pr_file" ]; then
+cat "$pr_file"
+fi
+done
+}
+trap on_error ERR
+
+if [ "${AARCH64}" == "1" ]; then
+# convert the arch specifier
+OPTS="${OPTS} -DRTE_ARCH_64=1 --cross-file
config/arm/arm64_armv8_linuxapp_gcc"
+fi
+
+OPTS="$OPTS --default-library=$DEF_LIB"
+meson build --werror -Dexamples=all ${OPTS}
+ninja -C build
diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
new file mode 100755
index 0..63502c90a
--- /dev/null
+++ b/.ci/linux-setup.sh
@@ -0,0 +1,3 @@
+ #!/bin/bash
+
+python3 -m pip install --upgrade meson --user
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0..b0ab00a9d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,73 @@
+language: c
+compiler:
+ - gcc
+ - clang
+
+dist: xenial
+
+os:
+ - linux
+
+addons:
+ apt:
+update: true
+packages:
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+
+before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
+
+sudo: false
+
+env:
+ - DEF_LIB="static"
+ - DEF_LIB="shared"
+ - DEF_LIB="static" OPTS="-Denable_kmods=false"
+ - DEF_LIB="shared" OPTS="-Denable_kmods=false"
+
+matrix:
+ include:
+ - env: DEF_LIB="static" OPTS="-Denable_kmods=false" AARCH64=1
+compiler: gcc
+addons:
+ apt:
+packages:
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+ - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross]
+ - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" AARCH64=1
+compiler: gcc
+addons:
+ apt:
+packages:
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+ - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross]
+ - env: DEF_LIB="static"
+compiler: gcc
+addons:
+ apt:
+packages:
+ - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+ - env: DEF_LIB="shared"
+compiler: gcc
+addons:
+ apt:
+packages:
+ - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+ - env: DEF_LIB="static" OPTS="-Denable_kmods=false"
+compiler: gcc
+addons:
+ apt:
+packages:
+ - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+ - env: DEF_LIB="shared" OPTS="-Denable_kmods=false"
+compiler: gcc
+addons:
+ apt:
+packages:
+ - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
+ - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools,
python3-wheel, python3-pip, ninja-build]
+
+
+script: ./.ci/${TRAVIS_OS_NAME}-build.sh
diff --git a/MAINTAINERS b/MAINTAINERS
index 15c53888c..e4b9a8e00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -119,6 +119,12 @@ F: config/rte_config.h
F: buildtools/gen-pmdinfo-cfile.sh
F: buildtools/symlink-drivers-solibs.sh
+Public CI
+M: Aaron Conole
+M: Michael Santana
+F: .travis.yml
+F: .ci/
+
ABI versioning
M: Neil Horman
F: doc/guides/rel_notes/deprecation.rst
diff --git a/doc/guides/contributing/p
Re: [dpdk-dev] [RFC v2 2/2] vhost: support requests only handled by external backend
On 04.03.2019 19:02, Maxime Coquelin wrote:
>
>
> On 3/4/19 4:25 PM, Ilya Maximets wrote:
>> On 28.02.2019 18:31, Maxime Coquelin wrote:
>>> External backends may have specific requests to handle, and so
>>> we don't want the vhost-user lib to handle these requests as
>>> errors.
>>>
>>> This patch also changes the experimental API by introducing
>>> RTE_VHOST_MSG_RESULT_NOT_HANDLED so that vhost-user lib
>>> can report an error if a message is handled neither by
>>> the vhost-user library nor by the external backend.
>>>
>>> The logic changes a bit so that if the callback returns
>>> with ERR, OK or REPLY, it is considered the message
>>> is handled by the external backend so it won't be
>>> handled by the vhost-user library.
>>> It is still possible for an external backend to listen
>>> to requests that have to be handled by the vhost-user
>>> library like SET_MEM_TABLE, but the callback have to
>>> return NOT_HANDLED in that case.
>>>
>>> Suggested-by: Ilya Maximets
>>> Signed-off-by: Maxime Coquelin
>>> ---
>>> lib/librte_vhost/rte_vhost.h | 16 +---
>>> lib/librte_vhost/vhost_user.c | 75 +++
>>> 2 files changed, 60 insertions(+), 31 deletions(-)
>>>
>>> diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
>>> index c9c392975..b1c5a0908 100644
>>> --- a/lib/librte_vhost/rte_vhost.h
>>> +++ b/lib/librte_vhost/rte_vhost.h
>>> @@ -121,6 +121,8 @@ enum rte_vhost_msg_result {
>>> RTE_VHOST_MSG_RESULT_OK = 0,
>>> /* Message handling successful and reply prepared */
>>> RTE_VHOST_MSG_RESULT_REPLY = 1,
>>> + /* Message not handled */
>>> + RTE_VHOST_MSG_RESULT_NOT_HANDLED,
>>> };
>>> /**
>>> @@ -135,11 +137,13 @@ enum rte_vhost_msg_result {
>>> * If the handler requires skipping the master message handling, this
>>> variable
>>> * shall be written 1, otherwise 0.
>>> * @return
>>> - * VH_RESULT_OK on success, VH_RESULT_REPLY on success with reply,
>>> - * VH_RESULT_ERR on failure
>>> + * RTE_VHOST_MSG_RESULT_OK on success,
>>> + * RTE_VHOST_MSG_RESULT_REPLY on success with reply,
>>> + * RTE_VHOST_MSG_RESULT_ERR on failure,
>>> + * RTE_VHOST_MSG_RESULT_NOT_HANDLED if message was not handled.
>>> */
>>> typedef enum rte_vhost_msg_result (*rte_vhost_msg_pre_handle)(int vid,
>>> - void *msg, uint32_t *skip_master);
>>> + void *msg);
>>> /**
>>> * Function prototype for the vhost backend to handler specific vhost user
>>> @@ -150,8 +154,10 @@ typedef enum rte_vhost_msg_result
>>> (*rte_vhost_msg_pre_handle)(int vid,
>>> * @param msg
>>> * Message pointer.
>>> * @return
>>> - * VH_RESULT_OK on success, VH_RESULT_REPLY on success with reply,
>>> - * VH_RESULT_ERR on failure
>>> + * RTE_VHOST_MSG_RESULT_OK on success,
>>> + * RTE_VHOST_MSG_RESULT_REPLY on success with reply,
>>> + * RTE_VHOST_MSG_RESULT_ERR on failure,
>>> + * RTE_VHOST_MSG_RESULT_NOT_HANDLED if message was not handled.
>>> */
>>> typedef enum rte_vhost_msg_result (*rte_vhost_msg_post_handle)(int vid,
>>> void *msg);
>>
>> According to above definition, we should make corresponding change in
>> vhost_crypto.
>> Something like this:
>> ---
>> diff --git a/lib/librte_vhost/vhost_crypto.c
>> b/lib/librte_vhost/vhost_crypto.c
>> index 0f437c4a1..f0eedd422 100644
>> --- a/lib/librte_vhost/vhost_crypto.c
>> +++ b/lib/librte_vhost/vhost_crypto.c
>> @@ -453,14 +453,20 @@ vhost_crypto_msg_post_handler(int vid, void *msg)
>> return RTE_VHOST_MSG_RESULT_ERR;
>> }
>> - if (vmsg->request.master == VHOST_USER_CRYPTO_CREATE_SESS) {
>> + switch (vmsg->request.master) {
>> + VHOST_USER_CRYPTO_CREATE_SESS:
>> vhost_crypto_create_sess(vcrypto,
>> &vmsg->payload.crypto_session);
>> vmsg->fd_num = 0;
>> ret = RTE_VHOST_MSG_RESULT_REPLY;
>> - } else if (vmsg->request.master == VHOST_USER_CRYPTO_CLOSE_SESS) {
>> + break;
>> + VHOST_USER_CRYPTO_CLOSE_SESS:
>> if (vhost_crypto_close_sess(vcrypto, vmsg->payload.u64))
>> ret = RTE_VHOST_MSG_RESULT_ERR;
>> + break;
>> + default:
>> + ret = RTE_VHOST_MSG_RESULT_NOT_HANDLED;
>> + break;
>> }
>> return ret;
>> ---
>
> Indeed, it will be part of v1 if Changpeng confirms this RFC is working
> for his usecase.
>
>>
>>
>>> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
>>> index 36c0c676d..ca9167f1d 100644
>>> --- a/lib/librte_vhost/vhost_user.c
>>> +++ b/lib/librte_vhost/vhost_user.c
>>> @@ -1906,7 +1906,7 @@ vhost_user_msg_handler(int vid, int fd)
>>> int did = -1;
>>> int ret;
>>> int unlock_required = 0;
>>> - uint32_t skip_master = 0;
>>> + bool handled;
>>
>> In below code 'handled' equals to 'false' only if 'ret' equals to
>> 'RTE_VHOST_MSG_RESULT_NOT_HANDLED'. Looks like we don't need this
>> variable.
>
> Actually I think it is necessary, more below.
>
Re: [dpdk-dev] [PATCH v3 0/4] ipsec: add AES-CTR and 3DES-CBC support
> > This patchset adds the AES-CTR and 3DES-CBC cipher algorithms > support to ipsec library. The test scripts for ipsec-secgw > sample application are added too. > > v3: > - fixed a bug in 3DES. > > v2: > - removed unsupported tests. > > Fan Zhang (4): > ipsec: add AES-CTR algorithm support > ipsec-secgw: add test scripts for aes ctr > ipsec: add 3DES-CBC algorithm support > ipsec-secgw: add 3des test files > > examples/ipsec-secgw/test/common_defs.sh | 4 +- > examples/ipsec-secgw/test/run_test.sh | 14 ++- > .../test/trs_3descbc_sha1_common_defs.sh | 73 +++ > examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh | 67 ++ > .../test/trs_3descbc_sha1_esn_atom_defs.sh | 5 + > .../ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh | 66 ++ > .../ipsec-secgw/test/trs_3descbc_sha1_old_defs.sh | 5 + > .../test/trs_aesctr_sha1_common_defs.sh| 69 +++ > examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh | 67 ++ > .../test/trs_aesctr_sha1_esn_atom_defs.sh | 5 + > .../ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh | 66 ++ > .../ipsec-secgw/test/trs_aesctr_sha1_old_defs.sh | 5 + > .../test/tun_3descbc_sha1_common_defs.sh | 72 +++ > examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh | 70 +++ > .../test/tun_3descbc_sha1_esn_atom_defs.sh | 5 + > .../ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh | 70 +++ > .../ipsec-secgw/test/tun_3descbc_sha1_old_defs.sh | 5 + > .../test/tun_aesctr_sha1_common_defs.sh| 68 ++ > examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh | 70 +++ > .../test/tun_aesctr_sha1_esn_atom_defs.sh | 5 + > .../ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh | 70 +++ > .../ipsec-secgw/test/tun_aesctr_sha1_old_defs.sh | 5 + > lib/librte_ipsec/crypto.h | 17 +++ > lib/librte_ipsec/sa.c | 137 > + > lib/librte_ipsec/sa.h | 24 > 25 files changed, 1040 insertions(+), 24 deletions(-) > create mode 100644 examples/ipsec-secgw/test/trs_3descbc_sha1_common_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_3descbc_sha1_defs.sh > create mode 100644 > examples/ipsec-secgw/test/trs_3descbc_sha1_esn_atom_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_3descbc_sha1_esn_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_3descbc_sha1_old_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_aesctr_sha1_common_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_aesctr_sha1_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_aesctr_sha1_esn_atom_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_aesctr_sha1_esn_defs.sh > create mode 100644 examples/ipsec-secgw/test/trs_aesctr_sha1_old_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_3descbc_sha1_common_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_3descbc_sha1_defs.sh > create mode 100644 > examples/ipsec-secgw/test/tun_3descbc_sha1_esn_atom_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_3descbc_sha1_esn_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_3descbc_sha1_old_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_aesctr_sha1_common_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_aesctr_sha1_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_aesctr_sha1_esn_atom_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_aesctr_sha1_esn_defs.sh > create mode 100644 examples/ipsec-secgw/test/tun_aesctr_sha1_old_defs.sh > > -- Reviewed-by: Konstantin Ananyev > 2.14.5
Re: [dpdk-dev] mlx5 under FreeBSD
dev.mlx5_core.1.hw.board_id: LNR3270110033 dev.mlx5_core.1.hw.fw_version: 12.17.2020 Thanks! Mit Matelske - Original Message - From: "shahafs" To: "Mit Matelske" , "stephen" Cc: "Thomas Monjalon" , "dev" , "Yongseok Koh" Sent: Sunday, March 3, 2019 2:43:41 AM Subject: RE: [dpdk-dev] mlx5 under FreeBSD Friday, March 1, 2019 5:58 PM, Mit Matelske: > Subject: Re: [dpdk-dev] mlx5 under FreeBSD > > I was wondering if I could lean on the experts to help me out with an issue? > I'm finally testing this port but don't understand why the following error is > happening: > > net_mlx5: mlx5_rxq.c:2151: mlx5_hrxq_drop_new(): port 0 cannot allocate > QP for drop queue > > The driver is giving the following error corresponding with that DPDK > message: > > Feb 28 15:00:44 fb100g1 kernel: mlx5_core0: ERR: mlx5_cmd_check:701:(pid > 6819): CREATE_TIR(0x900) op_mod(0x0) failed, status bad parameter(0x3), > syndrome (0x569ee6) Hard to say why. I tried to look for the syndrome above on FW but couldn't find. Are you sure this is correct one? Which FW version you use? > > The mlx5_core_create_tir function completes successfully for the en driver, > just not the ib driver when trying to build the hash tables. Any ideas? > > I've instrumented libmlx5.so.1, mlx5.ko and mlx5ib.ko to debug this and > everything looks fine according to my limited knowledge. Not sure why the > card is balking on this action. > > Thanks! > > Mit Matelske > > - Original Message - > From: "stephen" > To: "Mit Matelske" > Cc: "shahafs" , "Thomas Monjalon" > , "dev" , "Yongseok Koh" > > Sent: Wednesday, November 21, 2018 2:12:04 PM > Subject: Re: [dpdk-dev] mlx5 under FreeBSD > > On Wed, 21 Nov 2018 11:11:51 -0600 (CST) Mit Matelske > wrote: > > > > > > > Rather than building a complex shim, why not just have an OS > > > dependent section of the driver. The bigger issue is that the > > > kernel side functionality in BSD is different or missing. For example TAP > API is different and not multi-queue. > > > > Once I started working on it, I had to go this route. I haven't been > > able to but much time into it yet, but it is coming along: > > > > EAL: PCI device :b3:00.0 on NUMA socket 0 > > EAL: probe driver: 15b3:1013 net_mlx5 > > net_mlx5: mlx5.c:1315: mlx5_pci_probe(): checking device "mlx5_0" > > uverbs0 /sys/class/infiniband_verbs/uverbs0 > > /sys/class/infiniband/mlx5_0 > > net_mlx5: mlx5.c:1325: mlx5_pci_probe(): PCI information matches for > device "mlx5_0" > > net_mlx5: mlx5.c:1315: mlx5_pci_probe(): checking device "mlx5_1" > > uverbs1 /sys/class/infiniband_verbs/uverbs1 > > /sys/class/infiniband/mlx5_1 > > net_mlx5: mlx5.c:1382: mlx5_pci_probe(): no switch support detected > > net_mlx5: mlx5.c:796: mlx5_dev_spawn(): MPW isn't supported > > net_mlx5: mlx5.c:852: mlx5_dev_spawn(): tunnel offloading disabled due > > to old OFED/rdma-core version > > net_mlx5: mlx5.c:864: mlx5_dev_spawn(): MPLS over GRE/UDP tunnel > > offloading disabled due to old OFED/rdma-core version or firmware > > configuration > > net_mlx5: mlx5.c:877: mlx5_dev_spawn(): naming Ethernet device > ":b3:00.0" > > net_mlx5: mlx5.c:1007: mlx5_dev_spawn(): checksum offloading is > > supported > > net_mlx5: mlx5.c:1024: mlx5_dev_spawn(): maximum Rx indirection table > > size is 512 > > net_mlx5: mlx5.c:1028: mlx5_dev_spawn(): VLAN stripping is not > > supported > > net_mlx5: mlx5.c:1032: mlx5_dev_spawn(): FCS stripping configuration > > is not supported > > net_mlx5: mlx5.c:1037: mlx5_dev_spawn(): hardware Rx end alignment > > padding is not supported > > net_mlx5: mlx5.c:1052: mlx5_dev_spawn(): MPS is disabled > > net_mlx5: mlx5.c:628: mlx5_uar_init_primary(): port 0 reserved UAR > > address space: 0x88000 > > net_mlx5: mlx5.c:1107: mlx5_dev_spawn(): port 0 MAC address is > > 00:90:0b:78:2a:ea > > net_mlx5: mlx5.c:1114: mlx5_dev_spawn(): port 0 ifname is "mce0" > > net_mlx5: mlx5.c:1127: mlx5_dev_spawn(): port 0 MTU is 1500 > > net_mlx5: mlx5.c:1142: mlx5_dev_spawn(): flow rules relying on switch > > offloads will not be supported: cannot open libmnl socket: Address > > family not supported by protocol family > > net_mlx5: mlx5.c:1176: mlx5_dev_spawn(): port 0 forcing Ethernet > > interface up > > net_mlx5: mlx5_ethdev.c:735: mlx5_link_update_unlocked_gs(): port 0 > > ioctl(SIOCGIFFLAGS) failed: No such file or directory > > net_mlx5: mlx5_ethdev.c:664: mlx5_link_update_unlocked_gset(): port 0 > > ioctl(SIOCGIFFLAGS) failed: No such file or directory > > net_mlx5: mlx5_rxq.c:2150: mlx5_hrxq_drop_new(): port 0 cannot > > allocate QP for drop queue Segmentation fault (core dumped) > > > > Working through mlx5_ethdev now... > > > > Mit > > Also if you are targeting Azure or Hyper-V, then don't bother porting > TAP/VDEV_NETVSC/Failsafe model because that is being replaced by netvsc > native PMD. It would be easier to just get that working. > It would mean writing a uio equivalent driver for FreeBSD.
Re: [dpdk-dev] [PATCH v2 00/13] net/enic: 19.05 updates
On 3/2/2019 10:42 AM, Hyong Youb Kim wrote:
> This patch series fixes bugs in enic's implementation of flow API and
> adds very limited support for RAW, RSS, and PASSTHRU. Limited RSS and
> PASSTHRU are intended to support partial offloads in OVS-DPDK and
> VPP. These apps use MARK + default RSS and PASSTHRU + MARK to "mark
> packet and then receive normally". Cisco VIC can support these, even
> though general RSS and PASSTHRU are not possible.
>
> Intentionally removed Cc: stable from the last patch ("net/enic: fix
> several issues with inner packet matching") as it depends on a non-fix
> patch ("net/enic: move arguments into struct"). I will submit backport
> request for these separately, after rc1.
>
> ---
> v2:
> * Merge doc changes with corresponding code changes.
>
> Hyong Youb Kim (13):
> net/enic: remove unused code
> net/enic: fix flow director SCTP matching
> net/enic: fix SCTP match for flow API
> net/enic: allow flow mark ID 0
> net/enic: check for unsupported flow item types
> net/enic: enable limited RSS flow action
> net/enic: enable limited PASSTHRU flow action
> net/enic: move arguments into struct
> net/enic: enable limited support for RAW flow item
> net/enic: reset VXLAN port regardless of overlay offload
> net/enic: fix a couple issues with VXLAN match
> net/enic: fix an endian bug in VLAN match
> net/enic: fix several issues with inner packet matching
Series applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v2 13/13] net/enic: fix several issues with inner packet matching
On 3/2/2019 10:42 AM, Hyong Youb Kim wrote:
> Inner packet matching is currently buggy in many cases.
>
> 1. Mishandling null spec ("match any").
> The copy_item functions do nothing if spec is null. This is incorrect,
> as all patterns should be appended to the L5 pattern buffer even for
> null spec (treated as all zeros).
>
> 2. Accessing null spec causing segfault.
>
> 3. Not setting protocol fields.
> The NIC filter API currently has no flags for "match inner IPv4, IPv6,
> UDP, TCP, and so on". So, the driver needs to explicitly set EtherType
> and IP protocol fields in the L5 pattern buffer to avoid false
> positives (e.g. reporting IPv6 as IPv4).
>
> Instead of keep adding "if inner, do something differently" cases to
> the existing copy_item functions, introduce separate functions for
> inner packet patterns and address the above issues in those
> functions. The changes to the previous outer-packet copy_item
> functions are mechanical, due to reduced indentation.
>
> Fixes: 6ced137607d0 ("net/enic: flow API for NICs with advanced filters
> enabled")
>
> Signed-off-by: Hyong Youb Kim
<...>
I have added "Cc: sta...@dpdk.org" tag while merging. If the tag explicitly left
out to prevent backport please let me know to remove the tag back.
Re: [dpdk-dev] [dpdk-stable] [PATCH v3 1/2] Enable codespell by default. Can be disabled from config file.
On 3/1/19 4:08 PM, Thomas Monjalon wrote:
01/03/2019 21:24, Michael Santana Francisco:
On 3/1/19 12:51 PM, Thomas Monjalon wrote:
01/03/2019 18:43, Thomas Monjalon:
01/03/2019 18:08, Michael Santana:
+# Enable codespell by default. This can be overwritten from a config file.
+# You can also enable codespell by setting DPDK_CHECKPATCH_CODESPELL to a
valid path
+# to a dictionary.txt file if your dictionary.txt is not in the default
location.
This line length won't pass chekpatch ;)
Better to avoid "you" form in such comment.
+DPDK_CHECKPATCH_CODESPELL=enable
It will override the value if passed with an environment variable.
You should do the same as for DPDK_CHECKPATCH_LINE_LENGTH.
If I understood you correctly, you want to be able to set these
parameters via environment variables (and take precedence over any
variables set in any config file)
No :)
The scenario is to have no config file and use environment variables only.
The problem is right now that any environment variable is overwritten by
the variable being set in one of the config files
The only way I can think of doing this would be by saving the DPDK
variables (passed via environment) to a file or ironically temporary
variables (which themselves can also be overwritten, so that doesn't
really solve the problem) before being overwritten, and then restoring
said variables after the call to source.
This would add extra clutter in checkpatches, but it can be avoided by
doing it in load-devel-config instead.
So the bottom line is, environment variables take overall precedence,
then config files, and then default
Does this sound sane enough?
If anyone knows a better way to do this please share.
Look how DPDK_CHECKPATCH_LINE_LENGTH is handled.
The default value is used if DPDK_CHECKPATCH_LINE_LENGTH is not set,
neither by environment nor config file.
I think you can just do this after loading config file:
DPDK_CHECKPATCH_CODESPELL=${DPDK_CHECKPATCH_CODESPELL:-enable}
Oh! So it's much simpler than I thought. Yeah. I will remove what I have
now and put in your line to go along with the length= line. Will also
change the comment as I didn't remove the 'you' form in the last commit
or check for empty value in the test:
[ -z "$DPDK_CHECKPATCH_CODESPELL" -o "$DPDK_CHECKPATCH_CODESPELL" = enable ]
I am including in DPDK_CHECKPATCH_PATH, because might as well at this
point.
Empty DPDK_CHECKPATCH_PATH is already handled.
# Load config options:
# - DPDK_CHECKPATCH_PATH
# - DPDK_CHECKPATCH_LINE_LENGTH
+# - DPDK_CHECKPATCH_CODESPELL
. $(dirname $(readlink -e $0))/load-devel-config
VALIDATE_NEW_API=$(dirname $(readlink -e $0))/check-symbol-change.sh
@@ -13,6 +18,12 @@ length=${DPDK_CHECKPATCH_LINE_LENGTH:-80}
# override default Linux options
options="--no-tree"
+if [ "$DPDK_CHECKPATCH_CODESPELL" == "enable" ]; then
This is a bashism.
Standard sh uses a simple =
No need for a v4, I can fix it.
Because of the required change for the env var case,
please do a v4.
Re: [dpdk-dev] [PATCH v5] doc: add meson ut info in prog guide
On Sat, Feb 02, 2019 at 10:28:26AM +, Hari Kumar Vemula wrote: > Add a programmer's guide section for meson ut > > Signed-off-by: Hari Kumar Vemula Acked-by: Bruce Richardson
Re: [dpdk-dev] [PATCH 1/2] net/ice: suppport package download
NACK, see comments below
> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Qiming Yang
> Sent: Friday, March 1, 2019 4:46 AM
> To: dev@dpdk.org
> Cc: Yang, Qiming
> Subject: [dpdk-dev] [PATCH 1/2] net/ice: suppport package download
>
> Columbiaville requires a package to be downloaded if need advanced
> features. This patch add package download support in two ways.
> If it configured package path in devargs, will use this path, if not, will
> load the
We can't support downloading the package through devargs. Please remove this.
> package at /lib/firmware/intel/ice/ddp/ice.pkg.
>
The location is /lib/firmware. No need for extra indirection
> When package download failed, will initialize in safe mode, some advanced
> features will not be supported.
>
> Signed-off-by: Qiming Yang
> ---
> drivers/net/ice/ice_ethdev.c | 134
> +++
> drivers/net/ice/ice_ethdev.h | 2 +
> 2 files changed, 136 insertions(+)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index a23c63a..c097259 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -2,12 +2,19 @@
> * Copyright(c) 2018 Intel Corporation
> */
>
> +#include
> +#include
> +#include
> +#include
> +
> #include
>
> #include "base/ice_sched.h"
> #include "ice_ethdev.h"
> #include "ice_rxtx.h"
>
> +#define ETH_ICE_PKG_PATH_ARG "package_path"
> +
> #define ICE_MAX_QP_NUM "max_queue_pair_num"
> #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
>
> @@ -72,6 +79,10 @@ static int ice_xstats_get_names(struct rte_eth_dev
> *dev,
> struct rte_eth_xstat_name *xstats_names,
> unsigned int limit);
>
> +static const char *const valid_keys[] = {
> + ETH_ICE_PKG_PATH_ARG,
> + NULL};
> +
> static const struct rte_pci_id pci_id_ice_map[] = {
> { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID,
> ICE_DEV_ID_E810C_BACKPLANE) },
> { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID,
> ICE_DEV_ID_E810C_QSFP) }, @@ -1260,6 +1271,119 @@ ice_pf_setup(struct
> ice_pf *pf) }
>
> static int
> +ice_parse_pkg_path_handler(__rte_unused const char *key,
> + const char *value,
> + void *opaque)
> +{
> + struct ice_adapter *ad;
> +
> + ad = (struct ice_adapter *)opaque;
> + ad->pkg_path = value;
> +
> + return 0;
> +}
> +
> +static void
> +ice_find_pkg_path(struct rte_eth_dev *dev) {
> + struct rte_kvargs *kvlist;
> + struct ice_adapter *ad =
> + ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> + int kvargs_count;
> +
> + if (!(dev->device->devargs))
> + return;
> +
> + kvlist = rte_kvargs_parse(dev->device->devargs->args, valid_keys);
> + if (kvlist == NULL)
> + return;
> +
> + kvargs_count = rte_kvargs_count(kvlist, ETH_ICE_PKG_PATH_ARG);
> +
> + if (!kvargs_count) {
> + rte_kvargs_free(kvlist);
> + return;
> + }
> +
> + if (kvargs_count > 1)
> + PMD_DRV_LOG(WARNING, "More than one argument
> \"%s\" and only "
> + "the first invalid or last valid one is used !",
> + ETH_ICE_PKG_PATH_ARG);
> +
> + if (rte_kvargs_process(kvlist, ETH_ICE_PKG_PATH_ARG,
> +ice_parse_pkg_path_handler, ad) < 0) {
> + rte_kvargs_free(kvlist);
> + return;
> + }
> + rte_kvargs_free(kvlist);
> +}
> +
> +static int ice_load_pkg(struct rte_eth_dev *dev, const char *pkg_path)
> +{
> + struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> + struct ice_adapter *ad =
> + ICE_DEV_PRIVATE_TO_ADAPTER(dev->data-
> >dev_private);
> + int err;
> + uint8_t *buf;
> + int buf_len;
> + FILE *file;
> + struct stat fstat;
> +
> + file = fopen(pkg_path, "rb");
> + if (file == NULL) {
> + PMD_INIT_LOG(ERR, "failed to open file");
> + return 0;
> + }
> +
> + err = stat(pkg_path, &fstat);
> + if (err) {
> + PMD_INIT_LOG(ERR, "failed to get file stats");
> + fclose(file);
> + return 0;
> + }
> +
> + buf_len = fstat.st_size;
> + printf("buf_len = %d\n", buf_len);
> + buf = rte_malloc(NULL, buf_len, 0);
> +
> + if (buf == NULL) {
> + PMD_INIT_LOG(ERR, "failed to allocate buf for package");
> + fclose(file);
> + return 0;
> + }
> +
> + err = fread(buf, buf_len, 1, file);
> + if (err != 1) {
> + PMD_INIT_LOG(ERR, "failed to read package data");
> + fclose(file);
> + return 0;
> + }
> +
> + fclose(file);
> +
> + err = ice_copy_and_init_pkg(hw, buf, buf_len);
> + if (err) {
> + PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d\n",
> + err);
> + goto err_go_t
Re: [dpdk-dev] [PATCH] doc: fix wrong tag for Inner RSS
On 3/1/2019 11:10 AM, Rami Rosen wrote:
> This patch fixes a wrong tag in guides/nics/features.rst.
> The features tags should be, according to the
> "Features Overview" section in this doc, one of the following:
> "uses", "implements", "provides", or "related".
> Hence in Inner RSS section, it should be "uses"
> instead of "users".
>
> Fixes: d0a87d9aa8de ("doc: update mlx5 guide on tunnel offloading")
>
> Signed-off-by: Rami Rosen
Reviewed-by: Ferruh Yigit
Applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v6 1/1] ci: Introduce travis builds for github repositories
On Mon, 2019-03-04 at 11:12 -0500, Michael Santana wrote: > GitHub is a service used by developers to store repositories. GitHub > provides service integrations that allow 3rd party services to access > developer repositories and perform actions. One of these services is > Travis-CI, a simple continuous integration platform. > > This is a simple initial implementation of a travis build for the > DPDK > project. It doesn't require any changes from individual developers > to > enable, but will allow those developers who opt-in to GitHub and the > travis service to get automatic builds for every push they make. > > Additionally, the travis service will send an email to the test- > report > list informing anyone interested in the automated build (including a > result). > > Signed-off-by: Aaron Conole > Signed-off-by: Michael Santana > --- > v6: > Removed all classic make builds > > .ci/linux-build.sh | 21 + > .ci/linux-setup.sh | 3 ++ > .travis.yml | 73 > + > MAINTAINERS | 6 +++ > doc/guides/contributing/patches.rst | 4 ++ > 5 files changed, 107 insertions(+) > create mode 100755 .ci/linux-build.sh > create mode 100755 .ci/linux-setup.sh > create mode 100644 .travis.yml Acked-by: Luca Boccassi -- Kind regards, Luca Boccassi
[dpdk-dev] [PATCH v4 0/2] Minor changes to checkpatches
Fixed a minor bug with variable assignment, as well as added an option for checkpatches v3->v4: Support enabling codespell via environment variable. v2->v3: Also enable codespell by setting a path to a dictionary file. v1->v2: Enable codespell by default. Disable via config file Michael Santana (2): Enable codespell by default. Can be disabled from config file. devtools: fix result of svg include check devtools/checkpatches.sh | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) Series-Acked-by: Bruce Richardson -- 2.20.1
[dpdk-dev] [PATCH v4 1/2] Enable codespell by default. Can be disabled from config file.
Enable codespell by default.
codespell is a feature by checkpatch.pl that
checks for common spelling mistakes in patches.
This feature is disabled by default. To enable it one must add
the '--codespell' flag to the $options variable in
checkpatches.sh. With this change codespell is enabled by default.
The user can decide to turn off codespell from a one of the config
files read by checkpatches.sh.
Signed-off-by: Michael Santana
Reviewed-by: Rami Rosen
---
v3->v4:
Support enabling codespell via environment variable.
devtools/checkpatches.sh | 11 +++
1 file changed, 11 insertions(+)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 3b03b7ef2..7e862e0a4 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -5,14 +5,25 @@
# Load config options:
# - DPDK_CHECKPATCH_PATH
# - DPDK_CHECKPATCH_LINE_LENGTH
+# - DPDK_CHECKPATCH_CODESPELL
. $(dirname $(readlink -e $0))/load-devel-config
VALIDATE_NEW_API=$(dirname $(readlink -e $0))/check-symbol-change.sh
+# Enable codespell by default. This can be overwritten from a config file.
+# Codespell can also be enabled by setting DPDK_CHECKPATCH_CODESPELL to a
valid path
+# to a dictionary.txt file if dictionary.txt is not in the default location.
+codespell=${DPDK_CHECKPATCH_CODESPELL:-enable}
length=${DPDK_CHECKPATCH_LINE_LENGTH:-80}
# override default Linux options
options="--no-tree"
+if [ "$codespell" = "enable" ]; then
+options="$options --codespell"
+elif [ -f "$codespell" ]; then
+options="$options --codespell"
+options="$options --codespellfile $codespell"
+fi
options="$options --max-line-length=$length"
options="$options --show-types"
options="$options --ignore=LINUX_VERSION_CODE,\
--
2.20.1
[dpdk-dev] [PATCH v4 2/2] devtools: fix result of svg include check
Fix trivial bug. In sh shell, 'foo = 1' is not the same as
'foo=1'. Using 'foo = 1' makes the shell attempt to interpret foo
as a command, rather than a simple variable assignment.
Fixes: dafc04c15174 ("devtools: fix return of forbidden addition checks")
Cc: sta...@dpdk.org
Signed-off-by: Michael Santana
---
devtools/checkpatches.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 7e862e0a4..521534fce 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -73,7 +73,7 @@ check_forbidden_additions() { #
-v RET_ON_FAIL=1 \
-v MESSAGE='Using explicit .svg extension instead of .*' \
-f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
- "$1" || res = 1
+ "$1" || res=1
return $res
}
--
2.20.1
Re: [dpdk-dev] [PATCH 2/2] ethdev: use strlcpy instead of snprintf on initialization
On Mon, 4 Mar 2019 12:11:20 +0300 Andrew Rybchenko wrote: > On 3/1/19 9:42 PM, Stephen Hemminger wrote: > > On Fri, 1 Mar 2019 10:48:58 +0300 > > Andrew Rybchenko wrote: > > > >> On 3/1/19 1:47 AM, Stephen Hemminger wrote: > >>> Don't need to use snprintf for simple name copy. > >>> > >>> Signed-off-by: Stephen Hemminger > >>> --- > >>>lib/librte_ethdev/rte_ethdev.c | 2 +- > >>>1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> diff --git a/lib/librte_ethdev/rte_ethdev.c > >>> b/lib/librte_ethdev/rte_ethdev.c > >>> index 95889ed206db..8bd54dcf58c1 100644 > >>> --- a/lib/librte_ethdev/rte_ethdev.c > >>> +++ b/lib/librte_ethdev/rte_ethdev.c > >>> @@ -459,7 +459,7 @@ rte_eth_dev_allocate(const char *name) > >>> } > >>> > >>> eth_dev = eth_dev_get(port_id); > >>> - snprintf(eth_dev->data->name, sizeof(eth_dev->data->name), "%s", name); > >>> + strlcpy(eth_dev->data->name, name, RTE_ETH_NAME_MAX_LEN); > >> Why is sizeof() substituted with RTE_ETH_NAME_MAX_LEN? > > Same thing, I just wanted to make the length obvious to the reader. > > > >> I thought that sizeof() is the first choice in such cases since it is a > >> bit more > >> safer vs possible changes in the code. > >> > >> BTW, wouldn't it be more friendly to check name length on entry and > >> reject if it is too long? (and same for rte_eth_dev_create()) > > It is impossible for name to long since since both structures are the same. > > > > Which structures? name is an input parameter of the function. > Sorry my confusion, that was in patch 1.
Re: [dpdk-dev] [RFC v2] net/mlx5: support new naming scheme for representors
On Sun, 3 Mar 2019 07:14:07 + Dekel Peled wrote: > In current kernel implementation, the physical port name for representors is > a numeric string (i.e. '0', '1', etc.). > > > > Kernel patch [1] implements an updated scheme for naming of representors > ports. > > The new scheme gives a unique name for each port using the PF ID and the VF > ID. > > Uplink representors are named 'p0', 'p1', etc. > > VF representors are named 'pf0vf0', 'pf0vf1', 'pf1vf0', 'pf1vf1', etc. Depending on kernel to use any particular naming policy is going to be problematic. Users will want to run on older kernels, and many distributions rename interfaces through udev or other mechanism.
Re: [dpdk-dev] [PATCH v2 1/1] eal: add 128-bit cmpxchg (x86-64 only)
> This operation can be used for non-blocking algorithms, such as a non-blocking
> stack or ring.
>
> Signed-off-by: Gage Eads
> ---
> .../common/include/arch/x86/rte_atomic_64.h| 33
> lib/librte_eal/common/include/generic/rte_atomic.h | 59
> ++
> 2 files changed, 92 insertions(+)
>
> diff --git a/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
> b/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
> index fd2ec9c53..413e5361b 100644
> --- a/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
> +++ b/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
> @@ -34,6 +34,7 @@
> /*
> * Inspired from FreeBSD src/sys/amd64/include/atomic.h
> * Copyright (c) 1998 Doug Rabson
> + * Copyright (c) 2019 Intel Corporation
> * All rights reserved.
> */
>
> @@ -46,6 +47,7 @@
>
> #include
> #include
> +#include
> #include
>
> /*- 64 bit atomic operations
> -*/ @@ -
> 208,4 +210,35 @@ static inline void rte_atomic64_clear(rte_atomic64_t *v) }
> #endif
>
> +static inline int __rte_experimental
> +rte_atomic128_cmpxchg(rte_int128_t *dst,
> + rte_int128_t *exp,
> + const rte_int128_t *src,
> + unsigned int weak,
> + int success,
> + int failure)
> +{
> + RTE_SET_USED(weak);
> + RTE_SET_USED(success);
> + RTE_SET_USED(failure);
> + uint8_t res;
> +
> + asm volatile (
> + MPLOCKED
> + "cmpxchg16b %[dst];"
> + " sete %[res]"
> + : [dst] "=m" (dst->val[0]),
> + "=a" (exp->val[0]),
> + "=d" (exp->val[1]),
> + [res] "=r" (res)
> + : "b" (src->val[0]),
> + "c" (src->val[1]),
> + "a" (exp->val[0]),
> + "d" (exp->val[1]),
> + "m" (dst->val[0])
> + : "memory");
> +
> + return res;
> +}
> +
> #endif /* _RTE_ATOMIC_X86_64_H_ */
> diff --git a/lib/librte_eal/common/include/generic/rte_atomic.h
> b/lib/librte_eal/common/include/generic/rte_atomic.h
> index 4afd1acc3..7c43896e9 100644
> --- a/lib/librte_eal/common/include/generic/rte_atomic.h
> +++ b/lib/librte_eal/common/include/generic/rte_atomic.h
> @@ -14,6 +14,7 @@
>
> #include
> #include
> +#include
>
> #ifdef __DOXYGEN__
>
> @@ -1082,4 +1083,62 @@ static inline void
> rte_atomic64_clear(rte_atomic64_t *v) } #endif
>
> +/* 128 bit atomic operations
> +-*/
> +
> +#if defined(RTE_ARCH_X86_64)
> +/**
> + * 128-bit integer structure.
> + */
> +RTE_STD_C11
> +typedef struct {
> + RTE_STD_C11
> + union {
> + uint64_t val[2];
> + __int128 int128;
> + };
> +} __rte_aligned(16) rte_int128_t;
> +
> +/**
> + * An atomic compare and set function used by the mutex functions.
> + * (Atomically) Equivalent to:
> + * if (*dst == exp)
Should be, "if (*dst == *exp)"
> + * *dst = src
Should be "*dst = *src"
> + * else
> + * *exp = *dst
> + *
> + * @note The success and failure arguments must be one of the
> +__ATOMIC_* values
> + * defined in the C++11 standard. For details on their behavior, refer
> +to the
> + * standard.
> + *
> + * @param dst
> + * The destination into which the value will be written.
> + * @param exp
> + * Pointer to the expected value. If the operation fails, this memory is
> + * updated with the actual value.
> + * @param src
> + * Pointer to the new value.
> + * @param weak
> + * A value of true allows the comparison to spuriously fail and allows the
> + * 'exp' update to occur non-atomically (i.e. a torn read may occur).
> + * Implementations may ignore this argument and only implement the strong
> + * variant.
> + * @param success
> + * If successful, the operation's memory behavior conforms to this (or a
> + * stronger) model.
> + * @param failure
> + * If unsuccessful, the operation's memory behavior conforms to this (or a
> + * stronger) model. This argument cannot be __ATOMIC_RELEASE,
> + * __ATOMIC_ACQ_REL, or a stronger model than success.
> + * @return
> + * Non-zero on success; 0 on failure.
> + */
> +static inline int __rte_experimental
> +rte_atomic128_cmpxchg(rte_int128_t *dst,
Name could be more neutral. May be rte_atomic128_compare/cmp_exchange?
> + rte_int128_t *exp,
> + const rte_int128_t *src,
> + unsigned int weak,
> + int success,
> + int failure);
> +#endif
> +
> #endif /* _RTE_ATOMIC_H_ */
> --
> 2.13.6
Few minor comments.
I have not reviewed the x86 implementation.
Otherwise,
Reviewed-by: Honnappa Nagarahalli
Re: [dpdk-dev] [PATCH v2 1/1] eal: add 128-bit cmpxchg (x86-64 only)
[snip] > > +/** > > + * An atomic compare and set function used by the mutex functions. > > + * (Atomically) Equivalent to: > > + * if (*dst == exp) > Should be, "if (*dst == *exp)" > > > + * *dst = src > Should be "*dst = *src" > Good catches, will fix both. > > + * else > > + * *exp = *dst > > + * > > + * @note The success and failure arguments must be one of the > > +__ATOMIC_* values > > + * defined in the C++11 standard. For details on their behavior, > > +refer to the > > + * standard. > > + * > > + * @param dst > > + * The destination into which the value will be written. > > + * @param exp > > + * Pointer to the expected value. If the operation fails, this memory is > > + * updated with the actual value. > > + * @param src > > + * Pointer to the new value. > > + * @param weak > > + * A value of true allows the comparison to spuriously fail and allows > > the > > + * 'exp' update to occur non-atomically (i.e. a torn read may occur). > > + * Implementations may ignore this argument and only implement the > strong > > + * variant. > > + * @param success > > + * If successful, the operation's memory behavior conforms to this (or a > > + * stronger) model. > > + * @param failure > > + * If unsuccessful, the operation's memory behavior conforms to this (or > > a > > + * stronger) model. This argument cannot be __ATOMIC_RELEASE, > > + * __ATOMIC_ACQ_REL, or a stronger model than success. > > + * @return > > + * Non-zero on success; 0 on failure. > > + */ > > +static inline int __rte_experimental > > +rte_atomic128_cmpxchg(rte_int128_t *dst, > Name could be more neutral. May be rte_atomic128_compare/cmp_exchange? > > > + rte_int128_t *exp, > > + const rte_int128_t *src, > > + unsigned int weak, > > + int success, > > + int failure); > > +#endif > > + > > #endif /* _RTE_ATOMIC_H_ */ > > -- > > 2.13.6 > Sure -- I'll rename it rte_atomic128_cmp_exchange in the next version. > Few minor comments. > I have not reviewed the x86 implementation. > Otherwise, > Reviewed-by: Honnappa Nagarahalli Thanks, Gage
Re: [dpdk-dev] [PATCH] devtools: fix index generation
Reviewed-by: Rami Rosen > >
[dpdk-dev] [PATCH v3 1/1] eal: add 128-bit compare exchange (x86-64 only)
This operation can be used for non-blocking algorithms, such as a
non-blocking stack or ring.
Signed-off-by: Gage Eads
Reviewed-by: Honnappa Nagarahalli
---
.../common/include/arch/x86/rte_atomic_64.h| 33
lib/librte_eal/common/include/generic/rte_atomic.h | 59 ++
2 files changed, 92 insertions(+)
diff --git a/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
b/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
index fd2ec9c53..3b061ff7c 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_atomic_64.h
@@ -34,6 +34,7 @@
/*
* Inspired from FreeBSD src/sys/amd64/include/atomic.h
* Copyright (c) 1998 Doug Rabson
+ * Copyright (c) 2019 Intel Corporation
* All rights reserved.
*/
@@ -46,6 +47,7 @@
#include
#include
+#include
#include
/*- 64 bit atomic operations
-*/
@@ -208,4 +210,35 @@ static inline void rte_atomic64_clear(rte_atomic64_t *v)
}
#endif
+static inline int __rte_experimental
+rte_atomic128_cmp_exchange(rte_int128_t *dst,
+ rte_int128_t *exp,
+ const rte_int128_t *src,
+ unsigned int weak,
+ int success,
+ int failure)
+{
+ RTE_SET_USED(weak);
+ RTE_SET_USED(success);
+ RTE_SET_USED(failure);
+ uint8_t res;
+
+ asm volatile (
+ MPLOCKED
+ "cmpxchg16b %[dst];"
+ " sete %[res]"
+ : [dst] "=m" (dst->val[0]),
+ "=a" (exp->val[0]),
+ "=d" (exp->val[1]),
+ [res] "=r" (res)
+ : "b" (src->val[0]),
+ "c" (src->val[1]),
+ "a" (exp->val[0]),
+ "d" (exp->val[1]),
+ "m" (dst->val[0])
+ : "memory");
+
+ return res;
+}
+
#endif /* _RTE_ATOMIC_X86_64_H_ */
diff --git a/lib/librte_eal/common/include/generic/rte_atomic.h
b/lib/librte_eal/common/include/generic/rte_atomic.h
index 4afd1acc3..a7d58c190 100644
--- a/lib/librte_eal/common/include/generic/rte_atomic.h
+++ b/lib/librte_eal/common/include/generic/rte_atomic.h
@@ -14,6 +14,7 @@
#include
#include
+#include
#ifdef __DOXYGEN__
@@ -1082,4 +1083,62 @@ static inline void rte_atomic64_clear(rte_atomic64_t *v)
}
#endif
+/* 128 bit atomic operations
-*/
+
+#if defined(RTE_ARCH_X86_64)
+/**
+ * 128-bit integer structure.
+ */
+RTE_STD_C11
+typedef struct {
+ RTE_STD_C11
+ union {
+ uint64_t val[2];
+ __int128 int128;
+ };
+} __rte_aligned(16) rte_int128_t;
+
+/**
+ * An atomic compare and set function used by the mutex functions.
+ * (Atomically) Equivalent to:
+ * if (*dst == *exp)
+ * *dst = *src
+ * else
+ * *exp = *dst
+ *
+ * @note The success and failure arguments must be one of the __ATOMIC_* values
+ * defined in the C++11 standard. For details on their behavior, refer to the
+ * standard.
+ *
+ * @param dst
+ * The destination into which the value will be written.
+ * @param exp
+ * Pointer to the expected value. If the operation fails, this memory is
+ * updated with the actual value.
+ * @param src
+ * Pointer to the new value.
+ * @param weak
+ * A value of true allows the comparison to spuriously fail and allows the
+ * 'exp' update to occur non-atomically (i.e. a torn read may occur).
+ * Implementations may ignore this argument and only implement the strong
+ * variant.
+ * @param success
+ * If successful, the operation's memory behavior conforms to this (or a
+ * stronger) model.
+ * @param failure
+ * If unsuccessful, the operation's memory behavior conforms to this (or a
+ * stronger) model. This argument cannot be __ATOMIC_RELEASE,
+ * __ATOMIC_ACQ_REL, or a stronger model than success.
+ * @return
+ * Non-zero on success; 0 on failure.
+ */
+static inline int __rte_experimental
+rte_atomic128_cmp_exchange(rte_int128_t *dst,
+ rte_int128_t *exp,
+ const rte_int128_t *src,
+ unsigned int weak,
+ int success,
+ int failure);
+#endif
+
#endif /* _RTE_ATOMIC_H_ */
--
2.13.6
[dpdk-dev] [PATCH v3 0/1] Add 128-bit compare and set
This patch addresses x86-64 only; other architectures can/will be supported in the future. The __atomic intrinsic was considered for the implementation, however libatomic was found[1] to use locks to implement the 128-bit CAS on at least one architecture and so is eschewed here. The interface is modeled after the __atomic_compare_exchange_16 (which itself is based on the C++11 memory model) to best support weak consistency architectures. This patch was originally part of a series that introduces a non-blocking stack mempool handler[2], and is required by a non-blocking ring patchset. This patch was spun off so that the the NB ring depends only on this patch and not on the entire non-blocking stack patchset. [1] http://mails.dpdk.org/archives/dev/2019-January/124002.html [2] http://mails.dpdk.org/archives/dev/2019-January/123653.html v3: - Rename function to ISA-neutral rte_atomic128_cmp_exchange() - Fix two pseudocode bugs in function documentation v2: - Rename function to rte_atomic128_cmpxchg() - Replace "=A" output constraint with "=a" and "=d" to prevent GCC from using the al register for the sete destination - Extend 'weak' definition to allow non-atomic 'exp' updates. - Add const keyword to 'src' and remove volatile keyword from 'dst' - Put __int128 in a union in rte_int128_t and move the structure definition inside the RTE_ARCH_x86_64 ifdef - Drop enum rte_atomic_memmodel_t in favor of compiler-defined __ATOMIC_* - Drop unnecessary comment relating to X86_64 - Tweak the pseudocode to reflect the 'exp' update on failure. Gage Eads (1): eal: add 128-bit compare exchange (x86-64 only) .../common/include/arch/x86/rte_atomic_64.h| 33 lib/librte_eal/common/include/generic/rte_atomic.h | 59 ++ 2 files changed, 92 insertions(+) -- 2.13.6
Re: [dpdk-dev] [PATCH 10/10] net/atlantic: fix xstats to return correct number of requested items
Reviewed-by: Rami Rosen >
Re: [dpdk-dev] [PATCH 02/10] net/atlantic: remove unused variable
Reviewed-by: Rami Rosen >
Re: [dpdk-dev] [dpdk-stable] [PATCH v4 0/2] Minor changes to checkpatches
04/03/2019 20:07, Michael Santana: > Fixed a minor bug with variable assignment, as well as added an > option for checkpatches > > v3->v4: > Support enabling codespell via environment variable. > > v2->v3: > Also enable codespell by setting a path to a dictionary file. > > v1->v2: > Enable codespell by default. Disable via config file > > Michael Santana (2): > Enable codespell by default. Can be disabled from config file. > devtools: fix result of svg include check > > devtools/checkpatches.sh | 13 - > 1 file changed, 12 insertions(+), 1 deletion(-) > > Series-Acked-by: Bruce Richardson Applied, thanks
Re: [dpdk-dev] [EXT] [PATCH] devtools: fix index generation
> > build-tags.sh is broken because of removed 'test' folder, this breaks
> > helper make targets like 'make cscope', 'make tags', etc...
> >
> > Fixing it by removing 'test' from source directories list.
> >
> > Fixes: a9de470cc7c0 ("test: move to app directory")
> >
> > Signed-off-by: Ferruh Yigit
> > ---
> > Cc: bruce.richard...@intel.com
> > ---
>
> Acked-by: Jerin Jacob
Applied, thanks
[dpdk-dev] [PATCH] net/enic: add private API to set ingress VLAN rewrite mode
The driver currently has a devarg to set the rewrite mode during
init. Some apps want to programatically set it after running
rte_eal_init() and finding that ports are VIC. Add a private function
to support such applications.
Signed-off-by: Hyong Youb Kim
---
drivers/net/enic/Makefile | 3 +++
drivers/net/enic/enic.h | 1 +
drivers/net/enic/enic_ethdev.c| 7 +++
drivers/net/enic/meson.build | 1 +
drivers/net/enic/rte_pmd_enic.c | 33 +++
drivers/net/enic/rte_pmd_enic.h | 27 +
drivers/net/enic/rte_pmd_enic_version.map | 6 ++
7 files changed, 78 insertions(+)
create mode 100644 drivers/net/enic/rte_pmd_enic.c
create mode 100644 drivers/net/enic/rte_pmd_enic.h
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
index 04bae35e3..60373fa30 100644
--- a/drivers/net/enic/Makefile
+++ b/drivers/net/enic/Makefile
@@ -37,6 +37,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c
+SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += rte_pmd_enic.c
# The current implementation assumes 64-bit pointers
CC_AVX2_SUPPORT=0
@@ -66,4 +67,6 @@ ifeq ($(CC_AVX2_SUPPORT), 1)
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c
endif
+SYMLINK-$(CONFIG_RTE_LIBRTE_ENIC_PMD)-include := rte_pmd_enic.h
+
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index fa4d5590e..94563fe70 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -279,6 +279,7 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx)
return idx;
}
+bool enic_dev_is_enic(struct rte_eth_dev *dev);
void enic_fdir_stats_get(struct enic *enic,
struct rte_eth_fdir_stats *stats);
int enic_fdir_add_fltr(struct enic *enic,
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 8d14d8ac7..3a6aba3a2 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -1199,6 +1199,13 @@ static struct rte_pci_driver rte_enic_pmd = {
.remove = eth_enic_pci_remove,
};
+bool
+enic_dev_is_enic(struct rte_eth_dev *dev)
+{
+ return strcmp(dev->device->driver->name,
+ rte_enic_pmd.driver.name) == 0;
+}
+
RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map);
RTE_PMD_REGISTER_KMOD_DEP(net_enic, "* igb_uio | uio_pci_generic | vfio-pci");
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index c381f1496..c5520c17b 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -13,6 +13,7 @@ sources = files(
'enic_main.c',
'enic_res.c',
'enic_rxtx.c',
+ 'rte_pmd_enic.c',
)
deps += ['hash']
includes += include_directories('base')
diff --git a/drivers/net/enic/rte_pmd_enic.c b/drivers/net/enic/rte_pmd_enic.c
new file mode 100644
index 0..7c98edd35
--- /dev/null
+++ b/drivers/net/enic/rte_pmd_enic.c
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2019 Cisco Systems, Inc. All rights reserved.
+ */
+
+#include
+
+#include "enic_compat.h"
+#include "enic.h"
+#include "rte_pmd_enic.h"
+
+int
+rte_pmd_enic_set_ig_vlan_rewrite(uint16_t port, uint8_t mode)
+{
+ struct rte_eth_dev *dev;
+ struct enic *enic;
+ int err;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+ dev = &rte_eth_devices[port];
+ if (!enic_dev_is_enic(dev))
+ return -ENOTSUP;
+ if (mode > RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_PASS_THRU)
+ return -EINVAL;
+ enic = pmd_priv(dev);
+ dev_debug(enic, "Set ig_vlan_rewrite_mode=%u\n", mode);
+ err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev, mode);
+ if (err) {
+ dev_err(enic, "Failed to set ingress vlan rewrite mode\n");
+ return err;
+ }
+ enic->ig_vlan_rewrite_mode = mode;
+ return 0;
+}
diff --git a/drivers/net/enic/rte_pmd_enic.h b/drivers/net/enic/rte_pmd_enic.h
new file mode 100644
index 0..d4486929a
--- /dev/null
+++ b/drivers/net/enic/rte_pmd_enic.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2019 Cisco Systems, Inc. All rights reserved.
+ */
+
+#ifndef _RTE_PMD_ENIC_H_
+#define _RTE_PMD_ENIC_H_
+
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_DEFAULT_TRUNK 0
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_UNTAG_DEFAULT_VLAN 1
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN 2
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_PASS_THRU 3
+
+/**
+ * Set the ingress VLAN rewrite mode.
+ *
+ * @param port
+ *The port identifier of the Ethernet device.
+ * @param mode
+ *Rewrite m
[dpdk-dev] [PATCH v2] net/enic: add private API to set ingress VLAN rewrite mode
The driver currently has a devarg to set the rewrite mode during
init. Some apps want to programatically set it after running
rte_eal_init() and finding that ports are VIC. Add a private function
to support such applications.
Signed-off-by: Hyong Youb Kim
---
v2:
* Move symbol to the experimental section
drivers/net/enic/Makefile | 3 +++
drivers/net/enic/enic.h | 1 +
drivers/net/enic/enic_ethdev.c| 7 +++
drivers/net/enic/meson.build | 1 +
drivers/net/enic/rte_pmd_enic.c | 33 +++
drivers/net/enic/rte_pmd_enic.h | 28 ++
drivers/net/enic/rte_pmd_enic_version.map | 6 ++
7 files changed, 79 insertions(+)
create mode 100644 drivers/net/enic/rte_pmd_enic.c
create mode 100644 drivers/net/enic/rte_pmd_enic.h
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
index 04bae35e3..60373fa30 100644
--- a/drivers/net/enic/Makefile
+++ b/drivers/net/enic/Makefile
@@ -37,6 +37,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c
+SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += rte_pmd_enic.c
# The current implementation assumes 64-bit pointers
CC_AVX2_SUPPORT=0
@@ -66,4 +67,6 @@ ifeq ($(CC_AVX2_SUPPORT), 1)
SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c
endif
+SYMLINK-$(CONFIG_RTE_LIBRTE_ENIC_PMD)-include := rte_pmd_enic.h
+
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index fa4d5590e..94563fe70 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -279,6 +279,7 @@ enic_ring_incr(uint32_t n_descriptors, uint32_t idx)
return idx;
}
+bool enic_dev_is_enic(struct rte_eth_dev *dev);
void enic_fdir_stats_get(struct enic *enic,
struct rte_eth_fdir_stats *stats);
int enic_fdir_add_fltr(struct enic *enic,
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 8d14d8ac7..3a6aba3a2 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -1199,6 +1199,13 @@ static struct rte_pci_driver rte_enic_pmd = {
.remove = eth_enic_pci_remove,
};
+bool
+enic_dev_is_enic(struct rte_eth_dev *dev)
+{
+ return strcmp(dev->device->driver->name,
+ rte_enic_pmd.driver.name) == 0;
+}
+
RTE_PMD_REGISTER_PCI(net_enic, rte_enic_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map);
RTE_PMD_REGISTER_KMOD_DEP(net_enic, "* igb_uio | uio_pci_generic | vfio-pci");
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index c381f1496..c5520c17b 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -13,6 +13,7 @@ sources = files(
'enic_main.c',
'enic_res.c',
'enic_rxtx.c',
+ 'rte_pmd_enic.c',
)
deps += ['hash']
includes += include_directories('base')
diff --git a/drivers/net/enic/rte_pmd_enic.c b/drivers/net/enic/rte_pmd_enic.c
new file mode 100644
index 0..97804baa6
--- /dev/null
+++ b/drivers/net/enic/rte_pmd_enic.c
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2019 Cisco Systems, Inc. All rights reserved.
+ */
+
+#include
+
+#include "enic_compat.h"
+#include "enic.h"
+#include "rte_pmd_enic.h"
+
+int __rte_experimental
+rte_pmd_enic_set_ig_vlan_rewrite(uint16_t port, uint8_t mode)
+{
+ struct rte_eth_dev *dev;
+ struct enic *enic;
+ int err;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
+ dev = &rte_eth_devices[port];
+ if (!enic_dev_is_enic(dev))
+ return -ENOTSUP;
+ if (mode > RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_PASS_THRU)
+ return -EINVAL;
+ enic = pmd_priv(dev);
+ dev_debug(enic, "Set ig_vlan_rewrite_mode=%u\n", mode);
+ err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev, mode);
+ if (err) {
+ dev_err(enic, "Failed to set ingress vlan rewrite mode\n");
+ return err;
+ }
+ enic->ig_vlan_rewrite_mode = mode;
+ return 0;
+}
diff --git a/drivers/net/enic/rte_pmd_enic.h b/drivers/net/enic/rte_pmd_enic.h
new file mode 100644
index 0..92c3bd6a9
--- /dev/null
+++ b/drivers/net/enic/rte_pmd_enic.h
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2019 Cisco Systems, Inc. All rights reserved.
+ */
+
+#ifndef _RTE_PMD_ENIC_H_
+#define _RTE_PMD_ENIC_H_
+
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_DEFAULT_TRUNK 0
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_UNTAG_DEFAULT_VLAN 1
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN 2
+#define RTE_PMD_ENIC_IG_VLAN_REWRITE_MODE_PASS_THRU 3
+
+/**
+ * Set the ingress VLAN rewrite mode.
+ *
+ * @param port
+ *The port
