Re: [PATCH 0/3] replace use of EAL logtype
On Mon, Dec 11, 2023 at 8:19 PM Tyler Retzlaff wrote: > > On Mon, Dec 11, 2023 at 09:23:22AM -0800, Stephen Hemminger wrote: > > There are some places EAL logtype is being used in testpmd > > and examples where it should not be. Lets reserve EAL > > logtype to only be used by DPDK internals. > > > > Stephen Hemminger (3): > > testpmd: replace EAL logtype with fprintf > > examples/l2fwd-keepalive: don't use EAL logtype > > examples/vm_power_manager: do not use EAL logtype > > > > app/test-pmd/testpmd.c | 33 +++- > > examples/l2fwd-keepalive/shm.c | 21 +++- > > examples/vm_power_manager/main.c | 11 --- > > are the log types under ALLOW_INTERNAL_API? if not should they be? and > if they are should examples be defining ALLOW_INTERNAL_API? ALLOW_INTERNAL_API and ALLOW_EXPERIMENTAL_API tags have a transitive aspect. So it would prevent applications from calling inline helpers and macros with such logs in them. Like for example: lib/eal/include/rte_test.h: RTE_LOG(ERR, EAL, "Test assert %s line %d failed: " \ The EAL logtype is "easy" to fix, but others like ETHDEV are more tricky. -- David Marchand
Re: [PATCH] eventdev: replace RTE_LOGTYPE_EVENTDEV with a dynamic type
On Tue, Dec 12, 2023 at 8:53 AM David Marchand wrote: > > On Mon, Dec 11, 2023 at 9:33 PM Stephen Hemminger > wrote: > > > > With a little setup in eventdev_pmd.h the eventdev drivers > > and API can be converted to dynamic log type. > > > > Signed-off-by: Stephen Hemminger > > LGTM (with a comment on logtype). Scratch that, this is already a driver header, hence internal. -- David Marchand
RE: [PATCH v3] lib/net: fix tcp/udp cksum with padding data
> From: Kaiwen Deng [mailto:kaiwenx.d...@intel.com]
> Sent: Tuesday, 12 December 2023 03.16
>
> IEEE 802 packets may have a minimum size limit. The data fields
> should be padded when necessary. In some cases, the padding data
> is not zero.
>
> In 'rte_ipv4_udptcp_cksum_mbuf()', as payload length
> "mbuf->pkt_len - l4_off" is used, which includes padding and if
> padding is not zero it will end up producing wrong checksum.
>
> This patch will use IP header to get the payload size to calculate
> tcp/udp checksum.
>
> Fixes: d178f693bbfe ("net: add UDP/TCP checksum in mbuf segments")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Kaiwen Deng
> ---
> lib/net/rte_ip.h | 9 +++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
> index 6fa98a5a0f..c503a2b57f 100644
> --- a/lib/net/rte_ip.h
> +++ b/lib/net/rte_ip.h
> @@ -423,7 +423,10 @@ __rte_ipv4_udptcp_cksum_mbuf(const struct rte_mbuf
> *m,
> if (l4_off > m->pkt_len)
> return 0;
It's not directly related, but while you are at it, please also add unlikely to
the above check:
- if (l4_off > m->pkt_len)
- return 0;
+ if (unlikely(l4_off > m->pkt_len))
+ return 0; /* invalid params, return a dummy value */
>
> - if (rte_raw_cksum_mbuf(m, l4_off, m->pkt_len - l4_off,
> &raw_cksum))
> + uint16_t len = rte_be_to_cpu_16(ipv4_hdr->total_length) -
> + (uint16_t)rte_ipv4_hdr_len(ipv4_hdr);
> +
> + if (rte_raw_cksum_mbuf(m, l4_off, len, &raw_cksum))
Please declare "uint16_t len;" with the other variables at the top of the
function, and only set its value here. (It's allowed to declare here, but
please follow this function's existing convention of where variables are
declared.)
> return 0;
>
> cksum = raw_cksum + rte_ipv4_phdr_cksum(ipv4_hdr, 0);
> @@ -666,7 +669,9 @@ __rte_ipv6_udptcp_cksum_mbuf(const struct rte_mbuf
> *m,
> if (l4_off > m->pkt_len)
> return 0;
Again not directly related, but please also add unlikely to this comparison:
- if (l4_off > m->pkt_len)
- return 0;
+ if (unlikely(l4_off > m->pkt_len))
+ return 0; /* invalid params, return a dummy value */
>
> - if (rte_raw_cksum_mbuf(m, l4_off, m->pkt_len - l4_off,
> &raw_cksum))
> + uint16_t len = rte_be_to_cpu_16(ipv6_hdr->payload_len);
> +
> + if (rte_raw_cksum_mbuf(m, l4_off, len, &raw_cksum))
No need for "len" variable here, just use
rte_be_to_cpu_16(ipv6_hdr->payload_len) directly:
- if (rte_raw_cksum_mbuf(m, l4_off, m->pkt_len - l4_off, &raw_cksum))
+ if (rte_raw_cksum_mbuf(m, l4_off,
rte_be_to_cpu_16(ipv6_hdr->payload_len), &raw_cksum))
> return 0;
>
> cksum = raw_cksum + rte_ipv6_phdr_cksum(ipv6_hdr, 0);
> --
> 2.34.1
RE: [EXT] Re: [PATCH] cryptodev: convert to dynamic logtype
> On Mon, Dec 11, 2023 at 9:18 PM Stephen Hemminger > wrote: > > > > The cryptodev logs are all referenced via rte_crytpodev.h > > crypto* > > > so make it dynamic there. > > > > Signed-off-by: Stephen Hemminger > > I would add a comment in the header that this exported logtype > variable is for internal use. > Otherwise it lgtm. > > Akhil, do you mind if I take this directly in main? No issues, you can take it directly in main. Acked-by: Akhil Goyal
Re: [PATCH 3/3] net/nfb: use dynamic logtype
On Thu, 2023-12-07 at 10:56 -0800, Stephen Hemminger wrote:
> All drivers should be using dynamic logtype.
>
> Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver")
> Signed-off-by: Stephen Hemminger
Tested-by: Martin Spinler
RE: [PATCH] examples/ipsec-secgw: fix cryptodev to SA mapping
Fixes: a8ade12123c3 ("examples/ipsec-secgw: create lookaside sessions at init")
Cc: sta...@dpdk.org
Cc: vfia...@marvell.com
Signed-off-by: Radu Nicolau
Tested-by: Ting-Kai Ku
---
examples/ipsec-secgw/ipsec.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c index
f5cec4a928..593eab4e73 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -288,10 +288,9 @@ create_lookaside_session(struct ipsec_ctx
*ipsec_ctx_lcore[],
if (cdev_id == RTE_CRYPTO_MAX_DEVS)
cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
else if (cdev_id != ipsec_ctx->tbl[cdev_id_qp].id) {
- RTE_LOG(ERR, IPSEC,
- "SA mapping to multiple cryptodevs is "
- "not supported!");
- return -EINVAL;
+ RTE_LOG(WARNING, IPSEC,
+ "SA mapped to multiple cryptodevs for SPI %d\n",
+ sa->spi);
}
/* Store per core queue pair information */ @@ -908,7 +907,11
@@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
continue;
}
- enqueue_cop(sa->cqp[ipsec_ctx->lcore_id], &priv->cop);
+ if (sa->cqp[ipsec_ctx->lcore_id])
+ enqueue_cop(sa->cqp[ipsec_ctx->lcore_id], &priv->cop);
+ else
+ RTE_LOG(ERR, IPSEC, "No CQP available for lcore %d\n",
+ ipsec_ctx->lcore_id);
}
}
--
2.25.1
-Original Message-
From: Nicolau, Radu
Sent: Monday, December 11, 2023 5:54 PM
To: Nicolau, Radu ; Akhil Goyal
Cc: dev@dpdk.org; Power, Ciara ; Ku, Ting-Kai
; sta...@dpdk.org; vfia...@marvell.com
Subject: [PATCH] examples/ipsec-secgw: fix cryptodev to SA mapping
There are use cases where a SA should be able to use different cryptodevs on
different lcores, for example there can be cryptodevs with just 1 qp per VF.
For this purpose this patch relaxes the check in create lookaside session
function.
Also add a check to verify that a CQP is available for the current lcore.
Fixes: a8ade12123c3 ("examples/ipsec-secgw: create lookaside sessions at init")
Cc: sta...@dpdk.org
Cc: vfia...@marvell.com
Signed-off-by: Radu Nicolau
---
examples/ipsec-secgw/ipsec.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c index
f5cec4a928..593eab4e73 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -288,10 +288,9 @@ create_lookaside_session(struct ipsec_ctx
*ipsec_ctx_lcore[],
if (cdev_id == RTE_CRYPTO_MAX_DEVS)
cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
else if (cdev_id != ipsec_ctx->tbl[cdev_id_qp].id) {
- RTE_LOG(ERR, IPSEC,
- "SA mapping to multiple cryptodevs is "
- "not supported!");
- return -EINVAL;
+ RTE_LOG(WARNING, IPSEC,
+ "SA mapped to multiple cryptodevs for SPI %d\n",
+ sa->spi);
}
/* Store per core queue pair information */ @@ -908,7 +907,11
@@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
continue;
}
- enqueue_cop(sa->cqp[ipsec_ctx->lcore_id], &priv->cop);
+ if (sa->cqp[ipsec_ctx->lcore_id])
+ enqueue_cop(sa->cqp[ipsec_ctx->lcore_id], &priv->cop);
+ else
+ RTE_LOG(ERR, IPSEC, "No CQP available for lcore %d\n",
+ ipsec_ctx->lcore_id);
}
}
--
2.25.1
Re: [PATCH 0/3] enhancements for dpdk-cmdline-gen script
On Tue, Dec 5, 2023 at 3:51 PM Bruce Richardson wrote: > > This set contains some small enhancements for the cmdline generation > script introduced in the last release. Specifically: > > * Add support for commands with an optional variable parameter. This > is needed to support command pairs like testpmd's "start tx_first" > and "start tx_first 128" (to send 128 packets rather than 32). > > * Improve IP address handling support. We make the "IP" type correspond > to the cmdline lib IP type which supports IPv4 and v6. Then we add > explicit support for IPv4 addresses and IPv6 addresses only via > new type names. > > > Bruce Richardson (3): > buildtools/dpdk-cmdline-gen: support optional parameters > buildtools/dpdk-cmdline-gen: fix IP address initializer > buildtools/dpdk-cmdline-gen: add explicit IPv4 and v6 types > > buildtools/dpdk-cmdline-gen.py| 21 - > doc/guides/prog_guide/cmdline.rst | 17 + > 2 files changed, 37 insertions(+), 1 deletion(-) Series applied, thanks Bruce. -- David Marchand
Re: [PATCH] buildtools/dpdk-cmdline-gen: fix code gen for IP addresses
On Tue, Dec 5, 2023 at 12:31 PM Bruce Richardson
wrote:
>
> The C code generated for the tokens for matching IP addresses in
> commandlines was missing the "static" prefix present in the output for
> the other data-types.
>
> Fixes: 3791e9ed ("buildtools: add a tool to generate cmdline boilerplate")
> Cc: sta...@dpdk.org
>
> Reported-by: Sunil Kumar Kori
> Signed-off-by: Bruce Richardson
Applied, thanks Bruce and Sunil.
--
David Marchand
Re: 20.11.10 patches review and test
On Tue, 12 Dec 2023 at 05:41, Xu, HailinX wrote: > > > -Original Message- > > From: luca.bocca...@gmail.com > > Sent: Friday, December 1, 2023 7:51 PM > > To: sta...@dpdk.org > > Cc: dev@dpdk.org; Abhishek Marathe ; > > Ali Alnubani ; benjamin.wal...@intel.com; David > > Christensen ; Hemant Agrawal > > ; Stokes, Ian ; Jerin Jacob > > ; Mcnamara, John ; Ju- > > Hyoung Lee ; Kevin Traynor > > ; Luca Boccassi ; Pei Zhang > > ; qian.q...@intel.com; Raslan Darawsheh > > ; Thomas Monjalon ; > > Yanghang Liu ; yuan.p...@intel.com; > > zhaoyan.c...@intel.com > > Subject: 20.11.10 patches review and test > > > > Hi all, > > > > Here is a list of patches targeted for stable release 20.11.10. > > > > The planned date for the final release is December 12th. > > > > Please help with testing and validation of your use cases and report any > > issues/results with reply-all to this mail. For the final release the fixes > > and > > reported validations will be added to the release notes. > > > > A release candidate tarball can be found at: > > > > https://dpdk.org/browse/dpdk-stable/tag/?id=v20.11.10-rc1 > > > > These patches are located at branch 20.11 of dpdk-stable repo: > > https://dpdk.org/browse/dpdk-stable/ > > > > Thanks. > > > > Luca Boccassi > Update the test status for Intel part. Till now dpdk20.11.10-rc1 all > validation test is done. No new issue is found. > > # Basic Intel(R) NIC testing > * Build & CFLAG compile: cover the build test combination with latest > GCC/Clang version and the popular OS revision such as Ubuntu22.04, > Ubuntu20.04, Fedora38, RHEL9.2, RHEL8.7, FreeBSD13.2, Centos7.9 etc. > - All test done. No new dpdk issue is found. > * PF(i40e, ixgbe): test scenarios including RTE_FLOW/TSO/Jumboframe/checksum > offload/VLAN/VXLAN, etc. > - All test done. No new dpdk issue is found. > * VF(i40e, ixgbe): test scenarios including > VF-RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. > - All test done. No new dpdk issue is found. > * PF/VF(ice): test scenarios including Switch features/Package > Management/Flow Director/Advanced Tx/Advanced RSS/ACL/DCF/Flexible > Descriptor, etc. > - All test done. No new dpdk issue is found. > * Intel NIC single core/NIC performance: test scenarios including PF/VF > single core performance test, etc. > - All test done. No new dpdk issue is found. > * IPsec: test scenarios including ipsec/ipsec-gw/ipsec library basic test - > QAT&SW/FIB library, etc. > - All test done. No new dpdk issue is found. > > # Basic cryptodev and virtio testing > * Virtio: both function and performance test are covered. Such as > PVP/Virtio_loopback/virtio-user loopback/virtio-net VM2VM perf > testing/VMAWARE ESXI 8.0, etc. > - All test done. No new dpdk issue is found. > * Cryptodev: > *Function test: test scenarios including Cryptodev API testing/CompressDev > ISA-L/QAT/ZLIB PMD Testing/FIPS, etc. > - All test done. No new dpdk issue is found. > *Performance test: test scenarios including Thoughput Performance/Cryptodev > Latency, etc. > - All test done. No new dpdk issue is found. > > Regards, > Xu, Hailin Thank you!
[PATCH] app/dma-perf: replace pktmbuf with mempool objects
Replace pktmbuf pool with mempool, this allows increase in MOPS
especially in lower buffer size. Using Mempool, allows to reduce
the extra CPU cycles.
v1 changes:
1. pktmbuf pool create with mempool create.
2. create src & dst pointer array from the appropaite numa.
3. use get pool and put for mempool objects.
4. remove pktmbuf_mtod for dma and cpu memcpy.
Test Results for pktmbuf vs mempool:
Format: Buffer Size | % AVG cycles | % AVG Gbps
Category-1: HW-DSA
---
64|-13.11| 14.97
128|-41.49| 0.41
256| -1.85| 1.20
512| -9.38| 8.81
1024| 1.82| -2.00
1518| 0.00| -0.80
2048| 1.03| -0.91
4096| 0.00| -0.35
8192| 0.07| -0.08
Category-2: MEMCPY
---
64|-12.50|14.14
128|-40.63|67.26
256|-38.78|59.35
512|-30.26|43.36
1024|-21.80|27.04
1518|-16.23|19.33
2048|-14.75|16.81
4096| -9.56|10.01
8192| -3.32| 3.12
Signed-off-by: Vipin Varghese
Tested-by: Thiyagrajan P
---
app/test-dma-perf/benchmark.c | 74 +--
1 file changed, 44 insertions(+), 30 deletions(-)
diff --git a/app/test-dma-perf/benchmark.c b/app/test-dma-perf/benchmark.c
index 9b1f58c78c..dc6f16cc01 100644
--- a/app/test-dma-perf/benchmark.c
+++ b/app/test-dma-perf/benchmark.c
@@ -43,8 +43,8 @@ struct lcore_params {
uint16_t kick_batch;
uint32_t buf_size;
uint16_t test_secs;
- struct rte_mbuf **srcs;
- struct rte_mbuf **dsts;
+ void **srcs;
+ void **dsts;
volatile struct worker_info worker_info;
};
@@ -110,17 +110,17 @@ output_result(uint8_t scenario_id, uint32_t lcore_id,
char *dma_name, uint16_t r
}
static inline void
-cache_flush_buf(__rte_unused struct rte_mbuf **array,
+cache_flush_buf(__rte_unused void **array,
__rte_unused uint32_t buf_size,
__rte_unused uint32_t nr_buf)
{
#ifdef RTE_ARCH_X86_64
char *data;
- struct rte_mbuf **srcs = array;
+ void **srcs = array;
uint32_t i, offset;
for (i = 0; i < nr_buf; i++) {
- data = rte_pktmbuf_mtod(srcs[i], char *);
+ data = (char *) srcs[i];
for (offset = 0; offset < buf_size; offset += 64)
__builtin_ia32_clflush(data + offset);
}
@@ -224,8 +224,8 @@ do_dma_mem_copy(void *p)
const uint32_t nr_buf = para->nr_buf;
const uint16_t kick_batch = para->kick_batch;
const uint32_t buf_size = para->buf_size;
- struct rte_mbuf **srcs = para->srcs;
- struct rte_mbuf **dsts = para->dsts;
+ void **srcs = para->srcs;
+ void **dsts = para->dsts;
uint16_t nr_cpl;
uint64_t async_cnt = 0;
uint32_t i;
@@ -241,8 +241,12 @@ do_dma_mem_copy(void *p)
while (1) {
for (i = 0; i < nr_buf; i++) {
dma_copy:
- ret = rte_dma_copy(dev_id, 0,
rte_mbuf_data_iova(srcs[i]),
- rte_mbuf_data_iova(dsts[i]), buf_size, 0);
+ ret = rte_dma_copy(dev_id,
+ 0,
+ (rte_iova_t) srcs[i],
+ (rte_iova_t) dsts[i],
+ buf_size,
+ 0);
if (unlikely(ret < 0)) {
if (ret == -ENOSPC) {
do_dma_submit_and_poll(dev_id,
&async_cnt, worker_info);
@@ -276,8 +280,8 @@ do_cpu_mem_copy(void *p)
volatile struct worker_info *worker_info = &(para->worker_info);
const uint32_t nr_buf = para->nr_buf;
const uint32_t buf_size = para->buf_size;
- struct rte_mbuf **srcs = para->srcs;
- struct rte_mbuf **dsts = para->dsts;
+ void **srcs = para->srcs;
+ void **dsts = para->dsts;
uint32_t i;
worker_info->stop_flag = false;
@@ -288,8 +292,8 @@ do_cpu_mem_copy(void *p)
while (1) {
for (i = 0; i < nr_buf; i++) {
- const void *src = rte_pktmbuf_mtod(dsts[i], void *);
- void *dst = rte_pktmbuf_mtod(srcs[i], void *);
+ const void *src = (void *) dsts[i];
+ void *dst = (void *) srcs[i];
/* copy buffer form src to dst */
rte_memcpy(dst, src, (size_t)buf_size);
@@ -303,8 +307,8 @@ do_cpu_mem_copy(void *p)
}
static int
-setup_memory_env(struct test_configure *cfg, struct rte_mbuf ***srcs,
- struct rte_mbuf ***dsts)
+setup_memory_env(struct test_configure *cfg, void ***srcs,
+ void ***dsts)
{
unsigned int buf_size = cfg->buf_size.cur;
unsigned int nr_sockets;
@@ -317,47 +321,57 @@ setup_memory_env(struct test_configure *cfg, struct
rte_mbuf ***srcs,
return -1;
}
- src_pool = rte_pktmbuf_pool_crea
[PATCH] doc: update size parameter details
For configuration parameters `mem_size` and `buf_size` are represented as megabytes and bytes respectively in application. Update the documentation to represent the same. Signed-off-by: Vipin Varghese --- doc/guides/tools/dmaperf.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/tools/dmaperf.rst b/doc/guides/tools/dmaperf.rst index 9e3e78a6b7..6f85fceb8a 100644 --- a/doc/guides/tools/dmaperf.rst +++ b/doc/guides/tools/dmaperf.rst @@ -74,10 +74,10 @@ Configuration Parameters Currently supported types are ``DMA_MEM_COPY`` and ``CPU_MEM_COPY``. ``mem_size`` - The size of the memory footprint. + The size of the memory footprint in megabytes (MB) for source and destination. ``buf_size`` - The memory size of a single operation. + The memory size of a single operation in bytes (B). ``dma_ring_size`` The DMA ring buffer size. Must be a power of two, and between ``64`` and ``4096``. -- 2.34.1
Minutes of Techboard Meeting, 2023-11-29
TB Attendees Aaron Bruce Hemant Honnappa Jerin Kevin Konstantin Maxime Morten Stephen Thomas NOTE: The technical board meetings are on every second Wednesday at 3 pm UTC. Meetings are public, and DPDK community members are welcome to attend. Link to join: https://zoom-lfx.platform.linuxfoundation.org/meeting/96459488340?password=d 808f1f6-0a28-4165-929e-5a5bcae7efeb NOTE: Next meeting will be on Wednesday 2023-Dec-13 @3pm UTC, and will be chaired by Honnappa 1. Discussion of mandating DTS test case addition for new features. TB discussed the idea of mandating the addition of test cases for each new feature being added. - DTS framework pieces are being merged in the main DPDK repo. It currently supports Linux. o Windows is still an exception. o Windows maintainers shall plan to make it work soon. - First patch that introduces a new feature shall include 1 positive and 1 negative test case. - Subsequently, other PMDs adding support for this feature, shall add more than 1 positive and more than 1 negative test cases or modify existing test cases for code coverage. - It is module/tree maintainers responsibility to o ensure that test cases are submitted along with the patch o help identify test cases if the patch owner cannot find one - Thomas will help in updating it to contributing guidelines. - As the DTS becomes ready, the TB will review and announce the effective dates with enough notice in advance. - The current tentative timelines for these rules are: (subject to DTS readiness and TB approval for each step). o effective for basic ethdev features on 2024 H2 o effective for all ethdev (including rte_flow) on early 2025 o effective for more libraries in 2025 - Future ideas o Improve code coverage o Other samples applications in addition to testpmd 2. Discuss the outstanding issues in "redistribution" aspects of doc: define qualification criteria for external library patch https://patches.dpdk.org/project/dpdk/patch/20230928054036.645183-1-jerinj@m arvell.com/ TB discussed various guidelines to be added to external library support in DPDK. - The distribution and usage license details about the external library shall be documented within DPDK o It shall be a permissive license such as BSD-3 or Apache and align with the existing DPDK licenses. No GPL. o In case of mandatory components, libraries; Distros shall be able to use them. - They shall be optional to use and disabled by default. - They shall be freely available to build with DPDK. - They shall be downloadable from a direct link. There shall not be any requirement to login or sign a user agreement. - They may be limited to the OS, they are supporting. - It is yet to be decided about the applicability of the above rules to the existing DPDK libraries. - The voting on the above is not done as the members wants to first see the full draft of the rules. smime.p7s Description: S/MIME cryptographic signature
Re: [PATCH 3/3] examples/vm_power_manager: do not use EAL logtype
On 11/12/2023 17:23, Stephen Hemminger wrote: Be consistent for all the error printouts and use fprintf(). The EAL logtype is reserved for internal use by EAL. Signed-off-by: Stephen Hemminger --- examples/vm_power_manager/main.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c index b159291d77ce..c14138202004 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c --snip-- Acked-by: David Hunt
Re: [PATCH 24.03 v2 2/9] eventdev: increase flexibility of all-types flag
On Thu, Nov 23, 2023 at 09:37:58AM +0530, Jerin Jacob wrote: > On Tue, Nov 21, 2023 at 5:25 PM Bruce Richardson > wrote: > > > > Rather than requiring that any device advertising the > > RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES flag support all of atomic, ordered > > and parallel scheduling, we can redefine the field so that it basically > > means that you don't need to specify the queue scheduling type at config > > time. Instead all types of supported events can be sent to all queues. > > > > Suggested-by: Mattias Rönnblom > > Signed-off-by: Bruce Richardson > > --- > > lib/eventdev/rte_eventdev.h | 15 --- > > 1 file changed, 12 insertions(+), 3 deletions(-) > > > > diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h > > index d48957362c..1c5043de26 100644 > > --- a/lib/eventdev/rte_eventdev.h > > +++ b/lib/eventdev/rte_eventdev.h > > @@ -250,11 +250,20 @@ struct rte_event; > > * @see rte_event_dequeue_burst() > > */ > > #define RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES (1ULL << 3) > > -/**< Event device is capable of enqueuing events of any type to any queue. > > +/**< Event device is capable of accepting enqueued events, of any type > > + * advertised as supported by the device, to all destination queues. > > + * > > + * When this capability is set, the "schedule_type" field of the > > + * rte_event_queue_conf structure is ignored when a queue is being > > configured. > > can we also add something like below or so to above line > > rte_event_queue_conf structure is ignored when a queue is being > configured instead rte_event::sched_type > shall be used. > Preparing v3 now and including this doc change. However, I'm also wondering about the correct behaviour when this flag is not set. When the flag is not set, the events enqueued should match the event type of the queue, but do we need to enforce this, or should we? Couple of options: 1. Actually enforce this, and state that it is an error to enqueue events with another scheduling type. 2. Explicitly not enforce this, and just state instead that the sched_type of events will be ignored. Personally, I'd tend very much towards #2. because: * it's easier for the app, as they can ignore the sched_type field through the pipeline if they want, relying on each queues type to do the right thing. This could be especially useful if they have fallback mechanisms to e.g. configure a queue as atomic if reordered is not supported etc. The downside is that for portable applications the sched type should always be set anyway, but the app doesn't lose anything in this case with #2 over #1. * It's easier and more performant for the drivers, since it's one less check that should be performed on enqueue. The driver can just blindly override the sched_type provided with the queue config version. I actually think an extension of #2 would also be nice to have for portability, whereby an app could explicitly configure a queue to only have a scheduling type - event if it's all-types-capable - and thereafter never have to set the sched_type field on events. The drivers would always remember the queue-type and explicitly set that if necessary on enqueue Thoughts? /Bruce PS: Going to send v3 now anyway, based on feedback thus far. If we get quick consensus on above, I can roll it into a v4, otherwise we can look to clarify that situation in a separate patch later.
[PATCH v3 0/9] document scheduling types for eventdev drivers
The various eventdev drivers, while fitting under a common API, do not all support all scheduling types. The eventdev API is missing some way to query the particular scheduling support for a driver, a key piece of information for application developers. This patchset adds the necessary capability flags, and documentation feature rows, then, driver-by-driver adds the necessary flags to both code and docs. V3: * Fix missing PARALLEL flag on OPDL * Clarify further doc text on ALL_TYPES flag V2: * Fix flag values to be unique * Fix missing PARALLEL flag on DSW * Add patch adjusting definition of the ALL_TYPES flag Bruce Richardson (9): eventdev: add capability flags for supported sched types eventdev: clarify all-types flag documentation event/cnxk: add schedule-type capability flags event/dlb2: add schedule-type capability flags event/dpaa*: add schedule-type capability flags event/dsw: add schedule-type capability flags event/octeontx: add schedule-type capability flags event/opdl: add schedule-type capability flags event/sw: add schedule-type capability flags doc/guides/eventdevs/features/cnxk.ini | 3 ++ doc/guides/eventdevs/features/default.ini | 3 ++ doc/guides/eventdevs/features/dlb2.ini | 3 ++ doc/guides/eventdevs/features/dpaa.ini | 2 ++ doc/guides/eventdevs/features/dpaa2.ini| 2 ++ doc/guides/eventdevs/features/dsw.ini | 2 ++ doc/guides/eventdevs/features/octeontx.ini | 3 ++ doc/guides/eventdevs/features/opdl.ini | 3 ++ doc/guides/eventdevs/features/sw.ini | 3 ++ drivers/event/cnxk/cnxk_eventdev.c | 5 ++- drivers/event/dlb2/dlb2.c | 5 ++- drivers/event/dpaa/dpaa_eventdev.c | 2 ++ drivers/event/dpaa2/dpaa2_eventdev.c | 2 ++ drivers/event/dsw/dsw_evdev.c | 2 ++ drivers/event/octeontx/ssovf_evdev.c | 3 ++ drivers/event/opdl/opdl_evdev.c| 3 ++ drivers/event/sw/sw_evdev.c| 3 ++ lib/eventdev/rte_eventdev.h| 38 -- 18 files changed, 82 insertions(+), 5 deletions(-) -- 2.40.1
[PATCH v3 1/9] eventdev: add capability flags for supported sched types
Not all eventdev's support all scheduling types, for example, some may only support atomic scheduling or others only support ordered scheduling. There is currently no clear indication for each driver what sched types it supports, so add capability flags to be indicated on return from rte_event_dev_info_get() API. Similarly add the possible scheduling types to the capabilities table in the docs. Signed-off-by: Bruce Richardson Acked-by: Jerin Jacob --- doc/guides/eventdevs/features/default.ini | 3 +++ lib/eventdev/rte_eventdev.h | 21 + 2 files changed, 24 insertions(+) diff --git a/doc/guides/eventdevs/features/default.ini b/doc/guides/eventdevs/features/default.ini index e980ae134a..1cc4303fe5 100644 --- a/doc/guides/eventdevs/features/default.ini +++ b/doc/guides/eventdevs/features/default.ini @@ -6,6 +6,9 @@ ; the features table in the documentation. ; [Scheduling Features] +atomic_scheduling = +ordered_scheduling = +parallel_scheduling= queue_qos = event_qos = distributed_sched = diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h index ec9b02455d..d48957362c 100644 --- a/lib/eventdev/rte_eventdev.h +++ b/lib/eventdev/rte_eventdev.h @@ -326,6 +326,27 @@ struct rte_event; * than one. */ +#define RTE_EVENT_DEV_CAP_ATOMIC (1ULL << 13) +/**< Event device is capable of atomic scheduling. + * When this flag is set, the application can configure queues with scheduling type + * atomic on this event device. + * @see RTE_SCHED_TYPE_ATOMIC + */ + +#define RTE_EVENT_DEV_CAP_ORDERED (1ULL << 14) +/**< Event device is capable of ordered scheduling. + * When this flag is set, the application can configure queues with scheduling type + * ordered on this event device. + * @see RTE_SCHED_TYPE_ORDERED + */ + +#define RTE_EVENT_DEV_CAP_PARALLEL (1ULL << 15) +/**< Event device is capable of parallel scheduling. + * When this flag is set, the application can configure queues with scheduling type + * parallel on this event device. + * @see RTE_SCHED_TYPE_PARALLEL + */ + /* Event device priority levels */ #define RTE_EVENT_DEV_PRIORITY_HIGHEST 0 /**< Highest priority expressed across eventdev subsystem -- 2.40.1
[PATCH v3 2/9] eventdev: clarify all-types flag documentation
Rather than requiring that any device advertising the RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES flag support all of atomic, ordered and parallel scheduling, we can redefine the field so that it basically means that you don't need to specify the queue scheduling type at config time. Instead all types of supported events can be sent to all queues. Suggested-by: Mattias Rönnblom Signed-off-by: Bruce Richardson Acked-by: Jerin Jacob --- lib/eventdev/rte_eventdev.h | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h index d48957362c..35865f017f 100644 --- a/lib/eventdev/rte_eventdev.h +++ b/lib/eventdev/rte_eventdev.h @@ -250,11 +250,22 @@ struct rte_event; * @see rte_event_dequeue_burst() */ #define RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES (1ULL << 3) -/**< Event device is capable of enqueuing events of any type to any queue. +/**< Event device is capable of accepting enqueued events, of any type + * advertised as supported by the device, to all destination queues. + * + * When this capability is set, the "schedule_type" field of the + * rte_event_queue_conf structure is ignored when a queue is being configured. + * Instead the the "sched_type" field of each event enqueued is used to + * select the scheduling to be performed on that event. + * * If this capability is not set, the queue only supports events of the - * *RTE_SCHED_TYPE_* type that it was created with. + * *RTE_SCHED_TYPE_* type specified in the rte_event_queue_conf structure + * at time of configuration. * - * @see RTE_SCHED_TYPE_* values + * @see RTE_SCHED_TYPE_ATOMIC + * @see RTE_SCHED_TYPE_ORDERED + * @see RTE_SCHED_TYPE_PARALLEL + * @see rte_event_queue_conf.schedule_type */ #define RTE_EVENT_DEV_CAP_BURST_MODE (1ULL << 4) /**< Event device is capable of operating in burst mode for enqueue(forward, -- 2.40.1
[PATCH v3 3/9] event/cnxk: add schedule-type capability flags
Document explicitly the scheduling types supported by this driver, both via info_get() function, and via table in the documentation. Signed-off-by: Bruce Richardson --- doc/guides/eventdevs/features/cnxk.ini | 3 +++ drivers/event/cnxk/cnxk_eventdev.c | 5 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/guides/eventdevs/features/cnxk.ini b/doc/guides/eventdevs/features/cnxk.ini index 5d353e3670..d1516372fa 100644 --- a/doc/guides/eventdevs/features/cnxk.ini +++ b/doc/guides/eventdevs/features/cnxk.ini @@ -4,6 +4,9 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +ordered_scheduling = Y +parallel_scheduling= Y queue_qos = Y distributed_sched = Y queue_all_types= Y diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 0c61f4c20e..e266ee2789 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -22,7 +22,10 @@ cnxk_sso_info_get(struct cnxk_sso_evdev *dev, dev_info->max_event_port_dequeue_depth = 1; dev_info->max_event_port_enqueue_depth = 1; dev_info->max_num_events = dev->max_num_events; - dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_QUEUE_QOS | + dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_ATOMIC | + RTE_EVENT_DEV_CAP_ORDERED | + RTE_EVENT_DEV_CAP_PARALLEL | + RTE_EVENT_DEV_CAP_QUEUE_QOS | RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED | RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES | RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | -- 2.40.1
[PATCH v3 4/9] event/dlb2: add schedule-type capability flags
Document explicitly the scheduling types supported by this driver, both
via info_get() function, and via table in the documentation.
Signed-off-by: Bruce Richardson
Acked-by: Abdullah Sevincer
---
doc/guides/eventdevs/features/dlb2.ini | 3 +++
drivers/event/dlb2/dlb2.c | 5 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/doc/guides/eventdevs/features/dlb2.ini
b/doc/guides/eventdevs/features/dlb2.ini
index 48a2a18aff..7b80286927 100644
--- a/doc/guides/eventdevs/features/dlb2.ini
+++ b/doc/guides/eventdevs/features/dlb2.ini
@@ -4,6 +4,9 @@
; Refer to default.ini for the full list of available PMD features.
;
[Scheduling Features]
+atomic_scheduling = Y
+ordered_scheduling = Y
+parallel_scheduling= Y
event_qos = Y
distributed_sched = Y
queue_all_types= Y
diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index 050ace0904..770bdcbd2d 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -71,7 +71,10 @@ static struct rte_event_dev_info evdev_dlb2_default_info = {
.max_num_events = DLB2_MAX_NUM_LDB_CREDITS,
.max_single_link_event_port_queue_pairs =
DLB2_MAX_NUM_DIR_PORTS(DLB2_HW_V2),
- .event_dev_cap = (RTE_EVENT_DEV_CAP_EVENT_QOS |
+ .event_dev_cap = (RTE_EVENT_DEV_CAP_ATOMIC |
+ RTE_EVENT_DEV_CAP_ORDERED |
+ RTE_EVENT_DEV_CAP_PARALLEL |
+ RTE_EVENT_DEV_CAP_EVENT_QOS |
RTE_EVENT_DEV_CAP_NONSEQ_MODE |
RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |
--
2.40.1
[PATCH v3 5/9] event/dpaa*: add schedule-type capability flags
Document explicitly the scheduling types supported by these drivers, both via info_get() function, and via table in the documentation. Signed-off-by: Bruce Richardson Acked-by: Hemant Agrawal --- doc/guides/eventdevs/features/dpaa.ini | 2 ++ doc/guides/eventdevs/features/dpaa2.ini | 2 ++ drivers/event/dpaa/dpaa_eventdev.c | 2 ++ drivers/event/dpaa2/dpaa2_eventdev.c| 2 ++ 4 files changed, 8 insertions(+) diff --git a/doc/guides/eventdevs/features/dpaa.ini b/doc/guides/eventdevs/features/dpaa.ini index b73bfa02e5..b2ee6ed93a 100644 --- a/doc/guides/eventdevs/features/dpaa.ini +++ b/doc/guides/eventdevs/features/dpaa.ini @@ -4,6 +4,8 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +parallel_scheduling= Y distributed_sched = Y burst_mode = Y nonseq_mode= Y diff --git a/doc/guides/eventdevs/features/dpaa2.ini b/doc/guides/eventdevs/features/dpaa2.ini index c935bd0cfc..6d3c07ed66 100644 --- a/doc/guides/eventdevs/features/dpaa2.ini +++ b/doc/guides/eventdevs/features/dpaa2.ini @@ -4,6 +4,8 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +parallel_scheduling= Y distributed_sched = Y queue_all_types= Y burst_mode = Y diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 46a9b88c73..57ddb85e52 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -353,6 +353,8 @@ dpaa_event_dev_info_get(struct rte_eventdev *dev, dev_info->max_num_events = DPAA_EVENT_MAX_NUM_EVENTS; dev_info->event_dev_cap = + RTE_EVENT_DEV_CAP_ATOMIC | + RTE_EVENT_DEV_CAP_PARALLEL | RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED | RTE_EVENT_DEV_CAP_BURST_MODE | RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index dd4e64395f..dd62c76c86 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -404,6 +404,8 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev, DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH; dev_info->max_num_events = DPAA2_EVENT_MAX_NUM_EVENTS; dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED | + RTE_EVENT_DEV_CAP_ATOMIC | + RTE_EVENT_DEV_CAP_PARALLEL | RTE_EVENT_DEV_CAP_BURST_MODE| RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT | -- 2.40.1
[PATCH v3 6/9] event/dsw: add schedule-type capability flags
Document explicitly the scheduling types supported by this driver, both via info_get() function, and via table in the documentation. Signed-off-by: Bruce Richardson --- doc/guides/eventdevs/features/dsw.ini | 2 ++ drivers/event/dsw/dsw_evdev.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/guides/eventdevs/features/dsw.ini b/doc/guides/eventdevs/features/dsw.ini index c8bc6b3f1d..4038b9dd3d 100644 --- a/doc/guides/eventdevs/features/dsw.ini +++ b/doc/guides/eventdevs/features/dsw.ini @@ -4,6 +4,8 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +parallel_scheduling= Y distributed_sched = Y burst_mode = Y nonseq_mode= Y diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c index 1209e73a9d..9bf7b46a24 100644 --- a/drivers/event/dsw/dsw_evdev.c +++ b/drivers/event/dsw/dsw_evdev.c @@ -220,6 +220,8 @@ dsw_info_get(struct rte_eventdev *dev __rte_unused, .max_num_events = DSW_MAX_EVENTS, .max_profiles_per_port = 1, .event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE| + RTE_EVENT_DEV_CAP_ATOMIC | + RTE_EVENT_DEV_CAP_PARALLEL | RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED| RTE_EVENT_DEV_CAP_NONSEQ_MODE| RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT| -- 2.40.1
[PATCH v3 7/9] event/octeontx: add schedule-type capability flags
Document explicitly the scheduling types supported by this driver, both via info_get() function, and via table in the documentation. Signed-off-by: Bruce Richardson --- doc/guides/eventdevs/features/octeontx.ini | 3 +++ drivers/event/octeontx/ssovf_evdev.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/doc/guides/eventdevs/features/octeontx.ini b/doc/guides/eventdevs/features/octeontx.ini index ec044e6289..06efae767a 100644 --- a/doc/guides/eventdevs/features/octeontx.ini +++ b/doc/guides/eventdevs/features/octeontx.ini @@ -4,6 +4,9 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +ordered_scheduling = Y +parallel_scheduling= Y queue_qos = Y distributed_sched = Y queue_all_types= Y diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c index a16f24e088..3a933b1db7 100644 --- a/drivers/event/octeontx/ssovf_evdev.c +++ b/drivers/event/octeontx/ssovf_evdev.c @@ -151,6 +151,9 @@ ssovf_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *dev_info) dev_info->max_event_port_enqueue_depth = 1; dev_info->max_num_events = edev->max_num_events; dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_QUEUE_QOS | + RTE_EVENT_DEV_CAP_ATOMIC | + RTE_EVENT_DEV_CAP_ORDERED | + RTE_EVENT_DEV_CAP_PARALLEL | RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED | RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES| RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK | -- 2.40.1
[PATCH v3 8/9] event/opdl: add schedule-type capability flags
Document explicitly the scheduling types supported by this driver, both via info_get() function, and via table in the documentation. Signed-off-by: Bruce Richardson --- doc/guides/eventdevs/features/opdl.ini | 3 +++ drivers/event/opdl/opdl_evdev.c| 3 +++ 2 files changed, 6 insertions(+) diff --git a/doc/guides/eventdevs/features/opdl.ini b/doc/guides/eventdevs/features/opdl.ini index 5cc35d3c77..1a97fd54a6 100644 --- a/doc/guides/eventdevs/features/opdl.ini +++ b/doc/guides/eventdevs/features/opdl.ini @@ -4,6 +4,9 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +ordered_scheduling = Y +parallel_scheduling= Y burst_mode = Y carry_flow_id = Y maintenance_free = Y diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c index 0cccaf7e97..b34a5fcacd 100644 --- a/drivers/event/opdl/opdl_evdev.c +++ b/drivers/event/opdl/opdl_evdev.c @@ -376,6 +376,9 @@ opdl_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info) .max_event_port_enqueue_depth = MAX_OPDL_CONS_Q_DEPTH, .max_num_events = OPDL_INFLIGHT_EVENTS_TOTAL, .event_dev_cap = RTE_EVENT_DEV_CAP_BURST_MODE | +RTE_EVENT_DEV_CAP_ORDERED | +RTE_EVENT_DEV_CAP_ATOMIC | +RTE_EVENT_DEV_CAP_PARALLEL | RTE_EVENT_DEV_CAP_CARRY_FLOW_ID | RTE_EVENT_DEV_CAP_MAINTENANCE_FREE, .max_profiles_per_port = 1, -- 2.40.1
[PATCH v3 9/9] event/sw: add schedule-type capability flags
Document explicitly the scheduling types supported by this driver, both via info_get() function, and via table in the documentation. Signed-off-by: Bruce Richardson --- doc/guides/eventdevs/features/sw.ini | 3 +++ drivers/event/sw/sw_evdev.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/doc/guides/eventdevs/features/sw.ini b/doc/guides/eventdevs/features/sw.ini index 8c89d3b8d2..f4d46d79b8 100644 --- a/doc/guides/eventdevs/features/sw.ini +++ b/doc/guides/eventdevs/features/sw.ini @@ -4,6 +4,9 @@ ; Refer to default.ini for the full list of available PMD features. ; [Scheduling Features] +atomic_scheduling = Y +ordered_scheduling = Y +parallel_scheduling= Y queue_qos = Y event_qos = Y burst_mode = Y diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c index 55e7735cb0..1c01b069fe 100644 --- a/drivers/event/sw/sw_evdev.c +++ b/drivers/event/sw/sw_evdev.c @@ -600,6 +600,9 @@ sw_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *info) .max_event_port_enqueue_depth = MAX_SW_PROD_Q_DEPTH, .max_num_events = SW_INFLIGHT_EVENTS_TOTAL, .event_dev_cap = ( + RTE_EVENT_DEV_CAP_ATOMIC | + RTE_EVENT_DEV_CAP_ORDERED | + RTE_EVENT_DEV_CAP_PARALLEL | RTE_EVENT_DEV_CAP_QUEUE_QOS | RTE_EVENT_DEV_CAP_BURST_MODE | RTE_EVENT_DEV_CAP_EVENT_QOS | -- 2.40.1
Re: [PATCH v2 1/5] vhost: fix virtqueue access check in datapath
On 12/5/23 10:45, David Marchand wrote:
Now that a r/w lock is used, the access_ok field should only be updated
under a write lock.
Since the datapath code only takes a read lock on the virtqueue to check
access_ok, this lock must be released and a write lock taken before
calling vring_translate().
Fixes: 03f77d66d966 ("vhost: change virtqueue access lock to a read/write one")
Cc: sta...@dpdk.org
Signed-off-by: David Marchand
Acked-by: Eelco Chaudron
Reviewed-by: Maxime Coquelin
---
lib/vhost/virtio_net.c | 60 +++---
1 file changed, 44 insertions(+), 16 deletions(-)
diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index 8af20f1487..d00f4b03aa 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -1696,6 +1696,17 @@ virtio_dev_rx_packed(struct virtio_net *dev,
return pkt_idx;
}
+static void
+virtio_dev_vring_translate(struct virtio_net *dev, struct vhost_virtqueue *vq)
+{
+ rte_rwlock_write_lock(&vq->access_lock);
+ vhost_user_iotlb_rd_lock(vq);
+ if (!vq->access_ok)
+ vring_translate(dev, vq);
+ vhost_user_iotlb_rd_unlock(vq);
+ rte_rwlock_write_unlock(&vq->access_lock);
+}
+
static __rte_always_inline uint32_t
virtio_dev_rx(struct virtio_net *dev, struct vhost_virtqueue *vq,
struct rte_mbuf **pkts, uint32_t count)
@@ -1710,9 +1721,13 @@ virtio_dev_rx(struct virtio_net *dev, struct
vhost_virtqueue *vq,
vhost_user_iotlb_rd_lock(vq);
- if (unlikely(!vq->access_ok))
- if (unlikely(vring_translate(dev, vq) < 0))
- goto out;
+ if (unlikely(!vq->access_ok)) {
+ vhost_user_iotlb_rd_unlock(vq);
+ rte_rwlock_read_unlock(&vq->access_lock);
+
+ virtio_dev_vring_translate(dev, vq);
+ goto out_no_unlock;
+ }
count = RTE_MIN((uint32_t)MAX_PKT_BURST, count);
if (count == 0)
@@ -1731,6 +1746,7 @@ virtio_dev_rx(struct virtio_net *dev, struct
vhost_virtqueue *vq,
out_access_unlock:
rte_rwlock_read_unlock(&vq->access_lock);
+out_no_unlock:
return nb_tx;
}
@@ -2528,9 +2544,13 @@ virtio_dev_rx_async_submit(struct virtio_net *dev, struct vhost_virtqueue *vq,
vhost_user_iotlb_rd_lock(vq);
- if (unlikely(!vq->access_ok))
- if (unlikely(vring_translate(dev, vq) < 0))
- goto out;
+ if (unlikely(!vq->access_ok)) {
+ vhost_user_iotlb_rd_unlock(vq);
+ rte_rwlock_read_unlock(&vq->access_lock);
+
+ virtio_dev_vring_translate(dev, vq);
+ goto out_no_unlock;
+ }
count = RTE_MIN((uint32_t)MAX_PKT_BURST, count);
if (count == 0)
@@ -2551,6 +2571,7 @@ virtio_dev_rx_async_submit(struct virtio_net *dev, struct
vhost_virtqueue *vq,
out_access_unlock:
rte_rwlock_write_unlock(&vq->access_lock);
+out_no_unlock:
return nb_tx;
}
@@ -3581,11 +3602,13 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
vhost_user_iotlb_rd_lock(vq);
- if (unlikely(!vq->access_ok))
- if (unlikely(vring_translate(dev, vq) < 0)) {
- count = 0;
- goto out;
- }
+ if (unlikely(!vq->access_ok)) {
+ vhost_user_iotlb_rd_unlock(vq);
+ rte_rwlock_read_unlock(&vq->access_lock);
+
+ virtio_dev_vring_translate(dev, vq);
+ goto out_no_unlock;
+ }
/*
* Construct a RARP broadcast packet, and inject it to the "pkts"
@@ -3646,6 +3669,7 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
if (unlikely(rarp_mbuf != NULL))
count += 1;
+out_no_unlock:
return count;
}
@@ -4196,11 +4220,14 @@ rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id,
vhost_user_iotlb_rd_lock(vq);
- if (unlikely(vq->access_ok == 0))
- if (unlikely(vring_translate(dev, vq) < 0)) {
- count = 0;
- goto out;
- }
+ if (unlikely(vq->access_ok == 0)) {
+ vhost_user_iotlb_rd_unlock(vq);
+ rte_rwlock_read_unlock(&vq->access_lock);
+
+ virtio_dev_vring_translate(dev, vq);
+ count = 0;
+ goto out_no_unlock;
+ }
/*
* Construct a RARP broadcast packet, and inject it to the "pkts"
@@ -4266,5 +4293,6 @@ rte_vhost_async_try_dequeue_burst(int vid, uint16_t
queue_id,
if (unlikely(rarp_mbuf != NULL))
count += 1;
+out_no_unlock:
return count;
}
Series applied to next-virtio/for-next-net
Thanks,
Maxime
RE: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] > Sent: Tuesday, 12 December 2023 11.38 > > Replace pktmbuf pool with mempool, this allows increase in MOPS > especially in lower buffer size. Using Mempool, allows to reduce > the extra CPU cycles. I get the point of this change: It tests the performance of copying raw memory objects using respectively rte_memcpy and DMA, without the mbuf indirection overhead. However, I still consider the existing test relevant: The performance of copying packets using respectively rte_memcpy and DMA. So, instead of replacing mbufs with mempool objects, please add new test variants using mempool objects.
Re: [PATCH 1/3] testpmd: replace EAL logtype with fprintf
With belows to changes,
Acked-by: Huisong Li
在 2023/12/12 1:23, Stephen Hemminger 写道:
Testpmd is misusing EAL logtype for its own errors.
Since the code directly calls fprintf in other places,
change to use that everywhere. This has the added benefit
of not having testpmd output clutter up syslog().
Signed-off-by: Stephen Hemminger
---
app/test-pmd/testpmd.c | 33 +++--
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 9e4e99e53b9a..aa350d61e451 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3413,8 +3413,7 @@ stop_port(portid_t pid)
ret = eth_dev_stop_mp(pi);
if (ret != 0) {
- RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for port
%u\n",
- pi);
+ fprintf(stderr, "rte_eth_dev_stop failed for port
%u\n", pi);
/* Allow to retry stopping the port. */
port->port_status = RTE_PORT_STARTED;
continue;
@@ -3812,23 +3811,20 @@ pmd_test_exit(void)
if (hot_plug) {
ret = rte_dev_event_monitor_stop();
if (ret) {
- RTE_LOG(ERR, EAL,
- "fail to stop device event monitor.");
+ fprintf(stderr, "fail to stop device event monitor.");
return;
}
ret = rte_dev_event_callback_unregister(NULL,
dev_event_callback, NULL);
if (ret < 0) {
- RTE_LOG(ERR, EAL,
- "fail to unregister device event callback.\n");
+ fprintf(stderr, "fail to unregister device event
callback.\n");
return;
}
ret = rte_dev_hotplug_handle_disable();
if (ret) {
- RTE_LOG(ERR, EAL,
- "fail to disable hotplug handling.\n");
+ fprintf(stderr, "fail to disable hotplug handling.\n");
return;
}
}
@@ -4062,12 +4058,10 @@ dev_event_callback(const char *device_name, enum
rte_dev_event_type type,
switch (type) {
case RTE_DEV_EVENT_REMOVE:
- RTE_LOG(DEBUG, EAL, "The device: %s has been removed!\n",
- device_name);
+ fprintf(stderr, "The device: %s has been removed!\n",
device_name);
ret = rte_eth_dev_get_port_by_name(device_name, &port_id);
if (ret) {
- RTE_LOG(ERR, EAL, "can not get port by device %s!\n",
- device_name);
+ fprintf(stderr, "Can not get port by device %s!\n",
device_name);
return;
}
/*
@@ -4081,12 +4075,10 @@ dev_event_callback(const char *device_name, enum
rte_dev_event_type type,
*/
if (rte_eal_alarm_set(10,
rmv_port_callback, (void *)(intptr_t)port_id))
- RTE_LOG(ERR, EAL,
- "Could not set up deferred device removal\n");
+ fprintf(stderr, "Could not set up deferred device
removal\n");
break;
case RTE_DEV_EVENT_ADD:
- RTE_LOG(ERR, EAL, "The device: %s has been added!\n",
- device_name);
+ fprintf(stderr, "The device: %s has been added!\n",
device_name);
/* TODO: After finish kernel driver binding,
* begin to attach port.
*/
@@ -4632,23 +4624,20 @@ main(int argc, char** argv)
if (hot_plug) {
ret = rte_dev_hotplug_handle_enable();
if (ret) {
- RTE_LOG(ERR, EAL,
- "fail to enable hotplug handling.");
+ fprintf(stderr, "fail to enable hotplug handling.");
return -1;
}
ret = rte_dev_event_monitor_start();
if (ret) {
- RTE_LOG(ERR, EAL,
- "fail to start device event monitoring.");
+ fprintf(stderr, "fail to start device event
monitoring.");
return -1;
}
ret = rte_dev_event_callback_register(NULL,
dev_event_callback, NULL);
if (ret) {
- RTE_LOG(ERR, EAL,
- "fail to register device event callback\n");
+ fprintf(stderr, "fail to register device event
callback\n");
two space is here.
Can you fix it by the way?
return -1;
}
}
Re: [PATCH 2/3] examples/l2fwd-keepalive: don't use EAL logtype
Acked-by: Huisong Li
在 2023/12/12 1:23, Stephen Hemminger 写道:
EAL logtype should be reserved for EAL library.
This example is already using printf() so just print
errors to stderr.
Signed-off-by: Stephen Hemminger
---
examples/l2fwd-keepalive/shm.c | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/examples/l2fwd-keepalive/shm.c b/examples/l2fwd-keepalive/shm.c
index 7c7a9ea8ea3c..cbeeb511ef07 100644
--- a/examples/l2fwd-keepalive/shm.c
+++ b/examples/l2fwd-keepalive/shm.c
@@ -5,7 +5,6 @@
#include
#include
-#include
#include
#include "shm.h"
@@ -28,28 +27,23 @@ struct rte_keepalive_shm *rte_keepalive_shm_create(void)
fd = shm_open(RTE_KEEPALIVE_SHM_NAME,
O_CREAT | O_TRUNC | O_RDWR, 0666);
if (fd < 0)
- RTE_LOG(INFO, EAL,
- "Failed to open %s as SHM (%s)\n",
- RTE_KEEPALIVE_SHM_NAME,
- strerror(errno));
+ fprintf(stderr, "Failed to open %s as SHM (%s)\n",
+ RTE_KEEPALIVE_SHM_NAME, strerror(errno));
else if (ftruncate(fd, sizeof(struct rte_keepalive_shm)) != 0)
- RTE_LOG(INFO, EAL,
- "Failed to resize SHM (%s)\n", strerror(errno));
+ fprintf(stderr, "Failed to resize SHM (%s)\n", strerror(errno));
else {
ka_shm = (struct rte_keepalive_shm *) mmap(
0, sizeof(struct rte_keepalive_shm),
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
close(fd);
if (ka_shm == MAP_FAILED)
- RTE_LOG(INFO, EAL,
- "Failed to mmap SHM (%s)\n", strerror(errno));
+ fprintf(stderr, "Failed to mmap SHM (%s)\n",
strerror(errno));
else {
memset(ka_shm, 0, sizeof(struct rte_keepalive_shm));
/* Initialize the semaphores for IPC/SHM use */
if (sem_init(&ka_shm->core_died, 1, 0) != 0) {
- RTE_LOG(INFO, EAL,
- "Failed to setup SHM semaphore (%s)\n",
+ fprintf(stderr, "Failed to setup SHM semaphore
(%s)\n",
strerror(errno));
munmap(ka_shm,
sizeof(struct rte_keepalive_shm));
@@ -87,7 +81,7 @@ void rte_keepalive_relayed_state(struct rte_keepalive_shm
*shm,
* ka_agent is not active.
*/
if (sem_getvalue(&shm->core_died, &count) == -1) {
- RTE_LOG(INFO, EAL, "Semaphore check failed(%s)\n",
+ fprintf(stderr, "Semaphore check failed(%s)\n",
strerror(errno));
return;
}
@@ -95,8 +89,7 @@ void rte_keepalive_relayed_state(struct rte_keepalive_shm
*shm,
return;
if (sem_post(&shm->core_died) != 0)
- RTE_LOG(INFO, EAL,
- "Failed to increment semaphore (%s)\n",
+ fprintf(stderr, "Failed to increment semaphore (%s)\n",
strerror(errno));
}
}
Re: [PATCH 3/3] examples/vm_power_manager: do not use EAL logtype
Acked-by: Huisong Li
在 2023/12/12 1:23, Stephen Hemminger 写道:
Be consistent for all the error printouts and use fprintf().
The EAL logtype is reserved for internal use by EAL.
Signed-off-by: Stephen Hemminger
---
examples/vm_power_manager/main.c | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index b159291d77ce..c14138202004 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -17,7 +17,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -425,8 +424,7 @@ main(int argc, char **argv)
lcore_id = rte_get_next_lcore(-1, 1, 0);
if (lcore_id == RTE_MAX_LCORE) {
- RTE_LOG(ERR, EAL, "A minimum of three cores are required to run
"
- "application\n");
+ fprintf(stderr, "A minimum of three cores are required to run
application\n");
return 0;
}
printf("Running channel monitor on lcore id %d\n", lcore_id);
@@ -434,16 +432,15 @@ main(int argc, char **argv)
lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
if (lcore_id == RTE_MAX_LCORE) {
- RTE_LOG(ERR, EAL, "A minimum of three cores are required to run
"
- "application\n");
+ fprintf(stderr, "A minimum of three cores are required to run
application\n");
return 0;
}
if (power_manager_init() < 0) {
- printf("Unable to initialize power manager\n");
+ fprintf(stderr, "Unable to initialize power manager\n");
return -1;
}
if (channel_manager_init(CHANNEL_MGR_DEFAULT_HV_PATH) < 0) {
- printf("Unable to initialize channel manager\n");
+ fprintf(stderr, "Unable to initialize channel manager\n");
return -1;
}
RE: [RFC] ethdev: introduce entropy calculation
> Subject: [RFC] ethdev: introduce entropy calculation > > When offloading rules with the encap action, the HW may calculate entropy > based on the encap protocol. > Each HW can implement a different algorithm. > > When the application receives packets that should have been encaped by the > HW, but didn't reach this stage yet (for example TCP SYN packets), then when > encap is done in SW, application must apply the same entropy calculation > algorithm. > > Using the new API application can request the PMD to calculate the value as if > the packet passed in the HW. > > Signed-off-by: Ori Kam Acked-by: Dariusz Sosnowski Best regards, Dariusz Sosnowski
DPDK 20.11.10 released
Hi all, Here is a new stable release: https://fast.dpdk.org/rel/dpdk-20.11.10.tar.xz The git tree is at: https://dpdk.org/browse/dpdk-stable/?h=20.11 This is the final release of the 20.11 LTS branch, and it is now EOL. So long, and thanks for all the packets. Luca Boccassi --- VERSION|2 +- app/proc-info/main.c | 42 +- app/test-bbdev/test-bbdev.py | 29 +- app/test-bbdev/test_bbdev.c|3 +- app/test-pipeline/main.c | 14 + app/test-pipeline/main.h |2 + app/test-pipeline/pipeline_acl.c |6 +- app/test-pipeline/pipeline_hash.c | 106 +- app/test-pipeline/pipeline_lpm.c |6 +- app/test-pipeline/pipeline_lpm_ipv6.c |6 +- app/test-pipeline/pipeline_stub.c |6 +- app/test-pipeline/runtime.c| 126 +- app/test-pmd/cmdline.c | 121 +- app/test-pmd/testpmd.c | 25 +- app/test/test_cryptodev.c |5 + app/test/test_cryptodev_asym.c |4 +- app/test/test_cryptodev_mixed_test_vectors.h |8 +- app/test/test_event_crypto_adapter.c |7 +- app/test/test_hash_readwrite.c |2 +- app/test/test_link_bonding.c |5 +- app/test/test_link_bonding_mode4.c |3 +- app/test/test_link_bonding_rssconf.c |2 +- doc/guides/nics/hns3.rst |1 - doc/guides/nics/i40e.rst | 15 +- doc/guides/nics/ice.rst| 11 +- doc/guides/nics/ixgbe.rst |2 - doc/guides/nics/virtio.rst | 12 + doc/guides/platform/octeontx2.rst |3 + .../generic_segmentation_offload_lib.rst |2 +- doc/guides/prog_guide/rte_security.rst | 65 +- doc/guides/rel_notes/release_20_11.rst | 221 ++ doc/guides/sample_app_ug/vdpa.rst |3 +- drivers/bus/dpaa/base/qbman/qman.c |5 +- drivers/bus/pci/pci_common.c |2 +- drivers/common/mlx5/linux/mlx5_common_os.c |5 +- drivers/crypto/aesni_gcm/meson.build |7 +- drivers/crypto/aesni_mb/meson.build|7 +- drivers/crypto/kasumi/meson.build |7 +- drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 21 +- drivers/crypto/snow3g/meson.build |7 +- drivers/crypto/zuc/meson.build |7 +- drivers/event/dlb2/dlb2.c |1 + drivers/event/dlb2/dlb2_selftest.c |4 +- drivers/event/dlb2/pf/dlb2_main.c | 27 + drivers/event/dpaa/dpaa_eventdev.c |6 +- drivers/event/dpaa2/dpaa2_eventdev.c |6 +- drivers/event/dsw/dsw_evdev.c |2 +- drivers/event/octeontx/ssovf_evdev.c |2 +- drivers/event/opdl/opdl_evdev.c|2 +- drivers/event/skeleton/skeleton_eventdev.c |6 +- drivers/event/sw/sw_evdev.c|2 +- drivers/event/sw/sw_evdev_scheduler.c | 19 +- drivers/net/bonding/rte_eth_bond_8023ad.c |7 +- drivers/net/bonding/rte_eth_bond_8023ad.h |9 +- drivers/net/bonding/rte_eth_bond_pmd.c |4 + drivers/net/enic/enic_main.c |2 +- drivers/net/hns3/hns3_cmd.c| 42 +- drivers/net/hns3/hns3_cmd.h|1 + drivers/net/hns3/hns3_dcb.c|2 +- drivers/net/hns3/hns3_ethdev.c | 139 +- drivers/net/hns3/hns3_ethdev.h |5 + drivers/net/hns3/hns3_ethdev_vf.c | 48 +- drivers/net/hns3/hns3_fdir.c |2 +- drivers/net/hns3/hns3_flow.c |2 +- drivers/net/hns3/hns3_intr.c |4 +- drivers/net/hns3/hns3_mbx.c| 81 +- drivers/net/hns3/hns3_mbx.h| 10 - drivers/net/hns3/hns3_rss.c|8 +- drivers/net/hns3/hns3_rss.h|4 - drivers/net/hns3/hns3_rxtx.c | 11 +- drivers/net/hns3/hns3_rxtx_vec.c |5 + drivers/net/hns3/hns3_rxtx_vec_neon.h | 80 +- drivers/net/hns3/hns3_rxtx_vec_sve.c |5 + drivers/net/hns3/hns3_stats.c | 10 +- drivers/net/i40e/i40e_ethdev.c | 16 +- drivers/net/i40e/i40e_rxtx.c |6 + dri
Re: [PATCH 24.03 v2 2/9] eventdev: increase flexibility of all-types flag
On Tue, Dec 12, 2023 at 4:58 PM Bruce Richardson wrote: > > On Thu, Nov 23, 2023 at 09:37:58AM +0530, Jerin Jacob wrote: > > On Tue, Nov 21, 2023 at 5:25 PM Bruce Richardson > > wrote: > > > > > > Rather than requiring that any device advertising the > > > RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES flag support all of atomic, ordered > > > and parallel scheduling, we can redefine the field so that it basically > > > means that you don't need to specify the queue scheduling type at config > > > time. Instead all types of supported events can be sent to all queues. > > > > > > Suggested-by: Mattias Rönnblom > > > Signed-off-by: Bruce Richardson > > > --- > > > lib/eventdev/rte_eventdev.h | 15 --- > > > 1 file changed, 12 insertions(+), 3 deletions(-) > > > > > > diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h > > > index d48957362c..1c5043de26 100644 > > > --- a/lib/eventdev/rte_eventdev.h > > > +++ b/lib/eventdev/rte_eventdev.h > > > @@ -250,11 +250,20 @@ struct rte_event; > > > * @see rte_event_dequeue_burst() > > > */ > > > #define RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES (1ULL << 3) > > > -/**< Event device is capable of enqueuing events of any type to any > > > queue. > > > +/**< Event device is capable of accepting enqueued events, of any type > > > + * advertised as supported by the device, to all destination queues. > > > + * > > > + * When this capability is set, the "schedule_type" field of the > > > + * rte_event_queue_conf structure is ignored when a queue is being > > > configured. > > > > can we also add something like below or so to above line > > > > rte_event_queue_conf structure is ignored when a queue is being > > configured instead rte_event::sched_type > > shall be used. > > > Preparing v3 now and including this doc change. However, I'm also wondering > about the correct behaviour when this flag is not set. When the flag is not > set, the events enqueued should match the event type of the queue, but do > we need to enforce this, or should we? > > Couple of options: > 1. Actually enforce this, and state that it is an error to enqueue events >with another scheduling type. > 2. Explicitly not enforce this, and just state instead that the sched_type >of events will be ignored. > > Personally, I'd tend very much towards #2. because: > * it's easier for the app, as they can ignore the sched_type field through > the pipeline if they want, relying on each queues type to do the right > thing. This could be especially useful if they have fallback mechanisms > to e.g. configure a queue as atomic if reordered is not supported etc. > The downside is that for portable applications the sched type > should always be set anyway, but the app doesn't lose anything in this > case with #2 over #1. > > * It's easier and more performant for the drivers, since it's one less > check that should be performed on enqueue. The driver can just blindly > override the sched_type provided with the queue config version. > > I actually think an extension of #2 would also be nice to have for > portability, whereby an app could explicitly configure a queue to only have > a scheduling type - event if it's all-types-capable - and thereafter never > have to set the sched_type field on events. The drivers would always > remember the queue-type and explicitly set that if necessary on enqueue > > Thoughts? HW queues with All-type support will be costly resources, so making a portable program we need to spare 3 queues instead of 1 queue. Considering the difference in eventdev capabilities, I see the most reliable option is end user focus on reusable packet processing stages. Have worker skeleton based on HW device capabilities, as there are enough HW differences across event devices. That is the kind of theme followed in testeventdev. > /Bruce > > PS: Going to send v3 now anyway, based on feedback thus far. If we get > quick consensus on above, I can roll it into a v4, otherwise we can look to Let's go with v3 now. Later we can discuss more on this latter. > clarify that situation in a separate patch later.
Re: [PATCH] cryptodev: convert to dynamic logtype
On Mon, Dec 11, 2023 at 9:18 PM Stephen Hemminger wrote: > > The cryptodev logs are all referenced via rte_crytpodev.h > so make it dynamic there. > > Signed-off-by: Stephen Hemminger Applied, thanks. -- David Marchand
DPDK Release Status Meeting 2023-12-07
Release status meeting minutes 2023-12-07 = Agenda: * Release Dates * Subtrees * Roadmaps * LTS * Defects * Opens Participants: * AMD * Debian/Microsoft * Intel * Marvell * Nvidia * Red Hat Release Dates - The following are the current working dates for 23.11: * V1: 12 August 2023 * RC1: 11 October 2023 * RC2: 6 November 2023 * RC3: 13 November 2023 * RC4: 23 November 2023 * Release: 24 November 2023 The following are the current working dates for 24.03: - Proposal deadline (RFC/v1 patches): 22 December 2023/Proposal 29 December - API freeze (-rc1): 5 February 2024 - PMD features freeze (-rc2): 23 February 2024 - Builtin applications features freeze (-rc3): 4 March 2024 - Release: 14 March 2024 Subtrees * next-net on * No direct changes past RC4 * next-net-intel * No updates this week. * next-net-mlx * No updates this week. * Roadmap sent. * next-net-mvl * Starting to merge patches. * Roadmap sent. * next-eventdev * Starting to merge patches. * next-baseband * No updates this week. * next-virtio * No updates this week. * next-crypto * No updates this week. * main * New branch mirroring to GitHub to reduce load on git.dpdk.org. * Request for Roadmaps: https://core.dpdk.org/roadmap/ * Merging logging and other cleanups. * Improved Windows support. * Proposal to move v1 date from December 22 to 29 Proposed Schedule for 2023 -- See http://core.dpdk.org/roadmap/#dates LTS --- * 22.11.4 - In progress * 21.11.6 - In progress - backports mainly done * 20.11.10 - In progress - RC1 sent - testing ongoing * 19.11.15 - Will only be updated with CVE and critical fixes. * Distros * Debian 12 contains DPDK v22.11 * Ubuntu 22.04-LTS contains DPDK v21.11 * Ubuntu 23.04 contains DPDK v22.11 Defects --- * Bugzilla links, 'Bugs', added for hosted projects * https://www.dpdk.org/hosted-projects/ DPDK Release Status Meetings The DPDK Release Status Meeting is intended for DPDK Committers to discuss the status of the master tree and sub-trees, and for project managers to track progress or milestone dates. The meeting occurs on every Thursday at 9:30 UTC over Jitsi on https://meet.jit.si/DPDK You don't need an invite to join the meeting but if you want a calendar reminder just send an email to "John McNamara john.mcnam...@intel.com" for the invite.
RE: [v3] net/af_xdp: enable uds-path instead of use_cni
Thank you Maryam updating the document. I have added some comment below. Also what do you think about changing the name of the document file "af_xdp_cni.rst" to "af_xdp_dp.rst" ? Regards, Shibin > -Original Message- > From: Maryam Tahhan > Sent: Monday, December 11, 2023 2:39 PM > To: ferruh.yi...@amd.com; step...@networkplumber.org; > lihuis...@huawei.com; fengcheng...@huawei.com; > liuyongl...@huawei.com; Koikkara Reeny, Shibin > ; Loftus, Ciara > Cc: dev@dpdk.org; Tahhan, Maryam > Subject: [v3] net/af_xdp: enable uds-path instead of use_cni > > With the original 'use_cni' implementation, (using a hardcoded socket rather > than a configurable one), if a single pod is requesting multiple net devices > and these devices are from different pools, then the container attempts to > mount all the netdev UDSes in the pod as /tmp/afxdp.sock. Which means > that at best only 1 netdev will handshake correctly with the AF_XDP DP. This > patch addresses this by making the socket parameter configurable using a > new vdev param called 'uds_path' and removing the previous 'use_cni' > param. > Tested with the AF_XDP DP CNI PR 81, single and multiple interfaces. > > v3: > * Remove `use_cni` vdev argument as it's no longer needed. > * Update incorrect CNI references for the AF_XDP DP in the > documentation. > * Update the documentation to run a simple example with the > AF_XDP DP plugin in K8s. > > v2: > * Rename sock_path to uds_path. > * Update documentation to reflect when CAP_BPF is needed. > * Fix testpmd arguments in the provided example for Pods. > * Use AF_XDP API to update the xskmap entry. > > Signed-off-by: Maryam Tahhan > --- > doc/guides/howto/af_xdp_cni.rst | 334 +++- > drivers/net/af_xdp/rte_eth_af_xdp.c | 76 +++ > 2 files changed, 216 insertions(+), 194 deletions(-) > > diff --git a/doc/guides/howto/af_xdp_cni.rst > b/doc/guides/howto/af_xdp_cni.rst index a1a6d5b99c..b71fef61c7 100644 > --- a/doc/guides/howto/af_xdp_cni.rst > +++ b/doc/guides/howto/af_xdp_cni.rst > @@ -1,71 +1,65 @@ > .. SPDX-License-Identifier: BSD-3-Clause > Copyright(c) 2023 Intel Corporation. > > -Using a CNI with the AF_XDP driver > -== > +Using the AF_XDP Device Plugin with the AF_XDP driver > +== > > Introduction > > > -CNI, the Container Network Interface, is a technology for configuring - > container network interfaces -and which can be used to setup Kubernetes > networking. > +The `AF_XDP Device Plugin for Kubernetes`_ is a project that provisions > +and advertises interfaces (that can be used with AF_XDP) to Kubernetes. > +The project also includes a `CNI`_. > + > AF_XDP is a Linux socket Address Family that enables an XDP program to > redirect packets to a memory buffer in userspace. > > -This document explains how to enable the `AF_XDP Plugin for Kubernetes`_ > within -a DPDK application using the :doc:`../nics/af_xdp` to connect and use > these technologies. > - > -.. _AF_XDP Plugin for Kubernetes: https://github.com/intel/afxdp-plugins- > for-kubernetes > +This document explains how to use the `AF_XDP Device Plugin for > +Kubernetes`_ with a DPDK :doc:`../nics/af_xdp` based application running in > a Pod. > > +.. _AF_XDP Device Plugin for Kubernetes: > +https://github.com/intel/afxdp-plugins-for-kubernetes > +.. _CNI: https://github.com/containernetworking/cni > > Background > -- > > -The standard :doc:`../nics/af_xdp` initialization process involves loading an > eBPF program -onto the kernel netdev to be used by the PMD. > -This operation requires root or escalated Linux privileges -and thus prevents > the PMD from working in an unprivileged container. > -The AF_XDP CNI plugin handles this situation -by providing a device plugin > that performs the program loading. > - > -At a technical level the CNI opens a Unix Domain Socket and listens for a > client -to make requests over that socket. > -A DPDK application acting as a client connects and initiates a configuration > "handshake". > -The client then receives a file descriptor which points to the XSKMAP - > associated with the loaded eBPF program. > -The XSKMAP is a BPF map of AF_XDP sockets (XSK). > -The client can then proceed with creating an AF_XDP socket -and inserting > that socket into the XSKMAP pointed to by the descriptor. > - > -The EAL vdev argument ``use_cni`` is used to indicate that the user wishes - > to run the PMD in unprivileged mode and to receive the XSKMAP file > descriptor -from the CNI. > -When this flag is set, > -the ``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` libbpf flag -should be > used when creating the socket -to instruct libbpf not to load the default > libbpf program on the netdev. > -Instead the loading is handled by the CNI. > +The standard :doc:`../nics/af_xdp` initialization process involves > +loading an eBPF program onto the kernel netdev to be used by the PMD
[PATCH v1] net/tap: fix buffer overflow for ptypes list
Incorrect ptypes list causes buffer overflow for Address Sanitizer
run and a tap device. The last element in the ptypes lists to be
to "RTE_PTYPE_UNKNOWN" for rte_eth_dev_get_supported_ptypes().
In rte_eth_dev_get_supported_ptypes(), the loop iterates until it
finds "RTE_PTYPE_UNKNOWN" to detect last element of the ptypes array.
Fix tap_dev_supported_ptypes_get() method to return correct lists.
Fixes: 0849ac3b6122 ("net/tap: add packet type management")
Cc: sta...@dpdk.org
Signed-off-by: Sivaramakrishnan Venkat
---
drivers/net/tap/rte_eth_tap.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index b41fa971cb..3fa03cdbee 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -1803,6 +1803,7 @@ tap_dev_supported_ptypes_get(struct rte_eth_dev *dev
__rte_unused)
RTE_PTYPE_L4_UDP,
RTE_PTYPE_L4_TCP,
RTE_PTYPE_L4_SCTP,
+ RTE_PTYPE_UNKNOWN
};
return ptypes;
--
2.25.1
Re: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
On 12/12/2023 11:40 AM, Morten Brørup wrote: >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] >> Sent: Tuesday, 12 December 2023 11.38 >> >> Replace pktmbuf pool with mempool, this allows increase in MOPS >> especially in lower buffer size. Using Mempool, allows to reduce >> the extra CPU cycles. > > I get the point of this change: It tests the performance of copying raw > memory objects using respectively rte_memcpy and DMA, without the mbuf > indirection overhead. > > However, I still consider the existing test relevant: The performance of > copying packets using respectively rte_memcpy and DMA. > This is DMA performance test application and packets are not used, using pktmbuf just introduces overhead to the main focus of the application. I am not sure if pktmuf selected intentionally for this test application, but I assume it is there because of historical reasons. > So, instead of replacing mbufs with mempool objects, please add new test > variants using mempool objects. >
Re: [RFC v2 09/14] rcu: introduce a logging helper
On Fri, Dec 8, 2023 at 10:27 PM Tyler Retzlaff wrote: > > On Fri, Dec 08, 2023 at 03:59:43PM +0100, David Marchand wrote: > > Signed-off-by: David Marchand > > --- > > Reviewed-by: Tyler Retzlaff > > > lib/rcu/rte_rcu_qsbr.c | 62 -- > > lib/rcu/rte_rcu_qsbr.h | 1 + > > 2 files changed, 24 insertions(+), 39 deletions(-) > > > > diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c > > index 41a44be4b9..5b6530788a 100644 > > --- a/lib/rcu/rte_rcu_qsbr.c > > +++ b/lib/rcu/rte_rcu_qsbr.c > > @@ -19,6 +19,9 @@ > > #include "rte_rcu_qsbr.h" > > #include "rcu_qsbr_pvt.h" > > > > +#define RCU_LOG(level, fmt, args...) \ > > + RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args) > > + > > Since you are looking in the area for all the versions of gcc/clang we > use able to support the non-standard __VA_ARGS__ that discard the comma? I suspect there is some typo (maybe s/for all/are all/ ?). Can you please clarify? > > I know that some versions of gcc do and if it does I would like to move > to using __VA_ARGS__ instead of args so we can use the same thing with > msvc. If the request is to translate the ## args stuff to __VA_ARGS__, I would prefer this is done in a separate series and not to mix with this already huge series. -- David Marchand
RE: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
+TO: Bruce, please stop me if I'm completely off track here. > From: Ferruh Yigit [mailto:ferruh.yi...@amd.com] > Sent: Tuesday, 12 December 2023 15.38 > > On 12/12/2023 11:40 AM, Morten Brørup wrote: > >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] > >> Sent: Tuesday, 12 December 2023 11.38 > >> > >> Replace pktmbuf pool with mempool, this allows increase in MOPS > >> especially in lower buffer size. Using Mempool, allows to reduce > >> the extra CPU cycles. > > > > I get the point of this change: It tests the performance of copying > raw memory objects using respectively rte_memcpy and DMA, without the > mbuf indirection overhead. > > > > However, I still consider the existing test relevant: The performance > of copying packets using respectively rte_memcpy and DMA. > > > > This is DMA performance test application and packets are not used, > using > pktmbuf just introduces overhead to the main focus of the application. > > I am not sure if pktmuf selected intentionally for this test > application, but I assume it is there because of historical reasons. I think pktmbuf was selected intentionally, to provide more accurate results for application developers trying to determine when to use rte_memcpy and when to use DMA. Much like the "copy breakpoint" in Linux Ethernet drivers is used to determine which code path to take for each received packet. Most applications will be working with pktmbufs, so these applications will also experience the pktmbuf overhead. Performance testing with the same overhead as the application will be better to help the application developer determine when to use rte_memcpy and when to use DMA when working with pktmbufs. (Furthermore, for the pktmbuf tests, I wonder if copying performance could also depend on IOVA mode and RTE_IOVA_IN_MBUF.) Nonetheless, there may also be use cases where raw mempool objects are being copied by rte_memcpy or DMA, so adding tests for these use cases are useful. @Bruce, you were also deeply involved in the DMA library, and probably have more up-to-date practical experience with it. Am I right that pktmbuf overhead in these tests provides more "real life use"-like results? Or am I completely off track with my thinking here, i.e. the pktmbuf overhead is only noise? > > > > So, instead of replacing mbufs with mempool objects, please add new > test variants using mempool objects. > >
Re: [PATCH v1] net/tap: fix buffer overflow for ptypes list
On 12/12/2023 2:37 PM, Sivaramakrishnan Venkat wrote:
> Incorrect ptypes list causes buffer overflow for Address Sanitizer
> run and a tap device. The last element in the ptypes lists to be
> to "RTE_PTYPE_UNKNOWN" for rte_eth_dev_get_supported_ptypes().
> In rte_eth_dev_get_supported_ptypes(), the loop iterates until it
> finds "RTE_PTYPE_UNKNOWN" to detect last element of the ptypes array.
> Fix tap_dev_supported_ptypes_get() method to return correct lists.
>
> Fixes: 0849ac3b6122 ("net/tap: add packet type management")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Sivaramakrishnan Venkat
> ---
> drivers/net/tap/rte_eth_tap.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index b41fa971cb..3fa03cdbee 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -1803,6 +1803,7 @@ tap_dev_supported_ptypes_get(struct rte_eth_dev *dev
> __rte_unused)
> RTE_PTYPE_L4_UDP,
> RTE_PTYPE_L4_TCP,
> RTE_PTYPE_L4_SCTP,
> + RTE_PTYPE_UNKNOWN
> };
>
> return ptypes;
Hi Sivaramakrishnan,
Patch looks good to me, thanks.
But there are multiple drivers have same problem, at least following
ones [1] (maintainers of them cc'ed).
Can you please send a new version that fixes all?
Also as we have already missed multiple ones, perhaps we can add a unit
test to 'app/test/test_ethdev_api.c' for this API.
I think there is no way to make sure if 'RTE_PTYPE_UNKNOWN' is added
(unless you find a way), but we can call the
'rte_eth_dev_get_supported_ptypes()' API and detect any crash in advance.
Can you add this kind of unit test as part of next patch?
[1]
mvneta
mvpp2
pfe
dpaa
nfp
Re: [PATCH 0/7] support link auto negotiation
On 12/11/2023 3:08 AM, Chaoyong He wrote: > This patch series add the support of link auto negotiation feature, > including speed and FEC mode. > > Zerun Fu (7): > net/nfp: set a new parameter to hwinfo > net/nfp: support getting speed capability > net/nfp: support setting port speed > net/nfp: modify the link update function > net/nfp: support getting FEC capability > net/nfp: support getting FEC mode > net/nfp: support setting FEC mode > Series applied to dpdk-next-net/main, thanks.
[PATCH v1] crypto/ipsec_mb: unified IPsec MB interface
Currently IPsec MB provides both the JOB API and direct API.
AESNI_MB PMD is using the JOB API codepath while ZUC, KASUMI, SNOW3G,
CHACHA20_POLY1305 and AESNI_GCM are using the direct API.
Instead of using the direct API for these PMDs, they should now make
use of the JOB API codepath. This would remove all use of the IPsec MB
direct API for these PMDs.
Signed-off-by: Brian Dooley
---
drivers/crypto/ipsec_mb/pmd_aesni_gcm.c | 758 +-
drivers/crypto/ipsec_mb/pmd_aesni_gcm_priv.h | 21 -
drivers/crypto/ipsec_mb/pmd_aesni_mb.c| 6 +-
drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 13 +
drivers/crypto/ipsec_mb/pmd_chacha_poly.c | 335 +---
.../crypto/ipsec_mb/pmd_chacha_poly_priv.h| 19 -
drivers/crypto/ipsec_mb/pmd_kasumi.c | 404 +-
drivers/crypto/ipsec_mb/pmd_kasumi_priv.h | 12 -
drivers/crypto/ipsec_mb/pmd_snow3g.c | 540 +
drivers/crypto/ipsec_mb/pmd_snow3g_priv.h | 13 -
drivers/crypto/ipsec_mb/pmd_zuc.c | 342 +---
drivers/crypto/ipsec_mb/pmd_zuc_priv.h| 11 -
12 files changed, 38 insertions(+), 2436 deletions(-)
diff --git a/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
b/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
index 8d40bd9169..44609333ee 100644
--- a/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
+++ b/drivers/crypto/ipsec_mb/pmd_aesni_gcm.c
@@ -3,753 +3,7 @@
*/
#include "pmd_aesni_gcm_priv.h"
-
-static void
-aesni_gcm_set_ops(struct aesni_gcm_ops *ops, IMB_MGR *mb_mgr)
-{
- /* Set 128 bit function pointers. */
- ops[GCM_KEY_128].pre = mb_mgr->gcm128_pre;
- ops[GCM_KEY_128].init = mb_mgr->gcm128_init;
-
- ops[GCM_KEY_128].enc = mb_mgr->gcm128_enc;
- ops[GCM_KEY_128].update_enc = mb_mgr->gcm128_enc_update;
- ops[GCM_KEY_128].finalize_enc = mb_mgr->gcm128_enc_finalize;
-
- ops[GCM_KEY_128].dec = mb_mgr->gcm128_dec;
- ops[GCM_KEY_128].update_dec = mb_mgr->gcm128_dec_update;
- ops[GCM_KEY_128].finalize_dec = mb_mgr->gcm128_dec_finalize;
-
- ops[GCM_KEY_128].gmac_init = mb_mgr->gmac128_init;
- ops[GCM_KEY_128].gmac_update = mb_mgr->gmac128_update;
- ops[GCM_KEY_128].gmac_finalize = mb_mgr->gmac128_finalize;
-
- /* Set 192 bit function pointers. */
- ops[GCM_KEY_192].pre = mb_mgr->gcm192_pre;
- ops[GCM_KEY_192].init = mb_mgr->gcm192_init;
-
- ops[GCM_KEY_192].enc = mb_mgr->gcm192_enc;
- ops[GCM_KEY_192].update_enc = mb_mgr->gcm192_enc_update;
- ops[GCM_KEY_192].finalize_enc = mb_mgr->gcm192_enc_finalize;
-
- ops[GCM_KEY_192].dec = mb_mgr->gcm192_dec;
- ops[GCM_KEY_192].update_dec = mb_mgr->gcm192_dec_update;
- ops[GCM_KEY_192].finalize_dec = mb_mgr->gcm192_dec_finalize;
-
- ops[GCM_KEY_192].gmac_init = mb_mgr->gmac192_init;
- ops[GCM_KEY_192].gmac_update = mb_mgr->gmac192_update;
- ops[GCM_KEY_192].gmac_finalize = mb_mgr->gmac192_finalize;
-
- /* Set 256 bit function pointers. */
- ops[GCM_KEY_256].pre = mb_mgr->gcm256_pre;
- ops[GCM_KEY_256].init = mb_mgr->gcm256_init;
-
- ops[GCM_KEY_256].enc = mb_mgr->gcm256_enc;
- ops[GCM_KEY_256].update_enc = mb_mgr->gcm256_enc_update;
- ops[GCM_KEY_256].finalize_enc = mb_mgr->gcm256_enc_finalize;
-
- ops[GCM_KEY_256].dec = mb_mgr->gcm256_dec;
- ops[GCM_KEY_256].update_dec = mb_mgr->gcm256_dec_update;
- ops[GCM_KEY_256].finalize_dec = mb_mgr->gcm256_dec_finalize;
-
- ops[GCM_KEY_256].gmac_init = mb_mgr->gmac256_init;
- ops[GCM_KEY_256].gmac_update = mb_mgr->gmac256_update;
- ops[GCM_KEY_256].gmac_finalize = mb_mgr->gmac256_finalize;
-}
-
-static int
-aesni_gcm_session_configure(IMB_MGR *mb_mgr, void *session,
- const struct rte_crypto_sym_xform *xform)
-{
- struct aesni_gcm_session *sess = session;
- const struct rte_crypto_sym_xform *auth_xform;
- const struct rte_crypto_sym_xform *cipher_xform;
- const struct rte_crypto_sym_xform *aead_xform;
-
- uint8_t key_length;
- const uint8_t *key;
- enum ipsec_mb_operation mode;
- int ret = 0;
-
- ret = ipsec_mb_parse_xform(xform, &mode, &auth_xform,
- &cipher_xform, &aead_xform);
- if (ret)
- return ret;
-
- /**< GCM key type */
-
- sess->op = mode;
-
- switch (sess->op) {
- case IPSEC_MB_OP_HASH_GEN_ONLY:
- case IPSEC_MB_OP_HASH_VERIFY_ONLY:
- /* AES-GMAC
-* auth_xform = xform;
-*/
- if (auth_xform->auth.algo != RTE_CRYPTO_AUTH_AES_GMAC) {
- IPSEC_MB_LOG(ERR,
- "Only AES GMAC is supported as an authentication only algorithm");
- ret = -ENOTSUP;
- goto error_exit;
- }
- /* Set IV parameters */
- sess->iv.offset = auth_xform->auth.iv.offset;
- sess->iv.le
Re: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
On Tue, Dec 12, 2023 at 04:16:20PM +0100, Morten Brørup wrote: > +TO: Bruce, please stop me if I'm completely off track here. > > > From: Ferruh Yigit [mailto:ferruh.yi...@amd.com] Sent: Tuesday, 12 > > December 2023 15.38 > > > > On 12/12/2023 11:40 AM, Morten Brørup wrote: > > >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] Sent: Tuesday, > > >> 12 December 2023 11.38 > > >> > > >> Replace pktmbuf pool with mempool, this allows increase in MOPS > > >> especially in lower buffer size. Using Mempool, allows to reduce the > > >> extra CPU cycles. > > > > > > I get the point of this change: It tests the performance of copying > > raw memory objects using respectively rte_memcpy and DMA, without the > > mbuf indirection overhead. > > > > > > However, I still consider the existing test relevant: The performance > > of copying packets using respectively rte_memcpy and DMA. > > > > > > > This is DMA performance test application and packets are not used, > > using pktmbuf just introduces overhead to the main focus of the > > application. > > > > I am not sure if pktmuf selected intentionally for this test > > application, but I assume it is there because of historical reasons. > > I think pktmbuf was selected intentionally, to provide more accurate > results for application developers trying to determine when to use > rte_memcpy and when to use DMA. Much like the "copy breakpoint" in Linux > Ethernet drivers is used to determine which code path to take for each > received packet. > > Most applications will be working with pktmbufs, so these applications > will also experience the pktmbuf overhead. Performance testing with the > same overhead as the application will be better to help the application > developer determine when to use rte_memcpy and when to use DMA when > working with pktmbufs. > > (Furthermore, for the pktmbuf tests, I wonder if copying performance > could also depend on IOVA mode and RTE_IOVA_IN_MBUF.) > > Nonetheless, there may also be use cases where raw mempool objects are > being copied by rte_memcpy or DMA, so adding tests for these use cases > are useful. > > > @Bruce, you were also deeply involved in the DMA library, and probably > have more up-to-date practical experience with it. Am I right that > pktmbuf overhead in these tests provides more "real life use"-like > results? Or am I completely off track with my thinking here, i.e. the > pktmbuf overhead is only noise? > I'm actually not that familiar with the dma-test application, so can't comment on the specific overhead involved here. In the general case, if we are just talking about the overhead of dereferencing the mbufs then I would expect the overhead to be negligible. However, if we are looking to include the cost of allocation and freeing of buffers, I'd try to avoid that as it is a cost that would have to be paid for both SW copies and HW copies, so should not count when calculating offload cost. /Bruce
[PATCH] cryptodev: remove unused extern
The variable rte_cyptodev_names is unused and misspelled.
Fixes: c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented")
Signed-off-by: Stephen Hemminger
---
lib/cryptodev/rte_cryptodev.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index aaeaf294e6bb..59c7d69da5cc 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -26,8 +26,6 @@ extern "C" {
#include "rte_cryptodev_trace_fp.h"
-extern const char **rte_cyptodev_names;
-
/* Logging Macros */
#define CDEV_LOG_ERR(...) \
--
2.42.0
[PATCH] crytodev: make logtype internal
The logtype does not need to be exported as API.
Fixes: be618b81545e ("cryptodev: convert to dynamic logtype")
Signed-off-by: Stephen Hemminger
---
lib/cryptodev/version.map | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map
index 54360a5da538..bde369eb27a6 100644
--- a/lib/cryptodev/version.map
+++ b/lib/cryptodev/version.map
@@ -44,7 +44,6 @@ DPDK_24 {
rte_cryptodev_get_sec_ctx;
rte_cryptodev_info_get;
rte_cryptodev_is_valid_dev;
- rte_cryptodev_logtype;
rte_cryptodev_name_get;
rte_cryptodev_queue_pair_count;
rte_cryptodev_queue_pair_setup;
@@ -91,6 +90,7 @@ INTERNAL {
cryptodev_fp_ops_reset;
cryptodev_fp_ops_set;
+ rte_cryptodev_logtype;
rte_cryptodev_allocate_driver;
rte_cryptodev_pmd_allocate;
rte_cryptodev_pmd_callback_process;
--
2.42.0
[PATCH v2] eventdev: replace RTE_LOGTYPE_EVENTDEV with a dynamic type
With a little setup in eventdev_pmd.h the eventdev drivers
and API can be converted to dynamic log type.
Signed-off-by: Stephen Hemminger
---
v2 - logtpe can be internal
lib/eventdev/eventdev_pmd.h | 3 +++
lib/eventdev/rte_eventdev.c | 2 ++
lib/eventdev/version.map| 1 +
lib/log/log.c | 1 -
lib/log/rte_log.h | 2 +-
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 30bd90085c44..52dc1a1d79fb 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -31,6 +31,9 @@ extern "C" {
#include "event_timer_adapter_pmd.h"
#include "rte_eventdev.h"
+extern int rte_event_logtype;
+#define RTE_LOGTYPE_EVENTDEV rte_event_logtype
+
/* Logging Macros */
#define RTE_EDEV_LOG_ERR(...) \
RTE_LOG(ERR, EVENTDEV, \
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 0ca32d672175..10ea7f626e66 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -28,6 +28,8 @@
#include "eventdev_pmd.h"
#include "eventdev_trace.h"
+RTE_LOG_REGISTER_DEFAULT(rte_event_logtype, INFO);
+
static struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS];
struct rte_eventdev *rte_eventdevs = rte_event_devices;
diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index 3d5c6c2b835c..520b190bb84c 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -155,6 +155,7 @@ INTERNAL {
event_dev_fp_ops_reset;
event_dev_fp_ops_set;
event_dev_probing_finish;
+ rte_event_logtype;
rte_event_pmd_allocate;
rte_event_pmd_get_named_dev;
rte_event_pmd_is_valid_dev;
diff --git a/lib/log/log.c b/lib/log/log.c
index ab06132a98a1..641b4884aad2 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -356,7 +356,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PORT, "lib.port"},
{RTE_LOGTYPE_TABLE, "lib.table"},
{RTE_LOGTYPE_PIPELINE, "lib.pipeline"},
- {RTE_LOGTYPE_EVENTDEV, "lib.eventdev"},
{RTE_LOGTYPE_USER1, "user1"},
{RTE_LOGTYPE_USER2, "user2"},
{RTE_LOGTYPE_USER3, "user3"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 3394746103d4..b955adff7bac 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -45,7 +45,7 @@ extern "C" {
/* was RTE_LOGTYPE_MBUF */
/* was RTE_LOGTYPE_CRYPTODEV */
/* was RTE_LOGTYPE_EFD */
-#define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */
+/* was RTE_LOGTYPE_EVENTDEV */
/* was RTE_LOGTYPE_GSO */
/* these log types can be used in an application */
--
2.42.0
[PATCH v2 1/1] app/graph: generate cmdline boilerplate
From: Sunil Kumar Kori
Use the dpdk-cmdline-gen script to autogenerate all the boilerplate
structs and defines for the commandline part of the application.
Signed-off-by: Sunil Kumar Kori
Acked-by: Bruce Richardson
---
v1..v2:
- Rebase and remove Depends-On: tag as dependent series is applied.
app/graph/cli.c | 27 ---
app/graph/commands.list | 32
app/graph/ethdev.c| 288 +-
app/graph/ethdev.h| 9 -
app/graph/ethdev_priv.h | 63 ---
app/graph/ethdev_rx.c | 67 +--
app/graph/ethdev_rx.h | 2 -
app/graph/ethdev_rx_priv.h| 16 --
app/graph/examples/l3fwd.cli | 12 +-
app/graph/examples/l3fwd_pcap.cli | 12 +-
app/graph/graph.c | 131 ++
app/graph/graph.h | 5 -
app/graph/graph_priv.h| 35
app/graph/ip4_route.c | 86 ++---
app/graph/ip6_route.c | 88 ++---
app/graph/mempool.c | 68 +--
app/graph/mempool.h | 3 -
app/graph/mempool_priv.h | 18 --
app/graph/meson.build | 8 +
app/graph/module_api.h| 1 +
app/graph/neigh.c | 103 ++-
app/graph/neigh.h | 4 -
app/graph/neigh_priv.h| 21 ---
app/graph/route.h | 5 -
app/graph/route_priv.h| 34
25 files changed, 164 insertions(+), 974 deletions(-)
create mode 100644 app/graph/commands.list
diff --git a/app/graph/cli.c b/app/graph/cli.c
index 30b12312d6..0f23aa2586 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -19,33 +19,6 @@
#define CMD_MAX_TOKENS 256
#define MAX_LINE_SIZE 2048
-cmdline_parse_ctx_t modules_ctx[] = {
- (cmdline_parse_inst_t *)&graph_config_cmd_ctx,
- (cmdline_parse_inst_t *)&graph_start_cmd_ctx,
- (cmdline_parse_inst_t *)&graph_stats_cmd_ctx,
- (cmdline_parse_inst_t *)&graph_help_cmd_ctx,
- (cmdline_parse_inst_t *)&mempool_config_cmd_ctx,
- (cmdline_parse_inst_t *)&mempool_help_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_show_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_stats_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_mtu_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_prom_mode_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_ip4_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_rx_cmd_ctx,
- (cmdline_parse_inst_t *)ðdev_rx_help_cmd_ctx,
- (cmdline_parse_inst_t *)&ipv4_lookup_cmd_ctx,
- (cmdline_parse_inst_t *)&ipv4_lookup_help_cmd_ctx,
- (cmdline_parse_inst_t *)&ipv6_lookup_cmd_ctx,
- (cmdline_parse_inst_t *)&ipv6_lookup_help_cmd_ctx,
- (cmdline_parse_inst_t *)&neigh_v4_cmd_ctx,
- (cmdline_parse_inst_t *)&neigh_v6_cmd_ctx,
- (cmdline_parse_inst_t *)&neigh_help_cmd_ctx,
- NULL,
-};
-
static struct cmdline *cl;
static int
diff --git a/app/graph/commands.list b/app/graph/commands.list
new file mode 100644
index 00..1f3f43cdba
--- /dev/null
+++ b/app/graph/commands.list
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2023 Marvell.
+#
+graph usecase coremask mask bsz size tmo ns
model <(rtc,mcd,default)>model_name <(pcap_enable)>capt_ena pcap_ena
<(num_pcap_pkts)>capt_pkts_count num_pcap_pkts <(pcap_file)>capt_file
pcap_file # Command to create graph for given usecase
+graph start # Comanmd to start a graph
+graph stats show# Command to dump graph stats
+help graph # Print help on graph commands
+
+mempool name size buf_sz buffers nb_bufs cache
cache_size numa node # Create mempool
+help mempool# Print help on mempool commands
+
+ethdev dev rxq nb_rxq txq nb_txq mempool #
Create Ethernet device
+ethdev __dev mtu size# Set MTU on Ethernet
device
+ethdev __dev promiscuous <(on,off)>enable# Set promiscuous
mode on Ethernet device
+ethdev __dev show# Command to dump
Ethernet device info
+ethdev __dev stats # Command to dump
Ethernet device stats
+ethdev __dev ip4 addr add ip netmask mask # Set IPv4
address on Ethernet device
+ethdev __dev ip6 addr add ip netmask mask # Set IPv6
address on Ethernet device
+help ethdev # Print help on
ethdev commands
+
+ethdev_rx map port dev queue qid core core_id #
Port-Queue-Core mapping
+help ethdev_rx # Print help on
ethdev_rx commands
+
+ipv4_lookup route add ipv4 ip netmask mask via via_ip # Add
IPv4 route to LPM table
+help ipv4_lookup # Print help on
ipv4_lookup commands
+
+ipv6_lookup route add ipv6 ip netmask mask via via_ip # Add
IPv6 route to LPM6 tabl
Re: [PATCH 1/5] app/test-pm: add multiprocess test
On Tue, 12 Dec 2023 06:25:12 +0200
Artemy Kovalyov wrote:
> +rte_atomic32_t g_count;
> +
> +static int
> +done(const struct rte_mp_msg *msg __rte_unused, const void *arg __rte_unused)
> +{
> + rte_atomic32_dec(&g_count);
> + return 0;
> +}
Local variable, should be static.
Also, assert may not be the ideal way to report test failures.
The preferred way would be to use RTE_TEST_ASSERT() and RTE_TEST_ASSERT_EQUAL()
Re: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
[Public] Sharing a few critical points based on my exposure to the dma-perf application below On Tue, Dec 12, 2023 at 04:16:20PM +0100, Morten Brørup wrote: > +TO: Bruce, please stop me if I'm completely off track here. > > > From: Ferruh Yigit [mailto:ferruh.yi...@amd.com] Sent: Tuesday, 12 > > December 2023 15.38 > > > > On 12/12/2023 11:40 AM, Morten Brørup wrote: > > >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] Sent: Tuesday, > > >> 12 December 2023 11.38 > > >> > > >> Replace pktmbuf pool with mempool, this allows increase in MOPS > > >> especially in lower buffer size. Using Mempool, allows to reduce the > > >> extra CPU cycles. > > > > > > I get the point of this change: It tests the performance of copying > > raw memory objects using respectively rte_memcpy and DMA, without the > > mbuf indirection overhead. > > > > > > However, I still consider the existing test relevant: The performance > > of copying packets using respectively rte_memcpy and DMA. > > > > > > > This is DMA performance test application and packets are not used, > > using pktmbuf just introduces overhead to the main focus of the > > application. > > > > I am not sure if pktmuf selected intentionally for this test > > application, but I assume it is there because of historical reasons. > > I think pktmbuf was selected intentionally, to provide more accurate > results for application developers trying to determine when to use > rte_memcpy and when to use DMA. Much like the "copy breakpoint" in Linux > Ethernet drivers is used to determine which code path to take for each > received packet. yes Ferruh, this is the right understanding. In DPDK example we already have dma-forward application which makes use of pktmbuf payload to copy over new pktmbuf payload area. by moving to mempool, we are actually now focusing on source and destination buffers. This allows to create mempool objects with 2MB and 1GB src-dst areas. Thus allowing to focus src to dst copy. With pktmbuf we were not able to achieve the same. > > Most applications will be working with pktmbufs, so these applications > will also experience the pktmbuf overhead. Performance testing with the > same overhead as the application will be better to help the application > developer determine when to use rte_memcpy and when to use DMA when > working with pktmbufs. Morten thank you for the input, but as shared above DPDK example dma-fwd does justice to such scenario. inline to test-compress-perf & test-crypto-perf IMHO test-dma-perf should focus on getting best values of dma engine and memcpy comparision. > > (Furthermore, for the pktmbuf tests, I wonder if copying performance > could also depend on IOVA mode and RTE_IOVA_IN_MBUF.) > > Nonetheless, there may also be use cases where raw mempool objects are > being copied by rte_memcpy or DMA, so adding tests for these use cases > are useful. > > > @Bruce, you were also deeply involved in the DMA library, and probably > have more up-to-date practical experience with it. Am I right that > pktmbuf overhead in these tests provides more "real life use"-like > results? Or am I completely off track with my thinking here, i.e. the > pktmbuf overhead is only noise? > I'm actually not that familiar with the dma-test application, so can't comment on the specific overhead involved here. In the general case, if we are just talking about the overhead of dereferencing the mbufs then I would expect the overhead to be negligible. However, if we are looking to include the cost of allocation and freeing of buffers, I'd try to avoid that as it is a cost that would have to be paid for both SW copies and HW copies, so should not count when calculating offload cost. Bruce, as per test-dma-perf there is no repeated pktmbuf-alloc or pktmbuf-free. Hence I disagree that the overhead discussed for pkmbuf here is not related to alloc and free. But the cost as per my investigation goes into fetching the cacheline and performing mtod on each iteration. /Bruce I can rewrite the logic to make use pktmbuf objects by sending the src and dst with pre-computed mtod to avoid the overhead. But this will not resolve the 2MB and 1GB huge page copy alloc failures. IMHO, I believe in similar lines to other perf application, dma-perf application should focus on acutal device performance over application application performance.
RE: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
From: Varghese, Vipin [mailto:vipin.vargh...@amd.com] Sent: Tuesday, 12 December 2023 18.14 Sharing a few critical points based on my exposure to the dma-perf application below On Tue, Dec 12, 2023 at 04:16:20PM +0100, Morten Brørup wrote: > +TO: Bruce, please stop me if I'm completely off track here. > > > From: Ferruh Yigit [mailto:ferruh.yi...@amd.com] Sent: Tuesday, 12 > > December 2023 15.38 > > > > On 12/12/2023 11:40 AM, Morten Brørup wrote: > > >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] Sent: Tuesday, > > >> 12 December 2023 11.38 > > >> > > >> Replace pktmbuf pool with mempool, this allows increase in MOPS > > >> especially in lower buffer size. Using Mempool, allows to reduce the > > >> extra CPU cycles. > > > > > > I get the point of this change: It tests the performance of copying > > raw memory objects using respectively rte_memcpy and DMA, without the > > mbuf indirection overhead. > > > > > > However, I still consider the existing test relevant: The performance > > of copying packets using respectively rte_memcpy and DMA. > > > > > > > This is DMA performance test application and packets are not used, > > using pktmbuf just introduces overhead to the main focus of the > > application. > > > > I am not sure if pktmuf selected intentionally for this test > > application, but I assume it is there because of historical reasons. > > I think pktmbuf was selected intentionally, to provide more accurate > results for application developers trying to determine when to use > rte_memcpy and when to use DMA. Much like the "copy breakpoint" in Linux > Ethernet drivers is used to determine which code path to take for each > received packet. yes Ferruh, this is the right understanding. In DPDK example we already have dma-forward application which makes use of pktmbuf payload to copy over new pktmbuf payload area. by moving to mempool, we are actually now focusing on source and destination buffers. This allows to create mempool objects with 2MB and 1GB src-dst areas. Thus allowing to focus src to dst copy. With pktmbuf we were not able to achieve the same. > > Most applications will be working with pktmbufs, so these applications > will also experience the pktmbuf overhead. Performance testing with the > same overhead as the application will be better to help the application > developer determine when to use rte_memcpy and when to use DMA when > working with pktmbufs. Morten thank you for the input, but as shared above DPDK example dma-fwd does justice to such scenario. inline to test-compress-perf & test-crypto-perf IMHO test-dma-perf should focus on getting best values of dma engine and memcpy comparision. > > (Furthermore, for the pktmbuf tests, I wonder if copying performance > could also depend on IOVA mode and RTE_IOVA_IN_MBUF.) > > Nonetheless, there may also be use cases where raw mempool objects are > being copied by rte_memcpy or DMA, so adding tests for these use cases > are useful. > > > @Bruce, you were also deeply involved in the DMA library, and probably > have more up-to-date practical experience with it. Am I right that > pktmbuf overhead in these tests provides more "real life use"-like > results? Or am I completely off track with my thinking here, i.e. the > pktmbuf overhead is only noise? > I'm actually not that familiar with the dma-test application, so can't comment on the specific overhead involved here. In the general case, if we are just talking about the overhead of dereferencing the mbufs then I would expect the overhead to be negligible. However, if we are looking to include the cost of allocation and freeing of buffers, I'd try to avoid that as it is a cost that would have to be paid for both SW copies and HW copies, so should not count when calculating offload cost. Bruce, as per test-dma-perf there is no repeated pktmbuf-alloc or pktmbuf-free. Hence I disagree that the overhead discussed for pkmbuf here is not related to alloc and free. But the cost as per my investigation goes into fetching the cacheline and performing mtod on each iteration. /Bruce I can rewrite the logic to make use pktmbuf objects by sending the src and dst with pre-computed mtod to avoid the overhead. But this will not resolve the 2MB and 1GB huge page copy alloc failures. IMHO, I believe in similar lines to other perf application, dma-perf application should focus on acutal device performance over application application performance. [MB:] OK, Vipin has multiple good arguments for this patch. I am convinced, let's proceed with it. Acked-by: Morten Brørup
Re: [PATCH] app/dma-perf: replace pktmbuf with mempool objects
[AMD Official Use Only - General] Thank you Morten for the understanding From: Morten Brørup Sent: 12 December 2023 23:39 To: Varghese, Vipin ; Bruce Richardson Cc: Yigit, Ferruh ; dev@dpdk.org ; sta...@dpdk.org ; honest.ji...@foxmail.com ; P, Thiyagarajan Subject: RE: [PATCH] app/dma-perf: replace pktmbuf with mempool objects Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. From: Varghese, Vipin [mailto:vipin.vargh...@amd.com] Sent: Tuesday, 12 December 2023 18.14 Sharing a few critical points based on my exposure to the dma-perf application below On Tue, Dec 12, 2023 at 04:16:20PM +0100, Morten Brørup wrote: > +TO: Bruce, please stop me if I'm completely off track here. > > > From: Ferruh Yigit [mailto:ferruh.yi...@amd.com] Sent: Tuesday, 12 > > December 2023 15.38 > > > > On 12/12/2023 11:40 AM, Morten Brørup wrote: > > >> From: Vipin Varghese [mailto:vipin.vargh...@amd.com] Sent: Tuesday, > > >> 12 December 2023 11.38 > > >> > > >> Replace pktmbuf pool with mempool, this allows increase in MOPS > > >> especially in lower buffer size. Using Mempool, allows to reduce the > > >> extra CPU cycles. > > > > > > I get the point of this change: It tests the performance of copying > > raw memory objects using respectively rte_memcpy and DMA, without the > > mbuf indirection overhead. > > > > > > However, I still consider the existing test relevant: The performance > > of copying packets using respectively rte_memcpy and DMA. > > > > > > > This is DMA performance test application and packets are not used, > > using pktmbuf just introduces overhead to the main focus of the > > application. > > > > I am not sure if pktmuf selected intentionally for this test > > application, but I assume it is there because of historical reasons. > > I think pktmbuf was selected intentionally, to provide more accurate > results for application developers trying to determine when to use > rte_memcpy and when to use DMA. Much like the "copy breakpoint" in Linux > Ethernet drivers is used to determine which code path to take for each > received packet. yes Ferruh, this is the right understanding. In DPDK example we already have dma-forward application which makes use of pktmbuf payload to copy over new pktmbuf payload area. by moving to mempool, we are actually now focusing on source and destination buffers. This allows to create mempool objects with 2MB and 1GB src-dst areas. Thus allowing to focus src to dst copy. With pktmbuf we were not able to achieve the same. > > Most applications will be working with pktmbufs, so these applications > will also experience the pktmbuf overhead. Performance testing with the > same overhead as the application will be better to help the application > developer determine when to use rte_memcpy and when to use DMA when > working with pktmbufs. Morten thank you for the input, but as shared above DPDK example dma-fwd does justice to such scenario. inline to test-compress-perf & test-crypto-perf IMHO test-dma-perf should focus on getting best values of dma engine and memcpy comparision. > > (Furthermore, for the pktmbuf tests, I wonder if copying performance > could also depend on IOVA mode and RTE_IOVA_IN_MBUF.) > > Nonetheless, there may also be use cases where raw mempool objects are > being copied by rte_memcpy or DMA, so adding tests for these use cases > are useful. > > > @Bruce, you were also deeply involved in the DMA library, and probably > have more up-to-date practical experience with it. Am I right that > pktmbuf overhead in these tests provides more "real life use"-like > results? Or am I completely off track with my thinking here, i.e. the > pktmbuf overhead is only noise? > I'm actually not that familiar with the dma-test application, so can't comment on the specific overhead involved here. In the general case, if we are just talking about the overhead of dereferencing the mbufs then I would expect the overhead to be negligible. However, if we are looking to include the cost of allocation and freeing of buffers, I'd try to avoid that as it is a cost that would have to be paid for both SW copies and HW copies, so should not count when calculating offload cost. Bruce, as per test-dma-perf there is no repeated pktmbuf-alloc or pktmbuf-free. Hence I disagree that the overhead discussed for pkmbuf here is not related to alloc and free. But the cost as per my investigation goes into fetching the cacheline and performing mtod on each iteration. /Bruce I can rewrite the logic to make use pktmbuf objects by sending the src and dst with pre-computed mtod to avoid the overhead. But this will not resolve the 2MB and 1GB huge page copy alloc failures. IMHO, I believe in similar lines to other perf application, dma-perf application should focus on acutal device performance over application application performance. [MB:] OK,
Re: [RFC v2 09/14] rcu: introduce a logging helper
On Tue, Dec 12, 2023 at 04:00:35PM +0100, David Marchand wrote: > On Fri, Dec 8, 2023 at 10:27 PM Tyler Retzlaff > wrote: > > > > On Fri, Dec 08, 2023 at 03:59:43PM +0100, David Marchand wrote: > > > Signed-off-by: David Marchand > > > --- > > > > Reviewed-by: Tyler Retzlaff > > > > > lib/rcu/rte_rcu_qsbr.c | 62 -- > > > lib/rcu/rte_rcu_qsbr.h | 1 + > > > 2 files changed, 24 insertions(+), 39 deletions(-) > > > > > > diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c > > > index 41a44be4b9..5b6530788a 100644 > > > --- a/lib/rcu/rte_rcu_qsbr.c > > > +++ b/lib/rcu/rte_rcu_qsbr.c > > > @@ -19,6 +19,9 @@ > > > #include "rte_rcu_qsbr.h" > > > #include "rcu_qsbr_pvt.h" > > > > > > +#define RCU_LOG(level, fmt, args...) \ > > > + RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args) > > > + > > > > Since you are looking in the area for all the versions of gcc/clang we > > use able to support the non-standard __VA_ARGS__ that discard the comma? > > I suspect there is some typo (maybe s/for all/are all/ ?). > Can you please clarify? > > > > > > I know that some versions of gcc do and if it does I would like to move > > to using __VA_ARGS__ instead of args so we can use the same thing with > > msvc. > > If the request is to translate the ## args stuff to __VA_ARGS__, I > would prefer this is done in a separate series and not to mix with > this already huge series. Yes. I was asking if translation was possible from ## args to __VA_ARGS__. I was also asking if you could help do the translation. I didn't mean to suggest it should be done in this series. Ty > > > -- > David Marchand
[PATCH 00/26] Replace uses of RTE_LOGTYPE_PMD
The generic RTE_LOGTYPE_PMD is a leftover and should be removed. As a first step, fix many drivers to not use it, and add a helper for the RTE_LOG_DP(). Most of this patchset is boiler plate but there were some places where use of PMD type snuck in with changes to original driver and get fixed here. Stephen Hemminger (26): log: fix doc comment for RTE_LOG_DP() log: add rte_log_dp() net/atlantic: replace RTE_LOG_DP with rte_log_dp net/avp: replace RTE_LOG_DP with rte_log_dp net/bnxt: replace RTE_LOG_DP with rte_log_dp net/dpaa: replace RTE_LOG_DP with rte_log_dp net/dpaa2: replace RTE_LOG_DP with rte_log_dp net/enetc: replace RTE_LOG_DP with rte_log_dp net/enetfec: replace RTE_LOG_DP with rte_log_dp net/igc: replace RTE_LOG_DP with rte_log_dp net/mana: replace RTE_LOG_DP with rte_log_dp net/mvpp2: do not use PMD logtype net/octeon_ep: replace RTE_LOG_DP with rte_log_dp net/pfe: replace RTE_LOG_DP with rte_log_dp net/qede: replace RTE_LOG_DP with rte_log_dp net/virtio: replace RTE_LOG_DP with rte_log_dp net/vmxnet3: do not use PMD logtype common/cnxk: replace RTE_LOG_DP with rte_log_dp common/cpt: replace RTE_LOG_DP with rte_log_dp common/sfc_efx: remove use of PMD logtype common/dpaax: do not use PMD logtype basband/la12xx: replace RTE_LOG_DP with rte_log_dp bus/cdx: replace RTE_LOG_DP with rte_log_dp bus/fslmc: replace RTE_LOG_DP with rte_log_dp dma/dpaa, dma/dpaa2: replace RTE_LOG_DP with rte_log_dp mempool/dpaa, mempool/dpaa2: do not use logtype PMD .../baseband/la12xx/bbdev_la12xx_pmd_logs.h | 2 +- drivers/bus/cdx/cdx_logs.h| 2 +- drivers/bus/fslmc/fslmc_logs.h| 2 +- drivers/common/cnxk/roc_platform.h| 28 ++- drivers/common/cpt/cpt_pmd_logs.h | 2 +- drivers/common/dpaax/caamflib/compat.h| 5 +++- drivers/common/dpaax/version.map | 1 + drivers/common/sfc_efx/sfc_efx.c | 11 ++-- drivers/common/sfc_efx/sfc_efx_log.h | 2 +- drivers/dma/dpaa/dpaa_qdma_logs.h | 5 ++-- drivers/dma/dpaa2/dpaa2_qdma_logs.h | 3 +- drivers/mempool/dpaa/dpaa_mempool.h | 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 4 +-- drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 2 +- drivers/net/atlantic/atl_logs.h | 15 +- drivers/net/avp/avp_logs.h| 20 +++-- drivers/net/bnxt/bnxt.h | 5 drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 3 +- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 +- drivers/net/bnxt/bnxt_txr.c | 4 +-- drivers/net/dpaa/dpaa_ethdev.c| 4 +-- drivers/net/dpaa/dpaa_ethdev.h| 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_pmd_logs.h| 2 +- drivers/net/dpaa2/dpaa2_sparser.c | 4 +-- drivers/net/enetc/enetc_logs.h| 2 +- drivers/net/enetfec/enet_pmd_logs.h | 2 +- drivers/net/igc/igc_logs.h| 10 --- drivers/net/mana/mana.h | 2 +- drivers/net/mvpp2/mrvl_ethdev.c | 4 +-- drivers/net/octeon_ep/otx_ep_common.h | 7 + drivers/net/octeon_ep/otx_ep_rxtx.c | 5 ++-- drivers/net/octeontx/octeontx_logs.h | 3 +- drivers/net/pfe/pfe_logs.h| 2 +- drivers/net/qede/qede_logs.h | 10 --- drivers/net/virtio/virtio_logs.h | 16 ++- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_logs.h| 12 +--- lib/log/rte_log.h | 26 +++-- 39 files changed, 139 insertions(+), 99 deletions(-) -- 2.42.0
[PATCH 01/26] log: fix doc comment for RTE_LOG_DP()
The macro does not return a numeric status, only void.
Fixes: 5d8f0baf69ea ("log: do not drop debug logs at compile time")
Signed-off-by: Stephen Hemminger
---
lib/log/rte_log.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 4d207b8da2cd..051c20e2 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -348,9 +348,6 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char
*format, va_list ap)
* @param ...
* The fmt string, as in printf(3), followed by the variable arguments
* required by the format.
- * @return
- * - 0: Success.
- * - Negative on error.
*/
#define RTE_LOG_DP(l, t, ...) \
(void)((RTE_LOG_ ## l <= RTE_LOG_DP_LEVEL) ?\
--
2.42.0
[PATCH 03/26] net/atlantic: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/atlantic/atl_logs.h | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/atlantic/atl_logs.h b/drivers/net/atlantic/atl_logs.h index e3dba334fe92..c2a3a6320c58 100644 --- a/drivers/net/atlantic/atl_logs.h +++ b/drivers/net/atlantic/atl_logs.h @@ -14,18 +14,19 @@ extern int atl_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) - -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) - extern int atl_logtype_driver; #define PMD_DRV_LOG_RAW(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, atl_logtype_driver, "%s(): " fmt, \ __func__, ## args) #define PMD_DRV_LOG(level, fmt, args...) \ - PMD_DRV_LOG_RAW(level, fmt "\n", ## args) + rte_log_dp(RTE_LOG_ ## level, atl_logtype_driver, fmt "\n", \ + ## args) + +#define PMD_RX_LOG(level, fmt, args...) \ + PMD_DRV_LOG(level, fmt, ## args) + +#define PMD_TX_LOG(level, fmt, args...) \ + PMD_DRV_LOG(level, fmt, ## args) #endif -- 2.42.0
[PATCH 02/26] log: add rte_log_dp()
Add a new macro for logging in datapath using a logtype.
The existing macro RTE_LOG_DP() takes log type suffix (i.e. PMD)
like RTE_LOG(). This macro allows using a dynamic type.
Ideally, rte_log_dp() could be an always_inline function
but GCC and Clang will not inline a function with variable number
of arguments. Therefore it has to be a macro.
Signed-off-by: Stephen Hemminger
---
lib/log/rte_log.h | 23 +++
1 file changed, 23 insertions(+)
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 051c20e2..8eb2b38b1a9f 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -355,6 +355,29 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char
*format, va_list ap)
RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__) : \
0)
+/**
+ * Generates a log message for data path.
+ *
+ * Similar to rte_log(), except that it gets optimized away
+ * if the RTE_LOG_DP_LEVEL configuration option is lower than the log
+ * level argument.
+ *
+ * @param level
+ * Log level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8).
+ * @param logtype
+ * The log type, for example, RTE_LOGTYPE_EAL.
+ * @param format
+ * The format string, as in printf(3), followed by the variable arguments
+ * required by the format.
+ * @param ap
+ * The va_list of the variable arguments required by the format.
+ */
+#define rte_log_dp(lev, t, ...)\
+ do {\
+ if (lev <= RTE_LOG_DP_LEVEL)\
+ rte_log(lev, t, __VA_ARGS__); \
+ } while(0)
+
#define RTE_LOG_REGISTER_IMPL(type, name, level) \
int type; \
RTE_INIT(__##type) \
--
2.42.0
[PATCH 04/26] net/avp: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/avp/avp_logs.h | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/net/avp/avp_logs.h b/drivers/net/avp/avp_logs.h
index 6e297c7a4a81..0ae95a7685c5 100644
--- a/drivers/net/avp/avp_logs.h
+++ b/drivers/net/avp/avp_logs.h
@@ -7,24 +7,26 @@
#include
+
+extern int avp_logtype_driver;
+
+#define PMD_DRV_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
+ "%s(): " fmt, __func__, ## args)
+
#ifdef RTE_LIBRTE_AVP_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s() rx: " fmt, __func__, ## args)
+ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
+ "%s() rx: " fmt, __func__, ## args)
#else
#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_LIBRTE_AVP_DEBUG_TX
#define PMD_TX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s() tx: " fmt, __func__, ## args)
+ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
+ "%s() tx: " fmt, __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
-
-extern int avp_logtype_driver;
-
-#define PMD_DRV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
- "%s(): " fmt, __func__, ## args)
-
#endif /* _AVP_LOGS_H_ */
--
2.42.0
[PATCH 06/26] net/dpaa: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/dpaa/dpaa_ethdev.c | 4 ++--
drivers/net/dpaa/dpaa_ethdev.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index ef4c06db6a4d..0d0d493f3a6d 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -2096,7 +2096,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
/* copy the primary mac address */
rte_ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]);
- RTE_LOG(INFO, PMD, "net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT "\n",
+ DPAA_PMD_INFO("dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT,
dpaa_device->name, RTE_ETHER_ADDR_BYTES(&fman_intf->mac_addr));
if (!fman_intf->is_shared_mac) {
@@ -2166,7 +2166,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv,
ret = dpaa_dev_init_secondary(eth_dev);
if (ret != 0) {
- RTE_LOG(ERR, PMD, "secondary dev init failed\n");
+ DPAA_PMD_ERR("secondary dev init failed");
return ret;
}
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index 5b6802ece8f0..ced3e5f8ff98 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -232,6 +232,6 @@ extern int dpaa_logtype_pmd;
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA_DP_LOG(level, fmt, args...) \
- RTE_LOG_DP(level, PMD, fmt, ## args)
+ rte_log_dp(RTE_LOG_ ## level, dpaa_logtype_pmd, fmt, ## args)
#endif
--
2.42.0
[PATCH 05/26] net/bnxt: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/bnxt/bnxt.h | 5 + drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 3 +-- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 +-- drivers/net/bnxt/bnxt_txr.c | 4 +--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 0e01b1d4baea..3aa9213a12f9 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -1058,6 +1058,11 @@ extern int bnxt_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ PMD_DRV_LOG_RAW(level, fmt, ## args) +#define PMD_DRV_LOG_DP(level, fmt, args...)\ + rte_log_dp(RTE_LOG_ ## level, bnxt_logtype_driver, \ + fmt, ## args) + + extern const struct rte_flow_ops bnxt_ulp_rte_flow_ops; int32_t bnxt_ulp_port_init(struct bnxt *bp); void bnxt_ulp_port_deinit(struct bnxt *bp); diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c index aa1b1ab8bb7e..64c1dfac47d9 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c @@ -357,8 +357,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) nb_tx_pkts += txcmp->opaque; else - RTE_LOG_DP(ERR, PMD, - "Unhandled CMP type %02x\n", + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); } while (nb_tx_pkts < ring_mask); diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index e99a547f5857..572b21a00837 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -326,8 +326,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) nb_tx_pkts += txcmp->opaque; else - RTE_LOG_DP(ERR, PMD, - "Unhandled CMP type %02x\n", + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); } while (nb_tx_pkts < ring_mask); diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 899986764f93..bd0a75653ab3 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -542,9 +542,7 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq) if (CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2) nb_tx_pkts += opaque; else - RTE_LOG_DP(ERR, PMD, - "Unhandled CMP type %02x\n", - CMP_TYPE(txcmp)); + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); } while (nb_tx_pkts < ring_mask); -- 2.42.0
[PATCH 08/26] net/enetc: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/enetc/enetc_logs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/enetc/enetc_logs.h b/drivers/net/enetc/enetc_logs.h index 0976d42debd7..05a540f16490 100644 --- a/drivers/net/enetc/enetc_logs.h +++ b/drivers/net/enetc/enetc_logs.h @@ -30,7 +30,7 @@ extern int enetc_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define ENETC_PMD_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, enetc_logtype_pmd, fmt, ## args) #define ENETC_PMD_DP_DEBUG(fmt, args...) \ ENETC_PMD_DP_LOG(DEBUG, fmt, ## args) -- 2.42.0
[PATCH 07/26] net/dpaa2: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-
drivers/net/dpaa2/dpaa2_pmd_logs.h | 2 +-
drivers/net/dpaa2/dpaa2_sparser.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 8e610b6bba30..71d57ab26062 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -2851,7 +2851,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
return ret;
}
}
- RTE_LOG(INFO, PMD, "%s: netdev created, connected to %s\n",
+ DPAA2_PMD_INFO("%s: netdev created, connected to %s\n",
eth_dev->data->name, dpaa2_dev->ep_name);
return 0;
diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h
b/drivers/net/dpaa2/dpaa2_pmd_logs.h
index c47ba8e10bfc..89bffc684e50 100644
--- a/drivers/net/dpaa2/dpaa2_pmd_logs.h
+++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h
@@ -28,7 +28,7 @@ extern int dpaa2_logtype_pmd;
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA2_PMD_DP_LOG(level, fmt, args...) \
- RTE_LOG_DP(level, PMD, fmt, ## args)
+ rte_log_dp(RTE_LOG_ ## level, dpaa2_logtype_pmd, fmt, ## args)
#define DPAA2_PMD_DP_DEBUG(fmt, args...) \
DPAA2_PMD_DP_LOG(DEBUG, fmt, ## args)
diff --git a/drivers/net/dpaa2/dpaa2_sparser.c
b/drivers/net/dpaa2/dpaa2_sparser.c
index 63463c4fbfd6..202996c5d05d 100644
--- a/drivers/net/dpaa2/dpaa2_sparser.c
+++ b/drivers/net/dpaa2/dpaa2_sparser.c
@@ -181,7 +181,7 @@ int dpaa2_eth_load_wriop_soft_parser(struct dpaa2_dev_priv
*priv,
priv->ss_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(addr));
priv->ss_offset += sp_param.size;
- RTE_LOG(INFO, PMD, "Soft parser loaded for dpni@%d\n", priv->hw_id);
+ DPAA2_PMD_INFO("Soft parser loaded for dpni@%d\n", priv->hw_id);
rte_free(addr);
return 0;
@@ -234,6 +234,6 @@ int dpaa2_eth_enable_wriop_soft_parser(struct
dpaa2_dev_priv *priv,
}
rte_free(param_addr);
- RTE_LOG(INFO, PMD, "Soft parser enabled for dpni@%d\n", priv->hw_id);
+ DPAA2_PMD_INFO("Soft parser enabled for dpni@%d\n", priv->hw_id);
return 0;
}
--
2.42.0
[PATCH 09/26] net/enetfec: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/enetfec/enet_pmd_logs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/enetfec/enet_pmd_logs.h b/drivers/net/enetfec/enet_pmd_logs.h index 72d1cb61c598..c0a226284c53 100644 --- a/drivers/net/enetfec/enet_pmd_logs.h +++ b/drivers/net/enetfec/enet_pmd_logs.h @@ -28,6 +28,6 @@ extern int enetfec_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define ENETFEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, enetfec_logtype_pmd, fmt, ## args) #endif /* _ENETFEC_LOGS_H_ */ -- 2.42.0
[PATCH 10/26] net/igc: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/igc/igc_logs.h | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/igc/igc_logs.h b/drivers/net/igc/igc_logs.h
index 11071a32b542..ffa1981bae32 100644
--- a/drivers/net/igc/igc_logs.h
+++ b/drivers/net/igc/igc_logs.h
@@ -21,15 +21,17 @@ extern int igc_logtype_driver;
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#ifdef RTE_ETHDEV_DEBUG_RX
-#define PMD_RX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_RX_LOG(level, fmt, args...)\
+ rte_log(RTE_LOG_ ## level, igc_logtype_driver, \
+ "%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_ETHDEV_DEBUG_TX
-#define PMD_TX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_TX_LOG(level, fmt, args...)\
+ rte_log(RTE_LOG_ ## level, igc_logtype_driver, \
+ "%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
--
2.42.0
[PATCH 11/26] net/mana: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/mana/mana.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h index 6836872dc257..8d60f9172d44 100644 --- a/drivers/net/mana/mana.h +++ b/drivers/net/mana/mana.h @@ -467,7 +467,7 @@ extern int mana_logtype_init; __func__, ## args) #define DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt "\n", ## args) + rte_log_dp(RTE_LOG_ ## level, mana_logtype_driver, fmt "\n", ## args) #define PMD_INIT_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, mana_logtype_init, "%s(): " fmt "\n",\ -- 2.42.0
[PATCH 13/26] net/octeon_ep: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/octeon_ep/otx_ep_common.h | 7 +++
drivers/net/octeon_ep/otx_ep_rxtx.c | 5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/octeon_ep/otx_ep_common.h
b/drivers/net/octeon_ep/otx_ep_common.h
index 82e57520d38d..5fb63d051ac8 100644
--- a/drivers/net/octeon_ep/otx_ep_common.h
+++ b/drivers/net/octeon_ep/otx_ep_common.h
@@ -81,6 +81,13 @@
"%s():%u " fmt "\n",\
__func__, __LINE__, ##args)
+#define otx_ep_log_dp(level, fmt, args...) \
+ rte_log_dp(RTE_LOG_ ## level, otx_net_ep_logtype, \
+ "%s():%u " fmt "\n", \
+ __func__, __LINE__, ##args)
+
+
+
/* IO Access */
#define oct_ep_read64(addr) rte_read64_relaxed((void *)(addr))
#define oct_ep_write64(val, addr) rte_write64_relaxed((val), (void *)(addr))
diff --git a/drivers/net/octeon_ep/otx_ep_rxtx.c
b/drivers/net/octeon_ep/otx_ep_rxtx.c
index c421ef0a1c04..fe8885be54ff 100644
--- a/drivers/net/octeon_ep/otx_ep_rxtx.c
+++ b/drivers/net/octeon_ep/otx_ep_rxtx.c
@@ -884,9 +884,8 @@ otx_ep_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts)
next_fetch = (pkts == new_pkts - 1) ? 0 : 1;
oq_pkt = otx_ep_droq_read_packet(otx_ep, droq, next_fetch);
if (!oq_pkt) {
- RTE_LOG_DP(ERR, PMD,
- "DROQ read pkt failed pending %" PRIu64
- "last_pkt_count %" PRIu64 "new_pkts %d.\n",
+ otx_ep_log_dp(ERR, "DROQ read pkt failed pending %"
PRIu64
+ "last_pkt_count %" PRIu64 "new_pkts %d.",
droq->pkts_pending, droq->last_pkt_count,
new_pkts);
droq->stats.rx_err++;
--
2.42.0
[PATCH 12/26] net/mvpp2: do not use PMD logtype
The driver already has a logtype but it was not being used
in one place.
Fixes: 9e79d810911d ("net/mvpp2: support Tx scatter/gather")
Signed-off-by: Stephen Hemminger
---
drivers/net/mvpp2/mrvl_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index c12364941d62..9a9279a8783a 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -415,10 +415,10 @@ mrvl_set_tx_function(struct rte_eth_dev *dev)
/* Use a simple Tx queue (no offloads, no multi segs) if possible */
if (priv->multiseg) {
- RTE_LOG(INFO, PMD, "Using multi-segment tx callback\n");
+ MRVL_LOG(INFO, "Using multi-segment tx callback");
dev->tx_pkt_burst = mrvl_tx_sg_pkt_burst;
} else {
- RTE_LOG(INFO, PMD, "Using single-segment tx callback\n");
+ MRVL_LOG(INFO, "Using single-segment tx callback");
dev->tx_pkt_burst = mrvl_tx_pkt_burst;
}
}
--
2.42.0
[PATCH 14/26] net/pfe: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/octeontx/octeontx_logs.h | 3 +-- drivers/net/pfe/pfe_logs.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/octeontx/octeontx_logs.h b/drivers/net/octeontx/octeontx_logs.h index dec8042c67ba..cec5346d5a8b 100644 --- a/drivers/net/octeontx/octeontx_logs.h +++ b/drivers/net/octeontx/octeontx_logs.h @@ -19,11 +19,10 @@ rte_log(RTE_LOG_ ## level, otx_net_logtype_mbox, \ "%s(): " fmt "\n", __func__, ## args) -#define octeontx_log_info(fmt, args...)\ - RTE_LOG(INFO, PMD, fmt "\n", ## args) #define octeontx_log_err(s, ...) PMD_INIT_LOG(ERR, s, ##__VA_ARGS__) #define octeontx_log_dbg(s, ...) PMD_DRV_LOG(DEBUG, s, ##__VA_ARGS__) +#define octeontx_log_info(s, ...) PMD_DRV_LOG(INFO, s, ##__VA_ARGS__) #define octeontx_mbox_log(s, ...) PMD_MBOX_LOG(DEBUG, s, ##__VA_ARGS__) #define PMD_RX_LOG PMD_DRV_LOG diff --git a/drivers/net/pfe/pfe_logs.h b/drivers/net/pfe/pfe_logs.h index 58d5e8e7cff1..306bfc22ea54 100644 --- a/drivers/net/pfe/pfe_logs.h +++ b/drivers/net/pfe/pfe_logs.h @@ -26,6 +26,6 @@ extern int pfe_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define PFE_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ##level, pfe_logtype_pmd, fmt, ## args) #endif /* _PFE_LOGS_H_ */ -- 2.42.0
[PATCH 15/26] net/qede: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/qede/qede_logs.h | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/qede/qede_logs.h b/drivers/net/qede/qede_logs.h
index 3187d97bb7b0..097294be9c71 100644
--- a/drivers/net/qede/qede_logs.h
+++ b/drivers/net/qede/qede_logs.h
@@ -58,16 +58,18 @@ extern int qede_logtype_init;
#define PMD_INIT_FUNC_TRACE(edev) PMD_INIT_LOG(DEBUG, edev, " >>")
#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
-#define PMD_TX_LOG(level, q, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): port=%u queue=%u " fmt "\n", \
+#define PMD_TX_LOG(level, q, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, qded_logtype_driver, \
+ "%s(): port=%u queue=%u " fmt "\n", \
__func__, q->port_id, q->queue_id, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_LIBRTE_QEDE_DEBUG_RX
-#define PMD_RX_LOG(level, q, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): port=%u queue=%u " fmt "\n", \
+#define PMD_RX_LOG(level, q, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, qded_logtype_driver, \
+ "%s(): port=%u queue=%u " fmt "\n", \
__func__, q->port_id, q->queue_id, ## args)
#else
#define PMD_RX_LOG(level, q, fmt, args...) do { } while (0)
--
2.42.0
[PATCH 16/26] net/virtio: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/virtio/virtio_logs.h | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/virtio/virtio_logs.h b/drivers/net/virtio/virtio_logs.h
index 9b1b1defc5a6..0447ee961fb6 100644
--- a/drivers/net/virtio/virtio_logs.h
+++ b/drivers/net/virtio/virtio_logs.h
@@ -14,23 +14,25 @@ extern int virtio_logtype_init;
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
+extern int virtio_logtype_driver;
+#define PMD_DRV_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \
+ "%s(): " fmt "\n", __func__, ## args)
+
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s() rx: " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \
+ "%s() rx: " fmt "\n", __func__, ## args)
#else
#define PMD_RX_LOG(level, fmt, args...) do { } while(0)
#endif
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_TX
#define PMD_TX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s() tx: " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \
+ "%s() tx: " fmt "\n", __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while(0)
#endif
-extern int virtio_logtype_driver;
-#define PMD_DRV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \
- "%s(): " fmt "\n", __func__, ## args)
-
#endif /* _VIRTIO_LOGS_H_ */
--
2.42.0
[PATCH 17/26] net/vmxnet3: do not use PMD logtype
The driver used a slightly different (and older) format
for datapath logs. Remove PMD logtype here.
Signed-off-by: Stephen Hemminger
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +-
drivers/net/vmxnet3/vmxnet3_logs.h | 12
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c
b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index e49191718aea..4fd704045fc4 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -1919,7 +1919,7 @@ vmxnet3_interrupt_handler(void *param)
if (events == 0)
goto done;
- RTE_LOG(DEBUG, PMD, "Reading events: 0x%X", events);
+ PMD_DRV_LOG(DEBUG, "Reading events: 0x%X", events);
vmxnet3_process_events(dev);
done:
vmxnet3_enable_intr(hw, *eventIntrIdx);
diff --git a/drivers/net/vmxnet3/vmxnet3_logs.h
b/drivers/net/vmxnet3/vmxnet3_logs.h
index 74154e3a1a6d..058d704f82c9 100644
--- a/drivers/net/vmxnet3/vmxnet3_logs.h
+++ b/drivers/net/vmxnet3/vmxnet3_logs.h
@@ -11,28 +11,32 @@ extern int vmxnet3_logtype_init;
"%s(): " fmt "\n", __func__, ## args)
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
+extern int vmxnet3_logtype_driver;
+
#ifdef RTE_LIBRTE_VMXNET3_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \
+"%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_RX_LOG(level, fmt, args...) do { } while(0)
#endif
#ifdef RTE_LIBRTE_VMXNET3_DEBUG_TX
#define PMD_TX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \
+"%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while(0)
#endif
#ifdef RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE
#define PMD_TX_FREE_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \
+"%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)
#endif
-extern int vmxnet3_logtype_driver;
#define PMD_DRV_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \
"%s(): " fmt "\n", __func__, ## args)
--
2.42.0
[PATCH 18/26] common/cnxk: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/common/cnxk/roc_platform.h | 28 +++- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h index ba23b2e0d79e..9461f6e93304 100644 --- a/drivers/common/cnxk/roc_platform.h +++ b/drivers/common/cnxk/roc_platform.h @@ -265,11 +265,13 @@ extern int cnxk_logtype_tm; extern int cnxk_logtype_ree; extern int cnxk_logtype_dpi; -#define plt_err(fmt, args...) \ - RTE_LOG(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) -#define plt_info(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) -#define plt_warn(fmt, args...) RTE_LOG(WARNING, PMD, fmt "\n", ##args) -#define plt_print(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) +#define plt_log(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, cnxk_logtype_base, \ + "%s():%u " fmt "\n", __func__, __LINE__, ##args) +#define plt_err(fmt, ...) plt_log(ERR, fmt, ##__VA_ARGS__) +#define plt_info(fmt, ...) plt_log(INFO, fmt, ##__VA_ARGS__) +#define plt_warn(fmt, ...) plt_log(WARNING, fmt, ##__VA_ARGS__) +#define plt_print(fmt, ...) plt_log(INFO, fmt, ##__VA_ARGS__) #define plt_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__) #define plt_dump_no_nl(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) @@ -278,8 +280,7 @@ extern int cnxk_logtype_dpi; */ #define plt_dbg(subsystem, fmt, args...) \ rte_log(RTE_LOG_DEBUG, cnxk_logtype_##subsystem, \ - "[%s] %s():%u " fmt "\n", #subsystem, __func__, __LINE__, \ -##args) + "[%s] %s():%u " fmt "\n", #subsystem, __func__, __LINE__, ##args) #define plt_base_dbg(fmt, ...) plt_dbg(base, fmt, ##__VA_ARGS__) #define plt_cpt_dbg(fmt, ...) plt_dbg(cpt, fmt, ##__VA_ARGS__) @@ -295,12 +296,13 @@ extern int cnxk_logtype_dpi; #define plt_dpi_dbg(fmt, ...) plt_dbg(dpi, fmt, ##__VA_ARGS__) /* Datapath logs */ -#define plt_dp_err(fmt, args...) \ - RTE_LOG_DP(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) -#define plt_dp_info(fmt, args...) \ - RTE_LOG_DP(INFO, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) -#define plt_dp_dbg(fmt, args...) \ - RTE_LOG_DP(DEBUG, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) +#define plt_dp_log(level, fmt, args...) \ + rte_log_dp(RTE_LOG_ ## level, cnxk_logtype_base,\ + "%s():%u " fmt "\n", __func__, __LINE__, ## args) + +#define plt_dp_err(fmt, ...) plt_dp_log(ERR, fmt, ##__VA_ARGS__) +#define plt_dp_info(fmt, ...) plt_dp_log(INFO, fmt, ##__VA_ARGS__) +#define plt_dp_dbg(fmt, ...) plt_dp_log(DEBUG, fmt, ##__VA_ARGS__) #ifdef __cplusplus #define CNXK_PCI_ID(subsystem_dev, dev) \ -- 2.42.0
[PATCH 19/26] common/cpt: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/common/cpt/cpt_pmd_logs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/cpt/cpt_pmd_logs.h b/drivers/common/cpt/cpt_pmd_logs.h index 174326c6ce38..6b78fcb6b6fc 100644 --- a/drivers/common/cpt/cpt_pmd_logs.h +++ b/drivers/common/cpt/cpt_pmd_logs.h @@ -34,7 +34,7 @@ * level of 'pmd' has to be used. */ #define CPT_LOG_DP(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt "\n", ## args) + rte_log_dp(RTE_LOG_ ## level, CPT_LOGTYPE, fmt "\n", ## args) #define CPT_LOG_DP_DEBUG(fmt, args...) \ CPT_LOG_DP(DEBUG, fmt, ## args) -- 2.42.0
[PATCH 20/26] common/sfc_efx: remove use of PMD logtype
This code was implemented in a slightly different manner
than all the other logging code (for no good reason).
Make it the same and handle errors in same way as
other drivers.
Signed-off-by: Stephen Hemminger
---
drivers/common/sfc_efx/sfc_efx.c | 11 ++-
drivers/common/sfc_efx/sfc_efx_log.h | 2 +-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/common/sfc_efx/sfc_efx.c b/drivers/common/sfc_efx/sfc_efx.c
index 2dc5545760b8..5eeffb065b0d 100644
--- a/drivers/common/sfc_efx/sfc_efx.c
+++ b/drivers/common/sfc_efx/sfc_efx.c
@@ -15,7 +15,7 @@
#include "sfc_efx_log.h"
#include "sfc_efx.h"
-uint32_t sfc_efx_logtype;
+int sfc_efx_logtype;
static int
sfc_efx_kvarg_dev_class_handler(__rte_unused const char *key,
@@ -117,11 +117,4 @@ sfc_efx_family(struct rte_pci_device *pci_dev,
return rc;
}
-RTE_INIT(sfc_efx_register_logtype)
-{
- int ret;
-
- ret = rte_log_register_type_and_pick_level("pmd.common.sfc_efx",
- RTE_LOG_NOTICE);
- sfc_efx_logtype = (ret < 0) ? RTE_LOGTYPE_PMD : ret;
-}
+RTE_LOG_REGISTER_DEFAULT(sfc_efx_logtype, NOTICE);
diff --git a/drivers/common/sfc_efx/sfc_efx_log.h
b/drivers/common/sfc_efx/sfc_efx_log.h
index 694455c1b14e..1519ebdc175f 100644
--- a/drivers/common/sfc_efx/sfc_efx_log.h
+++ b/drivers/common/sfc_efx/sfc_efx_log.h
@@ -11,7 +11,7 @@
#define _SFC_EFX_LOG_H_
/** Generic driver log type */
-extern uint32_t sfc_efx_logtype;
+extern int sfc_efx_logtype;
/** Log message, add a prefix and a line break */
#define SFC_EFX_LOG(level, ...) \
--
2.42.0
[PATCH 21/26] common/dpaax: do not use PMD logtype
Use existing dpaax_logger log type instead of PMD.
Signed-off-by: Stephen Hemminger
---
drivers/common/dpaax/caamflib/compat.h | 5 -
drivers/common/dpaax/version.map | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/common/dpaax/caamflib/compat.h
b/drivers/common/dpaax/caamflib/compat.h
index 9776eed437ad..64ccdca95058 100644
--- a/drivers/common/dpaax/caamflib/compat.h
+++ b/drivers/common/dpaax/caamflib/compat.h
@@ -40,11 +40,14 @@
#define __maybe_unused __rte_unused
#endif
+extern int dpaax_logger;
+
#if defined(SUPPRESS_PRINTS)
#define pr_msg(l, fmt, ...) do { } while (0)
#else
#define pr_msg(l, fmt, ...) \
- RTE_LOG(l, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__)
+ rte_log(RTE_LOG_ ## l, dpaax_logger, "%s(): " fmt "\n", \
+ __func__, ##__VA_ARGS__)
#endif
#if !defined(pr_debug)
diff --git a/drivers/common/dpaax/version.map b/drivers/common/dpaax/version.map
index ee1ca6801c81..d48a6b6f37ee 100644
--- a/drivers/common/dpaax/version.map
+++ b/drivers/common/dpaax/version.map
@@ -6,6 +6,7 @@ INTERNAL {
dpaax_iova_table_p;
dpaax_iova_table_populate;
dpaax_iova_table_update;
+ dpaax_logger;
of_device_is_available;
of_device_is_compatible;
of_find_compatible_node;
--
2.42.0
[PATCH 22/26] basband/la12xx: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h b/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h index 452435ccb942..922eb601c61c 100644 --- a/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h +++ b/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h @@ -23,6 +23,6 @@ extern int bbdev_la12xx_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define rte_bbdev_dp_log(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, bbdev_la12xx_logtype, fmt, ## args) #endif /* _BBDEV_LA12XX_PMD_LOGS_H_ */ -- 2.42.0
[PATCH 23/26] bus/cdx: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/bus/cdx/cdx_logs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/cdx/cdx_logs.h b/drivers/bus/cdx/cdx_logs.h index a1046ce544a6..e432fae00e4d 100644 --- a/drivers/bus/cdx/cdx_logs.h +++ b/drivers/bus/cdx/cdx_logs.h @@ -25,7 +25,7 @@ extern int cdx_logtype_bus; /* DP Logs, toggled out at compile time if level lower than current level */ #define CDX_BUS_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, cdx_logtype_bus, fmt, ## args) #define CDX_BUS_DP_DEBUG(fmt, args...) \ CDX_BUS_DP_LOG(DEBUG, fmt, ## args) -- 2.42.0
[PATCH 25/26] dma/dpaa, dma/dpaa2: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/dma/dpaa/dpaa_qdma_logs.h | 5 +++-- drivers/dma/dpaa2/dpaa2_qdma_logs.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/dma/dpaa/dpaa_qdma_logs.h b/drivers/dma/dpaa/dpaa_qdma_logs.h index 762598f8f72f..169fbf364265 100644 --- a/drivers/dma/dpaa/dpaa_qdma_logs.h +++ b/drivers/dma/dpaa/dpaa_qdma_logs.h @@ -25,8 +25,9 @@ extern int dpaa_qdma_logtype; DPAA_QDMA_LOG(WARNING, fmt, ## args) /* DP Logs, toggled out at compile time if level lower than current level */ -#define DPAA_QDMA_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "dpaa_qdma: " fmt "\n", ## args) +#define DPAA_QDMA_DP_LOG(level, fmt, args...) \ + rte_log_dp(RTE_LOG_ ## level, dpaa_qdma_logtype,\ + "dpaa_qdma: " fmt "\n", ## args) #define DPAA_QDMA_DP_DEBUG(fmt, args...) \ DPAA_QDMA_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/dma/dpaa2/dpaa2_qdma_logs.h b/drivers/dma/dpaa2/dpaa2_qdma_logs.h index a46b8f24b5a7..52514c2dcc91 100644 --- a/drivers/dma/dpaa2/dpaa2_qdma_logs.h +++ b/drivers/dma/dpaa2/dpaa2_qdma_logs.h @@ -30,7 +30,8 @@ extern int dpaa2_qdma_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_QDMA_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "dpaa2_qdma: " fmt "\n", ## args) + rte_log_dp(RTE_LOG_ ## level, dpaa2_qdma_logtype, \ + "dpaa2_qdma: " fmt "\n", ## args) #define DPAA2_QDMA_DP_DEBUG(fmt, args...) \ DPAA2_QDMA_DP_LOG(DEBUG, fmt, ## args) -- 2.42.0
[PATCH 24/26] bus/fslmc: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/bus/fslmc/fslmc_logs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h index a1e14dd84e9a..edd74af04d7c 100644 --- a/drivers/bus/fslmc/fslmc_logs.h +++ b/drivers/bus/fslmc/fslmc_logs.h @@ -27,7 +27,7 @@ extern int dpaa2_logtype_bus; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_BUS_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, dpaa2_logtype_bus, fmt, ## args) #define DPAA2_BUS_DP_DEBUG(fmt, args...) \ DPAA2_BUS_DP_LOG(DEBUG, fmt, ## args) -- 2.42.0
[PATCH 26/26] mempool/dpaa, mempool/dpaa2: do not use logtype PMD
The driver already has a logtype, just not consistently used.
Signed-off-by: Stephen Hemminger
---
drivers/mempool/dpaa/dpaa_mempool.h | 2 +-
drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 4 ++--
drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mempool/dpaa/dpaa_mempool.h
b/drivers/mempool/dpaa/dpaa_mempool.h
index 3f0eafa7dd7b..ca97da46910c 100644
--- a/drivers/mempool/dpaa/dpaa_mempool.h
+++ b/drivers/mempool/dpaa/dpaa_mempool.h
@@ -67,7 +67,7 @@ extern struct dpaa_bp_info *rte_dpaa_bpid_info;
#define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, " >>")
#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \
- RTE_LOG_DP(DEBUG, PMD, fmt, ## args)
+ rte_log_dp(RTE_LOG_DEBUG, dpaa_logtype_mempool, fmt, ## args)
#define DPAA_MEMPOOL_DEBUG(fmt, args...) \
DPAA_MEMPOOL_LOG(DEBUG, fmt, ## args)
#define DPAA_MEMPOOL_ERR(fmt, args...) \
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
index 84371d5d1abb..e3983d34c25c 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
@@ -293,7 +293,7 @@ rte_dpaa2_mbuf_pool_bpid(struct rte_mempool *mp)
bp_info = mempool_to_bpinfo(mp);
if (!(bp_info->bp_list)) {
- RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n");
+ DPAA2_MEMPOOL_LOG(ERR, "DPAA2 buffer pool not configured\n");
return -ENOMEM;
}
@@ -307,7 +307,7 @@ rte_dpaa2_mbuf_from_buf_addr(struct rte_mempool *mp, void
*buf_addr)
bp_info = mempool_to_bpinfo(mp);
if (!(bp_info->bp_list)) {
- RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n");
+ DPAA2_MEMPOOL_LOG(ERR, "DPAA2 buffer pool not configured");
return NULL;
}
diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
index 986264319623..2f4fe0ba4209 100644
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h
@@ -25,7 +25,7 @@ extern int dpaa2_logtype_mempool;
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA2_MEMPOOL_DP_LOG(level, fmt, args...) \
- RTE_LOG_DP(level, PMD, fmt, ## args)
+ rte_log_dp(RTE_LOG_ ## level, dpaa2_logtype_mempool, fmt, ## args)
#define DPAA2_MEMPOOL_DP_DEBUG(fmt, args...) \
DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## args)
--
2.42.0
RE: [PATCH 10/26] net/igc: replace RTE_LOG_DP with rte_log_dp
> -Original Message- > From: Stephen Hemminger > Sent: Wednesday, December 13, 2023 09:42 > To: dev@dpdk.org > Cc: Stephen Hemminger ; Guo, Junfeng > ; Su, Simei > Subject: [PATCH 10/26] net/igc: replace RTE_LOG_DP with rte_log_dp > > Want datapath logs to use own logtype. > > Signed-off-by: Stephen Hemminger Looks good to me, thanks for improving the code! Maybe better also cc to the stable? Acked-by: Junfeng Guo Regards, Junfeng Guo > --- > drivers/net/igc/igc_logs.h | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) > > -- > 2.42.0
Re: [PATCH 05/26] net/bnxt: replace RTE_LOG_DP with rte_log_dp
On Wed, Dec 13, 2023 at 7:14 AM Stephen Hemminger wrote: > > Want datapath logs to use own logtype. > > Signed-off-by: Stephen Hemminger > --- > drivers/net/bnxt/bnxt.h | 5 + > drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 3 +-- > drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 +-- > drivers/net/bnxt/bnxt_txr.c | 4 +--- > 4 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h > index 0e01b1d4baea..3aa9213a12f9 100644 > --- a/drivers/net/bnxt/bnxt.h > +++ b/drivers/net/bnxt/bnxt.h > @@ -1058,6 +1058,11 @@ extern int bnxt_logtype_driver; > #define PMD_DRV_LOG(level, fmt, args...) \ > PMD_DRV_LOG_RAW(level, fmt, ## args) > > +#define PMD_DRV_LOG_DP(level, fmt, args...)\ > + rte_log_dp(RTE_LOG_ ## level, bnxt_logtype_driver, \ > + fmt, ## args) > + > + > extern const struct rte_flow_ops bnxt_ulp_rte_flow_ops; > int32_t bnxt_ulp_port_init(struct bnxt *bp); > void bnxt_ulp_port_deinit(struct bnxt *bp); > diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c > b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c > index aa1b1ab8bb7e..64c1dfac47d9 100644 > --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c > +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c > @@ -357,8 +357,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) > if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) > nb_tx_pkts += txcmp->opaque; > else > - RTE_LOG_DP(ERR, PMD, > - "Unhandled CMP type %02x\n", > + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", >CMP_TYPE(txcmp)); > raw_cons = NEXT_RAW_CMP(raw_cons); > } while (nb_tx_pkts < ring_mask); > diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c > b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c > index e99a547f5857..572b21a00837 100644 > --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c > +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c > @@ -326,8 +326,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) > if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) > nb_tx_pkts += txcmp->opaque; > else > - RTE_LOG_DP(ERR, PMD, > - "Unhandled CMP type %02x\n", > + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", >CMP_TYPE(txcmp)); > raw_cons = NEXT_RAW_CMP(raw_cons); > } while (nb_tx_pkts < ring_mask); > diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c > index 899986764f93..bd0a75653ab3 100644 > --- a/drivers/net/bnxt/bnxt_txr.c > +++ b/drivers/net/bnxt/bnxt_txr.c > @@ -542,9 +542,7 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq) > if (CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2) > nb_tx_pkts += opaque; > else > - RTE_LOG_DP(ERR, PMD, > - "Unhandled CMP type %02x\n", > - CMP_TYPE(txcmp)); > + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", > CMP_TYPE(txcmp)); > raw_cons = NEXT_RAW_CMP(raw_cons); > } while (nb_tx_pkts < ring_mask); > > -- > 2.42.0 > Acked-by: Somnath Kotur smime.p7s Description: S/MIME Cryptographic Signature
[PATCH 0/5] unify the usage of capacity and control
This patch series aims to unify the usage of capacity and control, and revise the related logics. Chaoyong He (5): net/nfp: complete the logic of print capacity net/nfp: modify the logic of set promisc mode net/nfp: modify the logic of set MAC address net/nfp: use ctrl to check the mode of features net/nfp: use ctrl extend to check the mode of features drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 14 +++--- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 16 +++ drivers/net/nfp/nfp_ethdev.c | 5 +- drivers/net/nfp/nfp_net_common.c | 73 ++ drivers/net/nfp/nfp_rxtx.c | 5 +- 5 files changed, 71 insertions(+), 42 deletions(-) -- 2.39.1
[PATCH 1/5] net/nfp: complete the logic of print capacity
Complete the logic of print capacity, print all the capacity and
extend capacity.
Signed-off-by: Chaoyong He
Reviewed-by: Peng Zhang
Reviewed-by: Long Wu
---
drivers/net/nfp/nfp_net_common.c | 59 ++--
1 file changed, 41 insertions(+), 18 deletions(-)
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index eeb0aaae26..79ce1dd837 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -306,28 +306,51 @@ void
nfp_net_log_device_information(const struct nfp_net_hw *hw)
{
uint32_t cap = hw->super.cap;
+ uint32_t cap_ext = hw->super.cap_ext;
PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d",
hw->ver.major, hw->ver.minor, hw->max_mtu);
- PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", cap,
- cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "",
- cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "",
- cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "",
- cap & NFP_NET_CFG_CTRL_RXCSUM? "RXCSUM ": "",
- cap & NFP_NET_CFG_CTRL_TXCSUM? "TXCSUM ": "",
- cap & NFP_NET_CFG_CTRL_RXVLAN? "RXVLAN ": "",
- cap & NFP_NET_CFG_CTRL_TXVLAN? "TXVLAN ": "",
- cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 " : "",
- cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? "TXVLANv2 " : "",
- cap & NFP_NET_CFG_CTRL_RXQINQ? "RXQINQ ": "",
- cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "",
- cap & NFP_NET_CFG_CTRL_GATHER? "GATHER ": "",
- cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " : "",
- cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "",
- cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "",
- cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "",
- cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : "");
+ PMD_INIT_LOG(INFO, "CAP: %#x", cap);
+ PMD_INIT_LOG(INFO,
"%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ cap & NFP_NET_CFG_CTRL_ENABLE? "ENABLE " :
"",
+ cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " :
"",
+ cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT ":
"",
+ cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT ":
"",
+ cap & NFP_NET_CFG_CTRL_RXCSUM? "RXCSUM " :
"",
+ cap & NFP_NET_CFG_CTRL_TXCSUM? "TXCSUM " :
"",
+ cap & NFP_NET_CFG_CTRL_RXVLAN? "RXVLAN " :
"",
+ cap & NFP_NET_CFG_CTRL_TXVLAN? "TXVLAN " :
"",
+ cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " :
"",
+ cap & NFP_NET_CFG_CTRL_GATHER? "GATHER " :
"",
+ cap & NFP_NET_CFG_CTRL_LSO ? "TSO " :
"",
+ cap & NFP_NET_CFG_CTRL_RXQINQ? "RXQINQ " :
"",
+ cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 ":
"",
+ cap & NFP_NET_CFG_CTRL_RINGCFG ? "RINGCFG " :
"",
+ cap & NFP_NET_CFG_CTRL_RSS ? "RSS " :
"",
+ cap & NFP_NET_CFG_CTRL_IRQMOD? "IRQMOD " :
"",
+ cap & NFP_NET_CFG_CTRL_RINGPRIO ? "RINGPRIO ":
"",
+ cap & NFP_NET_CFG_CTRL_MSIXAUTO ? "MSIXAUTO ":
"",
+ cap & NFP_NET_CFG_CTRL_TXRWB ? "TXRWB " :
"",
+ cap & NFP_NET_CFG_CTRL_L2SWITCH ? "L2SWITCH ":
"",
+ cap & NFP_NET_CFG_CTRL_TXVLAN_V2 ? "TXVLANv2 ":
"",
+ cap & NFP_NET_CFG_CTRL_VXLAN ? "VXLAN " :
"",
+ cap & NFP_NET_CFG_CTRL_NVGRE ? "NVGRE " :
"",
+ cap & NFP_NET_CFG_CTRL_MSIX_TX_OFF ? "MSIX_TX_OFF " :
"",
+ cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " :
"",
+ cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " :
"",
+ cap & NFP_NET_CFG_CTRL_CSUM_COMPLETE ? "CSUM ":
"",
+ cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR " :
"");
+
+ PMD_INIT_LOG(INFO, "CAP_WORD1: %#x", cap_ext);
+ PMD_INIT_LOG(INFO, "%s%s%s%s%s%s%s",
+ cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE? "PKT_TYPE
": "",
+ cap_ext & NFP_NET_CFG_CTRL_IPSEC ? "IPSEC "
[PATCH 2/5] net/nfp: modify the logic of set promisc mode
Modify the logic of set promisc mode, add the check logic of
capacity.
Signed-off-by: Chaoyong He
Reviewed-by: Peng Zhang
Reviewed-by: Long Wu
---
drivers/net/nfp/nfp_net_common.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 79ce1dd837..12b62c1958 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -592,6 +592,11 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev)
net_hw = nfp_net_get_hw(dev);
hw = &net_hw->super;
+ if ((hw->cap & NFP_NET_CFG_CTRL_PROMISC) == 0) {
+ PMD_DRV_LOG(ERR, "Promiscuous mode not supported");
+ return -ENOTSUP;
+ }
+
if ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) == 0) {
PMD_DRV_LOG(INFO, "Promiscuous mode already disabled");
return 0;
--
2.39.1
[PATCH 3/5] net/nfp: modify the logic of set MAC address
Modify the logic of set MAC address, add the check logic of MAC address.
Signed-off-by: Chaoyong He
Reviewed-by: Peng Zhang
Reviewed-by: Long Wu
---
drivers/net/nfp/nfp_net_common.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 12b62c1958..99e2fc54e0 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -417,6 +417,11 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev,
return -EBUSY;
}
+ if (rte_is_valid_assigned_ether_addr(mac_addr) == 0) {
+ PMD_DRV_LOG(ERR, "Invalid MAC address");
+ return -EINVAL;
+ }
+
/* Writing new MAC to the specific port BAR address */
nfp_write_mac(hw, (uint8_t *)mac_addr);
--
2.39.1
[PATCH 4/5] net/nfp: use ctrl to check the mode of features
Use the 'ctrl' rather than 'cap' to check the switch mode of features.
Signed-off-by: Chaoyong He
Reviewed-by: Peng Zhang
Reviewed-by: Long Wu
---
drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 10 +-
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 12 ++--
drivers/net/nfp/nfp_net_common.c | 2 +-
drivers/net/nfp/nfp_rxtx.c | 3 +--
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index ff9b10f046..56e57abacb 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -30,7 +30,7 @@ nfp_net_nfd3_tx_tso(struct nfp_net_txq *txq,
uint64_t ol_flags;
struct nfp_net_hw *hw = txq->hw;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
goto clean_txd;
ol_flags = mb->ol_flags;
@@ -69,7 +69,7 @@ nfp_net_nfd3_tx_cksum(struct nfp_net_txq *txq,
uint64_t ol_flags;
struct nfp_net_hw *hw = txq->hw;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXCSUM) == 0)
return;
ol_flags = mb->ol_flags;
@@ -127,8 +127,8 @@ nfp_net_nfd3_tx_vlan(struct nfp_net_txq *txq,
{
struct nfp_net_hw *hw = txq->hw;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 ||
- (hw->super.cap & NFP_NET_CFG_CTRL_TXVLAN) == 0)
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0 ||
+ (hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN) == 0)
return;
if ((mb->ol_flags & RTE_MBUF_F_TX_VLAN) != 0) {
@@ -278,7 +278,7 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue,
}
if (unlikely(pkt->nb_segs > 1 &&
- (hw->super.cap & NFP_NET_CFG_CTRL_GATHER) ==
0)) {
+ (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) ==
0)) {
PMD_TX_LOG(ERR, "Multisegment packet not supported");
goto xmit_end;
}
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 0141fbcc8f..fbf132347d 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -23,7 +23,7 @@ nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq,
uint64_t ol_flags;
struct nfp_net_hw *hw = txq->hw;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXCSUM) == 0)
return flags;
ol_flags = mb->ol_flags;
@@ -57,7 +57,7 @@ nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq,
txd.raw = 0;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) == 0)
return txd.raw;
ol_flags = mb->ol_flags;
@@ -146,7 +146,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
return -EINVAL;
/* Count TSO descriptor */
- if ((txq->hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
+ if ((txq->hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
(pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0)
n_descs++;
@@ -325,7 +325,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
nfp_net_nfdk_set_meta_data(pkt, txq, &metadata);
if (unlikely(pkt->nb_segs > 1 &&
- (hw->super.cap & NFP_NET_CFG_CTRL_GATHER) ==
0)) {
+ (hw->super.ctrl & NFP_NET_CFG_CTRL_GATHER) ==
0)) {
PMD_TX_LOG(ERR, "Multisegment packet not supported");
goto xmit_end;
}
@@ -335,7 +335,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
* multisegment packet, but TSO info needs to be in all of them.
*/
dma_len = pkt->data_len;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
(pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0) {
type = NFDK_DESC_TX_TYPE_TSO;
} else if (pkt->next == NULL && dma_len <=
NFDK_TX_MAX_DATA_PER_HEAD) {
@@ -408,7 +408,7 @@ nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
ktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_cksum(txq,
temp_pkt, metadata));
ktxds++;
- if ((hw->super.cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
+ if ((hw->super.ctrl & NFP_NET_CFG_CTRL_LSO_ANY) != 0 &&
(temp_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) !=
0) {
ktxds->raw = rte_cpu_to_le_64(nfp_net_nfdk_tx_tso(txq,
temp_pkt));
ktxds++;
diff --git a/drivers/net/nfp/nfp_net_common.c b/dri
[PATCH 5/5] net/nfp: use ctrl extend to check the mode of features
Use the 'ctrl_extend' rather than 'cap_extend' to check the switch mode
of features.
Signed-off-by: Chaoyong He
Reviewed-by: Peng Zhang
Reviewed-by: Long Wu
---
drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 4 +---
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 4 +---
drivers/net/nfp/nfp_ethdev.c | 5 +++--
drivers/net/nfp/nfp_net_common.c | 2 +-
drivers/net/nfp/nfp_rxtx.c | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
index 56e57abacb..fbc2dbedf4 100644
--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c
@@ -145,13 +145,11 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw
*meta_data,
char *meta;
uint8_t layer = 0;
uint32_t meta_info;
- uint32_t cap_extend;
struct nfp_net_hw *hw;
uint8_t vlan_layer = 0;
uint8_t ipsec_layer = 0;
hw = txq->hw;
- cap_extend = hw->super.cap_ext;
if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&
(hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {
@@ -162,7 +160,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw
*meta_data,
}
if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 &&
- (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {
+ (hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) {
uint32_t ipsec_type = NFP_NET_META_IPSEC |
NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE |
NFP_NET_META_IPSEC << (2 *
NFP_NET_META_FIELD_SIZE);
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index fbf132347d..72efbffb42 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -175,7 +175,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
char *meta;
uint8_t layer = 0;
uint32_t meta_type;
- uint32_t cap_extend;
struct nfp_net_hw *hw;
uint32_t header_offset;
uint8_t vlan_layer = 0;
@@ -184,7 +183,6 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
memset(&meta_data, 0, sizeof(meta_data));
hw = txq->hw;
- cap_extend = hw->super.cap_ext;
if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&
(hw->super.ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {
@@ -195,7 +193,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
}
if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 &&
- (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {
+ (hw->super.ctrl_ext & NFP_NET_CFG_CTRL_IPSEC) != 0) {
uint32_t ipsec_type = NFP_NET_META_IPSEC |
NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE |
NFP_NET_META_IPSEC << (2 *
NFP_NET_META_FIELD_SIZE);
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 185b570892..886b568d96 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -303,8 +303,9 @@ nfp_net_start(struct rte_eth_dev *dev)
ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE;
if ((cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0)
- ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP
- | NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;
+ ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC |
+ NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP |
+ NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;
/* Enable flow steer by extend ctrl word1. */
if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0)
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index fed36dac53..a438eb5871 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1371,7 +1371,7 @@ nfp_net_supported_ptypes_get(struct rte_eth_dev *dev)
return NULL;
net_hw = dev->data->dev_private;
- if ((net_hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
+ if ((net_hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
return NULL;
return ptypes;
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index f775f25cb2..cbcf57d769 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -617,7 +617,7 @@ nfp_net_parse_ptype(struct nfp_net_rxq *rxq,
struct nfp_ptype_parsed nfp_ptype;
uint16_t rxd_ptype = rxds->rxd.offload_info;
- if ((hw->super.cap_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
+ if ((hw->super.ctrl_ext & NFP_NET_CFG_CTRL_PKT_TYPE) == 0)
return;
if (rxd_ptype == 0 || (rxds->rxd.flags & PCIE_DESC_RX_VLAN) != 0)
--
2.39.1
[PATCH v2 00/25] Replace use of RTE_LOGTYPE_PMD
The generic RTE_LOGTYPE_PMD is a leftover and should be removed. As a first step, fix many drivers to not use it, and add a helper for the RTE_LOG_DP(). Most of this patchset is boiler plate but there were some places where use of PMD type snuck in with changes to original driver and get fixed here. More work is needed before PMD logtype can be retired. v2 - fix some typos from v1 from CI Stephen Hemminger (25): log: fix doc comment for RTE_LOG_DP() log: add rte_log_dp() net/atlantic: replace RTE_LOG_DP with rte_log_dp net/avp: replace RTE_LOG_DP with rte_log_dp net/bnxt: replace RTE_LOG_DP with rte_log_dp net/dpaa: replace RTE_LOG_DP with rte_log_dp net/dpaa2: replace RTE_LOG_DP with rte_log_dp net/enetc, net/enetfec: replace RTE_LOG_DP with rte_log_dp net/igc: replace RTE_LOG_DP with rte_log_dp net/mana: replace RTE_LOG_DP with rte_log_dp net/mvpp2: do not use PMD logtype net/octeon_ep: replace RTE_LOG_DP with rte_log_dp net/pfe: replace RTE_LOG_DP with rte_log_dp net/qede: replace RTE_LOG_DP with rte_log_dp net/virtio: replace RTE_LOG_DP with rte_log_dp net/vmxnet3: do not use PMD logtype common/cnxk: replace RTE_LOG_DP with rte_log_dp common/cpt: replace RTE_LOG_DP with rte_log_dp common/sfc_efx: remove use of PMD logtype common/dpaax: do not use PMD logtype basband/la12xx: replace RTE_LOG_DP with rte_log_dp bus/cdx: replace RTE_LOG_DP with rte_log_dp bus/fslmc: replace RTE_LOG_DP with rte_log_dp dma/dpaa, dma/dpaa2: replace RTE_LOG_DP with rte_log_dp mempool/dpaa, mempool/dpaa2: do not use logtype PMD .../baseband/la12xx/bbdev_la12xx_pmd_logs.h | 2 +- drivers/bus/cdx/cdx_logs.h| 2 +- drivers/bus/fslmc/fslmc_logs.h| 2 +- drivers/common/cnxk/roc_platform.h| 28 ++- drivers/common/cpt/cpt_pmd_logs.h | 2 +- drivers/common/dpaax/caamflib/compat.h| 5 +++- drivers/common/dpaax/dpaax_logs.h | 2 +- drivers/common/dpaax/version.map | 1 + drivers/common/sfc_efx/sfc_efx.c | 11 ++-- drivers/common/sfc_efx/sfc_efx_log.h | 2 +- drivers/dma/dpaa/dpaa_qdma_logs.h | 5 ++-- drivers/dma/dpaa2/dpaa2_qdma_logs.h | 3 +- drivers/mempool/dpaa/dpaa_mempool.h | 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 4 +-- drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 2 +- drivers/net/atlantic/atl_logs.h | 15 +- drivers/net/avp/avp_logs.h| 20 +++-- drivers/net/bnxt/bnxt.h | 5 drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 3 +- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 +- drivers/net/bnxt/bnxt_txr.c | 4 +-- drivers/net/dpaa/dpaa_ethdev.c| 4 +-- drivers/net/dpaa/dpaa_ethdev.h| 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_pmd_logs.h| 2 +- drivers/net/dpaa2/dpaa2_sparser.c | 4 +-- drivers/net/enetc/enetc_logs.h| 2 +- drivers/net/enetfec/enet_pmd_logs.h | 2 +- drivers/net/igc/igc_logs.h| 10 --- drivers/net/mana/mana.h | 2 +- drivers/net/mvpp2/mrvl_ethdev.c | 4 +-- drivers/net/octeon_ep/otx_ep_common.h | 7 + drivers/net/octeon_ep/otx_ep_rxtx.c | 5 ++-- drivers/net/octeontx/octeontx_logs.h | 3 +- drivers/net/pfe/pfe_logs.h| 2 +- drivers/net/qede/qede_logs.h | 10 --- drivers/net/virtio/virtio_logs.h | 16 ++- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_logs.h| 12 +--- lib/log/rte_log.h | 26 +++-- 40 files changed, 140 insertions(+), 100 deletions(-) -- 2.42.0
[PATCH v2 01/25] log: fix doc comment for RTE_LOG_DP()
The macro does not return a numeric status, only void.
Fixes: 5d8f0baf69ea ("log: do not drop debug logs at compile time")
Signed-off-by: Stephen Hemminger
---
lib/log/rte_log.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 4d207b8da2cd..051c20e2 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -348,9 +348,6 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char
*format, va_list ap)
* @param ...
* The fmt string, as in printf(3), followed by the variable arguments
* required by the format.
- * @return
- * - 0: Success.
- * - Negative on error.
*/
#define RTE_LOG_DP(l, t, ...) \
(void)((RTE_LOG_ ## l <= RTE_LOG_DP_LEVEL) ?\
--
2.42.0
[PATCH v2 02/25] log: add rte_log_dp()
Add a new macro for logging in datapath using a logtype.
The existing macro RTE_LOG_DP() takes log type suffix (i.e. PMD)
like RTE_LOG(). This macro allows using a dynamic type.
Ideally, rte_log_dp() could be an always_inline function
but GCC and Clang will not inline a function with variable number
of arguments. Therefore it has to be a macro.
Signed-off-by: Stephen Hemminger
---
lib/log/rte_log.h | 23 +++
1 file changed, 23 insertions(+)
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 051c20e2..8eb2b38b1a9f 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -355,6 +355,29 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char
*format, va_list ap)
RTE_LOGTYPE_ ## t, # t ": " __VA_ARGS__) : \
0)
+/**
+ * Generates a log message for data path.
+ *
+ * Similar to rte_log(), except that it gets optimized away
+ * if the RTE_LOG_DP_LEVEL configuration option is lower than the log
+ * level argument.
+ *
+ * @param level
+ * Log level. A value between RTE_LOG_EMERG (1) and RTE_LOG_DEBUG (8).
+ * @param logtype
+ * The log type, for example, RTE_LOGTYPE_EAL.
+ * @param format
+ * The format string, as in printf(3), followed by the variable arguments
+ * required by the format.
+ * @param ap
+ * The va_list of the variable arguments required by the format.
+ */
+#define rte_log_dp(lev, t, ...)\
+ do {\
+ if (lev <= RTE_LOG_DP_LEVEL)\
+ rte_log(lev, t, __VA_ARGS__); \
+ } while(0)
+
#define RTE_LOG_REGISTER_IMPL(type, name, level) \
int type; \
RTE_INIT(__##type) \
--
2.42.0
[PATCH v2 03/25] net/atlantic: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/atlantic/atl_logs.h | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/atlantic/atl_logs.h b/drivers/net/atlantic/atl_logs.h index e3dba334fe92..c2a3a6320c58 100644 --- a/drivers/net/atlantic/atl_logs.h +++ b/drivers/net/atlantic/atl_logs.h @@ -14,18 +14,19 @@ extern int atl_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") -#define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) - -#define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) - extern int atl_logtype_driver; #define PMD_DRV_LOG_RAW(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, atl_logtype_driver, "%s(): " fmt, \ __func__, ## args) #define PMD_DRV_LOG(level, fmt, args...) \ - PMD_DRV_LOG_RAW(level, fmt "\n", ## args) + rte_log_dp(RTE_LOG_ ## level, atl_logtype_driver, fmt "\n", \ + ## args) + +#define PMD_RX_LOG(level, fmt, args...) \ + PMD_DRV_LOG(level, fmt, ## args) + +#define PMD_TX_LOG(level, fmt, args...) \ + PMD_DRV_LOG(level, fmt, ## args) #endif -- 2.42.0
[PATCH v2 04/25] net/avp: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/avp/avp_logs.h | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/net/avp/avp_logs.h b/drivers/net/avp/avp_logs.h
index 6e297c7a4a81..0ae95a7685c5 100644
--- a/drivers/net/avp/avp_logs.h
+++ b/drivers/net/avp/avp_logs.h
@@ -7,24 +7,26 @@
#include
+
+extern int avp_logtype_driver;
+
+#define PMD_DRV_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
+ "%s(): " fmt, __func__, ## args)
+
#ifdef RTE_LIBRTE_AVP_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s() rx: " fmt, __func__, ## args)
+ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
+ "%s() rx: " fmt, __func__, ## args)
#else
#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_LIBRTE_AVP_DEBUG_TX
#define PMD_TX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s() tx: " fmt, __func__, ## args)
+ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
+ "%s() tx: " fmt, __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
-
-extern int avp_logtype_driver;
-
-#define PMD_DRV_LOG(level, fmt, args...) \
- rte_log(RTE_LOG_ ## level, avp_logtype_driver, \
- "%s(): " fmt, __func__, ## args)
-
#endif /* _AVP_LOGS_H_ */
--
2.42.0
[PATCH v2 05/25] net/bnxt: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger Acked-by: Somnath Kotur --- drivers/net/bnxt/bnxt.h | 5 + drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 3 +-- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 3 +-- drivers/net/bnxt/bnxt_txr.c | 4 +--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 0e01b1d4baea..3aa9213a12f9 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -1058,6 +1058,11 @@ extern int bnxt_logtype_driver; #define PMD_DRV_LOG(level, fmt, args...) \ PMD_DRV_LOG_RAW(level, fmt, ## args) +#define PMD_DRV_LOG_DP(level, fmt, args...)\ + rte_log_dp(RTE_LOG_ ## level, bnxt_logtype_driver, \ + fmt, ## args) + + extern const struct rte_flow_ops bnxt_ulp_rte_flow_ops; int32_t bnxt_ulp_port_init(struct bnxt *bp); void bnxt_ulp_port_deinit(struct bnxt *bp); diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c index aa1b1ab8bb7e..64c1dfac47d9 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c @@ -357,8 +357,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) nb_tx_pkts += txcmp->opaque; else - RTE_LOG_DP(ERR, PMD, - "Unhandled CMP type %02x\n", + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); } while (nb_tx_pkts < ring_mask); diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index e99a547f5857..572b21a00837 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -326,8 +326,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) nb_tx_pkts += txcmp->opaque; else - RTE_LOG_DP(ERR, PMD, - "Unhandled CMP type %02x\n", + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); } while (nb_tx_pkts < ring_mask); diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 899986764f93..bd0a75653ab3 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -542,9 +542,7 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq) if (CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2) nb_tx_pkts += opaque; else - RTE_LOG_DP(ERR, PMD, - "Unhandled CMP type %02x\n", - CMP_TYPE(txcmp)); + PMD_DRV_LOG_DP(ERR, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); } while (nb_tx_pkts < ring_mask); -- 2.42.0
[PATCH v2 06/25] net/dpaa: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/dpaa/dpaa_ethdev.c | 4 ++--
drivers/net/dpaa/dpaa_ethdev.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index ef4c06db6a4d..0d0d493f3a6d 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -2096,7 +2096,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
/* copy the primary mac address */
rte_ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]);
- RTE_LOG(INFO, PMD, "net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT "\n",
+ DPAA_PMD_INFO("dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT,
dpaa_device->name, RTE_ETHER_ADDR_BYTES(&fman_intf->mac_addr));
if (!fman_intf->is_shared_mac) {
@@ -2166,7 +2166,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv,
ret = dpaa_dev_init_secondary(eth_dev);
if (ret != 0) {
- RTE_LOG(ERR, PMD, "secondary dev init failed\n");
+ DPAA_PMD_ERR("secondary dev init failed");
return ret;
}
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index 5b6802ece8f0..ced3e5f8ff98 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -232,6 +232,6 @@ extern int dpaa_logtype_pmd;
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA_DP_LOG(level, fmt, args...) \
- RTE_LOG_DP(level, PMD, fmt, ## args)
+ rte_log_dp(RTE_LOG_ ## level, dpaa_logtype_pmd, fmt, ## args)
#endif
--
2.42.0
[PATCH v2 07/25] net/dpaa2: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/dpaa2/dpaa2_ethdev.c | 2 +-
drivers/net/dpaa2/dpaa2_pmd_logs.h | 2 +-
drivers/net/dpaa2/dpaa2_sparser.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 8e610b6bba30..71d57ab26062 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -2851,7 +2851,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
return ret;
}
}
- RTE_LOG(INFO, PMD, "%s: netdev created, connected to %s\n",
+ DPAA2_PMD_INFO("%s: netdev created, connected to %s\n",
eth_dev->data->name, dpaa2_dev->ep_name);
return 0;
diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h
b/drivers/net/dpaa2/dpaa2_pmd_logs.h
index c47ba8e10bfc..89bffc684e50 100644
--- a/drivers/net/dpaa2/dpaa2_pmd_logs.h
+++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h
@@ -28,7 +28,7 @@ extern int dpaa2_logtype_pmd;
/* DP Logs, toggled out at compile time if level lower than current level */
#define DPAA2_PMD_DP_LOG(level, fmt, args...) \
- RTE_LOG_DP(level, PMD, fmt, ## args)
+ rte_log_dp(RTE_LOG_ ## level, dpaa2_logtype_pmd, fmt, ## args)
#define DPAA2_PMD_DP_DEBUG(fmt, args...) \
DPAA2_PMD_DP_LOG(DEBUG, fmt, ## args)
diff --git a/drivers/net/dpaa2/dpaa2_sparser.c
b/drivers/net/dpaa2/dpaa2_sparser.c
index 63463c4fbfd6..202996c5d05d 100644
--- a/drivers/net/dpaa2/dpaa2_sparser.c
+++ b/drivers/net/dpaa2/dpaa2_sparser.c
@@ -181,7 +181,7 @@ int dpaa2_eth_load_wriop_soft_parser(struct dpaa2_dev_priv
*priv,
priv->ss_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(addr));
priv->ss_offset += sp_param.size;
- RTE_LOG(INFO, PMD, "Soft parser loaded for dpni@%d\n", priv->hw_id);
+ DPAA2_PMD_INFO("Soft parser loaded for dpni@%d\n", priv->hw_id);
rte_free(addr);
return 0;
@@ -234,6 +234,6 @@ int dpaa2_eth_enable_wriop_soft_parser(struct
dpaa2_dev_priv *priv,
}
rte_free(param_addr);
- RTE_LOG(INFO, PMD, "Soft parser enabled for dpni@%d\n", priv->hw_id);
+ DPAA2_PMD_INFO("Soft parser enabled for dpni@%d\n", priv->hw_id);
return 0;
}
--
2.42.0
[PATCH v2 08/25] net/enetc, net/enetfec: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/enetc/enetc_logs.h | 2 +- drivers/net/enetfec/enet_pmd_logs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/enetc/enetc_logs.h b/drivers/net/enetc/enetc_logs.h index 0976d42debd7..05a540f16490 100644 --- a/drivers/net/enetc/enetc_logs.h +++ b/drivers/net/enetc/enetc_logs.h @@ -30,7 +30,7 @@ extern int enetc_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define ENETC_PMD_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, enetc_logtype_pmd, fmt, ## args) #define ENETC_PMD_DP_DEBUG(fmt, args...) \ ENETC_PMD_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/enetfec/enet_pmd_logs.h b/drivers/net/enetfec/enet_pmd_logs.h index 72d1cb61c598..c0a226284c53 100644 --- a/drivers/net/enetfec/enet_pmd_logs.h +++ b/drivers/net/enetfec/enet_pmd_logs.h @@ -28,6 +28,6 @@ extern int enetfec_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define ENETFEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, enetfec_logtype_pmd, fmt, ## args) #endif /* _ENETFEC_LOGS_H_ */ -- 2.42.0
[PATCH v2 09/25] net/igc: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
Acked-by: Junfeng Guo
---
drivers/net/igc/igc_logs.h | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/igc/igc_logs.h b/drivers/net/igc/igc_logs.h
index 11071a32b542..ffa1981bae32 100644
--- a/drivers/net/igc/igc_logs.h
+++ b/drivers/net/igc/igc_logs.h
@@ -21,15 +21,17 @@ extern int igc_logtype_driver;
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
#ifdef RTE_ETHDEV_DEBUG_RX
-#define PMD_RX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_RX_LOG(level, fmt, args...)\
+ rte_log(RTE_LOG_ ## level, igc_logtype_driver, \
+ "%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
#endif
#ifdef RTE_ETHDEV_DEBUG_TX
-#define PMD_TX_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#define PMD_TX_LOG(level, fmt, args...)\
+ rte_log(RTE_LOG_ ## level, igc_logtype_driver, \
+ "%s(): " fmt "\n", __func__, ## args)
#else
#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
#endif
--
2.42.0
[PATCH v2 10/25] net/mana: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype. Signed-off-by: Stephen Hemminger --- drivers/net/mana/mana.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h index 6836872dc257..8d60f9172d44 100644 --- a/drivers/net/mana/mana.h +++ b/drivers/net/mana/mana.h @@ -467,7 +467,7 @@ extern int mana_logtype_init; __func__, ## args) #define DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt "\n", ## args) + rte_log_dp(RTE_LOG_ ## level, mana_logtype_driver, fmt "\n", ## args) #define PMD_INIT_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, mana_logtype_init, "%s(): " fmt "\n",\ -- 2.42.0
[PATCH v2 11/25] net/mvpp2: do not use PMD logtype
The driver already has a logtype but it was not being used
in one place.
Fixes: 9e79d810911d ("net/mvpp2: support Tx scatter/gather")
Signed-off-by: Stephen Hemminger
---
drivers/net/mvpp2/mrvl_ethdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index c12364941d62..9a9279a8783a 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -415,10 +415,10 @@ mrvl_set_tx_function(struct rte_eth_dev *dev)
/* Use a simple Tx queue (no offloads, no multi segs) if possible */
if (priv->multiseg) {
- RTE_LOG(INFO, PMD, "Using multi-segment tx callback\n");
+ MRVL_LOG(INFO, "Using multi-segment tx callback");
dev->tx_pkt_burst = mrvl_tx_sg_pkt_burst;
} else {
- RTE_LOG(INFO, PMD, "Using single-segment tx callback\n");
+ MRVL_LOG(INFO, "Using single-segment tx callback");
dev->tx_pkt_burst = mrvl_tx_pkt_burst;
}
}
--
2.42.0
[PATCH v2 12/25] net/octeon_ep: replace RTE_LOG_DP with rte_log_dp
Want datapath logs to use own logtype.
Signed-off-by: Stephen Hemminger
---
drivers/net/octeon_ep/otx_ep_common.h | 7 +++
drivers/net/octeon_ep/otx_ep_rxtx.c | 5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/octeon_ep/otx_ep_common.h
b/drivers/net/octeon_ep/otx_ep_common.h
index 82e57520d38d..5fb63d051ac8 100644
--- a/drivers/net/octeon_ep/otx_ep_common.h
+++ b/drivers/net/octeon_ep/otx_ep_common.h
@@ -81,6 +81,13 @@
"%s():%u " fmt "\n",\
__func__, __LINE__, ##args)
+#define otx_ep_log_dp(level, fmt, args...) \
+ rte_log_dp(RTE_LOG_ ## level, otx_net_ep_logtype, \
+ "%s():%u " fmt "\n", \
+ __func__, __LINE__, ##args)
+
+
+
/* IO Access */
#define oct_ep_read64(addr) rte_read64_relaxed((void *)(addr))
#define oct_ep_write64(val, addr) rte_write64_relaxed((val), (void *)(addr))
diff --git a/drivers/net/octeon_ep/otx_ep_rxtx.c
b/drivers/net/octeon_ep/otx_ep_rxtx.c
index c421ef0a1c04..fe8885be54ff 100644
--- a/drivers/net/octeon_ep/otx_ep_rxtx.c
+++ b/drivers/net/octeon_ep/otx_ep_rxtx.c
@@ -884,9 +884,8 @@ otx_ep_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts)
next_fetch = (pkts == new_pkts - 1) ? 0 : 1;
oq_pkt = otx_ep_droq_read_packet(otx_ep, droq, next_fetch);
if (!oq_pkt) {
- RTE_LOG_DP(ERR, PMD,
- "DROQ read pkt failed pending %" PRIu64
- "last_pkt_count %" PRIu64 "new_pkts %d.\n",
+ otx_ep_log_dp(ERR, "DROQ read pkt failed pending %"
PRIu64
+ "last_pkt_count %" PRIu64 "new_pkts %d.",
droq->pkts_pending, droq->last_pkt_count,
new_pkts);
droq->stats.rx_err++;
--
2.42.0
