Re: [dpdk-dev] [pull-request] next-crypto 18.02 rc1
20/01/2018 16:15, Pablo de Lara: > http://dpdk.org/git/next/dpdk-next-crypto Pulled, thanks
Re: [dpdk-dev] [pull-request] next-eventdev 18.02-RC1
18/01/2018 08:10, Jerin Jacob: > http://dpdk.org/git/next/dpdk-next-eventdev Pulled, thanks
[dpdk-dev] [PATCH] event/opdl: fix build using C99 mode
RHEL 7.4 gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16)
‘for’ loop initial declarations are only allowed in C99 mode
Fixes: 4236ce9bf5bf ("event/opdl: add OPDL ring infrastructure library")
Signed-off-by: Andrew Rybchenko
---
Other option is to move declarations outside of for loop.
I just want it to be fixed.
drivers/event/opdl/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile
index 747ae5b..a8aff2c 100644
--- a/drivers/event/opdl/Makefile
+++ b/drivers/event/opdl/Makefile
@@ -7,6 +7,8 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB = librte_pmd_opdl_event.a
# build flags
+CFLAGS += -std=c99
+CFLAGS += -D_XOPEN_SOURCE=600
CFLAGS += -O3
CFLAGS += $(WERROR_FLAGS)
# for older GCC versions, allow us to initialize an event using
--
2.7.4
Re: [dpdk-dev] [PATCH] event/opdl: fix build using C99 mode
21/01/2018 10:48, Andrew Rybchenko:
> RHEL 7.4 gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16)
>
> ‘for’ loop initial declarations are only allowed in C99 mode
>
> Fixes: 4236ce9bf5bf ("event/opdl: add OPDL ring infrastructure library")
>
> Signed-off-by: Andrew Rybchenko
> ---
> Other option is to move declarations outside of for loop.
> I just want it to be fixed.
Yes, other option would be to comply with DPDK coding style.
Let's fix it with std=C99, waiting for coding style fix.
Applied, thanks
Re: [dpdk-dev] [PATCH v5 0/6] TAP RSS eBPF cover letter
On 1/20/2018 9:25 PM, Ophir Munk wrote: > Hi Ferruh, > Thanks for applying v5 patches while changing the order of commits and adding > "Acked-by: ..." > > I have sent v6 which does the same but also updates the commit messages of > the switched commits to reflect more accurately the new order. > > Please let know if you are going to leave v5 as is or replace it with v6. I will drop existing ones and get your v6. > > Regards, > Ophir > >> -Original Message- >> From: Ferruh Yigit [mailto:ferruh.yi...@intel.com] >> Sent: Saturday, January 20, 2018 6:16 PM >> To: Pascal Mazon ; Ophir Munk >> ; dev@dpdk.org >> Cc: Thomas Monjalon ; Olga Shern >> >> Subject: Re: [dpdk-dev] [PATCH v5 0/6] TAP RSS eBPF cover letter >> >> On 1/19/2018 6:48 AM, Pascal Mazon wrote: >>> Hi, >>> >>> It seems more logical to me to introduce tap_program (patch 3) before >>> its compiled version (patch 2). >>> Source code is indeed written down before compiling it. >>> >>> The doc section is a good addition. >>> I'll be happy to see the upcoming utility for turning eBPF bytecode to >>> C arrays. >>> I'd have liked to see automation code (in a not-executed Makefile >>> target >>> typically) for generating the bytecode. >>> I'm being told it should happen in the upcoming series along with the >>> aforementioned utility. >>> >>> Otherwise code looks good enough (I couldn't see everything for lack >>> of time), considering that later patches are expected in next release. >>> >>> Acked-by: Pascal Mazon >>> >>> Best regards, >>> Pascal >>> >>> On 18/01/2018 14:38, Ophir Munk wrote: The patches of TAP RSS eBPF follow the RFC on this issue >> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdp >> dk.org%2Fdev%2Fpatchwork%2Fpatch%2F31781%2F&data=02%7C01%7Cop >> hirmu%40 >> mellanox.com%7Ccd9b412a6c1d428fe52308d56021141b%7Ca652971c7d2e >> 4d9ba6a >> 4d149256f461b%7C0%7C0%7C636520617565078480&sdata=7AuH4FxyKlZR >> %2Fwy6%2 B3hEnW3UQIWmGonkq%2FtAxPdEG2w%3D&reserved=0 v5 changes with respect to v4 = Update TAP document guide with RSS v4 changes with respect to v3 = * Code updates based on review comments * New commits organization (2-->5) based on review comments 1. net/tap: support actions for different classifiers (preparations for BPF. No BPF code yet) 2. net/tap: add eBPF bytes code (BPF bytes code in a separate file) 3. net/tap: add eBPF program file (Program source code of bytes code) 4. net/tap: add eBPF API (BPF API to be used by TAP) 5. net/tap: implement TAP RSS using eBPF v3 changes with respect to v2 = * Add support for IPv6 RSS in BPF program * Bug fixes * Updated compatibility to kernel versions: eBPF requires Linux version 4.9 configured with BPF * New license header (SPDX) for newly added files v2 changes with respect to v1 = * v2 has new commits organization (3 --> 2) * BPF program was revised. It is successfully tested on IPv4 L3 L4 layers (compatible to mlx4 device) * Licensing: no comments received for using "Dual BSD/GPL" string during BPF program loading to the kernel. (v1 and v2 are using the same license strings) Any comments are welcome. * Compatibility to kernel versions: eBPF requires Linux version 4.2 configured with BPF. TAP PMD will successfully compile on systems with old or non-BPF configured kernels. During compilation time the required Linux headers are searched for. If they are not present missing definitions are locally added (tap_autoconf.h). If the kernel cannot support a BPF operation - at runtime it will gracefully reject the netlink message (with BPF) sent to it. Ophir Munk (6): net/tap: support actions for different classifiers net/tap: add eBPF bytes code net/tap: add eBPF program file net/tap: add eBPF API net/tap: implement TAP RSS using eBPF doc: detail new tap RSS feature in guides >> >> Series applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v6 0/6] TAP RSS eBPF cover letter
On 1/20/2018 9:11 PM, Ophir Munk wrote: > The patches of TAP RSS eBPF follow the RFC on this issue > https://dpdk.org/dev/patchwork/patch/31781/ > > v6 changes with respect to v5 > = > 1. Reorder thes following commits (source file commit before byte code commit) > net/tap: add eBPF program file > net/tap: add eBPF bytes code > 2. Add acknowledgment to commits > > v5 changes with respect to v4 > = > Update TAP document guide with RSS > > v4 changes with respect to v3 > = > * Code updates based on review comments > * New commits organization (2-->5) based on review comments > 1. net/tap: support actions for different classifiers (preparations for > BPF. > No BPF code yet) > 2. net/tap: add eBPF bytes code (BPF bytes code in a separate file) > 3. net/tap: add eBPF program file (Program source code of bytes code) > 4. net/tap: add eBPF API (BPF API to be used by TAP) > 5. net/tap: implement TAP RSS using eBPF > > v3 changes with respect to v2 > = > * Add support for IPv6 RSS in BPF program > * Bug fixes > * Updated compatibility to kernel versions: > eBPF requires Linux version 4.9 configured with BPF > * New license header (SPDX) for newly added files > > v2 changes with respect to v1 > = > * v2 has new commits organization (3 --> 2) > * BPF program was revised. It is successfully tested on > IPv4 L3 L4 layers (compatible to mlx4 device) > * Licensing: no comments received for using "Dual BSD/GPL" > string during BPF program loading to the kernel. > (v1 and v2 are using the same license strings) > Any comments are welcome. > * Compatibility to kernel versions: > eBPF requires Linux version 4.2 configured with BPF. TAP PMD will > successfully compile on systems with old or non-BPF configured kernels. > During compilation time the required Linux headers are searched for. > If they are not present missing definitions are locally added > (tap_autoconf.h). > If the kernel cannot support a BPF operation - at runtime it will > gracefully reject the netlink message (with BPF) sent to it. > Ophir Munk (6): > net/tap: support actions for different classifiers > net/tap: add eBPF program file > net/tap: add eBPF bytes code > net/tap: add eBPF API > net/tap: implement TAP RSS using eBPF > doc: detail new tap RSS feature in guides Series applied to dpdk-next-net/master, thanks.
[dpdk-dev] [PATCH] eal: fix a memory leak in regexp log level set API
From: Ivan Malov
Fixes: a5279180f510 ("eal: change several log levels matching a regexp")
Cc: sta...@dpdk.org
Signed-off-by: Ivan Malov
Signed-off-by: Andrew Rybchenko
---
lib/librte_eal/common/eal_common_log.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/librte_eal/common/eal_common_log.c
b/lib/librte_eal/common/eal_common_log.c
index 5a3400e..37b2e20 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -110,6 +110,8 @@ rte_log_set_level_regexp(const char *pattern, uint32_t
level)
rte_logs.dynamic_types[i].loglevel = level;
}
+ regfree(&r);
+
return 0;
}
--
2.7.4
Re: [dpdk-dev] Compilation errors in drivers/event/opdl/
On Sat, 20 Jan 2018 09:44:46 +0100
Thomas Monjalon wrote:
> 20/01/2018 06:18, Patil, Harish:
> > Hi,
> >
> > I am seeing below compilation errors in drivers/event/opdl/, this is with
> > cloned latest DPDK (git clone http://dpdk.org/git/dpdk).
> >
> > ..
> > ..
> > /home2/hpatil/e4/jan19-inbox-submit/dpdk/drivers/event/opdl/opdl_evdev_xsta
> > ts.c: In function ‘opdl_xstats_get_names’:
> > /home2/hpatil/e4/jan19-inbox-submit/dpdk/drivers/event/opdl/opdl_evdev_xsta
> > ts.c:89:2: error: ‘for’ loop initial declarations are only allowed in
> > C99 mode
> > for (uint32_t j = 0; j < max_num_port_xstat; j++) {
> > ^
>
> My compiler does not raise this error.
> What is your compiler?
>
> Anyone to fix it QUICKLY please? today?
>
> Harish, do you think we should revert if not fixed?
Using declaration in for loop is a C++ thing which was inherited into C99.
Does DPDK require C99 mode?
Putting loop variables in for() looks better, but the rest of DPDK
doesn't use that style.
Re: [dpdk-dev] Compilation errors in drivers/event/opdl/
21/01/2018 18:34, Stephen Hemminger:
> On Sat, 20 Jan 2018 09:44:46 +0100
> Thomas Monjalon wrote:
>
> > 20/01/2018 06:18, Patil, Harish:
> > > Hi,
> > >
> > > I am seeing below compilation errors in drivers/event/opdl/, this is with
> > > cloned latest DPDK (git clone http://dpdk.org/git/dpdk).
> > >
> > > ..
> > > ..
> > > /home2/hpatil/e4/jan19-inbox-submit/dpdk/drivers/event/opdl/opdl_evdev_xsta
> > > ts.c: In function ‘opdl_xstats_get_names’:
> > > /home2/hpatil/e4/jan19-inbox-submit/dpdk/drivers/event/opdl/opdl_evdev_xsta
> > > ts.c:89:2: error: ‘for’ loop initial declarations are only allowed in
> > > C99 mode
> > > for (uint32_t j = 0; j < max_num_port_xstat; j++) {
> > > ^
> >
> > My compiler does not raise this error.
> > What is your compiler?
> >
> > Anyone to fix it QUICKLY please? today?
> >
> > Harish, do you think we should revert if not fixed?
>
> Using declaration in for loop is a C++ thing which was inherited into C99.
> Does DPDK require C99 mode?
No DPDK is not generally C99.
> Putting loop variables in for() looks better, but the rest of DPDK
> doesn't use that style.
C99 was forced for this driver as a quick fix.
Either the coding style guideline is updated to C99,
or this driver must be adapted to the DPDK coding style.
I have no strong opinion.
Is C99 well supported in all compilers we want to use (including Windows)?
Re: [dpdk-dev] [PATCHv4 1/5] buildtools: Add tool to check EXPERIMENTAL api exports
Hi Neil,
Sorry for the very late review.
I thought review had been done by others but it seems not.
Please find my comments below.
13/12/2017 16:17, Neil Horman:
> create mode 100755 buildtools/experimentalsyms.sh
When adding a new file, you must reference it in MAINTAINERS.
Please add it in the section "ABI versioning".
> --- /dev/null
> +++ b/buildtools/experimentalsyms.sh
I think the file name should include the word "check".
What about check-experimental-syms.sh ?
> @@ -0,0 +1,35 @@
> +#!/bin/sh
You must insert a SPDX license and copyright here.
> +if [ -d $MAPFILE ]
> +then
> + exit 0
> +fi
> +
> +if [ -d $OBJFILE ]
> +then
> + exit 0
> +fi
Why checking for not being a directory?
I guess you could check being a readable file (-r)?
Should it return an error?
> +for i in `awk 'BEGIN {found=0}
> + /.*EXPERIMENTAL.*/ {found=1}
> + /.*}.*;/ {found=0}
> + /.*;/ {if (found == 1) print $1}' $MAPFILE`
> +do
> + SYM=`echo $i | sed -e"s/;//"`
> + objdump -t $OBJFILE | grep -q "\.text.*$SYM"
> + IN_TEXT=$?
> + objdump -t $OBJFILE | grep -q "\.text\.experimental.*$SYM"
> + IN_EXP=$?
> + if [ $IN_TEXT -eq 0 -a $IN_EXP -ne 0 ]
> + then
> + echo "$SYM is not flagged as experimental"
> + echo "but is listed in version map"
> + echo "Please add __experimental to the definition of $SYM"
> + exit 1
> + fi
> +done
> +exit 0
exit 0 is useless at the end of a script.
Re: [dpdk-dev] [PATCH v5 00/15] common ethdev linkstatus functions
On 1/19/2018 4:35 PM, Ferruh Yigit wrote: > On 1/17/2018 4:18 PM, Ferruh Yigit wrote: >> On 1/17/2018 4:05 PM, Stephen Hemminger wrote: >>> On Wed, 17 Jan 2018 14:32:17 + >>> Ferruh Yigit wrote: >>> On 1/17/2018 7:56 AM, Andrew Rybchenko wrote: > On 01/16/2018 09:37 PM, Stephen Hemminger wrote: >> While reviewing drivers, noticed a lot of unnecessary >> duplication of code in drivers for handling the eth_dev link status >> information. While consolidating this, it also became obvious that >> some drivers behave differently for no good reason. >> >> It also was a good chance to introduce atomic exchange primitives >> in EAL because there are other places using cmpset where not >> necessary (such as bonding). >> >> Mostly only compile tested only, don't have all of the hardware >> available (except ixgbe and virtio) to test. >> >> Note: the eth_dev_link_update function return value is inconsistent >> across drivers. Should be changed to be void. > > I would say "link_update" callback return value is inconsistent across > drivers. I'm not sure which direction is right here: make it consistent > or make it void. Also any changes in link information could be > important. As I understand it should not happen without up/down, > but bugs with loss of intermediate transitions are definitely possible. > So, notifying about any changes in link information is definitely safer. > May be not now. Again, why not return previous link status, it is simple enough to prevent inconsistent usage. rte_eth_link_get() already discards the return value, so won't be a problem there. For the cases PMD would like know about link changes, they will need to implement almost same link_update function with a return value, so why not use existing link_update function? Like been in virtio, link_update() used in interrupt handler, and calls a callback process if status changes. When link_update() return status changed to void, I guess they will need to implement another version of the link_update with return and use it. >>> >>> The interrupt and non-interrupt model are different. >> >> Yes. But for virtio specific usage: >> >> virtio_interrupt_handler() >> virtio_dev_link_update() == 0 >> _rte_eth_dev_callback_process() >> >> meantime same exact virtio_dev_link_update() used as: >> .link_update = virtio_dev_link_update, >> >> so updating virtio_dev_link_update() to not return status change, will update >> logic in virtio_interrupt_handler(), no? > > I would like to see this patch in, because it is useful and almost done. The > concern I mentioned above effects virtio. Let's go step by step. I will update patchset to keep same behavior in drivers but switch to new APIs to prevent code duplication. In next step we can define the return value and implement missing PMDs. > > Can virtio maintainers check if it is OK to get this as it is please? > >> >>> Also the driver internally may want to do something different, this is about >>> the return value for dev_ops->link_update. >> >> Agreed, driver may do something different. And the function needs to be >> implemented will be very close to dev_ops->link_update. I thought making >> dev_ops->link_update more generic can prevent duplication there. And aligns >> with >> virtio usage.. >> >>> The code in rte_eth_dev never >>> used the return value. The bonding driver was expecting it to work but it >>> doesn't. >> >> Agreed. >> >>> Anyway drivers shouldn't in general be directly calling other >>> devices eth_dev_ops >> >> I guess now there are a few overlay PMDs does this. >> >
Re: [dpdk-dev] [PATCHv4 2/5] compat: Add __experimental macro
Hi,
I know I should have spotted these comments earlier,
I'm sorry to be late on this review.
13/12/2017 16:17, Neil Horman:
> +#ifndef ALLOW_EXPERIMENTAL_APIS
>
> +#define __experimental \
These macros should be in the DPDK namespace:
RTE_ALLOW_EXPERIMENTAL_API (no need of S)
__rte_experimental
> +__attribute__((deprecated("Symbol is not yet part of stable abi"), \
Nit: s/abi/ABI/
Re: [dpdk-dev] [PATCHv4 3/5] Makefiles: Add experimental tag check and warnings to trigger on use
13/12/2017 16:17, Neil Horman: > --- a/lib/librte_eal/linuxapp/eal/Makefile > +++ b/lib/librte_eal/linuxapp/eal/Makefile > +CFLAGS += -DALLOW_EXPERIMENTAL_APIS We can define this flag for the whole DPDK libraries, in mk/rte.vars.mk inside the block ifneq ($(BUILDING_RTE_SDK),) > --- a/mk/internal/rte.compile-pre.mk > +++ b/mk/internal/rte.compile-pre.mk > +EXPERIMENTAL_CHECK = $(RTE_SDK)/buildtools/experimentalsyms.sh > +CHECK_EXPERIMENTAL = $(EXPERIMENTAL_CHECK) $(SRCDIR)/$(EXPORT_MAP) $@ > echo $(C_TO_O_DISP); \ > $(C_TO_O) && \ > $(PMDINFO_TO_O) && \ > + $(CHECK_EXPERIMENTAL) && \ Inserting this check looks good.
Re: [dpdk-dev] [PATCHv4 3/5] Makefiles: Add experimental tag check and warnings to trigger on use
12/01/2018 13:44, Neil Horman: > On Fri, Jan 12, 2018 at 11:49:57AM +, Ferruh Yigit wrote: > > On 1/11/2018 8:50 PM, Neil Horman wrote: > > > On Thu, Jan 11, 2018 at 08:06:43PM +, Ferruh Yigit wrote: > > >> On 12/13/2017 3:17 PM, Neil Horman wrote: > > >>> --- a/app/test-eventdev/Makefile > > >>> +++ b/app/test-eventdev/Makefile > > >>> @@ -32,6 +32,7 @@ include $(RTE_SDK)/mk/rte.vars.mk > > >>> > > >>> APP = dpdk-test-eventdev > > >>> > > >>> +CFLAGS += -DALLOW_EXPERIMENTAL_APIS > > >> > > >> Do we need this internally in DPDK? For application developers this is > > >> great, > > >> they will get warning unless explicitly stated that they are OK with it. > > >> > > > I'm not sure what you're asking here. As I mentioned in the initial > > > post, I > > > think we should give blanket permission to any in-tree dpdk library to > > > allow the > > > use of experimental API's, but that doesn't really imply that all > > > developers > > > would wan't it disabled all the time. That is to say, I could envision a > > > library author who, early in development would want to get a warning > > > issued if > > > they used an unstable API, and, only once they were happy with their > > > design and > > > choice of API usage, turn the warning off. > > > > I got your point, but I think whoever using an experimental API in another > > component in DPDK is almost always the author of the that experimental API, > > so > > not sure this check is ever really needed within dpdk. > > > I would have thought so too, but it doesn't really bear up. The example I > used > to convince myself of a more granular approach was commit > 9c38b704d280ac128003238d7d80bf07fa556a7d where the rte_service API was > introduced as experimental by Nikhil Rao, and then later used in the eal > library > as part of commit a894d4815f79b0d76527d9c42b23327de1501711 by Harry van > Haaren. > Its no big deal because, as we agree, internal usage should be considered > safe, > but it seemed clear that differing authors were using each others code > (potentially oblivious to the experimental nature of those APIs) > > > But OK, I guess it won't hurt to have more granular approach. > > > > > > > >> Do we have any option than allowing them in DPDK library? And when > > >> experimental > > >> API modified the users in the DPDK library internally guaranteed to be > > >> updated. > > >> Why not globally allow this for all DPDK internally? > > >> > > > For the reason I gave above. We certainly could enable this in a more > > > top-level > > > makefile so that for in-library systems it was opt-in rather than > > > opt-out, but I > > > chose a more granular approach because I could envision newer libraries > > > wanting > > > it on. I also felt, generally speaking, that where warning flags were > > > concerned, it generally desireous to have them on by default, and make > > > people > > > explicitly choose to turn them off. I think DPDK developpers look at the EXPERIMENTAL warning in the doxygen above the prototype. And when API will be switched to stable, we probably won't remove the flag in the makefile to disable allowing experimental. So at the end, we could just allow experimental API for all internal libs.
[dpdk-dev] [PATCH v6 01/14] eal: introduce atomic exchange operation
From: Stephen Hemminger
To handle atomic update of link status (64 bit), every driver
was doing its own version using cmpset.
Atomic exchange is a useful primitive in its own right;
therefore make it a EAL routine.
Signed-off-by: Stephen Hemminger
Reviewed-by: Ferruh Yigit
---
v6:
*fix build error caused by rte_atomic64_t_cmpset
---
.../common/include/arch/x86/rte_atomic.h | 24 +++
.../common/include/arch/x86/rte_atomic_32.h| 12
.../common/include/arch/x86/rte_atomic_64.h| 12
lib/librte_eal/common/include/generic/rte_atomic.h | 78 ++
4 files changed, 126 insertions(+)
diff --git a/lib/librte_eal/common/include/arch/x86/rte_atomic.h
b/lib/librte_eal/common/include/arch/x86/rte_atomic.h
index 36cfabc38..55bfc3903 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_atomic.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_atomic.h
@@ -60,6 +60,18 @@ rte_atomic16_cmpset(volatile uint16_t *dst, uint16_t exp,
uint16_t src)
return res;
}
+static inline uint16_t
+rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val)
+{
+ asm volatile(
+ MPLOCKED
+ "xchgw %0, %1;"
+ : "=r" (val), "=m" (*dst)
+ : "0" (val), "m" (*dst)
+ : "memory"); /* no-clobber list */
+ return val;
+}
+
static inline int rte_atomic16_test_and_set(rte_atomic16_t *v)
{
return rte_atomic16_cmpset((volatile uint16_t *)&v->cnt, 0, 1);
@@ -134,6 +146,18 @@ rte_atomic32_cmpset(volatile uint32_t *dst, uint32_t exp,
uint32_t src)
return res;
}
+static inline uint32_t
+rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val)
+{
+ asm volatile(
+ MPLOCKED
+ "xchgl %0, %1;"
+ : "=r" (val), "=m" (*dst)
+ : "0" (val), "m" (*dst)
+ : "memory"); /* no-clobber list */
+ return val;
+}
+
static inline int rte_atomic32_test_and_set(rte_atomic32_t *v)
{
return rte_atomic32_cmpset((volatile uint32_t *)&v->cnt, 0, 1);
diff --git a/lib/librte_eal/common/include/arch/x86/rte_atomic_32.h
b/lib/librte_eal/common/include/arch/x86/rte_atomic_32.h
index fb3abf187..8d711b6f6 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_atomic_32.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_atomic_32.h
@@ -98,6 +98,18 @@ rte_atomic64_cmpset(volatile uint64_t *dst, uint64_t exp,
uint64_t src)
return res;
}
+static inline uint64_t
+rte_atomic64_exchange(volatile uint64_t *dest, uint64_t val)
+{
+ uint64_t old;
+
+ do {
+ old = *dest;
+ } while (rte_atomic64_cmpset(dest, old, val));
+
+ return old;
+}
+
static inline void
rte_atomic64_init(rte_atomic64_t *v)
{
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 1a53a766b..fd2ec9c53 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
@@ -71,6 +71,18 @@ rte_atomic64_cmpset(volatile uint64_t *dst, uint64_t exp,
uint64_t src)
return res;
}
+static inline uint64_t
+rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val)
+{
+ asm volatile(
+ MPLOCKED
+ "xchgq %0, %1;"
+ : "=r" (val), "=m" (*dst)
+ : "0" (val), "m" (*dst)
+ : "memory"); /* no-clobber list */
+ return val;
+}
+
static inline void
rte_atomic64_init(rte_atomic64_t *v)
{
diff --git a/lib/librte_eal/common/include/generic/rte_atomic.h
b/lib/librte_eal/common/include/generic/rte_atomic.h
index 3ba7245a3..d3348343c 100644
--- a/lib/librte_eal/common/include/generic/rte_atomic.h
+++ b/lib/librte_eal/common/include/generic/rte_atomic.h
@@ -139,6 +139,32 @@ rte_atomic16_cmpset(volatile uint16_t *dst, uint16_t exp,
uint16_t src)
}
#endif
+/**
+ * Atomic exchange.
+ *
+ * (atomic) equivalent to:
+ * ret = *dst
+ * *dst = val;
+ * return ret;
+ *
+ * @param dst
+ * The destination location into which the value will be written.
+ * @param val
+ * The new value.
+ * @return
+ * The original value at that location
+ */
+static inline uint16_t
+rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val);
+
+#ifdef RTE_FORCE_INTRINSICS
+static inline uint16_t
+rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val)
+{
+ return __atomic_exchange_2(dst, val, __ATOMIC_SEQ_CST);
+}
+#endif
+
/**
* The atomic counter structure.
*/
@@ -392,6 +418,32 @@ rte_atomic32_cmpset(volatile uint32_t *dst, uint32_t exp,
uint32_t src)
}
#endif
+/**
+ * Atomic exchange.
+ *
+ * (atomic) equivalent to:
+ * ret = *dst
+ * *dst = val;
+ * return ret;
+ *
+ * @param dst
+ * The destination location into which the value will be
[dpdk-dev] [PATCH v6 02/14] ethdev: add linkstatus get/set helper functions
From: Stephen Hemminger
Many drivers are all doing copy/paste of the same code to atomically
update the link status. Reduce duplication, and allow for future
changes by having common function for this.
Signed-off-by: Stephen Hemminger
Reviewed-by: Ferruh Yigit
---
lib/librte_ether/rte_ethdev.c | 22 +++
lib/librte_ether/rte_ethdev.h | 62 +++
2 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 8a365393d..1d6f159e8 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1540,20 +1540,6 @@ rte_eth_allmulticast_get(uint16_t port_id)
return dev->data->all_multicast;
}
-static inline int
-rte_eth_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
void
rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link)
{
@@ -1562,8 +1548,8 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link
*eth_link)
RTE_ETH_VALID_PORTID_OR_RET(port_id);
dev = &rte_eth_devices[port_id];
- if (dev->data->dev_conf.intr_conf.lsc != 0)
- rte_eth_dev_atomic_read_link_status(dev, eth_link);
+ if (dev->data->dev_conf.intr_conf.lsc)
+ rte_eth_linkstatus_get(dev, eth_link);
else {
RTE_FUNC_PTR_OR_RET(*dev->dev_ops->link_update);
(*dev->dev_ops->link_update)(dev, 1);
@@ -1579,8 +1565,8 @@ rte_eth_link_get_nowait(uint16_t port_id, struct
rte_eth_link *eth_link)
RTE_ETH_VALID_PORTID_OR_RET(port_id);
dev = &rte_eth_devices[port_id];
- if (dev->data->dev_conf.intr_conf.lsc != 0)
- rte_eth_dev_atomic_read_link_status(dev, eth_link);
+ if (dev->data->dev_conf.intr_conf.lsc)
+ rte_eth_linkstatus_get(dev, eth_link);
else {
RTE_FUNC_PTR_OR_RET(*dev->dev_ops->link_update);
(*dev->dev_ops->link_update)(dev, 0);
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 2729e2b43..c8b254cd6 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -2254,6 +2254,68 @@ int rte_eth_dev_set_link_down(uint16_t port_id);
*/
void rte_eth_dev_close(uint16_t port_id);
+
+/**
+ * @internal
+ * Atomically set the link status for the specific device.
+ * It is for use by DPDK device driver use only.
+ * User applications should not call it
+ *
+ * @param dev
+ * Pointer to struct rte_eth_dev.
+ * @param link
+ * New link status value.
+ * @return
+ * 1 if link status has changed;
+ * 0 if link status is unchanged.
+ */
+static inline int
+rte_eth_linkstatus_set(struct rte_eth_dev *dev,
+ const struct rte_eth_link *new_link)
+{
+ volatile uint64_t *dev_link
+= (volatile uint64_t *)&(dev->data->dev_link);
+ union {
+ uint64_t val64;
+ struct rte_eth_link link;
+ } orig;
+
+ RTE_BUILD_BUG_ON(sizeof(*new_link) != sizeof(uint64_t));
+
+ orig.val64 = rte_atomic64_exchange(dev_link,
+ *(const uint64_t *)new_link);
+
+ return orig.link.link_status != new_link->link_status;
+}
+
+/**
+ * @internal
+ * Atomically get the link speed and status.
+ *
+ * @param dev
+ * Pointer to struct rte_eth_dev.
+ * @param link
+ * link status value.
+ */
+static inline void
+rte_eth_linkstatus_get(const struct rte_eth_dev *dev,
+ struct rte_eth_link *link)
+{
+ volatile uint64_t *src = (uint64_t *)&(dev->data->dev_link);
+ uint64_t *dst = (uint64_t *)link;
+
+ RTE_BUILD_BUG_ON(sizeof(*link) != sizeof(uint64_t));
+
+ /* can't use rte_atomic64_read because it returns signed int */
+#ifdef __LP64__
+ *dst = *src;
+#else
+ do {
+ *dst = *src;
+ } while (!rte_atomic64_cmpset(src, *dst, *dst));
+#endif
+}
+
/**
* Reset a Ethernet device and keep its port id.
*
--
2.14.3
[dpdk-dev] [PATCH v6 03/14] net/virtio: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use the new comon code in ethdev to handle link status update.
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/virtio/virtio_ethdev.c | 53 +-
1 file changed, 6 insertions(+), 47 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index 17ac04931..dcbbfa90c 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -14,7 +14,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -785,46 +784,6 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
.mac_addr_set= virtio_mac_addr_set,
};
-static inline int
-virtio_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-virtio_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
static void
virtio_update_stats(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
@@ -2023,8 +1982,10 @@ static void
virtio_dev_stop(struct rte_eth_dev *dev)
{
struct virtio_hw *hw = dev->data->dev_private;
- struct rte_eth_link link;
struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ };
PMD_INIT_LOG(DEBUG, "stop");
@@ -2033,8 +1994,7 @@ virtio_dev_stop(struct rte_eth_dev *dev)
virtio_intr_disable(dev);
hw->started = 0;
- memset(&link, 0, sizeof(link));
- virtio_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
rte_spinlock_unlock(&hw->state_lock);
}
@@ -2044,8 +2004,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complet
struct rte_eth_link link, old;
uint16_t status;
struct virtio_hw *hw = dev->data->dev_private;
- memset(&link, 0, sizeof(link));
- virtio_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
old = link;
link.link_duplex = ETH_LINK_FULL_DUPLEX;
link.link_speed = ETH_SPEED_NUM_10G;
@@ -2069,7 +2028,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complet
} else {
link.link_status = ETH_LINK_UP;
}
- virtio_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
return (old.link_status == link.link_status) ? -1 : 0;
}
--
2.14.3
[dpdk-dev] [PATCH v6 04/14] net/vmxnet3: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use new rte_eth_link_update helper.
Also remove no longer necessary include of rte_atomic.h
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 80 +++-
1 file changed, 14 insertions(+), 66 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c
b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index d3b704b40..fc495388e 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -160,59 +159,6 @@ gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size,
return rte_memzone_reserve_aligned(z_name, size, socket_id, 0, align);
}
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-
-static int
-vmxnet3_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to write to.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static int
-vmxnet3_dev_atomic_write_link_status(struct rte_eth_dev *dev,
-struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
/*
* This function is based on vmxnet3_disable_intr()
*/
@@ -817,8 +763,10 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
static void
vmxnet3_dev_stop(struct rte_eth_dev *dev)
{
- struct rte_eth_link link;
struct vmxnet3_hw *hw = dev->data->dev_private;
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ };
PMD_INIT_FUNC_TRACE();
@@ -852,8 +800,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
vmxnet3_dev_clear_queues(dev);
/* Clear recorded link status */
- memset(&link, 0, sizeof(link));
- vmxnet3_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
}
/*
@@ -1132,23 +1079,24 @@ __vmxnet3_dev_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complete)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
- struct rte_eth_link old = { 0 }, link;
+ struct rte_eth_link old;
+ struct rte_eth_link link = {
+ .link_speed = ETH_SPEED_NUM_10G,
+ .link_duplex = ETH_LINK_FULL_DUPLEX,
+ .link_autoneg = ETH_LINK_AUTONEG,
+ .link_status = ETH_LINK_DOWN,
+ };
uint32_t ret;
- memset(&link, 0, sizeof(link));
- vmxnet3_dev_atomic_read_link_status(dev, &old);
+ rte_eth_linkstatus_get(dev, &old);
VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK);
ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
- if (ret & 0x1) {
+ if (ret & 0x1)
link.link_status = ETH_LINK_UP;
- link.link_duplex = ETH_LINK_FULL_DUPLEX;
- link.link_speed = ETH_SPEED_NUM_10G;
- link.link_autoneg = ETH_LINK_AUTONEG;
- }
- vmxnet3_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
return (old.link_status == link.link_status) ? -1 : 0;
}
--
2.14.3
[dpdk-dev] [PATCH v6 07/14] net/e1000: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use new rte_eth_linkstatus_get/set API.
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/e1000/em_ethdev.c | 63 -
drivers/net/e1000/igb_ethdev.c | 64 --
2 files changed, 10 insertions(+), 117 deletions(-)
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index dcffb0797..8bedaf77d 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
@@ -197,57 +196,6 @@ static const struct eth_dev_ops eth_em_ops = {
.txq_info_get = em_txq_info_get,
};
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_em_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_em_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
/**
* eth_em_dev_is_ich8 - Check for ICH8 device
@@ -802,7 +750,7 @@ eth_em_stop(struct rte_eth_dev *dev)
/* clear the recorded link status */
memset(&link, 0, sizeof(link));
- rte_em_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
if (!rte_intr_allow_others(intr_handle))
/* resume to the default handler */
@@ -1194,8 +1142,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int
wait_to_complete)
break;
rte_delay_ms(EM_LINK_UPDATE_CHECK_INTERVAL);
}
- memset(&link, 0, sizeof(link));
- rte_em_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
old = link;
/* Now we check if a transition has happened */
@@ -1215,7 +1162,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int
wait_to_complete)
link.link_status = ETH_LINK_DOWN;
link.link_autoneg = ETH_LINK_FIXED;
}
- rte_em_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
/* not changed */
if (old.link_status == link.link_status)
@@ -1631,8 +1578,8 @@ eth_em_interrupt_action(struct rte_eth_dev *dev,
if (ret < 0)
return 0;
- memset(&link, 0, sizeof(link));
- rte_em_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
+
if (link.link_status) {
PMD_INIT_LOG(INFO, " Port %d: Link Up - speed %u Mbps - %s",
dev->data->port_id, link.link_speed,
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 077e09400..b02a0e6b4 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
@@ -522,57 +521,6 @@ static const struct rte_igb_xstats_name_off
rte_igbvf_stats_strings[] = {
#define IGBVF_NB_XSTATS (sizeof(rte_igbvf_stats_strings) / \
sizeof(rte_igbvf_stats_strings[0]))
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_igb_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset
[dpdk-dev] [PATCH v6 09/14] net/i40e: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use new rte_linkstatus update API
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/i40e/i40e_ethdev.c| 39 +--
drivers/net/i40e/i40e_ethdev_vf.c | 19 +++
2 files changed, 8 insertions(+), 50 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 5ea9f9917..0b102c0de 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -628,34 +628,6 @@ static struct rte_pci_driver rte_i40e_pmd = {
.remove = eth_i40e_pci_remove,
};
-static inline int
-rte_i40e_dev_atomic_read_link_status(struct rte_eth_dev *dev,
-struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-static inline int
-rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
RTE_PMD_REGISTER_PCI(net_i40e, rte_i40e_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map);
RTE_PMD_REGISTER_KMOD_DEP(net_i40e, "* igb_uio | uio_pci_generic | vfio-pci");
@@ -2353,11 +2325,11 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false;
memset(&link, 0, sizeof(link));
- memset(&old, 0, sizeof(old));
- memset(&link_status, 0, sizeof(link_status));
- rte_i40e_dev_atomic_read_link_status(dev, &old);
+ rte_eth_linkstatus_get(dev, &old);
do {
+ memset(&link_status, 0, sizeof(link_status));
+
/* Get link status information from hardware */
status = i40e_aq_get_link_info(hw, enable_lse,
&link_status, NULL);
@@ -2410,7 +2382,7 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
ETH_LINK_SPEED_FIXED);
out:
- rte_i40e_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
if (link.link_status == old.link_status)
return -1;
@@ -10034,9 +10006,8 @@ i40e_start_timecounters(struct rte_eth_dev *dev)
uint32_t tsync_inc_h;
/* Get current link speed. */
- memset(&link, 0, sizeof(link));
i40e_dev_link_update(dev, 1);
- rte_i40e_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
switch (link.link_speed) {
case ETH_SPEED_NUM_40G:
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c
b/drivers/net/i40e/i40e_ethdev_vf.c
index 0cca0d324..8e61fa84f 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1036,20 +1036,6 @@ static const struct rte_pci_id pci_id_i40evf_map[] = {
{ .vendor_id = 0, /* sentinel */ },
};
-static inline int
-i40evf_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
/* Disable IRQ0 */
static inline void
i40evf_disable_irq0(struct i40e_hw *hw)
@@ -2077,6 +2063,7 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,
* while Linux driver does not
*/
+ memset(&new_link, 0, sizeof(new_link));
/* Linux driver PF host */
switch (vf->link_speed) {
case I40E_LINK_SPEED_100MB:
@@ -2106,9 +2093,9 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,
new_link.link_status = vf->link_up ? ETH_LINK_UP :
ETH_LINK_DOWN;
new_link.link_autoneg =
- dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED;
+ dev->data->dev_conf.link_speeds & ETH_LINK_FIXED;
- i40evf_dev_atomic_write_link_status(dev, &new_link);
+ rte_eth_linkstatus_set(dev, &new_link);
return 0;
}
--
2.14.3
[dpdk-dev] [PATCH v6 10/14] net/liquidio: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use the new link update API, and cleanup the logic in the the
link update routine.
Signed-off-by: Stephen Hemminger
Tested-by: Shijith Thotton
Reviewed-by: Ferruh Yigit
---
drivers/net/liquidio/lio_ethdev.c | 56 +++
1 file changed, 9 insertions(+), 47 deletions(-)
diff --git a/drivers/net/liquidio/lio_ethdev.c
b/drivers/net/liquidio/lio_ethdev.c
index 8f6ef6381..9adbcc12c 100644
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -904,32 +904,6 @@ lio_dev_vlan_filter_set(struct rte_eth_dev *eth_dev,
uint16_t vlan_id, int on)
return 0;
}
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param eth_dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-lio_dev_atomic_write_link_status(struct rte_eth_dev *eth_dev,
-struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = ð_dev->data->dev_link;
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
static uint64_t
lio_hweight64(uint64_t w)
{
@@ -949,24 +923,17 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev,
int wait_to_complete __rte_unused)
{
struct lio_device *lio_dev = LIO_DEV(eth_dev);
- struct rte_eth_link link, old;
-
- /* Initialize */
- link.link_status = ETH_LINK_DOWN;
- link.link_speed = ETH_SPEED_NUM_NONE;
- link.link_duplex = ETH_LINK_HALF_DUPLEX;
- link.link_autoneg = ETH_LINK_AUTONEG;
- memset(&old, 0, sizeof(old));
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ .link_speed = ETH_SPEED_NUM_NONE,
+ .link_duplex = ETH_LINK_HALF_DUPLEX,
+ .link_autoneg = ETH_LINK_AUTONEG,
+ };
/* Return what we found */
- if (lio_dev->linfo.link.s.link_up == 0) {
+ if (lio_dev->linfo.link.s.link_up == 0)
/* Interface is down */
- if (lio_dev_atomic_write_link_status(eth_dev, &link))
- return -1;
- if (link.link_status == old.link_status)
- return -1;
- return 0;
- }
+ return rte_eth_linkstatus_set(eth_dev, &link);
link.link_status = ETH_LINK_UP; /* Interface is up */
link.link_duplex = ETH_LINK_FULL_DUPLEX;
@@ -982,12 +949,7 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev,
link.link_duplex = ETH_LINK_HALF_DUPLEX;
}
- if (lio_dev_atomic_write_link_status(eth_dev, &link))
- return -1;
-
- if (link.link_status == old.link_status)
- return -1;
-
+ rte_eth_linkstatus_set(eth_dev, &link);
return 0;
}
--
2.14.3
[dpdk-dev] [PATCH v6 05/14] net/dpaa2: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use new helper function to update the link status.
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Use correct APIs
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/dpaa2/dpaa2_ethdev.c | 77 +++-
1 file changed, 12 insertions(+), 65 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index a0a3d5264..9a3a4182b 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -57,58 +57,6 @@ static int dpaa2_dev_set_link_up(struct rte_eth_dev *dev);
static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev);
static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-dpaa2_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &dev->data->dev_link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-dpaa2_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &dev->data->dev_link;
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
static int
dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
@@ -821,7 +769,9 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
int ret;
- struct rte_eth_link link;
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ };
struct rte_intr_handle *intr_handle = dev->intr_handle;
PMD_INIT_FUNC_TRACE();
@@ -851,8 +801,7 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
}
/* clear the recorded link status */
- memset(&link, 0, sizeof(link));
- dpaa2_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
}
static void
@@ -862,7 +811,9 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
int i, ret;
- struct rte_eth_link link;
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ };
struct dpaa2_queue *dpaa2_q;
PMD_INIT_FUNC_TRACE();
@@ -883,8 +834,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
return;
}
- memset(&link, 0, sizeof(link));
- dpaa2_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
}
static void
@@ -1342,8 +1292,7 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
RTE_LOG(ERR, PMD, "dpni is NULL\n");
return 0;
}
- memset(&old, 0, sizeof(old));
- dpaa2_dev_atomic_read_link_status(dev, &old);
+ rte_eth_linkstatus_get(dev, &old);
ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
if (ret < 0) {
@@ -1365,12 +1314,10 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
else
link.link_duplex = ETH_LINK_FULL_DUPLEX;
- dpaa2_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
- if (link.link_status)
- PMD_DRV_LOG(INFO, "Port %d Link is Up\n", dev->data->port_id);
- else
- PMD_DRV_LOG(INFO, "Port %d Link is Down", dev->data->port_id);
+ PMD_DRV_LOG(INFO, "Port %d Link is %s\n", dev->data->port_id,
+ link.link_status ? "Up" : "Down");
return 0;
}
--
2.14.3
[dpdk-dev] [PATCH v6 06/14] net/nfp: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use new rte_eth_linkstatus_get/set helper function.
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/nfp/nfp_net.c | 70 +--
1 file changed, 7 insertions(+), 63 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index d14f2442b..5b886528b 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -213,57 +213,6 @@ nn_cfg_writeq(struct nfp_net_hw *hw, int off, uint64_t val)
nn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off);
}
-/*
- * Atomically reads link status information from global structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-nfp_net_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &dev->data->dev_link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-/*
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-nfp_net_dev_atomic_write_link_status(struct rte_eth_dev *dev,
-struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &dev->data->dev_link;
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
static void
nfp_net_rx_queue_release_mbufs(struct nfp_net_rxq *rxq)
{
@@ -1017,8 +966,7 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused
int wait_to_complete)
hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- memset(&old, 0, sizeof(old));
- nfp_net_dev_atomic_read_link_status(dev, &old);
+ rte_eth_linkstatus_get(dev, &old);
nn_link_status = nn_cfg_readl(hw, NFP_NET_CFG_STS);
@@ -1038,11 +986,10 @@ nfp_net_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complete)
link.link_speed = ls_to_ethtool[nn_link_status];
if (old.link_status != link.link_status) {
- nfp_net_dev_atomic_write_link_status(dev, &link);
- if (link.link_status)
- PMD_DRV_LOG(INFO, "NIC Link is Up\n");
- else
- PMD_DRV_LOG(INFO, "NIC Link is Down\n");
+ rte_eth_linkstatus_set(dev, &link);
+
+ PMD_DRV_LOG(INFO, "NIC Link is %s\n",
+ link.link_status ? "Up" : "Down");
return 0;
}
@@ -1376,8 +1323,7 @@ nfp_net_dev_link_status_print(struct rte_eth_dev *dev)
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_eth_link link;
- memset(&link, 0, sizeof(link));
- nfp_net_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
if (link.link_status)
RTE_LOG(INFO, PMD, "Port %d: Link Up - speed %u Mbps - %s\n",
dev->data->port_id, link.link_speed,
@@ -1430,9 +1376,7 @@ nfp_net_dev_interrupt_handler(void *param)
PMD_DRV_LOG(DEBUG, "We got a LSC interrupt!!!\n");
- /* get the link status */
- memset(&link, 0, sizeof(link));
- nfp_net_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
nfp_net_link_update(dev, 0);
--
2.14.3
[dpdk-dev] [PATCH v6 08/14] net/ixgbe: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use the new helper functions from eth_dev for
handling atomic link_info update.
Signed-off-by: Stephen Hemminger
Signed-off-by: Ferruh Yigit
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
drivers/net/ixgbe/ixgbe_ethdev.c | 87
1 file changed, 16 insertions(+), 71 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 4f4334df2..2d520446c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -787,58 +786,6 @@ static const struct rte_ixgbe_xstats_name_off
rte_ixgbevf_stats_strings[] = {
#define IXGBEVF_NB_XSTATS (sizeof(rte_ixgbevf_stats_strings) / \
sizeof(rte_ixgbevf_stats_strings[0]))
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_ixgbe_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_ixgbe_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
/*
* This function is the same as ixgbe_is_sfp() in base/ixgbe.h.
*/
@@ -2758,7 +2705,7 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
/* Clear recorded link status */
memset(&link, 0, sizeof(link));
- rte_ixgbe_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
if (!rte_intr_allow_others(intr_handle))
/* resume to the default handler */
@@ -3943,7 +3890,7 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
int wait_to_complete, int vf)
{
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- struct rte_eth_link link, old;
+ struct rte_eth_link old;
ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
struct ixgbe_interrupt *intr =
IXGBE_DEV_PRIVATE_TO_INTR(dev->data->dev_private);
@@ -3952,13 +3899,13 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
u32 speed = 0;
int wait = 1;
bool autoneg = false;
+ struct rte_eth_link link = {
+ .link_status = ETH_LINK_DOWN,
+ .link_duplex = ETH_LINK_HALF_DUPLEX,
+ .link_autoneg = ETH_LINK_AUTONEG,
+ };
- link.link_status = ETH_LINK_DOWN;
- link.link_speed = 0;
- link.link_duplex = ETH_LINK_HALF_DUPLEX;
- link.link_autoneg = ETH_LINK_AUTONEG;
- memset(&old, 0, sizeof(old));
- rte_ixgbe_dev_atomic_read_link_status(dev, &old);
+ rte_eth_linkstatus_get(dev, &old);
hw->mac.get_link_status = true;
@@ -3982,14 +3929,14 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
if (diag != 0) {
link.link_speed = ETH_SPEED_NUM_100M;
link.link_duplex = ETH_LINK_FULL_DUPLEX;
- rte_ixgbe_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
if (link.link_status == old.link_status)
return -1;
return 0;
}
if (link_up == 0) {
- rte_ixgbe_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
intr->flags |= IXGBE_FLAG_NEED_LINK_CONFIG;
if (link.link_status == old.link_status)
return -1;
@@ -4026,7 +3973,7 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
link.link_speed = ETH_SPEED_NUM_10G;
break;
}
- rte_ixgbe_dev_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
[dpdk-dev] [PATCH v6 11/14] net/thunderx: use ethdev linkstatus helper functions
From: Stephen Hemminger
Use new helper function.
Signed-off-by: Stephen Hemminger
Reviewed-by: Ferruh Yigit
---
drivers/net/thunderx/nicvf_ethdev.c | 19 +++
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/net/thunderx/nicvf_ethdev.c
b/drivers/net/thunderx/nicvf_ethdev.c
index c42ba30a4..0076c5ae3 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -15,7 +15,6 @@
#include
#include
-#include
#include
#include
#include
@@ -69,20 +68,6 @@ nicvf_init_log(void)
rte_log_set_level(nicvf_logtype_driver, RTE_LOG_NOTICE);
}
-static inline int
-nicvf_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &dev->data->dev_link;
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
static inline void
nicvf_set_eth_link_status(struct nicvf *nic, struct rte_eth_link *link)
{
@@ -163,7 +148,9 @@ nicvf_dev_link_update(struct rte_eth_dev *dev, int
wait_to_complete)
memset(&link, 0, sizeof(link));
nicvf_set_eth_link_status(nic, &link);
}
- return nicvf_atomic_write_link_status(dev, &link);
+
+ rte_eth_linkstatus_set(dev, &link);
+ return 0;
}
static int
--
2.14.3
[dpdk-dev] [PATCH v6 13/14] net/octeontx: use ethdev linkstatus helper functions
From: Stephen Hemminger
Common function matches this drivers usage.
Signed-off-by: Stephen Hemminger
Reviewed-by: Ferruh Yigit
---
drivers/net/octeontx/octeontx_ethdev.c | 17 ++---
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/net/octeontx/octeontx_ethdev.c
b/drivers/net/octeontx/octeontx_ethdev.c
index adca3435e..a54ea1d22 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -487,20 +487,6 @@ octeontx_dev_promisc_disable(struct rte_eth_dev *dev)
octeontx_port_promisc_set(nic, 0);
}
-static inline int
-octeontx_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &dev->data->dev_link;
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
static int
octeontx_port_link_status(struct octeontx_nic *nic)
{
@@ -572,7 +558,8 @@ octeontx_dev_link_update(struct rte_eth_dev *dev,
link.link_duplex = ETH_LINK_FULL_DUPLEX;
link.link_autoneg = ETH_LINK_AUTONEG;
- return octeontx_atomic_write_link_status(dev, &link);
+ rte_eth_linkstatus_set(dev, &link);
+ return 0;
}
static int
--
2.14.3
[dpdk-dev] [PATCH v6 12/14] net/szedata2: use ethdev linkstatus helper functions
From: Stephen Hemminger
Yet another driver which was not returing correct value on
link change.
Since this driver can't be built on x86 could not even
do a compile test.
Signed-off-by: Stephen Hemminger
Reviewed-by: Ferruh Yigit
---
drivers/net/szedata2/rte_eth_szedata2.c | 19 ++-
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/net/szedata2/rte_eth_szedata2.c
b/drivers/net/szedata2/rte_eth_szedata2.c
index 45aebed33..958c5ccb3 100644
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -50,7 +50,6 @@
#include
#include
#include
-#include
#include "rte_eth_szedata2.h"
#include "szedata2_iobuf.h"
@@ -1173,14 +1172,15 @@ static int
eth_link_update(struct rte_eth_dev *dev,
int wait_to_complete __rte_unused)
{
- struct rte_eth_link link;
- struct rte_eth_link *link_ptr = &link;
- struct rte_eth_link *dev_link = &dev->data->dev_link;
struct pmd_internals *internals = (struct pmd_internals *)
dev->data->dev_private;
const volatile struct szedata2_ibuf *ibuf;
uint32_t i;
bool link_is_up = false;
+ struct rte_eth_link link = {
+ .link_duplex = ETH_LINK_FULL_DUPLEX,
+ .link_autoneg = ETH_LINK_FIXED,
+ };
switch (get_link_speed(internals)) {
case SZEDATA2_LINK_SPEED_10G:
@@ -1197,9 +1197,6 @@ eth_link_update(struct rte_eth_dev *dev,
break;
}
- /* szedata2 uses only full duplex */
- link.link_duplex = ETH_LINK_FULL_DUPLEX;
-
for (i = 0; i < szedata2_ibuf_count; i++) {
ibuf = ibuf_ptr_by_index(internals->pci_rsc, i);
/*
@@ -1212,13 +1209,9 @@ eth_link_update(struct rte_eth_dev *dev,
}
}
- link.link_status = (link_is_up) ? ETH_LINK_UP : ETH_LINK_DOWN;
-
- link.link_autoneg = ETH_LINK_FIXED;
-
- rte_atomic64_cmpset((uint64_t *)dev_link, *(uint64_t *)dev_link,
- *(uint64_t *)link_ptr);
+ link.link_status = link_is_up ? ETH_LINK_UP : ETH_LINK_DOWN;
+ rte_eth_linkstatus_set(dev, &link);
return 0;
}
--
2.14.3
[dpdk-dev] [PATCH v6 14/14] net/enic: use ethdev linkstatus helper functions
From: Stephen Hemminger
This driver was not doing atomic update of link status information.
And the return value was different than others.
The hardware also does not do autonegotiation (at least on Linux).
Signed-off-by: Stephen Hemminger
Reviewed-by: Ferruh Yigit
---
drivers/net/enic/enic_ethdev.c | 5 ++---
drivers/net/enic/enic_main.c | 17 -
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index ad7a4e306..d3e98a33f 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -426,10 +426,9 @@ static void enicpmd_dev_stop(struct rte_eth_dev *eth_dev)
ENICPMD_FUNC_TRACE();
enic_disable(enic);
+
memset(&link, 0, sizeof(link));
- rte_atomic64_cmpset((uint64_t *)ð_dev->data->dev_link,
- *(uint64_t *)ð_dev->data->dev_link,
- *(uint64_t *)&link);
+ rte_eth_linkstatus_set(eth_dev, &link);
}
/*
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 9bbe054b3..669085156 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -379,16 +379,15 @@ enic_free_consistent(void *priv,
int enic_link_update(struct enic *enic)
{
struct rte_eth_dev *eth_dev = enic->rte_dev;
- int ret;
- int link_status = 0;
+ struct rte_eth_link link = {
+ .link_status = enic_get_link_status(enic),
+ .link_duplex = ETH_LINK_FULL_DUPLEX,
+ .link_speed = vnic_dev_port_speed(enic->vdev),
+ .link_autoneg = ETH_LINK_FIXED,
+ };
- link_status = enic_get_link_status(enic);
- ret = (link_status == enic->link_status);
- enic->link_status = link_status;
- eth_dev->data->dev_link.link_status = link_status;
- eth_dev->data->dev_link.link_duplex = ETH_LINK_FULL_DUPLEX;
- eth_dev->data->dev_link.link_speed = vnic_dev_port_speed(enic->vdev);
- return ret;
+ rte_eth_linkstatus_set(eth_dev, &link);
+ return 0;
}
static void
--
2.14.3
Re: [dpdk-dev] [PATCH v6 01/14] eal: introduce atomic exchange operation
On 1/21/2018 6:59 PM, Ferruh Yigit wrote: > From: Stephen Hemminger > > To handle atomic update of link status (64 bit), every driver > was doing its own version using cmpset. > Atomic exchange is a useful primitive in its own right; > therefore make it a EAL routine. > > Signed-off-by: Stephen Hemminger > Reviewed-by: Ferruh Yigit Series applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v6 4/6] ethdev: adjust APIs removal error report
On 1/19/2018 4:19 PM, Ferruh Yigit wrote:
> On 1/18/2018 6:10 PM, Matan Azrad wrote:
>> Hi Ferruh
>>
>> From: Ferruh Yigit, Thursday, January 18, 2018 7:31 PM
>>> On 1/18/2018 11:27 AM, Matan Azrad wrote:
rte_eth_dev_is_removed API was added to detect a device removal
synchronously.
When a device removal occurs during control command execution, many
different errors can be reported to the user.
Adjust all ethdev APIs error reports to return -EIO in case of device
removal using rte_eth_dev_is_removed API.
Signed-off-by: Matan Azrad
Acked-by: Thomas Monjalon
---
lib/librte_ether/rte_ethdev.c | 192
+++---
lib/librte_ether/rte_ethdev.h | 51 ++-
2 files changed, 170 insertions(+), 73 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.c
b/lib/librte_ether/rte_ethdev.c index c93cec1..7044159 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -338,6 +338,16 @@ struct rte_eth_dev *
return -ENODEV;
}
+static int
+eth_err(uint16_t port_id, int ret)
+{
+ if (ret == 0)
+ return 0;
+ if (rte_eth_dev_is_removed(port_id))
+ return -EIO;
+ return ret;
+}
+
/* attach the new device, then store port_id of the device */ int
rte_eth_dev_attach(const char *devargs, uint16_t *port_id) @@ -492,7
+502,8 @@ struct rte_eth_dev *
return 0;
}
- return dev->dev_ops->rx_queue_start(dev, rx_queue_id);
+ return eth_err(port_id, dev->dev_ops->rx_queue_start(dev,
+ rx_queue_id));
}
>>>
>>> This patch updates *all* ethdev public APIs to add if device is removed
>>> check?
>>
>> Yes.
>>
>>> And each check goes to ethdev is_removed() dev_ops to ask if dev is
>>> removed.
>> Probably, if the REMOVED state setted in will not call device is_remove.
>>
>>> These must be better way of doing this, am I missing something.
>>
>> Suggest.
>
> With a silly analogy, this is like a blind person asking each time if he is
> dead
> before talking to other person.
>
> At first glance I can think of a kind of watchdog timer can be implemented in
> ethdev layer. It provides periodic checks and if device is dead it calls the
> registered user callback function.
>
> This method presented as synchronous method but not triggered from side where
> event happens, I mean not triggered from PMD but from application.
> So does application doing polling continuously if device is dead?
> Or if application is relying this patch to add a check in each API, what
> happens
> if device removed during data processing, will app rely on asynchronous
> method?
>
> I am including a few consumers of the ethdev to the mail thread, clearly I am
> not very supportive of this patch, but specially taking release is being close
> to the account, if there is no objection than me I will take as consensus to
> get
> the patch in.
It looks like there is no objection to the patch and it is already acked, I will
get latest version to next-net.
>
>>
>> This code will replace similar code in each PMD.
>>
>>> I definitely would like to see more comments for this patch.
>>>
>>> Another question is what happens if device removed while or before
>>> dev_ops called? There is no synchronizations in drivers for removal, right?
>>>
>>
>> Yes. You right, the device removal can be changed a moment after the call.
>> Actually the caller suspected in removal before call it(and want to validate
>> it) - so it makes sense.
>> From this reason the check in ethdev APIs is called generally in error flows.
>>
>>
>>> <...>
>
Re: [dpdk-dev] [PATCHv4 5/5] doc: Add ABI __experimental tag documentation
13/12/2017 16:17, Neil Horman: > --- a/doc/guides/contributing/versioning.rst > +++ b/doc/guides/contributing/versioning.rst > +Note that marking an API as experimental is a two step process. To mark an > API > +as experimental, the symbols which are desired to be exported must be placed > in > +an EXPERIMENTAL version block in the corresponding libraries' version map > +script. Secondly, the corresponding definitions of those exported functions, > and > +their forward declarations (in the development header files), must be marked > +with the __experimental tag (see rte_compat.h). The DPDK build makefiles > +preform a check to ensure that the map file and the C code reflect the same > +list of symbols. Thanks for this text. Bruce already commented about the type "preform". Ferruh already commented about adding a string in doxygen header. Ferruh already commented about adding sentences for new API. I add that it would be the right place to explain the effect of the attribute, and how it can be disabled at compilation.
Re: [dpdk-dev] [PATCH v7 0/6] Fail-safe\ethdev: fix removal handling lack
On 1/20/2018 9:12 PM, Matan Azrad wrote: > There is time between the physical removal of the device until sub-device > PMDs get a RMV interrupt. > At this time DPDK PMDs and applications still don't know about the removal > and may call sub-device control operation which should return an error. > > This series adds new ethdev operation to check device removal, adds support > for it in mlx PMDs, adjust ethdev APIs to return -EIO in case of removal and > fixes the fail-safe bug of removal error report. > > V2: > Remove ENODEV definition. > Remove checks from all mlx control commands. > Add new devop - "is_removed". > Implement it in mlx4 and mlx5. > Fix failsafe bug by the new devop. > > V3: > Adjust ethdev APIs removal error report. > Change failsafe check to check eth_dev* return values. > Remove backporting of fail-safe patch. > > V4: > Improve fail-safe internal API to adjust the actual error value as discussed. > Remove "Fixes" lines from fail-safe patch. > No changes in ethdev\mlx patches. > > V5: > Rebase on top of master-net-mlx. > > V6: > Move ethdev new API to be EXPERIMENTAL. > > V7: > Fix API return value description. > Swap checks in the new API as Konstantin suggested. > Add comment in the API as Ferruh suggested. > > Matan Azrad (6): > ethdev: add devop to check removal status > net/mlx4: support a device removal check operation > net/mlx5: support a device removal check operation > ethdev: adjust APIs removal error report > ethdev: adjust flow APIs removal error report > net/failsafe: fix removed device handling Series applied to dpdk-next-net/master, thanks.
Re: [dpdk-dev] [PATCH v2] checkpatches.sh: Add checks for ABI symbol addition
Hi,
16/01/2018 19:22, Neil Horman:
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> Developers and Maintainers Tools
> M: Thomas Monjalon
> +M: Neil Horman
> F: MAINTAINERS
> F: devtools/check-dup-includes.sh
> F: devtools/check-maintainers.sh
> @@ -52,6 +53,7 @@ F: devtools/get-maintainer.sh
> F: devtools/git-log-fixes.sh
> F: devtools/load-devel-config
> F: devtools/test-build.sh
> +F: devtools/validate-new-api.sh
> F: license/
I really think it should be in the section "ABI versioning""
> --- a/devtools/checkpatches.sh
> +++ b/devtools/checkpatches.sh
> +export VALIDATE_NEW_API=$(dirname $(readlink -e $0))/validate-new-api.sh
Why export?
> print_usage () {
> cat <<- END_OF_HELP
> + $(dirname $0)
> usage: $(basename $0) [-q] [-v] [-nX|patch1 [patch2] ...]]
This dirname is a debug leftover?
> @@ -96,9 +100,25 @@ check () { #
> else
> report=$($DPDK_CHECKPATCH_PATH $options - 2>/dev/null)
> fi
> - [ $? -ne 0 ] || return 0
> + reta=$?
What means reta?
> +
> $verbose || printf '\n### %s\n\n' "$3"
> printf '%s\n' "$report" | sed -n '1,/^total:.*lines checked$/p'
> +
> + echo
> + echo "Checking API additions/removals:"
You should respect $verbose before printing such header.
> + if [ -n "$1" ] ; then
> + report=$($VALIDATE_NEW_API $1)
> + elif [ -n "$2" ] ; then
> + report=$(git format-patch \
> + --find-renames --no-stat --stdout -1 $commit |
> + $VALIDATE_NEW_API -)
> + else
> + report=$($VALIDATE_NEW_API -)
> + fi
> + [ $? -ne 0 -o $reta -ne 0 ] || return 0
> + printf '%s\n' "$report" | sed -n '1,/^total:.*lines checked$/p'
> +
> status=$(($status + 1))
> }
> --- /dev/null
> +++ b/devtools/validate-new-api.sh
About the file name, is it only for new API?
You don't like check-symbol-change.sh ?
It may be stupid, but I thought "validate" is more related to full test,
like validate-abi.sh does for the ABI, and "check" can be a partial
test like done in checkpatches.sh.
> + }' > ./$mapdb
> +
> + sort -u $mapdb > ./$mapdb.2
> + mv -f $mapdb.2 $mapdb
[...]
> +mapfile=`mktemp mapdb.XX`
[...]
> +rm -f $mapfile
If you create temporary file, you should remove it in a trap cleanup,
in case of interrupted processing.
The best is to avoid temp file, but use variables instead.
Re: [dpdk-dev] [PATCH v4 3/7] ethdev: add port ownership
On 1/20/2018 9:24 PM, Matan Azrad wrote:
> The ownership of a port is implicit in DPDK.
> Making it explicit is better from the next reasons:
> 1. It will define well who is in charge of the port usage synchronization.
> 2. A library could work on top of a port.
> 3. A port can work on top of another port.
>
> Also in the fail-safe case, an issue has been met in testpmd.
> We need to check that the application is not trying to use a port which
> is already managed by fail-safe.
>
> A port owner is built from owner id(number) and owner name(string) while
> the owner id must be unique to distinguish between two identical entity
> instances and the owner name can be any name.
> The name helps to logically recognize the owner by different DPDK
> entities and allows easy debug.
> Each DPDK entity can allocate an owner unique identifier and can use it
> and its preferred name to owns valid ethdev ports.
> Each DPDK entity can get any port owner status to decide if it can
> manage the port or not.
>
> The mechanism is synchronized for both the primary process threads and
> the secondary processes threads to allow secondary process entity to be
> a port owner.
>
> Add a synchronized ownership mechanism to DPDK Ethernet devices to
> avoid multiple management of a device by different DPDK entities.
>
> The current ethdev internal port management is not affected by this
> feature.
>
> Signed-off-by: Matan Azrad
> Acked-by: Thomas Monjalon
> Acked-by: Konstantin Ananyev
<...>
> @@ -273,6 +289,144 @@ struct rte_eth_dev *
> return 1;
> }
>
> +static int
> +rte_eth_is_valid_owner_id(uint64_t owner_id)
> +{
> + if (owner_id == RTE_ETH_DEV_NO_OWNER ||
> + rte_eth_dev_shared_data->next_owner_id <= owner_id) {
> + RTE_LOG(ERR, EAL, "Invalid owner_id=%016lX.\n", owner_id);
This break build [1], also why using EAL log type here? There are a few sample
of this, and there are a few using PMD log type, please fix log types.
[1]
...dpdk/lib/librte_ether/rte_ethdev.c:372:59: error: format ‘%lX’ expects
argument of type ‘long unsigned int’, but argument 4 has type ‘uint64_t {aka
long long unsigned int}’ [-Werror=format=]
RTE_LOG(ERR, EAL, "Invalid owner_id=%016lX.\n", owner_id);
^
...dpdk/i686-native-linuxapp-gcc/include/rte_log.h:288:25: note: in definition
of macro ‘RTE_LOG’
RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__)
^
...dpdk/lib/librte_ether/rte_ethdev.c: In function ‘_rte_eth_dev_owner_set’:
...dpdk/lib/librte_ether/rte_ethdev.c:421:18: error: format ‘%lX’ expects
argument of type ‘long unsigned int’, but argument 6 has type ‘uint64_t {aka
long long unsigned int}’ [-Werror=format=]
port_owner->id);
~ ^
...dpdk/i686-native-linuxapp-gcc/include/rte_log.h:288:25: note: in definition
of macro ‘RTE_LOG’
RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__)
^
cc1: all warnings being treated as errors
Re: [dpdk-dev] [PATCH v4 3/7] ethdev: add port ownership
On 1/20/2018 9:24 PM, Matan Azrad wrote: > The ownership of a port is implicit in DPDK. > Making it explicit is better from the next reasons: > 1. It will define well who is in charge of the port usage synchronization. > 2. A library could work on top of a port. > 3. A port can work on top of another port. > > Also in the fail-safe case, an issue has been met in testpmd. > We need to check that the application is not trying to use a port which > is already managed by fail-safe. > > A port owner is built from owner id(number) and owner name(string) while > the owner id must be unique to distinguish between two identical entity > instances and the owner name can be any name. > The name helps to logically recognize the owner by different DPDK > entities and allows easy debug. > Each DPDK entity can allocate an owner unique identifier and can use it > and its preferred name to owns valid ethdev ports. > Each DPDK entity can get any port owner status to decide if it can > manage the port or not. > > The mechanism is synchronized for both the primary process threads and > the secondary processes threads to allow secondary process entity to be > a port owner. > > Add a synchronized ownership mechanism to DPDK Ethernet devices to > avoid multiple management of a device by different DPDK entities. > > The current ethdev internal port management is not affected by this > feature. > > Signed-off-by: Matan Azrad > Acked-by: Thomas Monjalon > Acked-by: Konstantin Ananyev <...> > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change without prior notice. > + * > + * Unset Ethernet device owner to make the device ownerless. > + * > + * @paramport_id > + * The identifier of port to make ownerless. > + * @paramowner > + * The owner identifier. Causing doc build warning: s/owner/owner_id > + * @return > + * 0 on success, negative errno value on error. > + */ > +int rte_eth_dev_owner_unset(const uint16_t port_id, const uint64_t owner_id); > + > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change without prior notice. > + * > + * Remove owner from all Ethernet devices owned by a specific owner. > + * > + * @paramowner Causing doc build warning: s/owner/owner_id > + * The owner identifier. > + */ > +void rte_eth_dev_owner_delete(const uint64_t owner_id); > + > +/** > + * @warning > + * @b EXPERIMENTAL: this API may change without prior notice. > + * > + * Get the owner of an Ethernet device. > + * > + * @paramport_id > + * The port identifier. > + * @paramowner > + * The owner structure pointer to fill. > + * @return > + * 0 on success, negative errno value on error.. > + */ > +int rte_eth_dev_owner_get(const uint16_t port_id, > + struct rte_eth_dev_owner *owner);
Re: [dpdk-dev] [PATCH v4] doc: add queue region feature info to release notes
> -Original Message- > From: Zhao1, Wei > Sent: Friday, January 19, 2018 3:28 AM > To: dev@dpdk.org > Cc: Mcnamara, John ; sta...@dpdk.org; Zhao1, Wei > > Subject: [PATCH v4] doc: add queue region feature info to release notes > > This patch add inforation about i40e queue region realted to release > notes, it has been missed before in v17.11 release notes. This feature has > been implemented in v17.11. > Here is a suggested reworking with minor changes and a link to the testpmd docs: Queue region configuration ~~ The Ethernet Controller X710/XL710 supports a feature of queue regions configuration for RSS in the PF, so that different traffic classes or different packet classification types can be separated to different queues in different queue regions. There is an API for configuration of queue regions in RSS with a command line. It can parse the parameters of the region index, queue number, queue start index, user priority, traffic classes and so on. Depending on commands from the command line, it will call i40e private APIs and start the process of setting or flushing the queue region configuration. As this feature is specific for i40e only private APIs are used. These new ``test_pmd`` commands are as shown below. For details please refer to :doc:`../testpmd_app_ug/index`. .. code-block:: console testpmd> set port (port_id) queue-region region_id (value) \ queue_start_index (value) queue_num (value) testpmd> set port (port_id) queue-region region_id (value) flowtype (value) testpmd> set port (port_id) queue-region UP (value) region_id (value) testpmd> set port (port_id) queue-region flush (on|off) testpmd> show port (port_id) queue-region
Re: [dpdk-dev] [PATCHv4 1/5] buildtools: Add tool to check EXPERIMENTAL api exports
On Sun, Jan 21, 2018 at 07:31:31PM +0100, Thomas Monjalon wrote:
> Hi Neil,
>
> Sorry for the very late review.
> I thought review had been done by others but it seems not.
> Please find my comments below.
>
> 13/12/2017 16:17, Neil Horman:
> > create mode 100755 buildtools/experimentalsyms.sh
>
> When adding a new file, you must reference it in MAINTAINERS.
> Please add it in the section "ABI versioning".
>
yup
> > --- /dev/null
> > +++ b/buildtools/experimentalsyms.sh
>
> I think the file name should include the word "check".
> What about check-experimental-syms.sh ?
>
> > @@ -0,0 +1,35 @@
> > +#!/bin/sh
>
> You must insert a SPDX license and copyright here.
>
Will do.
> > +if [ -d $MAPFILE ]
> > +then
> > + exit 0
> > +fi
> > +
> > +if [ -d $OBJFILE ]
> > +then
> > + exit 0
> > +fi
>
> Why checking for not being a directory?
> I guess you could check being a readable file (-r)?
> Should it return an error?
>
The objfile check is out of date (had it in place initially, and is no longer
needed). the mapfile check is there because dpdk apps use the same C_TO_O rule
and have no mapfile variable set.
> > +for i in `awk 'BEGIN {found=0}
> > + /.*EXPERIMENTAL.*/ {found=1}
> > + /.*}.*;/ {found=0}
> > + /.*;/ {if (found == 1) print $1}' $MAPFILE`
> > +do
> > + SYM=`echo $i | sed -e"s/;//"`
> > + objdump -t $OBJFILE | grep -q "\.text.*$SYM"
> > + IN_TEXT=$?
> > + objdump -t $OBJFILE | grep -q "\.text\.experimental.*$SYM"
> > + IN_EXP=$?
> > + if [ $IN_TEXT -eq 0 -a $IN_EXP -ne 0 ]
> > + then
> > + echo "$SYM is not flagged as experimental"
> > + echo "but is listed in version map"
> > + echo "Please add __experimental to the definition of $SYM"
> > + exit 1
> > + fi
> > +done
> > +exit 0
>
> exit 0 is useless at the end of a script.
Its there for clarity of exit value. I prefer to be expicit in that.
Neil
Re: [dpdk-dev] [PATCH v3 1/3] kni: support for MAC addr change
On 1/18/2018 6:12 AM, Hemant Agrawal wrote: > This patch adds following: > 1. Option to configure the mac address during create. Generate random >address only if the user has not provided any valid address. > 2. Inform usespace, if mac address is being changed in linux. > 3. Implement default handling of mac address change in the corresponding >ethernet device. > > Signed-off-by: Hemant Agrawal <...> > @@ -530,6 +556,14 @@ rte_kni_handle_request(struct rte_kni *kni) > req->result = kni->ops.config_network_if(\ > kni->ops.port_id, req->if_up); > break; > + case RTE_KNI_REQ_CHANGE_MAC_ADDR: /* Change MAC Address */ > + if (kni->ops.config_mac_address) > + req->result = kni->ops.config_mac_address( > + kni->ops.port_id, req->mac_addr); > + else if (kni->ops.port_id != UINT16_MAX) This won't be enough. rte_kni_alloc() can be called with NULL ops value. For that case m_ctx->ops won't be updated. And by default ops will have all zeros, not sure how to differentiate it from real port_id zero.
Re: [dpdk-dev] [PATCH v2 2/6] ethdev: add port ownership
On 1/19/2018 6:10 PM, Thomas Monjalon wrote: > 19/01/2018 18:37, Neil Horman: >> On Fri, Jan 19, 2018 at 06:09:47PM +0100, Thomas Monjalon wrote: >>> 19/01/2018 15:32, Neil Horman: On Fri, Jan 19, 2018 at 03:07:28PM +0100, Thomas Monjalon wrote: > 19/01/2018 14:57, Neil Horman: I specifically pointed that out above. There is no reason an owernship record couldn't be added to the rte_eth_dev structure. >>> >>> Sorry, don't understand why. >>> >> Because, thats the resource your trying to protect, and the object you >> want to >> identify ownership of, no? > > No > The rte_eth_dev structure is the port representation in the process. > The rte_eth_dev_data structure is the port represenation across > multi-process. > The ownership must be in rte_eth_dev_data to cover multi-process > protection. > Ok. You get the idea though right? That the port representation, for some definition thereof, should embody the ownership state. Neil >>> >>> Not sure to understand your question. >>> >> There is no real question here, only confirming that we are saying the same >> thing. I misspoke when I indicated ownership information should be embodied >> in >> rte_eth_dev rather than its shared data. But regardless, the concept is the >> same > > Yes we agree. > And I think it is what Matan did. > The owner is in struct rte_eth_dev_data: Hi Thomas, Neil, Sorry I did not able to this thred, is discussion concluded?
[dpdk-dev] [PATCH] examples/eventdev: fix build with GCC < 5
Some errors were seen with GCC 4.8 and 4.9.
It looks to be a bug fixed in GCC 5.
examples/eventdev_pipeline/pipeline_worker_generic.c:474:4: error:
missing initializer for field 'queue_id' of 'struct '
examples/eventdev_pipeline/pipeline_worker_generic.c:475:3: error:
missing initializer for field 'priority' of 'struct '
examples/eventdev_pipeline/pipeline_worker_tx.c:630:2: error:
missing initializer for field 'queue_id' of 'struct '
The workaround is to not use initializer statement,
but to use memset and standard assignment.
Signed-off-by: Thomas Monjalon
---
examples/eventdev_pipeline/pipeline_worker_generic.c | 8
examples/eventdev_pipeline/pipeline_worker_tx.c | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/examples/eventdev_pipeline/pipeline_worker_generic.c
b/examples/eventdev_pipeline/pipeline_worker_generic.c
index 2c51f4a30..c673160f5 100644
--- a/examples/eventdev_pipeline/pipeline_worker_generic.c
+++ b/examples/eventdev_pipeline/pipeline_worker_generic.c
@@ -468,10 +468,10 @@ init_rx_adapter(uint16_t nb_ports)
rte_exit(EXIT_FAILURE, "failed to create rx adapter[%d]",
cdata.rx_adapter_id);
- struct rte_event_eth_rx_adapter_queue_conf queue_conf = {
- .ev.sched_type = cdata.queue_type,
- .ev.queue_id = cdata.qid[0],
- };
+ struct rte_event_eth_rx_adapter_queue_conf queue_conf;
+ memset(&queue_conf, 0, sizeof(queue_conf));
+ queue_conf.ev.sched_type = cdata.queue_type;
+ queue_conf.ev.queue_id = cdata.qid[0];
for (i = 0; i < nb_ports; i++) {
uint32_t cap;
diff --git a/examples/eventdev_pipeline/pipeline_worker_tx.c
b/examples/eventdev_pipeline/pipeline_worker_tx.c
index c0d1bd9fb..b254b03f7 100644
--- a/examples/eventdev_pipeline/pipeline_worker_tx.c
+++ b/examples/eventdev_pipeline/pipeline_worker_tx.c
@@ -625,9 +625,9 @@ init_rx_adapter(uint16_t nb_ports)
rx_p_conf.enqueue_depth = dev_info.max_event_port_enqueue_depth;
- struct rte_event_eth_rx_adapter_queue_conf queue_conf = {
- .ev.sched_type = cdata.queue_type,
- };
+ struct rte_event_eth_rx_adapter_queue_conf queue_conf;
+ memset(&queue_conf, 0, sizeof(queue_conf));
+ queue_conf.ev.sched_type = cdata.queue_type;
for (i = 0; i < nb_ports; i++) {
uint32_t cap;
--
2.15.1
Re: [dpdk-dev] [PATCH] examples/eventdev: fix build with GCC < 5
Forgot the Fixes: tags,
21/01/2018 23:21, Thomas Monjalon:
> Some errors were seen with GCC 4.8 and 4.9.
> It looks to be a bug fixed in GCC 5.
>
> examples/eventdev_pipeline/pipeline_worker_generic.c:474:4: error:
> missing initializer for field 'queue_id' of 'struct '
>
> examples/eventdev_pipeline/pipeline_worker_generic.c:475:3: error:
> missing initializer for field 'priority' of 'struct '
>
> examples/eventdev_pipeline/pipeline_worker_tx.c:630:2: error:
> missing initializer for field 'queue_id' of 'struct '
>
> The workaround is to not use initializer statement,
> but to use memset and standard assignment.
Fixes: 84dde5de10a2 ("examples/eventdev: support Rx adapter")
Fixes: fa8054c8c889 ("examples/eventdev: add thread safe Tx worker pipeline")
> Signed-off-by: Thomas Monjalon
Re: [dpdk-dev] [PATCH] examples/eventdev: fix build with GCC < 5
On 1/21/2018 10:32 PM, Thomas Monjalon wrote:
> Forgot the Fixes: tags,
>
> 21/01/2018 23:21, Thomas Monjalon:
>> Some errors were seen with GCC 4.8 and 4.9.
>> It looks to be a bug fixed in GCC 5.
>>
>> examples/eventdev_pipeline/pipeline_worker_generic.c:474:4: error:
>> missing initializer for field 'queue_id' of 'struct '
>>
>> examples/eventdev_pipeline/pipeline_worker_generic.c:475:3: error:
>> missing initializer for field 'priority' of 'struct '
>>
>> examples/eventdev_pipeline/pipeline_worker_tx.c:630:2: error:
>> missing initializer for field 'queue_id' of 'struct '
>>
>> The workaround is to not use initializer statement,
>> but to use memset and standard assignment.
>
> Fixes: 84dde5de10a2 ("examples/eventdev: support Rx adapter")
> Fixes: fa8054c8c889 ("examples/eventdev: add thread safe Tx worker pipeline")
>
>> Signed-off-by: Thomas Monjalon
Reviewed-by: Ferruh Yigit
Re: [dpdk-dev] [PATCH] examples/eventdev: fix build with GCC < 5
21/01/2018 23:40, Ferruh Yigit:
> On 1/21/2018 10:32 PM, Thomas Monjalon wrote:
> > Forgot the Fixes: tags,
> >
> > 21/01/2018 23:21, Thomas Monjalon:
> >> Some errors were seen with GCC 4.8 and 4.9.
> >> It looks to be a bug fixed in GCC 5.
> >>
> >> examples/eventdev_pipeline/pipeline_worker_generic.c:474:4: error:
> >> missing initializer for field 'queue_id' of 'struct '
> >>
> >> examples/eventdev_pipeline/pipeline_worker_generic.c:475:3: error:
> >> missing initializer for field 'priority' of 'struct '
> >>
> >> examples/eventdev_pipeline/pipeline_worker_tx.c:630:2: error:
> >> missing initializer for field 'queue_id' of 'struct '
> >>
> >> The workaround is to not use initializer statement,
> >> but to use memset and standard assignment.
> >
> > Fixes: 84dde5de10a2 ("examples/eventdev: support Rx adapter")
> > Fixes: fa8054c8c889 ("examples/eventdev: add thread safe Tx worker
> > pipeline")
> >
> >> Signed-off-by: Thomas Monjalon
>
> Reviewed-by: Ferruh Yigit
Applied
Re: [dpdk-dev] [PATCH v4 1/4] ethdev: separate driver APIs
20/01/2018 17:57, Ferruh Yigit: > Create a rte_ethdev_driver.h file and move PMD specific APIs here. > Drivers updated to include this new header file. > > There is no update in header content and since ethdev.h included by > ethdev_driver.h, nothing changed from driver point of view, only > logically grouping of APIs. From applications point of view they can't > access to driver specific APIs anymore and they shouldn't. > > More PMD specific data structures still remain in ethdev.h because of > inline functions in header use them. Those will be handled separately. > > Signed-off-by: Ferruh Yigit > Acked-by: Shreyansh Jain > Acked-by: Andrew Rybchenko It is really hard to review, especially patches 2 and 3. But I really like the idea, so Series Acked-by: Thomas Monjalon Let's take this change in 18.02-rc1.
[dpdk-dev] [PATCH v5 1/4] ethdev: separate driver APIs
Create a rte_ethdev_driver.h file and move PMD specific APIs here. Drivers updated to include this new header file. There is no update in header content and since ethdev.h included by ethdev_driver.h, nothing changed from driver point of view, only logically grouping of APIs. From applications point of view they can't access to driver specific APIs anymore and they shouldn't. More PMD specific data structures still remain in ethdev.h because of inline functions in header use them. Those will be handled separately. Signed-off-by: Ferruh Yigit Acked-by: Shreyansh Jain Acked-by: Andrew Rybchenko Acked-by: Thomas Monjalon --- v2: use SPDX header v3: rebased on next-net v4: rebased on next-net v5: rebased on next-net --- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/dpaa/include/fman.h | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 +- drivers/bus/fslmc/fslmc_vfio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c| 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c| 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c| 2 +- drivers/event/dpaa2/dpaa2_eventdev.c| 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c| 2 +- drivers/event/octeontx/ssovf_evdev.c| 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool.c| 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/ark/ark_ethdev_rx.h | 2 +- drivers/net/ark/ark_ethdev_tx.h | 2 +- drivers/net/ark/ark_ext.h | 2 +- drivers/net/ark/ark_global.h| 2 +- drivers/net/ark/ark_pktchkr.c | 2 +- drivers/net/ark/ark_pktgen.c| 2 +- drivers/net/avf/avf_ethdev.c| 2 +- drivers/net/avf/avf_rxtx.c | 2 +- drivers/net/avf/avf_rxtx_vec_common.h | 2 +- drivers/net/avf/avf_rxtx_vec_sse.c | 2 +- drivers/net/avf/avf_vchnl.c | 2 +- drivers/net/avp/avp_ethdev.c| 2 +- drivers/net/bnx2x/bnx2x_ethdev.h| 2 +- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bnxt/bnxt_stats.h | 2 +- drivers/net/bnxt/rte_pmd_bnxt.c | 2 +- drivers/net/bnxt/rte_pmd_bnxt.h | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/bonding/rte_eth_bond_private.h | 2 +- drivers/net/cxgbe/base/t4_hw.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c| 2 +- drivers/net/cxgbe/cxgbe_main.c | 2 +- drivers/net/cxgbe/sge.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.h | 2 +- drivers/net/dpaa/dpaa_rxtx.c| 2 +- drivers/net/dpaa/rte_pmd_dpaa.h | 2 +- drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c| 2 +- drivers/net/dpaa2/dpaa2_rxtx.c | 2 +- drivers/net/e1000/em_ethdev.c | 2 +- drivers/net/e1000/em_rxtx.c | 2 +- drivers/net/e1000/igb_ethdev.c | 2 +- drivers/net/e1000/igb_flow.c| 2 +- drivers/net/e1000/igb_pf.c | 2 +- drivers/net/e1000/igb_rxtx.c| 2 +- drivers/net/ena/ena_ethdev.c| 2 +- drivers/net/enic/enic_clsf.c| 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/enic/enic_flow.c| 2 +- drivers/net/enic/enic_main.c| 2 +- drivers/net/enic/enic_res.c | 2 +- drivers/net/enic/enic_rxtx.c| 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/failsafe/failsafe_ops.c | 2 +- drivers/net/failsafe/failsafe_private.h | 2 +- drivers/net/failsafe/failsafe_rxtx.c| 2 +- drivers/net/fm10k/fm10k_ethdev.c| 2 +- drivers/net/fm10k/fm10k_rxtx.c | 2 +- drivers/net/fm10k/fm10k_rxtx_vec.c | 2 +- drivers/net/i40e/i40e_ethdev.c | 2 +- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- drivers/net/i40e/i40e_fdir.c| 2 +- drivers/net/i40e/i40e_flow.c| 2 +- drivers/net/i40e/i40e_pf.c | 2 +- drivers/net/i40e/i40e_rxtx.c| 2 +- drivers/net/i40e/i40e_rxtx_vec_altivec.c| 2 +- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_common.h | 2 +- drivers/net/i40e/i40e_rxtx_vec_
[dpdk-dev] [PATCH v5 3/4] ethdev: reorder inline functions
Move all inline function to the end of the ethdev.h header file and move
the ethdev_core.h just before inline functions.
Since inline functions need data structures in ethdev_core.h, this
reorder is to group them and make it clear where put further inline
functions.
Signed-off-by: Ferruh Yigit
Acked-by: Thomas Monjalon
---
lib/librte_ether/rte_ethdev.h | 2769 -
1 file changed, 1382 insertions(+), 1387 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 1e40d62c4..d097e528d 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -454,7 +454,6 @@ struct rte_eth_rss_conf {
ETH_RSS_GENEVE | \
ETH_RSS_NVGRE)
-
/**< Mask of valid RSS hash protocols */
#define ETH_RSS_PROTO_MASK ( \
ETH_RSS_IPV4 | \
@@ -1222,8 +1221,6 @@ struct rte_eth_dev_sriov {
#define RTE_ETH_NAME_MAX_LEN RTE_DEV_NAME_MAX_LEN
-#include
-
/** Device supports link state interrupt */
#define RTE_ETH_DEV_INTR_LSC 0x0002
/** Device is a bonded slave */
@@ -1249,7 +1246,6 @@ uint16_t rte_eth_find_next(uint16_t port_id);
(unsigned int)p < (unsigned int)RTE_MAX_ETHPORTS; \
p = rte_eth_find_next(p + 1))
-
/**
* Get the total number of Ethernet devices that have been successfully
* initialized by the matching Ethernet driver during the PCI probing phase
@@ -1573,8 +1569,6 @@ int rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t
tx_queue_id);
*/
int rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id);
-
-
/**
* Start an Ethernet device.
*
@@ -1601,7 +1595,6 @@ int rte_eth_dev_start(uint16_t port_id);
*/
void rte_eth_dev_stop(uint16_t port_id);
-
/**
* Link up an Ethernet device.
*
@@ -2193,1818 +2186,1820 @@ int rte_eth_dev_get_vlan_offload(uint16_t port_id);
*/
int rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on);
+typedef void (*buffer_tx_error_fn)(struct rte_mbuf **unsent, uint16_t count,
+ void *userdata);
+
/**
+ * Structure used to buffer packets for future TX
+ * Used by APIs rte_eth_tx_buffer and rte_eth_tx_buffer_flush
+ */
+struct rte_eth_dev_tx_buffer {
+ buffer_tx_error_fn error_callback;
+ void *error_userdata;
+ uint16_t size; /**< Size of buffer for buffered tx */
+ uint16_t length; /**< Number of packets in the array */
+ struct rte_mbuf *pkts[];
+ /**< Pending packets to be sent on explicit flush or when full */
+};
+
+/**
+ * Calculate the size of the tx buffer.
*
- * Retrieve a burst of input packets from a receive queue of an Ethernet
- * device. The retrieved packets are stored in *rte_mbuf* structures whose
- * pointers are supplied in the *rx_pkts* array.
- *
- * The rte_eth_rx_burst() function loops, parsing the RX ring of the
- * receive queue, up to *nb_pkts* packets, and for each completed RX
- * descriptor in the ring, it performs the following operations:
+ * @param sz
+ * Number of stored packets.
+ */
+#define RTE_ETH_TX_BUFFER_SIZE(sz) \
+ (sizeof(struct rte_eth_dev_tx_buffer) + (sz) * sizeof(struct rte_mbuf
*))
+
+/**
+ * Initialize default values for buffered transmitting
*
- * - Initialize the *rte_mbuf* data structure associated with the
- * RX descriptor according to the information provided by the NIC into
- * that RX descriptor.
+ * @param buffer
+ * Tx buffer to be initialized.
+ * @param size
+ * Buffer size
+ * @return
+ * 0 if no error
+ */
+int
+rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer *buffer, uint16_t size);
+
+/**
+ * Configure a callback for buffered packets which cannot be sent
*
- * - Store the *rte_mbuf* data structure into the next entry of the
- * *rx_pkts* array.
+ * Register a specific callback to be called when an attempt is made to send
+ * all packets buffered on an ethernet port, but not all packets can
+ * successfully be sent. The callback registered here will be called only
+ * from calls to rte_eth_tx_buffer() and rte_eth_tx_buffer_flush() APIs.
+ * The default callback configured for each queue by default just frees the
+ * packets back to the calling mempool. If additional behaviour is required,
+ * for example, to count dropped packets, or to retry transmission of packets
+ * which cannot be sent, this function should be used to register a suitable
+ * callback function to implement the desired behaviour.
+ * The example callback "rte_eth_count_unsent_packet_callback()" is also
+ * provided as reference.
*
- * - Replenish the RX descriptor with a new *rte_mbuf* buffer
- * allocated from the memory pool associated with the receive queue at
- * initialization time.
+ * @param buffer
+ * The port identifier of the Ethernet device.
+ * @param callback
+ * The function to be used as the callback.
+ * @param userdata
+ * Arbitrary parameter to be passed to the callback function
+ * @return
+ * 0 on success, or -1 on error with r
[dpdk-dev] [PATCH v5 2/4] ethdev: separate internal structures into own header
rte_ethdev_core.h created. Internal data structures are moved here. These structures are mostly intended to be used by drivers, but they need to be in the public header file because of the inline functions in the ethdev.h header, and those inline functions are preferred to kept because of the performance concerns. The accessibility of the data structures are not changed, only logically grouped to show that they are not intended to be used by applications. Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- lib/librte_ether/Makefile | 1 + lib/librte_ether/rte_ethdev.h | 584 +-- lib/librte_ether/rte_ethdev_core.h | 607 + 3 files changed, 609 insertions(+), 583 deletions(-) create mode 100644 lib/librte_ether/rte_ethdev_core.h diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile index 48d84f445..34d014e71 100644 --- a/lib/librte_ether/Makefile +++ b/lib/librte_ether/Makefile @@ -28,6 +28,7 @@ SRCS-y += ethdev_profile.c # SYMLINK-y-include += rte_ethdev.h SYMLINK-y-include += rte_ethdev_driver.h +SYMLINK-y-include += rte_ethdev_core.h SYMLINK-y-include += rte_ethdev_pci.h SYMLINK-y-include += rte_ethdev_vdev.h SYMLINK-y-include += rte_eth_ctrl.h diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 07019ab7a..1e40d62c4 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1153,483 +1153,6 @@ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); /**< l2 tunnel forwarding mask */ #define ETH_L2_TUNNEL_FORWARDING_MASK 0x0008 -/* - * Definitions of all functions exported by an Ethernet driver through the - * the generic structure of type *eth_dev_ops* supplied in the *rte_eth_dev* - * structure associated with an Ethernet device. - */ - -typedef int (*eth_dev_configure_t)(struct rte_eth_dev *dev); -/**< @internal Ethernet device configuration. */ - -typedef int (*eth_dev_start_t)(struct rte_eth_dev *dev); -/**< @internal Function used to start a configured Ethernet device. */ - -typedef void (*eth_dev_stop_t)(struct rte_eth_dev *dev); -/**< @internal Function used to stop a configured Ethernet device. */ - -typedef int (*eth_dev_set_link_up_t)(struct rte_eth_dev *dev); -/**< @internal Function used to link up a configured Ethernet device. */ - -typedef int (*eth_dev_set_link_down_t)(struct rte_eth_dev *dev); -/**< @internal Function used to link down a configured Ethernet device. */ - -typedef void (*eth_dev_close_t)(struct rte_eth_dev *dev); -/**< @internal Function used to close a configured Ethernet device. */ - -typedef int (*eth_dev_reset_t)(struct rte_eth_dev *dev); -/** <@internal Function used to reset a configured Ethernet device. */ - -typedef int (*eth_is_removed_t)(struct rte_eth_dev *dev); -/**< @internal Function used to detect an Ethernet device removal. */ - -typedef void (*eth_promiscuous_enable_t)(struct rte_eth_dev *dev); -/**< @internal Function used to enable the RX promiscuous mode of an Ethernet device. */ - -typedef void (*eth_promiscuous_disable_t)(struct rte_eth_dev *dev); -/**< @internal Function used to disable the RX promiscuous mode of an Ethernet device. */ - -typedef void (*eth_allmulticast_enable_t)(struct rte_eth_dev *dev); -/**< @internal Enable the receipt of all multicast packets by an Ethernet device. */ - -typedef void (*eth_allmulticast_disable_t)(struct rte_eth_dev *dev); -/**< @internal Disable the receipt of all multicast packets by an Ethernet device. */ - -typedef int (*eth_link_update_t)(struct rte_eth_dev *dev, - int wait_to_complete); -/**< @internal Get link speed, duplex mode and state (up/down) of an Ethernet device. */ - -typedef int (*eth_stats_get_t)(struct rte_eth_dev *dev, - struct rte_eth_stats *igb_stats); -/**< @internal Get global I/O statistics of an Ethernet device. */ - -typedef void (*eth_stats_reset_t)(struct rte_eth_dev *dev); -/**< @internal Reset global I/O statistics of an Ethernet device to 0. */ - -typedef int (*eth_xstats_get_t)(struct rte_eth_dev *dev, - struct rte_eth_xstat *stats, unsigned n); -/**< @internal Get extended stats of an Ethernet device. */ - -typedef int (*eth_xstats_get_by_id_t)(struct rte_eth_dev *dev, - const uint64_t *ids, - uint64_t *values, - unsigned int n); -/**< @internal Get extended stats of an Ethernet device. */ - -typedef void (*eth_xstats_reset_t)(struct rte_eth_dev *dev); -/**< @internal Reset extended stats of an Ethernet device. */ - -typedef int (*eth_xstats_get_names_t)(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_names, unsigned size); -/**< @internal Get names of extended stats of an Ethernet device. */ - -typedef int (*eth_xstats_get_names_by_id_t)(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_name
[dpdk-dev] [PATCH v5 4/4] ethdev: rename function parameter for consistency
Update "port" function argument variable to "port_id" in public header to be consistent in all APIs. No functional change. Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- lib/librte_ether/rte_ethdev.h | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index d097e528d..ccf4a15f2 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1158,7 +1158,7 @@ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); * The callback function is called on RX with a burst of packets that have * been received on the given port and queue. * - * @param port + * @param port_id * The Ethernet port on which RX is being performed. * @param queue * The queue on the Ethernet port which is being used to receive the packets. @@ -1174,7 +1174,7 @@ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); * @return * The number of packets returned to the user. */ -typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue, +typedef uint16_t (*rte_rx_callback_fn)(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], uint16_t nb_pkts, uint16_t max_pkts, void *user_param); @@ -1184,7 +1184,7 @@ typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue, * The callback function is called on TX with a burst of packets immediately * before the packets are put onto the hardware queue for transmission. * - * @param port + * @param port_id * The Ethernet port on which TX is being performed. * @param queue * The queue on the Ethernet port which is being used to transmit the packets. @@ -1198,7 +1198,7 @@ typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue, * @return * The number of packets to be written to the NIC. */ -typedef uint16_t (*rte_tx_callback_fn)(uint16_t port, uint16_t queue, +typedef uint16_t (*rte_tx_callback_fn)(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], uint16_t nb_pkts, void *user_param); /** @@ -2571,7 +2571,7 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, * Add a MAC address to an internal array of addresses used to enable whitelist * filtering to accept packets only if the destination MAC address matches. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param mac_addr * The MAC address to add. @@ -2579,20 +2579,20 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, * VMDq pool index to associate address with (if VMDq is enabled). If VMDq is * not enabled, this should be set to 0. * @return - * - (0) if successfully added or *mac_addr" was already added. + * - (0) if successfully added or *mac_addr* was already added. * - (-ENOTSUP) if hardware doesn't support this feature. * - (-ENODEV) if *port* is invalid. * - (-EIO) if device is removed. * - (-ENOSPC) if no more MAC addresses can be added. * - (-EINVAL) if MAC address is invalid. */ -int rte_eth_dev_mac_addr_add(uint16_t port, struct ether_addr *mac_addr, +int rte_eth_dev_mac_addr_add(uint16_t port_id, struct ether_addr *mac_addr, uint32_t pool); /** * Remove a MAC address from the internal array of addresses. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param mac_addr * MAC address to remove. @@ -2602,12 +2602,12 @@ int rte_eth_dev_mac_addr_add(uint16_t port, struct ether_addr *mac_addr, * - (-ENODEV) if *port* invalid. * - (-EADDRINUSE) if attempting to remove the default MAC address */ -int rte_eth_dev_mac_addr_remove(uint16_t port, struct ether_addr *mac_addr); +int rte_eth_dev_mac_addr_remove(uint16_t port_id, struct ether_addr *mac_addr); /** * Set the default MAC address. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param mac_addr * New default MAC address. @@ -2617,13 +2617,13 @@ int rte_eth_dev_mac_addr_remove(uint16_t port, struct ether_addr *mac_addr); * - (-ENODEV) if *port* invalid. * - (-EINVAL) if MAC address is invalid. */ -int rte_eth_dev_default_mac_addr_set(uint16_t port, +int rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct ether_addr *mac_addr); /** * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param reta_conf * RETA to update. @@ -2636,14 +2636,14 @@ int rte_eth_dev_default_mac_addr_set(uint16_t port, * - (-EINVAL) if bad parameter. * - (-EIO) if device is removed. */ -int rte_eth_dev_rss_reta_update(uint16_t port, +int rte_eth_dev_rss_reta_update(uint16_t port_id, struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size); /** * Query Redirecti
Re: [dpdk-dev] [PATCH v6 01/14] eal: introduce atomic exchange operation
21/01/2018 20:25, Ferruh Yigit: > On 1/21/2018 6:59 PM, Ferruh Yigit wrote: > > From: Stephen Hemminger > > > > To handle atomic update of link status (64 bit), every driver > > was doing its own version using cmpset. > > Atomic exchange is a useful primitive in its own right; > > therefore make it a EAL routine. > > > > Signed-off-by: Stephen Hemminger > > Reviewed-by: Ferruh Yigit > Series applied to dpdk-next-net/master, thanks. I need to drop this series when pulling in master, because PPC is not supported. Chao, please could you help on this feature? Thanks
[dpdk-dev] [PATCH v6 1/4] ethdev: separate driver APIs
Create a rte_ethdev_driver.h file and move PMD specific APIs here. Drivers updated to include this new header file. There is no update in header content and since ethdev.h included by ethdev_driver.h, nothing changed from driver point of view, only logically grouping of APIs. From applications point of view they can't access to driver specific APIs anymore and they shouldn't. More PMD specific data structures still remain in ethdev.h because of inline functions in header use them. Those will be handled separately. Signed-off-by: Ferruh Yigit Acked-by: Shreyansh Jain Acked-by: Andrew Rybchenko Acked-by: Thomas Monjalon --- v2: use SPDX header v3: rebased on next-net v4: rebased on next-net v5: rebased on next-net v6: rebased on next-net --- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/bus/dpaa/include/fman.h | 2 +- drivers/bus/fslmc/fslmc_bus.c | 2 +- drivers/bus/fslmc/fslmc_vfio.c | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c| 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpci.c| 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c| 2 +- drivers/event/dpaa2/dpaa2_eventdev.c| 2 +- drivers/event/dpaa2/dpaa2_hw_dpcon.c| 2 +- drivers/event/octeontx/ssovf_evdev.c| 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool.c| 2 +- drivers/net/af_packet/rte_eth_af_packet.c | 2 +- drivers/net/ark/ark_ethdev_rx.h | 2 +- drivers/net/ark/ark_ethdev_tx.h | 2 +- drivers/net/ark/ark_ext.h | 2 +- drivers/net/ark/ark_global.h| 2 +- drivers/net/ark/ark_pktchkr.c | 2 +- drivers/net/ark/ark_pktgen.c| 2 +- drivers/net/avf/avf_ethdev.c| 2 +- drivers/net/avf/avf_rxtx.c | 2 +- drivers/net/avf/avf_rxtx_vec_common.h | 2 +- drivers/net/avf/avf_rxtx_vec_sse.c | 2 +- drivers/net/avf/avf_vchnl.c | 2 +- drivers/net/avp/avp_ethdev.c| 2 +- drivers/net/bnx2x/bnx2x_ethdev.h| 2 +- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 2 +- drivers/net/bnxt/bnxt_stats.h | 2 +- drivers/net/bnxt/rte_pmd_bnxt.c | 2 +- drivers/net/bnxt/rte_pmd_bnxt.h | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/bonding/rte_eth_bond_private.h | 2 +- drivers/net/cxgbe/base/t4_hw.c | 2 +- drivers/net/cxgbe/cxgbe_ethdev.c| 2 +- drivers/net/cxgbe/cxgbe_main.c | 2 +- drivers/net/cxgbe/sge.c | 2 +- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.h | 2 +- drivers/net/dpaa/dpaa_rxtx.c| 2 +- drivers/net/dpaa/rte_pmd_dpaa.h | 2 +- drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c| 2 +- drivers/net/dpaa2/dpaa2_rxtx.c | 2 +- drivers/net/e1000/em_ethdev.c | 2 +- drivers/net/e1000/em_rxtx.c | 2 +- drivers/net/e1000/igb_ethdev.c | 2 +- drivers/net/e1000/igb_flow.c| 2 +- drivers/net/e1000/igb_pf.c | 2 +- drivers/net/e1000/igb_rxtx.c| 2 +- drivers/net/ena/ena_ethdev.c| 2 +- drivers/net/enic/enic_clsf.c| 2 +- drivers/net/enic/enic_ethdev.c | 2 +- drivers/net/enic/enic_flow.c| 2 +- drivers/net/enic/enic_main.c| 2 +- drivers/net/enic/enic_res.c | 2 +- drivers/net/enic/enic_rxtx.c| 2 +- drivers/net/failsafe/failsafe.c | 2 +- drivers/net/failsafe/failsafe_ops.c | 2 +- drivers/net/failsafe/failsafe_private.h | 2 +- drivers/net/failsafe/failsafe_rxtx.c| 2 +- drivers/net/fm10k/fm10k_ethdev.c| 2 +- drivers/net/fm10k/fm10k_rxtx.c | 2 +- drivers/net/fm10k/fm10k_rxtx_vec.c | 2 +- drivers/net/i40e/i40e_ethdev.c | 2 +- drivers/net/i40e/i40e_ethdev_vf.c | 2 +- drivers/net/i40e/i40e_fdir.c| 2 +- drivers/net/i40e/i40e_flow.c| 2 +- drivers/net/i40e/i40e_pf.c | 2 +- drivers/net/i40e/i40e_rxtx.c| 2 +- drivers/net/i40e/i40e_rxtx_vec_altivec.c| 2 +- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_common.h | 2 +- drivers
[dpdk-dev] [PATCH v6 2/4] ethdev: separate internal structures into own header
rte_ethdev_core.h created. Internal data structures are moved here. These structures are mostly intended to be used by drivers, but they need to be in the public header file because of the inline functions in the ethdev.h header, and those inline functions are preferred to kept because of the performance concerns. The accessibility of the data structures are not changed, only logically grouped to show that they are not intended to be used by applications. Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- lib/librte_ether/Makefile | 1 + lib/librte_ether/rte_ethdev.h | 584 +-- lib/librte_ether/rte_ethdev_core.h | 607 + 3 files changed, 609 insertions(+), 583 deletions(-) create mode 100644 lib/librte_ether/rte_ethdev_core.h diff --git a/lib/librte_ether/Makefile b/lib/librte_ether/Makefile index 48d84f445..34d014e71 100644 --- a/lib/librte_ether/Makefile +++ b/lib/librte_ether/Makefile @@ -28,6 +28,7 @@ SRCS-y += ethdev_profile.c # SYMLINK-y-include += rte_ethdev.h SYMLINK-y-include += rte_ethdev_driver.h +SYMLINK-y-include += rte_ethdev_core.h SYMLINK-y-include += rte_ethdev_pci.h SYMLINK-y-include += rte_ethdev_vdev.h SYMLINK-y-include += rte_eth_ctrl.h diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 07019ab7a..1e40d62c4 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1153,483 +1153,6 @@ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); /**< l2 tunnel forwarding mask */ #define ETH_L2_TUNNEL_FORWARDING_MASK 0x0008 -/* - * Definitions of all functions exported by an Ethernet driver through the - * the generic structure of type *eth_dev_ops* supplied in the *rte_eth_dev* - * structure associated with an Ethernet device. - */ - -typedef int (*eth_dev_configure_t)(struct rte_eth_dev *dev); -/**< @internal Ethernet device configuration. */ - -typedef int (*eth_dev_start_t)(struct rte_eth_dev *dev); -/**< @internal Function used to start a configured Ethernet device. */ - -typedef void (*eth_dev_stop_t)(struct rte_eth_dev *dev); -/**< @internal Function used to stop a configured Ethernet device. */ - -typedef int (*eth_dev_set_link_up_t)(struct rte_eth_dev *dev); -/**< @internal Function used to link up a configured Ethernet device. */ - -typedef int (*eth_dev_set_link_down_t)(struct rte_eth_dev *dev); -/**< @internal Function used to link down a configured Ethernet device. */ - -typedef void (*eth_dev_close_t)(struct rte_eth_dev *dev); -/**< @internal Function used to close a configured Ethernet device. */ - -typedef int (*eth_dev_reset_t)(struct rte_eth_dev *dev); -/** <@internal Function used to reset a configured Ethernet device. */ - -typedef int (*eth_is_removed_t)(struct rte_eth_dev *dev); -/**< @internal Function used to detect an Ethernet device removal. */ - -typedef void (*eth_promiscuous_enable_t)(struct rte_eth_dev *dev); -/**< @internal Function used to enable the RX promiscuous mode of an Ethernet device. */ - -typedef void (*eth_promiscuous_disable_t)(struct rte_eth_dev *dev); -/**< @internal Function used to disable the RX promiscuous mode of an Ethernet device. */ - -typedef void (*eth_allmulticast_enable_t)(struct rte_eth_dev *dev); -/**< @internal Enable the receipt of all multicast packets by an Ethernet device. */ - -typedef void (*eth_allmulticast_disable_t)(struct rte_eth_dev *dev); -/**< @internal Disable the receipt of all multicast packets by an Ethernet device. */ - -typedef int (*eth_link_update_t)(struct rte_eth_dev *dev, - int wait_to_complete); -/**< @internal Get link speed, duplex mode and state (up/down) of an Ethernet device. */ - -typedef int (*eth_stats_get_t)(struct rte_eth_dev *dev, - struct rte_eth_stats *igb_stats); -/**< @internal Get global I/O statistics of an Ethernet device. */ - -typedef void (*eth_stats_reset_t)(struct rte_eth_dev *dev); -/**< @internal Reset global I/O statistics of an Ethernet device to 0. */ - -typedef int (*eth_xstats_get_t)(struct rte_eth_dev *dev, - struct rte_eth_xstat *stats, unsigned n); -/**< @internal Get extended stats of an Ethernet device. */ - -typedef int (*eth_xstats_get_by_id_t)(struct rte_eth_dev *dev, - const uint64_t *ids, - uint64_t *values, - unsigned int n); -/**< @internal Get extended stats of an Ethernet device. */ - -typedef void (*eth_xstats_reset_t)(struct rte_eth_dev *dev); -/**< @internal Reset extended stats of an Ethernet device. */ - -typedef int (*eth_xstats_get_names_t)(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_names, unsigned size); -/**< @internal Get names of extended stats of an Ethernet device. */ - -typedef int (*eth_xstats_get_names_by_id_t)(struct rte_eth_dev *dev, - struct rte_eth_xstat_name *xstats_name
[dpdk-dev] [PATCH v6 4/4] ethdev: rename function parameter for consistency
Update "port" function argument variable to "port_id" in public header to be consistent in all APIs. No functional change. Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- lib/librte_ether/rte_ethdev.h | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index d097e528d..ccf4a15f2 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1158,7 +1158,7 @@ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); * The callback function is called on RX with a burst of packets that have * been received on the given port and queue. * - * @param port + * @param port_id * The Ethernet port on which RX is being performed. * @param queue * The queue on the Ethernet port which is being used to receive the packets. @@ -1174,7 +1174,7 @@ TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); * @return * The number of packets returned to the user. */ -typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue, +typedef uint16_t (*rte_rx_callback_fn)(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], uint16_t nb_pkts, uint16_t max_pkts, void *user_param); @@ -1184,7 +1184,7 @@ typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue, * The callback function is called on TX with a burst of packets immediately * before the packets are put onto the hardware queue for transmission. * - * @param port + * @param port_id * The Ethernet port on which TX is being performed. * @param queue * The queue on the Ethernet port which is being used to transmit the packets. @@ -1198,7 +1198,7 @@ typedef uint16_t (*rte_rx_callback_fn)(uint16_t port, uint16_t queue, * @return * The number of packets to be written to the NIC. */ -typedef uint16_t (*rte_tx_callback_fn)(uint16_t port, uint16_t queue, +typedef uint16_t (*rte_tx_callback_fn)(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], uint16_t nb_pkts, void *user_param); /** @@ -2571,7 +2571,7 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, * Add a MAC address to an internal array of addresses used to enable whitelist * filtering to accept packets only if the destination MAC address matches. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param mac_addr * The MAC address to add. @@ -2579,20 +2579,20 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, * VMDq pool index to associate address with (if VMDq is enabled). If VMDq is * not enabled, this should be set to 0. * @return - * - (0) if successfully added or *mac_addr" was already added. + * - (0) if successfully added or *mac_addr* was already added. * - (-ENOTSUP) if hardware doesn't support this feature. * - (-ENODEV) if *port* is invalid. * - (-EIO) if device is removed. * - (-ENOSPC) if no more MAC addresses can be added. * - (-EINVAL) if MAC address is invalid. */ -int rte_eth_dev_mac_addr_add(uint16_t port, struct ether_addr *mac_addr, +int rte_eth_dev_mac_addr_add(uint16_t port_id, struct ether_addr *mac_addr, uint32_t pool); /** * Remove a MAC address from the internal array of addresses. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param mac_addr * MAC address to remove. @@ -2602,12 +2602,12 @@ int rte_eth_dev_mac_addr_add(uint16_t port, struct ether_addr *mac_addr, * - (-ENODEV) if *port* invalid. * - (-EADDRINUSE) if attempting to remove the default MAC address */ -int rte_eth_dev_mac_addr_remove(uint16_t port, struct ether_addr *mac_addr); +int rte_eth_dev_mac_addr_remove(uint16_t port_id, struct ether_addr *mac_addr); /** * Set the default MAC address. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param mac_addr * New default MAC address. @@ -2617,13 +2617,13 @@ int rte_eth_dev_mac_addr_remove(uint16_t port, struct ether_addr *mac_addr); * - (-ENODEV) if *port* invalid. * - (-EINVAL) if MAC address is invalid. */ -int rte_eth_dev_default_mac_addr_set(uint16_t port, +int rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct ether_addr *mac_addr); /** * Update Redirection Table(RETA) of Receive Side Scaling of Ethernet device. * - * @param port + * @param port_id * The port identifier of the Ethernet device. * @param reta_conf * RETA to update. @@ -2636,14 +2636,14 @@ int rte_eth_dev_default_mac_addr_set(uint16_t port, * - (-EINVAL) if bad parameter. * - (-EIO) if device is removed. */ -int rte_eth_dev_rss_reta_update(uint16_t port, +int rte_eth_dev_rss_reta_update(uint16_t port_id, struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size); /** * Query Redirecti
[dpdk-dev] [PATCH v6 3/4] ethdev: reorder inline functions
Move all inline function to the end of the ethdev.h header file and move
the ethdev_core.h just before inline functions.
Since inline functions need data structures in ethdev_core.h, this
reorder is to group them and make it clear where put further inline
functions.
Signed-off-by: Ferruh Yigit
Acked-by: Thomas Monjalon
---
lib/librte_ether/rte_ethdev.h | 2769 -
1 file changed, 1382 insertions(+), 1387 deletions(-)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 1e40d62c4..d097e528d 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -454,7 +454,6 @@ struct rte_eth_rss_conf {
ETH_RSS_GENEVE | \
ETH_RSS_NVGRE)
-
/**< Mask of valid RSS hash protocols */
#define ETH_RSS_PROTO_MASK ( \
ETH_RSS_IPV4 | \
@@ -1222,8 +1221,6 @@ struct rte_eth_dev_sriov {
#define RTE_ETH_NAME_MAX_LEN RTE_DEV_NAME_MAX_LEN
-#include
-
/** Device supports link state interrupt */
#define RTE_ETH_DEV_INTR_LSC 0x0002
/** Device is a bonded slave */
@@ -1249,7 +1246,6 @@ uint16_t rte_eth_find_next(uint16_t port_id);
(unsigned int)p < (unsigned int)RTE_MAX_ETHPORTS; \
p = rte_eth_find_next(p + 1))
-
/**
* Get the total number of Ethernet devices that have been successfully
* initialized by the matching Ethernet driver during the PCI probing phase
@@ -1573,8 +1569,6 @@ int rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t
tx_queue_id);
*/
int rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id);
-
-
/**
* Start an Ethernet device.
*
@@ -1601,7 +1595,6 @@ int rte_eth_dev_start(uint16_t port_id);
*/
void rte_eth_dev_stop(uint16_t port_id);
-
/**
* Link up an Ethernet device.
*
@@ -2193,1818 +2186,1820 @@ int rte_eth_dev_get_vlan_offload(uint16_t port_id);
*/
int rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on);
+typedef void (*buffer_tx_error_fn)(struct rte_mbuf **unsent, uint16_t count,
+ void *userdata);
+
/**
+ * Structure used to buffer packets for future TX
+ * Used by APIs rte_eth_tx_buffer and rte_eth_tx_buffer_flush
+ */
+struct rte_eth_dev_tx_buffer {
+ buffer_tx_error_fn error_callback;
+ void *error_userdata;
+ uint16_t size; /**< Size of buffer for buffered tx */
+ uint16_t length; /**< Number of packets in the array */
+ struct rte_mbuf *pkts[];
+ /**< Pending packets to be sent on explicit flush or when full */
+};
+
+/**
+ * Calculate the size of the tx buffer.
*
- * Retrieve a burst of input packets from a receive queue of an Ethernet
- * device. The retrieved packets are stored in *rte_mbuf* structures whose
- * pointers are supplied in the *rx_pkts* array.
- *
- * The rte_eth_rx_burst() function loops, parsing the RX ring of the
- * receive queue, up to *nb_pkts* packets, and for each completed RX
- * descriptor in the ring, it performs the following operations:
+ * @param sz
+ * Number of stored packets.
+ */
+#define RTE_ETH_TX_BUFFER_SIZE(sz) \
+ (sizeof(struct rte_eth_dev_tx_buffer) + (sz) * sizeof(struct rte_mbuf
*))
+
+/**
+ * Initialize default values for buffered transmitting
*
- * - Initialize the *rte_mbuf* data structure associated with the
- * RX descriptor according to the information provided by the NIC into
- * that RX descriptor.
+ * @param buffer
+ * Tx buffer to be initialized.
+ * @param size
+ * Buffer size
+ * @return
+ * 0 if no error
+ */
+int
+rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer *buffer, uint16_t size);
+
+/**
+ * Configure a callback for buffered packets which cannot be sent
*
- * - Store the *rte_mbuf* data structure into the next entry of the
- * *rx_pkts* array.
+ * Register a specific callback to be called when an attempt is made to send
+ * all packets buffered on an ethernet port, but not all packets can
+ * successfully be sent. The callback registered here will be called only
+ * from calls to rte_eth_tx_buffer() and rte_eth_tx_buffer_flush() APIs.
+ * The default callback configured for each queue by default just frees the
+ * packets back to the calling mempool. If additional behaviour is required,
+ * for example, to count dropped packets, or to retry transmission of packets
+ * which cannot be sent, this function should be used to register a suitable
+ * callback function to implement the desired behaviour.
+ * The example callback "rte_eth_count_unsent_packet_callback()" is also
+ * provided as reference.
*
- * - Replenish the RX descriptor with a new *rte_mbuf* buffer
- * allocated from the memory pool associated with the receive queue at
- * initialization time.
+ * @param buffer
+ * The port identifier of the Ethernet device.
+ * @param callback
+ * The function to be used as the callback.
+ * @param userdata
+ * Arbitrary parameter to be passed to the callback function
+ * @return
+ * 0 on success, or -1 on error with r
Re: [dpdk-dev] [PATCH v6 1/4] ethdev: separate driver APIs
22/01/2018 01:16, Ferruh Yigit: > Create a rte_ethdev_driver.h file and move PMD specific APIs here. > Drivers updated to include this new header file. > > There is no update in header content and since ethdev.h included by > ethdev_driver.h, nothing changed from driver point of view, only > logically grouping of APIs. From applications point of view they can't > access to driver specific APIs anymore and they shouldn't. > > More PMD specific data structures still remain in ethdev.h because of > inline functions in header use them. Those will be handled separately. > > Signed-off-by: Ferruh Yigit > Acked-by: Shreyansh Jain > Acked-by: Andrew Rybchenko > Acked-by: Thomas Monjalon Series applied, thanks
Re: [dpdk-dev] [PATCH v4] config: sort PMD config options
20/01/2018 17:50, Ferruh Yigit: > No config option changed, added or removed. > Only reshuffle PMD config options mostly to help new PMDs where to put > their new config option. > > Ordered as physical, paravirtual and virtual groups. Alphabetical order > within a group. > > Also tried to group vendor devices together which breaks alphabetical > order in some places. > > Signed-off-by: Ferruh Yigit Applied, thanks
Re: [dpdk-dev] [PATCHv4 3/5] Makefiles: Add experimental tag check and warnings to trigger on use
On Sun, Jan 21, 2018 at 07:50:08PM +0100, Thomas Monjalon wrote: > 13/12/2017 16:17, Neil Horman: > > --- a/lib/librte_eal/linuxapp/eal/Makefile > > +++ b/lib/librte_eal/linuxapp/eal/Makefile > > +CFLAGS += -DALLOW_EXPERIMENTAL_APIS > I think I addressed this in an earlier thread, but I'm opposed to doing this. I'm strongly in favor of granting an exception to any developer who wants to use experimental apis for in-tree code, but I would like for them to have to opt into that decision, rather than just have a blanket allowance. I think theres value in a developer having to make tha conscious decision when writing new code. > We can define this flag for the whole DPDK libraries, > in mk/rte.vars.mk > inside the block ifneq ($(BUILDING_RTE_SDK),) > > > --- a/mk/internal/rte.compile-pre.mk > > +++ b/mk/internal/rte.compile-pre.mk > > +EXPERIMENTAL_CHECK = $(RTE_SDK)/buildtools/experimentalsyms.sh > > +CHECK_EXPERIMENTAL = $(EXPERIMENTAL_CHECK) $(SRCDIR)/$(EXPORT_MAP) $@ > > > echo $(C_TO_O_DISP); \ > > $(C_TO_O) && \ > > $(PMDINFO_TO_O) && \ > > + $(CHECK_EXPERIMENTAL) && \ > > Inserting this check looks good. > >
Re: [dpdk-dev] [PATCHv4 3/5] Makefiles: Add experimental tag check and warnings to trigger on use
On Sun, Jan 21, 2018 at 07:54:44PM +0100, Thomas Monjalon wrote: > 12/01/2018 13:44, Neil Horman: > > On Fri, Jan 12, 2018 at 11:49:57AM +, Ferruh Yigit wrote: > > > On 1/11/2018 8:50 PM, Neil Horman wrote: > > > > On Thu, Jan 11, 2018 at 08:06:43PM +, Ferruh Yigit wrote: > > > >> On 12/13/2017 3:17 PM, Neil Horman wrote: > > > >>> --- a/app/test-eventdev/Makefile > > > >>> +++ b/app/test-eventdev/Makefile > > > >>> @@ -32,6 +32,7 @@ include $(RTE_SDK)/mk/rte.vars.mk > > > >>> > > > >>> APP = dpdk-test-eventdev > > > >>> > > > >>> +CFLAGS += -DALLOW_EXPERIMENTAL_APIS > > > >> > > > >> Do we need this internally in DPDK? For application developers this is > > > >> great, > > > >> they will get warning unless explicitly stated that they are OK with > > > >> it. > > > >> > > > > I'm not sure what you're asking here. As I mentioned in the initial > > > > post, I > > > > think we should give blanket permission to any in-tree dpdk library to > > > > allow the > > > > use of experimental API's, but that doesn't really imply that all > > > > developers > > > > would wan't it disabled all the time. That is to say, I could envision > > > > a > > > > library author who, early in development would want to get a warning > > > > issued if > > > > they used an unstable API, and, only once they were happy with their > > > > design and > > > > choice of API usage, turn the warning off. > > > > > > I got your point, but I think whoever using an experimental API in another > > > component in DPDK is almost always the author of the that experimental > > > API, so > > > not sure this check is ever really needed within dpdk. > > > > > I would have thought so too, but it doesn't really bear up. The example I > > used > > to convince myself of a more granular approach was commit > > 9c38b704d280ac128003238d7d80bf07fa556a7d where the rte_service API was > > introduced as experimental by Nikhil Rao, and then later used in the eal > > library > > as part of commit a894d4815f79b0d76527d9c42b23327de1501711 by Harry van > > Haaren. > > Its no big deal because, as we agree, internal usage should be considered > > safe, > > but it seemed clear that differing authors were using each others code > > (potentially oblivious to the experimental nature of those APIs) > > > > > But OK, I guess it won't hurt to have more granular approach. > > > > > > > > > > >> Do we have any option than allowing them in DPDK library? And when > > > >> experimental > > > >> API modified the users in the DPDK library internally guaranteed to be > > > >> updated. > > > >> Why not globally allow this for all DPDK internally? > > > >> > > > > For the reason I gave above. We certainly could enable this in a more > > > > top-level > > > > makefile so that for in-library systems it was opt-in rather than > > > > opt-out, but I > > > > chose a more granular approach because I could envision newer libraries > > > > wanting > > > > it on. I also felt, generally speaking, that where warning flags were > > > > concerned, it generally desireous to have them on by default, and make > > > > people > > > > explicitly choose to turn them off. > > I think DPDK developpers look at the EXPERIMENTAL warning in the doxygen > above the prototype. I'm not sure I agree with that, but regardless, my initial reasoning for writing this tag was to call attention to experimental API's during review, rather than their use during development, so I didn't gripe about ABI changes on expemted code. Additionally, weather they look at the docs or not, they can pre-emptively turn off the warning if they choose. > And when API will be switched to stable, we probably won't remove the flag > in the makefile to disable allowing experimental. Well, that remains to be seen I suppose. > So at the end, we could just allow experimental API for all internal libs. Thats a rather bootstrapping argument. You are effecitvely saying that no one developing will ever want to be warned of using experimental APIs in DPDK, so lets just turn it off everyone. I would really rather let individual developers make that call at the time they author something new. >
Re: [dpdk-dev] [PATCHv4 3/5] Makefiles: Add experimental tag check and warnings to trigger on use
22/01/2018 02:34, Neil Horman: > On Sun, Jan 21, 2018 at 07:54:44PM +0100, Thomas Monjalon wrote: > > 12/01/2018 13:44, Neil Horman: > > > On Fri, Jan 12, 2018 at 11:49:57AM +, Ferruh Yigit wrote: > > > > On 1/11/2018 8:50 PM, Neil Horman wrote: > > > > > On Thu, Jan 11, 2018 at 08:06:43PM +, Ferruh Yigit wrote: > > > > >> On 12/13/2017 3:17 PM, Neil Horman wrote: > > > > >>> --- a/app/test-eventdev/Makefile > > > > >>> +++ b/app/test-eventdev/Makefile > > > > >>> @@ -32,6 +32,7 @@ include $(RTE_SDK)/mk/rte.vars.mk > > > > >>> > > > > >>> APP = dpdk-test-eventdev > > > > >>> > > > > >>> +CFLAGS += -DALLOW_EXPERIMENTAL_APIS > > > > >> > > > > >> Do we need this internally in DPDK? For application developers this > > > > >> is great, > > > > >> they will get warning unless explicitly stated that they are OK with > > > > >> it. > > > > >> > > > > > I'm not sure what you're asking here. As I mentioned in the initial > > > > > post, I > > > > > think we should give blanket permission to any in-tree dpdk library > > > > > to allow the > > > > > use of experimental API's, but that doesn't really imply that all > > > > > developers > > > > > would wan't it disabled all the time. That is to say, I could > > > > > envision a > > > > > library author who, early in development would want to get a warning > > > > > issued if > > > > > they used an unstable API, and, only once they were happy with their > > > > > design and > > > > > choice of API usage, turn the warning off. > > > > > > > > I got your point, but I think whoever using an experimental API in > > > > another > > > > component in DPDK is almost always the author of the that experimental > > > > API, so > > > > not sure this check is ever really needed within dpdk. > > > > > > > I would have thought so too, but it doesn't really bear up. The example > > > I used > > > to convince myself of a more granular approach was commit > > > 9c38b704d280ac128003238d7d80bf07fa556a7d where the rte_service API was > > > introduced as experimental by Nikhil Rao, and then later used in the eal > > > library > > > as part of commit a894d4815f79b0d76527d9c42b23327de1501711 by Harry van > > > Haaren. > > > Its no big deal because, as we agree, internal usage should be considered > > > safe, > > > but it seemed clear that differing authors were using each others code > > > (potentially oblivious to the experimental nature of those APIs) > > > > > > > But OK, I guess it won't hurt to have more granular approach. > > > > > > > > > > > > > >> Do we have any option than allowing them in DPDK library? And when > > > > >> experimental > > > > >> API modified the users in the DPDK library internally guaranteed to > > > > >> be updated. > > > > >> Why not globally allow this for all DPDK internally? > > > > >> > > > > > For the reason I gave above. We certainly could enable this in a > > > > > more top-level > > > > > makefile so that for in-library systems it was opt-in rather than > > > > > opt-out, but I > > > > > chose a more granular approach because I could envision newer > > > > > libraries wanting > > > > > it on. I also felt, generally speaking, that where warning flags were > > > > > concerned, it generally desireous to have them on by default, and > > > > > make people > > > > > explicitly choose to turn them off. > > > > I think DPDK developpers look at the EXPERIMENTAL warning in the doxygen > > above the prototype. > I'm not sure I agree with that, but regardless, my initial reasoning for > writing > this tag was to call attention to experimental API's during review, rather > than > their use during development, so I didn't gripe about ABI changes on expemted > code. Additionally, weather they look at the docs or not, they can > pre-emptively turn off the warning if they choose. > > > And when API will be switched to stable, we probably won't remove the flag > > in the makefile to disable allowing experimental. > Well, that remains to be seen I suppose. > > > So at the end, we could just allow experimental API for all internal libs. > Thats a rather bootstrapping argument. You are effecitvely saying that no one > developing will ever want to be warned of using experimental APIs in DPDK, so > lets just turn it off everyone. I would really rather let individual > developers > make that call at the time they author something new. I don't see the benefit, but I am OK to keep it like this.
[dpdk-dev] [[PATCH v5] 1/5] buildtools: Add tool to check EXPERIMENTAL api exports
This tools reads the given version map for a directory, and checks to
ensure that, for each symbol listed in the export list, the corresponding
definition is tagged as __rte_experimental, erroring out if its not. In this
way, we can ensure that the EXPERIMENTAL api is kept in sync with the tags
Signed-off-by: Neil Horman
CC: Thomas Monjalon
CC: "Mcnamara, John"
CC: Bruce Richardson
---
MAINTAINERS | 1 +
buildtools/check-experimental-syms.sh | 32
2 files changed, 33 insertions(+)
create mode 100755 buildtools/check-experimental-syms.sh
diff --git a/MAINTAINERS b/MAINTAINERS
index b51c2d096..446d2545d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -77,6 +77,7 @@ M: Neil Horman
F: lib/librte_compat/
F: doc/guides/rel_notes/deprecation.rst
F: devtools/validate-abi.sh
+F: buildtools/check-experimental-syms.sh
Driver information
F: buildtools/pmdinfogen/
diff --git a/buildtools/check-experimental-syms.sh
b/buildtools/check-experimental-syms.sh
new file mode 100755
index 0..7d21de35c
--- /dev/null
+++ b/buildtools/check-experimental-syms.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: BSD-3-Clause
+
+MAPFILE=$1
+OBJFILE=$2
+
+if [ -d $MAPFILE ]
+then
+ exit 0
+fi
+
+for i in `awk 'BEGIN {found=0}
+ /.*EXPERIMENTAL.*/ {found=1}
+ /.*}.*;/ {found=0}
+ /.*;/ {if (found == 1) print $1}' $MAPFILE`
+do
+ SYM=`echo $i | sed -e"s/;//"`
+ objdump -t $OBJFILE | grep -q "\.text.*$SYM"
+ IN_TEXT=$?
+ objdump -t $OBJFILE | grep -q "\.text\.experimental.*$SYM"
+ IN_EXP=$?
+ if [ $IN_TEXT -eq 0 -a $IN_EXP -ne 0 ]
+ then
+ echo "$SYM is not flagged as experimental"
+ echo "but is listed in version map"
+ echo "Please add __rte_experimental to the definition of $SYM"
+ exit 1
+ fi
+done
+exit 0
+
--
2.14.3
[dpdk-dev] [[PATCH v5] 5/5] doc: Add ABI __experimental tag documentation
Document the need to add the __experimental tag to appropriate functions Signed-off-by: Neil Horman CC: Thomas Monjalon CC: "Mcnamara, John" CC: Bruce Richardson --- doc/guides/contributing/versioning.rst | 14 ++ 1 file changed, 14 insertions(+) diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst index 400090628..b4de9ed04 100644 --- a/doc/guides/contributing/versioning.rst +++ b/doc/guides/contributing/versioning.rst @@ -50,6 +50,20 @@ those new APIs and start finding issues with them, new DPDK APIs will be automatically marked as ``experimental`` to allow for a period of stabilization before they become part of a tracked ABI. +Note that marking an API as experimental is a multi step process. To mark an API +as experimental, the symbols which are desired to be exported must be placed in +an EXPERIMENTAL version block in the corresponding libraries' version map +script. Secondly, the corresponding definitions of those exported functions, and +their forward declarations (in the development header files), must be marked +with the __rte_experimental tag (see rte_compat.h). The DPDK build makefiles +perform a check to ensure that the map file and the C code reflect the same +list of symbols. This check can be circumvented by defining +ALLOW_EXPERIMENTAL_API during compilation in the corresponding library Makefile. + +In addition to tagging the code with __rte_experimental, the +doxygen markup must also contain the EXPERIMENTAL string, and the MAINTAINER +file should note that the library contains EXPERIMENTAL APIs. + ABI versions, once released, are available until such time as their deprecation has been noted in the Release Notes for at least one major release cycle. For example consider the case where the ABI for DPDK 2.0 has been -- 2.14.3
[dpdk-dev] [PATCH 0/5] dpdk: enhance EXPERIMENTAL api tagging
Hey all- A few days ago, I was lamenting the fact that, when reviewing patches I would frequently complain about ABI changes that were actually considered safe because they were part of the EXPERIMENTAL api set. John M. asked me then what I might do to improve the situation, and the following patch set is a proposal that I've come up with. In thinking about the problem I identified two issues that I think we can improve on in this area: 1) Make experimental api calls more visible in the source code. That is to say, when reviewing patches, it would be nice to have some sort of visual reference that indicates that the changes being made are part of an experimental API and therefore ABI concerns need not be addressed 2) Make experimenal api usage more visible to consumers of the DPDK, so that they can make a more informed decision about the API's they consume in their application. We make an effort to document all the experimental API's, but there is no guarantee that a user will check the documentation before making use of a new library. This patch set attempts to achieve both of the above goals. To do this I've added an __experimental macro tag, suitable for inserting into api forward declarations and definitions. The presence of the tag in the header and c files where the api code resides increases the likelyhood that any patch submitted against them will include the tag in the context, making it clear to reviewers that ABI stability isn't a concern here. Also, This tag marks each function it is used on with an attibute causing any use of the fuction to emit a warning during the build with a message indicating that the API call in question is not yet part of the stable interface. Developers can then make an informed decision to suppress that warning or not. Because there is internal use of several experimental API's, this set also includes a new override macro ALLOW_EXPERIMENTAL_API to automatically suprress these warnings. I think its fair to assume that, for internal use, we almost always want to suppress these warnings, as by definition any change to the apis (even their removal) must be done in parallel with an appropriate change in the calling locations, lest the dpdk build itself break. Neil --- v5 Changes * Clean ups suggested by Thomas
[dpdk-dev] [[PATCH v5] 3/5] Makefiles: Add experimental tag check and warnings to trigger on use
Add checks during build to ensure that all symbols in the EXPERIMENTAL version map section have __experimental tags on their definitions, and enable the warnings needed to announce their use. Also add an ALLOW_EXPERIMENTAL_APIS define to allow individual libraries and files to declare the acceptability of experimental api usage Signed-off-by: Neil Horman CC: Thomas Monjalon CC: "Mcnamara, John" CC: Bruce Richardson --- app/test-eventdev/Makefile | 1 + app/test-pmd/Makefile | 1 + drivers/event/sw/Makefile | 1 + drivers/net/failsafe/Makefile | 1 + drivers/net/ixgbe/Makefile | 1 + examples/eventdev_pipeline_sw_pmd/Makefile | 1 + examples/flow_classify/Makefile| 1 + examples/ipsec-secgw/Makefile | 1 + examples/service_cores/Makefile| 1 + lib/librte_eal/bsdapp/eal/Makefile | 1 + lib/librte_eal/linuxapp/Makefile | 2 ++ lib/librte_eal/linuxapp/eal/Makefile | 2 ++ lib/librte_eventdev/Makefile | 1 + lib/librte_security/Makefile | 1 + mk/internal/rte.compile-pre.mk | 4 mk/toolchain/clang/rte.vars.mk | 2 +- mk/toolchain/gcc/rte.vars.mk | 2 +- mk/toolchain/icc/rte.vars.mk | 2 +- 18 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/test-eventdev/Makefile b/app/test-eventdev/Makefile index cfe567a6d..2a9cc1fb1 100644 --- a/app/test-eventdev/Makefile +++ b/app/test-eventdev/Makefile @@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk APP = dpdk-test-eventdev +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile index 82b3481c0..ce4e578fe 100644 --- a/app/test-pmd/Makefile +++ b/app/test-pmd/Makefile @@ -10,6 +10,7 @@ ifeq ($(CONFIG_RTE_TEST_PMD),y) # APP = testpmd +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/drivers/event/sw/Makefile b/drivers/event/sw/Makefile index 0ff9a7f28..6c38bf6f6 100644 --- a/drivers/event/sw/Makefile +++ b/drivers/event/sw/Makefile @@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_pmd_sw_event.a # build flags +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) # for older GCC versions, allow us to initialize an event using diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile index ea2a8fe46..a3b8173aa 100644 --- a/drivers/net/failsafe/Makefile +++ b/drivers/net/failsafe/Makefile @@ -50,6 +50,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c # No exported include files # Basic CFLAGS: +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -std=gnu99 -Wextra CFLAGS += -O3 CFLAGS += -I. diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile index 9efa5a40c..d0804fc5b 100644 --- a/drivers/net/ixgbe/Makefile +++ b/drivers/net/ixgbe/Makefile @@ -8,6 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # LIB = librte_pmd_ixgbe.a +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/eventdev_pipeline_sw_pmd/Makefile b/examples/eventdev_pipeline_sw_pmd/Makefile index 241d0c141..66914f633 100644 --- a/examples/eventdev_pipeline_sw_pmd/Makefile +++ b/examples/eventdev_pipeline_sw_pmd/Makefile @@ -16,6 +16,7 @@ APP = eventdev_pipeline_sw_pmd # all source are stored in SRCS-y SRCS-y := main.c +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index 56062486f..a00b75eff 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -17,6 +17,7 @@ APP = flow_classify # all source are stored in SRCS-y SRCS-y := flow_classify.c +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 9b7bacb3e..c4d07cc9d 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -18,6 +18,7 @@ endif APP = ipsec-secgw +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 -gdwarf-2 CFLAGS += $(WERROR_FLAGS) ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index 2dc36134b..4f79c9776 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -16,6 +16,7 @@ APP = service_cores # all source are stored in SRCS-y SRCS-y := main.c +CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += $(WERROR_FLAGS) # workaround for a gcc bug with noreturn attribute diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 3c3407b78..5e6ae5da3 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -9,6 +9,7 @@ ARCH_DIR ?= $(RTE_ARCH) VPATH += $(RTE_SDK)/lib/librte_eal/common VPATH += $(RTE_SDK
[dpdk-dev] [[PATCH v5] 4/5] dpdk: add __rte_experimental tag to appropriate api calls
Append the __rte_experimental tag to api calls appearing in the EXPERIMENTAL
section of their libraries version map
Signed-off-by: Neil Horman
CC: Thomas Monjalon
CC: "Mcnamara, John"
CC: Bruce Richardson
---
lib/librte_eal/common/eal_common_dev.c | 6 ++-
lib/librte_eal/common/eal_common_devargs.c | 7 +--
lib/librte_eal/common/include/rte_dev.h| 6 ++-
lib/librte_eal/common/include/rte_devargs.h| 8 ++--
lib/librte_eal/common/include/rte_service.h| 47 ++-
.../common/include/rte_service_component.h | 14 +++---
lib/librte_eal/common/rte_service.c| 52 --
lib/librte_eal/linuxapp/eal/eal.c | 1 +
lib/librte_ether/rte_mtr.c | 25 ++-
lib/librte_ether/rte_mtr.h | 26 +--
lib/librte_flow_classify/rte_flow_classify.c | 13 +++---
lib/librte_flow_classify/rte_flow_classify.h | 11 ++---
lib/librte_security/rte_security.c | 16 +++
lib/librte_security/rte_security.h | 23 +-
14 files changed, 139 insertions(+), 116 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_dev.c
b/lib/librte_eal/common/eal_common_dev.c
index dda8f5835..0de1c5d62 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -37,6 +37,7 @@
#include
#include
+#include
#include
#include
#include
@@ -133,7 +134,7 @@ full_dev_name(const char *bus, const char *dev, const char
*args)
return name;
}
-int rte_eal_hotplug_add(const char *busname, const char *devname,
+int __rte_experimental rte_eal_hotplug_add(const char *busname, const char
*devname,
const char *devargs)
{
struct rte_bus *bus;
@@ -203,7 +204,8 @@ int rte_eal_hotplug_add(const char *busname, const char
*devname,
return ret;
}
-int rte_eal_hotplug_remove(const char *busname, const char *devname)
+int __rte_experimental
+rte_eal_hotplug_remove(const char *busname, const char *devname)
{
struct rte_bus *bus;
struct rte_device *dev;
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index 6ac88d6ab..3db07ee99 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -40,6 +40,7 @@
#include
#include
+#include
#include
#include
#include
@@ -85,7 +86,7 @@ bus_name_cmp(const struct rte_bus *bus, const void *name)
return strncmp(bus->name, name, strlen(bus->name));
}
-int
+int __rte_experimental
rte_eal_devargs_parse(const char *dev, struct rte_devargs *da)
{
struct rte_bus *bus = NULL;
@@ -139,7 +140,7 @@ rte_eal_devargs_parse(const char *dev, struct rte_devargs
*da)
return 0;
}
-int
+int __rte_experimental
rte_eal_devargs_insert(struct rte_devargs *da)
{
int ret;
@@ -188,7 +189,7 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char
*devargs_str)
return -1;
}
-int
+int __rte_experimental
rte_eal_devargs_remove(const char *busname, const char *devname)
{
struct rte_devargs *d;
diff --git a/lib/librte_eal/common/include/rte_dev.h
b/lib/librte_eal/common/include/rte_dev.h
index 9342e0cbd..9fee224f2 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -49,6 +49,7 @@ extern "C" {
#include
#include
+#include
#include
__attribute__((format(printf, 2, 0)))
@@ -209,7 +210,7 @@ int rte_eal_dev_detach(struct rte_device *dev);
* @return
* 0 on success, negative on error.
*/
-int rte_eal_hotplug_add(const char *busname, const char *devname,
+int __rte_experimental rte_eal_hotplug_add(const char *busname, const char
*devname,
const char *devargs);
/**
@@ -225,7 +226,8 @@ int rte_eal_hotplug_add(const char *busname, const char
*devname,
* @return
* 0 on success, negative on error.
*/
-int rte_eal_hotplug_remove(const char *busname, const char *devname);
+int __rte_experimental rte_eal_hotplug_remove(const char *busname,
+ const char *devname);
/**
* Device comparison function.
diff --git a/lib/librte_eal/common/include/rte_devargs.h
b/lib/librte_eal/common/include/rte_devargs.h
index 58d585df6..e7579f82a 100644
--- a/lib/librte_eal/common/include/rte_devargs.h
+++ b/lib/librte_eal/common/include/rte_devargs.h
@@ -50,6 +50,7 @@ extern "C" {
#include
#include
+#include
#include
/**
@@ -136,7 +137,7 @@ int rte_eal_parse_devargs_str(const char *devargs_str,
* - 0 on success.
* - Negative errno on error.
*/
-int
+int __rte_experimental
rte_eal_devargs_parse(const char *dev,
struct rte_devargs *da);
@@ -150,7 +151,7 @@ rte_eal_devargs_parse(const char *dev,
* - 0 on success
* - Negative on error.
*/
-int
+int __rte_experimental
rte_eal
[dpdk-dev] [[PATCH v5] 2/5] compat: Add __rte_experimental macro
The __rte_experimental macro tags a given exported function as being part of
the EXPERIMENTAL api. Use of this tag will cause any caller of the
function (that isn't removed by dead code elimination) to emit a warning
that the user is making use of an API whos stabilty isn't guaranteed.
It also places the function in the .text.experimental section, which is
used to validate the tag against the corresponding library version map
Signed-off-by: Neil Horman
CC: Thomas Monjalon
CC: "Mcnamara, John"
CC: Bruce Richardson
---
lib/librte_compat/rte_compat.h | 11 +++
1 file changed, 11 insertions(+)
diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h
index 41e8032ba..ad8f81ffe 100644
--- a/lib/librte_compat/rte_compat.h
+++ b/lib/librte_compat/rte_compat.h
@@ -101,5 +101,16 @@
*/
#endif
+#ifndef ALLOW_EXPERIMENTAL_API
+#define __rte_experimental \
+__attribute__((deprecated("Symbol is not yet part of stable ABI"), \
+section(".text.experimental")))
+
+#else
+
+#define __rte_experimental \
+__attribute__((section(".text.experimental")))
+
+#endif
#endif /* _RTE_COMPAT_H_ */
--
2.14.3
Re: [dpdk-dev] [PATCH v8 2/3] ring: introduce new header file to include common functions
Hi Hermant On 1/20/2018 12:47 AM, Hemant Agrawal Wrote: Hi Olivier, On Fri, Jan 19, 2018 at 07:45:30PM +0530, Hemant Agrawal wrote: Hi Jia, On 1/17/2018 9:33 AM, Jia He wrote: Move the common part of rte_ring.h into rte_ring_generic.h. Move the memory barrier part into update_tail(). No functional changes here. Signed-off-by: Jia He Suggested-by: Jerin Jacob Suggested-by: Ananyev Konstantin Acked-by: Jerin Jacob Acked-by: Olivier Matz --- diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h new file mode 100644 index 000..01f2cae --- /dev/null +++ b/lib/librte_ring/rte_ring_generic.h @@ -0,0 +1,202 @@ +/*- + * Copyright(c) 2017 Intel Corporation. All rights reserved. + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause The SPDX should be first line. See other files for Intel or NXP. [Hemant] Don't add SPDX to this file. This file is not BSD-3 licensed. Please keep the full text as in the original file. + */ + +/* + * Derived from FreeBSD's bufring.h + * + +* ** +*** + * + * Copyright (c) 2007-2009 Kip Macy km...@freebsd.org + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or +without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + *this list of conditions and the following disclaimer. + * + * 2. The name of Kip Macy nor the names of other + *contributors may be used to endorse or promote products derived from + *this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + +* ** +/ + This is BSD-2-freebsd, which is not a approved license for DPDK. Can you ask Kip Macy, if he/she is ok to re-license it with BSD-3? Please check with legal, if you can just keep the copyright of Kip Macy and re license it with BSD-3. I see the BSD-3 license to be permissive enough to be re-licensed as BSD-3. But I am not a lawyer. I agree this is something we should do, as a maintainer of librte_ring, I can do it. But here, Jia is just moving code in a new file. I don't think this should block his patchset from beeing included. [Hemant] I thought of blocking this kind of moves, so that we get the license complaint of DPDK faster 😊 Jia, shall keep the original copyrights and headers in this file (i.e. No SPDX). You need to fix it along with rte_ring.h in near future. Regards, Hemant Ok, I will Besides ,I got the allowance from Kip Macy just now. He/She allowed dpdk to license librte_ring.h as BSD-3. My question: >Would you mind allowing dpdk librte_ring.h to be licensed as BSD 3 instead of BSD 2? His/her reply: "I think that's fine. If you're using it be careful I think there's a fix to memory barrier usage needed more relaxed memory models such as ARM. I'll check reviews to see if it made it in or not." -- Cheers, Jia
Re: [dpdk-dev] [PATCH v2] checkpatches.sh: Add checks for ABI symbol addition
On Sun, Jan 21, 2018 at 09:29:18PM +0100, Thomas Monjalon wrote:
> Hi,
>
> 16/01/2018 19:22, Neil Horman:
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > Developers and Maintainers Tools
> > M: Thomas Monjalon
> > +M: Neil Horman
> > F: MAINTAINERS
> > F: devtools/check-dup-includes.sh
> > F: devtools/check-maintainers.sh
> > @@ -52,6 +53,7 @@ F: devtools/get-maintainer.sh
> > F: devtools/git-log-fixes.sh
> > F: devtools/load-devel-config
> > F: devtools/test-build.sh
> > +F: devtools/validate-new-api.sh
> > F: license/
>
> I really think it should be in the section "ABI versioning""
>
I can do that.
> > --- a/devtools/checkpatches.sh
> > +++ b/devtools/checkpatches.sh
> > +export VALIDATE_NEW_API=$(dirname $(readlink -e $0))/validate-new-api.sh
>
> Why export?
>
As I recall I had needed that in an earlier incantation of this script, but its
likely not needed any longer
> > print_usage () {
> > cat <<- END_OF_HELP
> > + $(dirname $0)
> > usage: $(basename $0) [-q] [-v] [-nX|patch1 [patch2] ...]]
>
> This dirname is a debug leftover?
Yes.
>
> > @@ -96,9 +100,25 @@ check () { #
> > else
> > report=$($DPDK_CHECKPATCH_PATH $options - 2>/dev/null)
> > fi
> > - [ $? -ne 0 ] || return 0
> > + reta=$?
>
> What means reta?
>
just a subindex on a return code.
> > +
> > $verbose || printf '\n### %s\n\n' "$3"
> > printf '%s\n' "$report" | sed -n '1,/^total:.*lines checked$/p'
> > +
> > + echo
> > + echo "Checking API additions/removals:"
>
> You should respect $verbose before printing such header.
>
I can add a quiet/verbose mode option, but I didn't think it was needed here
since its being run automatically from within checkpatches.
> > + if [ -n "$1" ] ; then
> > + report=$($VALIDATE_NEW_API $1)
> > + elif [ -n "$2" ] ; then
> > + report=$(git format-patch \
> > +--find-renames --no-stat --stdout -1 $commit |
> > + $VALIDATE_NEW_API -)
> > + else
> > + report=$($VALIDATE_NEW_API -)
> > + fi
> > + [ $? -ne 0 -o $reta -ne 0 ] || return 0
> > + printf '%s\n' "$report" | sed -n '1,/^total:.*lines checked$/p'
> > +
> > status=$(($status + 1))
> > }
>
> > --- /dev/null
> > +++ b/devtools/validate-new-api.sh
>
> About the file name, is it only for new API?
> You don't like check-symbol-change.sh ?
> It may be stupid, but I thought "validate" is more related to full test,
> like validate-abi.sh does for the ABI, and "check" can be a partial
> test like done in checkpatches.sh.
>
I can change the name, but to answer your question, its realy meant to validate
any changes to a version map, so change.sh suffixes might be more appropriate.
> > + }' > ./$mapdb
> > +
> > + sort -u $mapdb > ./$mapdb.2
> > + mv -f $mapdb.2 $mapdb
> [...]
> > +mapfile=`mktemp mapdb.XX`
> [...]
> > +rm -f $mapfile
>
> If you create temporary file, you should remove it in a trap cleanup,
> in case of interrupted processing.
> The best is to avoid temp file, but use variables instead.
I'm not going to be able to avoid a temp file, since the number of changes in a
map are inditerminate. I can trap and clean up the temp files though.
I'm still in transit, so it will likely be a few days before I can get to this.
Neil
>
Re: [dpdk-dev] [PATCH v3] doc: add queue region feature info to release notes
Ok, good idea, v5 will come later. > -Original Message- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Friday, January 19, 2018 5:17 PM > To: Zhao1, Wei > Cc: Zhang, Helin ; dev@dpdk.org; Mcnamara, John > ; Yigit, Ferruh ; Xing, > Beilei > Subject: Re: [dpdk-dev] [PATCH v3] doc: add queue region feature info to > release notes > > 19/01/2018 10:13, Thomas Monjalon: > > 19/01/2018 04:15, Zhao1, Wei: > > > Hi, Thomas > > > Thank you! After discussion with Beilei, I have commit a new patch v4. > > > https://dpdk.org/dev/patchwork/patch/33956/ > > > Beilei also commit another new patch, we are waiting for review by > Mcnamara, John. > > > Do you think this is ok? > > > > Yes it is fine to wait for John's approval. > > > > Note: in release notes, you should group all i40e features in the same > > place. > > In v4, you just added it at the end. > > I think v5 is needed. > > More precisions: > There is no i40e block in 17.11 release notes. > So you should insert one close to other net devices, for instance, after the > bnxt one.
[dpdk-dev] [dpdk-announce] release candidate 18.02-rc1
A new DPDK release candidate is ready for testing: http://dpdk.org/browse/dpdk/tag/?id=v18.02-rc1 Special attention was paid to not break the ABI in this release. It means 18.02 could replace 17.11 without rebuilding the applications. However it is advised to keep using 17.11 LTS for long term deployments. The release notes are not complete yet: http://dpdk.org/doc/guides/rel_notes/release_18_02.html Some highlights: - new license header (SPDX tag) - bbdev (Wireless Base Band) device class - ethdev probe notifications and port ownership - Hyper-V platform driver - AVF (Adaptive Virtual Function) ethdev driver - IPsec offload in DPAA - DPAA eventdev driver - OPDL (Ordered Packet Distribution Library) eventdev driver Some features may be integrated in 18.02-rc2: - rawdev - hotplug events API - AMD drivers - meson build system Some planned features are postponed to 18.05: - meter profile - new devargs syntax - multi-process channel - dynamic memory management - VF representor - vhost-pci - virtio-crypto The planned release date for 18.02 is in two weeks. We are very short in time. It will be probably a bit late, but most changes must be done before the Chinese New Year holidays. Please start testing and fixing bugs now. When finding a new bug, please report it on bugzilla: http://dpdk.org/tracker/ Thank you everyone
Re: [dpdk-dev] [PATCH v2] checkpatches.sh: Add checks for ABI symbol addition
22/01/2018 02:54, Neil Horman: > On Sun, Jan 21, 2018 at 09:29:18PM +0100, Thomas Monjalon wrote: > > > $verbose || printf '\n### %s\n\n' "$3" > > > printf '%s\n' "$report" | sed -n '1,/^total:.*lines checked$/p' > > > + > > > + echo > > > + echo "Checking API additions/removals:" > > > > You should respect $verbose before printing such header. > > > I can add a quiet/verbose mode option, but I didn't think it was needed here > since its being run automatically from within checkpatches. I mean there is a verbose option already. So you just have to take it into account when printing. Thanks
Re: [dpdk-dev] [dpdk-stable] [PATCH] eal: fix a memory leak in regexp log level set API
On 1/21/2018 5:05 PM, Andrew Rybchenko wrote:
> From: Ivan Malov
>
> Fixes: a5279180f510 ("eal: change several log levels matching a regexp")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ivan Malov
> Signed-off-by: Andrew Rybchenko
Reviewed-by: Ferruh Yigit
[dpdk-dev] 答复: Re: [PATCH v2 1/4] net/dpaa: add null point check and fix mem leak
Hi, I've sent this patch again and it is accepted. The other 3 pathes have no conflict with the latest master version and the titles have described the modification of the patches. So I need not send the patches for v3, right? --origin-- From ： ; to ：wang.yon...@zte.com.cn; cc： ; ; ; ; ; date ：2018-01-18 07:00 subject ：Re: [dpdk-dev] [PATCH v2 1/4] net/dpaa: add null point check and fix mem leak Hi, Please could you rebase on master and keep the acked already given? Please use --in-reply-to to keep v3 in the same thread as v2. Titles are the same for every patches. Are they all fixing a NULL pointer check and a mem leak? More details in the commit message may help. If they are fixes, a tag Fixes: may help for backports. Thanks
Re: [dpdk-dev] [PATCH v2 1/4] net/virtio: fix queue flushing with vector Rx enabled
On Fri, Jan 19, 2018 at 04:55:53PM +0100, Olivier Matz wrote:
> When using vector Rx mode (use_simple_rx = 1), vq->vq_descx[] is not
> kept up to date. To properly detach the mbufs in this case, browse
> sw_ring[] instead, as it's done in virtqueue_rxvq_flush().
>
> Since we need virtio_get_queue_type(), also move this function in
> virtqueue.h as a static inline.
>
> Fixes: fc3d66212fed ("virtio: add vector Rx")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Olivier Matz
> ---
>
> Tiwei,
>
> While it passes my test plan, please carefully check that what I did in
> virtqueue_detatch_unused() is correct. I tried to reproduce what is done
> in virtqueue_rxvq_flush(), but I may be mistaking due to the different
> ring layout assumption and mbuf management between standard and vector.
>
> Thanks
> Olivier
>
>
> drivers/net/virtio/virtio_ethdev.c | 11 ---
> drivers/net/virtio/virtqueue.c | 17 +++--
> drivers/net/virtio/virtqueue.h | 11 +++
> 3 files changed, 26 insertions(+), 13 deletions(-)
>
[...]
> struct rte_mbuf *
> virtqueue_detatch_unused(struct virtqueue *vq)
> {
> + struct virtio_hw *hw = vq->hw;
> struct rte_mbuf *cookie;
> int idx;
> + int type = virtio_get_queue_type(hw, vq->vq_queue_index);
> +
> + if (vq == NULL)
> + return NULL;
>
> - if (vq != NULL)
> - for (idx = 0; idx < vq->vq_nentries; idx++) {
> + for (idx = 0; idx < vq->vq_nentries; idx++) {
> + if (hw->use_simple_rx && type == VTNET_RQ) {
> + cookie = vq->sw_ring[idx];
> + if (cookie != NULL) {
> + vq->sw_ring[idx] = NULL;
Thanks for working on this!
The vq->sw_ring[idx] isn't zeroed during Rx. So besides the
check of (cookie != NULL), some other check is also needed
to avoid freeing the mbufs already delivered to application.
The mbufs in below interval belong to application:
start: sw_ring[vq->vq_avail_idx & (vq->vq_nentries - 1)] (included)
end: sw_ring[(vq->vq_avail_idx + vq->vq_free_cnt) & (vq->vq_nentries - 1)]
(excluded)
PS. (vq->vq_avail_idx & (vq->vq_nentries - 1)) can be greater than
(vq->vq_avail_idx + vq->vq_free_cnt) & (vq->vq_nentries - 1).
Thanks,
Tiwei
[dpdk-dev] [PATCH v9 1/3] eal/arm64: remove the braces {} for dmb() and dsb()
for the code as follows:
if (condition)
rte_smp_rmb();
else
rte_smp_wmb();
Without this patch, compiler will report this error:
error: 'else' without a previous 'if'
Fixes: 84733fd0d75e ("eal/arm64: fix memory barrier definition")
Signed-off-by: Jia He
Acked-by: Jerin Jacob
---
lib/librte_eal/common/include/arch/arm/rte_atomic_64.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
b/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
index b6bbd0b..10ccf14 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_atomic_64.h
@@ -15,8 +15,8 @@ extern "C" {
#include "generic/rte_atomic.h"
-#define dsb(opt) { asm volatile("dsb " #opt : : : "memory"); }
-#define dmb(opt) { asm volatile("dmb " #opt : : : "memory"); }
+#define dsb(opt) asm volatile("dsb " #opt : : : "memory")
+#define dmb(opt) asm volatile("dmb " #opt : : : "memory")
#define rte_mb() dsb(sy)
--
2.7.4
[dpdk-dev] [PATCH v9 0/3] support c11 memory model barrier in librte_ring
There are 2 model barrier options in librte_ring suggested by Jerin:
1. use rte_smp_rmb
2. use load_acquire/store_release
CONFIG_RTE_RING_USE_C11_MEM_MODEL is provided for supporting C11 memory
model barrier in librte_ring. By default it is "y" on arm64, "n" on any
other architectures so far.
Already fuctionally tested on the machines as follows:
- on X86
- on arm64 with CONFIG_RTE_RING_USE_C11_MEM_MODEL=y
- on arm64 with CONFIG_RTE_RING_USE_C11_MEM_MODEL=n
---
Changelog:
V9: remove the SPDX tag and refine commit logs
V8: Change the license to SPDX tag. Change USE_C11_MEM_MODEL to "n" on
any architectures by default
V7: fix check-git-log warnings which is suggested by Jerin
V6: minor change in subject and log
V5: split it into 2 patchset due to the milestone concerns, this is the 2st
one. Also fix checkpatch.pl warnings
V4: split into small patches
V3: arch specific implementation for enqueue/dequeue barrier
V2: let users choose whether using load_acquire/store_release
V1: rte_smp_rmb() between 2 loads
Jia He (3):
eal/arm64: remove the braces {} for dmb() and dsb()
ring: introduce new header file to include common functions
ring: introduce new header file to support C11 memory model
config/common_armv8a_linuxapp | 2 +
config/common_base | 5 +
.../common/include/arch/arm/rte_atomic_64.h| 4 +-
lib/librte_eventdev/rte_event_ring.h | 6 +-
lib/librte_ring/Makefile | 4 +-
lib/librte_ring/rte_ring.h | 173 ++--
lib/librte_ring/rte_ring_c11_mem.h | 218
lib/librte_ring/rte_ring_generic.h | 228 +
8 files changed, 476 insertions(+), 164 deletions(-)
create mode 100644 lib/librte_ring/rte_ring_c11_mem.h
create mode 100644 lib/librte_ring/rte_ring_generic.h
--
2.7.4
[dpdk-dev] [PATCH v9 3/3] ring: introduce new header file to support C11 memory model
This patch is to support C11 memory model barrier in librte_ring. There are 2 barrier implementation options in librte_ring (suggested by Jerin). 1. use rte_smp_rmb 2. use load_acquire/store_release(refer to [1]). The reason why providing 2 options is the performance benchmark difference in different arm machines, refer to [2]. CONFIG_RTE_RING_USE_C11_MEM_MODEL is provided, and by default it is "n" on any architectures and only "y" on arm64 so far. [1] https://github.com/freebsd/freebsd/blob/master/sys/sys/buf_ring.h#L170 [2] http://dpdk.org/ml/archives/dev/2017-October/080861.html Signed-off-by: Jia He Suggested-by: Jerin Jacob Acked-by: Jerin Jacob Acked-by: Olivier Matz Acked-by: Jianbo Liu --- config/common_armv8a_linuxapp | 2 + config/common_base | 5 + lib/librte_ring/Makefile | 3 +- lib/librte_ring/rte_ring.h | 14 ++- lib/librte_ring/rte_ring_c11_mem.h | 218 + 5 files changed, 240 insertions(+), 2 deletions(-) create mode 100644 lib/librte_ring/rte_ring_c11_mem.h diff --git a/config/common_armv8a_linuxapp b/config/common_armv8a_linuxapp index 790e716..0a1f370 100644 --- a/config/common_armv8a_linuxapp +++ b/config/common_armv8a_linuxapp @@ -34,3 +34,5 @@ CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n CONFIG_RTE_LIBRTE_AVP_PMD=n CONFIG_RTE_SCHED_VECTOR=n + +CONFIG_RTE_RING_USE_C11_MEM_MODEL=y diff --git a/config/common_base b/config/common_base index 170a389..0aadda8 100644 --- a/config/common_base +++ b/config/common_base @@ -843,3 +843,8 @@ CONFIG_RTE_APP_CRYPTO_PERF=y # Compile the eventdev application # CONFIG_RTE_APP_EVENTDEV=y + +# +# Use C11 memory model barrier in Librte_ring +# +CONFIG_RTE_RING_USE_C11_MEM_MODEL=n diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile index 281ffb7..bde8907 100644 --- a/lib/librte_ring/Makefile +++ b/lib/librte_ring/Makefile @@ -18,6 +18,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \ - rte_ring_generic.h + rte_ring_generic.h \ + rte_ring_c11_mem.h include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index bc3756a..cbf2f19 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -357,8 +357,20 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); } \ } while (0) -/* Move common functions to generic file */ +/* Between load and load. there might be cpu reorder in weak model + * (powerpc/arm). + * There are 2 choices for the users + * 1.use rmb() memory barrier + * 2.use one-direcion load_acquire/store_release barrier,defined by + * CONFIG_RTE_RING_USE_C11_MEM_MODEL=y + * It depends on performance test results. + * By default, move common functions to rte_ring_generic.h + */ +#ifdef RTE_RING_USE_C11_MEM_MODEL +#include "rte_ring_c11_mem.h" +#else #include "rte_ring_generic.h" +#endif /** * @internal Enqueue several objects on the ring diff --git a/lib/librte_ring/rte_ring_c11_mem.h b/lib/librte_ring/rte_ring_c11_mem.h new file mode 100644 index 000..8ccb937 --- /dev/null +++ b/lib/librte_ring/rte_ring_c11_mem.h @@ -0,0 +1,218 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2017 HXT-semitech Corporation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of HXT-semitech Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMA
[dpdk-dev] [PATCH v9 2/3] ring: introduce new header file to include common functions
Move the common part of rte_ring.h into rte_ring_generic.h.
Move the memory barrier part into update_tail().
No functional changes here.
Signed-off-by: Jia He
Suggested-by: Jerin Jacob
Suggested-by: Ananyev Konstantin
Acked-by: Jerin Jacob
Acked-by: Olivier Matz
---
lib/librte_eventdev/rte_event_ring.h | 6 +-
lib/librte_ring/Makefile | 3 +-
lib/librte_ring/rte_ring.h | 161 +
lib/librte_ring/rte_ring_generic.h | 228 +++
4 files changed, 236 insertions(+), 162 deletions(-)
create mode 100644 lib/librte_ring/rte_ring_generic.h
diff --git a/lib/librte_eventdev/rte_event_ring.h
b/lib/librte_eventdev/rte_event_ring.h
index 480d1d0..29d4228 100644
--- a/lib/librte_eventdev/rte_event_ring.h
+++ b/lib/librte_eventdev/rte_event_ring.h
@@ -98,9 +98,8 @@ rte_event_ring_enqueue_burst(struct rte_event_ring *r,
goto end;
ENQUEUE_PTRS(&r->r, &r[1], prod_head, events, n, struct rte_event);
- rte_smp_wmb();
- update_tail(&r->r.prod, prod_head, prod_next, 1);
+ update_tail(&r->r.prod, prod_head, prod_next, 1, 1);
end:
if (free_space != NULL)
*free_space = free_entries - n;
@@ -140,9 +139,8 @@ rte_event_ring_dequeue_burst(struct rte_event_ring *r,
goto end;
DEQUEUE_PTRS(&r->r, &r[1], cons_head, events, n, struct rte_event);
- rte_smp_rmb();
- update_tail(&r->r.cons, cons_head, cons_next, 1);
+ update_tail(&r->r.cons, cons_head, cons_next, 1, 0);
end:
if (available != NULL)
diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile
index f5f0d35..281ffb7 100644
--- a/lib/librte_ring/Makefile
+++ b/lib/librte_ring/Makefile
@@ -17,6 +17,7 @@ LIBABIVER := 1
SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c
# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h
+SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \
+ rte_ring_generic.h
include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index 7069d52..bc3756a 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -357,91 +357,8 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r);
} \
} while (0)
-static __rte_always_inline void
-update_tail(struct rte_ring_headtail *ht, uint32_t old_val, uint32_t new_val,
- uint32_t single)
-{
- /*
-* If there are other enqueues/dequeues in progress that preceded us,
-* we need to wait for them to complete
-*/
- if (!single)
- while (unlikely(ht->tail != old_val))
- rte_pause();
-
- ht->tail = new_val;
-}
-
-/**
- * @internal This function updates the producer head for enqueue
- *
- * @param r
- * A pointer to the ring structure
- * @param is_sp
- * Indicates whether multi-producer path is needed or not
- * @param n
- * The number of elements we will want to enqueue, i.e. how far should the
- * head be moved
- * @param behavior
- * RTE_RING_QUEUE_FIXED:Enqueue a fixed number of items from a ring
- * RTE_RING_QUEUE_VARIABLE: Enqueue as many items as possible from ring
- * @param old_head
- * Returns head value as it was before the move, i.e. where enqueue starts
- * @param new_head
- * Returns the current/new head value i.e. where enqueue finishes
- * @param free_entries
- * Returns the amount of free space in the ring BEFORE head was moved
- * @return
- * Actual number of objects enqueued.
- * If behavior == RTE_RING_QUEUE_FIXED, this will be 0 or n only.
- */
-static __rte_always_inline unsigned int
-__rte_ring_move_prod_head(struct rte_ring *r, int is_sp,
- unsigned int n, enum rte_ring_queue_behavior behavior,
- uint32_t *old_head, uint32_t *new_head,
- uint32_t *free_entries)
-{
- const uint32_t capacity = r->capacity;
- unsigned int max = n;
- int success;
-
- do {
- /* Reset n to the initial burst count */
- n = max;
-
- *old_head = r->prod.head;
-
- /* add rmb barrier to avoid load/load reorder in weak
-* memory model. It is noop on x86
-*/
- rte_smp_rmb();
-
- const uint32_t cons_tail = r->cons.tail;
- /*
-* The subtraction is done between two unsigned 32bits value
-* (the result is always modulo 32 bits even if we have
-* *old_head > cons_tail). So 'free_entries' is always between 0
-* and capacity (which is < size).
-*/
- *free_entries = (capacity + cons_tail - *old_head);
-
- /* check that we have enough room in ring */
- if (unlikely(n > *free_entries))
- n = (behavior == RTE_RING_QUEUE_FIXED) ?
-
[dpdk-dev] [PATCH v5] doc: add queue region feature info to release notes
This patch add inforation about i40e queue region realted to release notes, it has been missed before in v17.11 release notes. This feature has been implemented in v17.11. Signed-off-by: Wei Zhao --- v2: -change this information to v18.02 release notes. v3: -rework it on dpdk-next-net-intel sub tree. v4: -rework it into 17.11 release notes and i40e.rst. v5: -change some use of words and comment location in file. --- doc/guides/nics/i40e.rst | 25 - doc/guides/rel_notes/release_17_11.rst | 7 +++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index 50d5e36..29601f1 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -66,7 +66,7 @@ Features of the I40E PMD are: - IEEE1588/802.1AS timestamping - VF Daemon (VFD) - EXPERIMENTAL - Dynamic Device Personalization (DDP) - +- Queue region configuration Prerequisites - @@ -430,6 +430,29 @@ For example, to use only 48bit prefix for IPv6 src address for IPv6 TCP RSS: testpmd> port config 0 pctype 43 hash_inset set field 14 testpmd> port config 0 pctype 43 hash_inset set field 15 +Queue region configuration +~~~ +The Ethernet Controller X710/XL710 supports a feature of queue regions +configuration for RSS in the PF, so that different traffic classes or +different packet classification types can be separated to different +queues in different queue regions. There is an API for configuration +of queue regions in RSS with a command line. It can parse the parameters +of the region index, queue number, queue start index, user priority, traffic +classes and so on. Depending on commands from the command line, it will call +i40e private APIs and start the process of setting or flushing the queue +region configuration. As this feature is specific for i40e only private +APIs are used. These new ``test_pmd`` commands are as shown below. For +details please refer to :doc:`../testpmd_app_ug/index`. + +.. code-block:: console + + testpmd> set port (port_id) queue-region region_id (value) \ + queue_start_index (value) queue_num (value) + testpmd> set port (port_id) queue-region region_id (value) flowtype (value) + testpmd> set port (port_id) queue-region UP (value) region_id (value) + testpmd> set port (port_id) queue-region flush (on|off) + testpmd> show port (port_id) queue-region + Limitations or Known issues --- diff --git a/doc/guides/rel_notes/release_17_11.rst b/doc/guides/rel_notes/release_17_11.rst index c37c71a..088778b 100644 --- a/doc/guides/rel_notes/release_17_11.rst +++ b/doc/guides/rel_notes/release_17_11.rst @@ -216,6 +216,13 @@ New Features profiles which can be programmed by dynamic device personalization (DDP) process. +* **Added the i40e ethernet driver to support queue region feature.** + + This feature enable queue regions configuration for RSS in PF, + so that different traffic classes or different packet + classification types can be separated into different queues in + different queue regions. + * **Updated ipsec-secgw application to support rte_security.** Updated the ``ipsec-secgw`` sample application to support ``rte_security`` -- 2.9.3
Re: [dpdk-dev] [PATCH v4] doc: add queue region feature info to release notes
Thank you for your help! I have commit a v5 patch https://dpdk.org/dev/patchwork/patch/34211/ > -Original Message- > From: Mcnamara, John > Sent: Monday, January 22, 2018 5:22 AM > To: Zhao1, Wei ; dev@dpdk.org > Cc: sta...@dpdk.org > Subject: RE: [PATCH v4] doc: add queue region feature info to release notes > > > > > -Original Message- > > From: Zhao1, Wei > > Sent: Friday, January 19, 2018 3:28 AM > > To: dev@dpdk.org > > Cc: Mcnamara, John ; sta...@dpdk.org; > Zhao1, > > Wei > > Subject: [PATCH v4] doc: add queue region feature info to release > > notes > > > > This patch add inforation about i40e queue region realted to release > > notes, it has been missed before in v17.11 release notes. This feature > > has been implemented in v17.11. > > > > Here is a suggested reworking with minor changes and a link to the testpmd > docs: > > Queue region configuration > ~~ > > The Ethernet Controller X710/XL710 supports a feature of queue regions > configuration for RSS in the PF, so that different traffic classes or > different > packet classification types can be separated to different queues in different > queue regions. There is an API for configuration of queue regions in RSS with > a command line. It can parse the parameters of the region index, queue > number, queue start index, user priority, traffic classes and so on. Depending > on commands from the command line, it will call i40e private APIs and start > the process of setting or flushing the queue region configuration. As this > feature is specific for i40e only private APIs are used. These new > ``test_pmd`` > commands are as shown below. For details please refer > to :doc:`../testpmd_app_ug/index`. > > .. code-block:: console > >testpmd> set port (port_id) queue-region region_id (value) \ > queue_start_index (value) queue_num (value) >testpmd> set port (port_id) queue-region region_id (value) flowtype > (value) >testpmd> set port (port_id) queue-region UP (value) region_id (value) >testpmd> set port (port_id) queue-region flush (on|off) >testpmd> show port (port_id) queue-region > > >
Re: [dpdk-dev] [PATCH v3] doc: add queue region feature info to release notes
HI, Thomas > -Original Message- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Friday, January 19, 2018 5:17 PM > To: Zhao1, Wei > Cc: Zhang, Helin ; dev@dpdk.org; Mcnamara, John > ; Yigit, Ferruh ; Xing, > Beilei > Subject: Re: [dpdk-dev] [PATCH v3] doc: add queue region feature info to > release notes > > 19/01/2018 10:13, Thomas Monjalon: > > 19/01/2018 04:15, Zhao1, Wei: > > > Hi, Thomas > > > Thank you! After discussion with Beilei, I have commit a new patch v4. > > > https://dpdk.org/dev/patchwork/patch/33956/ > > > Beilei also commit another new patch, we are waiting for review by > Mcnamara, John. > > > Do you think this is ok? > > > > Yes it is fine to wait for John's approval. > > > > Note: in release notes, you should group all i40e features in the same > > place. > > In v4, you just added it at the end. > > I think v5 is needed. > > More precisions: > There is no i40e block in 17.11 release notes. > So you should insert one close to other net devices, for instance, after the > bnxt one. Thank you for your help! I have commit a v5 patch https://dpdk.org/dev/patchwork/patch/34211/ It is based on beilei xing patch https://dpdk.org/dev/patchwork/patch/33953/ I have add i40e comment after hers.
Re: [dpdk-dev] [PATCH v4 2/2] build: add support for detecting march on ARM
Hi, Pavan
Please see my notes inline.
Best regards,
Herbert
> -Original Message-
> From: Pavan Nikhilesh [mailto:pbhagavat...@caviumnetworks.com]
> Sent: Saturday, January 20, 2018 2:24
> To: jerin.ja...@caviumnetworks.com; bruce.richard...@intel.com;
> harry.van.haa...@intel.com; Herbert Guan ;
> hemant.agra...@nxp.com
> Cc: dev@dpdk.org; Pavan Nikhilesh
> Subject: [dpdk-dev] [PATCH v4 2/2] build: add support for detecting march
> on ARM
>
> Added support for detecting march and mcpu by reading midr_el1 register.
> The implementer, primary part number values read can be used to figure out
> the underlying arm cpu.
>
> Signed-off-by: Pavan Nikhilesh
> ---
> app/test-pmd/meson.build| 2 +-
> config/arm/armv8_machine.py | 18 +++
> config/arm/meson.build | 76
> -
> config/meson.build | 19 ++--
> drivers/meson.build | 2 +-
> examples/meson.build| 2 +-
> lib/meson.build | 2 +-
> meson.build | 2 +-
> test/test/meson.build | 2 +-
> 9 files changed, 102 insertions(+), 23 deletions(-) create mode 100755
> config/arm/armv8_machine.py
>
> diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index
> e819677a5..2a3f0ba1f 100644
> --- a/app/test-pmd/meson.build
> +++ b/app/test-pmd/meson.build
> @@ -45,7 +45,7 @@ endif
>
> executable('dpdk-testpmd',
> sources,
> - c_args: machine_arg,
> + c_args: machine_args,
> link_whole: link_libs,
> dependencies: dep_objs,
> install_rpath: join_paths(get_option('prefix'), driver_install_path),
> diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py
> new file mode 100755 index 0..404866d2f
> --- /dev/null
> +++ b/config/arm/armv8_machine.py
> @@ -0,0 +1,18 @@
> +#!/usr/bin/python
> +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc
> +
> +ident = []
> +fname = '/sys/devices/system/cpu/cpu0/regs/identification/midr_el1'
> +with open(fname) as f:
> +content = f.read()
> +
> +midr_el1 = (int(content.rstrip('\n'), 16))
> +
> +ident.append(hex((midr_el1 >> 24) & 0xFF)) # Implementer
> +ident.append(hex((midr_el1 >> 20) & 0xF)) # Variant
> +ident.append(hex((midr_el1 >> 16) & 0XF)) # Architecture
> +ident.append(hex((midr_el1 >> 4) & 0xFFF)) # Primary Part number
> +ident.append(hex(midr_el1 & 0xF)) # Revision
> +
> +print(' '.join(ident))
> diff --git a/config/arm/meson.build b/config/arm/meson.build index
> f05de4c2c..1bed82236 100644
> --- a/config/arm/meson.build
> +++ b/config/arm/meson.build
> @@ -5,28 +5,88 @@
> # for checking defines we need to use the correct compiler flags march_opt
> = '-march=@0@'.format(machine)
>
> +machine_args_cavium = [
> + ['default', ['-march=armv8-a+crc+crypto','-mcpu=thunderx']],
> + ['0xa1', ['-mcpu=thunderxt88']],
> + ['0xa2', ['-mcpu=thunderxt81']],
> + ['0xa3', ['-mcpu=thunderxt83']]]
> +
> +flags_cavium = [
> + ['RTE_MACHINE', '"thunderx"'],
> + ['RTE_CACHE_LINE_SIZE', 128],
> + ['RTE_MAX_NUMA_NODES', 2],
> + ['RTE_MAX_LCORE', 96],
> + ['RTE_MAX_VFIO_GROUPS', 128],
> + ['RTE_RING_USE_C11_MEM_MODEL', false]]
> +
> +impl_0x43 = ['Cavium', flags_cavium, machine_args_cavium]
There're only Cavimu args/flags defined, so other arm/arm64 platforms will fail
at detecting. Can you add one entry for default?
> +
> +dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> +dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) -if cc.sizeof('void *') == 8
> - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
> - dpdk_conf.set('RTE_ARCH_ARM64', 1)
> - dpdk_conf.set('RTE_ARCH_64', 1)
> -else
> +
> +if cc.sizeof('void *') != 8
> dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
> dpdk_conf.set('RTE_ARCH_ARM', 1)
> dpdk_conf.set('RTE_ARCH_ARMv7', 1)
> +else
> + dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
> + dpdk_conf.set('RTE_ARCH_ARM64', 1)
> + dpdk_conf.set('RTE_ARCH_64', 1)
> +
> + if not meson.is_cross_build()
> + # The script returns ['Implementor', 'Variant', 'Architecture',
> + # 'Primary Part number', 'Revision']
> + detect_vendor = find_program(join_paths(
> + meson.current_source_dir(),
> 'armv8_machine.py'))
> + cmd = run_command(detect_vendor.path())
> + if cmd.returncode() != 0
> + message('Using default armv8 config')
> + else
> + machine_args = [] # Clear previous machine args
> + cmd_output = cmd.stdout().strip().split(' ')
> + machine = get_variable('impl_' + cmd_output[0])
Script will fail for non-cavium Arm platforms. We need to check if
cmd_output[0] is a known value in a list, otherwise should go to default entry.
> + message('Implementor : ' + machine[0])
> +
> +
Re: [dpdk-dev] [PATCH v8 2/3] ring: introduce new header file to include common functions
Hi hermant On 1/22/2018 1:15 PM, Hemant Agrawal Wrote: Hi Jia, On 1/22/2018 7:23 AM, Jia He wrote: This is BSD-2-freebsd, which is not a approved license for DPDK. Can you ask Kip Macy, if he/she is ok to re-license it with BSD-3? Please check with legal, if you can just keep the copyright of Kip Macy and re license it with BSD-3. I see the BSD-3 license to be permissive enough to be re-licensed as BSD-3. But I am not a lawyer. I agree this is something we should do, as a maintainer of librte_ring, I can do it. But here, Jia is just moving code in a new file. I don't think this should block his patchset from beeing included. [Hemant] I thought of blocking this kind of moves, so that we get the license complaint of DPDK faster 😊 Jia, shall keep the original copyrights and headers in this file (i.e. No SPDX). You need to fix it along with rte_ring.h in near future. Regards, Hemant Ok, I will Besides ,I got the allowance from Kip Macy just now. He/She allowed dpdk to license librte_ring.h as BSD-3. My question: Would you mind allowing dpdk librte_ring.h to be licensed as BSD 3 instead of BSD 2? His/her reply: "I think that's fine. If you're using it be careful I think there's a fix to memory barrier usage needed more relaxed memory models such as ARM. I'll check reviews to see if it made it in or not." That is good. Your Patch v9 looks ok. Will you please also add another patch for following: (all files in librte_ring - having BSD-2 license) /* SPDX-License-Identifier: BSD-3-Clause * * Copyright . (Intel or your company) * Copyright (c) 2007-2009 Kip Macy km...@freebsd.org * All rights reserved. * Derived from FreeBSD's bufring.h * Used as BSD-3 Licensed with permission from Kip Macy. */ With pleasure, thanks -- Cheers, Jia
[dpdk-dev] [PATCH 0/5] bnxt patchset
Please consider applying this patchset. Ajit Khaparde (4): net/bnxt: fix size of tx ring in HW net/bnxt: use driver specific dynamic log type net/bnxt: register for more async events net/bnxt: check if MAC address is all zeros Somnath Kotur (1): net/bnxt: Support for rx/tx_queue_start/stop ops drivers/net/bnxt/bnxt.h | 8 + drivers/net/bnxt/bnxt_cpr.c | 19 ++- drivers/net/bnxt/bnxt_ethdev.c | 356 drivers/net/bnxt/bnxt_filter.c | 44 ++--- drivers/net/bnxt/bnxt_filter.h | 1 + drivers/net/bnxt/bnxt_hwrm.c| 151 - drivers/net/bnxt/bnxt_hwrm.h| 11 ++ drivers/net/bnxt/bnxt_irq.c | 4 +- drivers/net/bnxt/bnxt_ring.c| 12 +- drivers/net/bnxt/bnxt_rxq.c | 22 +-- drivers/net/bnxt/bnxt_rxq.h | 2 +- drivers/net/bnxt/bnxt_rxr.c | 23 +-- drivers/net/bnxt/bnxt_rxr.h | 3 +- drivers/net/bnxt/bnxt_stats.c | 16 +- drivers/net/bnxt/bnxt_txq.c | 10 +- drivers/net/bnxt/bnxt_txq.h | 1 - drivers/net/bnxt/bnxt_txr.c | 34 +++- drivers/net/bnxt/bnxt_txr.h | 2 + drivers/net/bnxt/bnxt_vnic.c| 14 +- drivers/net/bnxt/rte_pmd_bnxt.c | 48 +++--- 20 files changed, 464 insertions(+), 317 deletions(-) -- 2.14.3 (Apple Git-98)
[dpdk-dev] [PATCH 1/5] net/bnxt: fix size of tx ring in HW
During Tx ring allocation, the actual ring size configured in the HW
ends up being twice the number of txd parameter specified to the driver.
The power of 2 ring size wrongly adds a +1 while sending the ring
create command to the FW.
Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code")
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_txr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index ac77434b7..2f2c87119 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -101,7 +101,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq,
unsigned int socket_id)
if (ring == NULL)
return -ENOMEM;
txr->tx_ring_struct = ring;
- ring->ring_size = rte_align32pow2(txq->nb_tx_desc + 1);
+ ring->ring_size = rte_align32pow2(txq->nb_tx_desc);
ring->ring_mask = ring->ring_size - 1;
ring->bd = (void *)txr->tx_desc_ring;
ring->bd_dma = txr->tx_desc_mapping;
--
2.14.3 (Apple Git-98)
[dpdk-dev] [PATCH 3/5] net/bnxt: register for more async events
Register for async events from the FW. New events we are registering for include Link speed config changes, PF driver unload and VF config change. Also log a message when the async event arrives on the completion ring. Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_cpr.c | 11 ++- drivers/net/bnxt/bnxt_hwrm.c | 9 +++-- drivers/net/bnxt/bnxt_hwrm.h | 11 +++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c index 663a5223d..737bb060a 100644 --- a/drivers/net/bnxt/bnxt_cpr.c +++ b/drivers/net/bnxt/bnxt_cpr.c @@ -57,8 +57,17 @@ void bnxt_handle_async_event(struct bnxt *bp, case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE: bnxt_link_update_op(bp->eth_dev, 1); break; + case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD: + PMD_DRV_LOG(INFO, "Async event: PF driver unloaded\n"); + break; + case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE: + PMD_DRV_LOG(INFO, "Async event: VF config changed\n"); + break; + case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED: + PMD_DRV_LOG(INFO, "Port conn async event\n"); + break; default: - PMD_DRV_LOG(DEBUG, "handle_async_event id = 0x%x\n", event_id); + PMD_DRV_LOG(INFO, "handle_async_event id = 0x%x\n", event_id); break; } } diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index fdca424a9..75e03ad5d 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -637,8 +637,13 @@ int bnxt_hwrm_func_driver_register(struct bnxt *bp) sizeof(bp->pf.vf_req_fwd))); } - req.async_event_fwd[0] |= rte_cpu_to_le_32(0x1); /* TODO: Use MACRO */ - //memset(req.async_event_fwd, 0xff, sizeof(req.async_event_fwd)); + req.async_event_fwd[0] |= + rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_LINK_STATUS_CHANGE | +ASYNC_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED | +ASYNC_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE); + req.async_event_fwd[1] |= + rte_cpu_to_le_32(ASYNC_CMPL_EVENT_ID_PF_DRVR_UNLOAD | +ASYNC_CMPL_EVENT_ID_VF_CFG_CHANGE); rc = bnxt_hwrm_send_message(bp, &req, sizeof(req)); diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h index 46f6f3208..108f8e81d 100644 --- a/drivers/net/bnxt/bnxt_hwrm.h +++ b/drivers/net/bnxt/bnxt_hwrm.h @@ -42,6 +42,17 @@ struct bnxt_filter_info; struct bnxt_cp_ring_info; #define HWRM_SEQ_ID_INVALID -1U +/* Convert Bit field location to value */ +#define ASYNC_CMPL_EVENT_ID_LINK_STATUS_CHANGE \ + (1 << HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE) +#define ASYNC_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED \ + (1 << HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED) +#define ASYNC_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE \ + (1 << HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE) +#define ASYNC_CMPL_EVENT_ID_PF_DRVR_UNLOAD \ + (1 << (HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD - 32)) +#define ASYNC_CMPL_EVENT_ID_VF_CFG_CHANGE \ + (1 << (HWRM_ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE - 32)) int bnxt_hwrm_cfa_l2_clear_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic); -- 2.14.3 (Apple Git-98)
[dpdk-dev] [PATCH 5/5] net/bnxt: Support for rx/tx_queue_start/stop ops
Currently this is implemented entirely in the PMD as there is no explicit
support in the HW. Re-program the RSS Table without this queue on stop
and add it back to the table on start.
Signed-off-by: Somnath Kotur
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_ethdev.c | 125 ++---
drivers/net/bnxt/bnxt_rxq.h| 2 +-
drivers/net/bnxt/bnxt_rxr.c| 4 ++
drivers/net/bnxt/bnxt_rxr.h| 3 +-
drivers/net/bnxt/bnxt_txq.h| 1 -
drivers/net/bnxt/bnxt_txr.c| 32 +++
drivers/net/bnxt/bnxt_txr.h| 2 +
7 files changed, 133 insertions(+), 36 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index ebc2dfab2..82d2416ba 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1,4 +1,4 @@
-/*-
+/*
* BSD LICENSE
*
* Copyright(c) Broadcom Limited.
@@ -200,9 +200,37 @@ static int bnxt_alloc_mem(struct bnxt *bp)
return rc;
}
+static int bnxt_vnic_rss_configure(struct bnxt *bp, struct bnxt_vnic_info
*vnic)
+{
+ unsigned int rss_idx, fw_idx, i;
+
+ if (vnic->rss_table && vnic->hash_type) {
+ /*
+* Fill the RSS hash & redirection table with
+* ring group ids for all VNICs
+*/
+ for (rss_idx = 0, fw_idx = 0; rss_idx < HW_HASH_INDEX_SIZE;
+ rss_idx++, fw_idx++) {
+ for (i = 0; i < bp->rx_cp_nr_rings; i++) {
+ fw_idx %= bp->rx_cp_nr_rings;
+ if (vnic->fw_grp_ids[fw_idx] !=
+ INVALID_HW_RING_ID)
+ break;
+ fw_idx++;
+ }
+ if (i == bp->rx_cp_nr_rings)
+ return 0;
+ vnic->rss_table[rss_idx] =
+ vnic->fw_grp_ids[fw_idx];
+ }
+ return bnxt_hwrm_vnic_rss_cfg(bp, vnic);
+ }
+ return 0;
+}
+
static int bnxt_init_chip(struct bnxt *bp)
{
- unsigned int i, rss_idx, fw_idx;
+ unsigned int i;
struct rte_eth_link new;
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
@@ -279,27 +307,12 @@ static int bnxt_init_chip(struct bnxt *bp)
i, rc);
goto err_out;
}
- if (vnic->rss_table && vnic->hash_type) {
- /*
-* Fill the RSS hash & redirection table with
-* ring group ids for all VNICs
-*/
- for (rss_idx = 0, fw_idx = 0;
-rss_idx < HW_HASH_INDEX_SIZE;
-rss_idx++, fw_idx++) {
- if (vnic->fw_grp_ids[fw_idx] ==
- INVALID_HW_RING_ID)
- fw_idx = 0;
- vnic->rss_table[rss_idx] =
- vnic->fw_grp_ids[fw_idx];
- }
- rc = bnxt_hwrm_vnic_rss_cfg(bp, vnic);
- if (rc) {
- PMD_DRV_LOG(ERR,
- "HWRM vnic %d set RSS failure rc: %x\n",
- i, rc);
- goto err_out;
- }
+
+ rc = bnxt_vnic_rss_configure(bp, vnic);
+ if (rc) {
+ PMD_DRV_LOG(ERR,
+ "HWRM vnic set RSS failure rc: %x\n", rc);
+ goto err_out;
}
bnxt_hwrm_vnic_plcmode_cfg(bp, vnic);
@@ -321,8 +334,7 @@ static int bnxt_init_chip(struct bnxt *bp)
!RTE_ETH_DEV_SRIOV(bp->eth_dev).active) &&
bp->eth_dev->data->dev_conf.intr_conf.rxq != 0) {
intr_vector = bp->eth_dev->data->nb_rx_queues;
- PMD_DRV_LOG(INFO, "%s(): intr_vector = %d\n", __func__,
- intr_vector);
+ PMD_DRV_LOG(INFO, "intr_vector = %d\n", intr_vector);
if (intr_vector > bp->rx_cp_nr_rings) {
PMD_DRV_LOG(ERR, "At most %d intr queues supported",
bp->rx_cp_nr_rings);
@@ -342,9 +354,9 @@ static int bnxt_init_chip(struct bnxt *bp)
" intr_vec", bp->eth_dev->data->nb_rx_queues);
return -ENOMEM;
}
- PMD_DRV_LOG(DEBUG, "%s(): intr_handle->intr_vec = %p "
+ PMD_DRV_LOG(DEBUG, "intr_handle->intr_vec = %p "
"intr_handle->nb_efd = %d intr_handle->max_intr = %d\n
[dpdk-dev] [PATCH 2/5] net/bnxt: use driver specific dynamic log type
This patch implements driver specific log type doing away with
usage of RTE_LOG() for logging.
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt.h | 8 ++
drivers/net/bnxt/bnxt_cpr.c | 10 +-
drivers/net/bnxt/bnxt_ethdev.c | 233 +---
drivers/net/bnxt/bnxt_filter.c | 42
drivers/net/bnxt/bnxt_hwrm.c| 142
drivers/net/bnxt/bnxt_irq.c | 4 +-
drivers/net/bnxt/bnxt_ring.c| 12 +--
drivers/net/bnxt/bnxt_rxq.c | 22 ++--
drivers/net/bnxt/bnxt_rxr.c | 19 ++--
drivers/net/bnxt/bnxt_stats.c | 16 +--
drivers/net/bnxt/bnxt_txq.c | 10 +-
drivers/net/bnxt/bnxt_vnic.c| 14 +--
drivers/net/bnxt/rte_pmd_bnxt.c | 48 -
13 files changed, 297 insertions(+), 283 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index cf0b1d27c..6776c64a5 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -334,4 +334,12 @@ int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id,
void *msg);
bool is_bnxt_supported(struct rte_eth_dev *dev);
extern const struct rte_flow_ops bnxt_flow_ops;
+
+extern int bnxt_logtype_driver;
+#define PMD_DRV_LOG_RAW(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, bnxt_logtype_driver, "%s(): " fmt, \
+ __func__, ## args)
+
+#define PMD_DRV_LOG(level, fmt, args...) \
+ PMD_DRV_LOG_RAW(level, fmt, ## args)
#endif
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index cde8adc3b..663a5223d 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -58,7 +58,7 @@ void bnxt_handle_async_event(struct bnxt *bp,
bnxt_link_update_op(bp->eth_dev, 1);
break;
default:
- RTE_LOG(DEBUG, PMD, "handle_async_event id = 0x%x\n", event_id);
+ PMD_DRV_LOG(DEBUG, "handle_async_event id = 0x%x\n", event_id);
break;
}
}
@@ -74,7 +74,7 @@ void bnxt_handle_fwd_req(struct bnxt *bp, struct cmpl_base
*cmpl)
int rc;
if (bp->pf.active_vfs <= 0) {
- RTE_LOG(ERR, PMD, "Forwarded VF with no active VFs\n");
+ PMD_DRV_LOG(ERR, "Forwarded VF with no active VFs\n");
return;
}
@@ -93,7 +93,7 @@ void bnxt_handle_fwd_req(struct bnxt *bp, struct cmpl_base
*cmpl)
if (fw_vf_id < bp->pf.first_vf_id ||
fw_vf_id >= (bp->pf.first_vf_id) + bp->pf.active_vfs) {
- RTE_LOG(ERR, PMD,
+ PMD_DRV_LOG(ERR,
"FWD req's source_id 0x%x out of range 0x%x - 0x%x (%d %d)\n",
fw_vf_id, bp->pf.first_vf_id,
(bp->pf.first_vf_id) + bp->pf.active_vfs - 1,
@@ -130,7 +130,7 @@ void bnxt_handle_fwd_req(struct bnxt *bp, struct cmpl_base
*cmpl)
/* Forward */
rc = bnxt_hwrm_exec_fwd_resp(bp, fw_vf_id, fwd_cmd, req_len);
if (rc) {
- RTE_LOG(ERR, PMD,
+ PMD_DRV_LOG(ERR,
"Failed to send FWD req VF 0x%x, type 0x%x.\n",
fw_vf_id - bp->pf.first_vf_id,
rte_le_to_cpu_16(fwd_cmd->req_type));
@@ -141,7 +141,7 @@ void bnxt_handle_fwd_req(struct bnxt *bp, struct cmpl_base
*cmpl)
reject:
rc = bnxt_hwrm_reject_fwd_resp(bp, fw_vf_id, fwd_cmd, req_len);
if (rc) {
- RTE_LOG(ERR, PMD,
+ PMD_DRV_LOG(ERR,
"Failed to send REJECT req VF 0x%x, type 0x%x.\n",
fw_vf_id - bp->pf.first_vf_id,
rte_le_to_cpu_16(fwd_cmd->req_type));
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 057786a62..af4673dc2 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -58,6 +58,7 @@
#define DRV_MODULE_NAME"bnxt"
static const char bnxt_version[] =
"Broadcom Cumulus driver " DRV_MODULE_NAME "\n";
+int bnxt_logtype_driver;
#define PCI_VENDOR_ID_BROADCOM 0x14E4
@@ -223,25 +224,25 @@ static int bnxt_init_chip(struct bnxt *bp)
rc = bnxt_alloc_all_hwrm_stat_ctxs(bp);
if (rc) {
- RTE_LOG(ERR, PMD, "HWRM stat ctx alloc failure rc: %x\n", rc);
+ PMD_DRV_LOG(ERR, "HWRM stat ctx alloc failure rc: %x\n", rc);
goto err_out;
}
rc = bnxt_alloc_hwrm_rings(bp);
if (rc) {
- RTE_LOG(ERR, PMD, "HWRM ring alloc failure rc: %x\n", rc);
+ PMD_DRV_LOG(ERR, "HWRM ring alloc failure rc: %x\n", rc);
goto err_out;
}
rc = bnxt_alloc_all_hwrm_ring_grps(bp);
if (rc) {
- RTE_LOG(ERR, PMD, "HWRM ring grp alloc failure: %x\n", rc);
+ PMD_DRV_LOG(ERR, "HWRM ring grp alloc failure: %x\n", rc);
goto err_out;
}
rc = bnxt_
[dpdk-dev] [PATCH 4/5] net/bnxt: check if MAC address is all zeros
In certain cases the MAC address of a port could be all zeros.
Catch it early, log a message and fail the initiaization.
Signed-off-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_ethdev.c | 10 ++
drivers/net/bnxt/bnxt_filter.c | 2 +-
drivers/net/bnxt/bnxt_filter.h | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index af4673dc2..ebc2dfab2 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3247,6 +3247,16 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)
rc = -ENOMEM;
goto error_free;
}
+
+ if (check_zero_bytes(bp->dflt_mac_addr, ETHER_ADDR_LEN)) {
+ PMD_DRV_LOG(ERR,
+ "Invalid MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
+ bp->dflt_mac_addr[0], bp->dflt_mac_addr[1],
+ bp->dflt_mac_addr[2], bp->dflt_mac_addr[3],
+ bp->dflt_mac_addr[4], bp->dflt_mac_addr[5]);
+ rc = -EINVAL;
+ goto error_free;
+ }
/* Copy the permanent MAC from the qcap response address now. */
memcpy(bp->mac_addr, bp->dflt_mac_addr, sizeof(bp->mac_addr));
memcpy(ð_dev->data->mac_addrs[0], bp->mac_addr, ETHER_ADDR_LEN);
diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c
index 0716dd8fd..032e8eed0 100644
--- a/drivers/net/bnxt/bnxt_filter.c
+++ b/drivers/net/bnxt/bnxt_filter.c
@@ -250,7 +250,7 @@ nxt_non_void_action(const struct rte_flow_action *cur)
}
}
-static inline int check_zero_bytes(const uint8_t *bytes, int len)
+int check_zero_bytes(const uint8_t *bytes, int len)
{
int i;
for (i = 0; i < len; i++)
diff --git a/drivers/net/bnxt/bnxt_filter.h b/drivers/net/bnxt/bnxt_filter.h
index 2591a87e2..a3c702df6 100644
--- a/drivers/net/bnxt/bnxt_filter.h
+++ b/drivers/net/bnxt/bnxt_filter.h
@@ -97,6 +97,7 @@ struct bnxt_filter_info *bnxt_get_unused_filter(struct bnxt
*bp);
void bnxt_free_filter(struct bnxt *bp, struct bnxt_filter_info *filter);
struct bnxt_filter_info *bnxt_get_l2_filter(struct bnxt *bp,
struct bnxt_filter_info *nf, struct bnxt_vnic_info *vnic);
+int check_zero_bytes(const uint8_t *bytes, int len);
#define NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_MACADDR \
HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_SRC_MACADDR
--
2.14.3 (Apple Git-98)
Re: [dpdk-dev] [PATCH v3 1/3] kni: support for MAC addr change
Hi Ferruh, On 1/22/2018 3:37 AM, Ferruh Yigit wrote: On 1/18/2018 6:12 AM, Hemant Agrawal wrote: This patch adds following: 1. Option to configure the mac address during create. Generate random address only if the user has not provided any valid address. 2. Inform usespace, if mac address is being changed in linux. 3. Implement default handling of mac address change in the corresponding ethernet device. Signed-off-by: Hemant Agrawal <...> @@ -530,6 +556,14 @@ rte_kni_handle_request(struct rte_kni *kni) req->result = kni->ops.config_network_if(\ kni->ops.port_id, req->if_up); break; + case RTE_KNI_REQ_CHANGE_MAC_ADDR: /* Change MAC Address */ + if (kni->ops.config_mac_address) + req->result = kni->ops.config_mac_address( + kni->ops.port_id, req->mac_addr); + else if (kni->ops.port_id != UINT16_MAX) This won't be enough. rte_kni_alloc() can be called with NULL ops value. For that case m_ctx->ops won't be updated. And by default ops will have all zeros, not sure how to differentiate it from real port_id zero. I think, I tried to address that in the first patch. rte_kni_alloc(struct rte_mempool *pktmbuf_pool, memset(ctx, 0, sizeof(struct rte_kni)); if (ops) memcpy(&ctx->ops, ops, sizeof(struct rte_kni_ops)); + else + ctx->ops.port_id = UINT16_MAX; Do you still see issue? Regards, Hemant
Re: [dpdk-dev] [PATCH 1/2] lib/cryptodev: add support to set session private data
Hi All,
> -Original Message-
> From: Gujjar, Abhinandan S
> Sent: Thursday, January 18, 2018 12:22 PM
> To: Akhil Goyal ; De Lara Guarch, Pablo
> ; Doherty, Declan
> ; Jacob, Jerin
>
> Cc: dev@dpdk.org; Vangati, Narender ; Rao,
> Nikhil
> Subject: RE: [PATCH 1/2] lib/cryptodev: add support to set session private
> data
>
> Hi Akhil,
>
> > -Original Message-
> > From: Akhil Goyal [mailto:akhil.go...@nxp.com]
> > Sent: Wednesday, January 17, 2018 4:23 PM
> > To: Gujjar, Abhinandan S ; De Lara
> > Guarch, Pablo ; Doherty, Declan
> > ; Jacob, Jerin
> >
> > Cc: dev@dpdk.org; Vangati, Narender ; Rao,
> > Nikhil
> > Subject: Re: [PATCH 1/2] lib/cryptodev: add support to set session
> > private data
> >
> > Hi Abhinandan,
> > On 1/17/2018 3:35 PM, Gujjar, Abhinandan S wrote:
> > > Hi Akhil,
> > >
> > >> -Original Message-
> > >> From: De Lara Guarch, Pablo
> > >> Sent: Wednesday, January 17, 2018 3:16 PM
> > >> To: Gujjar, Abhinandan S ; Akhil Goyal
> > >> ; Doherty, Declan ;
> > >> Jacob, Jerin
> > >> Cc: dev@dpdk.org; Vangati, Narender ;
> > >> Rao, Nikhil
> > >> Subject: RE: [PATCH 1/2] lib/cryptodev: add support to set session
> > >> private data
> > >>
> > >> Hi Abhinandan,
> > >>
> > >>> -Original Message-
> > >>> From: Gujjar, Abhinandan S
> > >>> Sent: Wednesday, January 17, 2018 6:35 AM
> > >>> To: Akhil Goyal ; Doherty, Declan
> > >>> ; De Lara Guarch, Pablo
> > >>> ; Jacob, Jerin
> > >>>
> > >>> Cc: dev@dpdk.org; Vangati, Narender ;
> > >>> Rao, Nikhil
> > >>> Subject: RE: [PATCH 1/2] lib/cryptodev: add support to set session
> > >>> private data
> > >>>
> > >>> Hi Akhil,
> > >>>
> > >>
> > >> ...
> > >>
> > >>> I guess, you are suggesting below changes:
> > >>> diff --git a/lib/librte_cryptodev/rte_cryptodev.h
> > >>> b/lib/librte_cryptodev/rte_cryptodev.h
> > >>> index 56958a6..057c39a 100644
> > >>> --- a/lib/librte_cryptodev/rte_cryptodev.h
> > >>> +++ b/lib/librte_cryptodev/rte_cryptodev.h
> > >>> @@ -892,6 +892,8 @@ struct rte_cryptodev_data {
> > >>>
> > >>> /** Cryptodev symmetric crypto session */ struct
> > >>> rte_cryptodev_sym_session {
> > >>> + uint16_t private_data_offset;
> > >>> + /**< Private data offset */
> > >>> __extension__ void *sess_private_data[0];
> > >>> /**< Private session material */ }; I am ok with this.
> > >>>
> > >>> Declan/Pablo,
> > >>> Is this ok? Do you see any impact on performance or anything else
> > >>> has to be considered?
> > >>
> > >> This is breaking ABI, and since there is a zero length array, this
> > >> latter has to be at the end of the structure.
> > >> Therefore, this is not a valid option unless ABI deprecation is
> > >> announced and then it could be merged in the next release.
> > > What is your opinion on this?
> > > Should we consider retaining the enum rte_crypto_op_private_data_type?
> >
> > As per our previous discussion we are anyway pushing crypto adapter to
> > next release, then we do have time for the deprecation notice to be sent.
> Not sure, it is really worth breaking ABI or have an enum.
> > Or you can reserve the first byte of private data (internal to
> > library) in the session to check whether the private data is valid or not.
> Regarding reserving the first byte which validates the rest of the metadata
> data,
> unless this byte is also included part of rte_cryptodev_sym_session_create()
> i.e.
> memset(sess, 0, (sizeof(void *) * nb_drivers + private_data_flag)); and in
> rte_cryptodev_get_header_session_size(void)
> {
> /*
>* Header contains pointers to the private data
>* of all registered drivers
>*/
> return (sizeof(void *) * nb_drivers + private_data_flag); } Without
> above
> changes, the flag content can't be just trusted. Do you agree?
I will send the next patch based on above approach.
>
> Pablo/Declan,
> Hope the changes are ok? ABI breakage or anything has to be considered again?
> >
> > IMO, private data offset in session is a better approach instead of
> > adding one more enum. Others can suggest.
> @Others, please provide your inputs so that I can prepare the next patch.
>
> -Abhinandan
> >
> > -Akhil
> > >>
> > >> Pablo
> > > Abhinandan
> > >
Re: [dpdk-dev] net/ixgbe: fix VFIO interrupt mapping in PF
I add this code line to align same style and same action taken in ixgbe VF and i40e VF. In ixgbe VF or i40e VF, without this line, the initialization of Rx queue interrupt mapping to VFIO-PCI vectors would fail. I have tested it in ixgbe PF port with example/l3fwd-power and found the interrupt can be initialized successfully and Rx queue can be waked up by incoming packets no matter whether this line exists or not. So I decide to reject it now. > -Original Message- > From: Yang, Qiming > Sent: Wednesday, January 10, 2018 2:29 PM > To: Lu, Wenzhuo ; Dai, Wei > Cc: dev@dpdk.org > Subject: RE: [dpdk-dev] net/ixgbe: fix VFIO interrupt mapping in PF > > +1 why we disable interrupt in dev_start twice? > > > -Original Message- > > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Wenzhuo Lu > > Sent: Tuesday, January 9, 2018 4:24 PM > > To: Dai, Wei > > Cc: dev@dpdk.org > > Subject: Re: [dpdk-dev] net/ixgbe: fix VFIO interrupt mapping in PF > > > > Hi Wei, > > > > > + rte_intr_disable(intr_handle); > > TBH, confused by this patch. I see the intr already disabled at the > > begining of this function, ixgbe_dev_start, why we need to disable it > again?
[dpdk-dev] [PATCH] ring: convert license headers to SPDX tags
Signed-off-by: Jia He --- lib/librte_ring/rte_ring.c | 66 +++--- lib/librte_ring/rte_ring.h | 66 +++--- lib/librte_ring/rte_ring_c11_mem.h | 65 +++-- lib/librte_ring/rte_ring_generic.h | 66 +++--- 4 files changed, 20 insertions(+), 243 deletions(-) diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c index 036467f..d215ace 100644 --- a/lib/librte_ring/rte_ring.c +++ b/lib/librte_ring/rte_ring.c @@ -1,67 +1,11 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2015 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Derived from FreeBSD's bufring.c - * - ** +/* SPDX-License-Identifier: BSD-3-Clause * + * Copyright (c) 2010-2015 Intel Corporation * Copyright (c) 2007,2008 Kip Macy km...@freebsd.org * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - *this list of conditions and the following disclaimer. - * - * 2. The name of Kip Macy nor the names of other - *contributors may be used to endorse or promote products derived from - *this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ***/ + * Derived from FreeBSD's bufring.h + * Used as BSD-3 Licensed with permission from Kip Macy. + */ #include #include diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index cbf2f19..253cdc9 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -1,67 +1,11 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2017 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of
Re: [dpdk-dev] [PATCH v4 2/2] build: add support for detecting march on ARM
Hi Herbert,
Thanks for the review, will add a default entry for generic arm.
On Mon, Jan 22, 2018 at 05:52:36AM +, Herbert Guan wrote:
> Hi, Pavan
>
> Please see my notes inline.
>
> Best regards,
> Herbert
>
> > -Original Message-
> > From: Pavan Nikhilesh [mailto:pbhagavat...@caviumnetworks.com]
> > Sent: Saturday, January 20, 2018 2:24
> > To: jerin.ja...@caviumnetworks.com; bruce.richard...@intel.com;
> > harry.van.haa...@intel.com; Herbert Guan ;
> > hemant.agra...@nxp.com
> > Cc: dev@dpdk.org; Pavan Nikhilesh
> > Subject: [dpdk-dev] [PATCH v4 2/2] build: add support for detecting march
> > on ARM
> >
> > Added support for detecting march and mcpu by reading midr_el1 register.
> > The implementer, primary part number values read can be used to figure out
> > the underlying arm cpu.
> >
> > Signed-off-by: Pavan Nikhilesh
> > ---
> > +impl_0x43 = ['Cavium', flags_cavium, machine_args_cavium]
>
> There're only Cavimu args/flags defined, so other arm/arm64 platforms will
> fail at detecting. Can you add one entry for default?
>
> > +
> > +dpdk_conf.set_quoted('RTE_TOOLCHAIN', 'gcc')
> > +dpdk_conf.set('RTE_TOOLCHAIN_GCC', 1)
> > dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) -if cc.sizeof('void *') == 8
> > - dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
> > - dpdk_conf.set('RTE_ARCH_ARM64', 1)
> > - dpdk_conf.set('RTE_ARCH_64', 1)
> > -else
> > +
> > +if cc.sizeof('void *') != 8
> > dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
> > dpdk_conf.set('RTE_ARCH_ARM', 1)
> > dpdk_conf.set('RTE_ARCH_ARMv7', 1)
> > +else
> > + dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
> > + dpdk_conf.set('RTE_ARCH_ARM64', 1)
> > + dpdk_conf.set('RTE_ARCH_64', 1)
> > +
> > + if not meson.is_cross_build()
> > + # The script returns ['Implementor', 'Variant', 'Architecture',
> > + # 'Primary Part number', 'Revision']
> > + detect_vendor = find_program(join_paths(
> > + meson.current_source_dir(),
> > 'armv8_machine.py'))
> > + cmd = run_command(detect_vendor.path())
> > + if cmd.returncode() != 0
> > + message('Using default armv8 config')
> > + else
> > + machine_args = [] # Clear previous machine args
> > + cmd_output = cmd.stdout().strip().split(' ')
> > + machine = get_variable('impl_' + cmd_output[0])
>
> Script will fail for non-cavium Arm platforms. We need to check if
> cmd_output[0] is a known value in a list, otherwise should go to default
> entry.
>
> > + message('Implementor : ' + machine[0])
> > +
Re: [dpdk-dev] [PATCH] app/testpmd: add meter to the actions table
On Fri, Jan 12, 2018 at 01:07:34PM +, Singh, Jasvinder wrote:
>
>
> > -Original Message-
> > From: Dumitrescu, Cristian
> > Sent: Thursday, January 11, 2018 6:34 PM
> > To: Tomasz Duszynski ; dev@dpdk.org
> > Cc: Lu, Wenzhuo ; Wu, Jingjing
> > ; Singh, Jasvinder
> > Subject: RE: [dpdk-dev] [PATCH] app/testpmd: add meter to the actions
> > table
> >
> >
> > > -Original Message-
> > > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Tomasz Duszynski
> > > Sent: Thursday, January 11, 2018 1:49 PM
> > > To: dev@dpdk.org
> > > Cc: Lu, Wenzhuo ; Wu, Jingjing
> > > ; Tomasz Duszynski
> > > Subject: [dpdk-dev] [PATCH] app/testpmd: add meter to the actions
> > > table
> > >
> > > Since METER action is supported by the testpmd application suitable
> > > entry should exist in flow actions information table.
> > >
> > > Without that testpmd will return error on adding a new flow to the
> > > list of flows attached to a given port.
> > >
> > > Signed-off-by: Tomasz Duszynski
> > > ---
> > > app/test-pmd/config.c | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index
> > > 0a84481..4ad19fb 100644
> > > --- a/app/test-pmd/config.c
> > > +++ b/app/test-pmd/config.c
> > > @@ -1038,6 +1038,7 @@ static const struct {
> > > MK_FLOW_ACTION(RSS, sizeof(struct rte_flow_action_rss)), /*
> > > +queue[] */
> > > MK_FLOW_ACTION(PF, 0),
> > > MK_FLOW_ACTION(VF, sizeof(struct rte_flow_action_vf)),
> > > + MK_FLOW_ACTION(METER, sizeof(struct rte_flow_action_meter)),
> > > };
> > >
> > > /** Compute storage space needed by action configuration. */
> > > --
> > > 2.7.4
> >
> > Adding Jasvinder to this thread.
>
> The above change looks fine to me.
>
> Acked-by: Jasvinder Singh
Since I cannot see any objections can you pick up this one?
--
- Tomasz Duszyński
Re: [dpdk-dev] [PATCH] virtio: add new driver for crypto devices
Hi Thomas, > -Original Message- > From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Saturday, January 20, 2018 11:50 PM > To: Zhoujian (jay) > Cc: dev@dpdk.org; Zhang, Roy Fan ; > y...@fridaylinux.org; maxime.coque...@redhat.com; Gonglei (Arei) > ; Zeng, Xin ; Huangweidong (C) > ; wangxin (U) ; > longpeng ; ferruh.yi...@intel.com > Subject: Re: [dpdk-dev] [PATCH] virtio: add new driver for crypto devices > > Hi, > > 28/11/2017 02:27, Jay Zhou: > > For DPDK, I'm a newbie. Thanks for testing and pointing these steps > > out, will fix them in V2. > > Any news about this work? Another project is eating my time too, so it's a little late to send out v2... Pls help to review then. > > I see there is also a patch from Fan Zhang to support crypto in vhost-user. > Do you work together? Yes, we're working together :) Regards, Jay
Re: [dpdk-dev] 答复: Re: [PATCH v2 1/4] net/dpaa: add null point check and fix mem leak
Hi, 22/01/2018 03:53, wang.yon...@zte.com.cn: > Hi, > I've sent this patch again and it is accepted. > The other 3 pathes have no conflict with the latest master version and the > titles have described the modification of the patches. > So I need not send the patches for v3, right? Please re-send those which are not integrated yet, with more details, and appropriate title. Thanks > --origin-- > From ： ; > to ：wang.yon...@zte.com.cn; > cc： ; ; ; > ; ; > date ：2018-01-18 07:00 > subject ：Re: [dpdk-dev] [PATCH v2 1/4] net/dpaa: add null point check and fix > mem leak > Hi, > > Please could you rebase on master and keep the acked already given? > Please use --in-reply-to to keep v3 in the same thread as v2. > > Titles are the same for every patches. > Are they all fixing a NULL pointer check and a mem leak? > More details in the commit message may help. > > If they are fixes, a tag Fixes: may help for backports. > > Thanks
Re: [dpdk-dev] [PATCH] reset src fd field to -1 in fdset_move of vhost
On 2018/1/19 22:37, Yuanhan Liu wrote:
On Thu, Dec 21, 2017 at 05:15:40PM +0800, Bing Zhao wrote:
In the fdset_move, after copying the fd&rwfds from the src to the dst, the fd
should be set to -1. Or else in some cases, there will be a fault missing. E.g:
Before: 1 -1 3 4 -1 6 7 -1 9 10
After: 1 10 3 4 9 6 7 -1 9 10
Then the index7 will be returned correctly for the first time, but if another
fd is to be added, it will fail.
Hi,
Have you met a real issue? I'm a bit doubt about that, since the fd array
is also guarded by "pfdset->num", which makes sure we will not access
those invalid entries (i.e. the last 2 entries in above example).
--yliu
Signed-off-by: Bing Zhao
---
lib/librte_vhost/fd_man.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
index 4c6fed418..48594dd7f 100644
--- a/lib/librte_vhost/fd_man.c
+++ b/lib/librte_vhost/fd_man.c
@@ -63,6 +63,7 @@ fdset_move(struct fdset *pfdset, int dst, int src)
{
pfdset->fd[dst]= pfdset->fd[src];
pfdset->rwfds[dst] = pfdset->rwfds[src];
+ pfdset->fd[src].fd = -1;
}
static void
--
2.11.0.windows.1
Hello Yuanhan,
Thanks for your information. The answer is "no", and I just study the
code and notice this. But yes you're right, I missed this. At first I
thought there was a "-1" check in the "fdset_add_fd", indeed there isn't
:). And no matter "-1" or other values in the "fd" element, if the "num"
index points at that position, all the fields will be rewritten. So
there is no problem.
Thanks again and please just ignore this.
Re: [dpdk-dev] [PATCH v9 0/3] support c11 memory model barrier in librte_ring
22/01/2018 05:41, Jia He: > Changelog: > V9: remove the SPDX tag and refine commit logs Why did you remove the SPDX tag? You need to fix the licensing issue. BSD-2-Clause is uncommon in DPDK.
