Re: [PATCH v2] kni: remove deprecated kernel network interface
30/07/2023 19:12, Stephen Hemminger: > On Sat, 29 Jul 2023 19:12:05 -0700 > Stephen Hemminger wrote: > > > Deprecation and removal was announced in 22.11. > > Make it so. Would be good to summarize the reason here, and name replacements. Also it should not be completely removed. I think we were supposed to move KNI into the kmod repository? > > Leave kernel/linux with empty directory because > > CI is trying to directly build it. At some later date, > > kernel/linux can be removed. > > > > Signed-off-by: Stephen Hemminger > > --- > > Want suggestions on this. > 1. The release notes gets coding style warning because checkpatch > is checking that release note matches current release, and release number > hasn't change yet. Should I just wait? Yes the release notes file for 23.11 should be created today. > 2. The OVSrobot is looking into the port library to see the kni symbols. > But port is marked as deprecated already. > Perhaps we should just pull out port first? No we must support it until it is removed. You should either disable or remove KNI from the port library.
[PATCH 0/3] version: 23.11-rc0
Prepare the new release. I chose to separate the compat code cleanup in the telemetry and vhost libraries for making it easier to review, though the 3 patches could be squashed in a single change. -- David Marchand David Marchand (3): version: 23.11-rc0 telemetry: remove v23 ABI compatibility vhost: remove v23 ABI compatibility .github/workflows/build.yml| 4 +- ABI_VERSION| 2 +- VERSION| 2 +- devtools/libabigail.abignore | 5 - doc/guides/rel_notes/index.rst | 1 + doc/guides/rel_notes/release_23_11.rst | 136 + drivers/baseband/acc/version.map | 2 +- drivers/baseband/fpga_5gnr_fec/version.map | 2 +- drivers/baseband/fpga_lte_fec/version.map | 2 +- drivers/bus/fslmc/version.map | 2 +- drivers/bus/pci/version.map| 2 +- drivers/bus/platform/version.map | 2 +- drivers/bus/vdev/version.map | 2 +- drivers/bus/vmbus/version.map | 2 +- drivers/crypto/octeontx/version.map| 2 +- drivers/crypto/scheduler/version.map | 2 +- drivers/dma/dpaa2/version.map | 2 +- drivers/event/dlb2/version.map | 2 +- drivers/mempool/cnxk/version.map | 8 +- drivers/mempool/dpaa2/version.map | 2 +- drivers/net/atlantic/version.map | 2 +- drivers/net/bnxt/version.map | 2 +- drivers/net/bonding/version.map| 2 +- drivers/net/cnxk/version.map | 2 +- drivers/net/dpaa/version.map | 2 +- drivers/net/dpaa2/version.map | 2 +- drivers/net/i40e/version.map | 2 +- drivers/net/iavf/version.map | 2 +- drivers/net/ice/version.map| 2 +- drivers/net/ipn3ke/version.map | 2 +- drivers/net/ixgbe/version.map | 2 +- drivers/net/mlx5/version.map | 2 +- drivers/net/octeontx/version.map | 2 +- drivers/net/ring/version.map | 2 +- drivers/net/softnic/version.map| 2 +- drivers/net/vhost/version.map | 2 +- drivers/raw/ifpga/version.map | 2 +- drivers/version.map| 2 +- lib/acl/version.map| 2 +- lib/bbdev/version.map | 2 +- lib/bitratestats/version.map | 2 +- lib/bpf/version.map| 2 +- lib/cfgfile/version.map| 2 +- lib/cmdline/version.map| 2 +- lib/cryptodev/version.map | 2 +- lib/distributor/version.map| 2 +- lib/eal/version.map| 2 +- lib/efd/version.map| 2 +- lib/ethdev/version.map | 2 +- lib/eventdev/version.map | 2 +- lib/fib/version.map| 2 +- lib/gro/version.map| 2 +- lib/gso/version.map| 2 +- lib/hash/version.map | 2 +- lib/ip_frag/version.map| 2 +- lib/ipsec/version.map | 2 +- lib/jobstats/version.map | 2 +- lib/kni/version.map| 2 +- lib/kvargs/version.map | 2 +- lib/latencystats/version.map | 2 +- lib/lpm/version.map| 2 +- lib/mbuf/version.map | 2 +- lib/member/version.map | 2 +- lib/mempool/version.map| 2 +- lib/meter/version.map | 2 +- lib/metrics/version.map| 2 +- lib/net/version.map| 2 +- lib/pci/version.map| 2 +- lib/pdump/version.map | 2 +- lib/pipeline/version.map | 2 +- lib/port/version.map | 2 +- lib/power/version.map | 2 +- lib/rawdev/version.map | 2 +- lib/rcu/version.map| 2 +- lib/reorder/version.map| 2 +- lib/rib/version.map| 2 +- lib/ring/version.map | 2 +- lib/sched/version.map | 2 +- lib/security/version.map | 2 +- lib/stack/version.map | 2 +- lib/table/version.map | 2 +- lib/telemetry/meson.build | 1 - lib/telemetry/telemetry_data.c | 33 + lib/telemetry/telemetry_data.h | 6 - lib/telemetry/version.map | 9 +- lib/timer/version.map | 2 +- lib/vhost/meson.build | 2 - lib/vhost/socket.c
[PATCH 1/3] version: 23.11-rc0
Start a new release cycle with empty release notes. The ABI version becomes 24.0. The map files are updated to the new ABI major number (24). The ABI exceptions are dropped and CI ABI checks are disabled because compatibility is not preserved. The telemetry and vhost libraries compat code is cleaned up in next commits. Signed-off-by: David Marchand --- .github/workflows/build.yml| 4 +- ABI_VERSION| 2 +- VERSION| 2 +- devtools/libabigail.abignore | 5 - doc/guides/rel_notes/index.rst | 1 + doc/guides/rel_notes/release_23_11.rst | 136 + drivers/baseband/acc/version.map | 2 +- drivers/baseband/fpga_5gnr_fec/version.map | 2 +- drivers/baseband/fpga_lte_fec/version.map | 2 +- drivers/bus/fslmc/version.map | 2 +- drivers/bus/pci/version.map| 2 +- drivers/bus/platform/version.map | 2 +- drivers/bus/vdev/version.map | 2 +- drivers/bus/vmbus/version.map | 2 +- drivers/crypto/octeontx/version.map| 2 +- drivers/crypto/scheduler/version.map | 2 +- drivers/dma/dpaa2/version.map | 2 +- drivers/event/dlb2/version.map | 2 +- drivers/mempool/cnxk/version.map | 8 +- drivers/mempool/dpaa2/version.map | 2 +- drivers/net/atlantic/version.map | 2 +- drivers/net/bnxt/version.map | 2 +- drivers/net/bonding/version.map| 2 +- drivers/net/cnxk/version.map | 2 +- drivers/net/dpaa/version.map | 2 +- drivers/net/dpaa2/version.map | 2 +- drivers/net/i40e/version.map | 2 +- drivers/net/iavf/version.map | 2 +- drivers/net/ice/version.map| 2 +- drivers/net/ipn3ke/version.map | 2 +- drivers/net/ixgbe/version.map | 2 +- drivers/net/mlx5/version.map | 2 +- drivers/net/octeontx/version.map | 2 +- drivers/net/ring/version.map | 2 +- drivers/net/softnic/version.map| 2 +- drivers/net/vhost/version.map | 2 +- drivers/raw/ifpga/version.map | 2 +- drivers/version.map| 2 +- lib/acl/version.map| 2 +- lib/bbdev/version.map | 2 +- lib/bitratestats/version.map | 2 +- lib/bpf/version.map| 2 +- lib/cfgfile/version.map| 2 +- lib/cmdline/version.map| 2 +- lib/cryptodev/version.map | 2 +- lib/distributor/version.map| 2 +- lib/eal/version.map| 2 +- lib/efd/version.map| 2 +- lib/ethdev/version.map | 2 +- lib/eventdev/version.map | 2 +- lib/fib/version.map| 2 +- lib/gro/version.map| 2 +- lib/gso/version.map| 2 +- lib/hash/version.map | 2 +- lib/ip_frag/version.map| 2 +- lib/ipsec/version.map | 2 +- lib/jobstats/version.map | 2 +- lib/kni/version.map| 2 +- lib/kvargs/version.map | 2 +- lib/latencystats/version.map | 2 +- lib/lpm/version.map| 2 +- lib/mbuf/version.map | 2 +- lib/member/version.map | 2 +- lib/mempool/version.map| 2 +- lib/meter/version.map | 2 +- lib/metrics/version.map| 2 +- lib/net/version.map| 2 +- lib/pci/version.map| 2 +- lib/pdump/version.map | 2 +- lib/pipeline/version.map | 2 +- lib/port/version.map | 2 +- lib/power/version.map | 2 +- lib/rawdev/version.map | 2 +- lib/rcu/version.map| 2 +- lib/reorder/version.map| 2 +- lib/rib/version.map| 2 +- lib/ring/version.map | 2 +- lib/sched/version.map | 2 +- lib/security/version.map | 2 +- lib/stack/version.map | 2 +- lib/table/version.map | 2 +- lib/timer/version.map | 2 +- 82 files changed, 220 insertions(+), 88 deletions(-) create mode 100644 doc/guides/rel_notes/release_23_11.rst diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3bcb160cf..2c1eda9b18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflow
[PATCH 2/3] telemetry: remove v23 ABI compatibility
v23.11 is a ABI breaking release, remove compatibility code for the
previous major ABI version.
Signed-off-by: David Marchand
---
lib/telemetry/meson.build | 1 -
lib/telemetry/telemetry_data.c | 33 -
lib/telemetry/telemetry_data.h | 6 --
lib/telemetry/version.map | 9 +
4 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/lib/telemetry/meson.build b/lib/telemetry/meson.build
index 73750d9ef4..f84c9aa3be 100644
--- a/lib/telemetry/meson.build
+++ b/lib/telemetry/meson.build
@@ -6,4 +6,3 @@ includes = [global_inc]
sources = files('telemetry.c', 'telemetry_data.c', 'telemetry_legacy.c')
headers = files('rte_telemetry.h')
includes += include_directories('../metrics')
-use_function_versioning = true
diff --git a/lib/telemetry/telemetry_data.c b/lib/telemetry/telemetry_data.c
index 0c7187bec1..3b1a2408df 100644
--- a/lib/telemetry/telemetry_data.c
+++ b/lib/telemetry/telemetry_data.c
@@ -10,7 +10,6 @@
#undef RTE_USE_LIBBSD
#include
-#include
#include
#include "telemetry_data.h"
@@ -63,8 +62,8 @@ rte_tel_data_add_array_string(struct rte_tel_data *d, const
char *str)
return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG;
}
-int __vsym
-rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t x)
+int
+rte_tel_data_add_array_int(struct rte_tel_data *d, int64_t x)
{
if (d->type != TEL_ARRAY_INT)
return -EINVAL;
@@ -74,18 +73,6 @@ rte_tel_data_add_array_int_v24(struct rte_tel_data *d,
int64_t x)
return 0;
}
-int __vsym
-rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int x)
-{
- return rte_tel_data_add_array_int_v24(d, x);
-}
-
-/* mark the v23 function as the older version, and v24 as the default version
*/
-VERSION_SYMBOL(rte_tel_data_add_array_int, _v23, 23);
-BIND_DEFAULT_SYMBOL(rte_tel_data_add_array_int, _v24, 24);
-MAP_STATIC_SYMBOL(int rte_tel_data_add_array_int(struct rte_tel_data *d,
- int64_t x), rte_tel_data_add_array_int_v24);
-
int
rte_tel_data_add_array_uint(struct rte_tel_data *d, uint64_t x)
{
@@ -190,8 +177,8 @@ rte_tel_data_add_dict_string(struct rte_tel_data *d, const
char *name,
return 0;
}
-int __vsym
-rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name,
int64_t val)
+int
+rte_tel_data_add_dict_int(struct rte_tel_data *d, const char *name, int64_t
val)
{
struct tel_dict_entry *e = &d->data.dict[d->data_len];
if (d->type != TEL_DICT)
@@ -209,18 +196,6 @@ rte_tel_data_add_dict_int_v24(struct rte_tel_data *d,
const char *name, int64_t
return bytes < RTE_TEL_MAX_STRING_LEN ? 0 : E2BIG;
}
-int __vsym
-rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name, int
val)
-{
- return rte_tel_data_add_dict_int_v24(d, name, val);
-}
-
-/* mark the v23 function as the older version, and v24 as the default version
*/
-VERSION_SYMBOL(rte_tel_data_add_dict_int, _v23, 23);
-BIND_DEFAULT_SYMBOL(rte_tel_data_add_dict_int, _v24, 24);
-MAP_STATIC_SYMBOL(int rte_tel_data_add_dict_int(struct rte_tel_data *d,
- const char *name, int64_t val), rte_tel_data_add_dict_int_v24);
-
int
rte_tel_data_add_dict_uint(struct rte_tel_data *d,
const char *name, uint64_t val)
diff --git a/lib/telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
index 53e4cabea5..205509c5a2 100644
--- a/lib/telemetry/telemetry_data.h
+++ b/lib/telemetry/telemetry_data.h
@@ -49,10 +49,4 @@ struct rte_tel_data {
} data; /* data container */
};
-/* versioned functions */
-int rte_tel_data_add_array_int_v23(struct rte_tel_data *d, int val);
-int rte_tel_data_add_array_int_v24(struct rte_tel_data *d, int64_t val);
-int rte_tel_data_add_dict_int_v23(struct rte_tel_data *d, const char *name,
int val);
-int rte_tel_data_add_dict_int_v24(struct rte_tel_data *d, const char *name,
int64_t val);
-
#endif
diff --git a/lib/telemetry/version.map b/lib/telemetry/version.map
index af978b883d..7d12c92905 100644
--- a/lib/telemetry/version.map
+++ b/lib/telemetry/version.map
@@ -1,4 +1,4 @@
-DPDK_23 {
+DPDK_24 {
global:
rte_tel_data_add_array_container;
@@ -31,13 +31,6 @@ EXPERIMENTAL {
local: *;
};
-DPDK_24 {
- global:
-
- rte_tel_data_add_array_int;
- rte_tel_data_add_dict_int;
-} DPDK_23;
-
INTERNAL {
rte_telemetry_legacy_register;
rte_telemetry_init;
--
2.41.0
[PATCH 3/3] vhost: remove v23 ABI compatibility
v23.11 is a ABI breaking release, remove compatibility code for the
previous major ABI version.
Signed-off-by: David Marchand
---
lib/vhost/meson.build | 2 --
lib/vhost/socket.c| 59 +++
lib/vhost/version.map | 8 +-
lib/vhost/vhost.h | 6 -
4 files changed, 5 insertions(+), 70 deletions(-)
diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build
index 94f3d2535e..41b622a9be 100644
--- a/lib/vhost/meson.build
+++ b/lib/vhost/meson.build
@@ -43,5 +43,3 @@ driver_sdk_headers = files(
'vdpa_driver.h',
)
deps += ['ethdev', 'cryptodev', 'hash', 'pci', 'dmadev']
-
-use_function_versioning = true
diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index 033f4b3b75..fefe60fae6 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -15,7 +15,6 @@
#include
#include
-#include
#include
#include "fd_man.h"
@@ -64,7 +63,6 @@ struct vhost_user_socket {
struct rte_vdpa_device *vdpa_dev;
struct rte_vhost_device_ops const *notify_ops;
- struct rte_vhost_device_ops *malloc_notify_ops;
};
struct vhost_user_connection {
@@ -880,7 +878,6 @@ vhost_user_socket_mem_free(struct vhost_user_socket
*vsocket)
return;
free(vsocket->path);
- free(vsocket->malloc_notify_ops);
free(vsocket);
}
@@ -1146,69 +1143,21 @@ rte_vhost_driver_unregister(const char *path)
/*
* Register ops so that we can add/remove device to data core.
*/
-static int
-vhost_driver_callback_register(const char *path,
- struct rte_vhost_device_ops const * const ops,
- struct rte_vhost_device_ops *malloc_ops)
+int
+rte_vhost_driver_callback_register(const char *path,
+ struct rte_vhost_device_ops const * const ops)
{
struct vhost_user_socket *vsocket;
pthread_mutex_lock(&vhost_user.mutex);
vsocket = find_vhost_user_socket(path);
- if (vsocket) {
+ if (vsocket)
vsocket->notify_ops = ops;
- free(vsocket->malloc_notify_ops);
- vsocket->malloc_notify_ops = malloc_ops;
- }
pthread_mutex_unlock(&vhost_user.mutex);
return vsocket ? 0 : -1;
}
-int __vsym
-rte_vhost_driver_callback_register_v24(const char *path,
- struct rte_vhost_device_ops const * const ops)
-{
- return vhost_driver_callback_register(path, ops, NULL);
-}
-
-int __vsym
-rte_vhost_driver_callback_register_v23(const char *path,
- struct rte_vhost_device_ops const * const ops)
-{
- int ret;
-
- /*
-* Although the ops structure is a const structure, we do need to
-* override the guest_notify operation. This is because with the
-* previous APIs it was "reserved" and if any garbage value was passed,
-* it could crash the application.
-*/
- if (ops && !ops->guest_notify) {
- struct rte_vhost_device_ops *new_ops;
-
- new_ops = malloc(sizeof(*new_ops));
- if (new_ops == NULL)
- return -1;
-
- memcpy(new_ops, ops, sizeof(*new_ops));
- new_ops->guest_notify = NULL;
-
- ret = vhost_driver_callback_register(path, new_ops, new_ops);
- } else {
- ret = vhost_driver_callback_register(path, ops, NULL);
- }
-
- return ret;
-}
-
-/* Mark the v23 function as the old version, and v24 as the default version. */
-VERSION_SYMBOL(rte_vhost_driver_callback_register, _v23, 23);
-BIND_DEFAULT_SYMBOL(rte_vhost_driver_callback_register, _v24, 24);
-MAP_STATIC_SYMBOL(int rte_vhost_driver_callback_register(const char *path,
- struct rte_vhost_device_ops const * const ops),
- rte_vhost_driver_callback_register_v24);
-
struct rte_vhost_device_ops const *
vhost_driver_callback_get(const char *path)
{
diff --git a/lib/vhost/version.map b/lib/vhost/version.map
index f5d9d68e2c..5bc133dafd 100644
--- a/lib/vhost/version.map
+++ b/lib/vhost/version.map
@@ -1,4 +1,4 @@
-DPDK_23 {
+DPDK_24 {
global:
rte_vdpa_find_device_by_name;
@@ -64,12 +64,6 @@ DPDK_23 {
local: *;
};
-DPDK_24 {
- global:
-
- rte_vhost_driver_callback_register;
-} DPDK_23;
-
EXPERIMENTAL {
global:
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index f49ce943b0..9723429b1c 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -1046,10 +1046,4 @@ mbuf_is_consumed(struct rte_mbuf *m)
void mem_set_dump(void *ptr, size_t size, bool enable, uint64_t alignment);
-/* Versioned functions */
-int rte_vhost_driver_callback_register_v23(const char *path,
- struct rte_vhost_device_ops const * const ops);
-int rte_vhost_driver_callback_register_v24(const char *path,
- struct rte_vhost_device_ops const * const ops);
-
#endif /* _VHOST_NET_CDEV_H_ */
--
2.41.0
Re: [PATCH 1/3] version: 23.11-rc0
On Mon, Jul 31, 2023 at 11:43:53AM +0200, David Marchand wrote: > Start a new release cycle with empty release notes. > > The ABI version becomes 24.0. > The map files are updated to the new ABI major number (24). > The ABI exceptions are dropped and CI ABI checks are disabled because > compatibility is not preserved. > > The telemetry and vhost libraries compat code is cleaned up in next > commits. > > Signed-off-by: David Marchand Acked-by: Bruce Richardson
Re: [PATCH 2/3] telemetry: remove v23 ABI compatibility
On Mon, Jul 31, 2023 at 11:43:54AM +0200, David Marchand wrote: > v23.11 is a ABI breaking release, remove compatibility code for the > previous major ABI version. > > Signed-off-by: David Marchand > --- Acked-by: Bruce Richardson
Re: [PATCH 0/3] version: 23.11-rc0
On Mon, Jul 31, 2023 at 11:43:52AM +0200, David Marchand wrote: > Prepare the new release. > > I chose to separate the compat code cleanup in the telemetry and vhost > libraries for making it easier to review, though the 3 patches could be > squashed in a single change. > I actually think they are better kept separate on apply. It's more in keeping with the principle of each patch doing one thing, and you can also track the acks from the individual library maintainers for patches 2 & 3.
[PATCH v6 0/3] Split logging functionality out of EAL
There is a general desire to reduce the size and scope of EAL. To this
end, this patchset makes a (very) small step in that direction by taking
the logging functionality out of EAL and putting it into its own library
that can be built and maintained separately.
As with the first RFC for this, the main obstacle is the "fnmatch"
function which is needed by both EAL and the new log function when
building on windows. While the function cannot stay in EAL - or we would
have a circular dependency, moving it to a new library or just putting
it in the log library have the disadvantages that it then "leaks" into
the public namespace without an rte_prefix, which could cause issues.
Since only a single function is involved, subsequent versions take a
different approach to v1, and just moves the offending function to be a
static function in a header file. This allows use by multiple libs
without conflicting names or making it public.
The other complication, as explained in v1 RFC was that of multiple
implementations for different OS's. This is solved here in the same
way as v1, by including the OS in the name and having meson pick the
correct file for each build. Since only one file is involved, there
seemed little need for replicating EAL's separate subdirectories
per-OS.
v6:
* Updated ABI version to DPDK_24 for new log library for 23.11 release.
v5:
* rebased to latest main branch
* fixed trailing whitespace issues in new doc section
v4:
* Fixed windows build error, due to missing strdup (_strdup on windows)
* Added doc updates to programmers guide.
v3:
* Fixed missing log file for BSD
* Removed "eal" from the filenames of files in the log directory
* added prefixes to elements in the fnmatch header to avoid conflicts
* fixed space indentation in new lines in telemetry.c (checkpatch)
* removed "extern int logtype" definition in telemetry.c (checkpatch)
* added log directory to list for doxygen scanning
Bruce Richardson (3):
eal/windows: move fnmatch function to header file
log: separate logging functions out of EAL
telemetry: use standard logging
doc/api/doxy-api.conf.in | 1 +
.../prog_guide/env_abstraction_layer.rst | 4 +-
doc/guides/prog_guide/index.rst | 1 +
doc/guides/prog_guide/log_lib.rst | 115
lib/eal/common/eal_common_options.c | 2 +-
lib/eal/common/eal_private.h | 7 -
lib/eal/common/meson.build| 1 -
lib/eal/freebsd/eal.c | 6 +-
lib/eal/include/meson.build | 1 -
lib/eal/linux/eal.c | 8 +-
lib/eal/linux/meson.build | 1 -
lib/eal/meson.build | 2 +-
lib/eal/version.map | 17 --
lib/eal/windows/eal.c | 2 +-
lib/eal/windows/fnmatch.c | 172 -
lib/eal/windows/include/fnmatch.h | 175 --
lib/eal/windows/meson.build | 2 -
lib/kvargs/meson.build| 3 +-
.../common/eal_common_log.c => log/log.c} | 7 +-
lib/log/log_freebsd.c | 12 ++
.../common/eal_log.h => log/log_internal.h} | 18 +-
lib/{eal/linux/eal_log.c => log/log_linux.c} | 2 +-
.../windows/eal_log.c => log/log_windows.c} | 2 +-
lib/log/meson.build | 9 +
lib/{eal/include => log}/rte_log.h| 0
lib/log/version.map | 34
lib/meson.build | 1 +
lib/telemetry/meson.build | 3 +-
lib/telemetry/telemetry.c | 11 +-
lib/telemetry/telemetry_internal.h| 3 +-
30 files changed, 370 insertions(+), 252 deletions(-)
create mode 100644 doc/guides/prog_guide/log_lib.rst
delete mode 100644 lib/eal/windows/fnmatch.c
rename lib/{eal/common/eal_common_log.c => log/log.c} (99%)
create mode 100644 lib/log/log_freebsd.c
rename lib/{eal/common/eal_log.h => log/log_internal.h} (69%)
rename lib/{eal/linux/eal_log.c => log/log_linux.c} (97%)
rename lib/{eal/windows/eal_log.c => log/log_windows.c} (93%)
create mode 100644 lib/log/meson.build
rename lib/{eal/include => log}/rte_log.h (100%)
create mode 100644 lib/log/version.map
--
2.39.2
[PATCH v6 1/3] eal/windows: move fnmatch function to header file
To allow the fnmatch function to be shared between libraries, without
having to export it into the public namespace (since it's not prefixed
with "rte"), we can convert fnmatch.c to replace fnmatch.h. This allows
fnmatch function to be static and limited in scope to the current file,
preventing duplicate definitions if it is used by two libraries, while
also not requiring export for sharing.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Tyler Retzlaff
---
lib/eal/windows/fnmatch.c | 172 -
lib/eal/windows/include/fnmatch.h | 175 +++---
lib/eal/windows/meson.build | 1 -
3 files changed, 162 insertions(+), 186 deletions(-)
delete mode 100644 lib/eal/windows/fnmatch.c
diff --git a/lib/eal/windows/fnmatch.c b/lib/eal/windows/fnmatch.c
deleted file mode 100644
index f622bf54c5..00
--- a/lib/eal/windows/fnmatch.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 1989, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)fnmatch.c8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-#include
-#include
-#include
-
-#include "fnmatch.h"
-
-#define EOS'\0'
-
-static const char *rangematch(const char *, char, int);
-
-int
-fnmatch(const char *pattern, const char *string, int flags)
-{
- const char *stringstart;
- char c, test;
-
- for (stringstart = string;;)
- switch (c = *pattern++) {
- case EOS:
- if ((flags & FNM_LEADING_DIR) && *string == '/')
- return (0);
- return (*string == EOS ? 0 : FNM_NOMATCH);
- case '?':
- if (*string == EOS)
- return (FNM_NOMATCH);
- if (*string == '/' && (flags & FNM_PATHNAME))
- return (FNM_NOMATCH);
- if (*string == '.' && (flags & FNM_PERIOD) &&
- (string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
- return (FNM_NOMATCH);
- ++string;
- break;
- case '*':
- c = *pattern;
- /* Collapse multiple stars. */
- while (c == '*')
- c = *++pattern;
-
- if (*string == '.' && (flags & FNM_PERIOD) &&
- (string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
- return (FNM_NOMATCH);
-
- /* Optimize for pattern with * at end or before /. */
- if (c == EOS)
- if (flags & FNM_PATHNAME)
- return ((flags & FNM_LEADING_DIR) ||
- strchr(string, '/') == NULL ?
- 0 : FNM_NOMATCH);
- else
- return (0);
- else if (c == '/' && flags & FNM_PATHNAME) {
- string = strchr(string, '/');
- if (string == NULL)
- return (FNM_NOMATCH);
- break;
- }
-
- /* General case, use recursion. */
- while ((test = *string) != EOS) {
- if (!fnmatch(pattern, string,
- flags & ~FNM_PERIOD))
- return (0);
- if (test == '/' && flags & FNM_PATHNAME)
- break;
- ++string;
- }
- return (FNM_NOMATCH);
- case '[':
- if (*string == EOS)
- return (FNM_NOMATCH);
- if (*string == '/' && flags & FNM_PATHNAME)
- return (FNM_NOMATCH);
- pattern = rangematch(pattern, *string, flags);
- if (pattern == NULL)
- return (FNM_NOMATCH);
- ++string;
- break;
- case '\\':
- if (!(flags & FNM_NOESCAPE)) {
- c
[PATCH v6 2/3] log: separate logging functions out of EAL
Move the logging capability to a separate library, free from EAL. Rename
files as appropriate, and use meson.build to select the correct file to
be built for each operating system, rather than having a subdir per-os.
Add new documentation section in programmers guide to cover logging in
more detail.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Tyler Retzlaff
---
doc/api/doxy-api.conf.in | 1 +
.../prog_guide/env_abstraction_layer.rst | 4 +-
doc/guides/prog_guide/index.rst | 1 +
doc/guides/prog_guide/log_lib.rst | 115 ++
lib/eal/common/eal_common_options.c | 2 +-
lib/eal/common/eal_private.h | 7 --
lib/eal/common/meson.build| 1 -
lib/eal/include/meson.build | 1 -
lib/eal/linux/eal.c | 2 +-
lib/eal/linux/meson.build | 1 -
lib/eal/meson.build | 2 +-
lib/eal/version.map | 17 ---
lib/eal/windows/eal.c | 2 +-
lib/eal/windows/meson.build | 1 -
lib/kvargs/meson.build| 3 +-
.../common/eal_common_log.c => log/log.c} | 7 +-
lib/log/log_freebsd.c | 12 ++
.../common/eal_log.h => log/log_internal.h} | 18 ++-
lib/{eal/linux/eal_log.c => log/log_linux.c} | 2 +-
.../windows/eal_log.c => log/log_windows.c} | 2 +-
lib/log/meson.build | 9 ++
lib/{eal/include => log}/rte_log.h| 0
lib/log/version.map | 34 ++
lib/meson.build | 1 +
lib/telemetry/meson.build | 3 +-
25 files changed, 202 insertions(+), 46 deletions(-)
create mode 100644 doc/guides/prog_guide/log_lib.rst
rename lib/{eal/common/eal_common_log.c => log/log.c} (99%)
create mode 100644 lib/log/log_freebsd.c
rename lib/{eal/common/eal_log.h => log/log_internal.h} (69%)
rename lib/{eal/linux/eal_log.c => log/log_linux.c} (97%)
rename lib/{eal/windows/eal_log.c => log/log_windows.c} (93%)
create mode 100644 lib/log/meson.build
rename lib/{eal/include => log}/rte_log.h (100%)
create mode 100644 lib/log/version.map
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 1a4210b948..40f7dd2877 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -52,6 +52,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \
@TOPDIR@/lib/kni \
@TOPDIR@/lib/kvargs \
@TOPDIR@/lib/latencystats \
+ @TOPDIR@/lib/log \
@TOPDIR@/lib/lpm \
@TOPDIR@/lib/mbuf \
@TOPDIR@/lib/member \
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst
b/doc/guides/prog_guide/env_abstraction_layer.rst
index 93c8a031be..8033f6cebd 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -443,9 +443,7 @@ Per-lcore variables are implemented using *Thread Local
Storage* (TLS) to provid
Logs
-A logging API is provided by EAL.
-By default, in a Linux application, logs are sent to syslog and also to the
console.
-However, the log function can be overridden by the user to use a different
logging mechanism.
+While originally part of EAL, DPDK logging functionality is now provided by
the :ref:`Log_Library`.
Trace and Debug Functions
^
diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst
index d89cd3edb6..ac91060992 100644
--- a/doc/guides/prog_guide/index.rst
+++ b/doc/guides/prog_guide/index.rst
@@ -12,6 +12,7 @@ Programmer's Guide
overview
source_org
env_abstraction_layer
+log_lib
service_cores
trace_lib
rcu_lib
diff --git a/doc/guides/prog_guide/log_lib.rst
b/doc/guides/prog_guide/log_lib.rst
new file mode 100644
index 00..706ddcfef3
--- /dev/null
+++ b/doc/guides/prog_guide/log_lib.rst
@@ -0,0 +1,115 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2023 Intel Corporation.
+
+.. _log_library:
+
+Log Library
+
+
+The DPDK Log library provides the logging functionality for other DPDK
libraries and drivers.
+By default, in a Linux application, logs are sent to syslog and also to the
console.
+On FreeBSD and Windows applications, logs are sent only to the console.
+However, the log function can be overridden by the user to use a different
logging mechanism.
+
+Log Levels
+---
+
+Log messages from apps and libraries are reported with a given level of
severity.
+These levels, specified in ``rte_log.h`` are (from most to least important):
+
+#. Emergency
+#. Alert
+#. Critical
+#. Error
+#. Warning
+#. Notice
+#. Information
+#. Debug
+
+At runtim
[PATCH v6 3/3] telemetry: use standard logging
Now that logging is moved out of EAL, we don't need injection of the
logtype and logging function from EAL to telemetry library, simplifying
things.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Tyler Retzlaff
---
lib/eal/freebsd/eal.c | 6 +-
lib/eal/linux/eal.c| 6 +-
lib/telemetry/telemetry.c | 11 +++
lib/telemetry/telemetry_internal.h | 3 +--
4 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index dfe973e6fd..0175d89e4b 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -898,13 +898,9 @@ rte_eal_init(int argc, char **argv)
return -1;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
!internal_conf->no_telemetry) {
- int tlog = rte_log_register_type_and_pick_level(
- "lib.telemetry", RTE_LOG_WARNING);
- if (tlog < 0)
- tlog = RTE_LOGTYPE_EAL;
if (rte_telemetry_init(rte_eal_get_runtime_dir(),
rte_version(),
- &internal_conf->ctrl_cpuset, rte_log, tlog) !=
0)
+ &internal_conf->ctrl_cpuset) != 0)
return -1;
}
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 2f9203c87d..543cbe75fa 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1333,13 +1333,9 @@ rte_eal_init(int argc, char **argv)
return -1;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
!internal_conf->no_telemetry) {
- int tlog = rte_log_register_type_and_pick_level(
- "lib.telemetry", RTE_LOG_WARNING);
- if (tlog < 0)
- tlog = RTE_LOGTYPE_EAL;
if (rte_telemetry_init(rte_eal_get_runtime_dir(),
rte_version(),
- &internal_conf->ctrl_cpuset, rte_log, tlog) !=
0)
+ &internal_conf->ctrl_cpuset) != 0)
return -1;
}
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 590720bfa6..7d0488a6d7 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -54,11 +54,9 @@ static struct socket v1_socket; /* socket for v1 telemetry */
static const char *telemetry_version; /* save rte_version */
static const char *socket_dir;/* runtime directory */
static rte_cpuset_t *thread_cpuset;
-static rte_log_fn rte_log_ptr;
-static uint32_t logtype;
-#define TMTY_LOG(l, ...) \
-rte_log_ptr(RTE_LOG_ ## l, logtype, "TELEMETRY: " __VA_ARGS__)
+RTE_LOG_REGISTER_DEFAULT(logtype, WARNING);
+#define TMTY_LOG(l, ...) rte_log(RTE_LOG_ ## l, logtype, "TELEMETRY: "
__VA_ARGS__)
/* list of command callbacks, with one command registered by default */
static struct cmd_callback *callbacks;
@@ -627,14 +625,11 @@ telemetry_v2_init(void)
#endif /* !RTE_EXEC_ENV_WINDOWS */
int32_t
-rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset,
- rte_log_fn log_fn, uint32_t registered_logtype)
+rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset)
{
telemetry_version = rte_version;
socket_dir = runtime_dir;
thread_cpuset = cpuset;
- rte_log_ptr = log_fn;
- logtype = registered_logtype;
#ifndef RTE_EXEC_ENV_WINDOWS
if (telemetry_v2_init() != 0)
diff --git a/lib/telemetry/telemetry_internal.h
b/lib/telemetry/telemetry_internal.h
index 80e2bd3a49..b331e9458f 100644
--- a/lib/telemetry/telemetry_internal.h
+++ b/lib/telemetry/telemetry_internal.h
@@ -108,7 +108,6 @@ typedef int (*rte_log_fn)(uint32_t level, uint32_t logtype,
const char *format,
*/
__rte_internal
int
-rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset,
- rte_log_fn log_fn, uint32_t registered_logtype);
+rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset);
#endif
--
2.39.2
Re: [PATCH 0/3] version: 23.11-rc0
31/07/2023 12:02, Bruce Richardson: > On Mon, Jul 31, 2023 at 11:43:52AM +0200, David Marchand wrote: > > Prepare the new release. > > > > I chose to separate the compat code cleanup in the telemetry and vhost > > libraries for making it easier to review, though the 3 patches could be > > squashed in a single change. > > > I actually think they are better kept separate on apply. It's more in > keeping with the principle of each patch doing one thing, and you can also > track the acks from the individual library maintainers for patches 2 & 3. +1 for keeping patches separate
[PATCH] build: update DPDK to use C11 standard
As previously announced, DPDK 23.11 will require a C11 supporting
compiler and will use the C11 standard in all builds.
Signed-off-by: Bruce Richardson
---
When moving the information about the new requirement to the release
notes, a change like this doesn't seem to fit into any existing section.
Given its global scope and importance, I've therefore just put it on
top of the file, rather than in any section.
---
doc/guides/linux_gsg/sys_reqs.rst | 3 ++-
doc/guides/rel_notes/deprecation.rst | 18 --
doc/guides/rel_notes/release_23_11.rst | 17 +
meson.build| 1 +
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/doc/guides/linux_gsg/sys_reqs.rst
b/doc/guides/linux_gsg/sys_reqs.rst
index dfeaf4e1c5..13be715933 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -27,7 +27,8 @@ Compilation of the DPDK
The setup commands and installed packages needed on various systems may be
different.
For details on Linux distributions and the versions tested, please consult
the DPDK Release Notes.
-* General development tools including a supported C compiler such as gcc
(version 4.9+) or clang (version 3.4+),
+* General development tools including a C compiler supporting the C11
standard,
+including standard atomics, for example: GCC (version 5.0+) or Clang
(version 3.6+),
and ``pkg-config`` or ``pkgconf`` to be used when building end-user
binaries against DPDK.
* For RHEL/Fedora systems these can be installed using ``dnf groupinstall
"Development Tools"``
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 494b401cda..cc939d3c67 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -17,24 +17,6 @@ Other API and ABI deprecation notices are to be posted below.
Deprecation Notices
---
-* C Compiler: From DPDK 23.11 onwards,
- building DPDK will require a C compiler which supports the C11 standard,
- including support for C11 standard atomics.
-
- More specifically, the requirements will be:
-
- * Support for flag "-std=c11" (or similar)
- * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
-
- Please note:
-
- * C11, including standard atomics, is supported from GCC version 5 onwards,
-and is the default language version in that release
-(Ref: https://gcc.gnu.org/gcc-5/changes.html)
- * C11 is the default compilation mode in Clang from version 3.6,
-which also added support for standard atomics
-(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
-
* build: Enabling deprecated libraries (``flow_classify``, ``kni``)
won't be possible anymore through the use of the ``disable_libs`` build
option.
A new build option for deprecated libraries will be introduced instead.
diff --git a/doc/guides/rel_notes/release_23_11.rst
b/doc/guides/rel_notes/release_23_11.rst
index 6b4dd21fd0..c8b9ed456c 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -20,6 +20,23 @@ DPDK Release 23.11
ninja -C build doc
xdg-open build/doc/guides/html/rel_notes/release_23_11.html
+* Build Requirements: From DPDK 23.11 onwards,
+ building DPDK will require a C compiler which supports the C11 standard,
+ including support for C11 standard atomics.
+
+ More specifically, the requirements will be:
+
+ * Support for flag "-std=c11" (or similar)
+ * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
+
+ Please note:
+
+ * C11, including standard atomics, is supported from GCC version 5 onwards,
+and is the default language version in that release
+(Ref: https://gcc.gnu.org/gcc-5/changes.html)
+ * C11 is the default compilation mode in Clang from version 3.6,
+which also added support for standard atomics
+(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
New Features
diff --git a/meson.build b/meson.build
index 39cb73846d..70b54f0c98 100644
--- a/meson.build
+++ b/meson.build
@@ -9,6 +9,7 @@ project('DPDK', 'c',
license: 'BSD',
default_options: [
'buildtype=release',
+'c_std=c11',
'default_library=static',
'warning_level=2',
],
--
2.39.2
RE: [PATCH] build: update DPDK to use C11 standard
> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > Sent: Monday, 31 July 2023 12.39 > > As previously announced, DPDK 23.11 will require a C11 supporting > compiler and will use the C11 standard in all builds. > > Signed-off-by: Bruce Richardson > > --- Acked-by: Morten Brørup
[PATCH v2 1/7] drivers: changes for dmadev driver
Dmadev driver changes to align with dpdk spec.
Signed-off-by: Amit Prakash Shukla
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/dma/cnxk/cnxk_dmadev.c | 464 -
drivers/dma/cnxk/cnxk_dmadev.h | 24 +-
2 files changed, 294 insertions(+), 194 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index a6f4a31e0e..a0152fc6df 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -7,68 +7,76 @@
#include
#include
+#include
+#include
#include
#include
#include
#include
-#include
-#include
-#include
#include
static int
-cnxk_dmadev_info_get(const struct rte_dma_dev *dev,
-struct rte_dma_info *dev_info, uint32_t size)
+cnxk_dmadev_info_get(const struct rte_dma_dev *dev, struct rte_dma_info
*dev_info, uint32_t size)
{
RTE_SET_USED(dev);
RTE_SET_USED(size);
dev_info->max_vchans = 1;
dev_info->nb_vchans = 1;
- dev_info->dev_capa = RTE_DMA_CAPA_MEM_TO_MEM |
- RTE_DMA_CAPA_MEM_TO_DEV | RTE_DMA_CAPA_DEV_TO_MEM |
- RTE_DMA_CAPA_DEV_TO_DEV | RTE_DMA_CAPA_OPS_COPY |
- RTE_DMA_CAPA_OPS_COPY_SG;
+ dev_info->dev_capa = RTE_DMA_CAPA_MEM_TO_MEM | RTE_DMA_CAPA_MEM_TO_DEV |
+RTE_DMA_CAPA_DEV_TO_MEM | RTE_DMA_CAPA_DEV_TO_DEV |
+RTE_DMA_CAPA_OPS_COPY | RTE_DMA_CAPA_OPS_COPY_SG;
dev_info->max_desc = DPI_MAX_DESC;
- dev_info->min_desc = 1;
+ dev_info->min_desc = 2;
dev_info->max_sges = DPI_MAX_POINTER;
return 0;
}
static int
-cnxk_dmadev_configure(struct rte_dma_dev *dev,
- const struct rte_dma_conf *conf, uint32_t conf_sz)
+cnxk_dmadev_configure(struct rte_dma_dev *dev, const struct rte_dma_conf
*conf, uint32_t conf_sz)
{
struct cnxk_dpi_vf_s *dpivf = NULL;
int rc = 0;
RTE_SET_USED(conf);
- RTE_SET_USED(conf);
- RTE_SET_USED(conf_sz);
RTE_SET_USED(conf_sz);
+
dpivf = dev->fp_obj->dev_private;
+
+ if (dpivf->flag & CNXK_DPI_DEV_CONFIG)
+ return rc;
+
rc = roc_dpi_configure(&dpivf->rdpi);
- if (rc < 0)
+ if (rc < 0) {
plt_err("DMA configure failed err = %d", rc);
+ goto done;
+ }
+ dpivf->flag |= CNXK_DPI_DEV_CONFIG;
+
+done:
return rc;
}
static int
cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan,
- const struct rte_dma_vchan_conf *conf,
- uint32_t conf_sz)
+ const struct rte_dma_vchan_conf *conf, uint32_t conf_sz)
{
struct cnxk_dpi_vf_s *dpivf = dev->fp_obj->dev_private;
- struct cnxk_dpi_compl_s *comp_data;
- union dpi_instr_hdr_s *header = &dpivf->conf.hdr;
+ struct cnxk_dpi_conf *dpi_conf = &dpivf->conf;
+ union dpi_instr_hdr_s *header = &dpi_conf->hdr;
+ uint16_t max_desc;
+ uint32_t size;
int i;
RTE_SET_USED(vchan);
RTE_SET_USED(conf_sz);
+ if (dpivf->flag & CNXK_DPI_VCHAN_CONFIG)
+ return 0;
+
header->cn9k.pt = DPI_HDR_PT_ZBW_CA;
switch (conf->direction) {
@@ -96,35 +104,54 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
header->cn9k.fport = conf->dst_port.pcie.coreid;
};
- for (i = 0; i < conf->nb_desc; i++) {
- comp_data = rte_zmalloc(NULL, sizeof(*comp_data), 0);
- if (comp_data == NULL) {
- plt_err("Failed to allocate for comp_data");
- return -ENOMEM;
- }
- comp_data->cdata = DPI_REQ_CDATA;
- dpivf->conf.c_desc.compl_ptr[i] = comp_data;
- };
- dpivf->conf.c_desc.max_cnt = DPI_MAX_DESC;
- dpivf->conf.c_desc.head = 0;
- dpivf->conf.c_desc.tail = 0;
+ max_desc = conf->nb_desc;
+ if (!rte_is_power_of_2(max_desc))
+ max_desc = rte_align32pow2(max_desc);
+
+ if (max_desc > DPI_MAX_DESC)
+ max_desc = DPI_MAX_DESC;
+
+ size = (max_desc * sizeof(struct cnxk_dpi_compl_s *));
+ dpi_conf->c_desc.compl_ptr = rte_zmalloc(NULL, size, 0);
+
+ if (dpi_conf->c_desc.compl_ptr == NULL) {
+ plt_err("Failed to allocate for comp_data");
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < max_desc; i++) {
+ dpi_conf->c_desc.compl_ptr[i] =
+ rte_zmalloc(NULL, sizeof(struct cnxk_dpi_compl_s), 0);
+ dpi_conf->c_desc.compl_ptr[i]->cdata = DPI_REQ_CDATA;
+ }
+
+ dpi_conf->c_desc.max_cnt = (max_desc - 1);
+ dpi_conf->c_desc.head = 0;
+ dpi_conf->c_desc.tail = 0;
+ dpivf->pnum_words = 0;
+ dpivf->pending = 0;
+ dpivf->flag |= CNXK_DPI_VCHAN_CONFIG;
return 0;
}
[PATCH v2 2/7] dma/cnxk: add DMA devops for all models of cn10xxx
Valid function pointers are set for DMA device operations
i.e. cn10k_dmadev_ops are used for all cn10k devices.
Signed-off-by: Radha Mohan Chintakuntla
Signed-off-by: Amit Prakash Shukla
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/dma/cnxk/cnxk_dmadev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index a0152fc6df..1dc124e68f 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -763,7 +763,9 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv
__rte_unused, struct rte_pci_de
dmadev->fp_obj->burst_capacity = cnxk_damdev_burst_capacity;
if (pci_dev->id.subsystem_device_id == PCI_SUBSYSTEM_DEVID_CN10KA ||
+ pci_dev->id.subsystem_device_id == PCI_SUBSYSTEM_DEVID_CN10KAS ||
pci_dev->id.subsystem_device_id == PCI_SUBSYSTEM_DEVID_CNF10KA ||
+ pci_dev->id.subsystem_device_id == PCI_SUBSYSTEM_DEVID_CNF10KB ||
pci_dev->id.subsystem_device_id == PCI_SUBSYSTEM_DEVID_CN10KB) {
dmadev->dev_ops = &cn10k_dmadev_ops;
dmadev->fp_obj->copy = cn10k_dmadev_copy;
--
2.25.1
[PATCH v2 3/7] dma/cnxk: update func field based on transfer type
Use pfid and vfid of src_port for incoming DMA transfers and dst_port
for outgoing DMA transfers.
Signed-off-by: Radha Mohan Chintakuntla
Signed-off-by: Amit Prakash Shukla
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/dma/cnxk/cnxk_dmadev.c | 26 ++
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 1dc124e68f..d8cfb98cd7 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -84,13 +84,21 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
header->cn9k.xtype = DPI_XTYPE_INBOUND;
header->cn9k.lport = conf->src_port.pcie.coreid;
header->cn9k.fport = 0;
- header->cn9k.pvfe = 1;
+ header->cn9k.pvfe = conf->src_port.pcie.vfen;
+ if (header->cn9k.pvfe) {
+ header->cn9k.func = conf->src_port.pcie.pfid << 12;
+ header->cn9k.func |= conf->src_port.pcie.vfid;
+ }
break;
case RTE_DMA_DIR_MEM_TO_DEV:
header->cn9k.xtype = DPI_XTYPE_OUTBOUND;
header->cn9k.lport = 0;
header->cn9k.fport = conf->dst_port.pcie.coreid;
- header->cn9k.pvfe = 1;
+ header->cn9k.pvfe = conf->dst_port.pcie.vfen;
+ if (header->cn9k.pvfe) {
+ header->cn9k.func = conf->dst_port.pcie.pfid << 12;
+ header->cn9k.func |= conf->dst_port.pcie.vfid;
+ }
break;
case RTE_DMA_DIR_MEM_TO_MEM:
header->cn9k.xtype = DPI_XTYPE_INTERNAL_ONLY;
@@ -102,6 +110,7 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
header->cn9k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
header->cn9k.lport = conf->src_port.pcie.coreid;
header->cn9k.fport = conf->dst_port.pcie.coreid;
+ header->cn9k.pvfe = 0;
};
max_desc = conf->nb_desc;
@@ -159,13 +168,21 @@ cn10k_dmadev_vchan_setup(struct rte_dma_dev *dev,
uint16_t vchan,
header->cn10k.xtype = DPI_XTYPE_INBOUND;
header->cn10k.lport = conf->src_port.pcie.coreid;
header->cn10k.fport = 0;
- header->cn10k.pvfe = 1;
+ header->cn10k.pvfe = conf->src_port.pcie.vfen;
+ if (header->cn10k.pvfe) {
+ header->cn10k.func = conf->src_port.pcie.pfid << 12;
+ header->cn10k.func |= conf->src_port.pcie.vfid;
+ }
break;
case RTE_DMA_DIR_MEM_TO_DEV:
header->cn10k.xtype = DPI_XTYPE_OUTBOUND;
header->cn10k.lport = 0;
header->cn10k.fport = conf->dst_port.pcie.coreid;
- header->cn10k.pvfe = 1;
+ header->cn10k.pvfe = conf->dst_port.pcie.vfen;
+ if (header->cn10k.pvfe) {
+ header->cn10k.func = conf->dst_port.pcie.pfid << 12;
+ header->cn10k.func |= conf->dst_port.pcie.vfid;
+ }
break;
case RTE_DMA_DIR_MEM_TO_MEM:
header->cn10k.xtype = DPI_XTYPE_INTERNAL_ONLY;
@@ -177,6 +194,7 @@ cn10k_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
header->cn10k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
header->cn10k.lport = conf->src_port.pcie.coreid;
header->cn10k.fport = conf->dst_port.pcie.coreid;
+ header->cn10k.pvfe = 0;
};
max_desc = conf->nb_desc;
--
2.25.1
[PATCH v2 4/7] dma/cnxk: increase vchan per queue to max 4
To support multiple directions in same queue make use of multiple vchan
per queue. Each vchan can be configured in some direction and used.
Signed-off-by: Amit Prakash Shukla
Signed-off-by: Radha Mohan Chintakuntla
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/dma/cnxk/cnxk_dmadev.c | 68 +++---
drivers/dma/cnxk/cnxk_dmadev.h | 11 +++---
2 files changed, 36 insertions(+), 43 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index d8cfb98cd7..7d83b70e8b 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -22,8 +22,8 @@ cnxk_dmadev_info_get(const struct rte_dma_dev *dev, struct
rte_dma_info *dev_inf
RTE_SET_USED(dev);
RTE_SET_USED(size);
- dev_info->max_vchans = 1;
- dev_info->nb_vchans = 1;
+ dev_info->max_vchans = MAX_VCHANS_PER_QUEUE;
+ dev_info->nb_vchans = MAX_VCHANS_PER_QUEUE;
dev_info->dev_capa = RTE_DMA_CAPA_MEM_TO_MEM | RTE_DMA_CAPA_MEM_TO_DEV |
RTE_DMA_CAPA_DEV_TO_MEM | RTE_DMA_CAPA_DEV_TO_DEV |
RTE_DMA_CAPA_OPS_COPY | RTE_DMA_CAPA_OPS_COPY_SG;
@@ -65,13 +65,12 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
const struct rte_dma_vchan_conf *conf, uint32_t conf_sz)
{
struct cnxk_dpi_vf_s *dpivf = dev->fp_obj->dev_private;
- struct cnxk_dpi_conf *dpi_conf = &dpivf->conf;
+ struct cnxk_dpi_conf *dpi_conf = &dpivf->conf[vchan];
union dpi_instr_hdr_s *header = &dpi_conf->hdr;
uint16_t max_desc;
uint32_t size;
int i;
- RTE_SET_USED(vchan);
RTE_SET_USED(conf_sz);
if (dpivf->flag & CNXK_DPI_VCHAN_CONFIG)
@@ -149,13 +148,12 @@ cn10k_dmadev_vchan_setup(struct rte_dma_dev *dev,
uint16_t vchan,
const struct rte_dma_vchan_conf *conf, uint32_t
conf_sz)
{
struct cnxk_dpi_vf_s *dpivf = dev->fp_obj->dev_private;
- struct cnxk_dpi_conf *dpi_conf = &dpivf->conf;
+ struct cnxk_dpi_conf *dpi_conf = &dpivf->conf[vchan];
union dpi_instr_hdr_s *header = &dpi_conf->hdr;
uint16_t max_desc;
uint32_t size;
int i;
- RTE_SET_USED(vchan);
RTE_SET_USED(conf_sz);
if (dpivf->flag & CNXK_DPI_VCHAN_CONFIG)
@@ -360,18 +358,17 @@ cnxk_dmadev_copy(void *dev_private, uint16_t vchan,
rte_iova_t src, rte_iova_t d
uint64_t flags)
{
struct cnxk_dpi_vf_s *dpivf = dev_private;
- union dpi_instr_hdr_s *header = &dpivf->conf.hdr;
+ struct cnxk_dpi_conf *dpi_conf = &dpivf->conf[vchan];
+ union dpi_instr_hdr_s *header = &dpi_conf->hdr;
struct cnxk_dpi_compl_s *comp_ptr;
uint64_t cmd[DPI_MAX_CMD_SIZE];
rte_iova_t fptr, lptr;
int num_words = 0;
int rc;
- RTE_SET_USED(vchan);
-
- comp_ptr = dpivf->conf.c_desc.compl_ptr[dpivf->conf.c_desc.tail];
+ comp_ptr = dpi_conf->c_desc.compl_ptr[dpi_conf->c_desc.tail];
header->cn9k.ptr = (uint64_t)comp_ptr;
- STRM_INC(dpivf->conf.c_desc, tail);
+ STRM_INC(dpi_conf->c_desc, tail);
header->cn9k.nfst = 1;
header->cn9k.nlst = 1;
@@ -400,7 +397,7 @@ cnxk_dmadev_copy(void *dev_private, uint16_t vchan,
rte_iova_t src, rte_iova_t d
rc = __dpi_queue_write(&dpivf->rdpi, cmd, num_words);
if (unlikely(rc)) {
- STRM_DEC(dpivf->conf.c_desc, tail);
+ STRM_DEC(dpi_conf->c_desc, tail);
return rc;
}
@@ -421,18 +418,17 @@ cnxk_dmadev_copy_sg(void *dev_private, uint16_t vchan,
const struct rte_dma_sge
const struct rte_dma_sge *dst, uint16_t nb_src, uint16_t
nb_dst, uint64_t flags)
{
struct cnxk_dpi_vf_s *dpivf = dev_private;
- union dpi_instr_hdr_s *header = &dpivf->conf.hdr;
+ struct cnxk_dpi_conf *dpi_conf = &dpivf->conf[vchan];
+ union dpi_instr_hdr_s *header = &dpi_conf->hdr;
const struct rte_dma_sge *fptr, *lptr;
struct cnxk_dpi_compl_s *comp_ptr;
uint64_t cmd[DPI_MAX_CMD_SIZE];
int num_words = 0;
int i, rc;
- RTE_SET_USED(vchan);
-
- comp_ptr = dpivf->conf.c_desc.compl_ptr[dpivf->conf.c_desc.tail];
+ comp_ptr = dpi_conf->c_desc.compl_ptr[dpi_conf->c_desc.tail];
header->cn9k.ptr = (uint64_t)comp_ptr;
- STRM_INC(dpivf->conf.c_desc, tail);
+ STRM_INC(dpi_conf->c_desc, tail);
/*
* For inbound case, src pointers are last pointers.
@@ -468,7 +464,7 @@ cnxk_dmadev_copy_sg(void *dev_private, uint16_t vchan,
const struct rte_dma_sge
rc = __dpi_queue_write(&dpivf->rdpi, cmd, num_words);
if (unlikely(rc)) {
- STRM_DEC(dpivf->conf.c_desc, tail);
+ STRM_DEC(dpi_conf->c_desc, tail);
return rc;
}
@@ -489,18 +485,17 @@ cn10k_dmadev_copy(void *dev_priv
[PATCH v2 5/7] dma/cnxk: vchan support enhancement
Code changes to realign dpi private structure based on vchan.
Changeset also resets DMA dev stats while starting dma device.
Signed-off-by: Amit Prakash Shukla
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/dma/cnxk/cnxk_dmadev.c | 210 -
drivers/dma/cnxk/cnxk_dmadev.h | 18 +--
2 files changed, 165 insertions(+), 63 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 7d83b70e8b..9fb3bb264a 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -16,35 +16,79 @@
#include
+static int cnxk_stats_reset(struct rte_dma_dev *dev, uint16_t vchan);
+
static int
cnxk_dmadev_info_get(const struct rte_dma_dev *dev, struct rte_dma_info
*dev_info, uint32_t size)
{
- RTE_SET_USED(dev);
+ struct cnxk_dpi_vf_s *dpivf = dev->fp_obj->dev_private;
RTE_SET_USED(size);
dev_info->max_vchans = MAX_VCHANS_PER_QUEUE;
- dev_info->nb_vchans = MAX_VCHANS_PER_QUEUE;
+ dev_info->nb_vchans = dpivf->num_vchans;
dev_info->dev_capa = RTE_DMA_CAPA_MEM_TO_MEM | RTE_DMA_CAPA_MEM_TO_DEV |
RTE_DMA_CAPA_DEV_TO_MEM | RTE_DMA_CAPA_DEV_TO_DEV |
RTE_DMA_CAPA_OPS_COPY | RTE_DMA_CAPA_OPS_COPY_SG;
dev_info->max_desc = DPI_MAX_DESC;
- dev_info->min_desc = 2;
+ dev_info->min_desc = DPI_MIN_DESC;
dev_info->max_sges = DPI_MAX_POINTER;
return 0;
}
+static int
+cnxk_dmadev_vchan_free(struct cnxk_dpi_vf_s *dpivf, uint16_t vchan)
+{
+ struct cnxk_dpi_conf *dpi_conf;
+ uint16_t num_vchans;
+ uint16_t max_desc;
+ int i, j;
+
+ if (vchan == RTE_DMA_ALL_VCHAN) {
+ num_vchans = dpivf->num_vchans;
+ i = 0;
+ } else {
+ if (vchan >= MAX_VCHANS_PER_QUEUE)
+ return -EINVAL;
+
+ num_vchans = vchan + 1;
+ i = vchan;
+ }
+
+ for (; i < num_vchans; i++) {
+ dpi_conf = &dpivf->conf[i];
+ max_desc = dpi_conf->c_desc.max_cnt;
+ if (dpi_conf->c_desc.compl_ptr) {
+ for (j = 0; j < max_desc; j++)
+ rte_free(dpi_conf->c_desc.compl_ptr[j]);
+ }
+
+ rte_free(dpi_conf->c_desc.compl_ptr);
+ dpi_conf->c_desc.compl_ptr = NULL;
+ }
+
+ return 0;
+}
+
static int
cnxk_dmadev_configure(struct rte_dma_dev *dev, const struct rte_dma_conf
*conf, uint32_t conf_sz)
{
struct cnxk_dpi_vf_s *dpivf = NULL;
int rc = 0;
- RTE_SET_USED(conf);
RTE_SET_USED(conf_sz);
dpivf = dev->fp_obj->dev_private;
+ /* Accept only number of vchans as config from application. */
+ if (!(dpivf->flag & CNXK_DPI_DEV_START)) {
+ /* After config function, vchan setup function has to be called.
+* Free up vchan memory if any, before configuring num_vchans.
+*/
+ cnxk_dmadev_vchan_free(dpivf, RTE_DMA_ALL_VCHAN);
+ dpivf->num_vchans = conf->nb_vchans;
+ }
+
if (dpivf->flag & CNXK_DPI_DEV_CONFIG)
return rc;
@@ -73,7 +117,7 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
RTE_SET_USED(conf_sz);
- if (dpivf->flag & CNXK_DPI_VCHAN_CONFIG)
+ if (dpivf->flag & CNXK_DPI_DEV_START)
return 0;
header->cn9k.pt = DPI_HDR_PT_ZBW_CA;
@@ -112,6 +156,9 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
header->cn9k.pvfe = 0;
};
+ /* Free up descriptor memory before allocating. */
+ cnxk_dmadev_vchan_free(dpivf, vchan);
+
max_desc = conf->nb_desc;
if (!rte_is_power_of_2(max_desc))
max_desc = rte_align32pow2(max_desc);
@@ -130,15 +177,15 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
for (i = 0; i < max_desc; i++) {
dpi_conf->c_desc.compl_ptr[i] =
rte_zmalloc(NULL, sizeof(struct cnxk_dpi_compl_s), 0);
+ if (!dpi_conf->c_desc.compl_ptr[i]) {
+ plt_err("Failed to allocate for descriptor memory");
+ return -ENOMEM;
+ }
+
dpi_conf->c_desc.compl_ptr[i]->cdata = DPI_REQ_CDATA;
}
dpi_conf->c_desc.max_cnt = (max_desc - 1);
- dpi_conf->c_desc.head = 0;
- dpi_conf->c_desc.tail = 0;
- dpivf->pnum_words = 0;
- dpivf->pending = 0;
- dpivf->flag |= CNXK_DPI_VCHAN_CONFIG;
return 0;
}
@@ -156,7 +203,7 @@ cn10k_dmadev_vchan_setup(struct rte_dma_dev *dev, uint16_t
vchan,
RTE_SET_USED(conf_sz);
- if (dpivf->flag & CNXK_DPI_VCHAN_CONFIG)
+ if (dpivf->flag & CNXK_DPI_DEV_START)
return 0;
header->cn10k.pt = DPI_HDR
[PATCH v2 6/7] common/cnxk: use unique name for DPI memzone
roc_dpi was using vfid as part of name for memzone allocation.
This led to memzone allocation failure in case of multiple
physical functions.
vfid is not unique by itself since multiple physical functions
can have the same virtual function indices.
So use complete DBDF as part of memzone name to make it unique.
Signed-off-by: Radha Mohan Chintakuntla
Signed-off-by: Amit Prakash Shukla
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/common/cnxk/roc_dpi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c
index 93c8318a3d..0e2f803077 100644
--- a/drivers/common/cnxk/roc_dpi.c
+++ b/drivers/common/cnxk/roc_dpi.c
@@ -81,10 +81,10 @@ roc_dpi_configure(struct roc_dpi *roc_dpi)
return rc;
}
- snprintf(name, sizeof(name), "dpimem%d", roc_dpi->vfid);
+ snprintf(name, sizeof(name), "dpimem%d:%d:%d:%d", pci_dev->addr.domain,
pci_dev->addr.bus,
+pci_dev->addr.devid, pci_dev->addr.function);
buflen = DPI_CMD_QUEUE_SIZE * DPI_CMD_QUEUE_BUFS;
- dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0,
-DPI_CMD_QUEUE_SIZE);
+ dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0,
DPI_CMD_QUEUE_SIZE);
if (dpi_mz == NULL) {
plt_err("dpi memzone reserve failed");
rc = -ENOMEM;
--
2.25.1
[PATCH v2 7/7] dma/cnxk: add completion ring tail wrap check
From: Vamsi Attunuru
Adds a check to avoid tail wrap when completion desc ring
is full. Also patch increase max desc size to 2048.
Signed-off-by: Vamsi Attunuru
---
v2:
- Fix for bugs observed in v1.
- Squashed few commits.
drivers/dma/cnxk/cnxk_dmadev.c | 22 --
drivers/dma/cnxk/cnxk_dmadev.h | 2 +-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 9fb3bb264a..288606bb3d 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -434,6 +434,11 @@ cnxk_dmadev_copy(void *dev_private, uint16_t vchan,
rte_iova_t src, rte_iova_t d
header->cn9k.ptr = (uint64_t)comp_ptr;
STRM_INC(dpi_conf->c_desc, tail);
+ if (unlikely(dpi_conf->c_desc.tail == dpi_conf->c_desc.head)) {
+ STRM_DEC(dpi_conf->c_desc, tail);
+ return -ENOSPC;
+ }
+
header->cn9k.nfst = 1;
header->cn9k.nlst = 1;
@@ -494,6 +499,11 @@ cnxk_dmadev_copy_sg(void *dev_private, uint16_t vchan,
const struct rte_dma_sge
header->cn9k.ptr = (uint64_t)comp_ptr;
STRM_INC(dpi_conf->c_desc, tail);
+ if (unlikely(dpi_conf->c_desc.tail == dpi_conf->c_desc.head)) {
+ STRM_DEC(dpi_conf->c_desc, tail);
+ return -ENOSPC;
+ }
+
/*
* For inbound case, src pointers are last pointers.
* For all other cases, src pointers are first pointers.
@@ -561,6 +571,11 @@ cn10k_dmadev_copy(void *dev_private, uint16_t vchan,
rte_iova_t src, rte_iova_t
header->cn10k.ptr = (uint64_t)comp_ptr;
STRM_INC(dpi_conf->c_desc, tail);
+ if (unlikely(dpi_conf->c_desc.tail == dpi_conf->c_desc.head)) {
+ STRM_DEC(dpi_conf->c_desc, tail);
+ return -ENOSPC;
+ }
+
header->cn10k.nfst = 1;
header->cn10k.nlst = 1;
@@ -613,6 +628,11 @@ cn10k_dmadev_copy_sg(void *dev_private, uint16_t vchan,
const struct rte_dma_sge
header->cn10k.ptr = (uint64_t)comp_ptr;
STRM_INC(dpi_conf->c_desc, tail);
+ if (unlikely(dpi_conf->c_desc.tail == dpi_conf->c_desc.head)) {
+ STRM_DEC(dpi_conf->c_desc, tail);
+ return -ENOSPC;
+ }
+
header->cn10k.nfst = nb_src & DPI_MAX_POINTER;
header->cn10k.nlst = nb_dst & DPI_MAX_POINTER;
fptr = &src[0];
@@ -695,8 +715,6 @@ cnxk_dmadev_completed_status(void *dev_private, uint16_t
vchan, const uint16_t n
struct cnxk_dpi_compl_s *comp_ptr;
int cnt;
- RTE_SET_USED(last_idx);
-
for (cnt = 0; cnt < nb_cpls; cnt++) {
comp_ptr = c_desc->compl_ptr[c_desc->head];
status[cnt] = comp_ptr->cdata;
diff --git a/drivers/dma/cnxk/cnxk_dmadev.h b/drivers/dma/cnxk/cnxk_dmadev.h
index f375143b16..9c6c898d23 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.h
+++ b/drivers/dma/cnxk/cnxk_dmadev.h
@@ -9,7 +9,7 @@
#define DPI_MAX_POINTER 15
#define STRM_INC(s, var) ((s).var = ((s).var + 1) & (s).max_cnt)
#define STRM_DEC(s, var) ((s).var = ((s).var - 1) == -1 ? (s).max_cnt :
((s).var - 1))
-#define DPI_MAX_DESC1024
+#define DPI_MAX_DESC2048
#define DPI_MIN_DESC2
#define MAX_VCHANS_PER_QUEUE 4
--
2.25.1
Re: [PATCH v4] eal: non-temporal memcpy
Hello, What's the status of this feature? 10/10/2022 08:46, Morten Brørup: > This patch provides a function for memory copy using non-temporal store, > load or both, controlled by flags passed to the function. > > Applications sometimes copy data to another memory location, which is only > used much later. > In this case, it is inefficient to pollute the data cache with the copied > data. > > An example use case (originating from a real life application): > Copying filtered packets, or the first part of them, into a capture buffer > for offline analysis. > > The purpose of the function is to achieve a performance gain by not > polluting the cache when copying data. > Although the throughput can be improved by further optimization, I do not > have time to do it now. > > The functional tests and performance tests for memory copy have been > expanded to include non-temporal copying. > > A non-temporal version of the mbuf library's function to create a full > copy of a given packet mbuf is provided. > > The packet capture and packet dump libraries have been updated to use > non-temporal memory copy of the packets. > > Implementation notes: > > Implementations for non-x86 architectures can be provided by anyone at a > later time. I am not going to do it. > > x86 non-temporal load instructions must be 16 byte aligned [1], and > non-temporal store instructions must be 4, 8 or 16 byte aligned [2]. > > ARM non-temporal load and store instructions seem to require 4 byte > alignment [3]. > > [1] https://www.intel.com/content/www/us/en/docs/intrinsics-guide/ > index.html#text=_mm_stream_load > [2] https://www.intel.com/content/www/us/en/docs/intrinsics-guide/ > index.html#text=_mm_stream_si > [3] https://developer.arm.com/documentation/100076/0100/ > A64-Instruction-Set-Reference/A64-Floating-point-Instructions/ > LDNP--SIMD-and-FP- > > This patch is a major rewrite from the RFC v3, so no version log comparing > to the RFC is provided. > > v4 > * Also ignore the warning for clang int the workaround for > _mm_stream_load_si128() missing const in the parameter. > * Add missing C linkage specifier in rte_memcpy.h. > > v3 > * _mm_stream_si64() is not supported on 32-bit x86 architecture, so only > use it on 64-bit x86 architecture. > * CLANG warns that _mm_stream_load_si128_const() and > rte_memcpy_nt_15_or_less_s16a() are not public, > so remove __rte_internal from them. It also affects the documentation > for the functions, so the fix can't be limited to CLANG. > * Use __rte_experimental instead of __rte_internal. > * Replace with nnn in function documentation; it doesn't look like > HTML. > * Slightly modify the workaround for _mm_stream_load_si128() missing const > in the parameter; the ancient GCC 4.5.8 in RHEL7 doesn't understand > #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers", so use > #pragma GCC diagnostic ignored "-Wcast-qual" instead. I hope that works. > * Fixed one coding style issue missed in v2. > > v2 > * The last 16 byte block of data, incl. any trailing bytes, were not > copied from the source memory area in rte_memcpy_nt_buf(). > * Fix many coding style issues. > * Add some missing header files. > * Fix build time warning for non-x86 architectures by using a different > method to mark the flags parameter unused. > * CLANG doesn't understand RTE_BUILD_BUG_ON(!__builtin_constant_p(flags)), > so omit it when using CLANG. > > Signed-off-by: Morten Brørup > --- > app/test/test_memcpy.c | 65 +- > app/test/test_memcpy_perf.c | 187 ++-- > lib/eal/include/generic/rte_memcpy.h | 127 +++ > lib/eal/x86/include/rte_memcpy.h | 1238 ++ > lib/mbuf/rte_mbuf.c | 77 ++ > lib/mbuf/rte_mbuf.h | 32 + > lib/mbuf/version.map |1 + > lib/pcapng/rte_pcapng.c |3 +- > lib/pdump/rte_pdump.c|6 +- > 9 files changed, 1645 insertions(+), 91 deletions(-)
Re: [PATCH v12 1/2] mempool cache: add zero-copy get and put functions
Olivier, Andrew, any comments? 21/07/2023 18:28, Dharmik Thakkar: > From: Morten Brørup > > Zero-copy access to mempool caches is beneficial for PMD performance. > Furthermore, having a zero-copy mempool API is considered a precondition > for fixing a certain category of bugs, present in some PMDs: For > performance reasons, some PMDs had bypassed the mempool API in order to > achieve zero-copy access to the mempool cache. This can only be fixed > in those PMDs without a performance regression if the mempool library > offers zero-copy access APIs, so the PMDs can use the proper mempool > API instead of copy-pasting code from the mempool library. > Furthermore, the copy-pasted code in those PMDs has not been kept up to > date with the improvements of the mempool library, so when they bypass > the mempool API, mempool trace is missing and mempool statistics is not > updated. > > Bugzilla ID: 1052 > > Signed-off-by: Morten Brørup > Signed-off-by: Kamalakshitha Aligeri > Signed-off-by: Dharmik Thakkar > Reviewed-by: Ruifeng Wang > Acked-by: Konstantin Ananyev > Acked-by: Chengwen Feng
Re: [PATCH 0/1] mempool: implement index-based per core cache
The v2 was not sent, and Stephen dropped the patch from patchwork. Do we abandon this feature? Should I remove it from the roadmap? 06/07/2023 19:43, Stephen Hemminger: > On Thu, 13 Jan 2022 05:31:18 + > Dharmik Thakkar wrote: > > > Hi, > > > > Thank you for your valuable review comments and suggestions! > > > > I will be sending out a v2 in which I have increased the size of the > > mempool to 32GB by using division by sizeof(uintptr_t). > > However, I am seeing ~5% performance degradation with mempool_perf_autotest > > (for bulk size of 32) with this change > > when compared to the base performance. > > Earlier, without this change, I was seeing an improvement of ~13% compared > > to base performance. So, this is a significant degradation. > > I would appreciate your review comments on v2. > > > > Thank you! > > > > > On Jan 10, 2022, at 12:38 AM, Jerin Jacob wrote: > > > > > > On Sat, Jan 8, 2022 at 3:07 PM Morten Brørup > > > wrote: > > >> > > >>> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > >>> Sent: Friday, 7 January 2022 14.51 > > >>> > > >>> On Fri, Jan 07, 2022 at 12:29:23PM +0100, Morten Brørup wrote: > > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > Sent: Friday, 7 January 2022 12.16 > > > > > > On Sat, Dec 25, 2021 at 01:16:03AM +0100, Morten Brørup wrote: > > >>> From: Dharmik Thakkar [mailto:dharmik.thak...@arm.com] Sent: > > > Friday, 24 > > >>> December 2021 23.59 > > >>> > > >>> Current mempool per core cache implementation stores pointers > > >>> to > > > mbufs > > >>> On 64b architectures, each pointer consumes 8B This patch > > >>> replaces > > > it > > >>> with index-based implementation, where in each buffer is > > >>> addressed > > > by > > >>> (pool base address + index) It reduces the amount of > > >>> memory/cache > > >>> required for per core cache > > >>> > > >>> L3Fwd performance testing reveals minor improvements in the > > >>> cache > > >>> performance (L1 and L2 misses reduced by 0.60%) with no change > > >>> in > > >>> throughput > > >>> > > >>> Micro-benchmarking the patch using mempool_perf_test shows > > > significant > > >>> improvement with majority of the test cases > > >>> > > >> > > >> I still think this is very interesting. And your performance > > >>> numbers > > > are > > >> looking good. > > >> > > >> However, it limits the size of a mempool to 4 GB. As previously > > >> discussed, the max mempool size can be increased by multiplying > > >>> the > > > index > > >> with a constant. > > >> > > >> I would suggest using sizeof(uintptr_t) as the constant > > >>> multiplier, > > > so > > >> the mempool can hold objects of any size divisible by > > > sizeof(uintptr_t). > > >> And it would be silly to use a mempool to hold objects smaller > > >>> than > > >> sizeof(uintptr_t). > > >> > > >> How does the performance look if you multiply the index by > > >> sizeof(uintptr_t)? > > >> > > > > > > Each mempool entry is cache aligned, so we can use that if we want > > >>> a > > > bigger > > > multiplier. > > > > Thanks for chiming in, Bruce. > > > > Please also read this discussion about the multiplier: > > http://inbox.dpdk.org/dev/calbae1prqyyog96f6ecew1vpf3toh1h7mzzuliy95z9xjbr...@mail.gmail.com/ > > > > >>> > > >>> I actually wondered after I had sent the email whether we had indeed an > > >>> option to disable the cache alignment or not! Thanks for pointing out > > >>> that > > >>> we do. This brings a couple additional thoughts: > > >>> > > >>> * Using indexes for the cache should probably be a runtime flag rather > > >>> than > > >>> a build-time one. > > >>> * It would seem reasonable to me to disallow use of the indexed-cache > > >>> flag > > >>> and the non-cache aligned flag simultaneously. > > >>> * On the offchance that that restriction is unacceptable, then we can > > >>> make things a little more complicated by doing a runtime computation > > >>> of > > >>> the "index-shiftwidth" to use. > > >>> > > >>> Overall, I think defaulting to cacheline shiftwidth and disallowing > > >>> index-based addressing when using unaligned buffers is simplest and > > >>> easiest > > >>> unless we can come up with a valid usecase for needing more than that. > > >>> > > >>> /Bruce > > >> > > >> This feature is a performance optimization. > > >> > > >> With that in mind, it should not introduce function pointers or similar > > >> run-time checks or in the fast path, to determine what kind of cache to > > >> use per mempool. And if an index multiplier is implemented, it should be > > >> a compile time constant, probably something between sizeof(uintptr_t) or > > >> RTE_MEMPOOL_ALIGN (=RTE_C
RE: [PATCH v4] eal: non-temporal memcpy
> From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Monday, 31 July 2023 14.14 > > Hello, > > What's the status of this feature? I haven't given up on upstreaming this feature, but there doesn't seem to be much demand for it, so working on it has low priority. > > > 10/10/2022 08:46, Morten Brørup: > > This patch provides a function for memory copy using non-temporal store, > > load or both, controlled by flags passed to the function. > > > > Applications sometimes copy data to another memory location, which is only > > used much later. > > In this case, it is inefficient to pollute the data cache with the copied > > data. > > > > An example use case (originating from a real life application): > > Copying filtered packets, or the first part of them, into a capture buffer > > for offline analysis. > > > > The purpose of the function is to achieve a performance gain by not > > polluting the cache when copying data. > > Although the throughput can be improved by further optimization, I do not > > have time to do it now. > > > > The functional tests and performance tests for memory copy have been > > expanded to include non-temporal copying. > > > > A non-temporal version of the mbuf library's function to create a full > > copy of a given packet mbuf is provided. > > > > The packet capture and packet dump libraries have been updated to use > > non-temporal memory copy of the packets. > > > > Implementation notes: > > > > Implementations for non-x86 architectures can be provided by anyone at a > > later time. I am not going to do it. > > > > x86 non-temporal load instructions must be 16 byte aligned [1], and > > non-temporal store instructions must be 4, 8 or 16 byte aligned [2]. > > > > ARM non-temporal load and store instructions seem to require 4 byte > > alignment [3]. > > > > [1] https://www.intel.com/content/www/us/en/docs/intrinsics-guide/ > > index.html#text=_mm_stream_load > > [2] https://www.intel.com/content/www/us/en/docs/intrinsics-guide/ > > index.html#text=_mm_stream_si > > [3] https://developer.arm.com/documentation/100076/0100/ > > A64-Instruction-Set-Reference/A64-Floating-point-Instructions/ > > LDNP--SIMD-and-FP- > > > > This patch is a major rewrite from the RFC v3, so no version log comparing > > to the RFC is provided. > > > > v4 > > * Also ignore the warning for clang int the workaround for > > _mm_stream_load_si128() missing const in the parameter. > > * Add missing C linkage specifier in rte_memcpy.h. > > > > v3 > > * _mm_stream_si64() is not supported on 32-bit x86 architecture, so only > > use it on 64-bit x86 architecture. > > * CLANG warns that _mm_stream_load_si128_const() and > > rte_memcpy_nt_15_or_less_s16a() are not public, > > so remove __rte_internal from them. It also affects the documentation > > for the functions, so the fix can't be limited to CLANG. > > * Use __rte_experimental instead of __rte_internal. > > * Replace with nnn in function documentation; it doesn't look like > > HTML. > > * Slightly modify the workaround for _mm_stream_load_si128() missing const > > in the parameter; the ancient GCC 4.5.8 in RHEL7 doesn't understand > > #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers", so use > > #pragma GCC diagnostic ignored "-Wcast-qual" instead. I hope that works. > > * Fixed one coding style issue missed in v2. > > > > v2 > > * The last 16 byte block of data, incl. any trailing bytes, were not > > copied from the source memory area in rte_memcpy_nt_buf(). > > * Fix many coding style issues. > > * Add some missing header files. > > * Fix build time warning for non-x86 architectures by using a different > > method to mark the flags parameter unused. > > * CLANG doesn't understand RTE_BUILD_BUG_ON(!__builtin_constant_p(flags)), > > so omit it when using CLANG. > > > > Signed-off-by: Morten Brørup > > --- > > app/test/test_memcpy.c | 65 +- > > app/test/test_memcpy_perf.c | 187 ++-- > > lib/eal/include/generic/rte_memcpy.h | 127 +++ > > lib/eal/x86/include/rte_memcpy.h | 1238 ++ > > lib/mbuf/rte_mbuf.c | 77 ++ > > lib/mbuf/rte_mbuf.h | 32 + > > lib/mbuf/version.map |1 + > > lib/pcapng/rte_pcapng.c |3 +- > > lib/pdump/rte_pdump.c|6 +- > > 9 files changed, 1645 insertions(+), 91 deletions(-) > > >
Re: [RFC] ring: further performance improvements with C11
15/06/2023 22:13, Wathsala Vithanage: > For improved performance over the current C11 based ring implementation > following changes were made. > (1) Replace tail store with RELEASE semantics in __rte_ring_update_tail > with a RELEASE fence. Replace load of the tail with ACQUIRE semantics > in __rte_ring_move_prod_head and __rte_ring_move_cons_head with ACQUIRE > fences. > (2) Remove ACQUIRE fences between load of the old_head and load of the > cons_tail in __rte_ring_move_prod_head and __rte_ring_move_cons_head. > These two fences are not required for the safety of the ring library. > > Signed-off-by: Wathsala Vithanage > Reviewed-by: Honnappa Nagarahalli > Reviewed-by: Ruifeng Wang Are we waiting for more reviews?
Re: [PATCH v11 0/4] add support for self monitoring
Ping for update What is the status of this feature? 04/05/2023 10:02, David Marchand: > Hello Tomasz, > > On Thu, Feb 16, 2023 at 6:55 PM Tomasz Duszynski > wrote: > > > > This series adds self monitoring support i.e allows to configure and > > read performance measurement unit (PMU) counters in runtime without > > using perf utility. This has certain advantages when application runs on > > isolated cores running dedicated tasks. > > > > Events can be read directly using rte_pmu_read() or using dedicated > > tracepoint rte_eal_trace_pmu_read(). The latter will cause events to be > > stored inside CTF file. > > > > By design, all enabled events are grouped together and the same group > > is attached to lcores that use self monitoring funtionality. > > > > Events are enabled by names, which need to be read from standard > > location under sysfs i.e > > > > /sys/bus/event_source/devices/PMU/events > > > > where PMU is a core pmu i.e one measuring cpu events. As of today > > raw events are not supported. > > > > Tomasz Duszynski (4): > > lib: add generic support for reading PMU events > > pmu: support reading ARM PMU events in runtime > > pmu: support reading Intel x86_64 PMU events in runtime > > eal: add PMU support to tracing library > > There are still some pending comments on this series and it can't be > merged until they get sorted out. > > I noted two points : > - Konstantin asked for better explanations in the implementation. > - He also pointed out at using this feature with non EAL lcores. > > Could you work on this so we can consider this series for v23.07?
RE: [PATCH 0/1] mempool: implement index-based per core cache
> From: Thomas Monjalon [mailto:tho...@monjalon.net] > Sent: Monday, 31 July 2023 14.24 > > The v2 was not sent, and Stephen dropped the patch from patchwork. > > Do we abandon this feature? +1, because I think that the zero-copy mempool cache access functions make this patch irrelevant. > Should I remove it from the roadmap? +1 > > > 06/07/2023 19:43, Stephen Hemminger: > > On Thu, 13 Jan 2022 05:31:18 + > > Dharmik Thakkar wrote: > > > > > Hi, > > > > > > Thank you for your valuable review comments and suggestions! > > > > > > I will be sending out a v2 in which I have increased the size of the > mempool to 32GB by using division by sizeof(uintptr_t). > > > However, I am seeing ~5% performance degradation with > mempool_perf_autotest (for bulk size of 32) with this change > > > when compared to the base performance. > > > Earlier, without this change, I was seeing an improvement of ~13% compared > to base performance. So, this is a significant degradation. > > > I would appreciate your review comments on v2. > > > > > > Thank you! > > > > > > > On Jan 10, 2022, at 12:38 AM, Jerin Jacob wrote: > > > > > > > > On Sat, Jan 8, 2022 at 3:07 PM Morten Brørup > > > > > wrote: > > > >> > > > >>> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > >>> Sent: Friday, 7 January 2022 14.51 > > > >>> > > > >>> On Fri, Jan 07, 2022 at 12:29:23PM +0100, Morten Brørup wrote: > > > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > > Sent: Friday, 7 January 2022 12.16 > > > > > > > > On Sat, Dec 25, 2021 at 01:16:03AM +0100, Morten Brørup wrote: > > > >>> From: Dharmik Thakkar [mailto:dharmik.thak...@arm.com] Sent: > > > > Friday, 24 > > > >>> December 2021 23.59 > > > >>> > > > >>> Current mempool per core cache implementation stores pointers > > > >>> to > > > > mbufs > > > >>> On 64b architectures, each pointer consumes 8B This patch > > > >>> replaces > > > > it > > > >>> with index-based implementation, where in each buffer is > > > >>> addressed > > > > by > > > >>> (pool base address + index) It reduces the amount of > > > >>> memory/cache > > > >>> required for per core cache > > > >>> > > > >>> L3Fwd performance testing reveals minor improvements in the > > > >>> cache > > > >>> performance (L1 and L2 misses reduced by 0.60%) with no change > > > >>> in > > > >>> throughput > > > >>> > > > >>> Micro-benchmarking the patch using mempool_perf_test shows > > > > significant > > > >>> improvement with majority of the test cases > > > >>> > > > >> > > > >> I still think this is very interesting. And your performance > > > >>> numbers > > > > are > > > >> looking good. > > > >> > > > >> However, it limits the size of a mempool to 4 GB. As previously > > > >> discussed, the max mempool size can be increased by multiplying > > > >>> the > > > > index > > > >> with a constant. > > > >> > > > >> I would suggest using sizeof(uintptr_t) as the constant > > > >>> multiplier, > > > > so > > > >> the mempool can hold objects of any size divisible by > > > > sizeof(uintptr_t). > > > >> And it would be silly to use a mempool to hold objects smaller > > > >>> than > > > >> sizeof(uintptr_t). > > > >> > > > >> How does the performance look if you multiply the index by > > > >> sizeof(uintptr_t)? > > > >> > > > > > > > > Each mempool entry is cache aligned, so we can use that if we want > > > >>> a > > > > bigger > > > > multiplier. > > > > > > Thanks for chiming in, Bruce. > > > > > > Please also read this discussion about the multiplier: > > > > http://inbox.dpdk.org/dev/CALBAE1PrQYyOG96f6ECeW1vPF3TOh1h7MZZULiY95z9xjbRuyA@ > mail.gmail.com/ > > > > > > >>> > > > >>> I actually wondered after I had sent the email whether we had indeed > an > > > >>> option to disable the cache alignment or not! Thanks for pointing out > > > >>> that > > > >>> we do. This brings a couple additional thoughts: > > > >>> > > > >>> * Using indexes for the cache should probably be a runtime flag rather > > > >>> than > > > >>> a build-time one. > > > >>> * It would seem reasonable to me to disallow use of the indexed-cache > > > >>> flag > > > >>> and the non-cache aligned flag simultaneously. > > > >>> * On the offchance that that restriction is unacceptable, then we can > > > >>> make things a little more complicated by doing a runtime computation > > > >>> of > > > >>> the "index-shiftwidth" to use. > > > >>> > > > >>> Overall, I think defaulting to cacheline shiftwidth and disallowing > > > >>> index-based addressing when using unaligned buffers is simplest and > > > >>> easiest > > > >>> unless we can come up with a valid usecase for needing more than that. > > > >>> > > > >>> /Bruce > > > >> > > > >> This feature is a performance optimization. > > > >> > > > >> With that in min
Re: [dpdk-dev] [PATCH ] common/cnxk: fix setting default flow action
On Mon, Jul 31, 2023 at 8:26 AM wrote:
>
> From: Satheesh Paul
>
> For MCAM rules with PF/VF action, the PF's default rule action is
> is copied and overwritten over the user provided action. Fixing this
> by setting default action only if no other action (like queue) is
> specified by user.
>
> Fixes: a07f7ced436def ("common/cnxk: add NPC init and fini")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Satheesh Paul
> Reviewed-by: Kiran Kumar K
Updated the git commit as follows and applied to
dpdk-next-net-mrvl/for-next-net. Thanks
common/cnxk: fix default flow action setting
For MCAM rules with PF/VF action, the PF's default rule action is
is copied and overwritten over the user provided action. Fixing this
by setting default action only if no other action (like queue) is
specified by user.
Fixes: a07f7ced436d ("common/cnxk: add NPC init and fini")
Cc: sta...@dpdk.org
Signed-off-by: Satheesh Paul
Reviewed-by: Kiran Kumar K
> ---
> drivers/common/cnxk/hw/nix.h| 1 +
> drivers/common/cnxk/roc_npc.c | 17 ++---
> drivers/common/cnxk/roc_npc_mcam_dump.c | 4
> 3 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h
> index 26dcda680e..d2c80f3c74 100644
> --- a/drivers/common/cnxk/hw/nix.h
> +++ b/drivers/common/cnxk/hw/nix.h
> @@ -619,6 +619,7 @@
> #define NIX_RX_ACTIONOP_RSS (0x4ull)
> #define NIX_RX_ACTIONOP_PF_FUNC_DROP (0x5ull)
> #define NIX_RX_ACTIONOP_MIRROR (0x6ull)
> +#define NIX_RX_ACTIONOP_DEFAULT (0xfull)
>
> #define NIX_RX_VTAGACTION_VTAG0_RELPTR (0x0ull)
> #define NIX_RX_VTAGACTION_VTAG1_RELPTR (0x4ull)
> diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
> index 848086c8de..586bc55791 100644
> --- a/drivers/common/cnxk/roc_npc.c
> +++ b/drivers/common/cnxk/roc_npc.c
> @@ -726,11 +726,15 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct
> roc_npc_attr *attr,
> if (req_act == ROC_NPC_ACTION_TYPE_VLAN_STRIP) {
> /* Only VLAN action is provided */
> flow->npc_action = NIX_RX_ACTIONOP_UCAST;
> - } else if (req_act &
> - (ROC_NPC_ACTION_TYPE_PF | ROC_NPC_ACTION_TYPE_VF)) {
> - flow->npc_action = NIX_RX_ACTIONOP_UCAST;
> - if (req_act & ROC_NPC_ACTION_TYPE_QUEUE)
> - flow->npc_action |= (uint64_t)rq << 20;
> + } else if (req_act & (ROC_NPC_ACTION_TYPE_PF |
> ROC_NPC_ACTION_TYPE_VF)) {
> + /* Check if any other action is set */
> + if ((req_act == ROC_NPC_ACTION_TYPE_PF) || (req_act ==
> ROC_NPC_ACTION_TYPE_VF)) {
> + flow->npc_action = NIX_RX_ACTIONOP_DEFAULT;
> + } else {
> + flow->npc_action = NIX_RX_ACTIONOP_UCAST;
> + if (req_act & ROC_NPC_ACTION_TYPE_QUEUE)
> + flow->npc_action |= (uint64_t)rq << 20;
> + }
> } else if (req_act & ROC_NPC_ACTION_TYPE_DROP) {
> flow->npc_action = NIX_RX_ACTIONOP_DROP;
> } else if (req_act & ROC_NPC_ACTION_TYPE_QUEUE) {
> @@ -741,8 +745,7 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct
> roc_npc_attr *attr,
> } else if (req_act & ROC_NPC_ACTION_TYPE_SEC) {
> flow->npc_action = NIX_RX_ACTIONOP_UCAST_IPSEC;
> flow->npc_action |= (uint64_t)rq << 20;
> - } else if (req_act &
> - (ROC_NPC_ACTION_TYPE_FLAG | ROC_NPC_ACTION_TYPE_MARK)) {
> + } else if (req_act & (ROC_NPC_ACTION_TYPE_FLAG |
> ROC_NPC_ACTION_TYPE_MARK)) {
> flow->npc_action = NIX_RX_ACTIONOP_UCAST;
> } else if (req_act & ROC_NPC_ACTION_TYPE_COUNT) {
> /* Keep ROC_NPC_ACTION_TYPE_COUNT_ACT always at the end
> diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c
> b/drivers/common/cnxk/roc_npc_mcam_dump.c
> index 01c4212567..ebd2dd69c2 100644
> --- a/drivers/common/cnxk/roc_npc_mcam_dump.c
> +++ b/drivers/common/cnxk/roc_npc_mcam_dump.c
> @@ -496,6 +496,10 @@ npc_flow_dump_rx_action(FILE *file, uint64_t npc_action)
> plt_strlcpy(index_name, "Multicast/mirror table index",
> NPC_MAX_FIELD_NAME_SIZE);
> break;
> + case NIX_RX_ACTIONOP_DEFAULT:
> + fprintf(file, "NIX_RX_ACTIONOP_DEFAULT (%" PRIu64 ")\n",
> + (uint64_t)NIX_RX_ACTIONOP_DEFAULT);
> + break;
> default:
> plt_err("Unknown NIX_RX_ACTIONOP found");
> return;
> --
> 2.39.2
>
Re: [PATCH v4] dmadev: add tracepoints
10/07/2023 09:50, fengchengwen:
> Hi Thomas,
>
> On 2023/7/10 14:49, Thomas Monjalon wrote:
> > 09/07/2023 05:23, fengchengwen:
> >> Hi Thomas,
> >>
> >> On 2023/7/7 18:40, Thomas Monjalon wrote:
> >>> 26/05/2023 10:42, Chengwen Feng:
> Add tracepoints at important APIs for tracing support.
>
> Signed-off-by: Chengwen Feng
> Acked-by: Morten Brørup
>
> ---
> v4: Fix asan smoke fail.
> v3: Address Morten's comment:
> Move stats_get and vchan_status and to trace_fp.h.
> v2: Address Morten's comment:
> Make stats_get as fast-path trace-points.
> Place fast-path trace-point functions behind in version.map.
> >>>
> >>> There are more things to fix.
> >>> First you must export rte_dmadev_trace_fp.h as it is included by
> >>> rte_dmadev.h.
> >>
> >> It was already included by rte_dmadev.h:
> >> diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
> >> index e61d71959e..e792b90ef8 100644
> >> --- a/lib/dmadev/rte_dmadev.h
> >> +++ b/lib/dmadev/rte_dmadev.h
> >> @@ -796,6 +796,7 @@ struct rte_dma_sge {
> >> };
> >>
> >> #include "rte_dmadev_core.h"
> >> +#include "rte_dmadev_trace_fp.h"
> >>
> >>
> >>> Note: you could have caught this if testing the example app for DMA.
> >>> Second, you must avoid structs and enum in this header file,
> >>
> >> Let me explain the #if #endif logic:
> >>
> >> For the function:
> >> uint16_t
> >> rte_dma_completed(int16_t dev_id, uint16_t vchan, const uint16_t nb_cpls,
> >> uint16_t *last_idx, bool *has_error)
> >>
> >> The common trace implementation:
> >> RTE_TRACE_POINT_FP(
> >>rte_dma_trace_completed,
> >>RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
> >> const uint16_t nb_cpls, uint16_t *last_idx,
> >> bool *has_error, uint16_t ret),
> >>rte_trace_point_emit_i16(dev_id);
> >>rte_trace_point_emit_u16(vchan);
> >>rte_trace_point_emit_u16(nb_cpls);
> >>rte_trace_point_emit_ptr(idx_val);
> >>rte_trace_point_emit_ptr(has_error);
> >>rte_trace_point_emit_u16(ret);
> >> )
> >>
> >> But it has a problem: for pointer parameter (e.g. last_idx and has_error),
> >> only record
> >> the pointer value (i.e. address value).
> >>
> >> I think the pointer value has no mean (in particular, many of there
> >> pointers are stack
> >> variables), the value of the pointer point to is meaningful.
> >>
> >> So I add the pointer reference like below (as V3 did):
> >> RTE_TRACE_POINT_FP(
> >>rte_dma_trace_completed,
> >>RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
> >> const uint16_t nb_cpls, uint16_t *last_idx,
> >> bool *has_error, uint16_t ret),
> >>int has_error_val = *has_error;// pointer reference
> >>int last_idx_val = *last_idx; // pointer reference
> >>rte_trace_point_emit_i16(dev_id);
> >>rte_trace_point_emit_u16(vchan);
> >>rte_trace_point_emit_u16(nb_cpls);
> >>rte_trace_point_emit_int(last_idx_val);// record the value of
> >> pointer
> >>rte_trace_point_emit_int(has_error_val); // record the value of
> >> pointer
> >>rte_trace_point_emit_u16(ret);
> >> )
> >>
> >> Unfortunately, the above lead to asan failed. because in:
> >> RTE_TRACE_POINT_REGISTER(rte_dma_trace_completed,
> >>lib.dmadev.completed)
> >> it will invoke rte_dma_trace_completed() with the parameter is undefined.
> >>
> >>
> >> To solve this problem, consider the rte_dmadev_trace_points.c will include
> >> rte_trace_point_register.h,
> >> and the rte_trace_point_register.h will defined macro:
> >> _RTE_TRACE_POINT_REGISTER_H_.
> >>
> >> so we update trace points as (as V4 did):
> >> RTE_TRACE_POINT_FP(
> >>rte_dma_trace_completed,
> >>RTE_TRACE_POINT_ARGS(int16_t dev_id, uint16_t vchan,
> >> const uint16_t nb_cpls, uint16_t *last_idx,
> >> bool *has_error, uint16_t ret),
> >> #ifdef _RTE_TRACE_POINT_REGISTER_H_
> >>uint16_t __last_idx = 0;
> >>bool __has_error = false;
> >>last_idx = &__last_idx; // make sure the pointer has
> >> meaningful value.
> >>has_error = &__has_error;// so that the next pointer
> >> reference will work well.
> >> #endif /* _RTE_TRACE_POINT_REGISTER_H_ */
> >>int has_error_val = *has_error;
> >>int last_idx_val = *last_idx;
> >>rte_trace_point_emit_i16(dev_id);
> >>rte_trace_point_emit_u16(vchan);
> >>rte_trace_point_emit_u16(nb_cpls);
> >>rte_trace_point_emit_int(last_idx_val);
> >>rte_trace_point_emit_int(has_error_val);
> >>rte_trace_point_emit_u16(ret);
> >> )
> >>
> >>> otherwise it cannot be included alone.
> >>> Look at what is done in other *_trace_fp.h files.
> >>>
> >>>
> >>
> >> Whether enable_trace_fp is true or false, the v4 work well.
> >> Below is that run examples with enable_trace_fp=true.
> >>
> >> ./dpdk-test --file-prefix=feng1
Re: [dpdk-dev] [PATCH 1/3] mbuf: add Tx offloads for packet marking
Please can you remind what was decided for this feature? I think I should remove it from the roadmap. 17/04/2020 09:22, Nithin Dabilpuram: > From: Nithin Dabilpuram > > Introduce PKT_TX_MARK_IP_DSCP, PKT_TX_MARK_IP_ECN > and PKT_TX_MARK_VLAN_DEI Tx offload flags to support > packet marking. > > When packet marking feature in Traffic manager is enabled, > application has to the use the three new flags to indicate > to PMD on whether packet marking needs to be enabled on the > specific mbuf or not. By setting the three flags, it is > assumed by PMD that application has already verified the > applicability of marking on that specific packet and > PMD need not perform further checks as per RFC. > > Signed-off-by: Krzysztof Kanas > Signed-off-by: Nithin Dabilpuram
[Bug 1268] dma/idxd appends extra characters which makes test-dma-perf to fail.
https://bugs.dpdk.org/show_bug.cgi?id=1268 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Resolution|--- |FIXED Status|UNCONFIRMED |RESOLVED --- Comment #7 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=4334b7b405 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 1259] [dpdk-23.07] vf_smoke: vf cannot forward packets
https://bugs.dpdk.org/show_bug.cgi?id=1259 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #12 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=d7d802daf8 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 1160] IPv4 FIB 0.0.0.0/0 route doesn't work when first route added to FIB and using TBL24_8
https://bugs.dpdk.org/show_bug.cgi?id=1160 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #1 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=880bc2b5f3 -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] Marvell DPDK v20.08 Roadmap
29/05/2020 14:50, Jerin Kollanukkaran: > octeontx2 network PMD: > ~~ > 12) Add devargs for locking the NDC context for NIX. > http://patches.dpdk.org/patch/67489/ > > 13) Add packet mirroring support It seems packet mirroring never got implemented? octeontx2 has been replaced by cnxk, but I don't find any mirroring in cnxk as well. Should I remove it from the online roadmap?
Re: [dpdk-dev] Marvell DPDK v20.08 Roadmap
On Mon, Jul 31, 2023 at 6:36 PM Thomas Monjalon wrote: > > 29/05/2020 14:50, Jerin Kollanukkaran: > > octeontx2 network PMD: > > ~~ > > 12) Add devargs for locking the NDC context for NIX. > > http://patches.dpdk.org/patch/67489/ > > > > 13) Add packet mirroring support > > It seems packet mirroring never got implemented? > octeontx2 has been replaced by cnxk, > but I don't find any mirroring in cnxk as well. > > Should I remove it from the online roadmap? Keep it in cnxk roadmap. It is planned in the future. > >
[PATCH] test/event: remove timer state check
From: Pavan Nikhilesh Remove checking if timer state is set to RTE_EVENT_TIMER_NOT_ARMED after the timer has expired as certain timer device implementations might not have access to the rte_event_timer handle of a timer event. Signed-off-by: Pavan Nikhilesh --- app/test/test_event_timer_adapter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c index 510bebcf86..2bc2e026a9 100644 --- a/app/test/test_event_timer_adapter.c +++ b/app/test/test_event_timer_adapter.c @@ -1944,9 +1944,9 @@ test_timer_ticks_remaining(void) TEST_ASSERT_EQUAL(timeout_event_dequeue(&ev, 1, WAIT_TICKS(1)), 1, "Armed timer failed to trigger."); - TEST_ASSERT_EQUAL(ev_tim->state, RTE_EVENT_TIMER_NOT_ARMED, - "Improper timer state set expected %d returned %d", - RTE_EVENT_TIMER_NOT_ARMED, ev_tim->state); + + if (ev_tim->state != RTE_EVENT_TIMER_NOT_ARMED) + ev_tim->state = RTE_EVENT_TIMER_NOT_ARMED; /* Test that timer that fired returns error */ TEST_ASSERT_FAIL(rte_event_timer_remaining_ticks_get(timdev, ev_tim, -- 2.25.1
Re: [dpdk-dev] Marvell DPDK v20.08 Roadmap
31/07/2023 15:08, Jerin Jacob: > On Mon, Jul 31, 2023 at 6:36 PM Thomas Monjalon wrote: > > > > 29/05/2020 14:50, Jerin Kollanukkaran: > > > octeontx2 network PMD: > > > ~~ > > > 12) Add devargs for locking the NDC context for NIX. > > > http://patches.dpdk.org/patch/67489/ > > > > > > 13) Add packet mirroring support > > > > It seems packet mirroring never got implemented? > > octeontx2 has been replaced by cnxk, > > but I don't find any mirroring in cnxk as well. > > > > Should I remove it from the online roadmap? > > Keep it in cnxk roadmap. It is planned in the future. OK thanks
Re: [PATCH 0/3] version: 23.11-rc0
On Mon, Jul 31, 2023 at 11:44 AM David Marchand wrote: > > Prepare the new release. > > I chose to separate the compat code cleanup in the telemetry and vhost > libraries for making it easier to review, though the 3 patches could be > squashed in a single change. Series applied. Here we go. If not already done, it is the right time to send your roadmap updates and rfc patches. You can also send (rebased) deferred series from previous release cycles. -- David Marchand
Re: [dpdk-dev] Marvell DPDK 20.11 Roadmap
23/08/2020 10:36, Jerin Jacob Kollanukkaran: > Qede network PMD: > ~ > 14) SRIOV-PF support > 15) rte_flow support > 16) PMD changed to support next generation HW The 2 last items are still in the online roadmap. I don't expect more changes, so I will remove them from the roadmap.
Re: [PATCH v6 00/26] Net/SPNIC: support SPNIC into DPDK 22.03
13/04/2023 11:02, Ferruh Yigit: > On 2/18/2022 9:30 AM, Yanling Song wrote: > > On Sun, 13 Feb 2022 19:07:09 +0100 > > Thomas Monjalon wrote: > >> If you don't want to keep a copyright, don't copy the code. > >> > > Got it. We will modify the code to meet the requirement of community > > and upstream it again. Since the change is great, I'm afraid that the > > new code maybe cannot meet the schedule of 22.03. > > Hi Yanling, > > What is the status of the driver? Will there be a new version? It seems this patch was abandoned. Anyway it was a lot of copy/pasting from hinic driver without keeping the copyright. Tell us in case I say something wrong.
Re: Intel roadmap for 22.07
24/03/2022 09:32, Mcnamara, John: > * QAT PMD remove deprecated dependency on openssl 1.x Was this really done? I'm lost in QAT dependency. Should I remove this item from the online roadmap?
Re: [dpdk-dev] [PATCH] update Intel roadmap for 21.11
Hello, 03/09/2021 17:15, Ferruh Yigit: > +- control adapter and RX adapter enhancements in DLB driver Any news about this feature? Was it implemented? Should I remove it from the online roadmap?
Re: [PATCH v1] maintainers: update maintainer for DLB Driver
10/07/2023 21:52, Sevincer, Abdullah: > 28/06/2023 01:21, Thomas Monjalon: > > 26/06/2023 10:04, Abdullah Sevincer: > > > Abdullah Sevincer is now maintainer for DLB Driver. > > > > > > Signed-off-by: Abdullah Sevincer > > > --- > > > > > > Intel DLB2 > > > > > > -M: Timothy McDaniel > > > +M: Abdullah Sevincer > > > > Would you be able to get an ack from Timothy? > > Thanks Thomas, requested ack from Timothy. Timothy, do you agree with changing maintainership of DLB?
[PATCH v7 0/2] Select optional libraries
This series is one implementation to try and please users who want to select more easily which parts of DPDK are built. It introduces a change in behavior for enabling deprecated libraries: this series is aimed at the next release but sent early as a demo of what changes are required. A deprecation notice has been sent so that this work can be merged in v23.11: https://patchwork.dpdk.org/project/dpdk/patch/20230628134315.551591-1-david.march...@redhat.com/ Changes since v6: - rebased on v23.11-rc0, - updated docs, Changes since v5: - added acks from Morten, - resent series as a new thread to avoid confusing patchwork with the previous partially applied series, Changes since v4: - rebased on main, - switched to a list of enabled deprecated libraries, Changes since v3: - split kni cleanup, - split variable rename cleanup, - introduced a new meson option to control deprecated libraries activation, - simplified the actual implementation of enable_libs to mimic enable_drivers behavior, -- David Marchand David Marchand (2): build: select deprecated libraries build: select optional libraries .ci/linux-build.sh| 2 +- devtools/test-meson-builds.sh | 8 +-- doc/guides/prog_guide/flow_classify_lib.rst | 5 +- .../prog_guide/kernel_nic_interface.rst | 3 +- doc/guides/rel_notes/deprecation.rst | 4 -- doc/guides/rel_notes/release_23_11.rst| 6 +++ lib/meson.build | 50 +-- meson_options.txt | 8 ++- 8 files changed, 58 insertions(+), 28 deletions(-) -- 2.41.0
[PATCH v7 1/2] build: select deprecated libraries
Rework deprecated libraries selection by introducing a new configuration option. This breaks existing configurations that were relying on disable_libs='' for enabling deprecated libraries. On the other hand, it will make enabling optional libraries more straightforward by taking the deprecated libraries out of the picture. Signed-off-by: David Marchand Acked-by: Morten Brørup Acked-by: Bruce Richardson --- Changes since v5: - rebased, - updated doc (kni, flow classify docs), - updated deprecation notices and RN, Changes since v4: - changed the option to a list of libraries instead of a global on/off knob, - moved all deprecated libs checks under a single block for readability, --- .ci/linux-build.sh| 2 +- devtools/test-meson-builds.sh | 8 +++--- doc/guides/prog_guide/flow_classify_lib.rst | 5 ++-- .../prog_guide/kernel_nic_interface.rst | 3 +- doc/guides/rel_notes/deprecation.rst | 4 --- doc/guides/rel_notes/release_23_11.rst| 3 ++ lib/meson.build | 28 +-- meson_options.txt | 4 ++- 8 files changed, 36 insertions(+), 21 deletions(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 45f2729996..e0b62bac90 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -97,7 +97,7 @@ if [ "$MINI" = "true" ]; then OPTS="$OPTS -Denable_drivers=net/null" OPTS="$OPTS -Ddisable_libs=*" else -OPTS="$OPTS -Ddisable_libs=" +OPTS="$OPTS -Denable_deprecated_libs=*" fi OPTS="$OPTS -Dlibdir=lib" diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 84b907d2ea..c41659d28b 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -120,10 +120,10 @@ config () # return fi options= - # deprecated libs may be disabled by default, so for complete builds ensure - # no libs are disabled - if ! echo $* | grep -q -- 'disable_libs' ; then - options="$options -Ddisable_libs=" + # deprecated libs are disabled by default, so for complete builds + # enable them + if ! echo $* | grep -q -- 'enable_deprecated_libs' ; then + options="$options -Denable_deprecated_libs=*" fi if echo $* | grep -qw -- '--default-library=shared' ; then options="$options -Dexamples=all" diff --git a/doc/guides/prog_guide/flow_classify_lib.rst b/doc/guides/prog_guide/flow_classify_lib.rst index ad2e10ec26..558a982e3b 100644 --- a/doc/guides/prog_guide/flow_classify_lib.rst +++ b/doc/guides/prog_guide/flow_classify_lib.rst @@ -10,8 +10,9 @@ Flow Classification Library See :doc:`../rel_notes/deprecation`. It is disabled by default in the DPDK build. - To re-enable the library, remove 'flow_classify' from the "disable_libs" - meson option when configuring a build. + To re-enable the library, tell meson to enable 'flow_classify' as part of + the deprecated libraries meson option + ``-Denable_deprecated_libs=flow_classify``. DPDK provides a Flow Classification library that provides the ability to classify an input packet by matching it against a set of Flow rules. diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst index 392e5df75f..1097ecc695 100644 --- a/doc/guides/prog_guide/kernel_nic_interface.rst +++ b/doc/guides/prog_guide/kernel_nic_interface.rst @@ -18,7 +18,8 @@ Kernel NIC Interface .. note:: KNI is disabled by default in the DPDK build. - To re-enable the library, remove 'kni' from the "disable_libs" meson option when configuring a build. + To re-enable the library, tell meson to enable 'kni' as part of the + deprecated libraries meson option ``-Denable_deprecated_libs=kni``. The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the Linux* control plane. diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 494b401cda..10ba03a71c 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -35,10 +35,6 @@ Deprecation Notices which also added support for standard atomics (Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html) -* build: Enabling deprecated libraries (``flow_classify``, ``kni``) - won't be possible anymore through the use of the ``disable_libs`` build option. - A new build option for deprecated libraries will be introduced instead. - * kvargs: The function ``rte_kvargs_process`` will get a new parameter for returning key match count. It will ease handling of no-match case. diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst index 6b4dd21fd0..781b338101 100644 --- a/doc/guides/rel_notes/release_23_11.rst +++ b/doc/guides/rel_notes/release_23_11.rst @@ -55,6 +55,9 @@ New Features Also, mak
[PATCH v7 2/2] build: select optional libraries
There is currently no way to know which libraries are optional.
Introduce a enable_libs option (close to what we have for drivers) so
that packagers or projects consuming DPDK can more easily select the
optional libraries that matter to them and disable other optional
libraries.
Signed-off-by: David Marchand
Acked-by: Morten Brørup
Acked-by: Bruce Richardson
---
Changes since v5:
- added an entry in the release notes,
Changes since v4:
- moved always_enable earlier for readability,
Changes since v3:
- split non related cleanup changes,
- fixed false positive complaints about disabling mandatory libs by
building the list of always enabled libs, appending this list to
enable_list and checking the disable side,
- updated enable/disable_libs descriptions,
Changes since v2:
- moved the IOVA check for kni build in lib/kni/meson.build,
- reworked deprecated libraries handling by only considering them when
no enable_libs option is set. With this, no need for a default value
in meson_options.txt, yet configurations in the CI must be adjusted,
- moved mandatory libraries check after enable/disable_libs evaluation,
---
doc/guides/rel_notes/release_23_11.rst | 3 +++
lib/meson.build| 34 +-
meson_options.txt | 4 ++-
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/doc/guides/rel_notes/release_23_11.rst
b/doc/guides/rel_notes/release_23_11.rst
index 781b338101..c073612b82 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -58,6 +58,9 @@ New Features
* build: Enabling deprecated libraries (``flow_classify``, ``kni``) is now done
using the new ``enable_deprecated_libraries`` build option.
+* build: Optional libraries can now be selected with the new ``enable_libs``
+ build option similarly to the existing ``enable_drivers`` build option.
+
Removed Items
-
diff --git a/lib/meson.build b/lib/meson.build
index 73afd90b38..b8834fc277 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -88,6 +88,13 @@ optional_libs = [
'vhost',
]
+always_enable = []
+foreach l:libraries
+if not optional_libs.contains(l)
+always_enable += l
+endif
+endforeach
+
dpdk_libs_deprecated += [
'flow_classify',
'kni',
@@ -102,17 +109,13 @@ foreach l:run_command(list_dir_globs,
get_option('enable_deprecated_libs'),
enable_deprecated_libs += l
endforeach
-disabled_libs = []
-opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs'),
-check: true).stdout().split()
-foreach l:opt_disabled_libs
-if not optional_libs.contains(l)
-warning('Cannot disable mandatory library "@0@"'.format(l))
-continue
-endif
-disabled_libs += l
-endforeach
+disable_libs = run_command(list_dir_globs, get_option('disable_libs'), check:
true).stdout().split()
+enable_libs = run_command(list_dir_globs, get_option('enable_libs'), check:
true).stdout().split()
+if enable_libs.length() == 0
+enable_libs += optional_libs
+endif
+enable_libs += always_enable
default_cflags = machine_args
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
@@ -153,9 +156,16 @@ foreach l:libraries
else
warning('Enabling deprecated library, "@0@"'.format(l))
endif
-elif disabled_libs.contains(l)
+elif not enable_libs.contains(l)
build = false
-reason = 'explicitly disabled via build config'
+reason = 'not in enabled libraries build config'
+elif disable_libs.contains(l)
+if always_enable.contains(l)
+warning('Cannot disable mandatory library "@0@"'.format(l))
+else
+build = false
+reason = 'explicitly disabled via build config'
+endif
endif
if build
diff --git a/meson_options.txt b/meson_options.txt
index 839d4266c6..7312da3640 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,7 +11,7 @@ option('disable_apps', type: 'string', value: '', description:
option('disable_drivers', type: 'string', value: '', description:
'Comma-separated list of drivers to explicitly disable.')
option('disable_libs', type: 'string', value: '', description:
- 'Comma-separated list of libraries to explicitly disable. [NOTE: not
all libs can be disabled]')
+ 'Comma-separated list of optional libraries to explicitly disable.
[NOTE: mandatory libs cannot be disabled]')
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-',
description:
'Subdirectory of libdir where to install PMDs. Defaults to using a
versioned subdirectory.')
option('enable_docs', type: 'boolean', value: false, description:
@@ -26,6 +26,8 @@ option('enable_driver_sdk', type: 'boolean', value: false,
description:
'Install headers to build drivers.')
option('enable_kmods', type: 'boolean', value: false, description:
'build kernel modules')
+option('enable_libs'
RE: [PATCH 0/1] mempool: implement index-based per core cache
> -Original Message- > From: Morten Brørup > Sent: Monday, July 31, 2023 7:33 AM > To: tho...@monjalon.net; Dharmik Jayesh Thakkar > > Cc: dev@dpdk.org; Jerin Jacob ; Bruce Richardson > ; Honnappa Nagarahalli > ; nd ; Ruifeng Wang > ; Stephen Hemminger > ; olivier.m...@6wind.com; > andrew.rybche...@oktetlabs.ru > Subject: RE: [PATCH 0/1] mempool: implement index-based per core cache > > > From: Thomas Monjalon [mailto:tho...@monjalon.net] > > Sent: Monday, 31 July 2023 14.24 > > > > The v2 was not sent, and Stephen dropped the patch from patchwork. > > > > Do we abandon this feature? > > +1, because I think that the zero-copy mempool cache access functions make > this patch irrelevant. > > > Should I remove it from the roadmap? > > +1 V2 was sent (https://patches.dpdk.org/project/dpdk/patch/20220113053630.886638-1-dharmik.thak...@arm.com/) However, it is not relevant anymore and can be dropped. Thank you! > > > > > > > 06/07/2023 19:43, Stephen Hemminger: > > > On Thu, 13 Jan 2022 05:31:18 + > > > Dharmik Thakkar wrote: > > > > > > > Hi, > > > > > > > > Thank you for your valuable review comments and suggestions! > > > > > > > > I will be sending out a v2 in which I have increased the size of > > > > the > > mempool to 32GB by using division by sizeof(uintptr_t). > > > > However, I am seeing ~5% performance degradation with > > mempool_perf_autotest (for bulk size of 32) with this change > > > > when compared to the base performance. > > > > Earlier, without this change, I was seeing an improvement of ~13% > > > > compared > > to base performance. So, this is a significant degradation. > > > > I would appreciate your review comments on v2. > > > > > > > > Thank you! > > > > > > > > > On Jan 10, 2022, at 12:38 AM, Jerin Jacob > wrote: > > > > > > > > > > On Sat, Jan 8, 2022 at 3:07 PM Morten Brørup > > > > > > > wrote: > > > > >> > > > > >>> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > > >>> Sent: Friday, 7 January 2022 14.51 > > > > >>> > > > > >>> On Fri, Jan 07, 2022 at 12:29:23PM +0100, Morten Brørup wrote: > > > > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > > > Sent: Friday, 7 January 2022 12.16 > > > > > > > > > > On Sat, Dec 25, 2021 at 01:16:03AM +0100, Morten Brørup wrote: > > > > >>> From: Dharmik Thakkar [mailto:dharmik.thak...@arm.com] > Sent: > > > > > Friday, 24 > > > > >>> December 2021 23.59 > > > > >>> > > > > >>> Current mempool per core cache implementation stores > > > > >>> pointers > > > > >>> to > > > > > mbufs > > > > >>> On 64b architectures, each pointer consumes 8B This patch > > > > >>> replaces > > > > > it > > > > >>> with index-based implementation, where in each buffer is > > > > >>> addressed > > > > > by > > > > >>> (pool base address + index) It reduces the amount of > > > > >>> memory/cache > > > > >>> required for per core cache > > > > >>> > > > > >>> L3Fwd performance testing reveals minor improvements in > > > > >>> the > > > > >>> cache > > > > >>> performance (L1 and L2 misses reduced by 0.60%) with no > > > > >>> change > > > > >>> in > > > > >>> throughput > > > > >>> > > > > >>> Micro-benchmarking the patch using mempool_perf_test shows > > > > > significant > > > > >>> improvement with majority of the test cases > > > > >>> > > > > >> > > > > >> I still think this is very interesting. And your > > > > >> performance > > > > >>> numbers > > > > > are > > > > >> looking good. > > > > >> > > > > >> However, it limits the size of a mempool to 4 GB. As > > > > >> previously discussed, the max mempool size can be increased > > > > >> by multiplying > > > > >>> the > > > > > index > > > > >> with a constant. > > > > >> > > > > >> I would suggest using sizeof(uintptr_t) as the constant > > > > >>> multiplier, > > > > > so > > > > >> the mempool can hold objects of any size divisible by > > > > > sizeof(uintptr_t). > > > > >> And it would be silly to use a mempool to hold objects > > > > >> smaller > > > > >>> than > > > > >> sizeof(uintptr_t). > > > > >> > > > > >> How does the performance look if you multiply the index by > > > > >> sizeof(uintptr_t)? > > > > >> > > > > > > > > > > Each mempool entry is cache aligned, so we can use that if > > > > > we want > > > > >>> a > > > > > bigger > > > > > multiplier. > > > > > > > > Thanks for chiming in, Bruce. > > > > > > > > Please also read this discussion about the multiplier: > > > > > > > http://inbox.dpdk.org/dev/CALBAE1PrQYyOG96f6ECeW1vPF3TOh1h7MZZULiY > 95z9 > > xjbRuyA@ > > mail.gmail.com/ > > > > > > > > >>> > > > > >>> I actually wondered after I had sent the email whether we had > > > > >>> indeed > > an > > > > >>> option to disable the cache alignment or not! Thanks for > > > > >>> pointing out th
Re: [PATCH v2] kni: remove deprecated kernel network interface
On Mon, 31 Jul 2023 10:40:35 +0200 Thomas Monjalon wrote: > 30/07/2023 19:12, Stephen Hemminger: > > On Sat, 29 Jul 2023 19:12:05 -0700 > > Stephen Hemminger wrote: > > > > > Deprecation and removal was announced in 22.11. > > > Make it so. > > Would be good to summarize the reason here, > and name replacements. > > Also it should not be completely removed. > I think we were supposed to move KNI into the kmod repository? The decision I remember was to remove it completely. KNI has several issues which make it unstable and even a potential security problem. Moving it doesn't stop usage. > > > Leave kernel/linux with empty directory because > > > CI is trying to directly build it. At some later date, > > > kernel/linux can be removed. > > > > > > Signed-off-by: Stephen Hemminger > > > --- > > > > Want suggestions on this. > > 1. The release notes gets coding style warning because checkpatch > > is checking that release note matches current release, and release number > > hasn't change yet. Should I just wait? > > Yes the release notes file for 23.11 should be created today. > > > > 2. The OVSrobot is looking into the port library to see the kni symbols. > > But port is marked as deprecated already. > > Perhaps we should just pull out port first? > > No we must support it until it is removed. > You should either disable or remove KNI from the port library. The patch removed from port library and it builds but the ABI robot was looking for symbols. Will just remove port library first.
Re: [PATCH v2] kni: remove deprecated kernel network interface
On Mon, Jul 31, 2023 at 5:13 PM Stephen Hemminger wrote: > > > 2. The OVSrobot is looking into the port library to see the kni symbols. > > > But port is marked as deprecated already. > > > Perhaps we should just pull out port first? > > > > No we must support it until it is removed. > > You should either disable or remove KNI from the port library. > > The patch removed from port library and it builds but the ABI > robot was looking for symbols. The ABI check was still active by the time you submitted this series. Please resend it now that the ABI check is disabled with rc0 merged. -- David Marchand
Re: [PATCH v2] kni: remove deprecated kernel network interface
31/07/2023 17:13, Stephen Hemminger: > On Mon, 31 Jul 2023 10:40:35 +0200 > Thomas Monjalon wrote: > > > 30/07/2023 19:12, Stephen Hemminger: > > > On Sat, 29 Jul 2023 19:12:05 -0700 > > > Stephen Hemminger wrote: > > > > > > > Deprecation and removal was announced in 22.11. > > > > Make it so. > > > > Would be good to summarize the reason here, > > and name replacements. > > > > Also it should not be completely removed. > > I think we were supposed to move KNI into the kmod repository? > > The decision I remember was to remove it completely. > KNI has several issues which make it unstable and even a potential > security problem. Moving it doesn't stop usage. The latest decision I've found was "remove lib + kmod from main repo for 23.11" http://mails.dpdk.org/archives/dev/2022-June/243596.html igb_uio was moved in dpdk-kmods/linux which looks as a cemetery. Should we make a grave for KNI?
[PATCH v7 1/3] eal/windows: move fnmatch function to header file
To allow the fnmatch function to be shared between libraries, without
having to export it into the public namespace (since it's not prefixed
with "rte"), we can convert fnmatch.c to replace fnmatch.h. This allows
fnmatch function to be static and limited in scope to the current file,
preventing duplicate definitions if it is used by two libraries, while
also not requiring export for sharing.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Tyler Retzlaff
---
lib/eal/windows/fnmatch.c | 172 -
lib/eal/windows/include/fnmatch.h | 175 +++---
lib/eal/windows/meson.build | 1 -
3 files changed, 162 insertions(+), 186 deletions(-)
delete mode 100644 lib/eal/windows/fnmatch.c
diff --git a/lib/eal/windows/fnmatch.c b/lib/eal/windows/fnmatch.c
deleted file mode 100644
index f622bf54c5..00
--- a/lib/eal/windows/fnmatch.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 1989, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)fnmatch.c8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-#include
-#include
-#include
-
-#include "fnmatch.h"
-
-#define EOS'\0'
-
-static const char *rangematch(const char *, char, int);
-
-int
-fnmatch(const char *pattern, const char *string, int flags)
-{
- const char *stringstart;
- char c, test;
-
- for (stringstart = string;;)
- switch (c = *pattern++) {
- case EOS:
- if ((flags & FNM_LEADING_DIR) && *string == '/')
- return (0);
- return (*string == EOS ? 0 : FNM_NOMATCH);
- case '?':
- if (*string == EOS)
- return (FNM_NOMATCH);
- if (*string == '/' && (flags & FNM_PATHNAME))
- return (FNM_NOMATCH);
- if (*string == '.' && (flags & FNM_PERIOD) &&
- (string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
- return (FNM_NOMATCH);
- ++string;
- break;
- case '*':
- c = *pattern;
- /* Collapse multiple stars. */
- while (c == '*')
- c = *++pattern;
-
- if (*string == '.' && (flags & FNM_PERIOD) &&
- (string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
- return (FNM_NOMATCH);
-
- /* Optimize for pattern with * at end or before /. */
- if (c == EOS)
- if (flags & FNM_PATHNAME)
- return ((flags & FNM_LEADING_DIR) ||
- strchr(string, '/') == NULL ?
- 0 : FNM_NOMATCH);
- else
- return (0);
- else if (c == '/' && flags & FNM_PATHNAME) {
- string = strchr(string, '/');
- if (string == NULL)
- return (FNM_NOMATCH);
- break;
- }
-
- /* General case, use recursion. */
- while ((test = *string) != EOS) {
- if (!fnmatch(pattern, string,
- flags & ~FNM_PERIOD))
- return (0);
- if (test == '/' && flags & FNM_PATHNAME)
- break;
- ++string;
- }
- return (FNM_NOMATCH);
- case '[':
- if (*string == EOS)
- return (FNM_NOMATCH);
- if (*string == '/' && flags & FNM_PATHNAME)
- return (FNM_NOMATCH);
- pattern = rangematch(pattern, *string, flags);
- if (pattern == NULL)
- return (FNM_NOMATCH);
- ++string;
- break;
- case '\\':
- if (!(flags & FNM_NOESCAPE)) {
- c
[PATCH v7 0/3] Split logging functionality out of EAL
There is a general desire to reduce the size and scope of EAL. To this
end, this patchset makes a (very) small step in that direction by taking
the logging functionality out of EAL and putting it into its own library
that can be built and maintained separately.
As with the first RFC for this, the main obstacle is the "fnmatch"
function which is needed by both EAL and the new log function when
building on windows. While the function cannot stay in EAL - or we would
have a circular dependency, moving it to a new library or just putting
it in the log library have the disadvantages that it then "leaks" into
the public namespace without an rte_prefix, which could cause issues.
Since only a single function is involved, subsequent versions take a
different approach to v1, and just moves the offending function to be a
static function in a header file. This allows use by multiple libs
without conflicting names or making it public.
The other complication, as explained in v1 RFC was that of multiple
implementations for different OS's. This is solved here in the same
way as v1, by including the OS in the name and having meson pick the
correct file for each build. Since only one file is involved, there
seemed little need for replicating EAL's separate subdirectories
per-OS.
V7:
* re-submit to re-run CI with ABI checks disabled
v6:
* Updated ABI version to DPDK_24 for new log library for 23.11 release.
v5:
* rebased to latest main branch
* fixed trailing whitespace issues in new doc section
v4:
* Fixed windows build error, due to missing strdup (_strdup on windows)
* Added doc updates to programmers guide.
v3:
* Fixed missing log file for BSD
* Removed "eal" from the filenames of files in the log directory
* added prefixes to elements in the fnmatch header to avoid conflicts
* fixed space indentation in new lines in telemetry.c (checkpatch)
* removed "extern int logtype" definition in telemetry.c (checkpatch)
* added log directory to list for doxygen scanning
Bruce Richardson (3):
eal/windows: move fnmatch function to header file
log: separate logging functions out of EAL
telemetry: use standard logging
doc/api/doxy-api.conf.in | 1 +
.../prog_guide/env_abstraction_layer.rst | 4 +-
doc/guides/prog_guide/index.rst | 1 +
doc/guides/prog_guide/log_lib.rst | 115
lib/eal/common/eal_common_options.c | 2 +-
lib/eal/common/eal_private.h | 7 -
lib/eal/common/meson.build| 1 -
lib/eal/freebsd/eal.c | 6 +-
lib/eal/include/meson.build | 1 -
lib/eal/linux/eal.c | 8 +-
lib/eal/linux/meson.build | 1 -
lib/eal/meson.build | 2 +-
lib/eal/version.map | 17 --
lib/eal/windows/eal.c | 2 +-
lib/eal/windows/fnmatch.c | 172 -
lib/eal/windows/include/fnmatch.h | 175 --
lib/eal/windows/meson.build | 2 -
lib/kvargs/meson.build| 3 +-
.../common/eal_common_log.c => log/log.c} | 7 +-
lib/log/log_freebsd.c | 12 ++
.../common/eal_log.h => log/log_internal.h} | 18 +-
lib/{eal/linux/eal_log.c => log/log_linux.c} | 2 +-
.../windows/eal_log.c => log/log_windows.c} | 2 +-
lib/log/meson.build | 9 +
lib/{eal/include => log}/rte_log.h| 0
lib/log/version.map | 34
lib/meson.build | 1 +
lib/telemetry/meson.build | 3 +-
lib/telemetry/telemetry.c | 11 +-
lib/telemetry/telemetry_internal.h| 3 +-
30 files changed, 370 insertions(+), 252 deletions(-)
create mode 100644 doc/guides/prog_guide/log_lib.rst
delete mode 100644 lib/eal/windows/fnmatch.c
rename lib/{eal/common/eal_common_log.c => log/log.c} (99%)
create mode 100644 lib/log/log_freebsd.c
rename lib/{eal/common/eal_log.h => log/log_internal.h} (69%)
rename lib/{eal/linux/eal_log.c => log/log_linux.c} (97%)
rename lib/{eal/windows/eal_log.c => log/log_windows.c} (93%)
create mode 100644 lib/log/meson.build
rename lib/{eal/include => log}/rte_log.h (100%)
create mode 100644 lib/log/version.map
--
2.39.2
[PATCH v7 2/3] log: separate logging functions out of EAL
Move the logging capability to a separate library, free from EAL. Rename
files as appropriate, and use meson.build to select the correct file to
be built for each operating system, rather than having a subdir per-os.
Add new documentation section in programmers guide to cover logging in
more detail.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Tyler Retzlaff
---
doc/api/doxy-api.conf.in | 1 +
.../prog_guide/env_abstraction_layer.rst | 4 +-
doc/guides/prog_guide/index.rst | 1 +
doc/guides/prog_guide/log_lib.rst | 115 ++
lib/eal/common/eal_common_options.c | 2 +-
lib/eal/common/eal_private.h | 7 --
lib/eal/common/meson.build| 1 -
lib/eal/include/meson.build | 1 -
lib/eal/linux/eal.c | 2 +-
lib/eal/linux/meson.build | 1 -
lib/eal/meson.build | 2 +-
lib/eal/version.map | 17 ---
lib/eal/windows/eal.c | 2 +-
lib/eal/windows/meson.build | 1 -
lib/kvargs/meson.build| 3 +-
.../common/eal_common_log.c => log/log.c} | 7 +-
lib/log/log_freebsd.c | 12 ++
.../common/eal_log.h => log/log_internal.h} | 18 ++-
lib/{eal/linux/eal_log.c => log/log_linux.c} | 2 +-
.../windows/eal_log.c => log/log_windows.c} | 2 +-
lib/log/meson.build | 9 ++
lib/{eal/include => log}/rte_log.h| 0
lib/log/version.map | 34 ++
lib/meson.build | 1 +
lib/telemetry/meson.build | 3 +-
25 files changed, 202 insertions(+), 46 deletions(-)
create mode 100644 doc/guides/prog_guide/log_lib.rst
rename lib/{eal/common/eal_common_log.c => log/log.c} (99%)
create mode 100644 lib/log/log_freebsd.c
rename lib/{eal/common/eal_log.h => log/log_internal.h} (69%)
rename lib/{eal/linux/eal_log.c => log/log_linux.c} (97%)
rename lib/{eal/windows/eal_log.c => log/log_windows.c} (93%)
create mode 100644 lib/log/meson.build
rename lib/{eal/include => log}/rte_log.h (100%)
create mode 100644 lib/log/version.map
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index 1a4210b948..40f7dd2877 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -52,6 +52,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \
@TOPDIR@/lib/kni \
@TOPDIR@/lib/kvargs \
@TOPDIR@/lib/latencystats \
+ @TOPDIR@/lib/log \
@TOPDIR@/lib/lpm \
@TOPDIR@/lib/mbuf \
@TOPDIR@/lib/member \
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst
b/doc/guides/prog_guide/env_abstraction_layer.rst
index 93c8a031be..8033f6cebd 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -443,9 +443,7 @@ Per-lcore variables are implemented using *Thread Local
Storage* (TLS) to provid
Logs
-A logging API is provided by EAL.
-By default, in a Linux application, logs are sent to syslog and also to the
console.
-However, the log function can be overridden by the user to use a different
logging mechanism.
+While originally part of EAL, DPDK logging functionality is now provided by
the :ref:`Log_Library`.
Trace and Debug Functions
^
diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst
index d89cd3edb6..ac91060992 100644
--- a/doc/guides/prog_guide/index.rst
+++ b/doc/guides/prog_guide/index.rst
@@ -12,6 +12,7 @@ Programmer's Guide
overview
source_org
env_abstraction_layer
+log_lib
service_cores
trace_lib
rcu_lib
diff --git a/doc/guides/prog_guide/log_lib.rst
b/doc/guides/prog_guide/log_lib.rst
new file mode 100644
index 00..706ddcfef3
--- /dev/null
+++ b/doc/guides/prog_guide/log_lib.rst
@@ -0,0 +1,115 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2023 Intel Corporation.
+
+.. _log_library:
+
+Log Library
+
+
+The DPDK Log library provides the logging functionality for other DPDK
libraries and drivers.
+By default, in a Linux application, logs are sent to syslog and also to the
console.
+On FreeBSD and Windows applications, logs are sent only to the console.
+However, the log function can be overridden by the user to use a different
logging mechanism.
+
+Log Levels
+---
+
+Log messages from apps and libraries are reported with a given level of
severity.
+These levels, specified in ``rte_log.h`` are (from most to least important):
+
+#. Emergency
+#. Alert
+#. Critical
+#. Error
+#. Warning
+#. Notice
+#. Information
+#. Debug
+
+At runtim
[PATCH v7 3/3] telemetry: use standard logging
Now that logging is moved out of EAL, we don't need injection of the
logtype and logging function from EAL to telemetry library, simplifying
things.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
Acked-by: Tyler Retzlaff
---
lib/eal/freebsd/eal.c | 6 +-
lib/eal/linux/eal.c| 6 +-
lib/telemetry/telemetry.c | 11 +++
lib/telemetry/telemetry_internal.h | 3 +--
4 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index dfe973e6fd..0175d89e4b 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -898,13 +898,9 @@ rte_eal_init(int argc, char **argv)
return -1;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
!internal_conf->no_telemetry) {
- int tlog = rte_log_register_type_and_pick_level(
- "lib.telemetry", RTE_LOG_WARNING);
- if (tlog < 0)
- tlog = RTE_LOGTYPE_EAL;
if (rte_telemetry_init(rte_eal_get_runtime_dir(),
rte_version(),
- &internal_conf->ctrl_cpuset, rte_log, tlog) !=
0)
+ &internal_conf->ctrl_cpuset) != 0)
return -1;
}
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index 2f9203c87d..543cbe75fa 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -1333,13 +1333,9 @@ rte_eal_init(int argc, char **argv)
return -1;
}
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
!internal_conf->no_telemetry) {
- int tlog = rte_log_register_type_and_pick_level(
- "lib.telemetry", RTE_LOG_WARNING);
- if (tlog < 0)
- tlog = RTE_LOGTYPE_EAL;
if (rte_telemetry_init(rte_eal_get_runtime_dir(),
rte_version(),
- &internal_conf->ctrl_cpuset, rte_log, tlog) !=
0)
+ &internal_conf->ctrl_cpuset) != 0)
return -1;
}
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 590720bfa6..7d0488a6d7 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -54,11 +54,9 @@ static struct socket v1_socket; /* socket for v1 telemetry */
static const char *telemetry_version; /* save rte_version */
static const char *socket_dir;/* runtime directory */
static rte_cpuset_t *thread_cpuset;
-static rte_log_fn rte_log_ptr;
-static uint32_t logtype;
-#define TMTY_LOG(l, ...) \
-rte_log_ptr(RTE_LOG_ ## l, logtype, "TELEMETRY: " __VA_ARGS__)
+RTE_LOG_REGISTER_DEFAULT(logtype, WARNING);
+#define TMTY_LOG(l, ...) rte_log(RTE_LOG_ ## l, logtype, "TELEMETRY: "
__VA_ARGS__)
/* list of command callbacks, with one command registered by default */
static struct cmd_callback *callbacks;
@@ -627,14 +625,11 @@ telemetry_v2_init(void)
#endif /* !RTE_EXEC_ENV_WINDOWS */
int32_t
-rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset,
- rte_log_fn log_fn, uint32_t registered_logtype)
+rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset)
{
telemetry_version = rte_version;
socket_dir = runtime_dir;
thread_cpuset = cpuset;
- rte_log_ptr = log_fn;
- logtype = registered_logtype;
#ifndef RTE_EXEC_ENV_WINDOWS
if (telemetry_v2_init() != 0)
diff --git a/lib/telemetry/telemetry_internal.h
b/lib/telemetry/telemetry_internal.h
index 80e2bd3a49..b331e9458f 100644
--- a/lib/telemetry/telemetry_internal.h
+++ b/lib/telemetry/telemetry_internal.h
@@ -108,7 +108,6 @@ typedef int (*rte_log_fn)(uint32_t level, uint32_t logtype,
const char *format,
*/
__rte_internal
int
-rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset,
- rte_log_fn log_fn, uint32_t registered_logtype);
+rte_telemetry_init(const char *runtime_dir, const char *rte_version,
rte_cpuset_t *cpuset);
#endif
--
2.39.2
[PATCH v2] build: update DPDK to use C11 standard
As previously announced, DPDK 23.11 will require a C11 supporting
compiler and will use the C11 standard in all builds.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
---
V2:
* Resubmit now that 23.11-rc0 patch applied
* Add _POSIX_C_SOURCE macro to eal_common_errno.c to get POSIX
definition of strerror_r() with c11 standard.
---
doc/guides/linux_gsg/sys_reqs.rst | 3 ++-
doc/guides/rel_notes/deprecation.rst | 18 --
doc/guides/rel_notes/release_23_11.rst | 17 +
lib/eal/common/eal_common_errno.c | 1 +
meson.build| 1 +
5 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/doc/guides/linux_gsg/sys_reqs.rst
b/doc/guides/linux_gsg/sys_reqs.rst
index dfeaf4e1c5..13be715933 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -27,7 +27,8 @@ Compilation of the DPDK
The setup commands and installed packages needed on various systems may be
different.
For details on Linux distributions and the versions tested, please consult
the DPDK Release Notes.
-* General development tools including a supported C compiler such as gcc
(version 4.9+) or clang (version 3.4+),
+* General development tools including a C compiler supporting the C11
standard,
+including standard atomics, for example: GCC (version 5.0+) or Clang
(version 3.6+),
and ``pkg-config`` or ``pkgconf`` to be used when building end-user
binaries against DPDK.
* For RHEL/Fedora systems these can be installed using ``dnf groupinstall
"Development Tools"``
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 494b401cda..cc939d3c67 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -17,24 +17,6 @@ Other API and ABI deprecation notices are to be posted below.
Deprecation Notices
---
-* C Compiler: From DPDK 23.11 onwards,
- building DPDK will require a C compiler which supports the C11 standard,
- including support for C11 standard atomics.
-
- More specifically, the requirements will be:
-
- * Support for flag "-std=c11" (or similar)
- * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
-
- Please note:
-
- * C11, including standard atomics, is supported from GCC version 5 onwards,
-and is the default language version in that release
-(Ref: https://gcc.gnu.org/gcc-5/changes.html)
- * C11 is the default compilation mode in Clang from version 3.6,
-which also added support for standard atomics
-(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
-
* build: Enabling deprecated libraries (``flow_classify``, ``kni``)
won't be possible anymore through the use of the ``disable_libs`` build
option.
A new build option for deprecated libraries will be introduced instead.
diff --git a/doc/guides/rel_notes/release_23_11.rst
b/doc/guides/rel_notes/release_23_11.rst
index 6b4dd21fd0..c8b9ed456c 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -20,6 +20,23 @@ DPDK Release 23.11
ninja -C build doc
xdg-open build/doc/guides/html/rel_notes/release_23_11.html
+* Build Requirements: From DPDK 23.11 onwards,
+ building DPDK will require a C compiler which supports the C11 standard,
+ including support for C11 standard atomics.
+
+ More specifically, the requirements will be:
+
+ * Support for flag "-std=c11" (or similar)
+ * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
+
+ Please note:
+
+ * C11, including standard atomics, is supported from GCC version 5 onwards,
+and is the default language version in that release
+(Ref: https://gcc.gnu.org/gcc-5/changes.html)
+ * C11 is the default compilation mode in Clang from version 3.6,
+which also added support for standard atomics
+(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
New Features
diff --git a/lib/eal/common/eal_common_errno.c
b/lib/eal/common/eal_common_errno.c
index ef8f782abb..b30e2f0ad4 100644
--- a/lib/eal/common/eal_common_errno.c
+++ b/lib/eal/common/eal_common_errno.c
@@ -4,6 +4,7 @@
/* Use XSI-compliant portable version of strerror_r() */
#undef _GNU_SOURCE
+#define _POSIX_C_SOURCE 200809L
#include
#include
diff --git a/meson.build b/meson.build
index 39cb73846d..70b54f0c98 100644
--- a/meson.build
+++ b/meson.build
@@ -9,6 +9,7 @@ project('DPDK', 'c',
license: 'BSD',
default_options: [
'buildtype=release',
+'c_std=c11',
'default_library=static',
'warning_level=2',
],
--
2.39.2
[PATCH] cmdline: remove cmdline_poll()
The API functions cmdline_poll() was unused by any project,
untested, and it was buggy. Remove it from 23.11 release.
Signed-off-by: Stephen Hemminger
---
doc/guides/rel_notes/release_23_11.rst | 10 +---
lib/cmdline/cmdline.c | 34 -
lib/cmdline/cmdline.h | 16 --
lib/cmdline/cmdline_os_unix.c | 12 -
lib/cmdline/cmdline_os_windows.c | 68 --
lib/cmdline/cmdline_private.h | 3 --
lib/cmdline/version.map| 1 -
7 files changed, 1 insertion(+), 143 deletions(-)
diff --git a/doc/guides/rel_notes/release_23_11.rst
b/doc/guides/rel_notes/release_23_11.rst
index 6b4dd21fd0e1..d4c123e5503b 100644
--- a/doc/guides/rel_notes/release_23_11.rst
+++ b/doc/guides/rel_notes/release_23_11.rst
@@ -59,15 +59,7 @@ New Features
Removed Items
-
-.. This section should contain removed items in this release. Sample format:
-
- * Add a short 1-2 sentence description of the removed item
- in the past tense.
-
- This section is a comment. Do not overwrite or remove it.
- Also, make sure to start the actual text at the margin.
- ===
-
+* cmdline: Removed broken and unused function ``cmdline_poll``.
API Changes
---
diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index 355c7d8ca635..08721ee919be 100644
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -177,40 +177,6 @@ cmdline_quit(struct cmdline *cl)
rdline_quit(&cl->rdl);
}
-int
-cmdline_poll(struct cmdline *cl)
-{
- int status;
- ssize_t read_status;
- char c;
-
- if (!cl)
- return -EINVAL;
- else if (cl->rdl.status == RDLINE_EXITED)
- return RDLINE_EXITED;
-
- status = cmdline_poll_char(cl);
- if (status < 0)
- return status;
- else if (status > 0) {
- c = -1;
- read_status = cmdline_read_char(cl, &c);
- if (read_status < 0)
- return read_status;
-
- if (read_status == 0) {
- /* end of file is implicit quit */
- cmdline_quit(cl);
- } else {
- status = cmdline_in(cl, &c, 1);
- if (status < 0 && cl->rdl.status != RDLINE_EXITED)
- return status;
- }
- }
-
- return cl->rdl.status;
-}
-
void
cmdline_interact(struct cmdline *cl)
{
diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index d631cd4bd459..992c84591456 100644
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -43,22 +43,6 @@ __rte_experimental
struct rdline *
cmdline_get_rdline(struct cmdline *cl);
-/**
- * @deprecated Function is broken and scheduled for removal.
- *
- * This function is nonblocking equivalent of ``cmdline_interact()``. It polls
- * *cl* for one character and interpret it. If return value is *RDLINE_EXITED*
- * it mean that ``cmdline_quit()`` was invoked.
- *
- * @param cl
- * The command line object.
- *
- * @return
- * On success return object status - one of *enum rdline_status*.
- * On error return negative value.
- */
-__rte_deprecated
-int cmdline_poll(struct cmdline *cl);
void cmdline_interact(struct cmdline *cl);
void cmdline_quit(struct cmdline *cl);
diff --git a/lib/cmdline/cmdline_os_unix.c b/lib/cmdline/cmdline_os_unix.c
index 9a4ec4e33477..0365e73c115e 100644
--- a/lib/cmdline/cmdline_os_unix.c
+++ b/lib/cmdline/cmdline_os_unix.c
@@ -28,18 +28,6 @@ terminal_restore(const struct cmdline *cl)
tcsetattr(fileno(stdin), TCSANOW, &cl->oldterm);
}
-int
-cmdline_poll_char(struct cmdline *cl)
-{
- struct pollfd pfd;
-
- pfd.fd = cl->s_in;
- pfd.events = POLLIN;
- pfd.revents = 0;
-
- return poll(&pfd, 1, 0);
-}
-
ssize_t
cmdline_read_char(struct cmdline *cl, char *c)
{
diff --git a/lib/cmdline/cmdline_os_windows.c b/lib/cmdline/cmdline_os_windows.c
index 80863bfc8a00..74dc8a18db49 100644
--- a/lib/cmdline/cmdline_os_windows.c
+++ b/lib/cmdline/cmdline_os_windows.c
@@ -72,74 +72,6 @@ cmdline_is_key_down(const INPUT_RECORD *record)
record->Event.KeyEvent.bKeyDown;
}
-static int
-cmdline_poll_char_console(HANDLE handle)
-{
- INPUT_RECORD record;
- DWORD events;
-
- if (!PeekConsoleInput(handle, &record, 1, &events)) {
- /* Simulate poll(3) behavior on EOF. */
- return (GetLastError() == ERROR_HANDLE_EOF) ? 1 : -1;
- }
-
- if ((events == 0) || !cmdline_is_key_down(&record))
- return 0;
-
- return 1;
-}
-
-static int
-cmdline_poll_char_file(struct cmdline *cl, HANDLE handle)
-{
- DWORD type = GetFileType(handle);
-
- /* Since console is handled by cmdline_poll_char_console(),
-* this is either a serial port or input handle had been replaced.
-*/
-
Re: [PATCH v7 2/3] log: separate logging functions out of EAL
On Mon, Jul 31, 2023 at 5:39 PM Bruce Richardson wrote: > diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in > index 1a4210b948..40f7dd2877 100644 > --- a/doc/api/doxy-api.conf.in > +++ b/doc/api/doxy-api.conf.in > @@ -52,6 +52,7 @@ INPUT = > @TOPDIR@/doc/api/doxy-api-index.md \ >@TOPDIR@/lib/kni \ >@TOPDIR@/lib/kvargs \ >@TOPDIR@/lib/latencystats \ > + @TOPDIR@/lib/log \ >@TOPDIR@/lib/lpm \ >@TOPDIR@/lib/mbuf \ >@TOPDIR@/lib/member \ In case you are wondering about the reason.. the Intel CI reports an error on building the documentation: *Build Failed #1: OS: UB2204-64 Target: x86_64-native-linuxapp-doc FAILED: doc/api/html /usr/bin/python3 ../doc/api/generate_doxygen.py doc/api/html /usr/bin/doxygen doc/api/doxy-api.conf /root/UB2204-64_K5.15.0_GCC11.3.0/x86_64-native-linuxapp-doc/29045/dpdk/doc/api/doxy-api-index.md:230: error: unable to resolve reference to 'rte_log.h' for \ref command (warning treated as error, aborting now) Traceback (most recent call last): File "/root/UB2204-64_K5.15.0_GCC11.3.0/x86_64-native-linuxapp-doc/29045/dpdk/x86_64-native-linuxapp-doc/../doc/api/generate_doxygen.py", line 13, in subprocess.run(doxygen_command, check=True, stdout=out) File "/usr/lib/python3.10/subprocess.py", line 524, in run raise CalledProcessError(retcode, process.args, subprocess.CalledProcessError: Command '['/usr/bin/doxygen', 'doc/api/doxy-api.conf']' returned non-zero exit status 1. [2772/2774] Compiling C object app/test/dpdk-test.p/test_ring.c.o [2773/2774] Generating doc/guides/html_guides with a custom command ninja: build stopped IIRC Intel CI excludes changes on the doc/ directory when applying patches. http://inbox.dpdk.org/dev/cy5pr11mb618735108d3e9d90c67eef96f5...@cy5pr11mb6187.namprd11.prod.outlook.com/ .. which seems to match the failure reported here, as doxygen would fail to find rte_log.h. -- David Marchand
Re: [PATCH v2] build: update DPDK to use C11 standard
On Mon, Jul 31, 2023 at 04:58:02PM +0100, Bruce Richardson wrote: > As previously announced, DPDK 23.11 will require a C11 supporting > compiler and will use the C11 standard in all builds. > > Signed-off-by: Bruce Richardson > Acked-by: Morten Brørup > > --- Acked-by: Tyler Retzlaff
Re: [PATCH v7 2/3] log: separate logging functions out of EAL
On Mon, Jul 31, 2023 at 06:22:40PM +0200, David Marchand wrote: > On Mon, Jul 31, 2023 at 5:39 PM Bruce Richardson > wrote: > > diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in > > index 1a4210b948..40f7dd2877 100644 > > --- a/doc/api/doxy-api.conf.in > > +++ b/doc/api/doxy-api.conf.in > > @@ -52,6 +52,7 @@ INPUT = > > @TOPDIR@/doc/api/doxy-api-index.md \ > >@TOPDIR@/lib/kni \ > >@TOPDIR@/lib/kvargs \ > >@TOPDIR@/lib/latencystats \ > > + @TOPDIR@/lib/log \ > >@TOPDIR@/lib/lpm \ > >@TOPDIR@/lib/mbuf \ > >@TOPDIR@/lib/member \ > > In case you are wondering about the reason.. the Intel CI reports an > error on building the documentation: > > *Build Failed #1: > OS: UB2204-64 > Target: x86_64-native-linuxapp-doc > FAILED: doc/api/html > /usr/bin/python3 ../doc/api/generate_doxygen.py doc/api/html > /usr/bin/doxygen doc/api/doxy-api.conf > /root/UB2204-64_K5.15.0_GCC11.3.0/x86_64-native-linuxapp-doc/29045/dpdk/doc/api/doxy-api-index.md:230: > error: unable to resolve reference to 'rte_log.h' for \ref command > (warning treated as error, aborting now) > Traceback (most recent call last): > File > "/root/UB2204-64_K5.15.0_GCC11.3.0/x86_64-native-linuxapp-doc/29045/dpdk/x86_64-native-linuxapp-doc/../doc/api/generate_doxygen.py", > line 13, in > subprocess.run(doxygen_command, check=True, stdout=out) > File "/usr/lib/python3.10/subprocess.py", line 524, in run > raise CalledProcessError(retcode, process.args, > subprocess.CalledProcessError: Command '['/usr/bin/doxygen', > 'doc/api/doxy-api.conf']' returned non-zero exit status 1. > [2772/2774] Compiling C object app/test/dpdk-test.p/test_ring.c.o > [2773/2774] Generating doc/guides/html_guides with a custom command > ninja: build stopped > > IIRC Intel CI excludes changes on the doc/ directory when applying patches. > http://inbox.dpdk.org/dev/cy5pr11mb618735108d3e9d90c67eef96f5...@cy5pr11mb6187.namprd11.prod.outlook.com/ > > .. which seems to match the failure reported here, as doxygen would > fail to find rte_log.h. > Yes, I was very much wondering about the reason for failure, since I could find no issues with building the docs on my own system! Thanks for the info. /Bruce
Re: [PATCH] cmdline: remove cmdline_poll()
On Mon, Jul 31, 2023 at 09:12:32AM -0700, Stephen Hemminger wrote: > The API functions cmdline_poll() was unused by any project, > untested, and it was buggy. Remove it from 23.11 release. > > Signed-off-by: Stephen Hemminger > --- > doc/guides/rel_notes/release_23_11.rst | 10 +--- > lib/cmdline/cmdline.c | 34 - > lib/cmdline/cmdline.h | 16 -- > lib/cmdline/cmdline_os_unix.c | 12 - > lib/cmdline/cmdline_os_windows.c | 68 -- > lib/cmdline/cmdline_private.h | 3 -- > lib/cmdline/version.map| 1 - > 7 files changed, 1 insertion(+), 143 deletions(-) > Acked-by: Bruce Richardson with one comment below > diff --git a/doc/guides/rel_notes/release_23_11.rst > b/doc/guides/rel_notes/release_23_11.rst > index 6b4dd21fd0e1..d4c123e5503b 100644 > --- a/doc/guides/rel_notes/release_23_11.rst > +++ b/doc/guides/rel_notes/release_23_11.rst > @@ -59,15 +59,7 @@ New Features > Removed Items > - > > -.. This section should contain removed items in this release. Sample format: > - > - * Add a short 1-2 sentence description of the removed item > - in the past tense. > - > - This section is a comment. Do not overwrite or remove it. > - Also, make sure to start the actual text at the margin. > - === > - I believe we keep this boilerplate in place until the finalization of the release. We want to ensure the instructions are read by all who are editing this file.
Re: [PATCH v2] build: update DPDK to use C11 standard
On Mon, Jul 31, 2023 at 04:58:02PM +0100, Bruce Richardson wrote:
> As previously announced, DPDK 23.11 will require a C11 supporting
> compiler and will use the C11 standard in all builds.
>
> Signed-off-by: Bruce Richardson
> Acked-by: Morten Brørup
>
> ---
> V2:
> * Resubmit now that 23.11-rc0 patch applied
> * Add _POSIX_C_SOURCE macro to eal_common_errno.c to get POSIX
> definition of strerror_r() with c11 standard.
> ---
> doc/guides/linux_gsg/sys_reqs.rst | 3 ++-
> doc/guides/rel_notes/deprecation.rst | 18 --
> doc/guides/rel_notes/release_23_11.rst | 17 +
> lib/eal/common/eal_common_errno.c | 1 +
> meson.build| 1 +
> 5 files changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/doc/guides/linux_gsg/sys_reqs.rst
> b/doc/guides/linux_gsg/sys_reqs.rst
> index dfeaf4e1c5..13be715933 100644
> --- a/doc/guides/linux_gsg/sys_reqs.rst
> +++ b/doc/guides/linux_gsg/sys_reqs.rst
> @@ -27,7 +27,8 @@ Compilation of the DPDK
> The setup commands and installed packages needed on various systems may
> be different.
> For details on Linux distributions and the versions tested, please
> consult the DPDK Release Notes.
>
> -* General development tools including a supported C compiler such as gcc
> (version 4.9+) or clang (version 3.4+),
> +* General development tools including a C compiler supporting the C11
> standard,
> +including standard atomics, for example: GCC (version 5.0+) or Clang
> (version 3.6+),
> and ``pkg-config`` or ``pkgconf`` to be used when building end-user
> binaries against DPDK.
>
> * For RHEL/Fedora systems these can be installed using ``dnf
> groupinstall "Development Tools"``
> diff --git a/doc/guides/rel_notes/deprecation.rst
> b/doc/guides/rel_notes/deprecation.rst
> index 494b401cda..cc939d3c67 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -17,24 +17,6 @@ Other API and ABI deprecation notices are to be posted
> below.
> Deprecation Notices
> ---
>
> -* C Compiler: From DPDK 23.11 onwards,
> - building DPDK will require a C compiler which supports the C11 standard,
> - including support for C11 standard atomics.
> -
> - More specifically, the requirements will be:
> -
> - * Support for flag "-std=c11" (or similar)
> - * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
> -
> - Please note:
> -
> - * C11, including standard atomics, is supported from GCC version 5 onwards,
> -and is the default language version in that release
> -(Ref: https://gcc.gnu.org/gcc-5/changes.html)
> - * C11 is the default compilation mode in Clang from version 3.6,
> -which also added support for standard atomics
> -(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
> -
> * build: Enabling deprecated libraries (``flow_classify``, ``kni``)
>won't be possible anymore through the use of the ``disable_libs`` build
> option.
>A new build option for deprecated libraries will be introduced instead.
> diff --git a/doc/guides/rel_notes/release_23_11.rst
> b/doc/guides/rel_notes/release_23_11.rst
> index 6b4dd21fd0..c8b9ed456c 100644
> --- a/doc/guides/rel_notes/release_23_11.rst
> +++ b/doc/guides/rel_notes/release_23_11.rst
> @@ -20,6 +20,23 @@ DPDK Release 23.11
>ninja -C build doc
>xdg-open build/doc/guides/html/rel_notes/release_23_11.html
>
> +* Build Requirements: From DPDK 23.11 onwards,
> + building DPDK will require a C compiler which supports the C11 standard,
> + including support for C11 standard atomics.
> +
> + More specifically, the requirements will be:
> +
> + * Support for flag "-std=c11" (or similar)
> + * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag
> +
> + Please note:
> +
> + * C11, including standard atomics, is supported from GCC version 5 onwards,
> +and is the default language version in that release
> +(Ref: https://gcc.gnu.org/gcc-5/changes.html)
> + * C11 is the default compilation mode in Clang from version 3.6,
> +which also added support for standard atomics
> +(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html)
>
> New Features
>
> diff --git a/lib/eal/common/eal_common_errno.c
> b/lib/eal/common/eal_common_errno.c
> index ef8f782abb..b30e2f0ad4 100644
> --- a/lib/eal/common/eal_common_errno.c
> +++ b/lib/eal/common/eal_common_errno.c
> @@ -4,6 +4,7 @@
>
> /* Use XSI-compliant portable version of strerror_r() */
> #undef _GNU_SOURCE
> +#define _POSIX_C_SOURCE 200809L
>
> #include
> #include
> diff --git a/meson.build b/meson.build
> index 39cb73846d..70b54f0c98 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -9,6 +9,7 @@ project('DPDK', 'c',
> license: 'BSD',
> default_options: [
> 'buildtype=release',
> +'c_std=c11',
> 'default_library=static',
>
[PATCH v3] build: update DPDK to use C11 standard
As previously announced, DPDK 23.11 will require a C11 supporting compiler and will use the C11 standard in all builds. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup Acked-by: Tyler Retzlaff --- V3: * remove (now unneeded) use of -std=gnu99 in failsafe net driver. V2: * Resubmit now that 23.11-rc0 patch applied * Add _POSIX_C_SOURCE macro to eal_common_errno.c to get POSIX definition of strerror_r() with c11 standard. --- doc/guides/linux_gsg/sys_reqs.rst | 3 ++- doc/guides/rel_notes/deprecation.rst | 18 -- doc/guides/rel_notes/release_23_11.rst | 17 + drivers/net/failsafe/meson.build | 1 - lib/eal/common/eal_common_errno.c | 1 + meson.build| 1 + 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index dfeaf4e1c5..13be715933 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -27,7 +27,8 @@ Compilation of the DPDK The setup commands and installed packages needed on various systems may be different. For details on Linux distributions and the versions tested, please consult the DPDK Release Notes. -* General development tools including a supported C compiler such as gcc (version 4.9+) or clang (version 3.4+), +* General development tools including a C compiler supporting the C11 standard, +including standard atomics, for example: GCC (version 5.0+) or Clang (version 3.6+), and ``pkg-config`` or ``pkgconf`` to be used when building end-user binaries against DPDK. * For RHEL/Fedora systems these can be installed using ``dnf groupinstall "Development Tools"`` diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 494b401cda..cc939d3c67 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -17,24 +17,6 @@ Other API and ABI deprecation notices are to be posted below. Deprecation Notices --- -* C Compiler: From DPDK 23.11 onwards, - building DPDK will require a C compiler which supports the C11 standard, - including support for C11 standard atomics. - - More specifically, the requirements will be: - - * Support for flag "-std=c11" (or similar) - * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag - - Please note: - - * C11, including standard atomics, is supported from GCC version 5 onwards, -and is the default language version in that release -(Ref: https://gcc.gnu.org/gcc-5/changes.html) - * C11 is the default compilation mode in Clang from version 3.6, -which also added support for standard atomics -(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html) - * build: Enabling deprecated libraries (``flow_classify``, ``kni``) won't be possible anymore through the use of the ``disable_libs`` build option. A new build option for deprecated libraries will be introduced instead. diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst index 6b4dd21fd0..c8b9ed456c 100644 --- a/doc/guides/rel_notes/release_23_11.rst +++ b/doc/guides/rel_notes/release_23_11.rst @@ -20,6 +20,23 @@ DPDK Release 23.11 ninja -C build doc xdg-open build/doc/guides/html/rel_notes/release_23_11.html +* Build Requirements: From DPDK 23.11 onwards, + building DPDK will require a C compiler which supports the C11 standard, + including support for C11 standard atomics. + + More specifically, the requirements will be: + + * Support for flag "-std=c11" (or similar) + * __STDC_NO_ATOMICS__ is *not defined* when using c11 flag + + Please note: + + * C11, including standard atomics, is supported from GCC version 5 onwards, +and is the default language version in that release +(Ref: https://gcc.gnu.org/gcc-5/changes.html) + * C11 is the default compilation mode in Clang from version 3.6, +which also added support for standard atomics +(Ref: https://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html) New Features diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build index 6013e13722..c1d361083b 100644 --- a/drivers/net/failsafe/meson.build +++ b/drivers/net/failsafe/meson.build @@ -7,7 +7,6 @@ if is_windows subdir_done() endif -cflags += '-std=gnu99' cflags += '-D_DEFAULT_SOURCE' cflags += '-D_XOPEN_SOURCE=700' cflags += '-pedantic' diff --git a/lib/eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c index ef8f782abb..b30e2f0ad4 100644 --- a/lib/eal/common/eal_common_errno.c +++ b/lib/eal/common/eal_common_errno.c @@ -4,6 +4,7 @@ /* Use XSI-compliant portable version of strerror_r() */ #undef _GNU_SOURCE +#define _POSIX_C_SOURCE 200809L #include #include diff --git a/meson.build b/meson.build index 39cb73846d..70b54f0c98 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +
Registration reminder for DPDK Dublin Summit
Good afternoon DPDK Community, September 12-13, 2023 we will have the DPDK Summit at the Gibson Hotel in Point Square in Dublin. Once again, registration and attendance for this event are *free!* The schedule is posted here, and we have a dynamic two-day line-up of speakers: https://events.linuxfoundation.org/dpdk-summit/program/schedule/ If you have not already registered for the event, please do so now. *You may do so here:* https://events.linuxfoundation.org/dpdk-userspace-summit/ I would also encourage those who are traveling to Dublin but have not booked flights or accommodations to do so now to mitigate the elevation of costs. Any questions let us know. Thanks, Nathan Nathan C. Southern, Project Coordinator Data Plane Development Kit The Linux Foundation 248.835.4812 (mobile) nsouth...@linuxfoundation.org
Re: [PATCH v3] build: update DPDK to use C11 standard
On Mon, Jul 31, 2023 at 05:58:11PM +0100, Bruce Richardson wrote: > As previously announced, DPDK 23.11 will require a C11 supporting > compiler and will use the C11 standard in all builds. > > Signed-off-by: Bruce Richardson > Acked-by: Morten Brørup > Acked-by: Tyler Retzlaff > > --- > V3: > * remove (now unneeded) use of -std=gnu99 in failsafe net driver. > > V2: > * Resubmit now that 23.11-rc0 patch applied > * Add _POSIX_C_SOURCE macro to eal_common_errno.c to get POSIX > definition of strerror_r() with c11 standard. > --- Acked-by: Tyler Retzlaff if there is no objection from others i would like to suggest expedited merge of this series to make it easy to take a dependency on it for atomics changes. thanks!
Re: [PATCH 1/3] version: 23.11-rc0
David Marchand writes: > Start a new release cycle with empty release notes. > > The ABI version becomes 24.0. > The map files are updated to the new ABI major number (24). > The ABI exceptions are dropped and CI ABI checks are disabled because > compatibility is not preserved. > > The telemetry and vhost libraries compat code is cleaned up in next > commits. > > Signed-off-by: David Marchand > --- Acked-by: Aaron Conole
Re: [PATCH v7 1/2] build: select deprecated libraries
David Marchand writes: > Rework deprecated libraries selection by introducing a new configuration > option. > > This breaks existing configurations that were relying on disable_libs='' > for enabling deprecated libraries. > On the other hand, it will make enabling optional libraries more > straightforward by taking the deprecated libraries out of the picture. > > Signed-off-by: David Marchand > Acked-by: Morten Brørup > Acked-by: Bruce Richardson > --- Acked-by: Aaron Conole
Re: [PATCH v4] ethdev: advertise flow restore in mbuf
On 6/21/23 16:43, David Marchand wrote:
> As reported by Ilya [1], unconditionally calling
> rte_flow_get_restore_info() impacts an application performance for drivers
> that do not provide this ops.
> It could also impact processing of packets that require no call to
> rte_flow_get_restore_info() at all.
>
> Register a dynamic mbuf flag when an application negotiates tunnel
> metadata delivery (calling rte_eth_rx_metadata_negotiate() with
> RTE_ETH_RX_METADATA_TUNNEL_ID).
>
> Drivers then advertise that metadata can be extracted by setting this
> dynamic flag in each mbuf.
>
> The application then calls rte_flow_get_restore_info() only when required.
>
> Link: http://inbox.dpdk.org/dev/5248c2ca-f2a6-3fb0-38b8-7f659bfa4...@ovn.org/
> Signed-off-by: David Marchand
> Acked-by: Andrew Rybchenko
> Acked-by: Viacheslav Ovsiienko
> Tested-by: Ali Alnubani
> Acked-by: Ori Kam
> ---
> Changes since RFC v3:
> - rebased on next-net,
> - sending as non RFC for CIs that skip RFC patches,
>
> Changes since RFC v2:
> - fixed crash introduced in v2 and removed unneeded argument to
> rte_flow_restore_info_dynflag_register(),
>
> Changes since RFC v1:
> - rebased,
> - updated vectorized datapath functions for net/mlx5,
> - moved dynamic flag register to rte_eth_rx_metadata_negotiate() and
> hid rte_flow_restore_info_dynflag_register() into ethdev internals,
>
> ---
> app/test-pmd/util.c | 9 +++--
> drivers/net/mlx5/mlx5.c | 2 +
> drivers/net/mlx5/mlx5.h | 5 ++-
> drivers/net/mlx5/mlx5_flow.c | 47 +---
> drivers/net/mlx5/mlx5_rx.c | 2 +-
> drivers/net/mlx5/mlx5_rx.h | 1 +
> drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 16
> drivers/net/mlx5/mlx5_rxtx_vec_neon.h| 6 +--
> drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 6 +--
> drivers/net/mlx5/mlx5_trigger.c | 4 +-
> drivers/net/sfc/sfc_dp.c | 14 +--
> lib/ethdev/rte_ethdev.c | 5 +++
> lib/ethdev/rte_flow.c| 27 ++
> lib/ethdev/rte_flow.h| 18 -
> lib/ethdev/rte_flow_driver.h | 6 +++
> lib/ethdev/version.map | 1 +
> 16 files changed, 128 insertions(+), 41 deletions(-)
> diff --git a/lib/ethdev/rte_flow_driver.h b/lib/ethdev/rte_flow_driver.h
> index 356b60f523..f9fb01b8a2 100644
> --- a/lib/ethdev/rte_flow_driver.h
> +++ b/lib/ethdev/rte_flow_driver.h
> @@ -376,6 +376,12 @@ struct rte_flow_ops {
> const struct rte_flow_ops *
> rte_flow_ops_get(uint16_t port_id, struct rte_flow_error *error);
>
> +/**
> + * Register mbuf dynamic flag for rte_flow_get_restore_info.
> + */
> +int
> +rte_flow_restore_info_dynflag_register(void);
> +
Hi, David, others.
Is there a reason to not expose this function to the application?
The point is that application will likely want to know the value
of the flag before creating any devices. I.e. request it once
and use for all devices later without performing a call to an
external library (DPDK). In current implementation, application
will need to open some device first, and only then the result of
rte_flow_restore_info_dynflag() will become meaningful.
There is no need to require application to call this function,
it can still be called from the rx negotiation API, but it would
be nice if application could know it beforehand, i.e. had control
over when the flag is actually becomes visible.
Alternatively, the _register() could also be called right from
the rte_flow_restore_info_dynflag() at a slight performance cost.
It shouldn't be important though, since drivers do not seem to
call it from a performance-sensitive code.
Thoughts?
Best regards, Ilya Maximets.
[PATCH] flow_classify: remove library
The flow_classify library was marked for removal last year
because there was no maintainer and the functionality is
limited.
Signed-off-by: Stephen Hemminger
---
MAINTAINERS | 7 -
app/test/meson.build | 4 -
app/test/test_flow_classify.c | 895 --
doc/api/doxy-api-index.md | 1 -
doc/api/doxy-api.conf.in | 1 -
doc/guides/freebsd_gsg/build_sample_apps.rst | 2 +-
doc/guides/freebsd_gsg/install_from_ports.rst | 2 +-
doc/guides/prog_guide/flow_classify_lib.rst | 424 -
doc/guides/prog_guide/index.rst | 1 -
doc/guides/rel_notes/deprecation.rst | 8 +-
doc/guides/rel_notes/release_23_11.rst| 3 +
doc/guides/sample_app_ug/flow_classify.rst| 242 -
doc/guides/sample_app_ug/index.rst| 1 -
examples/flow_classify/Makefile | 51 -
examples/flow_classify/flow_classify.c| 878 -
examples/flow_classify/ipv4_rules_file.txt| 14 -
examples/flow_classify/meson.build| 13 -
examples/meson.build | 1 -
lib/flow_classify/meson.build | 12 -
lib/flow_classify/rte_flow_classify.c | 670 -
lib/flow_classify/rte_flow_classify.h | 284 --
lib/flow_classify/rte_flow_classify_parse.c | 532 ---
lib/flow_classify/rte_flow_classify_parse.h | 58 --
lib/flow_classify/version.map | 13 -
lib/meson.build | 3 -
meson_options.txt | 2 +-
26 files changed, 7 insertions(+), 4115 deletions(-)
delete mode 100644 app/test/test_flow_classify.c
delete mode 100644 doc/guides/prog_guide/flow_classify_lib.rst
delete mode 100644 doc/guides/sample_app_ug/flow_classify.rst
delete mode 100644 examples/flow_classify/Makefile
delete mode 100644 examples/flow_classify/flow_classify.c
delete mode 100644 examples/flow_classify/ipv4_rules_file.txt
delete mode 100644 examples/flow_classify/meson.build
delete mode 100644 lib/flow_classify/meson.build
delete mode 100644 lib/flow_classify/rte_flow_classify.c
delete mode 100644 lib/flow_classify/rte_flow_classify.h
delete mode 100644 lib/flow_classify/rte_flow_classify_parse.c
delete mode 100644 lib/flow_classify/rte_flow_classify_parse.h
delete mode 100644 lib/flow_classify/version.map
diff --git a/MAINTAINERS b/MAINTAINERS
index 18bc05fccd0d..dbb25211c367 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1511,13 +1511,6 @@ F: lib/pdcp/
F: doc/guides/prog_guide/pdcp_lib.rst
F: app/test/test_pdcp*
-Flow Classify - EXPERIMENTAL - UNMAINTAINED
-F: lib/flow_classify/
-F: app/test/test_flow_classify*
-F: doc/guides/prog_guide/flow_classify_lib.rst
-F: examples/flow_classify/
-F: doc/guides/sample_app_ug/flow_classify.rst
-
Distributor
M: David Hunt
F: lib/distributor/
diff --git a/app/test/meson.build b/app/test/meson.build
index b89cf0368fb5..90a2e350c7ae 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -359,10 +359,6 @@ if dpdk_conf.has('RTE_EVENT_SKELETON')
test_deps += 'event_skeleton'
endif
-if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY')
-test_sources += 'test_flow_classify.c'
-fast_tests += [['flow_classify_autotest', false, true]]
-endif
if dpdk_conf.has('RTE_LIB_GRAPH')
test_sources += 'test_graph.c'
fast_tests += [['graph_autotest', true, true]]
diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c
deleted file mode 100644
index 6e274d88e645..
--- a/app/test/test_flow_classify.c
+++ /dev/null
@@ -1,895 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017 Intel Corporation
- */
-
-#include
-#include
-
-#include "test.h"
-
-#include
-#include
-#include
-#include
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-static int
-test_flow_classify(void)
-{
- printf("flow_classify not supported on Windows, skipping test\n");
- return TEST_SKIPPED;
-}
-
-#else
-
-#include
-#include
-#include
-#include
-#include
-
-#include "packet_burst_generator.h"
-#include "test_flow_classify.h"
-
-
-#define FLOW_CLASSIFY_MAX_RULE_NUM 100
-#define MAX_PKT_BURST 32
-#define NB_SOCKETS 4
-#define MEMPOOL_CACHE_SIZE 256
-#define MBUF_SIZE 512
-#define NB_MBUF512
-
-/* test UDP, TCP and SCTP packets */
-static struct rte_mempool *mbufpool[NB_SOCKETS];
-static struct rte_mbuf *bufs[MAX_PKT_BURST];
-
-static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
- /* first input field - always one byte long. */
- {
- .type = RTE_ACL_FIELD_TYPE_BITMASK,
- .size = sizeof(uint8_t),
- .field_index = PROTO_FIELD_IPV4,
- .input_index = PROTO_INPUT_IPV4,
- .offset = sizeof(struct rte_ether_hdr) +
- offsetof(struct rte_i
[PATCH 1/4] build: require minimum c11 compiler
Update top level meson.build to require c_std=c11 and remove use of
-std=gnu99.
Signed-off-by: Tyler Retzlaff
---
drivers/net/failsafe/meson.build | 1 -
lib/eal/common/eal_common_errno.c | 1 +
meson.build | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index 6013e13..c1d3610 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -7,7 +7,6 @@ if is_windows
subdir_done()
endif
-cflags += '-std=gnu99'
cflags += '-D_DEFAULT_SOURCE'
cflags += '-D_XOPEN_SOURCE=700'
cflags += '-pedantic'
diff --git a/lib/eal/common/eal_common_errno.c
b/lib/eal/common/eal_common_errno.c
index ef8f782..d4e2c13 100644
--- a/lib/eal/common/eal_common_errno.c
+++ b/lib/eal/common/eal_common_errno.c
@@ -4,6 +4,7 @@
/* Use XSI-compliant portable version of strerror_r() */
#undef _GNU_SOURCE
+#define _POSIX_C_SOURCE 200112L
#include
#include
diff --git a/meson.build b/meson.build
index 39cb738..70b54f0 100644
--- a/meson.build
+++ b/meson.build
@@ -9,6 +9,7 @@ project('DPDK', 'c',
license: 'BSD',
default_options: [
'buildtype=release',
+'c_std=c11',
'default_library=static',
'warning_level=2',
],
--
1.8.3.1
[PATCH 0/4] eal: update public API to use stdatomic atomics
Update EAL public API to use standard C11 atomics. In accordance with technical board discussion February 2023. http://mails.dpdk.org/archives/dev/2023-February/263516.html This initial series makes no attempt to adapt every use of builtin atomics from GCC it intends only to adapt the public API of the EAL presented as a compatibility surface to applications. Further series will be submitted to adapt the rest of DPDK to use standard atomics that are 'internal' and not exposing or depending on the EAL API. The choice has been made to break these two changes apart to allow more precise analysis of any potential performance impact this change or subsequent changes may introduce. Additionally, it is not possible to break the commits up per driver/lib as both the provider and consumer of the APIs need to be changed in the same commit to maintain non-broken build and function. Finally, the first patch in this series is a duplication of Bruce Richardson series https://patchwork.dpdk.org/project/dpdk/list/?series=29048 and is only being provided to enable the CI run on this series. It is expected that Bruce's series when committed will allow the build: require minimum c11 compiler here to be dropped from this series. Tyler Retzlaff (4): build: require minimum c11 compiler devtools: forbid use of GCC atomic builtins eal: adapt rte pause APIs to use C11 atomics eal: adapt rte spinlock and rwlock APIs to use C11 atomics app/test-bbdev/test_bbdev_perf.c | 123 --- app/test/test_func_reentrancy.c | 8 +- app/test/test_mcslock.c | 12 +-- app/test/test_mempool_perf.c | 8 +- app/test/test_pflock.c | 12 +-- app/test/test_pmd_perf.c | 10 +-- app/test/test_ring_perf.c| 8 +- app/test/test_rwlock.c | 8 +- app/test/test_spinlock.c | 8 +- app/test/test_stack_perf.c | 12 +-- app/test/test_ticketlock.c | 8 +- app/test/test_timer.c| 16 ++-- devtools/checkpatches.sh | 8 ++ drivers/event/opdl/opdl_ring.c | 47 ++-- drivers/net/failsafe/meson.build | 1 - drivers/net/thunderx/nicvf_rxtx.c| 5 +- drivers/net/thunderx/nicvf_struct.h | 2 +- lib/bpf/bpf_pkt.c| 4 +- lib/distributor/distributor_private.h| 2 +- lib/distributor/rte_distributor_single.c | 44 +-- lib/eal/arm/include/rte_pause_64.h | 28 +++ lib/eal/common/eal_common_errno.c| 1 + lib/eal/common/eal_memcfg.h | 2 +- lib/eal/include/generic/rte_pause.h | 52 ++--- lib/eal/include/generic/rte_rwlock.h | 46 ++-- lib/eal/include/generic/rte_spinlock.h | 21 +++--- lib/eal/include/rte_mcslock.h| 12 +-- lib/eal/include/rte_pflock.h | 22 +++--- lib/eal/include/rte_ticketlock.h | 8 +- lib/eal/loongarch/include/rte_pause.h| 2 - lib/eal/ppc/include/rte_pause.h | 2 - lib/eal/riscv/include/rte_pause.h| 2 - lib/eal/x86/include/rte_spinlock.h | 2 +- lib/ring/rte_ring_core.h | 5 +- lib/ring/rte_ring_generic_pvt.h | 19 +++-- lib/ring/rte_ring_peek_elem_pvt.h| 2 +- meson.build | 1 + 37 files changed, 311 insertions(+), 262 deletions(-) -- 1.8.3.1
[PATCH 2/4] devtools: forbid use of GCC atomic builtins
Refrain from using compiler __atomic_xxx builtins DPDK now uses standard
C11 atomics atomic_xxx.
Signed-off-by: Tyler Retzlaff
---
devtools/checkpatches.sh | 8
1 file changed, 8 insertions(+)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 43f5e36..a32f02e 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -102,6 +102,14 @@ check_forbidden_additions() { #
-f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
"$1" || res=1
+ # refrain from using compiler __atomic_xxx builtins
+ awk -v FOLDERS="lib drivers app examples" \
+ -v EXPRESSIONS="__atomic_.*\\\(" \
+ -v RET_ON_FAIL=1 \
+ -v MESSAGE='Using __atomic_xxx builtins' \
+ -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+ "$1" || res=1
+
# refrain from using compiler __atomic_thread_fence()
# It should be avoided on x86 for SMP case.
awk -v FOLDERS="lib drivers app examples" \
--
1.8.3.1
[PATCH 4/4] eal: adapt rte spinlock and rwlock APIs to use C11 atomics
Adapt rte_spinlock.h and rte_rwlock.h APIs to use standard C11 atomics.
Update consumers of the spinlock and rwlock APIs for the API break.
Signed-off-by: Tyler Retzlaff
---
lib/eal/include/generic/rte_rwlock.h | 46 ++
lib/eal/include/generic/rte_spinlock.h | 21
lib/eal/x86/include/rte_spinlock.h | 2 +-
3 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/lib/eal/include/generic/rte_rwlock.h
b/lib/eal/include/generic/rte_rwlock.h
index 9e083bb..b659c4c 100644
--- a/lib/eal/include/generic/rte_rwlock.h
+++ b/lib/eal/include/generic/rte_rwlock.h
@@ -22,6 +22,8 @@
* https://locklessinc.com/articles/locks/
*/
+#include
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -57,7 +59,7 @@
#define RTE_RWLOCK_READ 0x4/* Reader increment */
typedef struct __rte_lockable {
- int32_t cnt;
+ int32_t _Atomic cnt;
} rte_rwlock_t;
/**
@@ -92,21 +94,21 @@
while (1) {
/* Wait while writer is present or pending */
- while (__atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED)
+ while (atomic_load_explicit(&rwl->cnt, memory_order_relaxed)
& RTE_RWLOCK_MASK)
rte_pause();
/* Try to get read lock */
- x = __atomic_fetch_add(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_ACQUIRE) + RTE_RWLOCK_READ;
+ x = atomic_fetch_add_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_acquire) + RTE_RWLOCK_READ;
/* If no writer, then acquire was successful */
if (likely(!(x & RTE_RWLOCK_MASK)))
return;
/* Lost race with writer, backout the change. */
- __atomic_fetch_sub(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_RELAXED);
+ atomic_fetch_sub_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_relaxed);
}
}
@@ -127,20 +129,20 @@
{
int32_t x;
- x = __atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED);
+ x = atomic_load_explicit(&rwl->cnt, memory_order_relaxed);
/* fail if write lock is held or writer is pending */
if (x & RTE_RWLOCK_MASK)
return -EBUSY;
/* Try to get read lock */
- x = __atomic_fetch_add(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_ACQUIRE) + RTE_RWLOCK_READ;
+ x = atomic_fetch_add_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_acquire) + RTE_RWLOCK_READ;
/* Back out if writer raced in */
if (unlikely(x & RTE_RWLOCK_MASK)) {
- __atomic_fetch_sub(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_RELEASE);
+ atomic_fetch_sub_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_release);
return -EBUSY;
}
@@ -158,7 +160,7 @@
__rte_unlock_function(rwl)
__rte_no_thread_safety_analysis
{
- __atomic_fetch_sub(&rwl->cnt, RTE_RWLOCK_READ, __ATOMIC_RELEASE);
+ atomic_fetch_sub_explicit(&rwl->cnt, RTE_RWLOCK_READ,
memory_order_release);
}
/**
@@ -178,10 +180,10 @@
{
int32_t x;
- x = __atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED);
+ x = atomic_load_explicit(&rwl->cnt, memory_order_relaxed);
if (x < RTE_RWLOCK_WRITE &&
- __atomic_compare_exchange_n(&rwl->cnt, &x, x + RTE_RWLOCK_WRITE,
- 1, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
+ atomic_compare_exchange_weak_explicit(&rwl->cnt, &x, x +
RTE_RWLOCK_WRITE,
+ memory_order_acquire,
memory_order_relaxed))
return 0;
else
return -EBUSY;
@@ -201,22 +203,22 @@
int32_t x;
while (1) {
- x = __atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED);
+ x = atomic_load_explicit(&rwl->cnt, memory_order_relaxed);
/* No readers or writers? */
if (likely(x < RTE_RWLOCK_WRITE)) {
/* Turn off RTE_RWLOCK_WAIT, turn on RTE_RWLOCK_WRITE */
- if (__atomic_compare_exchange_n(&rwl->cnt, &x,
RTE_RWLOCK_WRITE, 1,
- __ATOMIC_ACQUIRE,
__ATOMIC_RELAXED))
+ if (atomic_compare_exchange_weak_explicit(&rwl->cnt,
&x, RTE_RWLOCK_WRITE,
+ memory_order_acquire,
memory_order_relaxed))
return;
}
/* Turn on writer wait bit */
if (!(x & RTE_RWLOCK_WAIT))
- __atomic_fetch_or(&rwl->cnt, RTE_RWLOCK_WAIT,
__ATOMIC_RELAXED);
+ atomic_fetch_or_expli
[PATCH 3/4] eal: adapt rte pause APIs to use C11 atomics
Adapt rte_pause.h APIs to use standard C11 atomics. Update consumers of
the pause APIs for the API break.
Signed-off-by: Tyler Retzlaff
---
app/test-bbdev/test_bbdev_perf.c | 123 ---
app/test/test_func_reentrancy.c | 8 +-
app/test/test_mcslock.c | 12 +--
app/test/test_mempool_perf.c | 8 +-
app/test/test_pflock.c | 12 +--
app/test/test_pmd_perf.c | 10 +--
app/test/test_ring_perf.c| 8 +-
app/test/test_rwlock.c | 8 +-
app/test/test_spinlock.c | 8 +-
app/test/test_stack_perf.c | 12 +--
app/test/test_ticketlock.c | 8 +-
app/test/test_timer.c| 16 ++--
drivers/event/opdl/opdl_ring.c | 47 ++--
drivers/net/thunderx/nicvf_rxtx.c| 5 +-
drivers/net/thunderx/nicvf_struct.h | 2 +-
lib/bpf/bpf_pkt.c| 4 +-
lib/distributor/distributor_private.h| 2 +-
lib/distributor/rte_distributor_single.c | 44 +--
lib/eal/arm/include/rte_pause_64.h | 28 +++
lib/eal/common/eal_memcfg.h | 2 +-
lib/eal/include/generic/rte_pause.h | 52 ++---
lib/eal/include/rte_mcslock.h| 12 +--
lib/eal/include/rte_pflock.h | 22 +++---
lib/eal/include/rte_ticketlock.h | 8 +-
lib/eal/loongarch/include/rte_pause.h| 2 -
lib/eal/ppc/include/rte_pause.h | 2 -
lib/eal/riscv/include/rte_pause.h| 2 -
lib/ring/rte_ring_core.h | 5 +-
lib/ring/rte_ring_generic_pvt.h | 19 +++--
lib/ring/rte_ring_peek_elem_pvt.h| 2 +-
30 files changed, 265 insertions(+), 228 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 276bbf0..c3a3a28 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -143,7 +143,7 @@ struct test_op_params {
uint16_t num_to_process;
uint16_t num_lcores;
int vector_mask;
- uint16_t sync;
+ uint16_t _Atomic sync;
struct test_buffers q_bufs[RTE_MAX_NUMA_NODES][MAX_QUEUES];
};
@@ -158,7 +158,7 @@ struct thread_params {
uint8_t iter_count;
double iter_average;
double bler;
- uint16_t nb_dequeued;
+ uint16_t _Atomic nb_dequeued;
int16_t processing_status;
uint16_t burst_sz;
struct test_op_params *op_params;
@@ -3021,27 +3021,32 @@ typedef int (test_case_function)(struct active_device
*ad,
if (test_vector.op_type == RTE_BBDEV_OP_TURBO_DEC)
deq = rte_bbdev_dequeue_dec_ops(dev_id, queue_id,
&tp->dec_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else if (test_vector.op_type == RTE_BBDEV_OP_LDPC_DEC)
deq = rte_bbdev_dequeue_ldpc_dec_ops(dev_id, queue_id,
&tp->dec_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else if (test_vector.op_type == RTE_BBDEV_OP_LDPC_ENC)
deq = rte_bbdev_dequeue_ldpc_enc_ops(dev_id, queue_id,
&tp->enc_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else if (test_vector.op_type == RTE_BBDEV_OP_FFT)
deq = rte_bbdev_dequeue_fft_ops(dev_id, queue_id,
&tp->fft_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else /*RTE_BBDEV_OP_TURBO_ENC*/
deq = rte_bbdev_dequeue_enc_ops(dev_id, queue_id,
&tp->enc_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
if (deq < burst_sz) {
@@ -3052,8 +3057,9 @@ typedef int (test_c
Re: [PATCH v2] kni: remove deprecated kernel network interface
On Mon, 31 Jul 2023 10:40:35 +0200 Thomas Monjalon wrote: > > 2. The OVSrobot is looking into the port library to see the kni symbols. > > But port is marked as deprecated already. > > Perhaps we should just pull out port first? > > No we must support it until it is removed. > You should either disable or remove KNI from the port library. I just removed those calls from port library. One reason that KNI can't be isolated into a separate kmod repo is that it has components such as lib/kni that were being shared in several places like port, examples, and tests.
RE: Running DPDK on ARM on Mac w/ Apple Silicon?
Hi, Have you tried with docker container? I have run DPDK test suite on Mac w/ Apple Silicon with ubuntu docker container. Thank you! Best, Dharmik Thakkar From: Misha Sent: Sunday, July 30, 2023 3:49 AM To: dev@dpdk.org Subject: Running DPDK on ARM on Mac w/ Apple Silicon? Guys I apologize if this has already been asked before, but has anyone ever succeed in running DPDK on a Linux running within Parallels on a Mac with Apple Silicon? We are a group of developers of a product which uses DPDK a lot, and on Linux boxes running in Intels we actually manage to run it successfully. All of this is purely for testing of course. The real product runs on a real, physical x86_64 box, so we don't really care about actual performance. I tried installing it on both DEB and RPM based distros while trying to use the virtio devices but it always fails... I'm still trying on my own and I'm sure I'll manage somehow, but I just thought to save some time if someone already tried. Thanks a lot in advance! Misha. IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
Re: [PATCH v2] kni: remove deprecated kernel network interface
31/07/2023 23:12, Stephen Hemminger: > On Mon, 31 Jul 2023 10:40:35 +0200 > Thomas Monjalon wrote: > > > > 2. The OVSrobot is looking into the port library to see the kni symbols. > > > But port is marked as deprecated already. > > > Perhaps we should just pull out port first? > > > > No we must support it until it is removed. > > You should either disable or remove KNI from the port library. > > I just removed those calls from port library. > > One reason that KNI can't be isolated into a separate kmod repo > is that it has components such as lib/kni that were being shared > in several places like port, examples, and tests. Yes you're right.
Re: [PATCH v3] build: update DPDK to use C11 standard
Hi Bruce,
I see some failures for this series for our Ubuntu 20.04 containers. And,
our DTS testbeds which are on ubuntu 20.04 are skipping running
testsuites because they can't compile DPDK. So, that's why it has some
missing results for a couple of the Intel NICs. For context, I'll paste
below where the compile job terminates in one of our containerized compile
test runs. The GCC in use here is version 9.4, so it meets the requirements
as described in your patch as far as I can tell. I'll check it out more
tomorrow to see whether it's an infra failure, like some missing
dependencies. Please let me know if we expect to have no issues with 20.04
or if this is anticipated.
Thanks!
[1638/2730] Generating symbol file 'drivers/a715181@@rte_net_ixgbe@sha
/librte_net_ixgbe.so.24.0.symbols'.
[1639/2730] Compiling C object 'drivers/a715181@@tmp_rte_net_mlx4@sta
/net_mlx4_mlx4.c.o'.
FAILED: drivers/a715181@@tmp_rte_net_mlx4@sta/net_mlx4_mlx4.c.o
ccache cc -Idrivers/a715181@@tmp_rte_net_mlx4@sta -Idrivers -I../drivers
-Idrivers/net/mlx4 -I../drivers/net/mlx4 -Ilib/ethdev -I../lib/ethdev -I.
-I../ -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal
-I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/telemetry/../metrics
-I../lib/telemetry/../metrics -Ilib/telemetry -I../lib/telemetry -Ilib/net
-I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool
-Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci
-I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci
-Idrivers/bus/vdev -I../drivers/bus/vdev -I/usr/include/libnl3
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch
-Wextra -Werror -std=c11 -O3 -include rte_config.h -Wcast-qual -Wdeprecated
-Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Wold-style-definition
-Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings
-Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native
-DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation
-std=c11 -Wno-strict-prototypes -D_BSD_SOURCE -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=600 -UPEDANTIC -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.mlx4 -MD
-MQ 'drivers/a715181@@tmp_rte_net_mlx4@sta/net_mlx4_mlx4.c.o' -MF
'drivers/a715181@@tmp_rte_net_mlx4@sta/net_mlx4_mlx4.c.o.d' -o
'drivers/a715181@@tmp_rte_net_mlx4@sta/net_mlx4_mlx4.c.o' -c
../drivers/net/mlx4/mlx4.c
In file included from ../drivers/net/mlx4/mlx4_rxtx.h:27,
from ../drivers/net/mlx4/mlx4.c:49:
../drivers/net/mlx4/mlx4_prm.h:111:8: error: redefinition of 'struct
mlx4_wqe_lso_seg'
111 | struct mlx4_wqe_lso_seg {
|^~~~
In file included from ../drivers/net/mlx4/mlx4_glue.h:16,
from ../drivers/net/mlx4/mlx4.c:46:
/usr/include/infiniband/mlx4dv.h:410:8: note: originally defined here
410 | struct mlx4_wqe_lso_seg {
|^~~~
ninja: build stopped: subcommand failed.
[PATCH] net/iavf: add devargs to enable vf auto-reset
Originally, the iavf PMD does not perform special actions when it
receives a PF-to-VF reset event, resulting in vf being offline and
unavailable.
This patch enables vf auto-reset by setting 'watchdog_period' devargs
to true. The iavf PMD will perform an automatic reset to bring the vf
back online when it receives a PF-to-VF event.
Signed-off-by: Shiyang He
---
doc/guides/nics/intel_vf.rst | 3 +
drivers/net/iavf/iavf.h| 28 ++
drivers/net/iavf/iavf_ethdev.c | 166 +
drivers/net/iavf/iavf_rxtx.c | 25 +
drivers/net/iavf/iavf_rxtx.h | 1 +
drivers/net/iavf/iavf_vchnl.c | 8 ++
6 files changed, 231 insertions(+)
diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst
index d365dbc185..c0acd2a7f5 100644
--- a/doc/guides/nics/intel_vf.rst
+++ b/doc/guides/nics/intel_vf.rst
@@ -101,6 +101,9 @@ For more detail on SR-IOV, please refer to the following
documents:
Set ``devargs`` parameter ``watchdog_period`` to adjust the watchdog
period in microseconds, or set it to 0 to disable the watchdog,
for example, ``-a 18:01.0,watchdog_period=5000`` or ``-a
18:01.0,watchdog_period=0``.
+Enable vf auto-reset by setting the ``devargs`` parameter like ``-a
18:01.0,enable_auto_reset=1`` when IAVF is backed
+by an Intel® E810 device or an Intel® 700 Series Ethernet device.
+
The PCIE host-interface of Intel Ethernet Switch FM1 Series VF
infrastructure
^
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 98861e4242..a150b7d5cf 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -95,6 +95,24 @@
#define IAVF_L2TPV2_FLAGS_LEN 0x4000
+#ifndef DIV_ROUND_UP
+#define DIV_ROUND_UP(n, d) ( \
+{ \
+ const typeof(d) __d = d;\
+ (((n) + (__d) - 1) / (__d));\
+} \
+)
+#endif
+#ifndef DELAY
+#define DELAY(x) rte_delay_us(x)
+#endif
+#ifndef msleep
+#define msleep(x) DELAY(1000 * (x))
+#endif
+#ifndef usleep_range
+#define usleep_range(min, max) msleep(DIV_ROUND_UP(min, 1000))
+#endif
+
struct iavf_adapter;
struct iavf_rx_queue;
struct iavf_tx_queue;
@@ -305,6 +323,7 @@ struct iavf_devargs {
uint8_t proto_xtr[IAVF_MAX_QUEUE_NUM];
uint16_t quanta_size;
uint32_t watchdog_period;
+ uint8_t enable_auto_reset;
};
struct iavf_security_ctx;
@@ -424,6 +443,14 @@ _atomic_set_async_response_cmd(struct iavf_info *vf, enum
virtchnl_ops ops)
return !ret;
}
+
+static inline bool
+iavf_is_reset(struct iavf_hw *hw)
+{
+ return !(IAVF_READ_REG(hw, IAVF_VF_ARQLEN1) &
+IAVF_VF_ARQLEN1_ARQENABLE_MASK);
+}
+
int iavf_check_api_version(struct iavf_adapter *adapter);
int iavf_get_vf_resource(struct iavf_adapter *adapter);
void iavf_dev_event_handler_fini(void);
@@ -501,4 +528,5 @@ int iavf_flow_sub_check(struct iavf_adapter *adapter,
struct iavf_fsub_conf *filter);
void iavf_dev_watchdog_enable(struct iavf_adapter *adapter);
void iavf_dev_watchdog_disable(struct iavf_adapter *adapter);
+int iavf_handle_hw_reset(struct rte_eth_dev *dev);
#endif /* _IAVF_ETHDEV_H_ */
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index f2fc5a5621..5f9fce34a5 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -37,6 +37,7 @@
#define IAVF_PROTO_XTR_ARG "proto_xtr"
#define IAVF_QUANTA_SIZE_ARG "quanta_size"
#define IAVF_RESET_WATCHDOG_ARG"watchdog_period"
+#define IAVF_ENABLE_AUTO_RESET_ARG "enable_auto_reset"
uint64_t iavf_timestamp_dynflag;
int iavf_timestamp_dynfield_offset = -1;
@@ -45,6 +46,7 @@ static const char * const iavf_valid_args[] = {
IAVF_PROTO_XTR_ARG,
IAVF_QUANTA_SIZE_ARG,
IAVF_RESET_WATCHDOG_ARG,
+ IAVF_ENABLE_AUTO_RESET_ARG,
NULL
};
@@ -305,6 +307,8 @@ iavf_dev_watchdog(void *cb_arg)
adapter->vf.vf_reset = true;
adapter->vf.link_up = false;
+ iavf_handle_hw_reset(adapter->vf.eth_dev);
+
rte_eth_dev_callback_process(adapter->vf.eth_dev,
RTE_ETH_EVENT_INTR_RESET, NULL);
}
@@ -2210,6 +2214,26 @@ parse_u16(__rte_unused const char *key, const char
*value, void *args)
return 0;
}
+static int
+parse_bool(const char *key, const char *value, void *args)
+{
+ int *i = (int *)args;
+ char *end;
+ int num;
+
+ num = strtoul(value, &end, 10);
+
+ if (num != 0 && num != 1) {
+ PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", "
+ "value must be 0 or 1",
+ value, key);
+ return -1;
+ }
+
+ *i = num;
+
[PATCH] app/testpmd: add flush multicast MAC address command
Add command to flush multicast MAC address
Usage:
mcast_addr flush :
flush multicast MAC address on port_id
Signed-off-by: Dengdui Huang
---
app/test-pmd/cmdline.c | 43 +
app/test-pmd/config.c | 18 +
app/test-pmd/testpmd.h | 1 +
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8
4 files changed, 70 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0d0723f659..2d9d925776 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -494,6 +494,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"mac_addr remove (port_id) (XX:XX:XX:XX:XX:XX)\n"
"Remove a MAC address from port_id.\n\n"
+ "mcast_addr flush (port_id)\n"
+ "To flush the set of multicast addresses.\n\n"
+
"mac_addr set (port_id) (XX:XX:XX:XX:XX:XX)\n"
"Set the default MAC address for port_id.\n\n"
@@ -8561,6 +8564,45 @@ static cmdline_parse_inst_t cmd_mcast_addr = {
},
};
+/* *** FLUSH MULTICAST MAC ADDRESS ON PORT *** */
+struct cmd_mcast_addr_flush_result {
+ cmdline_fixed_string_t mcast_addr_cmd;
+ cmdline_fixed_string_t what;
+ uint16_t port_num;
+};
+
+static void cmd_mcast_addr_flush_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_mcast_addr_flush_result *res = parsed_result;
+
+ mcast_addr_flush(res->port_num);
+}
+
+static cmdline_parse_token_string_t cmd_mcast_addr_flush_cmd =
+ TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result,
+mcast_addr_cmd, "mcast_addr");
+static cmdline_parse_token_string_t cmd_mcast_addr_flush_what =
+ TOKEN_STRING_INITIALIZER(struct cmd_mcast_addr_result, what,
+"flush");
+static cmdline_parse_token_num_t cmd_mcast_addr_flush_portnum =
+ TOKEN_NUM_INITIALIZER(struct cmd_mcast_addr_result, port_num,
+RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_mcast_addr_flush = {
+ .f = cmd_mcast_addr_flush_parsed,
+ .data = (void *)0,
+ .help_str = "mcast_addr flush : "
+ "flush multicast MAC address on port_id",
+ .tokens = {
+ (void *)&cmd_mcast_addr_flush_cmd,
+ (void *)&cmd_mcast_addr_flush_what,
+ (void *)&cmd_mcast_addr_flush_portnum,
+ NULL,
+ },
+};
+
/* vf vlan anti spoof configuration */
/* Common result structure for vf vlan anti spoof */
@@ -12929,6 +12971,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
(cmdline_parse_inst_t *)&cmd_set_port_meter_stats_mask,
(cmdline_parse_inst_t *)&cmd_show_port_meter_stats,
(cmdline_parse_inst_t *)&cmd_mcast_addr,
+ (cmdline_parse_inst_t *)&cmd_mcast_addr_flush,
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_anti_spoof,
(cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof,
(cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 11f3a22048..d66d1db37c 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6802,6 +6802,24 @@ mcast_addr_remove(portid_t port_id, struct
rte_ether_addr *mc_addr)
mcast_addr_pool_append(port, mc_addr);
}
+void
+mcast_addr_flush(portid_t port_id)
+{
+ int ret;
+
+ if (port_id_is_invalid(port_id, ENABLED_WARN))
+ return;
+
+ ret = rte_eth_dev_set_mc_addr_list(port_id, NULL, 0);
+ if (ret != 0) {
+ fprintf(stderr,
+ "Failed to flush the set of filtered addresses on port
%u\n",
+ port_id);
+ return;
+ }
+ mcast_addr_pool_destroy(port_id);
+}
+
void
port_dcb_info_display(portid_t port_id)
{
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index f1df6a8faf..65d3634f6a 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -1176,6 +1176,7 @@ void show_mcast_macs(portid_t port_id);
/* Functions to manage the set of filtered Multicast MAC addresses */
void mcast_addr_add(portid_t port_id, struct rte_ether_addr *mc_addr);
void mcast_addr_remove(portid_t port_id, struct rte_ether_addr *mc_addr);
+void mcast_addr_flush(portid_t port_id);
void port_dcb_info_display(portid_t port_id);
uint8_t *open_file(const char *file_path, uint32_t *size);
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index a182479ab2..c3ab1507c4 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1320,6 +1320,14 @@ filtered by port::
testpmd> mcast_addr remove (port_id) (mcast_addr)
+mcast_addr flush
+
+
+To flush th
RE: [PATCH] doc: announce ethdev operation struct changes
> -Original Message-
> From: Morten Brørup
> Sent: Friday, July 28, 2023 11:55 PM
> To: tho...@monjalon.net
> Cc: dev@dpdk.org; nd ; Honnappa Nagarahalli
> ; Feifei Wang ;
> Ruifeng Wang ; Feifei Wang
> ; ferruh.yi...@amd.com;
> konstantin.anan...@huawei.com; andrew.rybche...@oktetlabs.ru
> Subject: RE: [PATCH] doc: announce ethdev operation struct changes
>
> > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > Sent: Friday, 28 July 2023 17.38
> >
> > 28/07/2023 17:33, Morten Brørup:
> > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > Sent: Friday, 28 July 2023 17.20
> > > >
> > > > 28/07/2023 17:08, Morten Brørup:
> > > > > > From: Thomas Monjalon [mailto:tho...@monjalon.net]
> > > > > > Sent: Friday, 28 July 2023 16.57
> > > > > >
> > > > > > 04/07/2023 10:10, Feifei Wang:
> > > > > > > To support mbufs recycle mode, announce the coming ABI
> > > > > > > changes from DPDK 23.11.
> > > > > > >
> > > > > > > Signed-off-by: Feifei Wang
> > > > > > > Reviewed-by: Ruifeng Wang
> > > > > > > ---
> > > > > > > doc/guides/rel_notes/deprecation.rst | 4
> > > > > > > 1 file changed, 4 insertions(+)
> > > > > > >
> > > > > > > diff --git a/doc/guides/rel_notes/deprecation.rst
> > > > > > b/doc/guides/rel_notes/deprecation.rst
> > > > > > > index 66431789b0..c7e1ffafb2 100644
> > > > > > > --- a/doc/guides/rel_notes/deprecation.rst
> > > > > > > +++ b/doc/guides/rel_notes/deprecation.rst
> > > > > > > @@ -118,6 +118,10 @@ Deprecation Notices
> > > > > > >The legacy actions should be removed
> > > > > > >once ``MODIFY_FIELD`` alternative is implemented in drivers.
> > > > > > >
> > > > > > > +* ethdev: The Ethernet device data structure ``struct
> > > > > > > +rte_eth_dev``
> > and
> > > > > > > + the fast-path ethdev flat array ``struct rte_eth_fp_ops``
> > > > > > > + will be
> > > > updated
> > > > > > > + with new fields to support mbufs recycle mode from DPDK 23.11.
> > > > >
> > > > > Existing fields will also be moved around [1]:
> > > > >
> > > > > @@ -83,15 +90,17 @@ struct rte_eth_fp_ops {
> > > > >* Rx fast-path functions and related data.
> > > > >* 64-bit systems: occupies first 64B line
> > > > >*/
> > > > > + /** Rx queues data. */
> > > > > + struct rte_ethdev_qdata rxq;
> > > > > /** PMD receive function. */
> > > > > eth_rx_burst_t rx_pkt_burst;
> > > > > /** Get the number of used Rx descriptors. */
> > > > > eth_rx_queue_count_t rx_queue_count;
> > > > > /** Check the status of a Rx descriptor. */
> > > > > eth_rx_descriptor_status_t rx_descriptor_status;
> > > > > - /** Rx queues data. */
> > > > > - struct rte_ethdev_qdata rxq;
> > > > > - uintptr_t reserved1[3];
> > > > > + /** Refill Rx descriptors with the recycling mbufs. */
> > > > > + eth_recycle_rx_descriptors_refill_t
> > recycle_rx_descriptors_refill;
> > > > > + uintptr_t reserved1[2];
> > > > > /**@}*/
> > > > >
> > > > > /**@{*/
> > > > > @@ -99,15 +108,17 @@ struct rte_eth_fp_ops {
> > > > >* Tx fast-path functions and related data.
> > > > >* 64-bit systems: occupies second 64B line
> > > > >*/
> > > > > + /** Tx queues data. */
> > > > > + struct rte_ethdev_qdata txq;
> > > > > /** PMD transmit function. */
> > > > > eth_tx_burst_t tx_pkt_burst;
> > > > > /** PMD transmit prepare function. */
> > > > > eth_tx_prep_t tx_pkt_prepare;
> > > > > /** Check the status of a Tx descriptor. */
> > > > > eth_tx_descriptor_status_t tx_descriptor_status;
> > > > > - /** Tx queues data. */
> > > > > - struct rte_ethdev_qdata txq;
> > > > > - uintptr_t reserved2[3];
> > > > > + /** Copy used mbufs from Tx mbuf ring into Rx. */
> > > > > + eth_recycle_tx_mbufs_reuse_t recycle_tx_mbufs_reuse;
> > > > > + uintptr_t reserved2[2];
> > > > > /**@}*/
> > > >
> > > > Removing existing fields should be announced explicitly.
> > >
> > > Agreed. And the patch misses this. The "rxq" and "txq" fields are
> > > not being
> > removed, they are being moved up in the structures. Your comment about
> > explicit mentioning still applies!
> > >
> > > If there's no time to wait for a new patch version from Feifei,
> > > perhaps you
> > improve the description while merging.
> >
> > If it's only moving fields, we can skip.
>
> OK. Thank you for elaborating.
>
> > The real change is the size of the reserved fields, so it looks
> > acceptable without notice.
>
> Agree.
Sorry for my late. Agree with this change. And then, I will update a new version
of recycle mbufs mode for dpdk 23.11
>
> Thoughts for later: We should perhaps document that changing the size of
> reserved fields is acceptable. And with that, if completely removing a
> reserved
> field is also acceptable or not.
[PATCH v2 1/4] build: require minimum c11 compiler
Update top level meson.build to require c_std=c11 and remove use of
-std=gnu99.
Signed-off-by: Tyler Retzlaff
---
drivers/net/failsafe/meson.build | 1 -
lib/eal/common/eal_common_errno.c | 1 +
meson.build | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index 6013e13..c1d3610 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -7,7 +7,6 @@ if is_windows
subdir_done()
endif
-cflags += '-std=gnu99'
cflags += '-D_DEFAULT_SOURCE'
cflags += '-D_XOPEN_SOURCE=700'
cflags += '-pedantic'
diff --git a/lib/eal/common/eal_common_errno.c
b/lib/eal/common/eal_common_errno.c
index ef8f782..d4e2c13 100644
--- a/lib/eal/common/eal_common_errno.c
+++ b/lib/eal/common/eal_common_errno.c
@@ -4,6 +4,7 @@
/* Use XSI-compliant portable version of strerror_r() */
#undef _GNU_SOURCE
+#define _POSIX_C_SOURCE 200112L
#include
#include
diff --git a/meson.build b/meson.build
index 39cb738..70b54f0 100644
--- a/meson.build
+++ b/meson.build
@@ -9,6 +9,7 @@ project('DPDK', 'c',
license: 'BSD',
default_options: [
'buildtype=release',
+'c_std=c11',
'default_library=static',
'warning_level=2',
],
--
1.8.3.1
[PATCH v2 2/4] devtools: forbid use of GCC atomic builtins
Refrain from using compiler __atomic_xxx builtins DPDK now uses standard
C11 atomics atomic_xxx.
Signed-off-by: Tyler Retzlaff
---
devtools/checkpatches.sh | 8
1 file changed, 8 insertions(+)
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index 43f5e36..a32f02e 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -102,6 +102,14 @@ check_forbidden_additions() { #
-f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
"$1" || res=1
+ # refrain from using compiler __atomic_xxx builtins
+ awk -v FOLDERS="lib drivers app examples" \
+ -v EXPRESSIONS="__atomic_.*\\\(" \
+ -v RET_ON_FAIL=1 \
+ -v MESSAGE='Using __atomic_xxx builtins' \
+ -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+ "$1" || res=1
+
# refrain from using compiler __atomic_thread_fence()
# It should be avoided on x86 for SMP case.
awk -v FOLDERS="lib drivers app examples" \
--
1.8.3.1
[PATCH v2 0/4] eal: update public API to use stdatomic atomics
Update EAL public API to use standard C11 atomics. In accordance with technical board discussion February 2023. http://mails.dpdk.org/archives/dev/2023-February/263516.html This initial series makes no attempt to adapt every use of builtin atomics from GCC it intends only to adapt the public API of the EAL presented as a compatibility surface to applications. Further series will be submitted to adapt the rest of DPDK to use standard atomics that are 'internal' and not do not straddle the EAL API. The choice has been made to break these two changes apart to allow more precise analysis of any potential performance impact this change or subsequent changes may introduce. Additionally, it is not possible to break the commits up per driver/lib as both the provider and consumer of the APIs need to be changed in the same commit to maintain non-broken build and function. Finally, the first patch in this series is a duplication of Bruce Richardson series https://patchwork.dpdk.org/project/dpdk/list/?series=29048 and is only being provided to enable the CI run on this series. It is expected that Bruce's series when committed will allow the build: require minimum c11 compiler here to be dropped from this series. v2: * remove volatile qualification from variables, structure fields and parameters that have been qualified _Atomic * restore removal of #include in rte_ring_core.h the ring library still uses other rte_atomic APIs and types that are not replaced by the standard or compiler intrinsics * add missing adaption to stdatomic in ring/rte_ring_c11_pvt.h Tyler Retzlaff (4): build: require minimum c11 compiler devtools: forbid use of GCC atomic builtins eal: adapt rte pause APIs to use C11 atomics eal: adapt rte spinlock and rwlock APIs to use C11 atomics app/test-bbdev/test_bbdev_perf.c | 123 --- app/test/test_func_reentrancy.c | 8 +- app/test/test_mcslock.c | 12 +-- app/test/test_mempool_perf.c | 8 +- app/test/test_pflock.c | 12 +-- app/test/test_pmd_perf.c | 10 +-- app/test/test_ring_perf.c| 8 +- app/test/test_rwlock.c | 8 +- app/test/test_spinlock.c | 8 +- app/test/test_stack_perf.c | 12 +-- app/test/test_ticketlock.c | 8 +- app/test/test_timer.c| 16 ++-- devtools/checkpatches.sh | 8 ++ drivers/event/opdl/opdl_ring.c | 47 ++-- drivers/net/failsafe/meson.build | 1 - drivers/net/thunderx/nicvf_rxtx.c| 5 +- drivers/net/thunderx/nicvf_struct.h | 2 +- lib/bpf/bpf_pkt.c| 4 +- lib/distributor/distributor_private.h| 2 +- lib/distributor/rte_distributor_single.c | 44 +-- lib/eal/arm/include/rte_pause_64.h | 28 +++ lib/eal/common/eal_common_errno.c| 1 + lib/eal/common/eal_memcfg.h | 2 +- lib/eal/include/generic/rte_pause.h | 52 ++--- lib/eal/include/generic/rte_rwlock.h | 46 ++-- lib/eal/include/generic/rte_spinlock.h | 21 +++--- lib/eal/include/rte_mcslock.h| 12 +-- lib/eal/include/rte_pflock.h | 22 +++--- lib/eal/include/rte_ticketlock.h | 8 +- lib/eal/loongarch/include/rte_pause.h| 2 - lib/eal/ppc/include/rte_pause.h | 2 - lib/eal/riscv/include/rte_pause.h| 2 - lib/eal/x86/include/rte_spinlock.h | 2 +- lib/ring/rte_ring_c11_pvt.h | 28 +++ lib/ring/rte_ring_core.h | 4 +- lib/ring/rte_ring_generic_pvt.h | 19 +++-- lib/ring/rte_ring_peek_elem_pvt.h| 2 +- meson.build | 1 + 38 files changed, 326 insertions(+), 274 deletions(-) -- 1.8.3.1
[PATCH v2 4/4] eal: adapt rte spinlock and rwlock APIs to use C11 atomics
Adapt rte_spinlock.h and rte_rwlock.h APIs to use standard C11 atomics.
Update consumers of the spinlock and rwlock APIs for the API break.
Signed-off-by: Tyler Retzlaff
---
lib/eal/include/generic/rte_rwlock.h | 46 ++
lib/eal/include/generic/rte_spinlock.h | 21
lib/eal/x86/include/rte_spinlock.h | 2 +-
3 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/lib/eal/include/generic/rte_rwlock.h
b/lib/eal/include/generic/rte_rwlock.h
index 9e083bb..b659c4c 100644
--- a/lib/eal/include/generic/rte_rwlock.h
+++ b/lib/eal/include/generic/rte_rwlock.h
@@ -22,6 +22,8 @@
* https://locklessinc.com/articles/locks/
*/
+#include
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -57,7 +59,7 @@
#define RTE_RWLOCK_READ 0x4/* Reader increment */
typedef struct __rte_lockable {
- int32_t cnt;
+ int32_t _Atomic cnt;
} rte_rwlock_t;
/**
@@ -92,21 +94,21 @@
while (1) {
/* Wait while writer is present or pending */
- while (__atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED)
+ while (atomic_load_explicit(&rwl->cnt, memory_order_relaxed)
& RTE_RWLOCK_MASK)
rte_pause();
/* Try to get read lock */
- x = __atomic_fetch_add(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_ACQUIRE) + RTE_RWLOCK_READ;
+ x = atomic_fetch_add_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_acquire) + RTE_RWLOCK_READ;
/* If no writer, then acquire was successful */
if (likely(!(x & RTE_RWLOCK_MASK)))
return;
/* Lost race with writer, backout the change. */
- __atomic_fetch_sub(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_RELAXED);
+ atomic_fetch_sub_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_relaxed);
}
}
@@ -127,20 +129,20 @@
{
int32_t x;
- x = __atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED);
+ x = atomic_load_explicit(&rwl->cnt, memory_order_relaxed);
/* fail if write lock is held or writer is pending */
if (x & RTE_RWLOCK_MASK)
return -EBUSY;
/* Try to get read lock */
- x = __atomic_fetch_add(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_ACQUIRE) + RTE_RWLOCK_READ;
+ x = atomic_fetch_add_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_acquire) + RTE_RWLOCK_READ;
/* Back out if writer raced in */
if (unlikely(x & RTE_RWLOCK_MASK)) {
- __atomic_fetch_sub(&rwl->cnt, RTE_RWLOCK_READ,
- __ATOMIC_RELEASE);
+ atomic_fetch_sub_explicit(&rwl->cnt, RTE_RWLOCK_READ,
+ memory_order_release);
return -EBUSY;
}
@@ -158,7 +160,7 @@
__rte_unlock_function(rwl)
__rte_no_thread_safety_analysis
{
- __atomic_fetch_sub(&rwl->cnt, RTE_RWLOCK_READ, __ATOMIC_RELEASE);
+ atomic_fetch_sub_explicit(&rwl->cnt, RTE_RWLOCK_READ,
memory_order_release);
}
/**
@@ -178,10 +180,10 @@
{
int32_t x;
- x = __atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED);
+ x = atomic_load_explicit(&rwl->cnt, memory_order_relaxed);
if (x < RTE_RWLOCK_WRITE &&
- __atomic_compare_exchange_n(&rwl->cnt, &x, x + RTE_RWLOCK_WRITE,
- 1, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
+ atomic_compare_exchange_weak_explicit(&rwl->cnt, &x, x +
RTE_RWLOCK_WRITE,
+ memory_order_acquire,
memory_order_relaxed))
return 0;
else
return -EBUSY;
@@ -201,22 +203,22 @@
int32_t x;
while (1) {
- x = __atomic_load_n(&rwl->cnt, __ATOMIC_RELAXED);
+ x = atomic_load_explicit(&rwl->cnt, memory_order_relaxed);
/* No readers or writers? */
if (likely(x < RTE_RWLOCK_WRITE)) {
/* Turn off RTE_RWLOCK_WAIT, turn on RTE_RWLOCK_WRITE */
- if (__atomic_compare_exchange_n(&rwl->cnt, &x,
RTE_RWLOCK_WRITE, 1,
- __ATOMIC_ACQUIRE,
__ATOMIC_RELAXED))
+ if (atomic_compare_exchange_weak_explicit(&rwl->cnt,
&x, RTE_RWLOCK_WRITE,
+ memory_order_acquire,
memory_order_relaxed))
return;
}
/* Turn on writer wait bit */
if (!(x & RTE_RWLOCK_WAIT))
- __atomic_fetch_or(&rwl->cnt, RTE_RWLOCK_WAIT,
__ATOMIC_RELAXED);
+ atomic_fetch_or_expli
[PATCH v2 3/4] eal: adapt rte pause APIs to use C11 atomics
Adapt rte_pause.h APIs to use standard C11 atomics. Update consumers of
the pause APIs for the API break.
Signed-off-by: Tyler Retzlaff
---
app/test-bbdev/test_bbdev_perf.c | 123 ---
app/test/test_func_reentrancy.c | 8 +-
app/test/test_mcslock.c | 12 +--
app/test/test_mempool_perf.c | 8 +-
app/test/test_pflock.c | 12 +--
app/test/test_pmd_perf.c | 10 +--
app/test/test_ring_perf.c| 8 +-
app/test/test_rwlock.c | 8 +-
app/test/test_spinlock.c | 8 +-
app/test/test_stack_perf.c | 12 +--
app/test/test_ticketlock.c | 8 +-
app/test/test_timer.c| 16 ++--
drivers/event/opdl/opdl_ring.c | 47 ++--
drivers/net/thunderx/nicvf_rxtx.c| 5 +-
drivers/net/thunderx/nicvf_struct.h | 2 +-
lib/bpf/bpf_pkt.c| 4 +-
lib/distributor/distributor_private.h| 2 +-
lib/distributor/rte_distributor_single.c | 44 +--
lib/eal/arm/include/rte_pause_64.h | 28 +++
lib/eal/common/eal_memcfg.h | 2 +-
lib/eal/include/generic/rte_pause.h | 52 ++---
lib/eal/include/rte_mcslock.h| 12 +--
lib/eal/include/rte_pflock.h | 22 +++---
lib/eal/include/rte_ticketlock.h | 8 +-
lib/eal/loongarch/include/rte_pause.h| 2 -
lib/eal/ppc/include/rte_pause.h | 2 -
lib/eal/riscv/include/rte_pause.h| 2 -
lib/ring/rte_ring_c11_pvt.h | 28 +++
lib/ring/rte_ring_core.h | 4 +-
lib/ring/rte_ring_generic_pvt.h | 19 +++--
lib/ring/rte_ring_peek_elem_pvt.h| 2 +-
31 files changed, 280 insertions(+), 240 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 276bbf0..c3a3a28 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -143,7 +143,7 @@ struct test_op_params {
uint16_t num_to_process;
uint16_t num_lcores;
int vector_mask;
- uint16_t sync;
+ uint16_t _Atomic sync;
struct test_buffers q_bufs[RTE_MAX_NUMA_NODES][MAX_QUEUES];
};
@@ -158,7 +158,7 @@ struct thread_params {
uint8_t iter_count;
double iter_average;
double bler;
- uint16_t nb_dequeued;
+ uint16_t _Atomic nb_dequeued;
int16_t processing_status;
uint16_t burst_sz;
struct test_op_params *op_params;
@@ -3021,27 +3021,32 @@ typedef int (test_case_function)(struct active_device
*ad,
if (test_vector.op_type == RTE_BBDEV_OP_TURBO_DEC)
deq = rte_bbdev_dequeue_dec_ops(dev_id, queue_id,
&tp->dec_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else if (test_vector.op_type == RTE_BBDEV_OP_LDPC_DEC)
deq = rte_bbdev_dequeue_ldpc_dec_ops(dev_id, queue_id,
&tp->dec_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else if (test_vector.op_type == RTE_BBDEV_OP_LDPC_ENC)
deq = rte_bbdev_dequeue_ldpc_enc_ops(dev_id, queue_id,
&tp->enc_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else if (test_vector.op_type == RTE_BBDEV_OP_FFT)
deq = rte_bbdev_dequeue_fft_ops(dev_id, queue_id,
&tp->fft_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
else /*RTE_BBDEV_OP_TURBO_ENC*/
deq = rte_bbdev_dequeue_enc_ops(dev_id, queue_id,
&tp->enc_ops[
- __atomic_load_n(&tp->nb_dequeued,
__ATOMIC_RELAXED)],
+ atomic_load_explicit(&tp->nb_dequeued,
+ memory_order_relaxed)],
burst_sz);
if (deq
[PATCH v1] eventdev/crypto: flush ops when circ buffer is full
crypto ops from the circ buffer are not getting flushed
to crypto dev when crypto dev becomes busy and circ buffer
gets full.
This patch flushes ops from circ buffer when circ buffer is full
instead of returning without flushing.
Signed-off-by: Ganapati Kundapura
diff --git a/lib/eventdev/rte_event_crypto_adapter.c
b/lib/eventdev/rte_event_crypto_adapter.c
index 52a28e5..1b435c9 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -248,9 +248,18 @@ eca_circular_buffer_flush_to_cdev(struct
crypto_ops_circular_buffer *bufp,
n = *tailp - *headp;
else if (*tailp < *headp)
n = bufp->size - *headp;
- else {
- *nb_ops_flushed = 0;
- return 0; /* buffer empty */
+ else { /* head == tail case */
+ /* when head == tail,
+* circ buff is either full(tail pointer roll over) or empty
+*/
+ if (bufp->count != 0) {
+ /* circ buffer is full */
+ n = bufp->count;
+ } else {
+ /* circ buffer is empty */
+ *nb_ops_flushed = 0;
+ return 0; /* buffer empty */
+ }
}
*nb_ops_flushed = rte_cryptodev_enqueue_burst(cdev_id, qp_id,
--
2.6.4
