RE: [PATCH v5 0/3] Recycle buffers from Tx to Rx
> -Original Message- > From: Ferruh Yigit > Sent: Wednesday, April 19, 2023 10:56 PM > To: Feifei Wang ; Qi Z Zhang > ; Mcnamara, John > Cc: dev@dpdk.org; konstantin.v.anan...@yandex.ru; > m...@smartsharesystems.com; nd > Subject: Re: [PATCH v5 0/3] Recycle buffers from Tx to Rx > > On 3/30/2023 7:29 AM, Feifei Wang wrote: > > Currently, the transmit side frees the buffers into the lcore cache > > and the receive side allocates buffers from the lcore cache. The > > transmit side typically frees 32 buffers resulting in 32*8=256B of > > stores to lcore cache. The receive side allocates 32 buffers and > > stores them in the receive side software ring, resulting in 32*8=256B > > of stores and 256B of load from the lcore cache. > > > > This patch proposes a mechanism to avoid freeing to/allocating from > > the lcore cache. i.e. the receive side will free the buffers from > > transmit side directly into its software ring. This will avoid the > > 256B of loads and stores introduced by the lcore cache. It also frees > > up the cache lines used by the lcore cache. And we can call this mode > > as buffer recycle mode. > > > > In the latest version, buffer recycle mode is packaged as a separate API. > > This allows for the users to change rxq/txq pairing in real time in > > data plane, according to the analysis of the packet flow by the application, > for example: > > -- > > - Step 1: upper application analyse the flow direction Step 2: > > rxq_buf_recycle_info = rte_eth_rx_buf_recycle_info_get(rx_portid, > > rx_queueid) Step 3: rte_eth_dev_buf_recycle(rx_portid, rx_queueid, > > tx_portid, tx_queueid, rxq_buf_recycle_info); Step 4: > > rte_eth_rx_burst(rx_portid,rx_queueid); > > Step 5: rte_eth_tx_burst(tx_portid,tx_queueid); > > -- > > - Above can support user to change rxq/txq pairing at runtime and > > user does not need to know the direction of flow in advance. This can > > effectively expand buffer recycle mode's use scenarios. > > > > Furthermore, buffer recycle mode is no longer limited to the same pmd, > > it can support moving buffers between different vendor pmds, even can > > put the buffer anywhere into your Rx buffer ring as long as the address of > > the > buffer ring can be provided. > > In the latest version, we enable direct-rearm in i40e pmd and ixgbe > > pmd, and also try to use i40e driver in Rx, ixgbe driver in Tx, and > > then achieve 7-9% performance improvement by buffer recycle mode. > > > > Difference between buffer recycle, ZC API used in mempool and general > > path For general path: > > Rx: 32 pkts memcpy from mempool cache to rx_sw_ring > > Tx: 32 pkts memcpy from tx_sw_ring to temporary > > variable + 32 pkts memcpy from temporary variable to mempool cache For > ZC API used in mempool: > > Rx: 32 pkts memcpy from mempool cache to rx_sw_ring > > Tx: 32 pkts memcpy from tx_sw_ring to zero-copy mempool > > cache > > Refer link: > > http://patches.dpdk.org/project/dpdk/patch/20230221055205.22984-2- > kama > > lakshitha.alig...@arm.com/ > > For buffer recycle: > > Rx/Tx: 32 pkts memcpy from tx_sw_ring to rx_sw_ring > > Thus we can see in the one loop, compared to general path, buffer > > recycle reduce 32+32=64 pkts memcpy; Compared to ZC API used in > mempool, we can see buffer recycle reduce 32 pkts memcpy in each loop. > > So, buffer recycle has its own benefits. > > > > Testing status: > > (1) dpdk l3fwd test with multiple drivers: > > port 0: 82599 NIC port 1: XL710 NIC > > - > > Without fast free With fast free > > Thunderx2: +7.53% +13.54% > > - > > > > (2) dpdk l3fwd test with same driver: > > port 0 && 1: XL710 NIC > > - > > Without fast free With fast free > > Ampere altra: +12.61% +11.42% > > n1sdp: +8.30% +3.85% > > x86-sse:+8.43% +3.72% > > - > > > > (3) Performance comparison with ZC_mempool used > > port 0 && 1: XL710 NIC > > with fast free > > - > > With recycle buffer With zc_mempool > > Ampere altra: 11.42% 3.54% > > - > > > > Thanks for the perf test reports. > > Since test is done on Intel NICs, it would be great to get some testing and > performance numbers from Intel side too, if possible. Thanks for the reviewing. Actually, we have done the test in x86. From the performance number
Re: [RFC PATCH v1 0/4] dts: add dts api docs
On Mon, Apr 3, 2023 at 11:42 AM Bruce Richardson
wrote:
>
> On Mon, Apr 03, 2023 at 11:17:06AM +0200, Juraj Linkeš wrote:
> >Hi Bruce, Thomas,
> >The meson integration is kinda all over the place. I wanted to use the
> >existing conf.py Sphinx config file, but I also wanted to keep the docs
> >separated (because of extra DTS api docs dependencies), so the various
> >pieces are in different places (the config file in one place, meson
> >code in dts directory and generated Sphinx docs are in a new directory
> >in the api build dir, separate from the rest of the Sphinx html).
> >The big thing here is that I didn't figure out how to separate the dts
> >api build from the rest of the docs. I don't know how the -Denable_docs
> >option is supposed to work. I wanted to use -Denable_dts_docs in the
> >same fashion to decouple the builds, but it doesn't seem to work.
> >Reading the code I think the original option doesn't actually do
> >anything - does it work? How is it supposed to work?
> >Thanks,
> >Juraj
>
> The enable_docs option works by selectively enabling the doc build tasks
> using the "build_by_default" parameter on them.
> See http://git.dpdk.org/dpdk/tree/doc/guides/meson.build#n23 for an
> example. The custom_target for sphinx is not a dependency of any other
> task, so whether it gets run or not depends entirely on whether the
> "build_by_default" and/or "install" options are set.
>
> As usual, there may be other stuff that needs cleaning up on this, but
> that's how it works for now, anyway. [And it does actually work, last I
> tested it :-)]
I looked into this and as is so frequently the case, we're both right. :-)
When running according to docs, that is with:
1. meson setup doc_build
2. ninja -C doc_build doc
it doesn't matter what enable_docs is set to, it always builds the docs.
But in the full build it does control whether docs are built, i.e.:
1. meson setup doc_build
2. ninja -C doc_build
doesn't build the docs, whereas:
1. meson setup doc_build -Denable_docs=true
2. ninja -C doc_build
builds the docs.
Now the problem in this version is when doing just the doc build
(ninja -C doc_build doc) both DPDK and DTS docs are built and I'd like
to separate those (because DTS doc build has additional dependencies).
I'm thinking the following would be a good solution within the current
paradigm:
1. The -Denable_docs=true and -Denable_dts_docs=true options to
separate doc builds for the full build.
2. Separate dts doc dir for the doc build ("ninja -C doc_build doc"
for DPDK docs and "ninja -C doc_build dts" (or maybe some other dir)
for DTS docs).
What do you think?
Juraj
>
> /Bruce
Re: [RFC PATCH v1 0/4] dts: add dts api docs
On Tue, Apr 25, 2023 at 10:20:36AM +0200, Juraj Linkeš wrote:
> On Mon, Apr 3, 2023 at 11:42 AM Bruce Richardson
> wrote:
> >
> > On Mon, Apr 03, 2023 at 11:17:06AM +0200, Juraj Linkeš wrote:
> > >Hi Bruce, Thomas,
> > >The meson integration is kinda all over the place. I wanted to use the
> > >existing conf.py Sphinx config file, but I also wanted to keep the docs
> > >separated (because of extra DTS api docs dependencies), so the various
> > >pieces are in different places (the config file in one place, meson
> > >code in dts directory and generated Sphinx docs are in a new directory
> > >in the api build dir, separate from the rest of the Sphinx html).
> > >The big thing here is that I didn't figure out how to separate the dts
> > >api build from the rest of the docs. I don't know how the -Denable_docs
> > >option is supposed to work. I wanted to use -Denable_dts_docs in the
> > >same fashion to decouple the builds, but it doesn't seem to work.
> > >Reading the code I think the original option doesn't actually do
> > >anything - does it work? How is it supposed to work?
> > >Thanks,
> > >Juraj
> >
> > The enable_docs option works by selectively enabling the doc build tasks
> > using the "build_by_default" parameter on them.
> > See http://git.dpdk.org/dpdk/tree/doc/guides/meson.build#n23 for an
> > example. The custom_target for sphinx is not a dependency of any other
> > task, so whether it gets run or not depends entirely on whether the
> > "build_by_default" and/or "install" options are set.
> >
> > As usual, there may be other stuff that needs cleaning up on this, but
> > that's how it works for now, anyway. [And it does actually work, last I
> > tested it :-)]
>
> I looked into this and as is so frequently the case, we're both right. :-)
>
> When running according to docs, that is with:
> 1. meson setup doc_build
> 2. ninja -C doc_build doc
>
> it doesn't matter what enable_docs is set to, it always builds the docs.
>
Yes, I'd forgotten that. That was deliberately done so one could always
request a doc build directly, without having to worry about DPDK config or
building the rest of DPDK.
> But in the full build it does control whether docs are built, i.e.:
>
> 1. meson setup doc_build
> 2. ninja -C doc_build
> doesn't build the docs, whereas:
>
> 1. meson setup doc_build -Denable_docs=true
> 2. ninja -C doc_build
> builds the docs.
>
> Now the problem in this version is when doing just the doc build
> (ninja -C doc_build doc) both DPDK and DTS docs are built and I'd like
> to separate those (because DTS doc build has additional dependencies).
> I'm thinking the following would be a good solution within the current
> paradigm:
> 1. The -Denable_docs=true and -Denable_dts_docs=true options to
> separate doc builds for the full build.
> 2. Separate dts doc dir for the doc build ("ninja -C doc_build doc"
> for DPDK docs and "ninja -C doc_build dts" (or maybe some other dir)
> for DTS docs).
How important is it to separate out the dts docs from the regular docs?
What are the additional dependencies, and how hard are they to get? If
possible I'd rather not have an additional build config option added for
this.
If we are separating them out, I think the dts doc target should be
"dts_doc" rather than "dts" for clarity.
/Bruce
Re: [RFC PATCH v1 0/4] dts: add dts api docs
On Tue, Apr 25, 2023 at 10:44 AM Bruce Richardson
wrote:
>
> On Tue, Apr 25, 2023 at 10:20:36AM +0200, Juraj Linkeš wrote:
> > On Mon, Apr 3, 2023 at 11:42 AM Bruce Richardson
> > wrote:
> > >
> > > On Mon, Apr 03, 2023 at 11:17:06AM +0200, Juraj Linkeš wrote:
> > > >Hi Bruce, Thomas,
> > > >The meson integration is kinda all over the place. I wanted to use
> > > > the
> > > >existing conf.py Sphinx config file, but I also wanted to keep the
> > > > docs
> > > >separated (because of extra DTS api docs dependencies), so the
> > > > various
> > > >pieces are in different places (the config file in one place, meson
> > > >code in dts directory and generated Sphinx docs are in a new
> > > > directory
> > > >in the api build dir, separate from the rest of the Sphinx html).
> > > >The big thing here is that I didn't figure out how to separate the
> > > > dts
> > > >api build from the rest of the docs. I don't know how the
> > > > -Denable_docs
> > > >option is supposed to work. I wanted to use -Denable_dts_docs in the
> > > >same fashion to decouple the builds, but it doesn't seem to work.
> > > >Reading the code I think the original option doesn't actually do
> > > >anything - does it work? How is it supposed to work?
> > > >Thanks,
> > > >Juraj
> > >
> > > The enable_docs option works by selectively enabling the doc build tasks
> > > using the "build_by_default" parameter on them.
> > > See http://git.dpdk.org/dpdk/tree/doc/guides/meson.build#n23 for an
> > > example. The custom_target for sphinx is not a dependency of any other
> > > task, so whether it gets run or not depends entirely on whether the
> > > "build_by_default" and/or "install" options are set.
> > >
> > > As usual, there may be other stuff that needs cleaning up on this, but
> > > that's how it works for now, anyway. [And it does actually work, last I
> > > tested it :-)]
> >
> > I looked into this and as is so frequently the case, we're both right. :-)
> >
> > When running according to docs, that is with:
> > 1. meson setup doc_build
> > 2. ninja -C doc_build doc
> >
> > it doesn't matter what enable_docs is set to, it always builds the docs.
> >
>
> Yes, I'd forgotten that. That was deliberately done so one could always
> request a doc build directly, without having to worry about DPDK config or
> building the rest of DPDK.
>
> > But in the full build it does control whether docs are built, i.e.:
> >
> > 1. meson setup doc_build
> > 2. ninja -C doc_build
> > doesn't build the docs, whereas:
> >
> > 1. meson setup doc_build -Denable_docs=true
> > 2. ninja -C doc_build
> > builds the docs.
> >
> > Now the problem in this version is when doing just the doc build
> > (ninja -C doc_build doc) both DPDK and DTS docs are built and I'd like
> > to separate those (because DTS doc build has additional dependencies).
> > I'm thinking the following would be a good solution within the current
> > paradigm:
> > 1. The -Denable_docs=true and -Denable_dts_docs=true options to
> > separate doc builds for the full build.
> > 2. Separate dts doc dir for the doc build ("ninja -C doc_build doc"
> > for DPDK docs and "ninja -C doc_build dts" (or maybe some other dir)
> > for DTS docs).
>
> How important is it to separate out the dts docs from the regular docs?
It is mostly a matter of dependencies.
> What are the additional dependencies, and how hard are they to get? If
> possible I'd rather not have an additional build config option added for
> this.
The same dependencies as for running DTS, which are the proper Python
version (3.10 and newer) with DTS depencies obtained with Poetry
(which is a matter of installing Poetry and running it). As is
standard with Python projects, this is all set up in a virtual
environment, which needs to be activated before running the doc build.
It's documented in more detail in the tools docs:
https://doc.dpdk.org/guides/tools/dts.html#setting-up-dts-environment
This may be too much of a hassle for DPDK devs to build non-DTS docs,
but I don't know whether DPDK devs actually build docs at all.
>
> If we are separating them out, I think the dts doc target should be
> "dts_doc" rather than "dts" for clarity.
Agreed, but "dts_doc" would be a new top-level dir. I think we could
do dts/doc (a dir inside dts).
Juraj
>
> /Bruce
>
Re: [PATCH v2 00/17] use __atomic operations returning previous value
On Thu, Mar 2, 2023 at 5:18 PM Tyler Retzlaff
wrote:
>
> This series replaces uses of __atomic_{add,and,or,sub,xor}_fetch with
> __atomic_fetch_{add,and,or,sub,xor} intrinsics. The latter omits generation
> of code that is only needed if the returned value is actually used.
>
> Additionally, this change simplifies adapting dpdk to standard atomics
> planned for 23.07 since __atomic_fetch_xxx can be trivially replaced with
> atomic_fetch_xxx whereas __atomic_xxx_fetch has no standard equivalent.
>
>
> v2:
> net/iavf patch had one incorrect change to __atomic_fetch_sub
> from __atomic_sub_fetch the new value was assigned to a variable
> on the previous line so revert the change from the patch.
>
> Series-acked-by: Morten Brørup
>
> Tyler Retzlaff (17):
> vhost: use previous value atomic fetch operations
> telemetry: use previous value atomic fetch operations
> stack: use previous value atomic fetch operations
> eal: use previous value atomic fetch operations
> distributor: use previous value atomic fetch operations
> bbdev: use previous value atomic fetch operations
> examples/vhost: use previous value atomic fetch operations
> net/virtio: use previous value atomic fetch operations
> net/octeontx: use previous value atomic fetch operations
> net/mlx5: use previous value atomic fetch operations
> net/iavf: use previous value atomic fetch operations
> net/cxgbe: use previous value atomic fetch operations
> drivers/event: use previous value atomic fetch operations
> dma/skeleton: use previous value atomic fetch operations
> drivers/common: use previous value atomic fetch operations
> app/test: use previous value atomic fetch operations
> test-eventdev: use previous value atomic fetch operations
>
> app/test-eventdev/test_order_common.h| 2 +-
> app/test/test_lcores.c | 2 +-
> app/test/test_service_cores.c| 4 ++--
> drivers/common/cnxk/roc_nix_inl_dev.c| 2 +-
> drivers/common/mlx5/mlx5_common_mr.c | 2 +-
> drivers/common/mlx5/mlx5_common_utils.c | 10 +-
> drivers/common/mlx5/mlx5_malloc.c| 16
> drivers/dma/skeleton/skeleton_dmadev.c | 2 +-
> drivers/event/cnxk/cnxk_eventdev_selftest.c | 12 ++--
> drivers/event/cnxk/cnxk_tim_worker.h | 6 +++---
> drivers/event/dsw/dsw_event.c| 6 +++---
> drivers/event/octeontx/timvf_worker.h| 6 +++---
> drivers/net/cxgbe/clip_tbl.c | 2 +-
> drivers/net/cxgbe/cxgbe_main.c | 12 ++--
> drivers/net/cxgbe/l2t.c | 4 ++--
> drivers/net/cxgbe/mps_tcam.c | 2 +-
> drivers/net/cxgbe/smt.c | 4 ++--
> drivers/net/iavf/iavf_vchnl.c| 4 ++--
> drivers/net/mlx5/linux/mlx5_verbs.c | 2 +-
> drivers/net/mlx5/mlx5_flow.c | 6 +++---
> drivers/net/mlx5/mlx5_flow_dv.c | 4 ++--
> drivers/net/mlx5/mlx5_flow_flex.c| 6 +++---
> drivers/net/mlx5/mlx5_flow_hw.c | 10 +-
> drivers/net/mlx5/mlx5_flow_meter.c | 20 ++--
> drivers/net/mlx5/mlx5_rx.h | 2 +-
> drivers/net/octeontx/octeontx_ethdev.c | 2 +-
> drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
> examples/vhost/main.c| 12 ++--
> examples/vhost/virtio_net.c | 4 ++--
> lib/bbdev/rte_bbdev.c| 2 +-
> lib/distributor/rte_distributor.c| 2 +-
> lib/eal/common/eal_common_trace.c| 8
> lib/eal/common/rte_service.c | 8
> lib/eal/ppc/include/rte_atomic.h | 16
> lib/stack/rte_stack_lf_c11.h | 2 +-
> lib/telemetry/telemetry.c| 6 +++---
> lib/vhost/virtio_net.c | 6 +++---
> 37 files changed, 109 insertions(+), 109 deletions(-)
The changes are systematic and lgtm.
Series applied, thanks Tyler.
--
David Marchand
RE: [PATCH v4] net/idpf: add VF support
> -Original Message- > From: Xing, Beilei > Sent: Monday, April 24, 2023 8:45 PM > To: Wu, Jingjing > Cc: dev@dpdk.org; Xing, Beilei > Subject: [PATCH v4] net/idpf: add VF support > > From: Beilei Xing > > Support VF whose device id is 0x145c. > > Signed-off-by: Beilei Xing Acked-by: Jingjing Wu
Re: [PATCH v3 00/16] replace __atomic operations returning new value
On Mon, Mar 20, 2023 at 8:01 PM Tyler Retzlaff
wrote:
>
> This series replaces uses of __atomic_{add,and,or,sub,xor}_fetch with
> __atomic_fetch_{add,and,or,sub,xor} intrinsics where the new value
> is used.
>
> This series is being separated from the other similar series in
> an effort to reduce the chance of mistakes being spotted in review
> since the usages in this case consume the returned / new value.
>
> v3:
> * incorporate Reviewed-by and Acked-by received so far
> * rebase series on -rc3 to get a fresh CI run
>
> v2:
> * remove unnecessary casts of signed to unsigned arguments when
> using generic __atomic builtins.
> * remove inappropriate cast of signed negative value on addend.
>
> Tyler Retzlaff (16):
> app/test: use previous value atomic fetch operations
> common/cnxk: use previous value atomic fetch operations
> common/mlx5: use previous value atomic fetch operations
> drivers/event: use previous value atomic fetch operations
> net/af_xdp: use previous value atomic fetch operations
> net/cnxk: use previous value atomic fetch operations
> net/cxgbe: use previous value atomic fetch operations
> net/iavf: use previous value atomic fetch operations
> net/mlx5: use previous value atomic fetch operations
> net/octeontx: use previous value atomic fetch operations
> raw/ifpga: use previous value atomic fetch operations
> bbdev: use previous value atomic fetch operations
> eal: use previous value atomic fetch operations
> ipsec: use previous value atomic fetch operations
> mbuf: use previous value atomic fetch operations
> rcu: use previous value atomic fetch operations
>
> app/test/test_ring_perf.c | 2 +-
> drivers/common/cnxk/roc_ae.c| 2 +-
> drivers/common/cnxk/roc_ae_fpm_tables.c | 2 +-
> drivers/common/cnxk/roc_npa.c | 2 +-
> drivers/common/mlx5/linux/mlx5_nl.c | 2 +-
> drivers/common/mlx5/mlx5_common_mr.c| 8
> drivers/common/mlx5/mlx5_common_utils.c | 8
> drivers/event/cnxk/cnxk_tim_worker.h| 2 +-
> drivers/event/dsw/dsw_event.c | 4 ++--
> drivers/event/octeontx/timvf_worker.h | 2 +-
> drivers/net/af_xdp/rte_eth_af_xdp.c | 4 ++--
> drivers/net/cnxk/cn10k_tx.h | 4 ++--
> drivers/net/cxgbe/clip_tbl.c| 2 +-
> drivers/net/cxgbe/mps_tcam.c| 2 +-
> drivers/net/iavf/iavf_vchnl.c | 8
> drivers/net/mlx5/linux/mlx5_verbs.c | 2 +-
> drivers/net/mlx5/mlx5.c | 4 ++--
> drivers/net/mlx5/mlx5_flow.c| 8
> drivers/net/mlx5/mlx5_flow_dv.c | 12 ++--
> drivers/net/mlx5/mlx5_flow_hw.c | 14 +++---
> drivers/net/mlx5/mlx5_hws_cnt.c | 4 ++--
> drivers/net/mlx5/mlx5_rxq.c | 6 +++---
> drivers/net/mlx5/mlx5_txq.c | 2 +-
> drivers/net/octeontx/octeontx_ethdev.c | 2 +-
> drivers/raw/ifpga/ifpga_rawdev.c| 2 +-
> lib/bbdev/rte_bbdev.c | 4 ++--
> lib/eal/include/generic/rte_rwlock.h| 8
> lib/eal/ppc/include/rte_atomic.h| 16
> lib/ipsec/ipsec_sqn.h | 2 +-
> lib/mbuf/rte_mbuf.h | 12 ++--
> lib/rcu/rte_rcu_qsbr.h | 2 +-
> 31 files changed, 77 insertions(+), 77 deletions(-)
>
LGTM.
Series applied, thanks.
--
David Marchand
Re: [PATCH v2] devtools: stop compiler atomics with no C11 equivalent
On Tue, Apr 4, 2023 at 2:21 AM Tyler Retzlaff
wrote:
>
> Refrain from using compiler __atomic_{add,and,nand,or,sub,xor}_fetch()
> to ease future adoption of C11 standard atomics.
>
> Signed-off-by: Tyler Retzlaff
> ---
> devtools/checkpatches.sh | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
> index a07bbc8..1b6841b 100755
> --- a/devtools/checkpatches.sh
> +++ b/devtools/checkpatches.sh
> @@ -119,6 +119,14 @@ check_forbidden_additions() { #
> -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
> "$1" || res=1
>
> + # refrain from using compiler
> __atomic_{add,and,nand,or,sub,xor}_fetch()
> + awk -v FOLDERS="lib drivers app examples" \
> + -v EXPRESSIONS="__atomic_(add|and|nand|or|sub|xor)_fetch\\\("
> \
> + -v RET_ON_FAIL=1 \
> + -v MESSAGE='Using __atomic_op_fetch use __atomic_fetch_op
> instead' \
> + -f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
> + "$1" || res=1
> +
> # forbid use of __reserved which is a reserved keyword in Windows
> system headers
> awk -v FOLDERS="lib drivers app examples" \
> -v EXPRESSIONS='\\<__reserved\\>' \
> --
> 1.8.3.1
I tweaked the warning message a bit, and applied.
Thanks.
--
David Marchand
Re: [RFC 0/3] introduce coroutine library
On 2023-04-24 15:02, Chengwen Feng wrote: This patchset introduces the coroutine library which will help refactor the hns3 PMD's reset process. The hns3 single function reset process consists of the following steps: 1.stop_service(); 2.prepare_reset(); 3.delay(100ms); 4.notify_hw(); 5.wait_hw_reset_done(); // multiple sleep waits are involved. 6.reinit(); 7.restore_conf(); If the DPDK process take over multiple hns3 functions (e.g. 100), it's impractical to reset and restore functions in sequence: 1.proc_func(001); // will completed in 100+ms range. 2.proc_func(002); // will completed in 100~200+ms range. ... x.proc_func(100); // will completed in 9900~1+ms range. The later functions will process fail because it's too late to deal with. One solution is that create a reset thread for each function, and it will lead to large number of threads if the DPDK process take over multiple hns3 functions. So the current hns3 driver uses asynchronous mechanism, for examples, it use rte_eal_alarm_set() when process delay(100ms), it splits a serial process into multiple asynchronous processes, and the code is complex and difficult to understand. The coroutine is a good mechanism to provide programmers with the simplicity of keeping serial processes within a limited number of threads. Coroutines (or anything with a stack, really) are generally too slow as a vehicle for concurrency in data plane applications, I would argue. They might help you solve this particular slow path task, but that alone doesn't seem like anything close to a rationale why a new concurrency library should be accepted. DPDK does need a deferred work mechanism, but I don't think coroutines are the answer. Currently, RTE timer is the closest thing you have in DPDK. To solve your issue (and many other, including things in the fast path), I would rather look in that direction, maybe extending to something Linux' tasklets. This patchset use to build the coroutine framework, and it just provides a demo. More APIs maybe added in the future. In addition, we would like to ask the community whether it it possible to accept the library. If not, whether it is allowed to provide the library in hns3 PMD. Chengwen Feng (3): lib/coroutine: add coroutine library examples/coroutine: support coroutine examples net/hns3: refactor reset process with coroutine drivers/net/hns3/hns3_ethdev.c| 217 ++ drivers/net/hns3/hns3_ethdev.h| 3 + drivers/net/hns3/hns3_intr.c | 38 ++ drivers/net/hns3/meson.build | 2 +- examples/coroutine/main.c | 153 + examples/coroutine/meson.build| 10 ++ examples/meson.build | 1 + lib/coroutine/meson.build | 8 ++ lib/coroutine/rte_coroutine.c | 190 ++ lib/coroutine/rte_coroutine.h | 110 +++ lib/coroutine/rte_coroutine_imp.h | 46 +++ lib/coroutine/version.map | 11 ++ lib/meson.build | 1 + 13 files changed, 789 insertions(+), 1 deletion(-) create mode 100644 examples/coroutine/main.c create mode 100644 examples/coroutine/meson.build create mode 100644 lib/coroutine/meson.build create mode 100644 lib/coroutine/rte_coroutine.c create mode 100644 lib/coroutine/rte_coroutine.h create mode 100644 lib/coroutine/rte_coroutine_imp.h create mode 100644 lib/coroutine/version.map
Re: [RFC PATCH v1 0/4] dts: add dts api docs
On Tue, Apr 25, 2023 at 10:57:12AM +0200, Juraj Linkeš wrote:
> On Tue, Apr 25, 2023 at 10:44 AM Bruce Richardson
> wrote:
> >
> > On Tue, Apr 25, 2023 at 10:20:36AM +0200, Juraj Linkeš wrote:
> > > On Mon, Apr 3, 2023 at 11:42 AM Bruce Richardson
> > > wrote:
> > > >
> > > > On Mon, Apr 03, 2023 at 11:17:06AM +0200, Juraj Linkeš wrote:
> > > > >Hi Bruce, Thomas,
> > > > >The meson integration is kinda all over the place. I wanted to use
> > > > > the
> > > > >existing conf.py Sphinx config file, but I also wanted to keep the
> > > > > docs
> > > > >separated (because of extra DTS api docs dependencies), so the
> > > > > various
> > > > >pieces are in different places (the config file in one place, meson
> > > > >code in dts directory and generated Sphinx docs are in a new
> > > > > directory
> > > > >in the api build dir, separate from the rest of the Sphinx html).
> > > > >The big thing here is that I didn't figure out how to separate the
> > > > > dts
> > > > >api build from the rest of the docs. I don't know how the
> > > > > -Denable_docs
> > > > >option is supposed to work. I wanted to use -Denable_dts_docs in
> > > > > the
> > > > >same fashion to decouple the builds, but it doesn't seem to work.
> > > > >Reading the code I think the original option doesn't actually do
> > > > >anything - does it work? How is it supposed to work?
> > > > >Thanks,
> > > > >Juraj
> > > >
> > > > The enable_docs option works by selectively enabling the doc build tasks
> > > > using the "build_by_default" parameter on them.
> > > > See http://git.dpdk.org/dpdk/tree/doc/guides/meson.build#n23 for an
> > > > example. The custom_target for sphinx is not a dependency of any other
> > > > task, so whether it gets run or not depends entirely on whether the
> > > > "build_by_default" and/or "install" options are set.
> > > >
> > > > As usual, there may be other stuff that needs cleaning up on this, but
> > > > that's how it works for now, anyway. [And it does actually work, last I
> > > > tested it :-)]
> > >
> > > I looked into this and as is so frequently the case, we're both right. :-)
> > >
> > > When running according to docs, that is with:
> > > 1. meson setup doc_build
> > > 2. ninja -C doc_build doc
> > >
> > > it doesn't matter what enable_docs is set to, it always builds the docs.
> > >
> >
> > Yes, I'd forgotten that. That was deliberately done so one could always
> > request a doc build directly, without having to worry about DPDK config or
> > building the rest of DPDK.
> >
> > > But in the full build it does control whether docs are built, i.e.:
> > >
> > > 1. meson setup doc_build
> > > 2. ninja -C doc_build
> > > doesn't build the docs, whereas:
> > >
> > > 1. meson setup doc_build -Denable_docs=true
> > > 2. ninja -C doc_build
> > > builds the docs.
> > >
> > > Now the problem in this version is when doing just the doc build
> > > (ninja -C doc_build doc) both DPDK and DTS docs are built and I'd like
> > > to separate those (because DTS doc build has additional dependencies).
> > > I'm thinking the following would be a good solution within the current
> > > paradigm:
> > > 1. The -Denable_docs=true and -Denable_dts_docs=true options to
> > > separate doc builds for the full build.
> > > 2. Separate dts doc dir for the doc build ("ninja -C doc_build doc"
> > > for DPDK docs and "ninja -C doc_build dts" (or maybe some other dir)
> > > for DTS docs).
> >
> > How important is it to separate out the dts docs from the regular docs?
>
> It is mostly a matter of dependencies.
>
> > What are the additional dependencies, and how hard are they to get? If
> > possible I'd rather not have an additional build config option added for
> > this.
>
> The same dependencies as for running DTS, which are the proper Python
> version (3.10 and newer) with DTS depencies obtained with Poetry
> (which is a matter of installing Poetry and running it). As is
> standard with Python projects, this is all set up in a virtual
> environment, which needs to be activated before running the doc build.
> It's documented in more detail in the tools docs:
> https://doc.dpdk.org/guides/tools/dts.html#setting-up-dts-environment
>
> This may be too much of a hassle for DPDK devs to build non-DTS docs,
> but I don't know whether DPDK devs actually build docs at all.
>
Can't really say for sure. I suspect most don't build them on a daily
basis, but would often need to build them before submitting patches with a
doc change included.
What format are the DTS docs in? I agree that as described above the
requirements are pretty different than those for the regular DPDK docs.
> >
> > If we are separating them out, I think the dts doc target should be
> > "dts_doc" rather than "dts" for clarity.
>
> Agreed, but "dts_doc" would be a new top-level dir. I think we could
> do dts/doc (a dir inside dts).
>
That path seems reasonable to me.
/Bruce
[PATCH 1/5] common/cnxk: fix IPsec IPv6 tunnel address byte swap
Fix the IPsec IPv6 tunnel address bytes swap during SA
configurations in session create/update.
Fixes: 78d03027f2c ("common/cnxk: add IPsec common code")
Signed-off-by: Rahul Bhansali
---
drivers/common/cnxk/cnxk_security.c | 16
1 file changed, 16 insertions(+)
diff --git a/drivers/common/cnxk/cnxk_security.c
b/drivers/common/cnxk/cnxk_security.c
index 79427d48fe..13ca2c7791 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -274,6 +274,14 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa)
return size;
}
+static void
+ot_ipsec_update_ipv6_addr_endianness(uint64_t *addr)
+{
+ *addr = rte_be_to_cpu_64(*addr);
+ addr++;
+ *addr = rte_be_to_cpu_64(*addr);
+}
+
static int
ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa,
struct rte_security_ipsec_xform *ipsec_xfrm)
@@ -310,6 +318,10 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa
*sa,
memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
sizeof(struct in6_addr));
+ /* IP Source and Dest are in LE/CPU endian */
+ ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.src_addr);
+ ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.dst_addr);
+
break;
default:
return -EINVAL;
@@ -499,6 +511,10 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
sizeof(struct in6_addr));
+ /* IP Source and Dest are in LE/CPU endian */
+ ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.src_addr);
+ ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.dst_addr);
+
/* Outer header flow label source */
if (!ipsec_xfrm->options.copy_flabel) {
sa->w2.s.ipv4_df_src_or_ipv6_flw_lbl_src =
--
2.25.1
[PATCH 2/5] event/cnxk: set Rx offload flags
Configure event dev Rx offload flags with rx adapter
start/stop callbacks.
Signed-off-by: Rahul Bhansali
---
drivers/event/cnxk/cnxk_eventdev_adptr.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/event/cnxk/cnxk_eventdev_adptr.c
b/drivers/event/cnxk/cnxk_eventdev_adptr.c
index 5ec436382c..6d975362e8 100644
--- a/drivers/event/cnxk/cnxk_eventdev_adptr.c
+++ b/drivers/event/cnxk/cnxk_eventdev_adptr.c
@@ -331,9 +331,9 @@ int
cnxk_sso_rx_adapter_start(const struct rte_eventdev *event_dev,
const struct rte_eth_dev *eth_dev)
{
- RTE_SET_USED(event_dev);
- RTE_SET_USED(eth_dev);
-
+ struct cnxk_eth_dev *cnxk_eth_dev = eth_dev->data->dev_private;
+ struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+ dev->rx_offloads |= cnxk_eth_dev->rx_offload_flags;
return 0;
}
@@ -341,9 +341,9 @@ int
cnxk_sso_rx_adapter_stop(const struct rte_eventdev *event_dev,
const struct rte_eth_dev *eth_dev)
{
- RTE_SET_USED(event_dev);
RTE_SET_USED(eth_dev);
-
+ struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+ dev->rx_offloads = 0;
return 0;
}
--
2.25.1
[PATCH 3/5] event/cnxk: fix Tx adapter data pointer
Dpdk test application crashes when event inline IPsec test ran for
second time onwards.
In case of event device cleanup, Tx adapter data pointer is free
but not set back to NULL, which causes incomplete
initialization on next run.
Fixes: 6a24c7c4bcd ("event/cnxk: add Tx adapter freeing")
Signed-off-by: Rahul Bhansali
---
drivers/event/cnxk/cnxk_eventdev_adptr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/event/cnxk/cnxk_eventdev_adptr.c
b/drivers/event/cnxk/cnxk_eventdev_adptr.c
index 6d975362e8..9a02026ea6 100644
--- a/drivers/event/cnxk/cnxk_eventdev_adptr.c
+++ b/drivers/event/cnxk/cnxk_eventdev_adptr.c
@@ -635,6 +635,7 @@ cnxk_sso_tx_adapter_free(uint8_t id __rte_unused,
if (dev->tx_adptr_data_sz && dev->tx_adptr_active_mask == 0) {
dev->tx_adptr_data_sz = 0;
free(dev->tx_adptr_data);
+ dev->tx_adptr_data = NULL;
}
return 0;
--
2.25.1
[PATCH 4/5] event/cnxk: fix mempool cookies check
Fix for mempool cookies get mark to be done before
meta to mbuf processing.
Fixes: 7a709964d9b ("net/cnxk: use NPA batch burst free for meta buffers")
Signed-off-by: Rahul Bhansali
---
drivers/event/cnxk/cn10k_worker.h | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/event/cnxk/cn10k_worker.h
b/drivers/event/cnxk/cn10k_worker.h
index 06c71c6092..1e519d8156 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -22,9 +22,6 @@ cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf,
uint8_t port_id,
(flags & NIX_RX_OFFLOAD_TSTAMP_F ? 8 : 0);
struct rte_mbuf *mbuf = (struct rte_mbuf *)__mbuf;
- /* Mark mempool obj as "get" as it is alloc'ed by NIX */
- RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1);
-
cn10k_nix_cqe_to_mbuf((struct nix_cqe_hdr_s *)wqe, tag,
(struct rte_mbuf *)mbuf, lookup_mem,
mbuf_init | ((uint64_t)port_id) << 48, flags);
@@ -166,6 +163,10 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws,
uint64_t *u64,
mbuf = u64[1] - sizeof(struct rte_mbuf);
rte_prefetch0((void *)mbuf);
+
+ /* Mark mempool obj as "get" as it is alloc'ed by NIX */
+ RTE_MEMPOOL_CHECK_COOKIES(((struct rte_mbuf *)mbuf)->pool,
(void **)&mbuf, 1, 1);
+
if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
const uint64_t mbuf_init =
0x10001ULL | RTE_PKTMBUF_HEADROOM |
--
2.25.1
[PATCH 5/5] net/cnxk: add mempool check for frag attach
Add mempool cookies get mark to all frags in case of reassembly failure. Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cn10k_rx.h | 9 + 1 file changed, 9 insertions(+) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 9fdb5565e9..cbaf994aa2 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -211,6 +211,9 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr, /* Update dynamic field with userdata */ *rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata; + /* Mark frag as get */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); + cnxk_ip_reassembly_dynfield(mbuf, off)->nb_frags = hdr->w0.num_frags - 2; cnxk_ip_reassembly_dynfield(mbuf, off)->next_frag = NULL; @@ -239,6 +242,9 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr, /* Update dynamic field with userdata */ *rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata; + /* Mark frag as get */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); + cnxk_ip_reassembly_dynfield(mbuf, off)->nb_frags = hdr->w0.num_frags - 3; cnxk_ip_reassembly_dynfield(mbuf, off)->next_frag = NULL; @@ -263,6 +269,9 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr, mbuf->ol_flags = ol_flags; mbuf->next = NULL; + /* Mark frag as get */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); + /* Update dynamic field with userdata */ *rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata; -- 2.25.1
Re: [PATCH] app/testpmd: fix GTP L2 len in checksum engine
On 4/2/2023 5:56 PM, Raslan Darawsheh wrote:
GTP header can be followed by an optional 32 bits extension.
But, l2_len value statically set to RTE_ETHER_GTP_HLEN
which is defined to be
(sizeof(struct rte_udp_hdr) + sizeof(struct rte_gtp_hdr))
This fixes the l2_len to take into consideration the extension size.
Fixes: d8e5e69f3a9b ("app/testpmd: add GTP parsing and Tx checksum offload")
Cc: ting...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Raslan Darawsheh
Acked-by: Aman Singh
---
app/test-pmd/csumonly.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index fc85c22a77..b50b89367a 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -250,7 +250,7 @@ parse_gtp(struct rte_udp_hdr *udp_hdr,
info->l4_proto = 0;
}
- info->l2_len += RTE_ETHER_GTP_HLEN;
+ info->l2_len += gtp_len + sizeof(udp_hdr);
Macro is unused after above change.
So can be removed.
}
/* Parse a vxlan header */
Re: [PATCH] ci: switch to Fedora 37
Hello Aaron, On Fri, Apr 21, 2023 at 11:06 PM Aaron Conole wrote: > David Marchand writes: > > Fedora 35 has been declared EOL in 2022/12 (see [1]). > > Fedora 36 will soon be EOL too. > > > > Move to Fedora 37. > > Fedora 37 libbpf does not support AF_XDP anymore, now provided by > > libxdp. > > > > 1: https://docs.fedoraproject.org/en-US/releases/eol/ > > > > Signed-off-by: David Marchand > > --- > > Acked-by: Aaron Conole > > FYI, Fedora 38 also just got released. Perhaps that can be a candidate > as well, but I didn't try it out. At a first glance, gcc 13 raises some new warnings, at least for examples (ip-pipeline and ntb). We can switch to f38 once builds are fine with gcc 13. -- David Marchand
RE: [PATCH v10 1/2] mempool cache: add zero-copy get and put functions
PING mempool maintainers - ack/review or further comments to this series?
> > From: Kamalakshitha Aligeri [mailto:kamalakshitha.alig...@arm.com]
> > Sent: Friday, 24 February 2023 19.11
> >
> > From: = Morten Brørup
>
> This should be:
>
> From: Morten Brørup
>
> It could be fixed while merging. This is the only complaint in patchwork.
>
> >
> > Zero-copy access to mempool caches is beneficial for PMD performance,
> > and
> > must be provided by the mempool library to fix [Bug 1052] without a
> > performance regression.
> >
> > [Bug 1052]: https://bugs.dpdk.org/show_bug.cgi?id=1052
> >
> > Bugzilla ID: 1052
> >
> > Signed-off-by: Morten Brørup
> > Signed-off-by: Kamalakshitha Aligeri
>
> Can we get some reviews/acks on this please? I would like to see mempool zero-
> copy go into DPDK before 23.11.
>
> Please also note that the warnings and errors in patchwork regarding patch 2/2
> are bogus or unrelated.
>
> > ---
> > v10:
> > * Added mempool test cases with zero-copy API's
>
> For the parts not provided by myself, i.e. the test cases:
>
> Acked-by: Morten Brørup
>
> [...]
>
> > diff --git a/lib/mempool/version.map b/lib/mempool/version.map
> > index dff2d1cb55..06cb83ad9d 100644
> > --- a/lib/mempool/version.map
> > +++ b/lib/mempool/version.map
> > @@ -49,6 +49,15 @@ EXPERIMENTAL {
> > __rte_mempool_trace_get_contig_blocks;
> > __rte_mempool_trace_default_cache;
> > __rte_mempool_trace_cache_flush;
> > + __rte_mempool_trace_ops_populate;
> > + __rte_mempool_trace_ops_alloc;
> > + __rte_mempool_trace_ops_free;
> > + __rte_mempool_trace_set_ops_byname;
> > +
> > + # added in 23.03
>
> Time is passing, so now this should be updated to 23.07
>
> It could be fixed while merging.
>
> > + __rte_mempool_trace_cache_zc_put_bulk;
> > + __rte_mempool_trace_cache_zc_put_rewind;
> > + __rte_mempool_trace_cache_zc_get_bulk;
> > };
> >
> > INTERNAL {
[PATCH v2 0/4] app: introduce testgraph application
This patch series introduces testgraph application that verifies graph architecture, it provides an infra to verify the graph & node libraries and scale the test coverage by adding newer configurations to exercise various graph topologies & graph-walk models required by the DPDK applications. Also this series adds two new nodes (punt_kernel & kernel_recv) to the node library. V2: * Handle error checks in testgraph application * Extend supported test node patterns * Fix warnings Vamsi Attunuru (4): node: add pkt punt to kernel node node: add a node to receive pkts from kernel node: remove hardcoded node next details app: add testgraph application app/meson.build |1 + app/test-graph/cmdline.c| 211 app/test-graph/cmdline_graph.c | 294 ++ app/test-graph/cmdline_graph.h | 19 + app/test-graph/meson.build | 14 + app/test-graph/parameters.c | 157 +++ app/test-graph/testgraph.c | 1426 +++ app/test-graph/testgraph.h | 91 ++ doc/guides/prog_guide/graph_lib.rst | 17 + doc/guides/tools/index.rst |1 + doc/guides/tools/testgraph.rst | 131 +++ lib/node/ethdev_rx.c|2 - lib/node/kernel_recv.c | 276 ++ lib/node/kernel_recv_priv.h | 74 ++ lib/node/meson.build|2 + lib/node/punt_kernel.c | 125 +++ lib/node/punt_kernel_priv.h | 36 + 17 files changed, 2875 insertions(+), 2 deletions(-) create mode 100644 app/test-graph/cmdline.c create mode 100644 app/test-graph/cmdline_graph.c create mode 100644 app/test-graph/cmdline_graph.h create mode 100644 app/test-graph/meson.build create mode 100644 app/test-graph/parameters.c create mode 100644 app/test-graph/testgraph.c create mode 100644 app/test-graph/testgraph.h create mode 100644 doc/guides/tools/testgraph.rst create mode 100644 lib/node/kernel_recv.c create mode 100644 lib/node/kernel_recv_priv.h create mode 100644 lib/node/punt_kernel.c create mode 100644 lib/node/punt_kernel_priv.h -- 2.25.1
[PATCH v2 1/4] node: add pkt punt to kernel node
Patch adds a node to punt the packets to kernel over
a raw socket.
Signed-off-by: Vamsi Attunuru
---
doc/guides/prog_guide/graph_lib.rst | 10 +++
lib/node/meson.build| 1 +
lib/node/punt_kernel.c | 125
lib/node/punt_kernel_priv.h | 36
4 files changed, 172 insertions(+)
diff --git a/doc/guides/prog_guide/graph_lib.rst
b/doc/guides/prog_guide/graph_lib.rst
index 1cfdc86433..b3b5b14827 100644
--- a/doc/guides/prog_guide/graph_lib.rst
+++ b/doc/guides/prog_guide/graph_lib.rst
@@ -392,3 +392,13 @@ null
This node ignores the set of objects passed to it and reports that all are
processed.
+
+punt_kernel
+~~~
+This node punts the packets to kernel using a raw socket interface. For sending
+the received packets, raw socket uses the packet's destination IP address in
+sockaddr_in address structure and node uses ``sendto`` function to send data
+on the raw socket.
+
+Aftering sending the burst of packets to kernel, this node redirects the same
+objects to pkt_drop node to free up the packet buffers.
diff --git a/lib/node/meson.build b/lib/node/meson.build
index dbdf673c86..48c2da73f7 100644
--- a/lib/node/meson.build
+++ b/lib/node/meson.build
@@ -17,6 +17,7 @@ sources = files(
'null.c',
'pkt_cls.c',
'pkt_drop.c',
+'punt_kernel.c',
)
headers = files('rte_node_ip4_api.h', 'rte_node_eth_api.h')
# Strict-aliasing rules are violated by uint8_t[] to context size casts.
diff --git a/lib/node/punt_kernel.c b/lib/node/punt_kernel.c
new file mode 100644
index 00..e5dd15b759
--- /dev/null
+++ b/lib/node/punt_kernel.c
@@ -0,0 +1,125 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell International Ltd.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "node_private.h"
+#include "punt_kernel_priv.h"
+
+static __rte_always_inline void
+punt_kernel_process_mbuf(struct rte_node *node, struct rte_mbuf **mbufs,
uint16_t cnt)
+{
+ punt_kernel_node_ctx_t *ctx = (punt_kernel_node_ctx_t *)node->ctx;
+ struct sockaddr_in sin = {0};
+ struct rte_ipv4_hdr *ip4;
+ size_t len;
+ char *buf;
+ int i;
+
+ for (i = 0; i < cnt; i++) {
+ ip4 = rte_pktmbuf_mtod(mbufs[i], struct rte_ipv4_hdr *);
+ len = rte_pktmbuf_data_len(mbufs[i]);
+ buf = (char *)ip4;
+
+ sin.sin_family = AF_INET;
+ sin.sin_port = 0;
+ sin.sin_addr.s_addr = ip4->dst_addr;
+
+ if (sendto(ctx->sock, buf, len, 0, (struct sockaddr *)&sin,
sizeof(sin)) < 0)
+ node_err("punt_kernel", "Unable to send packets: %s\n",
strerror(errno));
+ }
+}
+
+static uint16_t
+punt_kernel_node_process(struct rte_graph *graph __rte_unused, struct rte_node
*node, void **objs,
+uint16_t nb_objs)
+{
+ struct rte_mbuf **pkts = (struct rte_mbuf **)objs;
+ uint16_t obj_left = nb_objs;
+
+#define PREFETCH_CNT 4
+
+ while (obj_left >= 12) {
+ /* Prefetch next-next mbufs */
+ rte_prefetch0(pkts[8]);
+ rte_prefetch0(pkts[9]);
+ rte_prefetch0(pkts[10]);
+ rte_prefetch0(pkts[11]);
+
+ /* Prefetch next mbuf data */
+ rte_prefetch0(rte_pktmbuf_mtod_offset(pkts[4], void *,
pkts[4]->l2_len));
+ rte_prefetch0(rte_pktmbuf_mtod_offset(pkts[5], void *,
pkts[5]->l2_len));
+ rte_prefetch0(rte_pktmbuf_mtod_offset(pkts[6], void *,
pkts[6]->l2_len));
+ rte_prefetch0(rte_pktmbuf_mtod_offset(pkts[7], void *,
pkts[7]->l2_len));
+
+ punt_kernel_process_mbuf(node, pkts, PREFETCH_CNT);
+
+ obj_left -= PREFETCH_CNT;
+ pkts += PREFETCH_CNT;
+ }
+
+ while (obj_left > 0) {
+ punt_kernel_process_mbuf(node, pkts, 1);
+
+ obj_left--;
+ pkts++;
+ }
+
+ rte_node_next_stream_move(graph, node, PUNT_KERNEL_NEXT_PKT_DROP);
+
+ return nb_objs;
+}
+
+static int
+punt_kernel_node_init(const struct rte_graph *graph __rte_unused, struct
rte_node *node)
+{
+ punt_kernel_node_ctx_t *ctx = (punt_kernel_node_ctx_t *)node->ctx;
+
+ ctx->sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+ if (ctx->sock < 0)
+ node_err("punt_kernel", "Unable to open RAW socket\n");
+
+ return 0;
+}
+
+static void
+punt_kernel_node_fini(const struct rte_graph *graph __rte_unused, struct
rte_node *node)
+{
+ punt_kernel_node_ctx_t *ctx = (punt_kernel_node_ctx_t *)node->ctx;
+
+ if (ctx->sock >= 0) {
+ close(ctx->sock);
+ ctx->sock = -1;
+ }
+}
+
+static struct rte_node_register punt_kernel_node_base = {
+ .process = punt_kernel_node_process,
+ .name = "punt_kernel",
+
+ .init =
[PATCH v2 2/4] node: add a node to receive pkts from kernel
Patch adds a node to receive packets from kernel
over a raw socket.
Signed-off-by: Vamsi Attunuru
---
doc/guides/prog_guide/graph_lib.rst | 7 +
lib/node/kernel_recv.c | 276
lib/node/kernel_recv_priv.h | 74
lib/node/meson.build| 1 +
4 files changed, 358 insertions(+)
diff --git a/doc/guides/prog_guide/graph_lib.rst
b/doc/guides/prog_guide/graph_lib.rst
index b3b5b14827..1057f16de8 100644
--- a/doc/guides/prog_guide/graph_lib.rst
+++ b/doc/guides/prog_guide/graph_lib.rst
@@ -402,3 +402,10 @@ on the raw socket.
Aftering sending the burst of packets to kernel, this node redirects the same
objects to pkt_drop node to free up the packet buffers.
+
+kernel_recv
+~~~
+This node receives packets from kernel over a raw socket interface. Uses
``poll``
+function to poll on the socket fd for ``POLLIN`` events to read the packets
from
+raw socket to stream buffer and does ``rte_node_next_stream_move()`` when there
+are received packets.
diff --git a/lib/node/kernel_recv.c b/lib/node/kernel_recv.c
new file mode 100644
index 00..9b28ad76d3
--- /dev/null
+++ b/lib/node/kernel_recv.c
@@ -0,0 +1,276 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell International Ltd.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "ethdev_rx_priv.h"
+#include "kernel_recv_priv.h"
+#include "node_private.h"
+
+static struct kernel_recv_node_main kernel_recv_main;
+
+static inline struct rte_mbuf *
+alloc_rx_mbuf(kernel_recv_node_ctx_t *ctx)
+{
+ kernel_recv_info_t *rx = ctx->recv_info;
+
+ if (rx->idx >= rx->cnt) {
+ uint16_t cnt;
+
+ rx->idx = 0;
+ rx->cnt = 0;
+
+ cnt = rte_pktmbuf_alloc_bulk(ctx->pktmbuf_pool, rx->rx_bufs,
KERN_RECV_CACHE_COUNT);
+ if (cnt <= 0)
+ return NULL;
+
+ rx->cnt = cnt;
+ }
+
+ return rx->rx_bufs[rx->idx++];
+}
+
+static inline void
+mbuf_update(struct rte_mbuf **mbufs, uint16_t nb_pkts)
+{
+ struct rte_net_hdr_lens hdr_lens;
+ struct rte_mbuf *m;
+ int i;
+
+ for (i = 0; i < nb_pkts; i++) {
+ m = mbufs[i];
+
+ m->packet_type = rte_net_get_ptype(m, &hdr_lens,
RTE_PTYPE_ALL_MASK);
+
+ m->ol_flags = 0;
+ m->tx_offload = 0;
+
+ m->l2_len = hdr_lens.l2_len;
+ m->l3_len = hdr_lens.l3_len;
+ m->l4_len = hdr_lens.l4_len;
+ }
+}
+
+static uint16_t
+recv_pkt_parse(void **objs, uint16_t nb_pkts)
+{
+ uint16_t pkts_left = nb_pkts;
+ struct rte_mbuf **pkts;
+ int i;
+
+ pkts = (struct rte_mbuf **)objs;
+
+ if (pkts_left >= 4) {
+ for (i = 0; i < 4; i++)
+ rte_prefetch0(rte_pktmbuf_mtod(pkts[i], void *));
+ }
+
+ while (pkts_left >= 12) {
+ /* Prefetch next-next mbufs */
+ rte_prefetch0(pkts[8]);
+ rte_prefetch0(pkts[9]);
+ rte_prefetch0(pkts[10]);
+ rte_prefetch0(pkts[11]);
+
+ /* Prefetch next mbuf data */
+ rte_prefetch0(rte_pktmbuf_mtod(pkts[4], void *));
+ rte_prefetch0(rte_pktmbuf_mtod(pkts[5], void *));
+ rte_prefetch0(rte_pktmbuf_mtod(pkts[6], void *));
+ rte_prefetch0(rte_pktmbuf_mtod(pkts[7], void *));
+
+ /* Extract ptype of mbufs */
+ mbuf_update(pkts, 4);
+
+ pkts += 4;
+ pkts_left -= 4;
+ }
+
+ if (pkts_left > 0)
+ mbuf_update(pkts, pkts_left);
+
+ return nb_pkts;
+}
+
+static uint16_t
+kernel_recv_node_do(struct rte_graph *graph, struct rte_node *node,
kernel_recv_node_ctx_t *ctx)
+{
+ kernel_recv_info_t *rx;
+ uint16_t next_index;
+ int fd;
+
+ rx = ctx->recv_info;
+ next_index = rx->cls_next;
+
+ fd = rx->sock;
+ if (fd > 0) {
+ struct rte_mbuf **mbufs;
+ uint16_t len = 0, count = 0;
+ int nb_cnt, i;
+
+ nb_cnt = (node->size >= RTE_GRAPH_BURST_SIZE) ?
RTE_GRAPH_BURST_SIZE : node->size;
+
+ mbufs = (struct rte_mbuf **)node->objs;
+ for (i = 0; i < nb_cnt; i++) {
+ struct rte_mbuf *m = alloc_rx_mbuf(ctx);
+
+ if (!m)
+ break;
+
+ len = read(fd, rte_pktmbuf_mtod(m, char *),
rte_pktmbuf_tailroom(m));
+ if (len == 0 || len == 0x) {
+ rte_pktmbuf_free(m);
+ if (rx->idx <= 0)
+ node_dbg("kernel_recv", "rx_mbuf array
is empty\n");
+
[PATCH v2 3/4] node: remove hardcoded node next details
For ethdev_rx node, node_next details can be populated during node cloning time and same gets assigned to node context structure during node initialization. Patch removes overriding node_next details in node init(). Signed-off-by: Vamsi Attunuru --- lib/node/ethdev_rx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/node/ethdev_rx.c b/lib/node/ethdev_rx.c index a19237b42f..85816c489c 100644 --- a/lib/node/ethdev_rx.c +++ b/lib/node/ethdev_rx.c @@ -194,8 +194,6 @@ ethdev_rx_node_init(const struct rte_graph *graph, struct rte_node *node) RTE_VERIFY(elem != NULL); - ctx->cls_next = ETHDEV_RX_NEXT_PKT_CLS; - /* Check and setup ptype */ return ethdev_ptype_setup(ctx->port_id, ctx->queue_id); } -- 2.25.1
[PATCH v2 4/4] app: add testgraph application
Patch adds test-graph application to validate graph
and node libraries.
Signed-off-by: Vamsi Attunuru
---
app/meson.build|1 +
app/test-graph/cmdline.c | 211 +
app/test-graph/cmdline_graph.c | 294 +++
app/test-graph/cmdline_graph.h | 19 +
app/test-graph/meson.build | 14 +
app/test-graph/parameters.c| 157
app/test-graph/testgraph.c | 1426
app/test-graph/testgraph.h | 91 ++
doc/guides/tools/index.rst |1 +
doc/guides/tools/testgraph.rst | 131 +++
10 files changed, 2345 insertions(+)
diff --git a/app/meson.build b/app/meson.build
index 74d2420f67..6c7b24e604 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -22,6 +22,7 @@ apps = [
'test-eventdev',
'test-fib',
'test-flow-perf',
+'test-graph',
'test-gpudev',
'test-mldev',
'test-pipeline',
diff --git a/app/test-graph/cmdline.c b/app/test-graph/cmdline.c
new file mode 100644
index 00..d9474d827a
--- /dev/null
+++ b/app/test-graph/cmdline.c
@@ -0,0 +1,211 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2023 Marvell International Ltd.
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "cmdline_graph.h"
+#include "testgraph.h"
+
+static struct cmdline *testgraph_cl;
+static cmdline_parse_ctx_t *main_ctx;
+
+/* *** Help command with introduction. *** */
+struct cmd_help_brief_result {
+ cmdline_fixed_string_t help;
+};
+
+static void
+cmd_help_brief_parsed(__rte_unused void *parsed_result, struct cmdline *cl,
__rte_unused void *data)
+{
+ cmdline_printf(cl,
+ "\n"
+ "Help is available for the following sections:\n\n"
+ "help control: Start and stop
graph walk.\n"
+ "help display: Displaying port,
stats and config "
+ "information.\n"
+ "help config : Configuration
information.\n"
+ "help all: All of the above
sections.\n\n");
+}
+
+static cmdline_parse_token_string_t cmd_help_brief_help =
+ TOKEN_STRING_INITIALIZER(struct cmd_help_brief_result, help, "help");
+
+static cmdline_parse_inst_t cmd_help_brief = {
+ .f = cmd_help_brief_parsed,
+ .data = NULL,
+ .help_str = "help: Show help",
+ .tokens = {
+ (void *)&cmd_help_brief_help,
+ NULL,
+ },
+};
+
+/* *** Help command with help sections. *** */
+struct cmd_help_long_result {
+ cmdline_fixed_string_t help;
+ cmdline_fixed_string_t section;
+};
+
+static void
+cmd_help_long_parsed(void *parsed_result, struct cmdline *cl, __rte_unused
void *data)
+{
+ int show_all = 0;
+ struct cmd_help_long_result *res = parsed_result;
+
+ if (!strcmp(res->section, "all"))
+ show_all = 1;
+
+ if (show_all || !strcmp(res->section, "control")) {
+
+ cmdline_printf(cl, "\n"
+ "Control forwarding:\n"
+ "---\n\n"
+
+ "start graph_walk\n"
+ " Start graph_walk on worker threads.\n\n"
+
+ "stop graph_walk\n"
+ " Stop worker threads from running
graph_walk.\n\n"
+
+ "quit\n"
+ "Quit to prompt.\n\n");
+ }
+
+ if (show_all || !strcmp(res->section, "display")) {
+
+ cmdline_printf(cl,
+ "\n"
+ "Display:\n"
+ "\n\n"
+
+ "show node_list\n"
+ " Display the list of supported nodes.\n\n"
+
+ "show graph_stats\n"
+ " Display the node statistics of graph
cluster.\n\n");
+ }
+
+ if (show_all || !strcmp(res->section, "config")) {
+ cmdline_printf(cl, "\n"
+ "Configuration:\n"
+ "--\n"
+ "set lcore_config
(port_id0,rxq0,lcore_idX),..."
+ ".,(port_idX,rxqX,lcoreidY)\n"
+ " Set lcore configuration.\n\n"
+
+ "create_graph
(node0_name,node1_name,...,nodeX_name)\n"
+ " Create graph instances using the provided
node details.\n\n"
+
+ "destroy_graph\n"
+ " Destroy the graph instances.\n\n");
+ }
+}
+
+static cmdline_parse_token_s
RE: [RFC] lib: set/get max memzone segments
Thank you, Tyler Retzlaff, for your comments.
> > --- a/app/test/test_memzone.c
> > +++ b/app/test/test_memzone.c
> > @@ -871,7 +871,7 @@ test_memzone_bounded(void) static int
> > test_memzone_free(void)
> > {
> > - const struct rte_memzone *mz[RTE_MAX_MEMZONE + 1];
> > + const struct rte_memzone *mz[rte_memzone_max_get() + 1];
>
> please no more VLAs even if in tests.
>
VLA replaced with dynamic allocation.
> > --- a/lib/eal/common/eal_common_memzone.c
> > +++ b/lib/eal/common/eal_common_memzone.c
> > @@ -22,6 +22,10 @@
> > #include "eal_private.h"
> > #include "eal_memcfg.h"
> >
> > +#define RTE_DEFAULT_MAX_MEMZONE 2560
> > +
> > +static uint32_t memzone_max = RTE_DEFAULT_MAX_MEMZONE;
>
> should be size_t
>
Ack
> > +int
> > +rte_memzone_max_set(uint32_t max)
>
> max should be size_t
>
> > +{
Ack
> > +uint32_t
> > +rte_memzone_max_get(void)
>
> should return size_t
>
Ack
RE: [RFC] lib: set/get max memzone segments
Thank you Morten Brorup and Thomas Monjalon for the fruitful discussion. I am sending a V2 version that meets the understandings in the RFC so far. If confirmed I will send PATCH V1.
[RFC V2] lib: set/get max memzone segments
In current DPDK the RTE_MAX_MEMZONE definition is unconditionally hard
coded as 2560. For applications requiring different values of this
parameter – it is more convenient to set the max value via an rte API -
rather than changing the dpdk source code per application. In many
organizations, the possibility to compile a private DPDK library for a
particular application does not exist at all. With this option there is
no need to recompile DPDK and it allows using an in-box packaged DPDK.
An example usage for updating the RTE_MAX_MEMZONE would be of an
application that uses the DPDK mempool library which is based on DPDK
memzone library. The application may need to create a number of
steering tables, each of which will require its own mempool allocation.
This commit is not about how to optimize the application usage of
mempool nor about how to improve the mempool implementation based on
memzone. It is about how to make the max memzone definition - run-time
customized.
This commit adds an API which must be called before rte_eal_init():
rte_memzone_max_set(int max). If not called, the default memzone
(RTE_MAX_MEMZONE) is used. There is also an API to query the effective
max memzone: rte_memzone_max_get().
Signed-off-by: Ophir Munk
---
app/test/test_func_reentrancy.c | 2 +-
app/test/test_malloc_perf.c | 2 +-
app/test/test_memzone.c | 43 -
config/rte_config.h | 1 -
drivers/net/qede/base/bcm_osal.c| 26 +-
drivers/net/qede/base/bcm_osal.h| 3 +++
drivers/net/qede/qede_main.c| 7 ++
lib/eal/common/eal_common_memzone.c | 28 +---
lib/eal/include/rte_memzone.h | 20 +
lib/eal/version.map | 4
10 files changed, 110 insertions(+), 26 deletions(-)
diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index d1ed5d4..ae9de6f 100644
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -51,7 +51,7 @@ typedef void (*case_clean_t)(unsigned lcore_id);
#define MEMPOOL_ELT_SIZE(sizeof(uint32_t))
#define MEMPOOL_SIZE(4)
-#define MAX_LCORES (RTE_MAX_MEMZONE / (MAX_ITER_MULTI * 4U))
+#define MAX_LCORES (rte_memzone_max_get() / (MAX_ITER_MULTI * 4U))
static uint32_t obj_count;
static uint32_t synchro;
diff --git a/app/test/test_malloc_perf.c b/app/test/test_malloc_perf.c
index ccec43a..9bd1662 100644
--- a/app/test/test_malloc_perf.c
+++ b/app/test/test_malloc_perf.c
@@ -165,7 +165,7 @@ test_malloc_perf(void)
return -1;
if (test_alloc_perf("rte_memzone_reserve", memzone_alloc, memzone_free,
- NULL, memset_us_gb, RTE_MAX_MEMZONE - 1) < 0)
+ NULL, memset_us_gb, rte_memzone_max_get() - 1) < 0)
return -1;
return 0;
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index c9255e5..36b9790 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -871,9 +871,18 @@ test_memzone_bounded(void)
static int
test_memzone_free(void)
{
- const struct rte_memzone *mz[RTE_MAX_MEMZONE + 1];
+ size_t mz_size;
+ const struct rte_memzone **mz;
int i;
char name[20];
+ int rc = -1;
+
+ mz_size = (rte_memzone_max_get() + 1) * sizeof(struct rte_memzone *);
+ mz = rte_zmalloc("memzone_test", mz_size, 0);
+ if (!mz) {
+ printf("Fail allocating memzone test array\n");
+ return rc;
+ }
mz[0] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone0"), 2000,
SOCKET_ID_ANY, 0);
@@ -881,42 +890,42 @@ test_memzone_free(void)
SOCKET_ID_ANY, 0);
if (mz[0] > mz[1])
- return -1;
+ goto exit_test;
if (!rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone0")))
- return -1;
+ goto exit_test;
if (!rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone1")))
- return -1;
+ goto exit_test;
if (rte_memzone_free(mz[0])) {
printf("Fail memzone free - tempzone0\n");
- return -1;
+ goto exit_test;
}
if (rte_memzone_lookup(TEST_MEMZONE_NAME("tempzone0"))) {
printf("Found previously free memzone - tempzone0\n");
- return -1;
+ goto exit_test;
}
mz[2] = rte_memzone_reserve(TEST_MEMZONE_NAME("tempzone2"), 2000,
SOCKET_ID_ANY, 0);
if (mz[2] > mz[1]) {
printf("tempzone2 should have gotten the free entry from
tempzone0\n");
- return -1;
+ goto exit_test;
}
if (rte_memzone_free(mz[2])) {
printf("Fail memzone free - tempzone2\n");
- return -1;
+ goto exit_test;
[PATCH v2 1/3] event/cnxk: use LMTST for enqueue new burst
From: Pavan Nikhilesh
Use LMTST when all events in the burst are enqueue with
rte_event:op as RTE_EVENT_OP_NEW i.e. events are enqueued
with the `rte_event_enqueue_new_burst` API.
Signed-off-by: Pavan Nikhilesh
---
v2 Changes:
- Fix spell check.
drivers/common/cnxk/hw/sso.h| 1 +
drivers/common/cnxk/roc_sso.c | 10 +-
drivers/common/cnxk/roc_sso.h | 3 +
drivers/event/cnxk/cn10k_eventdev.c | 9 +-
drivers/event/cnxk/cn10k_eventdev.h | 6 +-
drivers/event/cnxk/cn10k_worker.c | 304 +++-
drivers/event/cnxk/cn9k_eventdev.c | 2 +-
drivers/event/cnxk/cnxk_eventdev.c | 15 +-
drivers/event/cnxk/cnxk_eventdev.h | 4 +-
9 files changed, 338 insertions(+), 16 deletions(-)
diff --git a/drivers/common/cnxk/hw/sso.h b/drivers/common/cnxk/hw/sso.h
index 25deaa4c14..09b8d4955f 100644
--- a/drivers/common/cnxk/hw/sso.h
+++ b/drivers/common/cnxk/hw/sso.h
@@ -157,6 +157,7 @@
#define SSO_LF_GGRP_AQ_CNT (0x1c0ull)
#define SSO_LF_GGRP_AQ_THR (0x1e0ull)
#define SSO_LF_GGRP_MISC_CNT(0x200ull)
+#define SSO_LF_GGRP_OP_AW_LMTST (0x400ull)
#define SSO_AF_IAQ_FREE_CNT_MASK 0x3FFFull
#define SSO_AF_IAQ_RSVD_FREE_MASK 0x3FFFull
diff --git a/drivers/common/cnxk/roc_sso.c b/drivers/common/cnxk/roc_sso.c
index 4a6a5080f7..99a55e49b0 100644
--- a/drivers/common/cnxk/roc_sso.c
+++ b/drivers/common/cnxk/roc_sso.c
@@ -6,6 +6,7 @@
#include "roc_priv.h"
#define SSO_XAQ_CACHE_CNT (0x7)
+#define SSO_XAQ_SLACK(16)
/* Private functions. */
int
@@ -493,9 +494,13 @@ sso_hwgrp_init_xaq_aura(struct dev *dev, struct
roc_sso_xaq_data *xaq,
xaq->nb_xae = nb_xae;
- /* Taken from HRM 14.3.3(4) */
+ /** SSO will reserve up to 0x4 XAQ buffers per group when GetWork engine
+* is inactive and it might prefetch an additional 0x3 buffers due to
+* pipelining.
+*/
xaq->nb_xaq = (SSO_XAQ_CACHE_CNT * nb_hwgrp);
xaq->nb_xaq += PLT_MAX(1 + ((xaq->nb_xae - 1) / xae_waes), xaq->nb_xaq);
+ xaq->nb_xaq += SSO_XAQ_SLACK;
xaq->mem = plt_zmalloc(xaq_buf_size * xaq->nb_xaq, xaq_buf_size);
if (xaq->mem == NULL) {
@@ -537,7 +542,8 @@ sso_hwgrp_init_xaq_aura(struct dev *dev, struct
roc_sso_xaq_data *xaq,
* There should be a minimum headroom of 7 XAQs per HWGRP for SSO
* to request XAQ to cache them even before enqueue is called.
*/
- xaq->xaq_lmt = xaq->nb_xaq - (nb_hwgrp * SSO_XAQ_CACHE_CNT);
+ xaq->xaq_lmt =
+ xaq->nb_xaq - (nb_hwgrp * SSO_XAQ_CACHE_CNT) - SSO_XAQ_SLACK;
return 0;
npa_fill_fail:
diff --git a/drivers/common/cnxk/roc_sso.h b/drivers/common/cnxk/roc_sso.h
index e67797b046..a2bb6fcb22 100644
--- a/drivers/common/cnxk/roc_sso.h
+++ b/drivers/common/cnxk/roc_sso.h
@@ -7,6 +7,9 @@
#include "hw/ssow.h"
+#define ROC_SSO_AW_PER_LMT_LINE_LOG2 3
+#define ROC_SSO_XAE_PER_XAQ 352
+
struct roc_sso_hwgrp_qos {
uint16_t hwgrp;
uint8_t xaq_prcnt;
diff --git a/drivers/event/cnxk/cn10k_eventdev.c
b/drivers/event/cnxk/cn10k_eventdev.c
index 071ea5a212..855c92da83 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -91,8 +91,10 @@ cn10k_sso_hws_setup(void *arg, void *hws, uintptr_t grp_base)
uint64_t val;
ws->grp_base = grp_base;
- ws->fc_mem = (uint64_t *)dev->fc_iova;
+ ws->fc_mem = (int64_t *)dev->fc_iova;
ws->xaq_lmt = dev->xaq_lmt;
+ ws->fc_cache_space = dev->fc_cache_space;
+ ws->aw_lmt = ws->lmt_base;
/* Set get_work timeout for HWS */
val = NSEC2USEC(dev->deq_tmo_ns);
@@ -624,6 +626,7 @@ cn10k_sso_info_get(struct rte_eventdev *event_dev,
dev_info->driver_name = RTE_STR(EVENTDEV_NAME_CN10K_PMD);
cnxk_sso_info_get(dev, dev_info);
+ dev_info->max_event_port_enqueue_depth = UINT32_MAX;
}
static int
@@ -632,7 +635,7 @@ cn10k_sso_dev_configure(const struct rte_eventdev
*event_dev)
struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
int rc;
- rc = cnxk_sso_dev_validate(event_dev);
+ rc = cnxk_sso_dev_validate(event_dev, 1, UINT32_MAX);
if (rc < 0) {
plt_err("Invalid event device configuration");
return -EINVAL;
@@ -871,7 +874,7 @@ cn10k_sso_set_priv_mem(const struct rte_eventdev
*event_dev, void *lookup_mem)
for (i = 0; i < dev->nb_event_ports; i++) {
struct cn10k_sso_hws *ws = event_dev->data->ports[i];
ws->xaq_lmt = dev->xaq_lmt;
- ws->fc_mem = (uint64_t *)dev->fc_iova;
+ ws->fc_mem = (int64_t *)dev->fc_iova;
ws->tstamp = dev->tstamp;
if (lookup_mem)
ws->lookup_mem = lookup_mem;
diff --git a/drivers/event/cnxk/cn10k_eventdev.h
b/drivers/event/cnxk/cn10k_eventdev.h
index aaa01d1ec1..29567728cd 100644
--- a/drivers/event/cnxk/cn10k_eventdev.h
+++ b/drivers/e
[PATCH v2 2/3] app/eventdev: use enqueue new event burst routine
From: Pavan Nikhilesh
Use the `rte_event_enqueue_new_burst` routine to enqueue events
with rte_event::op as RTE_EVENT_OP_NEW. This allows PMDs to use
optimized enqueue routines.
Signed-off-by: Pavan Nikhilesh
---
app/test-eventdev/evt_options.c | 2 +-
app/test-eventdev/test_perf_common.c | 58 +---
2 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c
index b175c067cd..03fb3bfce0 100644
--- a/app/test-eventdev/evt_options.c
+++ b/app/test-eventdev/evt_options.c
@@ -27,7 +27,7 @@ evt_options_default(struct evt_options *opt)
opt->nb_flows = 1024;
opt->socket_id = SOCKET_ID_ANY;
opt->pool_sz = 16 * 1024;
- opt->prod_enq_burst_sz = 1;
+ opt->prod_enq_burst_sz = 0;
opt->wkr_deq_dep = 16;
opt->nb_pkts = (1ULL << 26); /* do ~64M packets */
opt->nb_timers = 1E8;
diff --git a/app/test-eventdev/test_perf_common.c
b/app/test-eventdev/test_perf_common.c
index fd434666cb..68af3cb346 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -131,8 +131,10 @@ perf_producer(void *arg)
uint32_t flow_counter = 0;
uint64_t count = 0;
struct perf_elt *m[BURST_SIZE + 1] = {NULL};
+ uint8_t enable_fwd_latency;
struct rte_event ev;
+ enable_fwd_latency = opt->fwd_latency;
if (opt->verbose_level > 1)
printf("%s(): lcore %d dev_id %d port=%d queue %d\n", __func__,
rte_lcore_id(), dev_id, port, p->queue_id);
@@ -151,13 +153,16 @@ perf_producer(void *arg)
for (i = 0; i < BURST_SIZE; i++) {
ev.flow_id = flow_counter++ % nb_flows;
ev.event_ptr = m[i];
- m[i]->timestamp = rte_get_timer_cycles();
- while (rte_event_enqueue_burst(dev_id,
- port, &ev, 1) != 1) {
+ if (enable_fwd_latency)
+ m[i]->timestamp = rte_get_timer_cycles();
+ while (rte_event_enqueue_new_burst(dev_id, port, &ev,
+ 1) != 1) {
if (t->done)
break;
rte_pause();
- m[i]->timestamp = rte_get_timer_cycles();
+ if (enable_fwd_latency)
+ m[i]->timestamp =
+ rte_get_timer_cycles();
}
}
count += BURST_SIZE;
@@ -171,7 +176,6 @@ perf_producer_burst(void *arg)
{
uint32_t i;
uint64_t timestamp;
- struct rte_event_dev_info dev_info;
struct prod_data *p = arg;
struct test_perf *t = p->t;
struct evt_options *opt = t->opt;
@@ -183,15 +187,13 @@ perf_producer_burst(void *arg)
uint32_t flow_counter = 0;
uint16_t enq = 0;
uint64_t count = 0;
- struct perf_elt *m[MAX_PROD_ENQ_BURST_SIZE + 1];
- struct rte_event ev[MAX_PROD_ENQ_BURST_SIZE + 1];
+ struct perf_elt *m[opt->prod_enq_burst_sz + 1];
+ struct rte_event ev[opt->prod_enq_burst_sz + 1];
uint32_t burst_size = opt->prod_enq_burst_sz;
+ uint8_t enable_fwd_latency;
- memset(m, 0, sizeof(*m) * (MAX_PROD_ENQ_BURST_SIZE + 1));
- rte_event_dev_info_get(dev_id, &dev_info);
- if (dev_info.max_event_port_enqueue_depth < burst_size)
- burst_size = dev_info.max_event_port_enqueue_depth;
-
+ enable_fwd_latency = opt->fwd_latency;
+ memset(m, 0, sizeof(*m) * (opt->prod_enq_burst_sz + 1));
if (opt->verbose_level > 1)
printf("%s(): lcore %d dev_id %d port=%d queue %d\n", __func__,
rte_lcore_id(), dev_id, port, p->queue_id);
@@ -212,19 +214,21 @@ perf_producer_burst(void *arg)
for (i = 0; i < burst_size; i++) {
ev[i].flow_id = flow_counter++ % nb_flows;
ev[i].event_ptr = m[i];
- m[i]->timestamp = timestamp;
+ if (enable_fwd_latency)
+ m[i]->timestamp = timestamp;
}
- enq = rte_event_enqueue_burst(dev_id, port, ev, burst_size);
+ enq = rte_event_enqueue_new_burst(dev_id, port, ev, burst_size);
while (enq < burst_size) {
- enq += rte_event_enqueue_burst(dev_id, port,
- ev + enq,
- burst_size - enq);
+ enq += rte_event_enqueue_new_burst(
+ dev_id, port, ev + enq, burst_size - enq)
[PATCH v2 3/3] app/eventdev: prevent mempool exhaustion
From: Pavan Nikhilesh
Prevent mempool exhaustion due to elements being stuck in lcore
local caches.
Signed-off-by: Pavan Nikhilesh
---
app/test-eventdev/test_perf_common.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/test-eventdev/test_perf_common.c
b/app/test-eventdev/test_perf_common.c
index 68af3cb346..5e0255cfeb 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -1859,34 +1859,35 @@ int
perf_mempool_setup(struct evt_test *test, struct evt_options *opt)
{
struct test_perf *t = evt_test_priv(test);
+ unsigned int cache_sz;
+ cache_sz = RTE_MIN(RTE_MEMPOOL_CACHE_MAX_SIZE, (opt->pool_sz / 1.5) /
t->nb_workers);
if (opt->prod_type == EVT_PROD_TYPE_SYNT ||
opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
t->pool = rte_mempool_create(test->name, /* mempool name */
opt->pool_sz, /* number of elements*/
sizeof(struct perf_elt), /* element size*/
- 512, /* cache size*/
+ cache_sz, /* cache size*/
0, NULL, NULL,
perf_elt_init, /* obj constructor */
NULL, opt->socket_id, 0); /* flags */
} else if (opt->prod_type == EVT_PROD_TYPE_EVENT_CRYPTO_ADPTR &&
- opt->crypto_op_type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
+ opt->crypto_op_type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
t->pool = rte_mempool_create(test->name, /* mempool name */
opt->pool_sz, /* number of elements*/
sizeof(struct perf_elt) +
modex_test_case.result_len,
/* element size*/
- 512, /* cache size*/
+ cache_sz, /* cache size*/
0, NULL, NULL,
NULL, /* obj constructor */
NULL, opt->socket_id, 0); /* flags */
} else {
t->pool = rte_pktmbuf_pool_create(test->name, /* mempool name */
opt->pool_sz, /* number of elements*/
- 512, /* cache size*/
+ cache_sz, /* cache size*/
0,
RTE_MBUF_DEFAULT_BUF_SIZE,
opt->socket_id); /* flags */
-
}
if (t->pool == NULL) {
--
2.25.1
[PATCH v3 2/4] build: determine execution environment at config time
Move execution environment determination and definitions to config. The
RTE_EXEC_ENV macros are actually used by libraries built before EAL.
Currently it does not matter that this is determined in lib/eal since
the definitions are consumed before anything is built including libs
built before lib/eal. By moving this logic to config it allows kvargs
and telemetry to be built without EAL.
No functional change intended.
Signed-off-by: Tyler Retzlaff
Acked-by: Bruce Richardson
---
config/meson.build | 8
lib/eal/meson.build | 8
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 9a3f499..d2b12db 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -14,6 +14,14 @@ foreach env:supported_exec_envs
set_variable('is_' + env, exec_env == env)
endforeach
+exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2}
+foreach env, id:exec_envs
+dpdk_conf.set('RTE_ENV_' + env.to_upper(), id)
+dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env))
+endforeach
+dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env])
+dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
+
# MS linker requires special treatment.
# TODO: use cc.get_linker_id() with Meson >= 0.54
is_ms_compiler = is_windows and (cc.get_id() == 'msvc')
diff --git a/lib/eal/meson.build b/lib/eal/meson.build
index 9aa941a..d5eeb07 100644
--- a/lib/eal/meson.build
+++ b/lib/eal/meson.build
@@ -10,14 +10,6 @@ if not is_windows
subdir('unix')
endif
-exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2}
-foreach env, id:exec_envs
-dpdk_conf.set('RTE_ENV_' + env.to_upper(), id)
-dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env))
-endforeach
-dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env])
-
-dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
subdir(exec_env)
subdir(arch_subdir)
--
1.8.3.1
[PATCH v3 1/4] build: unblock the use of the MSVC compiler
Detect when MSVC toolset is available and tweak toolchain arguments
where the meson build system offers no abstraction.
Signed-off-by: Tyler Retzlaff
Acked-by: Bruce Richardson
---
buildtools/meson.build | 10 +++---
config/meson.build | 21 ++---
config/x86/meson.build | 8 +---
lib/meson.build| 13 ++---
4 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/buildtools/meson.build b/buildtools/meson.build
index e1c600e..838c39f 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -4,7 +4,9 @@
pkgconf = find_program('pkg-config', 'pkgconf', required: false)
check_symbols = find_program('check-symbols.sh')
ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
-objdump = find_program('objdump', 'llvm-objdump')
+if cc.get_id() != 'msvc'
+objdump = find_program('objdump', 'llvm-objdump')
+endif
python3 = import('python').find_installation(required: false)
if python3.found()
@@ -18,8 +20,10 @@ map_to_win_cmd = py3 + files('map_to_win.py')
sphinx_wrapper = py3 + files('call-sphinx-build.py')
get_cpu_count_cmd = py3 + files('get-cpu-count.py')
get_numa_count_cmd = py3 + files('get-numa-count.py')
-binutils_avx512_check = (py3 + files('binutils-avx512-check.py') +
-[objdump] + cc.cmd_array())
+if cc.get_id() != 'msvc'
+binutils_avx512_check = (py3 + files('binutils-avx512-check.py') +
+[objdump] + cc.cmd_array())
+endif
# select library and object file format
pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
diff --git a/config/meson.build b/config/meson.build
index fa730a1..9a3f499 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -16,7 +16,8 @@ endforeach
# MS linker requires special treatment.
# TODO: use cc.get_linker_id() with Meson >= 0.54
-is_ms_linker = is_windows and (cc.get_id() == 'clang')
+is_ms_compiler = is_windows and (cc.get_id() == 'msvc')
+is_ms_linker = is_windows and (cc.get_id() == 'clang' or is_ms_compiler)
# set the major version, which might be used by drivers and libraries
# depending on the configuration options
@@ -130,11 +131,13 @@ dpdk_conf.set('RTE_MACHINE', cpu_instruction_set)
machine_args = []
# ppc64 does not support -march= at all, use -mcpu and -mtune for that
-if host_machine.cpu_family().startswith('ppc')
-machine_args += '-mcpu=' + cpu_instruction_set
-machine_args += '-mtune=' + cpu_instruction_set
-else
-machine_args += '-march=' + cpu_instruction_set
+if not is_ms_compiler
+if host_machine.cpu_family().startswith('ppc')
+machine_args += '-mcpu=' + cpu_instruction_set
+machine_args += '-mtune=' + cpu_instruction_set
+else
+machine_args += '-march=' + cpu_instruction_set
+endif
endif
toolchain = cc.get_id()
@@ -253,7 +256,11 @@ if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64')
== false
endif
# add -include rte_config to cflags
-add_project_arguments('-include', 'rte_config.h', language: 'c')
+if is_ms_compiler
+add_project_arguments('/FI', 'rte_config.h', language: 'c')
+else
+add_project_arguments('-include', 'rte_config.h', language: 'c')
+endif
# enable extra warnings and disable any unwanted warnings
# -Wall is added by default at warning level 1, and -Wextra
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 54345c4..11f0bcc 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -25,9 +25,11 @@ if cc.has_argument('-mavx512f')
endif
# we require SSE4.2 for DPDK
-if cc.get_define('__SSE4_2__', args: machine_args) == ''
-message('SSE 4.2 not enabled by default, explicitly enabling')
-machine_args += '-msse4'
+if not is_ms_compiler
+if cc.get_define('__SSE4_2__', args: machine_args) == ''
+message('SSE 4.2 not enabled by default, explicitly enabling')
+machine_args += '-msse4'
+endif
endif
base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2']
diff --git a/lib/meson.build b/lib/meson.build
index dc8aa4a..40c632a 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -241,9 +241,16 @@ foreach l:libraries
output: '@0@_exports.def'.format(libname))
lk_deps += [def_file]
-lk_args = ['-Wl,/def:' + def_file.full_path()]
-if meson.version().version_compare('<0.54.0')
-lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a']
+if is_ms_compiler
+lk_args = ['/def:' + def_file.full_path()]
+if meson.version().version_compare('<0.54.0')
+lk_args += ['/implib:lib\\librte_' + l + '.dll.a']
+endif
+else
+lk_args = ['-Wl,/def:' + def_file.full_path()]
+if meson.version().version_compare('<0.54.0')
+lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a']
+endif
endif
else
if is_windows
--
1.8.3.1
[PATCH v3 0/4] enable use of the MSVC compiler
Introduce minimum changes to the build system to allow use of the MSVC compiler. This change is intended to enable a phased approach to allowing DPDK to built with MSVC. Building with MSVC removes barriers to enterprise customers use of DPDK who have constraints around security policy, compliance and functional requirements. v3: * enable compilation with C11 optional atomics * enable compilation with C23 typeof operator * disable microsoft secure crt checks (dpdk code fails) * force use of intrinsics v2: * moved checks to skip drivers, apps, usertools directories in to /meson.build file and removed conditional check from root meson.build (patch 3/3). Tyler Retzlaff (4): build: unblock the use of the MSVC compiler build: determine execution environment at config time build: limit what is built when using MSVC compiler build: enable MSVC specific compiler options app/meson.build| 5 + buildtools/meson.build | 10 +++--- config/meson.build | 37 ++--- config/x86/meson.build | 8 +--- drivers/meson.build| 4 lib/eal/meson.build| 8 lib/meson.build| 20 +--- usertools/meson.build | 4 8 files changed, 72 insertions(+), 24 deletions(-) -- 1.8.3.1
[PATCH v3 3/4] build: limit what is built when using MSVC compiler
Build only kvargs and telemetry when is_ms_compiler.
Signed-off-by: Tyler Retzlaff
Acked-by: Bruce Richardson
---
app/meson.build | 5 +
drivers/meson.build | 4
lib/meson.build | 7 +++
usertools/meson.build | 4
4 files changed, 20 insertions(+)
diff --git a/app/meson.build b/app/meson.build
index 74d2420..94fd7c9 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,6 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
+if is_ms_compiler
+enabled_apps = []
+subdir_done()
+endif
+
disable_apps = ',' + get_option('disable_apps')
disable_apps = run_command(list_dir_globs, disable_apps, check:
true).stdout().split()
diff --git a/drivers/meson.build b/drivers/meson.build
index 74ae8cb..749ec20 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -1,6 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
+if is_ms_compiler
+subdir_done()
+endif
+
fs = import('fs')
# Defines the order of dependencies evaluation
diff --git a/lib/meson.build b/lib/meson.build
index 40c632a..777d3d3 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -66,6 +66,13 @@ libraries = [
'node',
]
+if is_ms_compiler
+libraries = [
+'kvargs',
+'telemetry',
+]
+endif
+
optional_libs = [
'bitratestats',
'cfgfile',
diff --git a/usertools/meson.build b/usertools/meson.build
index b6271a2..1a56248 100644
--- a/usertools/meson.build
+++ b/usertools/meson.build
@@ -1,6 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_ms_compiler
+subdir_done()
+endif
+
install_data([
'dpdk-devbind.py',
'dpdk-pmdinfo.py',
--
1.8.3.1
[PATCH v3 4/4] build: enable MSVC specific compiler options
* Enable optional use of C11 atomics support.
* Enable use of C23 typeof operator.
* Explicitly force intrinsics when building with MSVC.
* Disable MSVC C runtime checks.
Signed-off-by: Tyler Retzlaff
---
config/meson.build | 8
1 file changed, 8 insertions(+)
diff --git a/config/meson.build b/config/meson.build
index d2b12db..9484449 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -27,6 +27,14 @@ dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
is_ms_compiler = is_windows and (cc.get_id() == 'msvc')
is_ms_linker = is_windows and (cc.get_id() == 'clang' or is_ms_compiler)
+# MS compiler (except x86) does not support inline assembly
+if is_ms_compiler
+dpdk_conf.set('_CRT_SECURE_NO_WARNINGS', 1)
+dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
+add_project_arguments('/experimental:c11atomics', language: 'c')
+add_project_arguments('/d1experimental:typeof', language: 'c')
+endif
+
# set the major version, which might be used by drivers and libraries
# depending on the configuration options
pver = meson.project_version().split('.')
--
1.8.3.1
[PATCH] net/tap: Set locally administered bit with a fixed MAC address
When the tap driver is loaded and the user selects the optional
"mac=fixed" setting, the tap driver incorrectly uses a globally
unique EUI-48 identifier (as documented in RFC 7042) of
00:64:74:61:70:. Since this is a locally generated ID,
the Local bit in the MAC address should be set to 1, resulting in
the new address 02:64:74:61:70:.
Bugzilla ID: 1198
Signed-off-by: David Christensen
---
doc/guides/nics/tap.rst | 8
drivers/net/tap/rte_eth_tap.c| 4 ++--
examples/ipsec-secgw/test/common_defs.sh | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst
index 2f7417bddd..07df0d35a2 100644
--- a/doc/guides/nics/tap.rst
+++ b/doc/guides/nics/tap.rst
@@ -34,14 +34,14 @@ Using the option ``mac=fixed`` you can create a fixed known
MAC address::
The MAC address will have a fixed value with the last octet incrementing by one
for each interface string containing ``mac=fixed``. The MAC address is
formatted
-as 00:'d':'t':'a':'p':[00-FF]. Convert the characters to hex and you get the
-actual MAC address: ``00:64:74:61:70:[00-FF]``.
+as 02:'d':'t':'a':'p':[00-FF]. Convert the characters to hex and you get the
+actual MAC address: ``02:64:74:61:70:[00-FF]``.
- --vdev=net_tap0,mac="00:64:74:61:70:11"
+ --vdev=net_tap0,mac="02:64:74:61:70:11"
The MAC address will have a user value passed as string. The MAC address is in
format with delimiter ``:``. The string is byte converted to hex and you get
-the actual MAC address: ``00:64:74:61:70:11``.
+the actual MAC address: ``02:64:74:61:70:11``.
It is possible to specify a remote netdevice to capture packets from by adding
``remote=foo1``, for example::
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 089ac202fa..bf98f75559 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -2303,8 +2303,8 @@ set_mac_type(const char *key __rte_unused,
if (!strncasecmp(ETH_TAP_MAC_FIXED, value, strlen(ETH_TAP_MAC_FIXED))) {
static int iface_idx;
- /* fixed mac = 00:64:74:61:70: */
- memcpy((char *)user_mac->addr_bytes, "\0dtap",
+ /* fixed mac = 02:64:74:61:70: */
+ memcpy((char *)user_mac->addr_bytes, "\002dtap",
RTE_ETHER_ADDR_LEN);
user_mac->addr_bytes[RTE_ETHER_ADDR_LEN - 1] =
iface_idx++ + '0';
diff --git a/examples/ipsec-secgw/test/common_defs.sh
b/examples/ipsec-secgw/test/common_defs.sh
index 3ef06bc761..6e04ffc1a6 100644
--- a/examples/ipsec-secgw/test/common_defs.sh
+++ b/examples/ipsec-secgw/test/common_defs.sh
@@ -26,7 +26,7 @@ fi
LOCAL_IFACE=dtap0
-LOCAL_MAC="00:64:74:61:70:30"
+LOCAL_MAC="02:64:74:61:70:30"
REMOTE_IPV4=192.168.31.14
LOCAL_IPV4=192.168.31.92
--
2.31.1
Re: [PATCH] ci: switch to Fedora 37
On Tue, 25 Apr 2023 15:13:50 +0200 David Marchand wrote: > Hello Aaron, > > On Fri, Apr 21, 2023 at 11:06 PM Aaron Conole wrote: > > David Marchand writes: > > > Fedora 35 has been declared EOL in 2022/12 (see [1]). > > > Fedora 36 will soon be EOL too. > > > > > > Move to Fedora 37. > > > Fedora 37 libbpf does not support AF_XDP anymore, now provided by > > > libxdp. > > > > > > 1: https://docs.fedoraproject.org/en-US/releases/eol/ > > > > > > Signed-off-by: David Marchand > > > --- > > > > Acked-by: Aaron Conole > > > > FYI, Fedora 38 also just got released. Perhaps that can be a candidate > > as well, but I didn't try it out. > > At a first glance, gcc 13 raises some new warnings, at least for > examples (ip-pipeline and ntb). > We can switch to f38 once builds are fine with gcc 13. What errors, just tried and current main branch builds clean on new F38 VM.
Re: [PATCH] net/tap: Set locally administered bit with a fixed MAC address
On Tue, 25 Apr 2023 16:58:06 -0400 David Christensen wrote: > When the tap driver is loaded and the user selects the optional > "mac=fixed" setting, the tap driver incorrectly uses a globally > unique EUI-48 identifier (as documented in RFC 7042) of > 00:64:74:61:70:. Since this is a locally generated ID, > the Local bit in the MAC address should be set to 1, resulting in > the new address 02:64:74:61:70:. > > Bugzilla ID: 1198 > > Signed-off-by: David Christensen Acked-by: Stephen Hemminger
RE: [PATCH v2 0/5] fix Rx data buffer size
> -Original Message-
> From: Wu, Wenjun1
> Sent: Friday, April 14, 2023 1:48 PM
> To: dev@dpdk.org; Zhang, Yuying ; Xing, Beilei
> ; Wu, Jingjing ; Yang,
> Qiming ; Zhang, Qi Z
> Cc: Wu, Wenjun1
> Subject: [PATCH v2 0/5] fix Rx data buffer size
>
> This patch set fixes RX data buffer size in ice, i40e, iavf and idpf driver.
>
> 1. Limit the maximum buffer size to no more than 16K - 128.
Confirmed with author, this target to align with hardware spec, added related
explanation in commit log.
> 2. Align max buffer size to 128, or replace RTE_ALIGN with
> RTE_ALIGN_FLOOR according to [1].
>
> [1] Commit c9c45beb1b97 ("net/iavf: fix Rx queue buffer size alignment")
>
> ---
> v2: fix commit log
>
> Wenjun Wu (5):
> net/i40e: fix Rx data buffer size
> net/ice: fix Rx data buffer size
> net/iavf: fix Rx data buffer size
> net/idpf: fix Rx data buffer size
> net/cpfl: fix Rx data buffer size
>
> drivers/common/idpf/idpf_common_rxtx.h | 3 +++
> drivers/net/cpfl/cpfl_rxtx.c | 3 ++-
> drivers/net/i40e/i40e_rxtx.c | 2 ++
> drivers/net/i40e/i40e_rxtx.h | 3 +++
> drivers/net/iavf/iavf_rxtx.c | 1 +
> drivers/net/iavf/iavf_rxtx.h | 3 +++
> drivers/net/ice/ice_dcf_ethdev.c | 3 ++-
> drivers/net/ice/ice_rxtx.c | 3 ++-
> drivers/net/ice/ice_rxtx.h | 3 +++
> drivers/net/idpf/idpf_rxtx.c | 6 --
> 10 files changed, 25 insertions(+), 5 deletions(-)
>
> --
> 2.34.1
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
RE: [PATCH v4] net/idpf: add VF support
> -Original Message- > From: Wu, Jingjing > Sent: Tuesday, April 25, 2023 5:11 PM > To: Xing, Beilei > Cc: dev@dpdk.org > Subject: RE: [PATCH v4] net/idpf: add VF support > > > > > -Original Message- > > From: Xing, Beilei > > Sent: Monday, April 24, 2023 8:45 PM > > To: Wu, Jingjing > > Cc: dev@dpdk.org; Xing, Beilei > > Subject: [PATCH v4] net/idpf: add VF support > > > > From: Beilei Xing > > > > Support VF whose device id is 0x145c. > > > > Signed-off-by: Beilei Xing > Acked-by: Jingjing Wu Applied to dpdk-next-net-intel. Thanks Qi
RE: [PATCH v5] common/idpf: refine capability get
> -Original Message- > From: Xing, Beilei > Sent: Monday, April 24, 2023 4:08 PM > To: Wu, Jingjing > Cc: dev@dpdk.org; Xing, Beilei > Subject: [PATCH v5] common/idpf: refine capability get > > From: Beilei Xing > > Initialize required capability in PMD, and refine > idpf_vc_caps_get function. Then different PMDs can > require different capability. > > Signed-off-by: Beilei Xing Acked-by: Jingjing Wu
Re: [PATCH] ci: switch to Fedora 37
On Wed, Apr 26, 2023 at 1:20 AM Stephen Hemminger
wrote:
> > > FYI, Fedora 38 also just got released. Perhaps that can be a candidate
> > > as well, but I didn't try it out.
> >
> > At a first glance, gcc 13 raises some new warnings, at least for
> > examples (ip-pipeline and ntb).
> > We can switch to f38 once builds are fine with gcc 13.
>
> What errors, just tried and current main branch builds clean on new F38 VM.
Fixes welcome:
[root@7e1b3663cd03 dpdk]# cat /etc/redhat-release
Fedora release 38 (Thirty Eight)
[root@7e1b3663cd03 dpdk]# rpm -q gcc
gcc-13.0.1-0.12.fc38.x86_64
[root@7e1b3663cd03 dpdk]# ninja -C build -
ninja: Entering directory `build'
[1/4] cc -Iexamples/dpdk-ip_pipeline.p -Iexamples -I../examples
-Iexamples/ip_pipeline -I../examples/ip_pipeline -I../examples/common
-I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include
-Ilib/eal/x86/include -I../lib/eal/x86/include -Ilib/eal/common
-I../lib/eal/common -Ilib/eal -I../lib/eal -Ilib/kvargs
-I../lib/kvargs -Ilib/metrics -I../lib/metrics -Ilib/telemetry
-I../lib/telemetry -Ilib/mempool -I../lib/mempool -Ilib/ring
-I../lib/ring -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf
-Ilib/ethdev -I../lib/ethdev -Ilib/meter -I../lib/meter -Ilib/cmdline
-I../lib/cmdline -Ilib/pipeline -I../lib/pipeline -Ilib/port
-I../lib/port -Ilib/sched -I../lib/sched -Ilib/ip_frag
-I../lib/ip_frag -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu
-Ilib/cryptodev -I../lib/cryptodev -Ilib/eventdev -I../lib/eventdev
-Ilib/timer -I../lib/timer -Ilib/table -I../lib/table -Ilib/lpm
-I../lib/lpm -Ilib/acl -I../lib/acl -Ilib/ipsec -I../lib/ipsec
-Ilib/security -I../lib/security -Idrivers/bus/pci
-I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci
-fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch
-Wextra -O3 -include rte_config.h -Wcast-qual -Wdeprecated -Wformat
-Wformat-nonliteral -Wformat-security -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Wold-style-definition
-Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef
-Wwrite-strings -Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE
-march=native -Wno-format-truncation -DALLOW_EXPERIMENTAL_API -MD -MQ
examples/dpdk-ip_pipeline.p/ip_pipeline_thread.c.o -MF
examples/dpdk-ip_pipeline.p/ip_pipeline_thread.c.o.d -o
examples/dpdk-ip_pipeline.p/ip_pipeline_thread.c.o -c
../examples/ip_pipeline/thread.c
In function ‘thread_msg_handle’,
inlined from ‘thread_main’ at ../examples/ip_pipeline/thread.c:3130:6:
../examples/ip_pipeline/thread.c:535:20: warning: ‘req’ may be used
uninitialized [-Wmaybe-uninitialized]
535 | if (req == NULL)
|^
../examples/ip_pipeline/thread.c: In function ‘thread_main’:
../examples/ip_pipeline/thread.c:433:32: note: ‘req’ was declared here
433 | struct thread_msg_req *req;
|^~~
[2/4] cc -Iexamples/dpdk-ntb.p -Iexamples -I../examples -Iexamples/ntb
-I../examples/ntb -I../examples/common -I. -I.. -Iconfig -I../config
-Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include
-I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common
-Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/metrics
-I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/mempool
-I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/net -I../lib/net
-Ilib/mbuf -I../lib/mbuf -Ilib/ethdev -I../lib/ethdev -Ilib/meter
-I../lib/meter -Ilib/cmdline -I../lib/cmdline -Ilib/rawdev
-I../lib/rawdev -Idrivers/raw/ntb -I../drivers/raw/ntb -Ilib/pci
-I../lib/pci -Idrivers/bus/pci -I../drivers/bus/pci
-I../drivers/bus/pci/linux -fdiagnostics-color=always -Wall
-Winvalid-pch -Wextra -O3 -include rte_config.h -Wcast-qual
-Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wold-style-definition -Wpointer-arith -Wsign-compare
-Wstrict-prototypes -Wundef -Wwrite-strings
-Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE
-march=native -Wno-format-truncation -D_FILE_OFFSET_BITS=64
-DALLOW_EXPERIMENTAL_API -MD -MQ examples/dpdk-ntb.p/ntb_ntb_fwd.c.o
-MF examples/dpdk-ntb.p/ntb_ntb_fwd.c.o.d -o
examples/dpdk-ntb.p/ntb_ntb_fwd.c.o -c ../examples/ntb/ntb_fwd.c
../examples/ntb/ntb_fwd.c: In function ‘ntb_stats_display’:
../examples/ntb/ntb_fwd.c:945:23: warning: ‘rte_rawdev_xstats_get’
accessing 8 bytes in a region of size 0 [-Wstringop-overflow=]
945 | if (nb_ids != rte_rawdev_xstats_get(dev_id, ids,
values, nb_ids)) {
| ^~
../examples/ntb/ntb_fwd.c:945:23: note: referencing argument 3 of type
‘uint64_t[0]’ {aka ‘long unsigned int[]’}
In file included from ../examples/ntb/ntb_fwd.c
Re: [PATCH] usertools: enhance CPU layout
Le 21/04/2023 à 17:15, Stephen Hemminger a écrit : Better to understand more about our opinion of this script before send a v2 patch. I've used 'lstopo'. It's a great tool. To my opinion, considering there're Linux tools to show all kinds of information, the reason that DPDK has its own tool is to summarize and emphasize the information that is important to DPDK. Here it's that some cores are more powerful than others. When the users use a testpmd-like APP, they can choose the appropriate cores after DPDK reminds them about the difference between cores. Add Thomas for more suggestions. Thanks. Adding Brice, hwloc maintainer. I think it would be better to contribute to the hwloc project. If we need a different set of info, we can probably tune it with options. The script had a purpose which was back when DPDK was first started. But as systems get more complex, it becomes something that has to deal with lots of corner cases; and if some other tool can it then that is better. Hello Indeed, hwloc/lstopo should be able to do something similar to that script. I didn't see anything network-related in the script, does it only show CPU info? Regarding the original patch, we already support all levels or caches, dies, clusters, etc. Hybrid CPUs are also detected but they are only nicely shown in the graphical output [1]. The textual output only says at the very end that there are two kinds and the bitmask of CPUs for each. I am open to improving this. Brice [1] https://twitter.com/bgoglin/status/1542117836008706049/photo/1 OpenPGP_signature Description: OpenPGP digital signature
RE: [PATCH] common/idpf: refine header file include
> -Original Message- > From: Zhang, Qi Z > Sent: Tuesday, April 25, 2023 6:40 AM > To: Xing, Beilei > Cc: dev@dpdk.org; Zhang, Qi Z > Subject: [PATCH] common/idpf: refine header file include > > Replace #include with #include "filename" for local header file. > > Signed-off-by: Qi Zhang Acked-by: Beilei Xing
RE: [PATCH] common/idpf: remove device stop flag
> -Original Message-
> From: Zhang, Qi Z
> Sent: Thursday, April 20, 2023 11:57 PM
> To: Xing, Beilei
> Cc: dev@dpdk.org; Zhang, Qi Z ; sta...@dpdk.org
> Subject: [PATCH] common/idpf: remove device stop flag
>
> Remove device stop flag, as we already have dev->data-dev_started.
> This also fixed the issue when close port directly without start it first,
> some
> error message will be reported in dev_stop.
>
> Fixes: 14aa6ed8f2ec ("net/idpf: support device start and stop")
> Fixes: 1082a773a86b ("common/idpf: add vport structure")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Qi Zhang
Acked-by: Beilei Xing
RE: [PATCH] common/idpf: remove unnecessary field in vport
> -Original Message-
> From: Zhang, Qi Z
> Sent: Friday, April 21, 2023 12:21 AM
> To: Xing, Beilei
> Cc: dev@dpdk.org; Zhang, Qi Z
> Subject: [PATCH] common/idpf: remove unnecessary field in vport
>
> Remove the pointer to rte_eth_dev instance, as 1. there is already a pointer
> to
> rte_eth_dev_data.
> 2. a pointer to rte_eth_dev will break multi-process usage.
Basically it's OK for me, do we need to add fix line?
>
> Signed-off-by: Qi Zhang
> ---
> drivers/common/idpf/idpf_common_device.h | 1 -
> drivers/net/cpfl/cpfl_ethdev.c | 4 ++--
> drivers/net/idpf/idpf_ethdev.c | 4 ++--
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/common/idpf/idpf_common_device.h
> b/drivers/common/idpf/idpf_common_device.h
> index 7a54f7c937..d29bcc71ab 100644
> --- a/drivers/common/idpf/idpf_common_device.h
> +++ b/drivers/common/idpf/idpf_common_device.h
> @@ -117,7 +117,6 @@ struct idpf_vport {
>
> struct virtchnl2_vport_stats eth_stats_offset;
>
> - void *dev;
> /* Event from ipf */
> bool link_up;
> uint32_t link_speed;
> diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c
> index f1d4425ce2..680c2326ec 100644
> --- a/drivers/net/cpfl/cpfl_ethdev.c
> +++ b/drivers/net/cpfl/cpfl_ethdev.c
> @@ -1061,7 +1061,8 @@ static void
> cpfl_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t
> msglen) {
> struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
> - struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
> + struct rte_eth_dev_data *data = vport->dev_data;
> + struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
>
> if (msglen < sizeof(struct virtchnl2_event)) {
> PMD_DRV_LOG(ERR, "Error event");
> @@ -1245,7 +1246,6 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void
> *init_params)
> vport->adapter = &adapter->base;
> vport->sw_idx = param->idx;
> vport->devarg_id = param->devarg_id;
> - vport->dev = dev;
>
> memset(&create_vport_info, 0, sizeof(create_vport_info));
> ret = idpf_vport_info_init(vport, &create_vport_info); diff --git
> a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index
> e01eb3a2ec..38ad4e7ac0 100644
> --- a/drivers/net/idpf/idpf_ethdev.c
> +++ b/drivers/net/idpf/idpf_ethdev.c
> @@ -1024,7 +1024,8 @@ static void
> idpf_handle_event_msg(struct idpf_vport *vport, uint8_t *msg, uint16_t
> msglen) {
> struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
> - struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
> + struct rte_eth_dev_data *data = vport->dev_data;
> + struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
>
> if (msglen < sizeof(struct virtchnl2_event)) {
> PMD_DRV_LOG(ERR, "Error event");
> @@ -1235,7 +1236,6 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void
> *init_params)
> vport->adapter = &adapter->base;
> vport->sw_idx = param->idx;
> vport->devarg_id = param->devarg_id;
> - vport->dev = dev;
>
> memset(&create_vport_info, 0, sizeof(create_vport_info));
> ret = idpf_vport_info_init(vport, &create_vport_info);
> --
> 2.31.1
RE: [PATCH] common/idpf: remove unnecessary field in vport
> -Original Message-
> From: Xing, Beilei
> Sent: Wednesday, April 26, 2023 2:46 PM
> To: Zhang, Qi Z
> Cc: dev@dpdk.org
> Subject: RE: [PATCH] common/idpf: remove unnecessary field in vport
>
>
>
> > -Original Message-
> > From: Zhang, Qi Z
> > Sent: Friday, April 21, 2023 12:21 AM
> > To: Xing, Beilei
> > Cc: dev@dpdk.org; Zhang, Qi Z
> > Subject: [PATCH] common/idpf: remove unnecessary field in vport
> >
> > Remove the pointer to rte_eth_dev instance, as 1. there is already a
> > pointer to rte_eth_dev_data.
> > 2. a pointer to rte_eth_dev will break multi-process usage.
>
> Basically it's OK for me, do we need to add fix line?
the multi-process support has not been enabled yet, so technically this is not
a fix but code refactor.
>
> >
> > Signed-off-by: Qi Zhang
> > ---
> > drivers/common/idpf/idpf_common_device.h | 1 -
> > drivers/net/cpfl/cpfl_ethdev.c | 4 ++--
> > drivers/net/idpf/idpf_ethdev.c | 4 ++--
> > 3 files changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/common/idpf/idpf_common_device.h
> > b/drivers/common/idpf/idpf_common_device.h
> > index 7a54f7c937..d29bcc71ab 100644
> > --- a/drivers/common/idpf/idpf_common_device.h
> > +++ b/drivers/common/idpf/idpf_common_device.h
> > @@ -117,7 +117,6 @@ struct idpf_vport {
> >
> > struct virtchnl2_vport_stats eth_stats_offset;
> >
> > - void *dev;
> > /* Event from ipf */
> > bool link_up;
> > uint32_t link_speed;
> > diff --git a/drivers/net/cpfl/cpfl_ethdev.c
> > b/drivers/net/cpfl/cpfl_ethdev.c index f1d4425ce2..680c2326ec 100644
> > --- a/drivers/net/cpfl/cpfl_ethdev.c
> > +++ b/drivers/net/cpfl/cpfl_ethdev.c
> > @@ -1061,7 +1061,8 @@ static void
> > cpfl_handle_event_msg(struct idpf_vport *vport, uint8_t *msg,
> > uint16_t
> > msglen) {
> > struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
> > - struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
> > + struct rte_eth_dev_data *data = vport->dev_data;
> > + struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
> >
> > if (msglen < sizeof(struct virtchnl2_event)) {
> > PMD_DRV_LOG(ERR, "Error event");
> > @@ -1245,7 +1246,6 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev,
> > void
> > *init_params)
> > vport->adapter = &adapter->base;
> > vport->sw_idx = param->idx;
> > vport->devarg_id = param->devarg_id;
> > - vport->dev = dev;
> >
> > memset(&create_vport_info, 0, sizeof(create_vport_info));
> > ret = idpf_vport_info_init(vport, &create_vport_info); diff --git
> > a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c
> > index
> > e01eb3a2ec..38ad4e7ac0 100644
> > --- a/drivers/net/idpf/idpf_ethdev.c
> > +++ b/drivers/net/idpf/idpf_ethdev.c
> > @@ -1024,7 +1024,8 @@ static void
> > idpf_handle_event_msg(struct idpf_vport *vport, uint8_t *msg,
> > uint16_t
> > msglen) {
> > struct virtchnl2_event *vc_event = (struct virtchnl2_event *)msg;
> > - struct rte_eth_dev *dev = (struct rte_eth_dev *)vport->dev;
> > + struct rte_eth_dev_data *data = vport->dev_data;
> > + struct rte_eth_dev *dev = &rte_eth_devices[data->port_id];
> >
> > if (msglen < sizeof(struct virtchnl2_event)) {
> > PMD_DRV_LOG(ERR, "Error event");
> > @@ -1235,7 +1236,6 @@ idpf_dev_vport_init(struct rte_eth_dev *dev,
> > void
> > *init_params)
> > vport->adapter = &adapter->base;
> > vport->sw_idx = param->idx;
> > vport->devarg_id = param->devarg_id;
> > - vport->dev = dev;
> >
> > memset(&create_vport_info, 0, sizeof(create_vport_info));
> > ret = idpf_vport_info_init(vport, &create_vport_info);
> > --
> > 2.31.1
RE: [PATCH] common/idpf: refine header file include
> -Original Message- > From: Xing, Beilei > Sent: Wednesday, April 26, 2023 2:41 PM > To: Zhang, Qi Z > Cc: dev@dpdk.org > Subject: RE: [PATCH] common/idpf: refine header file include > > > > > -Original Message- > > From: Zhang, Qi Z > > Sent: Tuesday, April 25, 2023 6:40 AM > > To: Xing, Beilei > > Cc: dev@dpdk.org; Zhang, Qi Z > > Subject: [PATCH] common/idpf: refine header file include > > > > Replace #include with #include "filename" for local header file. > > > > Signed-off-by: Qi Zhang > > Acked-by: Beilei Xing Applied to dpdk-next-net-intel. Thanks Qi
