Re: [dpdk-dev] [PATCH v2] service: don't walk out of bounds when checking services
On Tue, Dec 3, 2019 at 10:15 PM Aaron Conole wrote:
>
> The service_valid call is used without properly bounds checking the
> input parameter. Almost all instances of the service_valid call are
> inside a for() loop that prevents excessive walks, but some of the
> public APIs don't bounds check and will pass invalid arguments.
>
> Prevent this by using SERVICE_GET_OR_ERR_RET where it makes sense,
> and adding a bounds check to one service_valid() use.
>
> Fixes: 8d39d3e237c2 ("service: fix race in service on app lcore function")
> Fixes: e9139a32f6e8 ("service: add function to run on app lcore")
> Fixes: e30dd31847d2 ("service: add mechanism for quiescing")
> Signed-off-by: Aaron Conole
Reviewed-by: David Marchand
--
David Marchand
Re: [dpdk-dev] [PATCH v2] service: don't walk out of bounds when checking services
On Wed, Dec 4, 2019 at 9:33 AM David Marchand wrote:
>
> On Tue, Dec 3, 2019 at 10:15 PM Aaron Conole wrote:
> >
> > The service_valid call is used without properly bounds checking the
> > input parameter. Almost all instances of the service_valid call are
> > inside a for() loop that prevents excessive walks, but some of the
> > public APIs don't bounds check and will pass invalid arguments.
> >
> > Prevent this by using SERVICE_GET_OR_ERR_RET where it makes sense,
> > and adding a bounds check to one service_valid() use.
> >
> > Fixes: 8d39d3e237c2 ("service: fix race in service on app lcore function")
> > Fixes: e9139a32f6e8 ("service: add function to run on app lcore")
> > Fixes: e30dd31847d2 ("service: add mechanism for quiescing")
Cc: sta...@dpdk.org
> > Signed-off-by: Aaron Conole
>
> Reviewed-by: David Marchand
--
David Marchand
Re: [dpdk-dev] [PATCH v3 0/7] Add ABI compatibility checks to the meson build
On Tue, Dec 3, 2019 at 4:27 PM Laatz, Kevin wrote:
> > Build targets in project: 1019
> > WARNING: Project specifies a minimum meson_version '>= 0.47.1' but
> > uses features which were added in newer versions:
> > * 0.48.0: {'console arg in custom_target'}
> > * 0.50.0: {'install arg in configure_file'}
> > Found ninja-1.9.0 at /usr/bin/ninja
> > ninja -C /home/dmarchan/builds/build-gcc-static
> > ninja: Entering directory `/home/dmarchan/builds/build-gcc-static'
> > [48/2291] Generating librte_kvargs.abi_chk with a meson_exe.py custom
> > command.
> > FAILED: lib/librte_kvargs.abi_chk
> > /usr/bin/meson --internal exe
> > /home/dmarchan/builds/build-gcc-static/meson-private/meson_exe_abidiff_6511538ddd95d9672028017110fa45c67f01f7be.dat
> > file /home/dmarchan/dpdk/lib/abi/librte_kvargs.dump does not exist
> > [77/2291] Compiling C object
> > 'lib/76b5a35@@rte_mbuf@sta/librte_mbuf_rte_mbuf.c.o'.
> > ninja: build stopped: subcommand failed.
>
> This is failing as the .dump files have not been created yet. They can
> be generated with devtools/gen-abi-dump.sh . This will
> generate a .dump file for each shared object in the builddir drivers and
> lib folders.
Throwing an idea, I did not investigate.
Could we refactor our tools/checks on the .map files to use the dump files?
We would then only maintain one file about symbols versioning.
--
David Marchand
Re: [dpdk-dev] [PATCH v2] vhost: add config change slave msg support
On Wed, Dec 04, 2019 at 01:13:20PM +0800, Li Feng wrote:
> This msg is used to notify qemu that should get the config of backend.
>
> For example, vhost-user-blk uses this msg to notify guest os the
> compacity of backend has changed.
>
> Signed-off-by: Li Feng
> ---
> v2:
> * Fix a little log typo.
>
> lib/librte_vhost/vhost_user.c | 31 +++
> lib/librte_vhost/vhost_user.h | 2 ++
> 2 files changed, 33 insertions(+)
>
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 0cfb8b792..10f2e47d5 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t
> iova, uint8_t perm)
> return 0;
> }
>
> +static int
> +vhost_user_slave_config_change(struct virtio_net *dev)
> +{
> + int ret;
> + struct VhostUserMsg msg = {
> + .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
> + .flags = VHOST_USER_VERSION,
> + .size = 0,
> + };
> +
> + ret = send_vhost_message(dev->slave_req_fd, &msg);
> + if (ret < 0) {
> + RTE_LOG(ERR, VHOST_CONFIG,
> + "Failed to send config change (%d)\n",
> + ret);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +int
> +rte_vhost_user_slave_config_change(int vid)
> +{
> + struct virtio_net *dev;
> + dev = get_device(vid);
> + if (!dev)
> + return -ENODEV;
> + return vhost_user_slave_config_change(dev);
> +}
> +
> static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
> int index, int fd,
> uint64_t offset,
> diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
> index 6563f7315..5c1bb2138 100644
> --- a/lib/librte_vhost/vhost_user.h
> +++ b/lib/librte_vhost/vhost_user.h
> @@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
> typedef enum VhostUserSlaveRequest {
> VHOST_USER_SLAVE_NONE = 0,
> VHOST_USER_SLAVE_IOTLB_MSG = 1,
> + VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
> VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
> VHOST_USER_SLAVE_MAX
> } VhostUserSlaveRequest;
> @@ -158,6 +159,7 @@ typedef struct VhostUserMsg {
> /* vhost_user.c */
> int vhost_user_msg_handler(int vid, int fd);
> int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t
> perm);
> +int rte_vhost_user_slave_config_change(int vid);
This is supposed to be an API for external backends?
Thanks,
Tiwei
>
> /* socket.c */
> int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
> --
> 2.11.0
>
>
> --
> The SmartX email address is only for business purpose. Any sent message
> that is not related to the business is not authorized or permitted by
> SmartX.
> 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
>
>
Re: [dpdk-dev] [PATCH v2] vhost: add config change slave msg support
Hi Tiwei,
Thanks for your reply.
Yes, this new API currently is for vhost-user-blk in the SPDK project.
There is a patch in SPDK to use this API.
Thanks,
Feng Li
Tiwei Bie 于2019年12月4日周三 下午5:30写道：
>
> On Wed, Dec 04, 2019 at 01:13:20PM +0800, Li Feng wrote:
> > This msg is used to notify qemu that should get the config of backend.
> >
> > For example, vhost-user-blk uses this msg to notify guest os the
> > compacity of backend has changed.
> >
> > Signed-off-by: Li Feng
> > ---
> > v2:
> > * Fix a little log typo.
> >
> > lib/librte_vhost/vhost_user.c | 31 +++
> > lib/librte_vhost/vhost_user.h | 2 ++
> > 2 files changed, 33 insertions(+)
> >
> > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> > index 0cfb8b792..10f2e47d5 100644
> > --- a/lib/librte_vhost/vhost_user.c
> > +++ b/lib/librte_vhost/vhost_user.c
> > @@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev,
> > uint64_t iova, uint8_t perm)
> > return 0;
> > }
> >
> > +static int
> > +vhost_user_slave_config_change(struct virtio_net *dev)
> > +{
> > + int ret;
> > + struct VhostUserMsg msg = {
> > + .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
> > + .flags = VHOST_USER_VERSION,
> > + .size = 0,
> > + };
> > +
> > + ret = send_vhost_message(dev->slave_req_fd, &msg);
> > + if (ret < 0) {
> > + RTE_LOG(ERR, VHOST_CONFIG,
> > + "Failed to send config change (%d)\n",
> > + ret);
> > + return ret;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +int
> > +rte_vhost_user_slave_config_change(int vid)
> > +{
> > + struct virtio_net *dev;
> > + dev = get_device(vid);
> > + if (!dev)
> > + return -ENODEV;
> > + return vhost_user_slave_config_change(dev);
> > +}
> > +
> > static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
> > int index, int fd,
> > uint64_t offset,
> > diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
> > index 6563f7315..5c1bb2138 100644
> > --- a/lib/librte_vhost/vhost_user.h
> > +++ b/lib/librte_vhost/vhost_user.h
> > @@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
> > typedef enum VhostUserSlaveRequest {
> > VHOST_USER_SLAVE_NONE = 0,
> > VHOST_USER_SLAVE_IOTLB_MSG = 1,
> > + VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
> > VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
> > VHOST_USER_SLAVE_MAX
> > } VhostUserSlaveRequest;
> > @@ -158,6 +159,7 @@ typedef struct VhostUserMsg {
> > /* vhost_user.c */
> > int vhost_user_msg_handler(int vid, int fd);
> > int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t
> > perm);
> > +int rte_vhost_user_slave_config_change(int vid);
>
> This is supposed to be an API for external backends?
>
> Thanks,
> Tiwei
>
> >
> > /* socket.c */
> > int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int
> > max_fds,
> > --
> > 2.11.0
> >
> >
> > --
> > The SmartX email address is only for business purpose. Any sent message
> > that is not related to the business is not authorized or permitted by
> > SmartX.
> > 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
> >
> >
--
The SmartX email address is only for business purpose. Any sent message
that is not related to the business is not authorized or permitted by
SmartX.
本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
[dpdk-dev] [PATCH] drivers/net: fix mlx* glue libraries ABI version
Those libraries have been missed when switching to global ABI version.
Fixes: cba806e07d6f ("build: change ABI versioning to global")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
drivers/net/mlx4/Makefile| 2 +-
drivers/net/mlx4/meson.build | 2 +-
drivers/net/mlx5/Makefile| 2 +-
drivers/net/mlx5/meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index 329569dc10..dac5c5f64c 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB = librte_pmd_mlx4.a
LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
LIB_GLUE_BASE = librte_pmd_mlx4_glue.so
-LIB_GLUE_VERSION = 18.02.0
+LIB_GLUE_VERSION = $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
# Sources.
SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 9eb4988420..3ef946fef0 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -11,7 +11,7 @@ build = true
pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
-LIB_GLUE_VERSION = '18.02.0'
+LIB_GLUE_VERSION = abi_version
LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
if pmd_dlopen
dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index c5cf4397ac..90a9eeb61f 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB = librte_pmd_mlx5.a
LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
LIB_GLUE_BASE = librte_pmd_mlx5_glue.so
-LIB_GLUE_VERSION = 19.08.0
+LIB_GLUE_VERSION = $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
# Sources.
SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index d6b32db794..0216c22573 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -11,7 +11,7 @@ build = true
pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
-LIB_GLUE_VERSION = '19.08.0'
+LIB_GLUE_VERSION = abi_version
LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
if pmd_dlopen
dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
--
2.23.0
Re: [dpdk-dev] [PATCH v3 0/7] Add ABI compatibility checks to the meson build
On Wed, Dec 04, 2019 at 09:47:31AM +0100, David Marchand wrote:
> On Tue, Dec 3, 2019 at 4:27 PM Laatz, Kevin wrote:
> > > Build targets in project: 1019
> > > WARNING: Project specifies a minimum meson_version '>= 0.47.1' but
> > > uses features which were added in newer versions:
> > > * 0.48.0: {'console arg in custom_target'}
> > > * 0.50.0: {'install arg in configure_file'}
> > > Found ninja-1.9.0 at /usr/bin/ninja
> > > ninja -C /home/dmarchan/builds/build-gcc-static
> > > ninja: Entering directory `/home/dmarchan/builds/build-gcc-static'
> > > [48/2291] Generating librte_kvargs.abi_chk with a meson_exe.py custom
> > > command.
> > > FAILED: lib/librte_kvargs.abi_chk
> > > /usr/bin/meson --internal exe
> > > /home/dmarchan/builds/build-gcc-static/meson-private/meson_exe_abidiff_6511538ddd95d9672028017110fa45c67f01f7be.dat
> > > file /home/dmarchan/dpdk/lib/abi/librte_kvargs.dump does not exist
> > > [77/2291] Compiling C object
> > > 'lib/76b5a35@@rte_mbuf@sta/librte_mbuf_rte_mbuf.c.o'.
> > > ninja: build stopped: subcommand failed.
> >
> > This is failing as the .dump files have not been created yet. They can
> > be generated with devtools/gen-abi-dump.sh . This will
> > generate a .dump file for each shared object in the builddir drivers and
> > lib folders.
>
> Throwing an idea, I did not investigate.
>
> Could we refactor our tools/checks on the .map files to use the dump files?
> We would then only maintain one file about symbols versioning.
>
Could be looked into, but I'd worry about the complexity of the dump files
holding the whole API compared to the simpler map files which just have
a simple function listing.
/Bruce
Re: [dpdk-dev] [dpdk-stable] [PATCH] eal: fix unitialized data warning
Fixed title s/unitialized/uninitialized/
On Wed, Nov 27, 2019 at 11:32 PM Stephen Hemminger
wrote:
>
> Valgrind reports that eal interrupt thread is calling epoll_ctl
> with uninitialized data. Trivial to fix by initializing it.
Added a note on it being a Valgrind false positive.
> Fixes: af75078fece3 ("first public release")
> Cc: sta...@dpdk.org
> Signed-off-by: Stephen Hemminger
Acked-by: David Marchand
Applied, thanks.
--
David Marchand
Re: [dpdk-dev] [PATCH v3 0/7] Add ABI compatibility checks to the meson build
On Wed, Dec 04, 2019 at 09:47:31AM +0100, David Marchand wrote:
> On Tue, Dec 3, 2019 at 4:27 PM Laatz, Kevin wrote:
> > > Build targets in project: 1019
> > > WARNING: Project specifies a minimum meson_version '>= 0.47.1' but
> > > uses features which were added in newer versions:
> > > * 0.48.0: {'console arg in custom_target'}
> > > * 0.50.0: {'install arg in configure_file'}
> > > Found ninja-1.9.0 at /usr/bin/ninja
> > > ninja -C /home/dmarchan/builds/build-gcc-static
> > > ninja: Entering directory `/home/dmarchan/builds/build-gcc-static'
> > > [48/2291] Generating librte_kvargs.abi_chk with a meson_exe.py custom
> > > command.
> > > FAILED: lib/librte_kvargs.abi_chk
> > > /usr/bin/meson --internal exe
> > > /home/dmarchan/builds/build-gcc-static/meson-private/meson_exe_abidiff_6511538ddd95d9672028017110fa45c67f01f7be.dat
> > > file /home/dmarchan/dpdk/lib/abi/librte_kvargs.dump does not exist
> > > [77/2291] Compiling C object
> > > 'lib/76b5a35@@rte_mbuf@sta/librte_mbuf_rte_mbuf.c.o'.
> > > ninja: build stopped: subcommand failed.
> >
> > This is failing as the .dump files have not been created yet. They can
> > be generated with devtools/gen-abi-dump.sh . This will
> > generate a .dump file for each shared object in the builddir drivers and
> > lib folders.
>
> Throwing an idea, I did not investigate.
>
> Could we refactor our tools/checks on the .map files to use the dump files?
> We would then only maintain one file about symbols versioning.
>
Thats a chicken and egg problem. The map file is the canonical source for
versioning information. Any information that is encoded in the output of objdump
regarding versioning is sourced from the map files, so while you could use the
objdump output to check versioning, you can't remove the need for map files to
encode it.
If you want to remove the map files, we would need to look at the creation of
macros to encode versioning information for each symbol you want to export, and
use that to dynamically build a version map file (simmilar to what the linux
kernel EXPORT_SYMBOL does). But that just moves version tracking around, it
doesn't really eliminate it.
Neil
>
> --
> David Marchand
>
>
Re: [dpdk-dev] [PATCH v3 0/7] Add ABI compatibility checks to the meson build
On Wed, Dec 4, 2019 at 12:56 PM Neil Horman wrote:
>
> On Wed, Dec 04, 2019 at 09:47:31AM +0100, David Marchand wrote:
> > On Tue, Dec 3, 2019 at 4:27 PM Laatz, Kevin wrote:
> > > > Build targets in project: 1019
> > > > WARNING: Project specifies a minimum meson_version '>= 0.47.1' but
> > > > uses features which were added in newer versions:
> > > > * 0.48.0: {'console arg in custom_target'}
> > > > * 0.50.0: {'install arg in configure_file'}
> > > > Found ninja-1.9.0 at /usr/bin/ninja
> > > > ninja -C /home/dmarchan/builds/build-gcc-static
> > > > ninja: Entering directory `/home/dmarchan/builds/build-gcc-static'
> > > > [48/2291] Generating librte_kvargs.abi_chk with a meson_exe.py custom
> > > > command.
> > > > FAILED: lib/librte_kvargs.abi_chk
> > > > /usr/bin/meson --internal exe
> > > > /home/dmarchan/builds/build-gcc-static/meson-private/meson_exe_abidiff_6511538ddd95d9672028017110fa45c67f01f7be.dat
> > > > file /home/dmarchan/dpdk/lib/abi/librte_kvargs.dump does not exist
> > > > [77/2291] Compiling C object
> > > > 'lib/76b5a35@@rte_mbuf@sta/librte_mbuf_rte_mbuf.c.o'.
> > > > ninja: build stopped: subcommand failed.
> > >
> > > This is failing as the .dump files have not been created yet. They can
> > > be generated with devtools/gen-abi-dump.sh . This will
> > > generate a .dump file for each shared object in the builddir drivers and
> > > lib folders.
> >
> > Throwing an idea, I did not investigate.
> >
> > Could we refactor our tools/checks on the .map files to use the dump files?
> > We would then only maintain one file about symbols versioning.
> >
> Thats a chicken and egg problem. The map file is the canonical source for
> versioning information. Any information that is encoded in the output of
> objdump
> regarding versioning is sourced from the map files, so while you could use the
> objdump output to check versioning, you can't remove the need for map files to
> encode it.
Ah ah.. yes.
^U on this idea.
--
David Marchand
Re: [dpdk-dev] [dpdk-stable] [PATCH] eal: fix unitialized data warning
On 12/4/19 2:12 PM, David Marchand wrote:
> Fixed title s/unitialized/uninitialized/
>
> On Wed, Nov 27, 2019 at 11:32 PM Stephen Hemminger
> wrote:
>>
>> Valgrind reports that eal interrupt thread is calling epoll_ctl
>> with uninitialized data. Trivial to fix by initializing it.
>
> Added a note on it being a Valgrind false positive.
>
>
>> Fixes: af75078fece3 ("first public release")
>> Cc: sta...@dpdk.org
>
>> Signed-off-by: Stephen Hemminger
> Acked-by: David Marchand
>
> Applied, thanks.
It breaks build on RHEL 7.6 gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-36):
lib/librte_eal/linux/eal/eal_interrupts.c: In function
‘eal_intr_thread_main’:
lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing
initializer for field ‘events’ of ‘struct epoll_event’
[-Werror=missing-field-initializers]
struct epoll_event ev = { };
^
In file included from lib/librte_eal/linu/eal/eal_interrupts.c:15:0:
/usr/include/sys/epoll.h:89:12: note: ‘events’ declared here
uint32_t events; /* Epoll events */
^
Re: [dpdk-dev] [dpdk-stable] [PATCH] eal: fix unitialized data warning
On Wed, Dec 4, 2019 at 1:17 PM Andrew Rybchenko
wrote:
>
> On 12/4/19 2:12 PM, David Marchand wrote:
> > Fixed title s/unitialized/uninitialized/
> >
> > On Wed, Nov 27, 2019 at 11:32 PM Stephen Hemminger
> > wrote:
> >>
> >> Valgrind reports that eal interrupt thread is calling epoll_ctl
> >> with uninitialized data. Trivial to fix by initializing it.
> >
> > Added a note on it being a Valgrind false positive.
> >
> >
> >> Fixes: af75078fece3 ("first public release")
> >> Cc: sta...@dpdk.org
> >
> >> Signed-off-by: Stephen Hemminger
> > Acked-by: David Marchand
> >
> > Applied, thanks.
>
> It breaks build on RHEL 7.6 gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-36):
>
> lib/librte_eal/linux/eal/eal_interrupts.c: In function
> ‘eal_intr_thread_main’:
> lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing
> initializer for field ‘events’ of ‘struct epoll_event’
> [-Werror=missing-field-initializers]
>struct epoll_event ev = { };
> ^
> In file included from lib/librte_eal/linu/eal/eal_interrupts.c:15:0:
> /usr/include/sys/epoll.h:89:12: note: ‘events’ declared here
> uint32_t events; /* Epoll events */
> ^
Erf, indeed, I ran the tests on a different system than my laptop...
Need more coffee, those initializers are always a pain.
I'll go with a memset.
Best first commit for a release, I suppose.
--
David Marchand
[dpdk-dev] [RFC] net/mlx5: support RSS types L3/L4 SRC/DST only
In current PMD implementation, the RSS action is performed on L3 and L4, including SRC and DST fields. For some applications it can be useful to perform RSS on SRC only or on DST only. This RFC suggest use of existing rte_ethdev definitions to enhance RSS action support in MLX5 PMD: #define ETH_RSS_L3_SRC_ONLY(1ULL << 63) #define ETH_RSS_L3_DST_ONLY(1ULL << 62) #define ETH_RSS_L4_SRC_ONLY(1ULL << 61) #define ETH_RSS_L4_DST_ONLY(1ULL << 60) These values can be combined with L3/L4 ETH_RSS_* values, to define granular RSS offload types. Existing definition MLX5_RSS_HF_MASK will be updated to include the above ETH_RSS_* values. MLX5 flow validation function for RSS action will be updated to verify RSS types field: * ETH_RSS_L3_***_ONLY bits are set together with ETH_RSS_IP bits. * ETH_RSS_L4_***_ONLY bits are set together with ETH_RSS_UDP | ETH_RSS_TCP bits. MLX5 flow translation function will be updated to set flow hash_fields according to RSS types. Change will be implemented in function mlx5_flow_hashfields_adjust(). If RSS types include SRC_ONLY or DST_ONLY bits, hash_fields will be updated accordingly. IBV_RX_HASH_SRC/DST bits will be cleared according to RSS types. If RSS types include SRC_ONLY and DST_ONLY bits with same value, both set or both clear, hash_fields will be not be changed.
Re: [dpdk-dev] [PATCH v3] kernel/linux: fix kernel dir for meson
On Tue, 2019-12-03 at 23:59 +0800, Xiaolong Ye wrote:
> kernel_dir option in meson build is equivalent to RTE_KERNELDIR in
> make
> system, for cross-compilation case, users would specify it as local
> kernel src dir like
>
> //target-arm_glibc/linux-arm/linux-4.19.81/
>
> Current meson build would fail to compile kernel module if user
> specify
> kernel_dir as above, this patch fixes this issue.
>
> After this change, for normal build case, user can specify
> /lib/modules/ or /lib/modules//build
> as
> kernel_dir. For cross compilation case, user can specify any
> directory
> that contains kernel source code as the kernel_dir.
>
> Fixes: 317832f97c16 ("kernel/linux: fix modules install path")
> Cc:
> sta...@dpdk.org
>
> Cc:
> iryz...@nfware.com
>
>
> Signed-off-by: Xiaolong Ye <
> xiaolong...@intel.com
The convention used by upstream and all distros is that kernel headers
are in /build. Why can't the cross compilation case also
follow this convention, rather than adding complications to the
downstream build system?
--
Kind regards,
Luca Boccassi
Re: [dpdk-dev] Admin Queue ENA
Hi Param,
Adding atomic operations to setting/clearing comp ctxt won't help, as
there is no race there. The admin queue is designed this way, that
only single completion context can be held, so you should serialize
access to the rte_eth_stats_get().
If you won't do that, the 2nd thread will try to hold already occupied
context and this will result in disabling admin queue by the ena
communication layer - you won't be able to send further admin
commands.
That's intended behavior and it is caused because you are trying to
get the context with the occupied flag being set to true. Adding
atomic operations there won't change anything, as there will still be
a race between the thread that is waiting for the completion (occupied
flag already send to true) and another thread, that is trying to send
the same command using the same context (can't set occupied to true,
as it's already true) - that should never happen.
Without totally reworking ena_com admin queue design, we could add
lock in ena_stats_get() - but that'll cause unnecessary locking in all
of the applications that are using it from the main lcore context and
as your design seems to be unique by doing it from multiple threads,
maybe you could add a lock to your calls to the rte_eth_stats_get()?
Another solution might be using xstats API, which should let you to
get statistics from multiple threads as it's not using admin queue for
that - all stats are being counter internally in the PMD.
Thanks,
Michal
pt., 29 lis 2019 o 13:01 kumaraparameshwaran rathinavel
napisał(a):
>
> Hi Michał,
>
> Thanks for getting back on this.
>
> In our design we are using multiple cores requesting for rte_eth_stats_get,
> it is not from one process and hence not serialized. Since in our design this
> is not serialized, and hence in get_comp_ctxt() checking for occupied flag
> and comp_ctxt_release() are not done atomically which is causing this issue.
> Please let me know if my understanding is correct, so that I will fix the
> application in such a way that it is done from one process and not multiple.
>
> Thanks,
> Param.
>
> On Thu, Nov 28, 2019 at 6:44 PM Michał Krawczyk wrote:
>>
>> Hi Param,
>>
>> first of all - you are using very old ena_com. This code comes from
>> the DPDK version before v18.08. If you have any doubts, please check
>> the newer version of the driver and DPDK as the potential bug could be
>> already fixed there.
>>
>> Anyway, if you will look at the function get_comp_ctxt() which is
>> called by __ena_com_submit_admin_cmd() to get the completion context,
>> there is a check for the context if it's not occupied - in case it is
>> (which will be true until comp_ctxt_release() will clear it), the new
>> command using the same context cannot be used. So there shouldn't be
>> two consumers using the same completion contexts.
>>
>> In addition, drivers that are using ena_com are sending admin commands
>> one at a time during the init, so there shouldn't be even 2 commands
>> at a time. The only exception is ena_com_get_dev_basic_stats(), which
>> is called from rte_eth_stats_get() context - but if you consider DPDK
>> application, it should use it on the management lcore after init, so
>> it'll also be serialized.
>>
>> Thanks,
>> Michal
>>
>>
>>
>> pt., 8 lis 2019 o 07:02 kumaraparameshwaran rathinavel
>> napisał(a):
>> >
>> > Hi Michał,
>> >
>> > Please look at the below function,
>> >
>> > static int
>> > ena_com_wait_and_process_admin_cq_polling(
>> > struct ena_comp_ctx *comp_ctx,
>> > struct ena_com_admin_queue *admin_queue)
>> > {
>> > unsigned long flags = 0;
>> > u64 start_time;
>> > int ret;
>> >
>> > start_time = ENA_GET_SYSTEM_USECS();
>> >
>> > while (comp_ctx->status == ENA_CMD_SUBMITTED) {
>> > if ((ENA_GET_SYSTEM_USECS() - start_time) >
>> > ADMIN_CMD_TIMEOUT_US) {
>> > ena_trc_err("Wait for completion (polling) timeout\n");
>> > /* ENA didn't have any completion */
>> > ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
>> > admin_queue->stats.no_completion++;
>> > admin_queue->running_state = false;
>> > ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
>> >
>> > ret = ENA_COM_TIMER_EXPIRED;
>> > goto err;
>> > }
>> >
>> > ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
>> > ena_com_handle_admin_completion(admin_queue);
>> > ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
>> > }
>> >
>> > if (unlikely(comp_ctx->status == ENA_CMD_ABORTED)) {
>> > ena_trc_err("Command was aborted\n");
>> > ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
>> > admin_queue->stats.aborted_cmd++;
>> > ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
>> > ret = ENA_COM_NO_DEVICE;
>> > goto err;
>> > }
>> >
>> > ENA_ASSERT(comp_ctx->status == ENA_CMD_COMPLETED,
>> >"Invalid comp status %d\n", comp_ctx-
[dpdk-dev] [RFC] net/mlx5: add GTP support
This RFC describes the update of MLX5 PMD, in order to support GTP tunnel type. Update will include the support of matching on GTP item, fields msg_type and teid. GTP item validation function flow_dv_validate_item_gtp() will be implemented. This function will: Check that there is no tunnel layer in previous detected items. Multiple tunnel layers are not supported. Check that GTP item is preceded by L3 item and L4 UDP item. GTP is supported over UDP only. Check that there is no request to match on non-supported fields v_pt_rsv_flags and msg_len. Matching will be supported only for fields msg_type and teid. GTP item translation function flow_dv_translate_item_gtp() will be implemented. This function will set GTP item fields in matcher. Tunnel layer bit MLX5_FLOW_LAYER_GTP will be added, and updated in MLX5_FLOW_LAYER_TUNNEL mask, tunnels_info[] array, and MLX5_FLOW_TUNNEL size.
[dpdk-dev] [PATCH] ethdev: add L2TPv3 header to flow API
- RTE_FLOW_ITEM_TYPE_L2TPV3: matches a L2TPv3 header
Signed-off-by: Rory Sexton
Signed-off-by: Dariusz Jagus
---
app/test-pmd/cmdline_flow.c | 28 +
doc/guides/prog_guide/rte_flow.rst | 8 ++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 +++
lib/librte_ethdev/rte_flow.c| 1 +
lib/librte_ethdev/rte_flow.h| 27
5 files changed, 68 insertions(+)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 99dade7d8..a7fe7a7a8 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -213,6 +213,8 @@ enum index {
ITEM_TAG,
ITEM_TAG_DATA,
ITEM_TAG_INDEX,
+ ITEM_L2TPV3,
+ ITEM_L2TPV3_SESSION_ID,
/* Validate/create actions. */
ACTIONS,
@@ -746,6 +748,7 @@ static const enum index next_item[] = {
ITEM_PPPOE_PROTO_ID,
ITEM_HIGIG2,
ITEM_TAG,
+ ITEM_L2TPV3,
END_SET,
ZERO,
};
@@ -1030,6 +1033,12 @@ static const enum index item_tag[] = {
ZERO,
};
+static const enum index item_l2tpv3[] = {
+ ITEM_L2TPV3_SESSION_ID,
+ ITEM_NEXT,
+ ZERO,
+};
+
static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -2593,6 +2602,21 @@ static const struct token token_list[] = {
NEXT_ENTRY(ITEM_PARAM_IS)),
.args = ARGS(ARGS_ENTRY(struct rte_flow_item_tag, index)),
},
+ [ITEM_L2TPV3] = {
+ .name = "l2tpv3",
+ .help = "match L2TPv3 header",
+ .priv = PRIV_ITEM(L2TPV3, sizeof(struct rte_flow_item_l2tpv3)),
+ .next = NEXT(item_l2tpv3),
+ .call = parse_vc,
+ },
+ [ITEM_L2TPV3_SESSION_ID] = {
+ .name = "session_id",
+ .help = "session identifier",
+ .next = NEXT(item_l2tpv3, NEXT_ENTRY(UNSIGNED), item_param),
+ .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv3,
+session_id)),
+ },
+
/* Validate/create actions. */
[ACTIONS] = {
.name = "actions",
@@ -6238,6 +6262,10 @@ flow_item_default_mask(const struct rte_flow_item *item)
break;
case RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID:
mask = &rte_flow_item_pppoe_proto_id_mask;
+ break;
+ case RTE_FLOW_ITEM_TYPE_L2TPV3:
+ mask = &rte_flow_item_l2tpv3_mask;
+ break;
default:
break;
}
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index a254c81ef..c7ddb38c5 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1336,6 +1336,14 @@ Broadcom switches.
- Default ``mask`` matches classification and vlan.
+Item: ``L2TPV3``
+^
+
+Matches a L2TPv3 header.
+
+- ``session_id``: L2TPv3 session identifier.
+- Default ``mask`` matches session_id only.
+
Actions
~~~
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 73ef0b41d..a48e77619 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3954,6 +3954,10 @@ This section lists supported pattern items and their
attributes, if any.
- ``proto_id {unsigned}``: PPP protocol identifier.
+- ``l2tpv3``: match L2TPv3 header.
+
+ - ``session_id {unsigned}``: L2TPv3 session identifier.
+
Actions list
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 87a3e8c4c..fcda73320 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -93,6 +93,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] =
{
MK_FLOW_ITEM(IGMP, sizeof(struct rte_flow_item_igmp)),
MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
+ MK_FLOW_ITEM(L2TPV3, sizeof(struct rte_flow_item_l2tpv3)),
};
/** Generate flow_action[] entry. */
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 452d359a1..5ee055c28 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -510,6 +510,16 @@ enum rte_flow_item_type {
* See struct rte_flow_item_tag.
*/
RTE_FLOW_ITEM_TYPE_TAG,
+
+ /*
+* Matches a L2TPv3 header.
+*
+* Configure flow for L2TPv3 packets.
+*
+* See struct rte_flow_item_l2tpv3.
+*/
+ RTE_FLOW_ITEM_TYPE_L2TPV3,
+
};
/**
@@ -1373,6 +1383,23 @@ static const struct rte_flow_item_tag
rte_flow_item_tag_mask = {
};
#endif
+/**
+ * RTE_FLOW_ITEM_TYPE_L2TPV3.
+ *
+ * Matches a L2TPv3 header.
+ */
+struct rte_flow_item_l2tpv3 {
+ rte_be32_t session_id; /**< Session ID. */
+
[dpdk-dev] [PATCH] net/i40e: Add new customized pctype for l2tpv3
Signed-off-by: Rory Sexton
Signed-off-by: Dariusz Jagus
---
drivers/net/i40e/i40e_ethdev.c | 11 ++-
drivers/net/i40e/i40e_ethdev.h | 9 ++
drivers/net/i40e/i40e_fdir.c | 34 +
drivers/net/i40e/i40e_flow.c | 55 ++
4 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 5999c964b..80a46916c 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -12351,6 +12351,14 @@ i40e_update_customized_pctype(struct rte_eth_dev *dev,
uint8_t *pkg,
new_pctype =
i40e_find_customized_pctype(pf,
I40E_CUSTOMIZED_GTPU);
+ else if (!strcmp(name, "IPV4_L2TPV3"))
+ new_pctype =
+ i40e_find_customized_pctype(pf,
+ I40E_CUSTOMIZED_IPV4_L2TPV3);
+ else if (!strcmp(name, "IPV6_L2TPV3"))
+ new_pctype =
+ i40e_find_customized_pctype(pf,
+ I40E_CUSTOMIZED_IPV6_L2TPV3);
if (new_pctype) {
if (op == RTE_PMD_I40E_PKG_OP_WR_ADD) {
new_pctype->pctype = pctype_value;
@@ -12544,7 +12552,8 @@ i40e_update_customized_ptype(struct rte_eth_dev *dev,
uint8_t *pkg,
RTE_PTYPE_TUNNEL_GRENAT;
in_tunnel = true;
} else if (!strncasecmp(name, "L2TPV2CTL", 9) ||
- !strncasecmp(name, "L2TPV2", 6)) {
+ !strncasecmp(name, "L2TPV2", 6) ||
+ !strncasecmp(name, "L2TPV3", 6)) {
ptype_mapping[i].sw_ptype |=
RTE_PTYPE_TUNNEL_L2TP;
in_tunnel = true;
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 295ad593b..569a5a1e5 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -508,6 +508,11 @@ struct i40e_raw_flow {
uint32_t length;
};
+/* A structure used to define the input for L2TPv3 flow */
+struct i40e_l2tpv3_flow {
+ uint32_t session_id; /* Session ID in big endian. */
+};
+
/*
* A union contains the inputs for all types of flow
* items in flows need to be in big endian
@@ -526,6 +531,7 @@ union i40e_fdir_flow {
struct i40e_gtp_ipv4_flow gtp_ipv4_flow;
struct i40e_gtp_ipv6_flow gtp_ipv6_flow;
struct i40e_raw_flow raw_flow;
+ struct i40e_l2tpv3_flowl2tpv3_flow;
};
enum i40e_fdir_ip_type {
@@ -542,6 +548,7 @@ struct i40e_fdir_flow_ext {
uint16_t dst_id; /* VF ID, available when is_vf is 1*/
bool inner_ip; /* If there is inner ip */
enum i40e_fdir_ip_type iip_type; /* ip type for inner ip */
+ enum i40e_fdir_ip_type oip_type; /* ip type for outer ip */
bool customized_pctype; /* If customized pctype is used */
bool pkt_template; /* If raw packet template is used */
};
@@ -897,6 +904,8 @@ enum i40e_new_pctype {
I40E_CUSTOMIZED_GTPU_IPV4,
I40E_CUSTOMIZED_GTPU_IPV6,
I40E_CUSTOMIZED_GTPU,
+ I40E_CUSTOMIZED_IPV4_L2TPV3,
+ I40E_CUSTOMIZED_IPV6_L2TPV3,
I40E_CUSTOMIZED_MAX,
};
diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index dee007daa..b18301eec 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -33,6 +33,10 @@
#define IPV6_ADDR_LEN 16
#endif
+#ifndef IPPROTO_L2TP
+#define IPPROTO_L2TP 115
+#endif
+
#define I40E_FDIR_PKT_LEN 512
#define I40E_FDIR_IP_DEFAULT_LEN420
#define I40E_FDIR_IP_DEFAULT_TTL0x40
@@ -1026,7 +1030,12 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,
pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP ||
pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER ||
pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 ||
-is_customized_pctype) {
+((is_customized_pctype) &&
+ ((cus_pctype->index == I40E_CUSTOMIZED_GTPC) ||
+ (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) ||
+ (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6) ||
+ (cus_pctype->index == I40E_CUSTOMIZED_GTPU) ||
+ (cus_pctype->index == I40E_CUSTOMIZED_IPV4_L2TPV3 {
ip = (struct rte_ipv4_hdr *)raw_pkt;
*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
@@ -1054,12 +1063,16 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf,
Re: [dpdk-dev] [PATCH v3] kernel/linux: fix kernel dir for meson
On 12/04, Luca Boccassi wrote:
>On Tue, 2019-12-03 at 23:59 +0800, Xiaolong Ye wrote:
>> kernel_dir option in meson build is equivalent to RTE_KERNELDIR in
>> make
>> system, for cross-compilation case, users would specify it as local
>> kernel src dir like
>>
>> //target-arm_glibc/linux-arm/linux-4.19.81/
>>
>> Current meson build would fail to compile kernel module if user
>> specify
>> kernel_dir as above, this patch fixes this issue.
>>
>> After this change, for normal build case, user can specify
>> /lib/modules/ or /lib/modules//build
>> as
>> kernel_dir. For cross compilation case, user can specify any
>> directory
>> that contains kernel source code as the kernel_dir.
>>
>> Fixes: 317832f97c16 ("kernel/linux: fix modules install path")
>> Cc:
>> sta...@dpdk.org
>>
>> Cc:
>> iryz...@nfware.com
>>
>>
>> Signed-off-by: Xiaolong Ye <
>> xiaolong...@intel.com
>
>The convention used by upstream and all distros is that kernel headers
>are in /build. Why can't the cross compilation case also
>follow this convention, rather than adding complications to the
Yes, cross-compilation can follow this convention, but one common case is that
users download and put kernel src (the same kernel that's running in the target
machine)
to one arbitrary dir, he then use this dir as kernel_dir to build kernel
modules,
it's extra burden for users to create extra build dir to hold the kernel
headers.
Thanks,
Xiaolong
>downstream build system?
>
>--
>Kind regards,
>Luca Boccassi
[dpdk-dev] [PATCH v2 00/11] example/l3fwd: introduce event device support
From: Pavan Nikhilesh This patchset adds support for event mode in l3fwd. The poll mode is still the default mode of operation. The following new command line parameters are added: --mode: Dictates the mode of operation either poll or event. If unset then by default poll mode is used. --eventq_sched: Dictates event synchronization mode i.e. either ordered, atomic or parallel. Based on event device capability the configuration is done as follows: - A single event device is enabled. - The number of event ports is equal to the number of worker cores enabled in the core mask. Additional event ports might be configured based on Rx/Tx adapter capability. - The number of event queues is equal to the number of ethernet ports. If Tx adapter doesn't have internal port capability then an additional single link event queue is used to enqueue events to Tx adapter. - Each event port is linked to all existing event queues. - Dedicated Rx/Tx adapters for each Ethernet port. v2 Changes: -- - Shorten the structure name `s/event_rsrc/evt_rsrc` `s/l2fwd_rsrc/rsrc`. - Use rte_panic instead of rte_exit. - Rebase on top of Tx adapter change http://patches.dpdk.org/patch/60971. - Add parallel mode support. - Fix missing eventdev args parsing. Pavan Nikhilesh (7): examples/l3fwd: add event device configuration examples/l3fwd: add event eth Rx/Tx adapter setup examples/l3fwd: add service core setup based on caps examples/l3fwd: add event lpm main loop examples/l3fwd: add event em main loop examples/l3fwd: add graceful teardown for eventdevice doc: update l3fwd user guide to support eventdev Sunil Kumar Kori (4): examples/l3fwd: add framework for event device examples/l3fwd: split pipelines based on capability examples/l3fwd: add ethdev setup based on eventdev examples/l3fwd: add event port and queue setup doc/guides/sample_app_ug/l3_forward.rst| 76 +- examples/l3fwd/Makefile| 3 +- examples/l3fwd/l3fwd.h | 32 +++ examples/l3fwd/l3fwd_em.c | 177 examples/l3fwd/l3fwd_em.h | 159 +++ examples/l3fwd/l3fwd_em_hlm.h | 131 + examples/l3fwd/l3fwd_em_sequential.h | 26 ++ examples/l3fwd/l3fwd_event.c | 294 examples/l3fwd/l3fwd_event.h | 117 examples/l3fwd/l3fwd_event_generic.c | 300 + examples/l3fwd/l3fwd_event_internal_port.c | 279 +++ examples/l3fwd/l3fwd_lpm.c | 231 examples/l3fwd/main.c | 203 +++--- examples/l3fwd/meson.build | 5 +- 14 files changed, 1948 insertions(+), 85 deletions(-) create mode 100644 examples/l3fwd/l3fwd_event.c create mode 100644 examples/l3fwd/l3fwd_event.h create mode 100644 examples/l3fwd/l3fwd_event_generic.c create mode 100644 examples/l3fwd/l3fwd_event_internal_port.c -- 2.17.1
[dpdk-dev] [PATCH v2 01/11] examples/l3fwd: add framework for event device
From: Sunil Kumar Kori
Add framework to enable event device as a producer of packets.
To switch between event mode and poll mode the following options
have been added:
`--mode="eventdev"` or `--mode="poll"`
Also, allow the user to select the schedule type to be either
RTE_SCHED_TYPE_ORDERED, RTE_SCHED_TYPE_ATOMIC or RTE_SCHED_TYPE_PARALLEL
through:
`--eventq-sched="ordered"` or `--eventq-sched="atomic"` or
`--eventq-sched="parallel"`
Poll mode is still the default operation mode.
Signed-off-by: Sunil Kumar Kori
---
examples/l3fwd/Makefile | 2 +-
examples/l3fwd/l3fwd.h | 6 +++
examples/l3fwd/l3fwd_event.c | 75
examples/l3fwd/l3fwd_event.h | 54 ++
examples/l3fwd/main.c| 41 +---
examples/l3fwd/meson.build | 4 +-
6 files changed, 174 insertions(+), 8 deletions(-)
create mode 100644 examples/l3fwd/l3fwd_event.c
create mode 100644 examples/l3fwd/l3fwd_event.h
diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
index b2dbf2607..c892b867b 100644
--- a/examples/l3fwd/Makefile
+++ b/examples/l3fwd/Makefile
@@ -5,7 +5,7 @@
APP = l3fwd
# all source are stored in SRCS-y
-SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c
+SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c
# Build using pkg-config variables if possible
ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index 293fb1fa2..cd17a41b3 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -5,6 +5,9 @@
#ifndef __L3_FWD_H__
#define __L3_FWD_H__
+#include
+
+#include
#include
#define DO_RFC_1812_CHECKS
@@ -169,6 +172,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t
link_len)
}
#endif /* DO_RFC_1812_CHECKS */
+void
+print_usage(const char *prgname);
+
/* Function pointers for LPM or EM functionality. */
void
setup_lpm(const int socketid);
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
new file mode 100644
index 0..3892720be
--- /dev/null
+++ b/examples/l3fwd/l3fwd_event.c
@@ -0,0 +1,75 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include
+#include
+
+#include "l3fwd.h"
+#include "l3fwd_event.h"
+
+static void
+parse_mode(const char *optarg)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+
+ if (!strncmp(optarg, "poll", 4))
+ evt_rsrc->enabled = false;
+ else if (!strncmp(optarg, "eventdev", 8))
+ evt_rsrc->enabled = true;
+}
+
+static void
+parse_eventq_sync(const char *optarg)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+
+ if (!strncmp(optarg, "ordered", 7))
+ evt_rsrc->sched_type = RTE_SCHED_TYPE_ORDERED;
+ if (!strncmp(optarg, "atomic", 6))
+ evt_rsrc->sched_type = RTE_SCHED_TYPE_ATOMIC;
+ if (!strncmp(optarg, "parallel", 8))
+ evt_rsrc->sched_type = RTE_SCHED_TYPE_PARALLEL;
+}
+
+static void
+l3fwd_parse_eventdev_args(char **argv, int argc)
+{
+ const struct option eventdev_lgopts[] = {
+ {CMD_LINE_OPT_MODE, 1, 0, CMD_LINE_OPT_MODE_NUM},
+ {CMD_LINE_OPT_EVENTQ_SYNC, 1, 0, CMD_LINE_OPT_EVENTQ_SYNC_NUM},
+ {NULL, 0, 0, 0}
+ };
+ char *prgname = argv[0];
+ char **argvopt = argv;
+ int32_t option_index;
+ int32_t opt;
+
+ while ((opt = getopt_long(argc, argvopt, "", eventdev_lgopts,
+ &option_index)) != EOF) {
+ switch (opt) {
+ case CMD_LINE_OPT_MODE_NUM:
+ parse_mode(optarg);
+ break;
+
+ case CMD_LINE_OPT_EVENTQ_SYNC_NUM:
+ parse_eventq_sync(optarg);
+ break;
+
+ default:
+ print_usage(prgname);
+ exit(1);
+ }
+ }
+}
+
+void
+l3fwd_event_resource_setup(void)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+
+ /* Parse eventdev command line options */
+ l3fwd_parse_eventdev_args(evt_rsrc->args, evt_rsrc->nb_args);
+ if (!evt_rsrc->enabled)
+ return;
+}
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
new file mode 100644
index 0..c95296c38
--- /dev/null
+++ b/examples/l3fwd/l3fwd_event.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#ifndef __L3FWD_EVENTDEV_H__
+#define __L3FWD_EVENTDEV_H__
+
+#include
+#include
+#include
+
+#include "l3fwd.h"
+
+#define CMD_LINE_OPT_MODE "mode"
+#define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
+
+enum {
+ CMD_LINE_OPT_MODE_NUM = 265,
+ CMD_LINE_OPT_EVENTQ_SYNC_NUM,
+};
+
+struct l3fwd_event_resources {
+
[dpdk-dev] [PATCH v2 02/11] examples/l3fwd: split pipelines based on capability
From: Sunil Kumar Kori
Add infra to split eventdev framework based on event Tx adapter
capability.
If event Tx adapter has internal port capability then we use
`rte_event_eth_tx_adapter_enqueue` to transmitting packets else
we use a SINGLE_LINK event queue to enqueue packets to a service
core which is responsible for transmitting packets.
Signed-off-by: Sunil Kumar Kori
---
examples/l3fwd/Makefile| 1 +
examples/l3fwd/l3fwd_event.c | 31 ++
examples/l3fwd/l3fwd_event.h | 20 ++
examples/l3fwd/l3fwd_event_generic.c | 12 +
examples/l3fwd/l3fwd_event_internal_port.c | 12 +
examples/l3fwd/meson.build | 3 ++-
6 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 examples/l3fwd/l3fwd_event_generic.c
create mode 100644 examples/l3fwd/l3fwd_event_internal_port.c
diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
index c892b867b..59a110d12 100644
--- a/examples/l3fwd/Makefile
+++ b/examples/l3fwd/Makefile
@@ -6,6 +6,7 @@ APP = l3fwd
# all source are stored in SRCS-y
SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c
+SRCS-y += l3fwd_event_generic.c l3fwd_event_internal_port.c
# Build using pkg-config variables if possible
ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 3892720be..a76195a1f 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -63,6 +63,31 @@ l3fwd_parse_eventdev_args(char **argv, int argc)
}
}
+static void
+l3fwd_event_capability_setup(void)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ uint32_t caps = 0;
+ uint16_t i;
+ int ret;
+
+ RTE_ETH_FOREACH_DEV(i) {
+ ret = rte_event_eth_tx_adapter_caps_get(0, i, &caps);
+ if (ret)
+ rte_exit(EXIT_FAILURE,
+"Invalid capability for Tx adptr port %d\n",
+i);
+
+ evt_rsrc->tx_mode_q |= !(caps &
+ RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT);
+ }
+
+ if (evt_rsrc->tx_mode_q)
+ l3fwd_event_set_generic_ops(&evt_rsrc->ops);
+ else
+ l3fwd_event_set_internal_port_ops(&evt_rsrc->ops);
+}
+
void
l3fwd_event_resource_setup(void)
{
@@ -72,4 +97,10 @@ l3fwd_event_resource_setup(void)
l3fwd_parse_eventdev_args(evt_rsrc->args, evt_rsrc->nb_args);
if (!evt_rsrc->enabled)
return;
+
+ if (!rte_event_dev_count())
+ rte_exit(EXIT_FAILURE, "No Eventdev found");
+
+ /* Setup eventdev capability callbacks */
+ l3fwd_event_capability_setup();
}
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index c95296c38..edb0c9d45 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -7,6 +7,7 @@
#include
#include
+#include
#include
#include "l3fwd.h"
@@ -19,8 +20,25 @@ enum {
CMD_LINE_OPT_EVENTQ_SYNC_NUM,
};
+typedef uint32_t (*event_device_setup_cb)(void);
+typedef void (*event_queue_setup_cb)(uint32_t event_queue_cfg);
+typedef void (*event_port_setup_cb)(void);
+typedef void (*adapter_setup_cb)(void);
+typedef int (*event_loop_cb)(void *);
+
+struct l3fwd_event_setup_ops {
+ event_device_setup_cb event_device_setup;
+ event_queue_setup_cb event_queue_setup;
+ event_port_setup_cb event_port_setup;
+ adapter_setup_cb adapter_setup;
+ event_loop_cb lpm_event_loop;
+ event_loop_cb em_event_loop;
+};
+
struct l3fwd_event_resources {
+ struct l3fwd_event_setup_ops ops;
uint8_t sched_type;
+ uint8_t tx_mode_q;
uint8_t enabled;
uint8_t nb_args;
char **args;
@@ -50,5 +68,7 @@ l3fwd_get_eventdev_rsrc(void)
}
void l3fwd_event_resource_setup(void);
+void l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops);
+void l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops);
#endif /* __L3FWD_EVENTDEV_H__ */
diff --git a/examples/l3fwd/l3fwd_event_generic.c
b/examples/l3fwd/l3fwd_event_generic.c
new file mode 100644
index 0..6e228dbba
--- /dev/null
+++ b/examples/l3fwd/l3fwd_event_generic.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include "l3fwd.h"
+#include "l3fwd_event.h"
+
+void
+l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops)
+{
+ RTE_SET_USED(ops);
+}
diff --git a/examples/l3fwd/l3fwd_event_internal_port.c
b/examples/l3fwd/l3fwd_event_internal_port.c
new file mode 100644
index 0..b7eca15be
--- /dev/null
+++ b/examples/l3fwd/l3fwd_event_internal_port.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include "l3fwd.h"
+#include
[dpdk-dev] [PATCH v2 05/11] examples/l3fwd: add event port and queue setup
From: Sunil Kumar Kori
Add event device queue and port setup based on event eth Tx adapter
capabilities.
Signed-off-by: Sunil Kumar Kori
---
examples/l3fwd/l3fwd_event.c | 28 +-
examples/l3fwd/l3fwd_event.h | 1 +
examples/l3fwd/l3fwd_event_generic.c | 103 +
examples/l3fwd/l3fwd_event_internal_port.c | 98
4 files changed, 229 insertions(+), 1 deletion(-)
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index b1ff8dc31..4133dd167 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -212,10 +212,30 @@ l3fwd_event_capability_setup(void)
l3fwd_event_set_internal_port_ops(&evt_rsrc->ops);
}
+int
+l3fwd_get_free_event_port(struct l3fwd_event_resources *evt_rsrc)
+{
+ static int index;
+ int port_id;
+
+ rte_spinlock_lock(&evt_rsrc->evp.lock);
+ if (index >= evt_rsrc->evp.nb_ports) {
+ printf("No free event port is available\n");
+ return -1;
+ }
+
+ port_id = evt_rsrc->evp.event_p_id[index];
+ index++;
+ rte_spinlock_unlock(&evt_rsrc->evp.lock);
+
+ return port_id;
+}
+
void
l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
{
struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ uint32_t event_queue_cfg;
/* Parse eventdev command line options */
l3fwd_parse_eventdev_args(evt_rsrc->args, evt_rsrc->nb_args);
@@ -232,5 +252,11 @@ l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
l3fwd_eth_dev_port_setup(port_conf);
/* Event device configuration */
- evt_rsrc->ops.event_device_setup();
+ event_queue_cfg = evt_rsrc->ops.event_device_setup();
+
+ /* Event queue configuration */
+ evt_rsrc->ops.event_queue_setup(event_queue_cfg);
+
+ /* Event port configuration */
+ evt_rsrc->ops.event_port_setup();
}
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index cd36d99ae..8e0b70509 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -104,6 +104,7 @@ l3fwd_get_eventdev_rsrc(void)
}
void l3fwd_event_resource_setup(struct rte_eth_conf *port_conf);
+int l3fwd_get_free_event_port(struct l3fwd_event_resources *eventdev_rsrc);
void l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops);
void l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops);
diff --git a/examples/l3fwd/l3fwd_event_generic.c
b/examples/l3fwd/l3fwd_event_generic.c
index d748dcef9..27bc60038 100644
--- a/examples/l3fwd/l3fwd_event_generic.c
+++ b/examples/l3fwd/l3fwd_event_generic.c
@@ -78,8 +78,111 @@ l3fwd_event_device_setup_generic(void)
return event_queue_cfg;
}
+static void
+l3fwd_event_port_setup_generic(void)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ uint8_t event_d_id = evt_rsrc->event_d_id;
+ struct rte_event_port_conf event_p_conf = {
+ .dequeue_depth = 32,
+ .enqueue_depth = 32,
+ .new_event_threshold = 4096
+ };
+ struct rte_event_port_conf def_p_conf;
+ uint8_t event_p_id;
+ int32_t ret;
+
+ evt_rsrc->evp.event_p_id = (uint8_t *)malloc(sizeof(uint8_t) *
+ evt_rsrc->evp.nb_ports);
+ if (!evt_rsrc->evp.event_p_id)
+ rte_panic("No space is available\n");
+
+ memset(&def_p_conf, 0, sizeof(struct rte_event_port_conf));
+ rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf);
+
+ if (def_p_conf.new_event_threshold < event_p_conf.new_event_threshold)
+ event_p_conf.new_event_threshold =
+ def_p_conf.new_event_threshold;
+
+ if (def_p_conf.dequeue_depth < event_p_conf.dequeue_depth)
+ event_p_conf.dequeue_depth = def_p_conf.dequeue_depth;
+
+ if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth)
+ event_p_conf.enqueue_depth = def_p_conf.enqueue_depth;
+
+ event_p_conf.disable_implicit_release =
+ evt_rsrc->disable_implicit_release;
+ evt_rsrc->deq_depth = def_p_conf.dequeue_depth;
+
+ for (event_p_id = 0; event_p_id < evt_rsrc->evp.nb_ports;
+ event_p_id++) {
+ ret = rte_event_port_setup(event_d_id, event_p_id,
+ &event_p_conf);
+ if (ret < 0)
+ rte_panic("Error in configuring event port %d\n",
+ event_p_id);
+
+ ret = rte_event_port_link(event_d_id, event_p_id,
+ evt_rsrc->evq.event_q_id,
+ NULL,
+ evt_rsrc->evq.nb_queues - 1);
+ if (ret != (evt_rsrc->evq.nb_queues
[dpdk-dev] [PATCH v2 04/11] examples/l3fwd: add ethdev setup based on eventdev
From: Sunil Kumar Kori
Add ethernet port Rx/Tx queue setup for event device which are later
used for setting up event eth Rx/Tx adapters.
Signed-off-by: Sunil Kumar Kori
---
examples/l3fwd/l3fwd.h | 10 +++
examples/l3fwd/l3fwd_event.c | 129 ++-
examples/l3fwd/l3fwd_event.h | 2 +-
examples/l3fwd/main.c| 15 ++--
4 files changed, 144 insertions(+), 12 deletions(-)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index cd17a41b3..6d16cde74 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -18,9 +18,16 @@
#define NO_HASH_MULTI_LOOKUP 1
#endif
+/*
+ * Configurable number of RX/TX ring descriptors
+ */
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
+
#define MAX_PKT_BURST 32
#define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
+#define MEMPOOL_CACHE_SIZE 256
#define MAX_RX_QUEUE_PER_LCORE 16
/*
@@ -175,6 +182,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t
link_len)
void
print_usage(const char *prgname);
+int
+init_mem(uint16_t portid, unsigned int nb_mbuf);
+
/* Function pointers for LPM or EM functionality. */
void
setup_lpm(const int socketid);
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index a027e150d..b1ff8dc31 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -8,6 +8,14 @@
#include "l3fwd.h"
#include "l3fwd_event.h"
+static void
+print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr)
+{
+ char buf[RTE_ETHER_ADDR_FMT_SIZE];
+ rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr);
+ printf("%s%s", name, buf);
+}
+
static void
parse_mode(const char *optarg)
{
@@ -63,6 +71,122 @@ l3fwd_parse_eventdev_args(char **argv, int argc)
}
}
+static void
+l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ uint16_t nb_ports = rte_eth_dev_count_avail();
+ uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT;
+ uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT;
+ unsigned int nb_lcores = rte_lcore_count();
+ struct rte_eth_conf local_port_conf;
+ struct rte_eth_dev_info dev_info;
+ struct rte_eth_txconf txconf;
+ struct rte_eth_rxconf rxconf;
+ unsigned int nb_mbuf;
+ uint16_t port_id;
+ int32_t ret;
+
+ /* initialize all ports */
+ RTE_ETH_FOREACH_DEV(port_id) {
+ local_port_conf = *port_conf;
+ /* skip ports that are not enabled */
+ if ((evt_rsrc->port_mask & (1 << port_id)) == 0) {
+ printf("\nSkipping disabled port %d\n", port_id);
+ continue;
+ }
+
+ /* init port */
+ printf("Initializing port %d ... ", port_id);
+ fflush(stdout);
+ printf("Creating queues: nb_rxq=1 nb_txq=1...\n");
+
+ rte_eth_dev_info_get(port_id, &dev_info);
+ if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
+ local_port_conf.txmode.offloads |=
+ DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+ local_port_conf.rx_adv_conf.rss_conf.rss_hf &=
+ dev_info.flow_type_rss_offloads;
+ if (local_port_conf.rx_adv_conf.rss_conf.rss_hf !=
+ port_conf->rx_adv_conf.rss_conf.rss_hf) {
+ printf("Port %u modified RSS hash function "
+ "based on hardware support,"
+ "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+ port_id,
+ port_conf->rx_adv_conf.rss_conf.rss_hf,
+ local_port_conf.rx_adv_conf.rss_conf.rss_hf);
+ }
+
+ ret = rte_eth_dev_configure(port_id, 1, 1, &local_port_conf);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+"Cannot configure device: err=%d, port=%d\n",
+ret, port_id);
+
+ ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd,
+ &nb_txd);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+"Cannot adjust number of descriptors: err=%d, "
+"port=%d\n", ret, port_id);
+
+ rte_eth_macaddr_get(port_id, &ports_eth_addr[port_id]);
+ print_ethaddr(" Address:", &ports_eth_addr[port_id]);
+ printf(", ");
+ print_ethaddr("Destination:",
+ (const struct rte_ether_addr *)&dest_eth_addr[port_id]);
+ printf(", ");
+
+ /* prepare source MAC for each por
[dpdk-dev] [PATCH v2 06/11] examples/l3fwd: add event eth Rx/Tx adapter setup
From: Pavan Nikhilesh
Add event eth Rx/Tx adapter setup for both generic and internal port
event device pipelines.
Signed-off-by: Sunil Kumar Kori
Signed-off-by: Pavan Nikhilesh
---
examples/l3fwd/l3fwd_event.c | 3 +
examples/l3fwd/l3fwd_event.h | 1 +
examples/l3fwd/l3fwd_event_generic.c | 112 +
examples/l3fwd/l3fwd_event_internal_port.c | 93 +
4 files changed, 209 insertions(+)
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 4133dd167..3a43f30a3 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -259,4 +259,7 @@ l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
/* Event port configuration */
evt_rsrc->ops.event_port_setup();
+
+ /* Rx/Tx adapters configuration */
+ evt_rsrc->ops.adapter_setup();
}
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index 8e0b70509..9d8bd5a36 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -7,6 +7,7 @@
#include
#include
+#include
#include
#include
#include
diff --git a/examples/l3fwd/l3fwd_event_generic.c
b/examples/l3fwd/l3fwd_event_generic.c
index 27bc60038..74fa9509d 100644
--- a/examples/l3fwd/l3fwd_event_generic.c
+++ b/examples/l3fwd/l3fwd_event_generic.c
@@ -179,10 +179,122 @@ l3fwd_event_queue_setup_generic(uint32_t event_queue_cfg)
evt_rsrc->evq.event_q_id[event_q_id] = event_q_id;
}
+static void
+l3fwd_rx_tx_adapter_setup_generic(void)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ struct rte_event_eth_rx_adapter_queue_conf eth_q_conf;
+ uint8_t event_d_id = evt_rsrc->event_d_id;
+ uint8_t rx_adptr_id = 0;
+ uint8_t tx_adptr_id = 0;
+ uint8_t tx_port_id = 0;
+ uint16_t port_id;
+ uint32_t service_id;
+ int32_t ret, i = 0;
+
+ memset(ð_q_conf, 0, sizeof(eth_q_conf));
+ eth_q_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+
+ /* Rx adapter setup */
+ evt_rsrc->rx_adptr.nb_rx_adptr = 1;
+ evt_rsrc->rx_adptr.rx_adptr = (uint8_t *)malloc(sizeof(uint8_t) *
+ evt_rsrc->rx_adptr.nb_rx_adptr);
+ if (!evt_rsrc->rx_adptr.rx_adptr) {
+ free(evt_rsrc->evp.event_p_id);
+ free(evt_rsrc->evq.event_q_id);
+ rte_panic("Failed to allocate memery for Rx adapter\n");
+ }
+
+ ret = rte_event_eth_rx_adapter_create(rx_adptr_id, event_d_id,
+ &evt_rsrc->def_p_conf);
+ if (ret)
+ rte_panic("Failed to create rx adapter\n");
+
+ /* Configure user requested sched type */
+ eth_q_conf.ev.sched_type = evt_rsrc->sched_type;
+ RTE_ETH_FOREACH_DEV(port_id) {
+ if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+ continue;
+ eth_q_conf.ev.queue_id = evt_rsrc->evq.event_q_id[i];
+ ret = rte_event_eth_rx_adapter_queue_add(rx_adptr_id, port_id,
+-1, ð_q_conf);
+ if (ret)
+ rte_panic("Failed to add queues to Rx adapter\n");
+ if (i < evt_rsrc->evq.nb_queues)
+ i++;
+ }
+
+ ret = rte_event_eth_rx_adapter_service_id_get(rx_adptr_id, &service_id);
+ if (ret != -ESRCH && ret != 0)
+ rte_panic("Error getting the service ID for rx adptr\n");
+
+ rte_service_runstate_set(service_id, 1);
+ rte_service_set_runstate_mapped_check(service_id, 0);
+ evt_rsrc->rx_adptr.service_id = service_id;
+
+ ret = rte_event_eth_rx_adapter_start(rx_adptr_id);
+ if (ret)
+ rte_panic("Rx adapter[%d] start Failed\n", rx_adptr_id);
+
+ evt_rsrc->rx_adptr.rx_adptr[0] = rx_adptr_id;
+
+ /* Tx adapter setup */
+ evt_rsrc->tx_adptr.nb_tx_adptr = 1;
+ evt_rsrc->tx_adptr.tx_adptr = (uint8_t *)malloc(sizeof(uint8_t) *
+ evt_rsrc->tx_adptr.nb_tx_adptr);
+ if (!evt_rsrc->tx_adptr.tx_adptr) {
+ free(evt_rsrc->rx_adptr.rx_adptr);
+ free(evt_rsrc->evp.event_p_id);
+ free(evt_rsrc->evq.event_q_id);
+ rte_panic("Failed to allocate memery for Rx adapter\n");
+ }
+
+ ret = rte_event_eth_tx_adapter_create(tx_adptr_id, event_d_id,
+ &evt_rsrc->def_p_conf);
+ if (ret)
+ rte_panic("Failed to create tx adapter\n");
+
+ RTE_ETH_FOREACH_DEV(port_id) {
+ if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+ continue;
+ ret = rte_event_eth_tx_adapter_queue_add(tx_adptr_id, port_id,
+-1);
+ if (ret)
+ rte_pan
[dpdk-dev] [PATCH v2 03/11] examples/l3fwd: add event device configuration
From: Pavan Nikhilesh
Add event device configuration based on the capabilities of the
probed event device.
Signed-off-by: Pavan Nikhilesh
---
examples/l3fwd/l3fwd_event.c | 3 +
examples/l3fwd/l3fwd_event.h | 36 ++
examples/l3fwd/l3fwd_event_generic.c | 75 -
examples/l3fwd/l3fwd_event_internal_port.c | 78 +-
4 files changed, 190 insertions(+), 2 deletions(-)
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index a76195a1f..a027e150d 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -103,4 +103,7 @@ l3fwd_event_resource_setup(void)
/* Setup eventdev capability callbacks */
l3fwd_event_capability_setup();
+
+ /* Event device configuration */
+ evt_rsrc->ops.event_device_setup();
}
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index edb0c9d45..5aac0b06c 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -8,6 +8,7 @@
#include
#include
#include
+#include
#include
#include "l3fwd.h"
@@ -26,6 +27,29 @@ typedef void (*event_port_setup_cb)(void);
typedef void (*adapter_setup_cb)(void);
typedef int (*event_loop_cb)(void *);
+struct l3fwd_event_queues {
+ uint8_t *event_q_id;
+ uint8_t nb_queues;
+};
+
+struct l3fwd_event_ports {
+ uint8_t *event_p_id;
+ uint8_t nb_ports;
+ rte_spinlock_t lock;
+};
+
+struct l3fwd_event_rx_adptr {
+ uint32_t service_id;
+ uint8_t nb_rx_adptr;
+ uint8_t *rx_adptr;
+};
+
+struct l3fwd_event_tx_adptr {
+ uint32_t service_id;
+ uint8_t nb_tx_adptr;
+ uint8_t *tx_adptr;
+};
+
struct l3fwd_event_setup_ops {
event_device_setup_cb event_device_setup;
event_queue_setup_cb event_queue_setup;
@@ -36,9 +60,21 @@ struct l3fwd_event_setup_ops {
};
struct l3fwd_event_resources {
+ struct rte_event_port_conf def_p_conf;
+ struct l3fwd_event_rx_adptr rx_adptr;
+ struct l3fwd_event_tx_adptr tx_adptr;
+ uint8_t disable_implicit_release;
struct l3fwd_event_setup_ops ops;
+ struct rte_mempool * (*pkt_pool)[NB_SOCKETS];
+ struct l3fwd_event_queues evq;
+ struct l3fwd_event_ports evp;
+ uint32_t port_mask;
+ uint8_t per_port_pool;
+ uint8_t event_d_id;
uint8_t sched_type;
uint8_t tx_mode_q;
+ uint8_t deq_depth;
+ uint8_t has_burst;
uint8_t enabled;
uint8_t nb_args;
char **args;
diff --git a/examples/l3fwd/l3fwd_event_generic.c
b/examples/l3fwd/l3fwd_event_generic.c
index 6e228dbba..d748dcef9 100644
--- a/examples/l3fwd/l3fwd_event_generic.c
+++ b/examples/l3fwd/l3fwd_event_generic.c
@@ -5,8 +5,81 @@
#include "l3fwd.h"
#include "l3fwd_event.h"
+static uint32_t
+l3fwd_event_device_setup_generic(void)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ struct rte_event_dev_config event_d_conf = {
+ .nb_events_limit = 4096,
+ .nb_event_queue_flows = 1024,
+ .nb_event_port_dequeue_depth = 128,
+ .nb_event_port_enqueue_depth = 128
+ };
+ struct rte_event_dev_info dev_info;
+ const uint8_t event_d_id = 0; /* Always use first event device only */
+ uint32_t event_queue_cfg = 0;
+ uint16_t ethdev_count = 0;
+ uint16_t num_workers = 0;
+ uint16_t port_id;
+ int ret;
+
+ RTE_ETH_FOREACH_DEV(port_id) {
+ if ((evt_rsrc->port_mask & (1 << port_id)) == 0)
+ continue;
+ ethdev_count++;
+ }
+
+ /* Event device configurtion */
+ rte_event_dev_info_get(event_d_id, &dev_info);
+ evt_rsrc->disable_implicit_release = !!(dev_info.event_dev_cap &
+ RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE);
+
+ if (dev_info.event_dev_cap & RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES)
+ event_queue_cfg |= RTE_EVENT_QUEUE_CFG_ALL_TYPES;
+
+ /* One queue for each ethdev port + one Tx adapter Single link queue. */
+ event_d_conf.nb_event_queues = ethdev_count + 1;
+ if (dev_info.max_event_queues < event_d_conf.nb_event_queues)
+ event_d_conf.nb_event_queues = dev_info.max_event_queues;
+
+ if (dev_info.max_num_events < event_d_conf.nb_events_limit)
+ event_d_conf.nb_events_limit = dev_info.max_num_events;
+
+ if (dev_info.max_event_queue_flows < event_d_conf.nb_event_queue_flows)
+ event_d_conf.nb_event_queue_flows =
+ dev_info.max_event_queue_flows;
+
+ if (dev_info.max_event_port_dequeue_depth <
+ event_d_conf.nb_event_port_dequeue_depth)
+ event_d_conf.nb_event_port_dequeue_depth =
+ dev_info.max_event_port_dequeue_depth;
+
+ if (dev_
[dpdk-dev] [PATCH v2 09/11] examples/l3fwd: add event em main loop
From: Pavan Nikhilesh
Add em main loop for handling events based on capabilities of the
event device.
Signed-off-by: Pavan Nikhilesh
---
examples/l3fwd/l3fwd.h | 10 ++
examples/l3fwd/l3fwd_em.c| 177 +++
examples/l3fwd/l3fwd_em.h| 159 +---
examples/l3fwd/l3fwd_em_hlm.h| 131
examples/l3fwd/l3fwd_em_sequential.h | 26
examples/l3fwd/l3fwd_event.c | 9 ++
examples/l3fwd/main.c| 5 +-
7 files changed, 470 insertions(+), 47 deletions(-)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index 8f2e4be23..2d02fa731 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -221,6 +221,16 @@ lpm_event_main_loop_tx_q(__attribute__((unused)) void
*dummy);
int
lpm_event_main_loop_tx_q_burst(__attribute__((unused)) void *dummy);
+int
+em_event_main_loop_tx_d(__attribute__((unused)) void *dummy);
+int
+em_event_main_loop_tx_d_burst(__attribute__((unused)) void *dummy);
+int
+em_event_main_loop_tx_q(__attribute__((unused)) void *dummy);
+int
+em_event_main_loop_tx_q_burst(__attribute__((unused)) void *dummy);
+
+
/* Return ipv4/ipv6 fwd lookup struct for LPM or EM. */
void *
em_get_ipv4_l3fwd_lookup_struct(const int socketid);
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 74a7c8fa4..1a8bc9168 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -26,6 +26,7 @@
#include
#include "l3fwd.h"
+#include "l3fwd_event.h"
#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_CRC32)
#define EM_HASH_CRC 1
@@ -699,6 +700,182 @@ em_main_loop(__attribute__((unused)) void *dummy)
return 0;
}
+static __rte_always_inline void
+em_event_loop_single(struct l3fwd_event_resources *evt_rsrc,
+ const uint8_t flags)
+{
+ const int event_p_id = l3fwd_get_free_event_port(evt_rsrc);
+ const uint8_t tx_q_id = evt_rsrc->evq.event_q_id[
+ evt_rsrc->evq.nb_queues - 1];
+ const uint8_t event_d_id = evt_rsrc->event_d_id;
+ struct lcore_conf *lconf;
+ unsigned int lcore_id;
+ struct rte_event ev;
+
+ if (event_p_id < 0)
+ return;
+
+ lcore_id = rte_lcore_id();
+ lconf = &lcore_conf[lcore_id];
+
+ RTE_LOG(INFO, L3FWD, "entering %s on lcore %u\n", __func__, lcore_id);
+ while (!force_quit) {
+ if (!rte_event_dequeue_burst(event_d_id, event_p_id, &ev, 1, 0))
+ continue;
+
+ struct rte_mbuf *mbuf = ev.mbuf;
+
+#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON
+ mbuf->port = em_get_dst_port(lconf, mbuf, mbuf->port);
+ process_packet(mbuf, &mbuf->port);
+#else
+ l3fwd_em_simple_process(mbuf, lconf);
+#endif
+ if (mbuf->port == BAD_PORT) {
+ rte_pktmbuf_free(mbuf);
+ continue;
+ }
+
+ if (flags & L3FWD_EVENT_TX_ENQ) {
+ ev.queue_id = tx_q_id;
+ ev.op = RTE_EVENT_OP_FORWARD;
+ while (rte_event_enqueue_burst(event_d_id, event_p_id,
+ &ev, 1) && !force_quit)
+ ;
+ }
+
+ if (flags & L3FWD_EVENT_TX_DIRECT) {
+ rte_event_eth_tx_adapter_txq_set(mbuf, 0);
+ while (!rte_event_eth_tx_adapter_enqueue(event_d_id,
+ event_p_id, &ev, 1, 0) &&
+ !force_quit)
+ ;
+ }
+ }
+}
+
+static __rte_always_inline void
+em_event_loop_burst(struct l3fwd_event_resources *evt_rsrc,
+ const uint8_t flags)
+{
+ const int event_p_id = l3fwd_get_free_event_port(evt_rsrc);
+ const uint8_t tx_q_id = evt_rsrc->evq.event_q_id[
+ evt_rsrc->evq.nb_queues - 1];
+ const uint8_t event_d_id = evt_rsrc->event_d_id;
+ const uint16_t deq_len = evt_rsrc->deq_depth;
+ struct rte_event events[MAX_PKT_BURST];
+ struct lcore_conf *lconf;
+ unsigned int lcore_id;
+ int i, nb_enq, nb_deq;
+
+ if (event_p_id < 0)
+ return;
+
+ lcore_id = rte_lcore_id();
+
+ lconf = &lcore_conf[lcore_id];
+
+ RTE_LOG(INFO, L3FWD, "entering %s on lcore %u\n", __func__, lcore_id);
+
+ while (!force_quit) {
+ /* Read events from RX queues */
+ nb_deq = rte_event_dequeue_burst(event_d_id, event_p_id,
+ events, deq_len, 0);
+ if (nb_deq == 0) {
+ rte_pause();
+ continue;
+ }
+
+#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON
+ l3fwd_em_process_events(nb_deq, (struct rte_event **)&event
[dpdk-dev] [PATCH v2 11/11] doc: update l3fwd user guide to support eventdev
From: Pavan Nikhilesh Update l3fwd user guide to include event device related information. Signed-off-by: Pavan Nikhilesh --- doc/guides/sample_app_ug/l3_forward.rst | 76 +++-- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 4cb4b18da..e86c4dfd5 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -4,16 +4,23 @@ L3 Forwarding Sample Application -The L3 Forwarding application is a simple example of packet processing using the DPDK. +The L3 Forwarding application is a simple example of packet processing using +DPDK to demonstrate usage of poll and event mode packet I/O mechanism. The application performs L3 forwarding. Overview -The application demonstrates the use of the hash and LPM libraries in the DPDK to implement packet forwarding. -The initialization and run-time paths are very similar to those of the :doc:`l2_forward_real_virtual`. -The main difference from the L2 Forwarding sample application is that the forwarding decision -is made based on information read from the input packet. +The application demonstrates the use of the hash and LPM libraries in the DPDK +to implement packet forwarding using poll or event mode PMDs for packet I/O. +The initialization and run-time paths are very similar to those of the +:doc:`l2_forward_real_virtual` and :doc:`l2_forward_event_real_virtual`. +The main difference from the L2 Forwarding sample application is that optionally +packet can be Rx/Tx from/to eventdev instead of port directly and forwarding +decision is made based on information read from the input packet. + +Eventdev can optionally use S/W or H/W (if supported by platform) scheduler +implementation for packet I/O based on run time parameters. The lookup method is either hash-based or LPM-based and is selected at run time. When the selected lookup method is hash-based, a hash object is used to emulate the flow classification stage. @@ -56,6 +63,8 @@ The application has a number of command line options:: [--ipv6] [--parse-ptype] [--per-port-pool] + [--mode] + [--eventq-sched] Where, @@ -86,6 +95,11 @@ Where, * ``--per-port-pool:`` Optional, set to use independent buffer pools per port. Without this option, single buffer pool is used for all ports. +* ``--mode:`` Optional, Packet transfer mode for I/O, poll or eventdev. + +* ``--eventq-sched:`` Optional, Event queue synchronization method, Ordered or Atomic. Only valid if --mode=eventdev. + + For example, consider a dual processor socket platform with 8 physical cores, where cores 0-7 and 16-23 appear on socket 0, while cores 8-15 and 24-31 appear on socket 1. @@ -116,6 +130,51 @@ In this command: | | | | | +--+---+---+-+ +To use eventdev mode with sync method **ordered** on above mentioned environment, +Following is the sample command: + +.. code-block:: console + +./build/l3fwd -l 0-3 -n 4 -w -- -p 0x3 --eventq-sched=ordered + +or + +.. code-block:: console + +./build/l3fwd -l 0-3 -n 4 -w -- -p 0x03 --mode=eventdev --eventq-sched=ordered + +In this command: + +* -w option whitelist the event device supported by platform. Way to pass this device may vary based on platform. + +* The --mode option defines PMD to be used for packet I/O. + +* The --eventq-sched option enables synchronization menthod of event queue so that packets will be scheduled accordingly. + +If application uses S/W scheduler, it uses following DPDK services: + +* Software scheduler +* Rx adapter service function +* Tx adapter service function + +Application needs service cores to run above mentioned services. Service cores +must be provided as EAL parameters along with the --vdev=event_sw0 to enable S/W +scheduler. Following is the sample command: + +.. code-block:: console + +./build/l3fwd -l 0-7 -s 0-3 -n 4 --vdev event_sw0 -- -p 0x3 --mode=eventdev --eventq-sched=ordered + +In case of eventdev mode, *--config* option is not used for ethernet port +configuration. Instead each ethernet port will be configured with mentioned +setup: + +* Single Rx/Tx queue + +* Each Rx queue will be connected to event queue via Rx adapter. + +* Each Tx queue will be connected via Tx adapter. + Refer to the *DPDK Getting Started Guide* for general information on running applications and the Environment Abstraction Layer (EAL) options. @@ -125,7 +184,7 @@ Explanation --- The following sections provide some explanation of the sample application code. As mentioned in the overview section, -the initialization and run-time paths a
[dpdk-dev] [PATCH v2 10/11] examples/l3fwd: add graceful teardown for eventdevice
From: Pavan Nikhilesh
Add graceful teardown that addresses both event mode and poll mode.
Signed-off-by: Pavan Nikhilesh
---
examples/l3fwd/main.c | 49 ++-
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 0ae64dd41..68998f42c 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -920,7 +920,7 @@ main(int argc, char **argv)
struct lcore_conf *qconf;
struct rte_eth_dev_info dev_info;
struct rte_eth_txconf *txconf;
- int ret;
+ int i, ret;
unsigned nb_ports;
uint16_t queueid, portid;
unsigned lcore_id;
@@ -1195,27 +1195,46 @@ main(int argc, char **argv)
}
}
-
check_all_ports_link_status(enabled_port_mask);
ret = 0;
/* launch per-lcore init on every lcore */
rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MASTER);
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
- if (rte_eal_wait_lcore(lcore_id) < 0) {
- ret = -1;
- break;
+ if (evt_rsrc->enabled) {
+ for (i = 0; i < evt_rsrc->rx_adptr.nb_rx_adptr; i++)
+ rte_event_eth_rx_adapter_stop(
+ evt_rsrc->rx_adptr.rx_adptr[i]);
+ for (i = 0; i < evt_rsrc->tx_adptr.nb_tx_adptr; i++)
+ rte_event_eth_tx_adapter_stop(
+ evt_rsrc->tx_adptr.tx_adptr[i]);
+
+ RTE_ETH_FOREACH_DEV(portid) {
+ if ((enabled_port_mask & (1 << portid)) == 0)
+ continue;
+ rte_eth_dev_stop(portid);
}
- }
- /* stop ports */
- RTE_ETH_FOREACH_DEV(portid) {
- if ((enabled_port_mask & (1 << portid)) == 0)
- continue;
- printf("Closing port %d...", portid);
- rte_eth_dev_stop(portid);
- rte_eth_dev_close(portid);
- printf(" Done\n");
+ rte_eal_mp_wait_lcore();
+ RTE_ETH_FOREACH_DEV(portid) {
+ if ((enabled_port_mask & (1 << portid)) == 0)
+ continue;
+ rte_eth_dev_close(portid);
+ }
+
+ rte_event_dev_stop(evt_rsrc->event_d_id);
+ rte_event_dev_close(evt_rsrc->event_d_id);
+
+ } else {
+ rte_eal_mp_wait_lcore();
+
+ RTE_ETH_FOREACH_DEV(portid) {
+ if ((enabled_port_mask & (1 << portid)) == 0)
+ continue;
+ printf("Closing port %d...", portid);
+ rte_eth_dev_stop(portid);
+ rte_eth_dev_close(portid);
+ printf(" Done\n");
+ }
}
printf("Bye...\n");
--
2.17.1
[dpdk-dev] [PATCH v2 07/11] examples/l3fwd: add service core setup based on caps
From: Pavan Nikhilesh
Add service core setup when eventdev and Rx/Tx adapter don't have
internal port capability.
Signed-off-by: Pavan Nikhilesh
---
examples/l3fwd/l3fwd_event.c | 6 +++
examples/l3fwd/main.c| 93
2 files changed, 99 insertions(+)
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 3a43f30a3..0e796f003 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -236,6 +236,7 @@ l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
{
struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
uint32_t event_queue_cfg;
+ int ret;
/* Parse eventdev command line options */
l3fwd_parse_eventdev_args(evt_rsrc->args, evt_rsrc->nb_args);
@@ -262,4 +263,9 @@ l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
/* Rx/Tx adapters configuration */
evt_rsrc->ops.adapter_setup();
+
+ /* Start event device */
+ ret = rte_event_dev_start(evt_rsrc->event_d_id);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE, "Error in starting eventdev");
}
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 20df12748..69d212bc2 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -826,6 +826,93 @@ prepare_ptype_parser(uint16_t portid, uint16_t queueid)
return 0;
}
+static inline int
+l3fwd_service_enable(uint32_t service_id)
+{
+ uint8_t min_service_count = UINT8_MAX;
+ uint32_t slcore_array[RTE_MAX_LCORE];
+ unsigned int slcore = 0;
+ uint8_t service_count;
+ int32_t slcore_count;
+
+ if (!rte_service_lcore_count())
+ return -ENOENT;
+
+ slcore_count = rte_service_lcore_list(slcore_array, RTE_MAX_LCORE);
+ if (slcore_count < 0)
+ return -ENOENT;
+ /* Get the core which has least number of services running. */
+ while (slcore_count--) {
+ /* Reset default mapping */
+ rte_service_map_lcore_set(service_id,
+ slcore_array[slcore_count], 0);
+ service_count = rte_service_lcore_count_services(
+ slcore_array[slcore_count]);
+ if (service_count < min_service_count) {
+ slcore = slcore_array[slcore_count];
+ min_service_count = service_count;
+ }
+ }
+ if (rte_service_map_lcore_set(service_id, slcore, 1))
+ return -ENOENT;
+ rte_service_lcore_start(slcore);
+
+ return 0;
+}
+
+static void
+l3fwd_event_service_setup(void)
+{
+ struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ struct rte_event_dev_info evdev_info;
+ uint32_t service_id, caps;
+ int ret, i;
+
+ rte_event_dev_info_get(evt_rsrc->event_d_id, &evdev_info);
+ if (evdev_info.event_dev_cap & RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED) {
+ ret = rte_event_dev_service_id_get(evt_rsrc->event_d_id,
+ &service_id);
+ if (ret != -ESRCH && ret != 0)
+ rte_exit(EXIT_FAILURE,
+"Error in starting eventdev service\n");
+ l3fwd_service_enable(service_id);
+ }
+
+ for (i = 0; i < evt_rsrc->rx_adptr.nb_rx_adptr; i++) {
+ ret = rte_event_eth_rx_adapter_caps_get(evt_rsrc->event_d_id,
+ evt_rsrc->rx_adptr.rx_adptr[i], &caps);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+"Failed to get Rx adapter[%d] caps\n",
+evt_rsrc->rx_adptr.rx_adptr[i]);
+ ret = rte_event_eth_rx_adapter_service_id_get(
+ evt_rsrc->event_d_id,
+ &service_id);
+ if (ret != -ESRCH && ret != 0)
+ rte_exit(EXIT_FAILURE,
+"Error in starting Rx adapter[%d] service\n",
+evt_rsrc->rx_adptr.rx_adptr[i]);
+ l3fwd_service_enable(service_id);
+ }
+
+ for (i = 0; i < evt_rsrc->tx_adptr.nb_tx_adptr; i++) {
+ ret = rte_event_eth_tx_adapter_caps_get(evt_rsrc->event_d_id,
+ evt_rsrc->tx_adptr.tx_adptr[i], &caps);
+ if (ret < 0)
+ rte_exit(EXIT_FAILURE,
+"Failed to get Rx adapter[%d] caps\n",
+evt_rsrc->tx_adptr.tx_adptr[i]);
+ ret = rte_event_eth_tx_adapter_service_id_get(
+ evt_rsrc->event_d_id,
+ &service_id);
+ if (ret != -ESRCH && ret != 0)
+ rte_exit(EXIT_FAILURE,
+"Error in starting Rx adapter[%d] serv
[dpdk-dev] [PATCH v2 08/11] examples/l3fwd: add event lpm main loop
From: Pavan Nikhilesh
Add lpm main loop for handling events based on capabilities of the
event device.
Signed-off-by: Pavan Nikhilesh
---
examples/l3fwd/l3fwd.h | 9 ++
examples/l3fwd/l3fwd_event.c | 9 ++
examples/l3fwd/l3fwd_event.h | 5 +
examples/l3fwd/l3fwd_lpm.c | 231 +++
examples/l3fwd/main.c| 10 +-
5 files changed, 260 insertions(+), 4 deletions(-)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index 6d16cde74..8f2e4be23 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -212,6 +212,15 @@ em_main_loop(__attribute__((unused)) void *dummy);
int
lpm_main_loop(__attribute__((unused)) void *dummy);
+int
+lpm_event_main_loop_tx_d(__attribute__((unused)) void *dummy);
+int
+lpm_event_main_loop_tx_d_burst(__attribute__((unused)) void *dummy);
+int
+lpm_event_main_loop_tx_q(__attribute__((unused)) void *dummy);
+int
+lpm_event_main_loop_tx_q_burst(__attribute__((unused)) void *dummy);
+
/* Return ipv4/ipv6 fwd lookup struct for LPM or EM. */
void *
em_get_ipv4_l3fwd_lookup_struct(const int socketid);
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 0e796f003..c7de046e3 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -235,6 +235,12 @@ void
l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
{
struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
+ const event_loop_cb lpm_event_loop[2][2] = {
+ [0][0] = lpm_event_main_loop_tx_d,
+ [0][1] = lpm_event_main_loop_tx_d_burst,
+ [1][0] = lpm_event_main_loop_tx_q,
+ [1][1] = lpm_event_main_loop_tx_q_burst,
+ };
uint32_t event_queue_cfg;
int ret;
@@ -268,4 +274,7 @@ l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
ret = rte_event_dev_start(evt_rsrc->event_d_id);
if (ret < 0)
rte_exit(EXIT_FAILURE, "Error in starting eventdev");
+
+ evt_rsrc->ops.lpm_event_loop = lpm_event_loop[evt_rsrc->tx_mode_q]
+ [evt_rsrc->has_burst];
}
diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
index 9d8bd5a36..fcc0ce51a 100644
--- a/examples/l3fwd/l3fwd_event.h
+++ b/examples/l3fwd/l3fwd_event.h
@@ -14,6 +14,11 @@
#include "l3fwd.h"
+#define L3FWD_EVENT_SINGLE 0x1
+#define L3FWD_EVENT_BURST 0x2
+#define L3FWD_EVENT_TX_DIRECT 0x4
+#define L3FWD_EVENT_TX_ENQ 0x8
+
#define CMD_LINE_OPT_MODE "mode"
#define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 349de2703..c4669d6d5 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -28,6 +28,7 @@
#include
#include "l3fwd.h"
+#include "l3fwd_event.h"
struct ipv4_l3fwd_lpm_route {
uint32_t ip;
@@ -254,6 +255,236 @@ lpm_main_loop(__attribute__((unused)) void *dummy)
return 0;
}
+static __rte_always_inline void
+lpm_event_loop_single(struct l3fwd_event_resources *evt_rsrc,
+ const uint8_t flags)
+{
+ const int event_p_id = l3fwd_get_free_event_port(evt_rsrc);
+ const uint8_t tx_q_id = evt_rsrc->evq.event_q_id[
+ evt_rsrc->evq.nb_queues - 1];
+ const uint8_t event_d_id = evt_rsrc->event_d_id;
+ struct lcore_conf *lconf;
+ unsigned int lcore_id;
+ struct rte_event ev;
+
+ if (event_p_id < 0)
+ return;
+
+ lcore_id = rte_lcore_id();
+ lconf = &lcore_conf[lcore_id];
+
+ RTE_LOG(INFO, L3FWD, "entering %s on lcore %u\n", __func__, lcore_id);
+ while (!force_quit) {
+ if (!rte_event_dequeue_burst(event_d_id, event_p_id, &ev, 1, 0))
+ continue;
+
+ struct rte_mbuf *mbuf = ev.mbuf;
+ mbuf->port = lpm_get_dst_port(lconf, mbuf, mbuf->port);
+
+#if defined RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON \
+ || defined RTE_ARCH_PPC_64
+ process_packet(mbuf, &mbuf->port);
+#else
+
+ struct rte_ether_hdr *eth_hdr = rte_pktmbuf_mtod(mbuf,
+ struct rte_ether_hdr *);
+#ifdef DO_RFC_1812_CHECKS
+ struct rte_ipv4_hdr *ipv4_hdr;
+ if (RTE_ETH_IS_IPV4_HDR(mbuf->packet_type)) {
+ /* Handle IPv4 headers.*/
+ ipv4_hdr = rte_pktmbuf_mtod_offset(mbuf,
+ struct rte_ipv4_hdr *,
+ sizeof(struct rte_ether_hdr));
+
+ if (is_valid_ipv4_pkt(ipv4_hdr, mbuf->pkt_len)
+ < 0) {
+ mbuf->port = BAD_PORT;
+ continue;
+ }
+ /* Update time to live and header checksum */
+
[dpdk-dev] [PATCH] eal/linux: fix build error on RHEL 7.6
Previous fix gives hiccups to gcc on RHEL 7.6:
== Build lib/librte_eal/linux/eal
CC eal_interrupts.o
...lib/librte_eal/linux/eal/eal_interrupts.c: In function
‘eal_intr_thread_main’:
...lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing
initializer for field ‘events’ of ‘struct epoll_event’
[-Werror=missing-field-initializers]
struct epoll_event ev = { };
^
In file included from ...lib/librte_eal/linux/eal/eal_interrupts.c:15:0:
/usr/include/sys/epoll.h:89:12: note: ‘events’ declared here
uint32_t events; /* Epoll events */
^
...lib/librte_eal/linux/eal/eal_interrupts.c: At top level:
cc1: error: unrecognized command line option
"-Wno-address-of-packed-member" [-Werror]
cc1: all warnings being treated as errors
Fixes: e0ab8020ac2a ("eal/linux: fix uninitialized data valgrind warning")
Cc: sta...@dpdk.org
Reported-by: Andrew Rybchenko
Signed-off-by: David Marchand
---
lib/librte_eal/linux/eal/eal_interrupts.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c
b/lib/librte_eal/linux/eal/eal_interrupts.c
index 2cd537ba4..14ebb108c 100644
--- a/lib/librte_eal/linux/eal/eal_interrupts.c
+++ b/lib/librte_eal/linux/eal/eal_interrupts.c
@@ -1045,8 +1045,6 @@ eal_intr_handle_interrupts(int pfd, unsigned totalfds)
static __attribute__((noreturn)) void *
eal_intr_thread_main(__rte_unused void *arg)
{
- struct epoll_event ev = { };
-
/* host thread, never break out */
for (;;) {
/* build up the epoll fd with all descriptors we are to
@@ -1078,8 +1076,11 @@ eal_intr_thread_main(__rte_unused void *arg)
rte_spinlock_lock(&intr_lock);
TAILQ_FOREACH(src, &intr_sources, next) {
+ struct epoll_event ev;
+
if (src->callbacks.tqh_first == NULL)
continue; /* skip those with no callbacks */
+ memset(&ev, 0, sizeof(ev));
ev.events = EPOLLIN | EPOLLPRI | EPOLLRDHUP | EPOLLHUP;
ev.data.fd = src->intr_handle.fd;
--
2.23.0
[dpdk-dev] [PATCH] vhost: Add dynamic logging system
Currently there are a couple of limitations on the logging system: Most
of the logs are compiled out and both datapath and controlpath logs
share the same loglevel.
This patch tries to help fix that situation by:
- Splitting control plane and data plane logs
- Making control plane logs dynamic while keeping data plane logs
compiled out by default for log levels lower than the INFO.
As a result, two macros are introduced:
- VHOST_LOG_CONFIG(LEVEL, ...): Config path logging. Level can be
dynamically controlled by "lib.vhost.config"
- VHOST_LOG_DATA(LEVEL, ...): Data path logging. Level can be dynamically
controlled by "lib.vhost.data". Every log macro with a level lower than
RTE_LOG_DP_LEVEL (which defaults to RTE_LOG_INFO) will be compiled out.
Signed-off-by: Adrian Moreno
Fixes: 1c01d52392d5 ("vhost: add debug print")
Cc: huawei@intel.com
Cc: maxime.coque...@redhat.com
---
lib/librte_vhost/iotlb.c | 10 +-
lib/librte_vhost/socket.c | 84 ++---
lib/librte_vhost/vhost.c | 34 --
lib/librte_vhost/vhost.h | 24 ++--
lib/librte_vhost/vhost_user.c | 218 +-
lib/librte_vhost/virtio_net.c | 38 +++---
6 files changed, 214 insertions(+), 194 deletions(-)
diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c
index 4a1d8c125..bc1758528 100644
--- a/lib/librte_vhost/iotlb.c
+++ b/lib/librte_vhost/iotlb.c
@@ -70,14 +70,14 @@ vhost_user_iotlb_pending_insert(struct vhost_virtqueue *vq,
ret = rte_mempool_get(vq->iotlb_pool, (void **)&node);
if (ret) {
- RTE_LOG(DEBUG, VHOST_CONFIG, "IOTLB pool empty, clear
entries\n");
+ VHOST_LOG_CONFIG(DEBUG, "IOTLB pool empty, clear entries\n");
if (!TAILQ_EMPTY(&vq->iotlb_pending_list))
vhost_user_iotlb_pending_remove_all(vq);
else
vhost_user_iotlb_cache_random_evict(vq);
ret = rte_mempool_get(vq->iotlb_pool, (void **)&node);
if (ret) {
- RTE_LOG(ERR, VHOST_CONFIG, "IOTLB pool still empty,
failure\n");
+ VHOST_LOG_CONFIG(ERR, "IOTLB pool still empty,
failure\n");
return;
}
}
@@ -163,14 +163,14 @@ vhost_user_iotlb_cache_insert(struct vhost_virtqueue *vq,
uint64_t iova,
ret = rte_mempool_get(vq->iotlb_pool, (void **)&new_node);
if (ret) {
- RTE_LOG(DEBUG, VHOST_CONFIG, "IOTLB pool empty, clear
entries\n");
+ VHOST_LOG_CONFIG(DEBUG, "IOTLB pool empty, clear entries\n");
if (!TAILQ_EMPTY(&vq->iotlb_list))
vhost_user_iotlb_cache_random_evict(vq);
else
vhost_user_iotlb_pending_remove_all(vq);
ret = rte_mempool_get(vq->iotlb_pool, (void **)&new_node);
if (ret) {
- RTE_LOG(ERR, VHOST_CONFIG, "IOTLB pool still empty,
failure\n");
+ VHOST_LOG_CONFIG(ERR, "IOTLB pool still empty,
failure\n");
return;
}
}
@@ -323,7 +323,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index)
MEMPOOL_F_SP_PUT |
MEMPOOL_F_SC_GET);
if (!vq->iotlb_pool) {
- RTE_LOG(ERR, VHOST_CONFIG,
+ VHOST_LOG_CONFIG(ERR,
"Failed to create IOTLB cache pool (%s)\n",
pool_name);
return -1;
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index ebb2ff6c2..d7ab6155b 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -127,12 +127,12 @@ read_fd_message(int sockfd, char *buf, int buflen, int
*fds, int max_fds,
ret = recvmsg(sockfd, &msgh, 0);
if (ret <= 0) {
- RTE_LOG(ERR, VHOST_CONFIG, "recvmsg failed\n");
+ VHOST_LOG_CONFIG(ERR, "recvmsg failed\n");
return ret;
}
if (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC)) {
- RTE_LOG(ERR, VHOST_CONFIG, "truncated msg\n");
+ VHOST_LOG_CONFIG(ERR, "truncted msg\n");
return -1;
}
@@ -177,7 +177,7 @@ send_fd_message(int sockfd, char *buf, int buflen, int
*fds, int fd_num)
msgh.msg_controllen = sizeof(control);
cmsg = CMSG_FIRSTHDR(&msgh);
if (cmsg == NULL) {
- RTE_LOG(ERR, VHOST_CONFIG, "cmsg == NULL\n");
+ VHOST_LOG_CONFIG(ERR, "cmsg == NULL\n");
errno = EINVAL;
return -1;
}
@@ -195,7 +195,7 @@ send_fd_message(int sockfd, char *buf, int buflen, int
*fds, int fd_num)
} while (ret < 0 && errno == EINTR);
if (ret < 0) {
- RTE_LOG(ERR, VHOST_CONFIG, "sendmsg error\n");
+ VHOST_
Re: [dpdk-dev] [PATCH v3] kernel/linux: fix kernel dir for meson
On Wed, Dec 04, 2019 at 10:18:21PM +0800, Ye Xiaolong wrote:
> On 12/04, Luca Boccassi wrote:
> >On Tue, 2019-12-03 at 23:59 +0800, Xiaolong Ye wrote:
> >> kernel_dir option in meson build is equivalent to RTE_KERNELDIR in
> >> make
> >> system, for cross-compilation case, users would specify it as local
> >> kernel src dir like
> >>
> >> //target-arm_glibc/linux-arm/linux-4.19.81/
> >>
> >> Current meson build would fail to compile kernel module if user
> >> specify
> >> kernel_dir as above, this patch fixes this issue.
> >>
> >> After this change, for normal build case, user can specify
> >> /lib/modules/ or /lib/modules//build
> >> as
> >> kernel_dir. For cross compilation case, user can specify any
> >> directory
> >> that contains kernel source code as the kernel_dir.
> >>
> >> Fixes: 317832f97c16 ("kernel/linux: fix modules install path")
> >> Cc:
> >> sta...@dpdk.org
> >>
> >> Cc:
> >> iryz...@nfware.com
> >>
> >>
> >> Signed-off-by: Xiaolong Ye <
> >> xiaolong...@intel.com
> >
> >The convention used by upstream and all distros is that kernel headers
> >are in /build. Why can't the cross compilation case also
> >follow this convention, rather than adding complications to the
>
> Yes, cross-compilation can follow this convention, but one common case is that
> users download and put kernel src (the same kernel that's running in the
> target machine)
> to one arbitrary dir, he then use this dir as kernel_dir to build kernel
> modules,
> it's extra burden for users to create extra build dir to hold the kernel
> headers.
>
As part of the build of the kernel, do you not do a "modules_install" step,
which should set up things correctly for later builds?
/Bruce
Re: [dpdk-dev] [PATCH v2 00/11] example/l3fwd: introduce event device support
On Wed, Dec 4, 2019 at 8:13 PM wrote: > > From: Pavan Nikhilesh > > This patchset adds support for event mode in l3fwd. > The poll mode is still the default mode of operation. > > The following new command line parameters are added: > --mode: Dictates the mode of operation either poll or event. If unset then > by default poll mode is used. > --eventq_sched: Dictates event synchronization mode i.e. either ordered, > atomic or parallel. > > Based on event device capability the configuration is done as follows: > - A single event device is enabled. > - The number of event ports is equal to the number of worker > cores enabled in the core mask. Additional event ports might > be configured based on Rx/Tx adapter capability. > - The number of event queues is equal to the number of ethernet > ports. If Tx adapter doesn't have internal port capability then > an additional single link event queue is used to enqueue events > to Tx adapter. > - Each event port is linked to all existing event queues. > - Dedicated Rx/Tx adapters for each Ethernet port. > > v2 Changes: > -- > - Shorten the structure name `s/event_rsrc/evt_rsrc` `s/l2fwd_rsrc/rsrc`. > - Use rte_panic instead of rte_exit. > - Rebase on top of Tx adapter change http://patches.dpdk.org/patch/60971. > - Add parallel mode support. > - Fix missing eventdev args parsing. Since there is no maintainer for l3fwd and tech board decided to have a unified l3fwd application for poll mode and event mode, I request to have the review for the common code change(at least 8/11 and 9/11 patches). This series has been pushed from the last release to this release to have enough review. We would like to merge this patch for this release. Request a timely review.
Re: [dpdk-dev] [PATCH v2] net/i40e: always re-program promiscuous mode on VF interface
Any update on this patch? On 19 Nov 2019, at 14:45, Eelco Chaudron wrote: During a kernel PF reset, this event is propagated to the VF. The DPDK VF PMD will execute the reset task before the PF is done with his. This results in the admin queue message not being responded to leaving the port in "promiscuous" mode. This patch makes sure the promiscuous mode is configured independently of the current admin state. Signed-off-by: Eelco Chaudron --- v1-v2: In the earlier patch, we would force the vf->promisc_unicast_enabled state to false after a reset. Based on the review comments it was prefered to not take the current state into account when programming. v1 patch was called: net/i40e: force promiscuous state after VF reset drivers/net/i40e/i40e_ethdev_vf.c | 16 1 file changed, 16 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 5dba092..43f7ab5 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2162,10 +2162,6 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); int ret; - /* If enabled, just return */ - if (vf->promisc_unicast_enabled) - return 0; - ret = i40evf_config_promisc(dev, 1, vf->promisc_multicast_enabled); if (ret == 0) vf->promisc_unicast_enabled = TRUE; @@ -2181,10 +2177,6 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); int ret; - /* If disabled, just return */ - if (!vf->promisc_unicast_enabled) - return 0; - ret = i40evf_config_promisc(dev, 0, vf->promisc_multicast_enabled); if (ret == 0) vf->promisc_unicast_enabled = FALSE; @@ -2200,10 +2192,6 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); int ret; - /* If enabled, just return */ - if (vf->promisc_multicast_enabled) - return 0; - ret = i40evf_config_promisc(dev, vf->promisc_unicast_enabled, 1); if (ret == 0) vf->promisc_multicast_enabled = TRUE; @@ -2219,10 +2207,6 @@ static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); int ret; - /* If enabled, just return */ - if (!vf->promisc_multicast_enabled) - return 0; - ret = i40evf_config_promisc(dev, vf->promisc_unicast_enabled, 0); if (ret == 0) vf->promisc_multicast_enabled = FALSE;
[dpdk-dev] [PATCH] raw/ntb: fix write memory barrier issue
All buffers and ring info should be written before tail register update.
This patch relocates the write memory barrier before updating tail register
to avoid potential issues.
Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")
Cc: sta...@dpdk.org
Signed-off-by: Xiaoyun Li
---
drivers/raw/ntb/ntb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/ntb/ntb.c b/drivers/raw/ntb/ntb.c
index ad7f6abfd..dd0b72f8c 100644
--- a/drivers/raw/ntb/ntb.c
+++ b/drivers/raw/ntb/ntb.c
@@ -683,8 +683,8 @@ ntb_enqueue_bufs(struct rte_rawdev *dev,
sizeof(struct ntb_used) * nb1);
rte_memcpy(txq->tx_used_ring, tx_used + nb1,
sizeof(struct ntb_used) * nb2);
- *txq->used_cnt = txq->last_used;
rte_wmb();
+ *txq->used_cnt = txq->last_used;
/* update queue stats */
hw->ntb_xstats[NTB_TX_BYTES_ID + off] += bytes;
@@ -789,8 +789,8 @@ ntb_dequeue_bufs(struct rte_rawdev *dev,
sizeof(struct ntb_desc) * nb1);
rte_memcpy(rxq->rx_desc_ring, rx_desc + nb1,
sizeof(struct ntb_desc) * nb2);
- *rxq->avail_cnt = rxq->last_avail;
rte_wmb();
+ *rxq->avail_cnt = rxq->last_avail;
/* update queue stats */
off = NTB_XSTATS_NUM * ((size_t)context + 1);
--
2.17.1
[dpdk-dev] [PATCH] doc: fix a typo in ntb guide
In prerequisites of ntb guide, the correct flag when loading igb_uio
module should be `wc_activate=1`, not `wc_active=1`.
Fixes: 11b5c7daf019 ("raw/ntb: add enqueue and dequeue functions")
Cc: sta...@dpdk.org
Signed-off-by: Xiaoyun Li
---
doc/guides/rawdevs/ntb.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index 58472135f..aa7d80964 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -52,11 +52,11 @@ NTB PMD needs kernel PCI driver to support write combining
(WC) to get
better performance. The difference will be more than 10 times.
To enable WC, there are 2 ways.
-- Insert igb_uio with ``wc_active=1`` flag if use igb_uio driver.
+- Insert igb_uio with ``wc_activate=1`` flag if use igb_uio driver.
.. code-block:: console
- insmod igb_uio.ko wc_active=1
+ insmod igb_uio.ko wc_activate=1
- Enable WC for NTB device's Bar 2 and Bar 4 (Mapped memory) manually.
The reference is https://www.kernel.org/doc/html/latest/x86/mtrr.html
--
2.17.1
Re: [dpdk-dev] [PATCH] eal/linux: fix build error on RHEL 7.6
On Wed, 4 Dec 2019 16:00:02 +0100 David Marchand wrote: > + struct epoll_event ev; This needs to be initialized (like it was above) or it will cause warnings with valgrind about uninitialized data in system calls.
[dpdk-dev] [PATCH 1/5] app/test: add SPDX tag to timer test
This file was missing SPDX tag. Convert BSD boilerplate to license tag. Signed-off-by: Stephen Hemminger --- app/test/test_timer_racecond.c | 34 +++--- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/app/test/test_timer_racecond.c b/app/test/test_timer_racecond.c index a9e1daf16bf4..cf0bdd63c3df 100644 --- a/app/test/test_timer_racecond.c +++ b/app/test/test_timer_racecond.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2015 Akamai Technologies. - * 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. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2015 Akamai Technologies. + * All rights reserved. */ #include "test.h" -- 2.20.1
[dpdk-dev] [PATCH 2/5] devtools: add license tag to cocci.sh
This file still had original BSD boilerplate text. Replace it with SPDX tag. Signed-off-by: Stephen Hemminger --- devtools/cocci.sh | 30 +- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/devtools/cocci.sh b/devtools/cocci.sh index 8b17a8cebac3..77b7447cdfcd 100755 --- a/devtools/cocci.sh +++ b/devtools/cocci.sh @@ -1,34 +1,6 @@ #! /bin/sh - -# BSD LICENSE -# +# SPDX-License-Identifier: BSD-3-Clause # Copyright 2015 EZchip Semiconductor Ltd. -# -# 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 EZchip Semiconductor 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. # Apply coccinelle transforms. -- 2.20.1
[dpdk-dev] [PATCH 3/5] devtools: add SPDX tag to load-devel-config
Trivial file was missing any license. Signed-off-by: Stephen Hemminger --- devtools/load-devel-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devtools/load-devel-config b/devtools/load-devel-config index 380c79db41eb..ca1bc21b55e3 100644 --- a/devtools/load-devel-config +++ b/devtools/load-devel-config @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: BSD-3-Clause +# This file is intended to be sourced into shell # Load DPDK devel config and allow override # from system file test ! -r /etc/dpdk/devel.config || -- 2.20.1
[dpdk-dev] [PATCH 0/5] SPDX leftovers
These are tests and scripts with missing SPDX tags. Stephen Hemminger (5): app/test: add SPDX tag to timer test devtools: add license tag to cocci.sh devtools: add SPDX tag to load-devel-config examples/ipsecgw: add SPDX license tag examples/performance-thread: add mising SPDX tag app/test/test_timer_racecond.c| 34 ++- devtools/cocci.sh | 30 +--- devtools/load-devel-config| 2 ++ .../trs_aesgcm_inline_crypto_fallback_defs.sh | 1 + .../tun_aesgcm_inline_crypto_fallback_defs.sh | 1 + .../performance-thread/l3fwd-thread/test.sh | 2 ++ 6 files changed, 10 insertions(+), 60 deletions(-) -- 2.20.1
[dpdk-dev] [PATCH 5/5] examples/performance-thread: add mising SPDX tag
This example had no license. Signed-off-by: Stephen Hemminger --- examples/performance-thread/l3fwd-thread/test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/performance-thread/l3fwd-thread/test.sh b/examples/performance-thread/l3fwd-thread/test.sh index b7718b6223b0..43ff10b43082 100755 --- a/examples/performance-thread/l3fwd-thread/test.sh +++ b/examples/performance-thread/l3fwd-thread/test.sh @@ -1,4 +1,6 @@ #!/bin/bash +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2016 Intel Corporation case "$1" in -- 2.20.1
[dpdk-dev] [PATCH 4/5] examples/ipsecgw: add SPDX license tag
This trivial file had no license info.
Signed-off-by: Stephen Hemminger
---
.../ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh | 1 +
.../ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh | 1 +
2 files changed, 2 insertions(+)
diff --git
a/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
b/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
index 875a7457d3e8..f21b01d63546 100644
--- a/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
+++ b/examples/ipsec-secgw/test/trs_aesgcm_inline_crypto_fallback_defs.sh
@@ -1,4 +1,5 @@
#! /bin/bash
+# SPDX-License-Identifier: BSD-3-Clause
. ${DIR}/trs_aesgcm_defs.sh
diff --git
a/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
b/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
index 6968484323c2..97b9431f42a0 100644
--- a/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
+++ b/examples/ipsec-secgw/test/tun_aesgcm_inline_crypto_fallback_defs.sh
@@ -1,4 +1,5 @@
#! /bin/bash
+# SPDX-License-Identifier: BSD-3-Clause
. ${DIR}/tun_aesgcm_defs.sh
--
2.20.1
Re: [dpdk-dev] [PATCH] eal/linux: fix build error on RHEL 7.6
On Wed, Dec 4, 2019 at 4:37 PM Stephen Hemminger wrote: > > On Wed, 4 Dec 2019 16:00:02 +0100 > David Marchand wrote: > > > + struct epoll_event ev; > This needs to be initialized (like it was above) or it will cause > warnings with valgrind about uninitialized data in system calls. What is wrong with the memset? -- David Marchand
Re: [dpdk-dev] [PATCH] eal/linux: fix build error on RHEL 7.6
On Wed, 4 Dec 2019 16:00:02 +0100
David Marchand wrote:
> Previous fix gives hiccups to gcc on RHEL 7.6:
>
> == Build lib/librte_eal/linux/eal
> CC eal_interrupts.o
> ...lib/librte_eal/linux/eal/eal_interrupts.c: In function
> ‘eal_intr_thread_main’:
> ...lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing
> initializer for field ‘events’ of ‘struct epoll_event’
> [-Werror=missing-field-initializers]
> struct epoll_event ev = { };
> ^
> In file included from ...lib/librte_eal/linux/eal/eal_interrupts.c:15:0:
> /usr/include/sys/epoll.h:89:12: note: ‘events’ declared here
>uint32_t events; /* Epoll events */
> ^
> ...lib/librte_eal/linux/eal/eal_interrupts.c: At top level:
> cc1: error: unrecognized command line option
> "-Wno-address-of-packed-member" [-Werror]
> cc1: all warnings being treated as errors
>
> Fixes: e0ab8020ac2a ("eal/linux: fix uninitialized data valgrind warning")
> Cc: sta...@dpdk.org
>
> Reported-by: Andrew Rybchenko
> Signed-off-by: David Marchand
> ---
> lib/librte_eal/linux/eal/eal_interrupts.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_eal/linux/eal/eal_interrupts.c
> b/lib/librte_eal/linux/eal/eal_interrupts.c
> index 2cd537ba4..14ebb108c 100644
> --- a/lib/librte_eal/linux/eal/eal_interrupts.c
> +++ b/lib/librte_eal/linux/eal/eal_interrupts.c
> @@ -1045,8 +1045,6 @@ eal_intr_handle_interrupts(int pfd, unsigned totalfds)
> static __attribute__((noreturn)) void *
> eal_intr_thread_main(__rte_unused void *arg)
> {
> - struct epoll_event ev = { };
> -
> /* host thread, never break out */
> for (;;) {
> /* build up the epoll fd with all descriptors we are to
> @@ -1078,8 +1076,11 @@ eal_intr_thread_main(__rte_unused void *arg)
> rte_spinlock_lock(&intr_lock);
>
> TAILQ_FOREACH(src, &intr_sources, next) {
> + struct epoll_event ev;
> +
> if (src->callbacks.tqh_first == NULL)
> continue; /* skip those with no callbacks */
> + memset(&ev, 0, sizeof(ev));
> ev.events = EPOLLIN | EPOLLPRI | EPOLLRDHUP | EPOLLHUP;
> ev.data.fd = src->intr_handle.fd;
>
Never mind, memset does the same thing.
Not a fan of missing field initializer warnings.
Re: [dpdk-dev] [EXT] Re: [PATCH v2 1/4] eal: add API to check if its interrupt context
On Thu, Nov 28, 2019 at 08:45:42AM -0800, Stephen Hemminger wrote: > On Thu, 28 Nov 2019 08:10:23 + > Harman Kalra wrote: > > > On Wed, Nov 27, 2019 at 04:03:19PM -0800, Stephen Hemminger wrote: > > > External Email > > > > > > -- > > > On Wed, 27 Nov 2019 15:52:19 +0530 > > > Sunil Kumar Kori wrote: > > > > > > > > > > > +/** > > > > + * @warning > > > > + * @b EXPERIMENTAL: this API may change without prior notice > > > > + * > > > > + * Check if currently executing in interrupt context > > > > + * > > > > + * @return > > > > + * - positive in case of interrupt context > > > > + * - zero in case of process context > > > > + * - negative if unsuccessful > > > > + */ > > > > +__rte_experimental > > > > +int > > > > +rte_thread_is_intr(void); > > > > > > If you only need this in drivers, it should be internal not exposed > > > as part of API > > > > Sorry, but can you please help me understand the query. Do you mean: > > * Since "rte_thread_is_intr" would be used only used by > > libraries/drivers and not by any external application, rather having > > it in "rte_interrupt.h", we should have it in some internal header > > file like "eal_private.h" ?? > > > > ANS - Yes we can do that but since all other related APIs like > > "rte_intr_ack", "rte_intr_enable/disable" which are also used by > > drivers/lib and not application, are prototyped in "rte_interupt.h". > > > > OR do u mean > > * Since only octeontx2 driver is using this, why it is exposed as an API > > rather it should be defined as some driver internal function ?? > > > > ANS - "rte_thread_is_intr" is an counter part of "in_interrupt()" in > > DPDK, which will return whether the current execution is in interrupt > > context. This helps in dealing with nested interrupts case. We faced a > > similar case while handling hotplug probing initiated via secondary > > process. > > We believe this API could be very useful for many drivers which might > > end up in handling nested interrupts case. > > > > Thanks > > Harman > > What I meant was that some functions in EAL are documented as > being internal (flagged with @internal) and don't show up in > the documented API. > > My concern is that if we make this part of the public API, it makes > it harder to change structural things like the interrupt thread > later. The interrupt thread is already problematic for several > other usages. > I think now I understood your point, I will move prototype of this API to "common/include/rte_eal_interrupts.h", flag it as @internal and resend next version. I think this file was created for such APIs only as its description says. /** * @file rte_eal_interrupts.h * @internal * * Contains function prototypes exposed by the EAL for interrupt handling by * drivers and other DPDK internal consumers. */ Thanks Harman
Re: [dpdk-dev] [PATCH v2 02/17] net/ionic: add hardware structures definitions
> On 2 Dec 2019, at 17:33, Stephen Hemminger wrote: > > On Tue, 15 Oct 2019 10:22:20 +0200 > Alfredo Cardigliano wrote: > >> Add hardware structures and message commands definitions for >> Pensando network adapters. >> >> Signed-off-by: Alfredo Cardigliano >> Reviewed-by: Shannon Nelson >> --- >> drivers/net/ionic/ionic_if.h | 2491 ++ >> 1 file changed, 2491 insertions(+) >> create mode 100644 drivers/net/ionic/ionic_if.h >> >> diff --git a/drivers/net/ionic/ionic_if.h b/drivers/net/ionic/ionic_if.h >> new file mode 100644 >> index 0..5f31ec034 >> --- /dev/null >> +++ b/drivers/net/ionic/ionic_if.h >> @@ -0,0 +1,2491 @@ >> +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause */ > > This is not on the approved license list see license/README > and as Ferruh said would require special exception from DPDK governing board. I am going to change the License to BSD-3 for all files, however we would like to keep the current license for this specific header file (ionic_if.h) which is shared with the Linux kernel driver. Do you think this is acceptable? Thanks, Alfredo
[dpdk-dev] [PATCH] app/testpmd: fix device mcast list error handling
The multicast set list function now has a return value, which is checked
by the calling functions. A rollback occurs on detection of failure, to
realign local config with the device config.
The error print statement in the function had included the port_id and
mc_addr_nb values in the wrong order, these are now swapped.
Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC
addresses")
Cc: ivan.bo...@6wind.com
Cc: sta...@dpdk.org
Signed-off-by: Ciara Power
---
app/test-pmd/config.c | 31 +--
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index d59968278..8c8621779 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3707,6 +3707,14 @@ mcast_addr_pool_extend(struct rte_port *port)
}
+static void
+mcast_addr_pool_append(struct rte_port *port, struct rte_ether_addr *mc_addr)
+{
+ if (mcast_addr_pool_extend(port) != 0)
+ return;
+ rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[port->mc_addr_nb - 1]);
+}
+
static void
mcast_addr_pool_remove(struct rte_port *port, uint32_t addr_idx)
{
@@ -3725,7 +3733,7 @@ mcast_addr_pool_remove(struct rte_port *port, uint32_t
addr_idx)
sizeof(struct rte_ether_addr) * (port->mc_addr_nb - addr_idx));
}
-static void
+static int
eth_port_multicast_addr_list_set(portid_t port_id)
{
struct rte_port *port;
@@ -3734,10 +3742,11 @@ eth_port_multicast_addr_list_set(portid_t port_id)
port = &ports[port_id];
diag = rte_eth_dev_set_mc_addr_list(port_id, port->mc_addr_pool,
port->mc_addr_nb);
- if (diag == 0)
- return;
- printf("rte_eth_dev_set_mc_addr_list(port=%d, nb=%u) failed. diag=%d\n",
- port->mc_addr_nb, port_id, -diag);
+ if (diag < 0)
+ printf("rte_eth_dev_set_mc_addr_list(port=%d, nb=%u) failed.
diag=%d\n",
+ port_id, port->mc_addr_nb, diag);
+
+ return diag;
}
void
@@ -3762,10 +3771,10 @@ mcast_addr_add(portid_t port_id, struct rte_ether_addr
*mc_addr)
}
}
- if (mcast_addr_pool_extend(port) != 0)
- return;
- rte_ether_addr_copy(mc_addr, &port->mc_addr_pool[i]);
- eth_port_multicast_addr_list_set(port_id);
+ mcast_addr_pool_append(port, mc_addr);
+ if (eth_port_multicast_addr_list_set(port_id) < 0)
+ /* Rollback on failure, remove the address from the pool */
+ mcast_addr_pool_remove(port, i);
}
void
@@ -3792,7 +3801,9 @@ mcast_addr_remove(portid_t port_id, struct rte_ether_addr
*mc_addr)
}
mcast_addr_pool_remove(port, i);
- eth_port_multicast_addr_list_set(port_id);
+ if (eth_port_multicast_addr_list_set(port_id) < 0)
+ /* Rollback on failure, add the address back into the pool */
+ mcast_addr_pool_append(port, mc_addr);
}
void
--
2.17.1
Re: [dpdk-dev] [dpdk-stable] [PATCH] app/testpmd: fix device mcast list error handling
On 12/4/2019 4:38 PM, Ciara Power wrote:
> The multicast set list function now has a return value, which is checked
> by the calling functions. A rollback occurs on detection of failure, to
> realign local config with the device config.
>
> The error print statement in the function had included the port_id and
> mc_addr_nb values in the wrong order, these are now swapped.
>
> Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC
> addresses")
> Cc: ivan.bo...@6wind.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ciara Power
Reviewed-by: Ferruh Yigit
Re: [dpdk-dev] [dpdk-stable] [PATCH] eal/linux: fix build error on RHEL 7.6
On Wed, Dec 4, 2019 at 4:00 PM David Marchand wrote:
>
> Previous fix gives hiccups to gcc on RHEL 7.6:
>
> == Build lib/librte_eal/linux/eal
> CC eal_interrupts.o
> ...lib/librte_eal/linux/eal/eal_interrupts.c: In function
> ‘eal_intr_thread_main’:
> ...lib/librte_eal/linux/eal/eal_interrupts.c:1048:9: error: missing
> initializer for field ‘events’ of ‘struct epoll_event’
> [-Werror=missing-field-initializers]
> struct epoll_event ev = { };
> ^
> In file included from ...lib/librte_eal/linux/eal/eal_interrupts.c:15:0:
> /usr/include/sys/epoll.h:89:12: note: ‘events’ declared here
>uint32_t events; /* Epoll events */
> ^
> ...lib/librte_eal/linux/eal/eal_interrupts.c: At top level:
> cc1: error: unrecognized command line option
> "-Wno-address-of-packed-member" [-Werror]
> cc1: all warnings being treated as errors
>
> Fixes: e0ab8020ac2a ("eal/linux: fix uninitialized data valgrind warning")
> Cc: sta...@dpdk.org
>
> Reported-by: Andrew Rybchenko
> Signed-off-by: David Marchand
Applied.
--
David Marchand
[dpdk-dev] [PATCH] test/common: fix log2 check
We recently started to get random failures on the common_autotest ut with
clang on Ubuntu 16.04.6.
Example: https://travis-ci.com/DPDK/dpdk/jobs/263177424
Wrong rte_log2_u64(0) val 0, expected
Test Failed
The ut passes 0 to log2() to get an expected value.
Quoting log2 / log(3) manual:
If x is zero, then a pole error occurs, and the functions return
-HUGE_VAL, -HUGE_VALF, or -HUGE_VALL, respectively.
rte_log2_uXX helpers handle 0 as a special value and return 0.
Let's have dedicated tests for this case.
Fixes: 05c4345ef5c2 ("test: add unit test for integer log2 function")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
---
app/test/test_common.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/app/test/test_common.c b/app/test/test_common.c
index 2b856f8ba5..12bd1cad90 100644
--- a/app/test/test_common.c
+++ b/app/test/test_common.c
@@ -216,7 +216,19 @@ test_log2(void)
const uint32_t max = 0x1;
const uint32_t step = 1;
- for (i = 0; i < max; i = i + step) {
+ compare = rte_log2_u32(0);
+ if (compare != 0) {
+ printf("Wrong rte_log2_u32(0) val %x, expected 0\n", compare);
+ return TEST_FAILED;
+ }
+
+ compare = rte_log2_u64(0);
+ if (compare != 0) {
+ printf("Wrong rte_log2_u64(0) val %x, expected 0\n", compare);
+ return TEST_FAILED;
+ }
+
+ for (i = 1; i < max; i = i + step) {
uint64_t i64;
/* extend range for 64-bit */
--
2.23.0
Re: [dpdk-dev] [PATCH] test/common: fix log2 check
David Marchand writes:
> We recently started to get random failures on the common_autotest ut with
> clang on Ubuntu 16.04.6.
>
> Example: https://travis-ci.com/DPDK/dpdk/jobs/263177424
>
> Wrong rte_log2_u64(0) val 0, expected
> Test Failed
>
> The ut passes 0 to log2() to get an expected value.
>
> Quoting log2 / log(3) manual:
> If x is zero, then a pole error occurs, and the functions return
> -HUGE_VAL, -HUGE_VALF, or -HUGE_VALL, respectively.
>
> rte_log2_uXX helpers handle 0 as a special value and return 0.
> Let's have dedicated tests for this case.
>
> Fixes: 05c4345ef5c2 ("test: add unit test for integer log2 function")
> Cc: sta...@dpdk.org
>
> Signed-off-by: David Marchand
> ---
Acked-by: Aaron Conole
Somethings that concern me:
1. A log2(0) should probably be an undetermined value, but this
effectively makes log2(0) == log2(1) so that if anyone uses these
for some mathematical work, it will have an exceptional behavior. I
know it's documented from a programmer perspective, but I am all for
documenting the mathematical side effect as well.
2. Why hasn't this been complaining for so long? Or has it and we just
haven't noticed? Were some compiler flags changed recently? (maybe
-funsafe-math was always set or something?)
-Aaron
Re: [dpdk-dev] [PATCH v2] vhost: add config change slave msg support
On Wed, Dec 04, 2019 at 05:43:50PM +0800, Li Feng wrote:
> Hi Tiwei,
> Thanks for your reply.
> Yes, this new API currently is for vhost-user-blk in the SPDK project.
I see. Thanks for the clarification.
In this case, it should be declared in rte_vhost.h instead
of vhost_user.h which is an internal header. And the symbol
should be added to rte_vhost_version.map as well.
>
> There is a patch in SPDK to use this API.
Could you share the link to the SPDK patch?
Thanks,
Tiwei
>
> Thanks,
>
> Feng Li
>
> Tiwei Bie 于2019年12月4日周三 下午5:30写道：
> >
> > On Wed, Dec 04, 2019 at 01:13:20PM +0800, Li Feng wrote:
> > > This msg is used to notify qemu that should get the config of backend.
> > >
> > > For example, vhost-user-blk uses this msg to notify guest os the
> > > compacity of backend has changed.
> > >
> > > Signed-off-by: Li Feng
> > > ---
> > > v2:
> > > * Fix a little log typo.
> > >
> > > lib/librte_vhost/vhost_user.c | 31 +++
> > > lib/librte_vhost/vhost_user.h | 2 ++
> > > 2 files changed, 33 insertions(+)
> > >
> > > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> > > index 0cfb8b792..10f2e47d5 100644
> > > --- a/lib/librte_vhost/vhost_user.c
> > > +++ b/lib/librte_vhost/vhost_user.c
> > > @@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev,
> > > uint64_t iova, uint8_t perm)
> > > return 0;
> > > }
> > >
> > > +static int
> > > +vhost_user_slave_config_change(struct virtio_net *dev)
> > > +{
> > > + int ret;
> > > + struct VhostUserMsg msg = {
> > > + .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
> > > + .flags = VHOST_USER_VERSION,
> > > + .size = 0,
> > > + };
> > > +
> > > + ret = send_vhost_message(dev->slave_req_fd, &msg);
> > > + if (ret < 0) {
> > > + RTE_LOG(ERR, VHOST_CONFIG,
> > > + "Failed to send config change (%d)\n",
> > > + ret);
> > > + return ret;
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +int
> > > +rte_vhost_user_slave_config_change(int vid)
> > > +{
> > > + struct virtio_net *dev;
> > > + dev = get_device(vid);
> > > + if (!dev)
> > > + return -ENODEV;
> > > + return vhost_user_slave_config_change(dev);
> > > +}
> > > +
> > > static int vhost_user_slave_set_vring_host_notifier(struct virtio_net
> > > *dev,
> > > int index, int fd,
> > > uint64_t offset,
> > > diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
> > > index 6563f7315..5c1bb2138 100644
> > > --- a/lib/librte_vhost/vhost_user.h
> > > +++ b/lib/librte_vhost/vhost_user.h
> > > @@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
> > > typedef enum VhostUserSlaveRequest {
> > > VHOST_USER_SLAVE_NONE = 0,
> > > VHOST_USER_SLAVE_IOTLB_MSG = 1,
> > > + VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
> > > VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
> > > VHOST_USER_SLAVE_MAX
> > > } VhostUserSlaveRequest;
> > > @@ -158,6 +159,7 @@ typedef struct VhostUserMsg {
> > > /* vhost_user.c */
> > > int vhost_user_msg_handler(int vid, int fd);
> > > int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t
> > > perm);
> > > +int rte_vhost_user_slave_config_change(int vid);
> >
> > This is supposed to be an API for external backends?
> >
> > Thanks,
> > Tiwei
> >
> > >
> > > /* socket.c */
> > > int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int
> > > max_fds,
> > > --
> > > 2.11.0
> > >
> > >
> > > --
> > > The SmartX email address is only for business purpose. Any sent message
> > > that is not related to the business is not authorized or permitted by
> > > SmartX.
> > > 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
> > >
> > >
>
> --
> The SmartX email address is only for business purpose. Any sent message
> that is not related to the business is not authorized or permitted by
> SmartX.
> 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
>
>
Re: [dpdk-dev] [PATCH v2] vhost: add config change slave msg support
Tiwei Bie 于2019年12月5日周四 上午10:06写道：
>
> On Wed, Dec 04, 2019 at 05:43:50PM +0800, Li Feng wrote:
> > Hi Tiwei,
> > Thanks for your reply.
> > Yes, this new API currently is for vhost-user-blk in the SPDK project.
>
> I see. Thanks for the clarification.
> In this case, it should be declared in rte_vhost.h instead
> of vhost_user.h which is an internal header. And the symbol
> should be added to rte_vhost_version.map as well.
>
OK, one more question, should I add `__rte_experimental` tag before
the declare?
> >
> > There is a patch in SPDK to use this API.
>
> Could you share the link to the SPDK patch?
>
The patch is here:
https://review.gerrithub.io/c/spdk/spdk/+/476704
Thanks.
Feng Li
> Thanks,
> Tiwei
>
> >
> > Thanks,
> >
> > Feng Li
> >
> > Tiwei Bie 于2019年12月4日周三 下午5:30写道：
> > >
> > > On Wed, Dec 04, 2019 at 01:13:20PM +0800, Li Feng wrote:
> > > > This msg is used to notify qemu that should get the config of backend.
> > > >
> > > > For example, vhost-user-blk uses this msg to notify guest os the
> > > > compacity of backend has changed.
> > > >
> > > > Signed-off-by: Li Feng
> > > > ---
> > > > v2:
> > > > * Fix a little log typo.
> > > >
> > > > lib/librte_vhost/vhost_user.c | 31 +++
> > > > lib/librte_vhost/vhost_user.h | 2 ++
> > > > 2 files changed, 33 insertions(+)
> > > >
> > > > diff --git a/lib/librte_vhost/vhost_user.c
> > > > b/lib/librte_vhost/vhost_user.c
> > > > index 0cfb8b792..10f2e47d5 100644
> > > > --- a/lib/librte_vhost/vhost_user.c
> > > > +++ b/lib/librte_vhost/vhost_user.c
> > > > @@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev,
> > > > uint64_t iova, uint8_t perm)
> > > > return 0;
> > > > }
> > > >
> > > > +static int
> > > > +vhost_user_slave_config_change(struct virtio_net *dev)
> > > > +{
> > > > + int ret;
> > > > + struct VhostUserMsg msg = {
> > > > + .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
> > > > + .flags = VHOST_USER_VERSION,
> > > > + .size = 0,
> > > > + };
> > > > +
> > > > + ret = send_vhost_message(dev->slave_req_fd, &msg);
> > > > + if (ret < 0) {
> > > > + RTE_LOG(ERR, VHOST_CONFIG,
> > > > + "Failed to send config change (%d)\n",
> > > > + ret);
> > > > + return ret;
> > > > + }
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +int
> > > > +rte_vhost_user_slave_config_change(int vid)
> > > > +{
> > > > + struct virtio_net *dev;
> > > > + dev = get_device(vid);
> > > > + if (!dev)
> > > > + return -ENODEV;
> > > > + return vhost_user_slave_config_change(dev);
> > > > +}
> > > > +
> > > > static int vhost_user_slave_set_vring_host_notifier(struct virtio_net
> > > > *dev,
> > > > int index, int fd,
> > > > uint64_t offset,
> > > > diff --git a/lib/librte_vhost/vhost_user.h
> > > > b/lib/librte_vhost/vhost_user.h
> > > > index 6563f7315..5c1bb2138 100644
> > > > --- a/lib/librte_vhost/vhost_user.h
> > > > +++ b/lib/librte_vhost/vhost_user.h
> > > > @@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
> > > > typedef enum VhostUserSlaveRequest {
> > > > VHOST_USER_SLAVE_NONE = 0,
> > > > VHOST_USER_SLAVE_IOTLB_MSG = 1,
> > > > + VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
> > > > VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
> > > > VHOST_USER_SLAVE_MAX
> > > > } VhostUserSlaveRequest;
> > > > @@ -158,6 +159,7 @@ typedef struct VhostUserMsg {
> > > > /* vhost_user.c */
> > > > int vhost_user_msg_handler(int vid, int fd);
> > > > int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova,
> > > > uint8_t perm);
> > > > +int rte_vhost_user_slave_config_change(int vid);
> > >
> > > This is supposed to be an API for external backends?
> > >
> > > Thanks,
> > > Tiwei
> > >
> > > >
> > > > /* socket.c */
> > > > int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int
> > > > max_fds,
> > > > --
> > > > 2.11.0
> > > >
> > > >
> > > > --
> > > > The SmartX email address is only for business purpose. Any sent message
> > > > that is not related to the business is not authorized or permitted by
> > > > SmartX.
> > > > 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
> > > >
> > > >
> >
> > --
> > The SmartX email address is only for business purpose. Any sent message
> > that is not related to the business is not authorized or permitted by
> > SmartX.
> > 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
> >
> >
--
The SmartX email address is only for business purpose. Any sent message
that is not related to the business is not authorized or permitted by
SmartX.
本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
Re: [dpdk-dev] [PATCH v2] vhost: add config change slave msg support
On Thu, Dec 05, 2019 at 12:01:55PM +0800, Li Feng wrote:
> Tiwei Bie 于2019年12月5日周四 上午10:06写道：
> > On Wed, Dec 04, 2019 at 05:43:50PM +0800, Li Feng wrote:
> > > Hi Tiwei,
> > > Thanks for your reply.
> > > Yes, this new API currently is for vhost-user-blk in the SPDK project.
> >
> > I see. Thanks for the clarification.
> > In this case, it should be declared in rte_vhost.h instead
> > of vhost_user.h which is an internal header. And the symbol
> > should be added to rte_vhost_version.map as well.
> >
> OK, one more question, should I add `__rte_experimental` tag before
> the declare?
Yeah.
>
> > >
> > > There is a patch in SPDK to use this API.
> >
> > Could you share the link to the SPDK patch?
> >
> The patch is here:
> https://review.gerrithub.io/c/spdk/spdk/+/476704
Thanks for the link. Will take a closer look.
Thanks,
Tiwei
>
> Thanks.
> Feng Li
>
> > Thanks,
> > Tiwei
> >
> > >
> > > Thanks,
> > >
> > > Feng Li
> > >
> > > Tiwei Bie 于2019年12月4日周三 下午5:30写道：
> > > >
> > > > On Wed, Dec 04, 2019 at 01:13:20PM +0800, Li Feng wrote:
> > > > > This msg is used to notify qemu that should get the config of backend.
> > > > >
> > > > > For example, vhost-user-blk uses this msg to notify guest os the
> > > > > compacity of backend has changed.
> > > > >
> > > > > Signed-off-by: Li Feng
> > > > > ---
> > > > > v2:
> > > > > * Fix a little log typo.
> > > > >
> > > > > lib/librte_vhost/vhost_user.c | 31 +++
> > > > > lib/librte_vhost/vhost_user.h | 2 ++
> > > > > 2 files changed, 33 insertions(+)
> > > > >
> > > > > diff --git a/lib/librte_vhost/vhost_user.c
> > > > > b/lib/librte_vhost/vhost_user.c
> > > > > index 0cfb8b792..10f2e47d5 100644
> > > > > --- a/lib/librte_vhost/vhost_user.c
> > > > > +++ b/lib/librte_vhost/vhost_user.c
> > > > > @@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev,
> > > > > uint64_t iova, uint8_t perm)
> > > > > return 0;
> > > > > }
> > > > >
> > > > > +static int
> > > > > +vhost_user_slave_config_change(struct virtio_net *dev)
> > > > > +{
> > > > > + int ret;
> > > > > + struct VhostUserMsg msg = {
> > > > > + .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
> > > > > + .flags = VHOST_USER_VERSION,
> > > > > + .size = 0,
> > > > > + };
> > > > > +
> > > > > + ret = send_vhost_message(dev->slave_req_fd, &msg);
> > > > > + if (ret < 0) {
> > > > > + RTE_LOG(ERR, VHOST_CONFIG,
> > > > > + "Failed to send config change (%d)\n",
> > > > > + ret);
> > > > > + return ret;
> > > > > + }
> > > > > +
> > > > > + return 0;
> > > > > +}
> > > > > +
> > > > > +int
> > > > > +rte_vhost_user_slave_config_change(int vid)
> > > > > +{
> > > > > + struct virtio_net *dev;
> > > > > + dev = get_device(vid);
> > > > > + if (!dev)
> > > > > + return -ENODEV;
> > > > > + return vhost_user_slave_config_change(dev);
> > > > > +}
> > > > > +
> > > > > static int vhost_user_slave_set_vring_host_notifier(struct
> > > > > virtio_net *dev,
> > > > > int index, int fd,
> > > > > uint64_t offset,
> > > > > diff --git a/lib/librte_vhost/vhost_user.h
> > > > > b/lib/librte_vhost/vhost_user.h
> > > > > index 6563f7315..5c1bb2138 100644
> > > > > --- a/lib/librte_vhost/vhost_user.h
> > > > > +++ b/lib/librte_vhost/vhost_user.h
> > > > > @@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
> > > > > typedef enum VhostUserSlaveRequest {
> > > > > VHOST_USER_SLAVE_NONE = 0,
> > > > > VHOST_USER_SLAVE_IOTLB_MSG = 1,
> > > > > + VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
> > > > > VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
> > > > > VHOST_USER_SLAVE_MAX
> > > > > } VhostUserSlaveRequest;
> > > > > @@ -158,6 +159,7 @@ typedef struct VhostUserMsg {
> > > > > /* vhost_user.c */
> > > > > int vhost_user_msg_handler(int vid, int fd);
> > > > > int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova,
> > > > > uint8_t perm);
> > > > > +int rte_vhost_user_slave_config_change(int vid);
> > > >
> > > > This is supposed to be an API for external backends?
> > > >
> > > > Thanks,
> > > > Tiwei
> > > >
> > > > >
> > > > > /* socket.c */
> > > > > int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int
> > > > > max_fds,
> > > > > --
> > > > > 2.11.0
> > > > >
> > > > >
> > > > > --
> > > > > The SmartX email address is only for business purpose. Any sent
> > > > > message
> > > > > that is not related to the business is not authorized or permitted by
> > > > > SmartX.
> > > > > 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
> > > > >
> > > > >
> > >
> > > --
> > > The SmartX email address is only for business purpose. Any sent message
> > > that is not related to the business is not authorized or permitted by
> >
[dpdk-dev] [PATCH v3] vhost: add config change slave msg support
This msg is used to notify qemu that should get the config of backend.
For example, vhost-user-blk uses this msg to notify guest os the
compacity of backend has changed.
Signed-off-by: Li Feng
---
v3:
* Move the declare to rte_vhost.h
* Add the symbol in rte_vhost_version.map
v2:
* Fix a little log typo.
lib/librte_vhost/rte_vhost.h | 12
lib/librte_vhost/rte_vhost_version.map | 1 +
lib/librte_vhost/vhost_user.c | 31 +++
lib/librte_vhost/vhost_user.h | 1 +
4 files changed, 45 insertions(+)
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index 7b5dc87c2..fc28da264 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -977,6 +977,18 @@ __rte_experimental
int
rte_vhost_get_vdpa_device_id(int vid);
+/**
+ * Notify the guest that should get config from backend.
+ *
+ * @param vid
+ * vhost device ID
+ * @return
+ * 0 on success, < 0 on failure
+ */
+__rte_experimental
+int
+rte_vhost_user_slave_config_change(int vid);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/librte_vhost/rte_vhost_version.map
b/lib/librte_vhost/rte_vhost_version.map
index c512377fe..acf013d6d 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -65,4 +65,5 @@ EXPERIMENTAL {
rte_vhost_clr_inflight_desc_packed;
rte_vhost_get_vhost_ring_inflight;
rte_vhost_get_vring_base_from_inflight;
+ rte_vhost_user_slave_config_change;
};
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 0cfb8b792..10f2e47d5 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2840,6 +2840,37 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t
iova, uint8_t perm)
return 0;
}
+static int
+vhost_user_slave_config_change(struct virtio_net *dev)
+{
+ int ret;
+ struct VhostUserMsg msg = {
+ .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG,
+ .flags = VHOST_USER_VERSION,
+ .size = 0,
+ };
+
+ ret = send_vhost_message(dev->slave_req_fd, &msg);
+ if (ret < 0) {
+ RTE_LOG(ERR, VHOST_CONFIG,
+ "Failed to send config change (%d)\n",
+ ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+int
+rte_vhost_user_slave_config_change(int vid)
+{
+ struct virtio_net *dev;
+ dev = get_device(vid);
+ if (!dev)
+ return -ENODEV;
+ return vhost_user_slave_config_change(dev);
+}
+
static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,
int index, int fd,
uint64_t offset,
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 6563f7315..86c364a93 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -62,6 +62,7 @@ typedef enum VhostUserRequest {
typedef enum VhostUserSlaveRequest {
VHOST_USER_SLAVE_NONE = 0,
VHOST_USER_SLAVE_IOTLB_MSG = 1,
+ VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2,
VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3,
VHOST_USER_SLAVE_MAX
} VhostUserSlaveRequest;
--
2.11.0
--
The SmartX email address is only for business purpose. Any sent message
that is not related to the business is not authorized or permitted by
SmartX.
本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.
