[PATCH v2] vhost: add log for VHOST_USER_SET_VRING_BASE
This patch adds log for vring related info in handling of vhost message VHOST_USER_SET_VRING_BASE, which will be useful in live migration case. Signed-off-by: Andy Pei --- lib/vhost/vhost_user.c | 5 + 1 file changed, 5 insertions(+) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index a781346..cd8c7bc 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -973,6 +973,11 @@ vq->last_avail_idx = msg->payload.state.num; } + VHOST_LOG_CONFIG(INFO, + "vring base idx:%u last_used_idx:%u last_avail_idx:%u.\n", + msg->payload.state.index, vq->last_used_idx, + vq->last_avail_idx); + return RTE_VHOST_MSG_RESULT_OK; } -- 1.8.3.1
RE: [PATCH 0/6] allow more DPDK libraries to be disabled on build
> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > Sent: Thursday, 13 January 2022 18.39 > > A common request on-list has been to allow more of the DPDK build to be > disabled by those who are > doing their own builds and only use a subset of the libraries. To this > end, this patchset makes some > infrastructure changes [first two patches] to make it easier to have > libraries disabled, and then > adds a six libraries to the "optional" list. > > Bruce Richardson (6): > lib: allow recursive disabling of libs in build > app/test: link unit test binary against all available libs > build: add node library to optional list > build: add flow classification library to optional list > build: add "packet framework" libs to optional list > build: add cfgfile library to optional list > > app/test/meson.build | 74 > lib/meson.build | 30 -- > 2 files changed, 40 insertions(+), 64 deletions(-) > > -- > 2.32.0 > Thank you very much, Bruce! Acked-by: Morten Brørup
rte_memcpy alignment
Dear ARM/POWER/x86 maintainers, The architecture specific rte_memcpy() provides optimized variants to copy aligned data. However, the alignment requirements depend on the hardware architecture, and there is no common definition for the alignment. DPDK provides __rte_cache_aligned for cache optimization purposes, with architecture specific values. Would you consider providing an __rte_memcpy_aligned for rte_memcpy() optimization purposes? Or should I just use __rte_cache_aligned, although it is overkill? Specifically, I am working on a mempool optimization where the objs field in the rte_mempool_cache structure may benefit by being aligned for optimized rte_memcpy(). Med venlig hilsen / Kind regards, -Morten Brørup
Re:Re: [PATCH] net/bonding: fix RSS not work for bonding in DPDK21.11
Sorry，mq_mode is RTE_ETH_MQ_RX_RSS in rte_eth_conf.
call chain:
rte_eth_bond_create()->rte_eth_dev_configure()->rte_eth_bond_slave_add()->rte_eth_dev_start()
Consider this call chain, internals->rss_key_len is 0 in
bond_ethdev_configure() when we call rte_eth_dev_configure().
If internals->rss_key_len is 0, internals->rss_key can not be set properly.
Because memcpy in bond_ethdev_configure() use internals->rss_key_len(it is 0)
as copy size, and internals->rss_key will not be set in other functions.
---
e.g.:
bond_ethdev_configure(struct rte_eth_dev *dev)
{
const char *name = dev->device->name
struct bond_dev_private *internals = dev->data->dev_private
...
/*
* If RSS is enabled, fill table with default values and
* set key to the value specified in port RSS configuration.
* Fall back to default RSS key if the key is not specified
*/
if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) {
struct rte_eth_rss_conf *rss_conf =
&dev->data->dev_conf.rx_adv_conf.rss_conf
if (rss_conf->rss_key != NULL) {
if (internals->rss_key_len > rss_conf->rss_key_len) {
RTE_BOND_LOG(ERR, "Invalid rss key length(%u)",
rss_conf->rss_key_len)
return -EINVAL
}
memcpy(internals->rss_key, rss_conf->rss_key,
internals->rss_key_len)
} else {
if (internals->rss_key_len > sizeof(default_rss_key)) {
RTE_BOND_LOG(ERR,
"There is no suitable default hash key")
return -EINVAL
}
memcpy(internals->rss_key, default_rss_key,
internals->rss_key_len)
}
OriginFrom："Min Hu (Connor)" To："yuwenjun_yewu"
,tangchengchang
,"ferruh.yigit" Cc: dev
,stable Date：2022-01-14 08:59:21Subject：Re:
[PATCH] net/bonding: fix RSS not work for bonding in DPDK21.11Hi,在 2022/1/12
15:29, 俞文俊_yewu 写道:> From 85c4e32996fc262dd6f69d0ce272ae8e8350 Mon Sep 17
00:00:00 2001> > From: Yu Wenjun > > Date:
Wed, 12 Jan 2022 15:01:10 +0800> > Subject: [PATCH] net/bonding: fix RSS not
work for bonding> > > RSS don39t work when upgrade to DPDK21.11.Cannot get your
meaning, Why RSS don39t work?As mq_mode is not RTE_ETH_MQ_RX_RSS in
rte_eth_conf, RSS is off.Please make it clearer, thanks.> > > e.g.:> >
examples/bond/main.c:> > conf:> > static struct rte_eth_conf port_conf = {> >
.rxmode = {> > .mq_mode = RTE_ETH_MQ_RX_NONE,> > .split_hdr_size = 0,> > },> >
.rx_adv_conf = {> > .rss_conf = {> > .rss_key = NULL,> > .rss_hf =
RTE_ETH_RSS_IP,> > },> > },> > .txmode = {> > .mq_mode = RTE_ETH_MQ_TX_NONE,> >
},> > }> > > call chain:> >
rte_eth_bond_create()->rte_eth_dev_configure()->rte_eth_bond_slave_add()->rte_eth_dev_start()>
> > Signed-off-by: Yu Wenjun > > ---> >
drivers/net/bonding/rte_eth_bond_pmd.c | 5 +> > 1 file changed, 5
insertions(+)> > > diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c >
b/drivers/net/bonding/rte_eth_bond_pmd.c> > index 84f4900ee5..31bcee15cf
100644> > --- a/drivers/net/bonding/rte_eth_bond_pmd.c> > +++
b/drivers/net/bonding/rte_eth_bond_pmd.c> > @@ -3504,6 +3504,11 @@
bond_ethdev_configure(struct rte_eth_dev *dev)> > if
(dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) {> > struct
rte_eth_rss_conf *rss_conf => > &dev->data->dev_conf.rx_adv_conf.rss_conf> > +>
> +if (internals->rss_key_len == 0) {> > +internals->rss_key_len =
sizeof(default_rss_key)> > +}> > +> > if (rss_conf->rss_key != NULL) {> > if
(internals->rss_key_len > rss_conf->rss_key_len) {> > RTE_BOND_LOG(ERR,
"Invalid rss key length(%u)",> > -- > > 2.32.0.windows.1> > Subject：Re: [PATCH]
net/bonding: fix RSS not work for bonding in DPDK21.11Hi,在 2022/1/12 15:29,
俞文俊_yewu 写道:> From 85c4e32996fc262dd6f69d0ce272ae8e8350 Mon Sep 17
00:00:00 2001> > From: Yu Wenjun > > Date:
Wed, 12 Jan 2022 15:01:10 +0800> > Subject: [PATCH] net/bonding: fix RSS not
work for bonding> > > RSS don39t work when upgrade to DPDK21.11.Cannot get your
meaning, Why RSS don39t work?As mq_mode is not RTE_ETH_MQ_RX_RSS in
rte_eth_conf, RSS is off.Please make it clearer, thanks.> > > e.g.:> >
examples/bond/main.c:> > conf:> > static struct rte_eth_conf port_conf = {> >
.rxmode = {> > .mq_mode = RTE_ETH_MQ_RX_NONE,> > .split_hdr_size = 0,> > },> >
.rx_adv_conf = {> > .rss_conf = {> > .rss_key = NULL,> > .rss_hf =
RTE_ETH_RSS_IP,> > },> > },> > .txmode = {> > .mq_mode = RTE_ETH_MQ_TX_NONE,> >
},> > }> > > call chain:> >
rte_eth_bond_create()->rte_eth_dev_configure()->rte_eth_bond_slave_add()->rte_eth_dev_start()>
> > Signed-off-
Re: [PATCH v3] ethdev: mark old macros as deprecated
On 1/14/2022 6:45 AM, Xia, Chenbo wrote:
-Original Message-
From: Yigit, Ferruh
Sent: Wednesday, January 12, 2022 10:36 PM
To: Thomas Monjalon ; Andrew Rybchenko
; Hemant Agrawal ;
Tyler Retzlaff ; Xia, Chenbo
; Jerin Jacob
Cc: dev@dpdk.org; Yigit, Ferruh ; Stephen Hemminger
Subject: [PATCH v3] ethdev: mark old macros as deprecated
Old macros kept for backward compatibility, but this cause old macro
usage to sneak in silently.
Marking old macros as deprecated. Downside is this will cause some noise
for applications that are using old macros.
Fixes: 295968d17407 ("ethdev: add namespace")
Signed-off-by: Ferruh Yigit
Acked-by: Stephen Hemminger
---
v2:
* Release notes updated
v3:
* Update 22.03 release note
---
doc/guides/rel_notes/release_22_03.rst | 3 +
lib/ethdev/rte_ethdev.h| 474 +
2 files changed, 247 insertions(+), 230 deletions(-)
Acked-by: Chenbo Xia
Applied to dpdk-next-net/main, thanks.
RE: [PATCH] build: add missing arch define for Arm
> -Original Message-
> From: Thomas Monjalon
> Sent: Friday, January 14, 2022 1:33 AM
> To: Ruifeng Wang
> Cc: dev@dpdk.org; sta...@dpdk.org; vikto...@rehivetech.com;
> bruce.richard...@intel.com; step...@networkplumber.org;
> juraj.lin...@pantheon.tech; Honnappa Nagarahalli
> ; nd
> Subject: Re: [PATCH] build: add missing arch define for Arm
>
> 17/12/2021 09:54, Ruifeng Wang:
> > As per design document, RTE_ARCH is the name of the architecture.
> > However, the definition was missing on Arm with meson build.
> > It impacts applications that refers to this string.
> >
> > Added for Arm builds.
> >
> > Fixes: b1d48c41189a ("build: support ARM with meson")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Ruifeng Wang
> > ---
> > ['RTE_ARCH_ARMv8_AARCH32', true],
> > +['RTE_ARCH', 'arm64_aarch32'],
>
> Why not armv8_aarch32?
Thanks for the comments.
Agreed. armv8_aarch32 is consistent with the RTE_ARCH_xx macro above.
>
> [...]
> > dpdk_conf.set('RTE_ARCH_ARMv7', true)
> > +dpdk_conf.set('RTE_ARCH', 'armv7')
> [...]
> > # armv8 build
> > +dpdk_conf.set('RTE_ARCH', 'arm64')
>
> Why not armv8?
>
> What I prefer the most in silicon industry is the naming craziness :)
While armv8 usually refers to one generation of the Arm architecture, arm64 is
more generic for 64-bit architectures.
And what defined for armv8 build is RTE_ARCH_ARM64. So for consistency, arm64
is better?
Re: rte_memcpy alignment
On Fri, Jan 14, 2022 at 09:56:50AM +0100, Morten Brørup wrote: > Dear ARM/POWER/x86 maintainers, > > The architecture specific rte_memcpy() provides optimized variants to copy > aligned data. However, the alignment requirements depend on the hardware > architecture, and there is no common definition for the alignment. > > DPDK provides __rte_cache_aligned for cache optimization purposes, with > architecture specific values. Would you consider providing an > __rte_memcpy_aligned for rte_memcpy() optimization purposes? > > Or should I just use __rte_cache_aligned, although it is overkill? > > > Specifically, I am working on a mempool optimization where the objs field in > the rte_mempool_cache structure may benefit by being aligned for optimized > rte_memcpy(). > For me the difficulty with such a memcpy proposal - apart from probably adding to the amount of memcpy code we have to maintain - is the specific meaning of what "aligned" in the memcpy case. Unlike for a struct definition, the possible meaning of aligned in memcpy could be: * the source address is aligned * the destination address is aligned * both source and destination is aligned * both source and destination are aligned and the copy length is a multiple of the alignment length * the data is aligned to a cacheline boundary * the data is aligned to the largest load-store size for system * the data is aligned to the boundary suitable for the copy size, e.g. memcpy of 8 bytes is 8-byte aligned etc. Can you clarify a bit more on your own thinking here? Personally, I am a little dubious of the benefit of general memcpy optimization, but I do believe that for specific usecases there is value is having their own copy operations which include constraints for that specific usecase. For example, in the AVX-512 ice/i40e PMD code, we fold the memcpy from the mempool cache into the descriptor rearm function because we know we can always do 64-byte loads and stores, and also because we know that for each load in the copy, we can reuse the data just after storing it (giving good perf boost). Perhaps something similar could work for you in your mempool optimization. /Bruce
Re: [dpdk-dev] [PATCH v4] examples/l3fwd: ipv4 and udp/tcp cksum verification through software
Hello, and thank you for the recommendations. I did investigate the
alternative options offered. I have a question about it. After verifying
mbuf's cksum, we may set the RTE MBUF F RX * CKSUM_* flags. I was just
wondering if it should be done at the application level or in the driver
code.
If we add this feature to driver code, do we have to include it in all
drivers that don't support sw-based cksums, and will it vary per driver?
Is it possible to accomplish it in a generic way? As an example, how about
at the application level. If we set the RTE MBUF F RX * CKSUM_* flags on
the application level, it will be independent of the individual drivers.
Thanks
On Thu, Nov 4, 2021 at 6:19 PM Ananyev, Konstantin <
konstantin.anan...@intel.com> wrote:
> > checks if ipv4 and udptcp cksum offload capability available
> > If not available, cksum is verified through software
> > If cksum is corrupt, packet is dropped, rest of the packets
> > are forwarded back.
>
> From what I see right now l3fwd:
>a) enables HW RX cksum offload
>b) simply ignores HW provided cksum status
> Which came as a real surprise to me.
> Feel free to correct me if I missed something obvious here.
>
> So, I think first we need to add missing check first,
> even though it might cause some perf drop.
> Then make changes to actually check provided by HW status and
> when HW doesn't provide such offload do check in SW.
>
> Another alternative would be to remove request for HW offloads
> and document l3fwd that it doesn't check checksums at all,
> but I don't think it is a good way.
>
> > Bugzilla ID:545
> > Signed-off-by: Usama Nadeem
> > ---
> > examples/l3fwd/l3fwd.h | 6
> > examples/l3fwd/l3fwd_lpm.c | 72 --
> > examples/l3fwd/main.c | 33 +++--
> > 3 files changed, 105 insertions(+), 6 deletions(-)
> >
> > diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
> > index a808d60247..c2c21a91fb 100644
> > --- a/examples/l3fwd/l3fwd.h
> > +++ b/examples/l3fwd/l3fwd.h
> > @@ -55,6 +55,8 @@
> > #define L3FWD_HASH_ENTRIES (1024*1024*1)
> > #endif
> > #define HASH_ENTRY_NUMBER_DEFAULT4
> > +extern bool l3_sft_cksum;
> > +extern bool l4_sft_cksum;
>
> About the approach itself.
> We have similar issue for HW PTYPE recognition - some HW doesn't support
> it.
> So we check HW capabilities and if required we setup SW RX callbacks to do
> determine PTYPE in SW. Note that for EM/LPM we have different callbacks.
> I think for cksum checks we can do the same:
> check HW capabilities, if they are missing add a new callback that would
> calculate/check cksum and set RTE_MBUF_F_RX_*_CKSUM_* flags.
> That way it will HW/SW cksum will be transparent for the rest of l3fwd
> code.
>
> About cksums required: for LPM/FIB mode just IPv4 cksum seems enough.
> For EM we probably need L4 cksum too, though not sure is it really needed.
> Wonder what other people think here?
>
> > struct mbuf_table {
> > uint16_t len;
> > @@ -210,6 +212,10 @@ em_main_loop(__rte_unused void *dummy);
> > int
> > lpm_main_loop(__rte_unused void *dummy);
> >
> > +int
> > +check_software_cksum(struct rte_mbuf **pkts_burst,
> > +struct rte_mbuf **pkts_burst_to_send, int nb_rx);
> > +
> > int
> > fib_main_loop(__rte_unused void *dummy);
> >
> > diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> > index 232b606b54..ecaf323943 100644
> > --- a/examples/l3fwd/l3fwd_lpm.c
> > +++ b/examples/l3fwd/l3fwd_lpm.c
> > @@ -26,6 +26,7 @@
> > #include
> > #include
> > #include
> > +#include
> >
> > #include "l3fwd.h"
> > #include "l3fwd_event.h"
> > @@ -139,16 +140,65 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf
> *qconf, struct rte_mbuf *pkt,
> > #include "l3fwd_lpm.h"
> > #endif
> >
> > +
> > +int check_software_cksum(struct rte_mbuf **pkts_burst,
> > +struct rte_mbuf **pkts_burst_to_send, int nb_rx)
> > +{
> > + int j;
> > + int i = 0;
> > + struct rte_net_hdr_lens hdr_lens;
> > + struct rte_ipv4_hdr *ipv4_hdr;
> > + void *l3_hdr;
> > + void *l4_hdr;
> > + rte_be16_t prev_cksum;
> > + int dropped_pkts_udp_tcp = 0;
> > + int dropped_pkts_ipv4 = 0;
> > + bool dropped;
> > + for (j = 0; j < nb_rx; j++) {
> > + dropped = false;
> > + rte_net_get_ptype(pkts_burst[j], &hdr_lens,
> RTE_PTYPE_ALL_MASK);
> > + l3_hdr = rte_pktmbuf_mtod_offset(pkts_burst[j],
> > + void *, hdr_lens.l2_len);
> > + l4_hdr = rte_pktmbuf_mtod_offset(pkts_burst[j],
> > + void *, hdr_lens.l2_len + hdr_lens.l3_len);
> > + ipv4_hdr = l3_hdr;
> > + prev_cksum = ipv4_hdr->hdr_checksum;
> > + ipv4_hdr->hdr_checksum = 0;
> > + ipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr);
> > +
> > + if (l3_sft_cksum && prev_cksum != ipv4_hdr->hdr_checksum) {
> > + rte_pktmbuf_free(pkts_burst[j]);
> > +
RE: rte_memcpy alignment
> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > Sent: Friday, 14 January 2022 10.11 > > On Fri, Jan 14, 2022 at 09:56:50AM +0100, Morten Brørup wrote: > > Dear ARM/POWER/x86 maintainers, > > > > The architecture specific rte_memcpy() provides optimized variants to > copy aligned data. However, the alignment requirements depend on the > hardware architecture, and there is no common definition for the > alignment. > > > > DPDK provides __rte_cache_aligned for cache optimization purposes, > with architecture specific values. Would you consider providing an > __rte_memcpy_aligned for rte_memcpy() optimization purposes? > > > > Or should I just use __rte_cache_aligned, although it is overkill? > > > > > > Specifically, I am working on a mempool optimization where the objs > field in the rte_mempool_cache structure may benefit by being aligned > for optimized rte_memcpy(). > > > For me the difficulty with such a memcpy proposal - apart from probably > adding to the amount of memcpy code we have to maintain - is the > specific meaning > of what "aligned" in the memcpy case. Unlike for a struct definition, > the > possible meaning of aligned in memcpy could be: > * the source address is aligned > * the destination address is aligned > * both source and destination is aligned > * both source and destination are aligned and the copy length is a > multiple > of the alignment length > * the data is aligned to a cacheline boundary > * the data is aligned to the largest load-store size for system > * the data is aligned to the boundary suitable for the copy size, e.g. > memcpy of 8 bytes is 8-byte aligned etc. > > Can you clarify a bit more on your own thinking here? Personally, I am > a > little dubious of the benefit of general memcpy optimization, but I do > believe that for specific usecases there is value is having their own > copy > operations which include constraints for that specific usecase. For > example, in the AVX-512 ice/i40e PMD code, we fold the memcpy from the > mempool cache into the descriptor rearm function because we know we can > always do 64-byte loads and stores, and also because we know that for > each > load in the copy, we can reuse the data just after storing it (giving > good > perf boost). Perhaps something similar could work for you in your > mempool > optimization. > > /Bruce I'm going to copy array of pointers, specifically the 'objs' array in the rte_mempool_cache structure. The 'objs' array starts at byte 24, which is only 8 byte aligned. So it always fails the ALIGNMENT_MASK test in the x86 specific rte_memcpy(), and thus cannot ever use the optimized rte_memcpy_aligned() function to copy the array, but will use the rte_memcpy_generic() function. If the 'objs' array was optimally aligned, and the other array that is being copied to/from is also optimally aligned, rte_memcpy() would use the optimized rte_memcpy_aligned() function. Please also note that the value of ALIGNMENT_MASK depends on which vector instruction set DPDK is being compiled with. The other CPU architectures have similar stuff in their rte_memcpy() implementations, and their alignment requirements are also different. Please also note that rte_memcpy() becomes even more optimized when the size of the memcpy() operation is known at compile time. So I am asking for a public #define __rte_memcpy_aligned I can use to meet the alignment requirements for optimal rte_memcpy().
Re: rte_memcpy alignment
On Fri, Jan 14, 2022 at 10:53:54AM +0100, Morten Brørup wrote: > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > Sent: Friday, 14 January 2022 10.11 > > > > On Fri, Jan 14, 2022 at 09:56:50AM +0100, Morten Brørup wrote: > > > Dear ARM/POWER/x86 maintainers, > > > > > > The architecture specific rte_memcpy() provides optimized variants to > > copy aligned data. However, the alignment requirements depend on the > > hardware architecture, and there is no common definition for the > > alignment. > > > > > > DPDK provides __rte_cache_aligned for cache optimization purposes, > > with architecture specific values. Would you consider providing an > > __rte_memcpy_aligned for rte_memcpy() optimization purposes? > > > > > > Or should I just use __rte_cache_aligned, although it is overkill? > > > > > > > > > Specifically, I am working on a mempool optimization where the objs > > field in the rte_mempool_cache structure may benefit by being aligned > > for optimized rte_memcpy(). > > > > > For me the difficulty with such a memcpy proposal - apart from probably > > adding to the amount of memcpy code we have to maintain - is the > > specific meaning > > of what "aligned" in the memcpy case. Unlike for a struct definition, > > the > > possible meaning of aligned in memcpy could be: > > * the source address is aligned > > * the destination address is aligned > > * both source and destination is aligned > > * both source and destination are aligned and the copy length is a > > multiple > > of the alignment length > > * the data is aligned to a cacheline boundary > > * the data is aligned to the largest load-store size for system > > * the data is aligned to the boundary suitable for the copy size, e.g. > > memcpy of 8 bytes is 8-byte aligned etc. > > > > Can you clarify a bit more on your own thinking here? Personally, I am > > a > > little dubious of the benefit of general memcpy optimization, but I do > > believe that for specific usecases there is value is having their own > > copy > > operations which include constraints for that specific usecase. For > > example, in the AVX-512 ice/i40e PMD code, we fold the memcpy from the > > mempool cache into the descriptor rearm function because we know we can > > always do 64-byte loads and stores, and also because we know that for > > each > > load in the copy, we can reuse the data just after storing it (giving > > good > > perf boost). Perhaps something similar could work for you in your > > mempool > > optimization. > > > > /Bruce > > I'm going to copy array of pointers, specifically the 'objs' array in the > rte_mempool_cache structure. > > The 'objs' array starts at byte 24, which is only 8 byte aligned. So it > always fails the ALIGNMENT_MASK test in the x86 specific rte_memcpy(), and > thus cannot ever use the optimized rte_memcpy_aligned() function to copy the > array, but will use the rte_memcpy_generic() function. > > If the 'objs' array was optimally aligned, and the other array that is being > copied to/from is also optimally aligned, rte_memcpy() would use the > optimized rte_memcpy_aligned() function. > > Please also note that the value of ALIGNMENT_MASK depends on which vector > instruction set DPDK is being compiled with. > > The other CPU architectures have similar stuff in their rte_memcpy() > implementations, and their alignment requirements are also different. > > Please also note that rte_memcpy() becomes even more optimized when the size > of the memcpy() operation is known at compile time. > > So I am asking for a public #define __rte_memcpy_aligned I can use to meet > the alignment requirements for optimal rte_memcpy(). > Thanks for that, I misunderstood your original ask. Things are clearer now, and it seems reasonable.
[PATCH] common/mlx5: fix MR lookup for non-contiguous mempool
Memory region (MR) lookup by address inside mempool MRs
was not accounting for the upper bound of an MR.
For mempools covered by multiple MRs this could return
a wrong MR LKey, typically resulting in an unrecoverable
TxQ failure:
mlx5_net: Cannot change Tx QP state to INIT Invalid argument
Corresponding message from /var/log/dpdk_mlx5_port_X_txq_Y_index_Z*:
Unexpected CQE error syndrome 0x04 CQN = 128 SQN = 4848
wqe_counter = 0 wq_ci = 9 cq_ci = 122
This is likely to happen with --legacy-mem and IOVA-as-PA,
because EAL intentionally maps pages at non-adjacent PA
to non-adjacent VA in this mode, and MLX5 PMD works with VA.
Fixes: 690b2a88c2f7 ("common/mlx5: add mempool registration facilities")
Cc: sta...@dpdk.org
Reported-by: Wang Yunjian
Signed-off-by: Dmitry Kozlyuk
Reviewed-by: Viacheslav Ovsiienko
---
drivers/common/mlx5/mlx5_common_mr.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common_mr.c
b/drivers/common/mlx5/mlx5_common_mr.c
index 1537b5d428..5f7e4f6734 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -1834,12 +1834,13 @@ mlx5_mempool_reg_addr2mr(struct mlx5_mempool_reg *mpr,
uintptr_t addr,
for (i = 0; i < mpr->mrs_n; i++) {
const struct mlx5_pmd_mr *mr = &mpr->mrs[i].pmd_mr;
- uintptr_t mr_addr = (uintptr_t)mr->addr;
+ uintptr_t mr_start = (uintptr_t)mr->addr;
+ uintptr_t mr_end = mr_start + mr->len;
- if (mr_addr <= addr) {
+ if (mr_start <= addr && addr < mr_end) {
lkey = rte_cpu_to_be_32(mr->lkey);
- entry->start = mr_addr;
- entry->end = mr_addr + mr->len;
+ entry->start = mr_start;
+ entry->end = mr_end;
entry->lkey = lkey;
break;
}
--
2.25.1
RE: rte_memcpy alignment
> -Original Message- > From: Morten Brørup > Sent: Friday, January 14, 2022 9:54 AM > To: Richardson, Bruce > Cc: Jan Viktorin ; Ruifeng Wang > ; David Christensen ; > Ananyev, Konstantin ; dev@dpdk.org > Subject: RE: rte_memcpy alignment > > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > Sent: Friday, 14 January 2022 10.11 > > > > On Fri, Jan 14, 2022 at 09:56:50AM +0100, Morten Brørup wrote: > > > Dear ARM/POWER/x86 maintainers, > > > > > > The architecture specific rte_memcpy() provides optimized variants to > > copy aligned data. However, the alignment requirements depend on the > > hardware architecture, and there is no common definition for the > > alignment. > > > > > > DPDK provides __rte_cache_aligned for cache optimization purposes, > > with architecture specific values. Would you consider providing an > > __rte_memcpy_aligned for rte_memcpy() optimization purposes? > > > > > > Or should I just use __rte_cache_aligned, although it is overkill? > > > > > > > > > Specifically, I am working on a mempool optimization where the objs > > field in the rte_mempool_cache structure may benefit by being aligned > > for optimized rte_memcpy(). > > > > > For me the difficulty with such a memcpy proposal - apart from probably > > adding to the amount of memcpy code we have to maintain - is the > > specific meaning > > of what "aligned" in the memcpy case. Unlike for a struct definition, > > the > > possible meaning of aligned in memcpy could be: > > * the source address is aligned > > * the destination address is aligned > > * both source and destination is aligned > > * both source and destination are aligned and the copy length is a > > multiple > > of the alignment length > > * the data is aligned to a cacheline boundary > > * the data is aligned to the largest load-store size for system > > * the data is aligned to the boundary suitable for the copy size, e.g. > > memcpy of 8 bytes is 8-byte aligned etc. > > > > Can you clarify a bit more on your own thinking here? Personally, I am > > a > > little dubious of the benefit of general memcpy optimization, but I do > > believe that for specific usecases there is value is having their own > > copy > > operations which include constraints for that specific usecase. For > > example, in the AVX-512 ice/i40e PMD code, we fold the memcpy from the > > mempool cache into the descriptor rearm function because we know we can > > always do 64-byte loads and stores, and also because we know that for > > each > > load in the copy, we can reuse the data just after storing it (giving > > good > > perf boost). Perhaps something similar could work for you in your > > mempool > > optimization. > > > > /Bruce > > I'm going to copy array of pointers, specifically the 'objs' array in the > rte_mempool_cache structure. > > The 'objs' array starts at byte 24, which is only 8 byte aligned. So it > always fails the ALIGNMENT_MASK test in the x86 specific > rte_memcpy(), and thus cannot ever use the optimized rte_memcpy_aligned() > function to copy the array, but will use the > rte_memcpy_generic() function. > > If the 'objs' array was optimally aligned, and the other array that is being > copied to/from is also optimally aligned, rte_memcpy() would use > the optimized rte_memcpy_aligned() function. > > Please also note that the value of ALIGNMENT_MASK depends on which vector > instruction set DPDK is being compiled with. > > The other CPU architectures have similar stuff in their rte_memcpy() > implementations, and their alignment requirements are also different. > > Please also note that rte_memcpy() becomes even more optimized when the size > of the memcpy() operation is known at compile time. If the size is known at compile time, rte_memcpy() probably an overkill - modern compilers usually generate fast enough code for such cases. > > So I am asking for a public #define __rte_memcpy_aligned I can use to meet > the alignment requirements for optimal rte_memcpy(). Even on x86 ALIGNMENT_MASK could have different values (15/31/63) depending on ISA. So probably 64 as 'generic' one is the safest bet. Though I wonder do we really need such micro-optimizations here? Would it be such huge difference if you call rte_memcpy_aligned() instead of rte_memcpy()?
RE: rte_memcpy alignment
> From: Ananyev, Konstantin [mailto:konstantin.anan...@intel.com] > Sent: Friday, 14 January 2022 11.54 > > > From: Morten Brørup > > Sent: Friday, January 14, 2022 9:54 AM > > > > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > Sent: Friday, 14 January 2022 10.11 > > > > > > On Fri, Jan 14, 2022 at 09:56:50AM +0100, Morten Brørup wrote: > > > > Dear ARM/POWER/x86 maintainers, > > > > > > > > The architecture specific rte_memcpy() provides optimized > variants to > > > copy aligned data. However, the alignment requirements depend on > the > > > hardware architecture, and there is no common definition for the > > > alignment. > > > > > > > > DPDK provides __rte_cache_aligned for cache optimization > purposes, > > > with architecture specific values. Would you consider providing an > > > __rte_memcpy_aligned for rte_memcpy() optimization purposes? > > > > > > > > Or should I just use __rte_cache_aligned, although it is > overkill? > > > > > > > > > > > > Specifically, I am working on a mempool optimization where the > objs > > > field in the rte_mempool_cache structure may benefit by being > aligned > > > for optimized rte_memcpy(). > > > > > > > For me the difficulty with such a memcpy proposal - apart from > probably > > > adding to the amount of memcpy code we have to maintain - is the > > > specific meaning > > > of what "aligned" in the memcpy case. Unlike for a struct > definition, > > > the > > > possible meaning of aligned in memcpy could be: > > > * the source address is aligned > > > * the destination address is aligned > > > * both source and destination is aligned > > > * both source and destination are aligned and the copy length is a > > > multiple > > > of the alignment length > > > * the data is aligned to a cacheline boundary > > > * the data is aligned to the largest load-store size for system > > > * the data is aligned to the boundary suitable for the copy size, > e.g. > > > memcpy of 8 bytes is 8-byte aligned etc. > > > > > > Can you clarify a bit more on your own thinking here? Personally, I > am > > > a > > > little dubious of the benefit of general memcpy optimization, but I > do > > > believe that for specific usecases there is value is having their > own > > > copy > > > operations which include constraints for that specific usecase. For > > > example, in the AVX-512 ice/i40e PMD code, we fold the memcpy from > the > > > mempool cache into the descriptor rearm function because we know we > can > > > always do 64-byte loads and stores, and also because we know that > for > > > each > > > load in the copy, we can reuse the data just after storing it > (giving > > > good > > > perf boost). Perhaps something similar could work for you in your > > > mempool > > > optimization. > > > > > > /Bruce > > > > I'm going to copy array of pointers, specifically the 'objs' array in > the rte_mempool_cache structure. > > > > The 'objs' array starts at byte 24, which is only 8 byte aligned. So > it always fails the ALIGNMENT_MASK test in the x86 specific > > rte_memcpy(), and thus cannot ever use the optimized > rte_memcpy_aligned() function to copy the array, but will use the > > rte_memcpy_generic() function. > > > > If the 'objs' array was optimally aligned, and the other array that > is being copied to/from is also optimally aligned, rte_memcpy() would > use > > the optimized rte_memcpy_aligned() function. > > > > Please also note that the value of ALIGNMENT_MASK depends on which > vector instruction set DPDK is being compiled with. > > > > The other CPU architectures have similar stuff in their rte_memcpy() > implementations, and their alignment requirements are also different. > > > > Please also note that rte_memcpy() becomes even more optimized when > the size of the memcpy() operation is known at compile time. > > If the size is known at compile time, rte_memcpy() probably an overkill > - modern compilers usually generate fast enough code for such cases. > > > > > So I am asking for a public #define __rte_memcpy_aligned I can use to > meet the alignment requirements for optimal rte_memcpy(). > > Even on x86 ALIGNMENT_MASK could have different values (15/31/63) > depending on ISA. > So probably 64 as 'generic' one is the safest bet. I will use cache line alignment for now. > Though I wonder do we really need such micro-optimizations here? I'm not sure, but since it's available, I will use it. :-) And the mempool get/put functions are very frequently used, so I think we should squeeze out every bit of performance we can. > Would it be such huge difference if you call rte_memcpy_aligned() > instead of rte_memcpy()? rte_memcpy_aligned() is x86 only.
RE: rte_memcpy alignment
> > > From: Ananyev, Konstantin [mailto:konstantin.anan...@intel.com] > > Sent: Friday, 14 January 2022 11.54 > > > > > From: Morten Brørup > > > Sent: Friday, January 14, 2022 9:54 AM > > > > > > > From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > > > Sent: Friday, 14 January 2022 10.11 > > > > > > > > On Fri, Jan 14, 2022 at 09:56:50AM +0100, Morten Brørup wrote: > > > > > Dear ARM/POWER/x86 maintainers, > > > > > > > > > > The architecture specific rte_memcpy() provides optimized > > variants to > > > > copy aligned data. However, the alignment requirements depend on > > the > > > > hardware architecture, and there is no common definition for the > > > > alignment. > > > > > > > > > > DPDK provides __rte_cache_aligned for cache optimization > > purposes, > > > > with architecture specific values. Would you consider providing an > > > > __rte_memcpy_aligned for rte_memcpy() optimization purposes? > > > > > > > > > > Or should I just use __rte_cache_aligned, although it is > > overkill? > > > > > > > > > > > > > > > Specifically, I am working on a mempool optimization where the > > objs > > > > field in the rte_mempool_cache structure may benefit by being > > aligned > > > > for optimized rte_memcpy(). > > > > > > > > > For me the difficulty with such a memcpy proposal - apart from > > probably > > > > adding to the amount of memcpy code we have to maintain - is the > > > > specific meaning > > > > of what "aligned" in the memcpy case. Unlike for a struct > > definition, > > > > the > > > > possible meaning of aligned in memcpy could be: > > > > * the source address is aligned > > > > * the destination address is aligned > > > > * both source and destination is aligned > > > > * both source and destination are aligned and the copy length is a > > > > multiple > > > > of the alignment length > > > > * the data is aligned to a cacheline boundary > > > > * the data is aligned to the largest load-store size for system > > > > * the data is aligned to the boundary suitable for the copy size, > > e.g. > > > > memcpy of 8 bytes is 8-byte aligned etc. > > > > > > > > Can you clarify a bit more on your own thinking here? Personally, I > > am > > > > a > > > > little dubious of the benefit of general memcpy optimization, but I > > do > > > > believe that for specific usecases there is value is having their > > own > > > > copy > > > > operations which include constraints for that specific usecase. For > > > > example, in the AVX-512 ice/i40e PMD code, we fold the memcpy from > > the > > > > mempool cache into the descriptor rearm function because we know we > > can > > > > always do 64-byte loads and stores, and also because we know that > > for > > > > each > > > > load in the copy, we can reuse the data just after storing it > > (giving > > > > good > > > > perf boost). Perhaps something similar could work for you in your > > > > mempool > > > > optimization. > > > > > > > > /Bruce > > > > > > I'm going to copy array of pointers, specifically the 'objs' array in > > the rte_mempool_cache structure. > > > > > > The 'objs' array starts at byte 24, which is only 8 byte aligned. So > > it always fails the ALIGNMENT_MASK test in the x86 specific > > > rte_memcpy(), and thus cannot ever use the optimized > > rte_memcpy_aligned() function to copy the array, but will use the > > > rte_memcpy_generic() function. > > > > > > If the 'objs' array was optimally aligned, and the other array that > > is being copied to/from is also optimally aligned, rte_memcpy() would > > use > > > the optimized rte_memcpy_aligned() function. > > > > > > Please also note that the value of ALIGNMENT_MASK depends on which > > vector instruction set DPDK is being compiled with. > > > > > > The other CPU architectures have similar stuff in their rte_memcpy() > > implementations, and their alignment requirements are also different. > > > > > > Please also note that rte_memcpy() becomes even more optimized when > > the size of the memcpy() operation is known at compile time. > > > > If the size is known at compile time, rte_memcpy() probably an overkill > > - modern compilers usually generate fast enough code for such cases. > > > > > > > > So I am asking for a public #define __rte_memcpy_aligned I can use to > > meet the alignment requirements for optimal rte_memcpy(). > > > > Even on x86 ALIGNMENT_MASK could have different values (15/31/63) > > depending on ISA. > > So probably 64 as 'generic' one is the safest bet. > > I will use cache line alignment for now. > > > Though I wonder do we really need such micro-optimizations here? > > I'm not sure, but since it's available, I will use it. :-) > > And the mempool get/put functions are very frequently used, so I think we > should squeeze out every bit of performance we can. Well it wouldn't come for free, right? You would probably need to do some extra checking and add handling for non-aligned cases. Anyway, will probably just wait for the patch before going into further
RE: [dpdk-dev] [PATCH v4] examples/l3fwd: ipv4 and udp/tcp cksum verification through software
Hi Usama,
AFAIK, all drivers that support DEV_RX_OFFLOAD_*_CKSUM will
set RTE_MBUF_F_RX_*_CKSUM_* properly
(when DEV_RX_OFFLOAD_*_CKSUM was requested by user off-course).
The problem is that not all PMDs support checksum offload.
For such cases my suggestion was to install RX callback that would
verify packet checksum and set RTE_MBUF_F_RX_*_CKSUM_* for it.
From: Usama Nadeem
Sent: Friday, January 14, 2022 9:30 AM
To: Ananyev, Konstantin
Cc: tho...@monjalon.net; dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v4] examples/l3fwd: ipv4 and udp/tcp cksum
verification through software
Hello, and thank you for the recommendations. I did investigate the alternative
options offered. I have a question about it. After verifying mbuf's cksum, we
may set the RTE MBUF F RX * CKSUM_* flags. I was just wondering if it should be
done at the application level or in the driver code.
If we add this feature to driver code, do we have to include it in all drivers
that don't support sw-based cksums, and will it vary per driver?
Is it possible to accomplish it in a generic way? As an example, how about at
the application level. If we set the RTE MBUF F RX * CKSUM_* flags on the
application level, it will be independent of the individual drivers.
Thanks
On Thu, Nov 4, 2021 at 6:19 PM Ananyev, Konstantin
mailto:konstantin.anan...@intel.com>> wrote:
> checks if ipv4 and udptcp cksum offload capability available
> If not available, cksum is verified through software
> If cksum is corrupt, packet is dropped, rest of the packets
> are forwarded back.
From what I see right now l3fwd:
a) enables HW RX cksum offload
b) simply ignores HW provided cksum status
Which came as a real surprise to me.
Feel free to correct me if I missed something obvious here.
So, I think first we need to add missing check first,
even though it might cause some perf drop.
Then make changes to actually check provided by HW status and
when HW doesn't provide such offload do check in SW.
Another alternative would be to remove request for HW offloads
and document l3fwd that it doesn't check checksums at all,
but I don't think it is a good way.
> Bugzilla ID:545
> Signed-off-by: Usama Nadeem
> mailto:usama.nad...@emumba.com>>
> ---
> examples/l3fwd/l3fwd.h | 6
> examples/l3fwd/l3fwd_lpm.c | 72 --
> examples/l3fwd/main.c | 33 +++--
> 3 files changed, 105 insertions(+), 6 deletions(-)
>
> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
> index a808d60247..c2c21a91fb 100644
> --- a/examples/l3fwd/l3fwd.h
> +++ b/examples/l3fwd/l3fwd.h
> @@ -55,6 +55,8 @@
> #define L3FWD_HASH_ENTRIES (1024*1024*1)
> #endif
> #define HASH_ENTRY_NUMBER_DEFAULT4
> +extern bool l3_sft_cksum;
> +extern bool l4_sft_cksum;
About the approach itself.
We have similar issue for HW PTYPE recognition - some HW doesn't support it.
So we check HW capabilities and if required we setup SW RX callbacks to do
determine PTYPE in SW. Note that for EM/LPM we have different callbacks.
I think for cksum checks we can do the same:
check HW capabilities, if they are missing add a new callback that would
calculate/check cksum and set RTE_MBUF_F_RX_*_CKSUM_* flags.
That way it will HW/SW cksum will be transparent for the rest of l3fwd code.
About cksums required: for LPM/FIB mode just IPv4 cksum seems enough.
For EM we probably need L4 cksum too, though not sure is it really needed.
Wonder what other people think here?
> struct mbuf_table {
> uint16_t len;
> @@ -210,6 +212,10 @@ em_main_loop(__rte_unused void *dummy);
> int
> lpm_main_loop(__rte_unused void *dummy);
>
> +int
> +check_software_cksum(struct rte_mbuf **pkts_burst,
> +struct rte_mbuf **pkts_burst_to_send, int nb_rx);
> +
> int
> fib_main_loop(__rte_unused void *dummy);
>
> diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
> index 232b606b54..ecaf323943 100644
> --- a/examples/l3fwd/l3fwd_lpm.c
> +++ b/examples/l3fwd/l3fwd_lpm.c
> @@ -26,6 +26,7 @@
> #include
> #include
> #include
> +#include
>
> #include "l3fwd.h"
> #include "l3fwd_event.h"
> @@ -139,16 +140,65 @@ lpm_get_dst_port_with_ipv4(const struct lcore_conf
> *qconf, struct rte_mbuf *pkt,
> #include "l3fwd_lpm.h"
> #endif
>
> +
> +int check_software_cksum(struct rte_mbuf **pkts_burst,
> +struct rte_mbuf **pkts_burst_to_send, int nb_rx)
> +{
> + int j;
> + int i = 0;
> + struct rte_net_hdr_lens hdr_lens;
> + struct rte_ipv4_hdr *ipv4_hdr;
> + void *l3_hdr;
> + void *l4_hdr;
> + rte_be16_t prev_cksum;
> + int dropped_pkts_udp_tcp = 0;
> + int dropped_pkts_ipv4 = 0;
> + bool dropped;
> + for (j = 0; j < nb_rx; j++) {
> + dropped = false;
> + rte_net_get_ptype(pkts_burst[j], &hdr_lens, RTE_PTYPE_ALL_MASK);
> + l3_hdr = rte_pktmbuf_mtod_offset(pkts_burst[j],
> + void *, hdr_lens.l2_len);
> + l4_hdr = rte_pktmbuf_mtod_offset(pkts_b
Re: [dpdk-dev] [PATCH] net/bonding: fix offloading configuration
On 11/9/2021 7:57 AM, Min Hu (Connor) wrote:
From: Chengchang Tang
Currently, part offloadings of the bonding device will not take effect
by using dev_configure(). Because the related configuration will not be
delivered to the slave devices in this way.
The offloading capability of the bonding device is the intersection of
the capability of all slave devices. Based on this, the following functions
are added to the bonding driver:
1. If a Tx offloading is within the capability of the bonding device (i.e,
all the slave devices support this Tx offloading), the enabling status of
the offloading of all slave devices depends on the configuration of the
bonding device.
2. For the Tx offloading that is not within the Tx offloading capability
of the bonding device, the enabling status of the offloading on the slave
devices is irrelevant to the bonding device configuration. And it depends
on the original configuration of the slave devices.
Fixes: e8b3e1a9b1bb ("net/bonding: switch to new offloading API")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
Applied to dpdk-next-net/main, thanks.
Re: [PATCH] build: add missing arch define for Arm
14/01/2022 10:05, Ruifeng Wang:
> From: Thomas Monjalon
> > 17/12/2021 09:54, Ruifeng Wang:
> > > As per design document, RTE_ARCH is the name of the architecture.
> > > However, the definition was missing on Arm with meson build.
> > > It impacts applications that refers to this string.
> > >
> > > Added for Arm builds.
> > >
> > > Fixes: b1d48c41189a ("build: support ARM with meson")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Ruifeng Wang
> > > ---
> > > ['RTE_ARCH_ARMv8_AARCH32', true],
> > > +['RTE_ARCH', 'arm64_aarch32'],
> >
> > Why not armv8_aarch32?
>
> Thanks for the comments.
> Agreed. armv8_aarch32 is consistent with the RTE_ARCH_xx macro above.
>
> >
> > [...]
> > > dpdk_conf.set('RTE_ARCH_ARMv7', true)
> > > +dpdk_conf.set('RTE_ARCH', 'armv7')
> > [...]
> > > # armv8 build
> > > +dpdk_conf.set('RTE_ARCH', 'arm64')
> >
> > Why not armv8?
> >
> > What I prefer the most in silicon industry is the naming craziness :)
>
> While armv8 usually refers to one generation of the Arm architecture, arm64
> is more generic for 64-bit architectures.
> And what defined for armv8 build is RTE_ARCH_ARM64. So for consistency, arm64
> is better?
I don't really care as long as we can have fun of this naming :)
RE: [PATCH v4] kni: allow configuring the kni thread granularity
> -Original Message- > From: Tudor Cornea > Sent: Wednesday, November 24, 2021 7:24 PM > To: Yigit, Ferruh > Cc: tho...@monjalon.net; step...@networkplumber.org; Zhang, Helin > ; dev@dpdk.org; Tudor Cornea > > Subject: [PATCH v4] kni: allow configuring the kni thread granularity > > The Kni kthreads seem to be re-scheduled at a granularity of roughly > 1 millisecond right now, which seems to be insufficient for performing tests > involving a lot of control plane traffic. > > Even if KNI_KTHREAD_RESCHEDULE_INTERVAL is set to 5 microseconds, it > seems that the existing code cannot reschedule at the desired granularily, > due to precision constraints of schedule_timeout_interruptible(). > > In our use case, we leverage the Linux Kernel for control plane, and it is not > uncommon to have 60K - 100K pps for some signaling protocols. > > Since we are not in atomic context, the usleep_range() function seems to be > more appropriate for being able to introduce smaller controlled delays, in the > range of 5-10 microseconds. Upon reading the existing code, it would seem > that this was the original intent. Adding sub-millisecond delays, seems > unfeasible with a call to schedule_timeout_interruptible(). > > KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */ > schedule_timeout_interruptible( > usecs_to_jiffies(KNI_KTHREAD_RESCHEDULE_INTERVAL)); > > Below, we attempted a brief comparison between the existing > implementation, which uses schedule_timeout_interruptible() and > usleep_range(). > > We attempt to measure the CPU usage, and RTT between two Kni interfaces, > which are created on top of vmxnet3 adapters, connected by a vSwitch. > > insmod rte_kni.ko kthread_mode=single carrier=on > > schedule_timeout_interruptible(usecs_to_jiffies(5)) > kni_single CPU Usage: 2-4 % > [root@localhost ~]# ping 1.1.1.2 -I eth1 PING 1.1.1.2 (1.1.1.2) from 1.1.1.1 > eth1: 56(84) bytes of data. > 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=2.70 ms > 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=1.00 ms > 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=1.99 ms > 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.985 ms > 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=1.00 ms > > usleep_range(5, 10) > kni_single CPU usage: 50% > 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.338 ms > 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.150 ms > 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.123 ms > 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.139 ms > 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.159 ms > > usleep_range(20, 50) > kni_single CPU usage: 24% > 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.202 ms > 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.170 ms > 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.171 ms > 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.248 ms > 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.185 ms > > usleep_range(50, 100) > kni_single CPU usage: 13% > 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.537 ms > 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.257 ms > 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.231 ms > 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.143 ms > 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.200 ms > > usleep_range(100, 200) > kni_single CPU usage: 7% > 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.716 ms > 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.167 ms > 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.459 ms > 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.455 ms > 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.252 ms > > usleep_range(1000, 1100) > kni_single CPU usage: 2% > 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=2.22 ms > 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=1.17 ms > 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=1.17 ms > 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=1.17 ms > 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=1.15 ms > > Upon testing, usleep_range(1000, 1100) seems roughly equivalent in latency > and cpu usage to the variant with schedule_timeout_interruptible(), while > usleep_range(100, 200) seems to give a decent tradeoff between latency > and cpu usage, while allowing users to tweak the limits for improved > precision if they have such use cases. > > Disabling RTE_KNI_PREEMPT_DEFAULT, interestingly seems to lead to a > softlockup on my kernel. > > Kernel panic - not syncing: softlockup: hung tasks > CPU: 0 PID: 1226 Comm: kni_single Tainted: GW O 3.10 #1 >[] dump_stack+0x19/0x1b [] > panic+0xcd/0x1e0 [] watchdog_timer_fn+0x160/0x160 > [] __run_hrtimer.isra.4+0x42/0xd0 [] > hrtimer_interrupt+0xe7/0x1f0 [] > smp_apic_timer_interrupt+0x67/0xa0 > [] apic_timer_interrupt+0x6d/0x80 > > This patch also attempts to remove this option. > > References: > [1] https://www.kernel.org/doc/Documentation/timers/timers-howto.txt > > Signed-off-by: Tudor Cornea > > --- > v4: > * Removed RTE_KNI_PREEMPT_DEFAULT configuration option > v3: > * Fixed unwrapped commit description warning > *
Re: [PATCH v4] kni: allow configuring the kni thread granularity
On 11/24/2021 7:24 PM, Tudor Cornea wrote: The Kni kthreads seem to be re-scheduled at a granularity of roughly 1 millisecond right now, which seems to be insufficient for performing tests involving a lot of control plane traffic. Even if KNI_KTHREAD_RESCHEDULE_INTERVAL is set to 5 microseconds, it seems that the existing code cannot reschedule at the desired granularily, due to precision constraints of schedule_timeout_interruptible(). In our use case, we leverage the Linux Kernel for control plane, and it is not uncommon to have 60K - 100K pps for some signaling protocols. Since we are not in atomic context, the usleep_range() function seems to be more appropriate for being able to introduce smaller controlled delays, in the range of 5-10 microseconds. Upon reading the existing code, it would seem that this was the original intent. Adding sub-millisecond delays, seems unfeasible with a call to schedule_timeout_interruptible(). KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */ schedule_timeout_interruptible( usecs_to_jiffies(KNI_KTHREAD_RESCHEDULE_INTERVAL)); Below, we attempted a brief comparison between the existing implementation, which uses schedule_timeout_interruptible() and usleep_range(). We attempt to measure the CPU usage, and RTT between two Kni interfaces, which are created on top of vmxnet3 adapters, connected by a vSwitch. insmod rte_kni.ko kthread_mode=single carrier=on schedule_timeout_interruptible(usecs_to_jiffies(5)) kni_single CPU Usage: 2-4 % [root@localhost ~]# ping 1.1.1.2 -I eth1 PING 1.1.1.2 (1.1.1.2) from 1.1.1.1 eth1: 56(84) bytes of data. 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=2.70 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=1.00 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=1.99 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.985 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=1.00 ms usleep_range(5, 10) kni_single CPU usage: 50% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.338 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.150 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.123 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.139 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.159 ms usleep_range(20, 50) kni_single CPU usage: 24% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.202 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.170 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.171 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.248 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.185 ms usleep_range(50, 100) kni_single CPU usage: 13% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.537 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.257 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.231 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.143 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.200 ms usleep_range(100, 200) kni_single CPU usage: 7% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.716 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.167 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.459 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.455 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.252 ms usleep_range(1000, 1100) kni_single CPU usage: 2% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=2.22 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=1.17 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=1.17 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=1.17 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=1.15 ms Upon testing, usleep_range(1000, 1100) seems roughly equivalent in latency and cpu usage to the variant with schedule_timeout_interruptible(), while usleep_range(100, 200) seems to give a decent tradeoff between latency and cpu usage, while allowing users to tweak the limits for improved precision if they have such use cases. Disabling RTE_KNI_PREEMPT_DEFAULT, interestingly seems to lead to a softlockup on my kernel. Kernel panic - not syncing: softlockup: hung tasks CPU: 0 PID: 1226 Comm: kni_single Tainted: GW O 3.10 #1 [] dump_stack+0x19/0x1b [] panic+0xcd/0x1e0 [] watchdog_timer_fn+0x160/0x160 [] __run_hrtimer.isra.4+0x42/0xd0 [] hrtimer_interrupt+0xe7/0x1f0 [] smp_apic_timer_interrupt+0x67/0xa0 [] apic_timer_interrupt+0x6d/0x80 This patch also attempts to remove this option. References: [1] https://www.kernel.org/doc/Documentation/timers/timers-howto.txt Signed-off-by: Tudor Cornea --- v4: * Removed RTE_KNI_PREEMPT_DEFAULT configuration option v3: * Fixed unwrapped commit description warning * Changed from hrtimers to Linux High Precision Timers in docs * Added two tabs at the beginning of the new params description. Stephen correctly pointed out that the descriptions of the parameters for the Kni module are nonstandard w.r.t existing kernel code. I was thinking to preserve compatibility with the existing parameters of the Kni module for the moment, while an additional clean-up patch could format the descriptions to be closer to th
[PATCH] net/mlx5: fix RSS expansion compilation
For each item in flow rule pattern that can be expanded, RSS expansion
scheme returns ether specific next item flow item type or
RTE_FLOW_ITEM_TYPE_VOID or RTE_FLOW_ITEM_TYPE_END.
RTE_FLOW_ITEM_TYPE_END means that expansion has completed.
RTE_FLOW_ITEM_TYPE_VOID means that next flow item was not located yet
and the procedure will continue.
Current expansion scheme assigns RTE_FLOW_ITEM_TYPE_END for L2, L3 and
L4 rule items that set next protocol value to 0 in flow item mask.
The correct value in that case is RTE_FLOW_ITEM_TYPE_VOID.
Fixes: 342a22ef3928 ("net/mlx5: fix RSS expansion with explicit next protocol")
Signed-off-by: Gregory Etelson
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_flow.c | 8
1 file changed, 8 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 4e2ff16e30..e067087272 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -261,18 +261,26 @@ mlx5_flow_expand_rss_item_complete(const struct
rte_flow_item *item)
switch (item->type) {
case RTE_FLOW_ITEM_TYPE_ETH:
MLX5_XSET_ITEM_MASK_SPEC(eth, type);
+ if (!mask)
+ return RTE_FLOW_ITEM_TYPE_VOID;
ret = mlx5_ethertype_to_item_type(spec, mask, false);
break;
case RTE_FLOW_ITEM_TYPE_VLAN:
MLX5_XSET_ITEM_MASK_SPEC(vlan, inner_type);
+ if (!mask)
+ return RTE_FLOW_ITEM_TYPE_VOID;
ret = mlx5_ethertype_to_item_type(spec, mask, false);
break;
case RTE_FLOW_ITEM_TYPE_IPV4:
MLX5_XSET_ITEM_MASK_SPEC(ipv4, hdr.next_proto_id);
+ if (!mask)
+ return RTE_FLOW_ITEM_TYPE_VOID;
ret = mlx5_inet_proto_to_item_type(spec, mask);
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
MLX5_XSET_ITEM_MASK_SPEC(ipv6, hdr.proto);
+ if (!mask)
+ return RTE_FLOW_ITEM_TYPE_VOID;
ret = mlx5_inet_proto_to_item_type(spec, mask);
break;
case RTE_FLOW_ITEM_TYPE_GENEVE:
--
2.34.1
[PATCH v5] kni: allow configuring the kni thread granularity
The Kni kthreads seem to be re-scheduled at a granularity of roughly 1 millisecond right now, which seems to be insufficient for performing tests involving a lot of control plane traffic. Even if KNI_KTHREAD_RESCHEDULE_INTERVAL is set to 5 microseconds, it seems that the existing code cannot reschedule at the desired granularily, due to precision constraints of schedule_timeout_interruptible(). In our use case, we leverage the Linux Kernel for control plane, and it is not uncommon to have 60K - 100K pps for some signaling protocols. Since we are not in atomic context, the usleep_range() function seems to be more appropriate for being able to introduce smaller controlled delays, in the range of 5-10 microseconds. Upon reading the existing code, it would seem that this was the original intent. Adding sub-millisecond delays, seems unfeasible with a call to schedule_timeout_interruptible(). KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */ schedule_timeout_interruptible( usecs_to_jiffies(KNI_KTHREAD_RESCHEDULE_INTERVAL)); Below, we attempted a brief comparison between the existing implementation, which uses schedule_timeout_interruptible() and usleep_range(). We attempt to measure the CPU usage, and RTT between two Kni interfaces, which are created on top of vmxnet3 adapters, connected by a vSwitch. insmod rte_kni.ko kthread_mode=single carrier=on schedule_timeout_interruptible(usecs_to_jiffies(5)) kni_single CPU Usage: 2-4 % [root@localhost ~]# ping 1.1.1.2 -I eth1 PING 1.1.1.2 (1.1.1.2) from 1.1.1.1 eth1: 56(84) bytes of data. 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=2.70 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=1.00 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=1.99 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.985 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=1.00 ms usleep_range(5, 10) kni_single CPU usage: 50% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.338 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.150 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.123 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.139 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.159 ms usleep_range(20, 50) kni_single CPU usage: 24% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.202 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.170 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.171 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.248 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.185 ms usleep_range(50, 100) kni_single CPU usage: 13% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.537 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.257 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.231 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.143 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.200 ms usleep_range(100, 200) kni_single CPU usage: 7% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=0.716 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=0.167 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=0.459 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=0.455 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=0.252 ms usleep_range(1000, 1100) kni_single CPU usage: 2% 64 bytes from 1.1.1.2: icmp_seq=1 ttl=64 time=2.22 ms 64 bytes from 1.1.1.2: icmp_seq=2 ttl=64 time=1.17 ms 64 bytes from 1.1.1.2: icmp_seq=3 ttl=64 time=1.17 ms 64 bytes from 1.1.1.2: icmp_seq=4 ttl=64 time=1.17 ms 64 bytes from 1.1.1.2: icmp_seq=5 ttl=64 time=1.15 ms Upon testing, usleep_range(1000, 1100) seems roughly equivalent in latency and cpu usage to the variant with schedule_timeout_interruptible(), while usleep_range(100, 200) seems to give a decent tradeoff between latency and cpu usage, while allowing users to tweak the limits for improved precision if they have such use cases. Disabling RTE_KNI_PREEMPT_DEFAULT, interestingly seems to lead to a softlockup on my kernel. Kernel panic - not syncing: softlockup: hung tasks CPU: 0 PID: 1226 Comm: kni_single Tainted: GW O 3.10 #1 [] dump_stack+0x19/0x1b [] panic+0xcd/0x1e0 [] watchdog_timer_fn+0x160/0x160 [] __run_hrtimer.isra.4+0x42/0xd0 [] hrtimer_interrupt+0xe7/0x1f0 [] smp_apic_timer_interrupt+0x67/0xa0 [] apic_timer_interrupt+0x6d/0x80 This patch also attempts to remove this option. References: [1] https://www.kernel.org/doc/Documentation/timers/timers-howto.txt Signed-off-by: Tudor Cornea Acked-by: Padraig Connolly Reviewed-by: Ferruh Yigit --- v5: * Rebased the patch on top of the dpdk-next-net branch v4: * Removed RTE_KNI_PREEMPT_DEFAULT configuration option v3: * Fixed unwrapped commit description warning * Changed from hrtimers to Linux High Precision Timers in docs * Added two tabs at the beginning of the new params description. Stephen correctly pointed out that the descriptions of the parameters for the Kni module are nonstandard w.r.t existing kernel code. I was thinking to preserve compatibility with the existing parameters of the Kni module for the moment, while an additional clean-up p
Re: dumpcap w/ pcapng produces out of order/negative times
On Thu, 13 Jan 2022 21:38:06 -0500 Ben Magistro wrote: > While utilizing dumpcap with our app, we have observed the captured file > producing out of order timestamps to include negative times. We are still > investigating the root cause but believe it is in lib/pcapng. While doing > some testing of this issue, this behavior was not observed with pcap. In > the attached pcap, there are 5 streams (same curl multiple times a few > seconds apart), with streams 1 and 3 showing oddities. Specifically, > stream 1 is in the future relative to the packet order and stream 3 has a > negative time. > > Not sure if the pcap file will actual post/attach, if it doesn't will try > something. > > System: CentOS7 + devtoolset 9 > DPDK: v21.11 The library hast convert from TSC (cpu clock) to nanoseconds since 1/1/1970 The function pcapng_init computes the offset.
Re: [PATCH v5] kni: allow configuring the kni thread granularity
On Fri, 14 Jan 2022 17:18:19 +0200 Tudor Cornea wrote: > +module_param(min_scheduling_interval, long, 0644); > +MODULE_PARM_DESC(min_scheduling_interval, > +"\t\tKni thread min scheduling interval (default=100 microseconds):\n" > +"\t\t" > +); > + > +module_param(max_scheduling_interval, long, 0644); > +MODULE_PARM_DESC(max_scheduling_interval, > +"\t\tKni thread max scheduling interval (default=200 microseconds):\n" > +"\t\t" > +); Please don't add more bad module parameter strings. The KNI author did something no other kernel modules do with tabs and double spacing, stop this bogus stuff. Is there any reason you have to use KNI at all. KNI is broken on many levels and is not fixable. What about virtio or tap?
[PATCH v4 00/53] introduce IWYU
This patchset introduces the include-what-you-use script which removes unused header includes. IWYU GitHub: https://github.com/include-what-you-use/include-what-you-use Along with the script there are some patches which make a start on removing unneeded headers. V4: * Re-added removed headers that are now needed in order to fix build issues. * Removed other unused headers from other libraries Sean Morrissey (53): devtools: script to remove unused headers includes telemetry: remove unneeded header includes ring: remove unneeded header includes kvargs: remove unneeded header includes eal: remove unneeded header includes vhost: remove unneeded header includes timer: remove unneeded header includes table: remove unneeded header includes stack: remove unneeded header includes security: remove unneeded header includes sched: remove unneeded header includes ring: remove unneeded header includes rib: remove unneeded header includes reorder: remove unneeded header includes regexdev: remove unneeded header includes rcu: remove unneeded header includes rawdev: remove unneeded header includes power: remove unneeded header includes port: remove unneeded header includes pipeline: remove unneeded header includes pdump: remove unneeded header includes pci: remove unneeded header includes pcapng: remove unneeded header includes node: remove unneeded header includes net: remove unneeded header includes metrics: remove unneeded header includes mempool: remove unneeded header includes member: remove unneeded header includes mbuf: remove unneeded header includes lpm: remove unneeded header includes latencystats: remove unneeded header includes kvargs: remove unneeded header includes kni: remove unneeded header includes jobstats: remove unneeded header includes ipsec: remove unneeded header includes ip_frag: remove unneeded header includes hash: remove unneeded header includes gro: remove unneeded header includes graph: remove unneeded header includes gpudev: remove unneeded header includes flow_classify: remove unneeded header includes fib: remove unneeded header includes eventdev: remove unneeded header includes efd: remove unneeded header includes eal: remove unneeded header includes dmadev: remove unneeded header includes distributor: remove unneeded header includes compressdev: remove unneeded header includes cmdline: remove unneeded header includes bpf: remove unneeded header includes bbdev: remove unneeded header includes cryptodev: remove unneeded header includes acl: remove unneeded header includes devtools/process_iwyu.py| 109 examples/vm_power_manager/guest_cli/main.c | 1 + lib/acl/rte_acl.c | 1 - lib/bbdev/rte_bbdev.c | 4 - lib/bbdev/rte_bbdev.h | 4 - lib/bpf/bpf.c | 4 - lib/bpf/bpf_exec.c | 6 -- lib/bpf/bpf_jit_x86.c | 5 - lib/bpf/bpf_load.c | 8 -- lib/bpf/bpf_pkt.c | 12 --- lib/bpf/bpf_validate.c | 3 - lib/cmdline/cmdline.c | 2 - lib/cmdline/cmdline_cirbuf.c| 1 - lib/cmdline/cmdline_cirbuf.h| 1 - lib/cmdline/cmdline_parse.c | 3 - lib/cmdline/cmdline_parse_num.c | 4 - lib/cmdline/cmdline_parse_portlist.c| 3 - lib/cmdline/cmdline_parse_string.c | 4 - lib/cmdline/cmdline_rdline.c| 2 - lib/cmdline/cmdline_socket.c| 5 - lib/cmdline/cmdline_socket.h| 1 - lib/cmdline/cmdline_vt100.c | 3 - lib/compressdev/rte_comp.c | 1 - lib/compressdev/rte_comp.h | 1 - lib/compressdev/rte_compressdev.c | 1 - lib/compressdev/rte_compressdev.h | 1 - lib/compressdev/rte_compressdev_pmd.h | 2 - lib/cryptodev/cryptodev_pmd.h | 4 - lib/cryptodev/rte_cryptodev.c | 11 -- lib/cryptodev/rte_cryptodev.h | 2 - lib/distributor/rte_distributor.c | 2 - lib/distributor/rte_distributor_match_sse.c | 2 - lib/distributor/rte_distributor_single.c| 2 - lib/dmadev/rte_dmadev.h | 1 - lib/eal/common/eal_common_dev.c | 5 - lib/eal/common/eal_common_devargs.c | 1 - lib/eal/common/eal_common_errno.c | 4 - lib/eal/common/eal_common_fbarray.c | 3 - lib/eal/common/eal_common_hexdump.c | 3 - lib/eal/common/eal_common_launch.c | 6 -- lib/eal/common/eal_common_lcore.c | 7 +- lib/eal/common/eal_common_log.c | 2 - lib/eal/common/eal_common_memalloc.c| 3 - lib/eal/common/eal_common_memory.c | 5
[PATCH v4 02/53] telemetry: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
Acked-by: Ciara Power
---
lib/telemetry/telemetry.c | 1 -
lib/telemetry/telemetry_data.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index e5ccfe47f7..c6fd03a5ab 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#endif /* !RTE_EXEC_ENV_WINDOWS */
/* we won't link against libbsd, so just always use DPDKs-specific strlcpy */
diff --git a/lib/telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
index adb84a09f1..26aa28e72c 100644
--- a/lib/telemetry/telemetry_data.h
+++ b/lib/telemetry/telemetry_data.h
@@ -5,7 +5,6 @@
#ifndef _TELEMETRY_DATA_H_
#define _TELEMETRY_DATA_H_
-#include
#include "rte_telemetry.h"
enum tel_container_types {
--
2.25.1
[PATCH v4 01/53] devtools: script to remove unused headers includes
This script can be used for removing headers flagged for removal by the
include-what-you-use (IWYU) tool. The script has the ability to remove
headers from specified sub-directories or dpdk as a whole and tests the
build after each removal by calling meson compile.
example usages:
Remove headers flagged by iwyu_tool output file
$ ./devtools/process_iwyu.py iwyu.out -b build
Remove headers flagged by iwyu_tool output file from sub-directory
$ ./devtools/process_iwyu.py iwyu.out -b build -d lib/kvargs
Remove headers directly piped from the iwyu_tool
$ iwyu_tool -p build | ./devtools/process_iwyu.py - -b build
Signed-off-by: Sean Morrissey
Signed-off-by: Conor Fogarty
Reviewed-by: Bruce Richardson
---
devtools/process_iwyu.py | 109 +++
1 file changed, 109 insertions(+)
create mode 100755 devtools/process_iwyu.py
diff --git a/devtools/process_iwyu.py b/devtools/process_iwyu.py
new file mode 100755
index 00..50f3d4c5c7
--- /dev/null
+++ b/devtools/process_iwyu.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+#
+
+import argparse
+import fileinput
+import sys
+from os.path import abspath, relpath, join
+from pathlib import Path
+from mesonbuild import mesonmain
+
+
+def args_parse():
+"parse arguments and return the argument object back to main"
+parser = argparse.ArgumentParser(description="This script can be used to
remove includes which are not in use\n")
+parser.add_argument('-b', '--build_dir', type=str, default='build',
+help="The path to the build directory in which the
IWYU tool was used in.")
+parser.add_argument('-d', '--sub_dir', type=str, default='',
+help="The sub-directory to remove headers from.")
+parser.add_argument('file', type=Path,
+help="The path to the IWYU log file or output from
stdin.")
+
+return parser.parse_args()
+
+
+def run_meson(args):
+"Runs a meson command logging output to process.log"
+with open('process_iwyu.log', 'a') as sys.stdout:
+ret = mesonmain.run(args, abspath('meson'))
+sys.stdout = sys.__stdout__
+return ret
+
+
+def remove_includes(filepath, include, build_dir):
+"Attempts to remove include, if it fails then revert to original state"
+with open(filepath) as f:
+lines = f.readlines() # Read lines when file is opened
+
+with open(filepath, 'w') as f:
+for ln in lines: # Removes the include passed in
+if not ln.startswith(include):
+f.write(ln)
+
+# run test build -> call meson on the build folder, meson compile -C build
+ret = run_meson(['compile', '-C', build_dir])
+if (ret == 0): # Include is not needed -> build is successful
+print('SUCCESS')
+else:
+# failed, catch the error
+# return file to original state
+with open(filepath, 'w') as f:
+f.writelines(lines)
+print('FAILED')
+
+
+def get_build_config(builddir, condition):
+"returns contents of rte_build_config.h"
+with open(join(builddir, 'rte_build_config.h')) as f:
+return [ln for ln in f.readlines() if condition(ln)]
+
+
+def uses_libbsd(builddir):
+"return whether the build uses libbsd or not"
+return bool(get_build_config(builddir, lambda ln: 'RTE_USE_LIBBSD' in ln))
+
+
+def process(args):
+"process the iwyu output on a set of files"
+filepath = None
+build_dir = abspath(args.build_dir)
+directory = args.sub_dir
+
+print("Warning: The results of this script may include false positives
which are required for different systems",
+ file=sys.stderr)
+
+keep_str_fns = uses_libbsd(build_dir) # check for libbsd
+if keep_str_fns:
+print("Warning: libbsd is present, build will fail to detect incorrect
removal of rte_string_fns.h",
+ file=sys.stderr)
+# turn on werror
+run_meson(['configure', build_dir, '-Dwerror=true'])
+# Use stdin if no iwyu_tool out file given
+for line in fileinput.input(args.file):
+if 'should remove' in line:
+# If the file path in the iwyu_tool output is an absolute path it
+# means the file is outside of the dpdk directory, therefore
ignore it.
+# Also check to see if the file is within the specified sub
directory.
+filename = line.split()[0]
+if (filename != abspath(filename) and
+directory in filename):
+filepath = relpath(join(build_dir, filename))
+elif line.startswith('-') and filepath:
+include = '#include ' + line.split()[2]
+print(f"Remove {include} from {filepath} ... ", end='', flush=True)
+if keep_str_fns and '' in include:
+print('skipped')
+continue
+remove_includes(filepath, include, build_dir)
+else:
+
[PATCH v4 03/53] ring: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ring/rte_ring.c | 7 --- 1 file changed, 7 deletions(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index f17bd966be..bb95962b0c 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -17,16 +17,9 @@ #include #include -#include #include #include -#include -#include #include -#include -#include -#include -#include #include #include #include -- 2.25.1
[PATCH v4 04/53] kvargs: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/kvargs/rte_kvargs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c index 11f624ef14..7010d3ac51 100644 --- a/lib/kvargs/rte_kvargs.c +++ b/lib/kvargs/rte_kvargs.c @@ -7,7 +7,6 @@ #include #include -#include #include #include "rte_kvargs.h" -- 2.25.1
[PATCH v4 05/53] eal: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey Reviewed-by: Harry van Haaren Reviewed-by: Mattias Rönnblom Reviewed-by: David Christensen --- lib/eal/common/eal_common_dev.c| 5 - lib/eal/common/eal_common_devargs.c| 1 - lib/eal/common/eal_common_errno.c | 4 lib/eal/common/eal_common_fbarray.c| 3 --- lib/eal/common/eal_common_hexdump.c| 3 --- lib/eal/common/eal_common_launch.c | 6 -- lib/eal/common/eal_common_lcore.c | 7 +-- lib/eal/common/eal_common_log.c| 2 -- lib/eal/common/eal_common_memalloc.c | 3 --- lib/eal/common/eal_common_memory.c | 5 - lib/eal/common/eal_common_memzone.c| 4 lib/eal/common/eal_common_options.c| 2 -- lib/eal/common/eal_common_proc.c | 2 -- lib/eal/common/eal_common_string_fns.c | 2 -- lib/eal/common/eal_common_tailqs.c | 11 --- lib/eal/common/eal_common_thread.c | 3 --- lib/eal/common/eal_common_timer.c | 6 -- lib/eal/common/eal_common_trace.c | 1 - lib/eal/common/hotplug_mp.h| 1 - lib/eal/common/malloc_elem.c | 6 -- lib/eal/common/malloc_heap.c | 5 - lib/eal/common/malloc_mp.c | 1 - lib/eal/common/malloc_mp.h | 2 -- lib/eal/common/rte_malloc.c| 5 - lib/eal/common/rte_random.c| 3 --- lib/eal/common/rte_service.c | 6 -- lib/eal/include/rte_version.h | 2 -- lib/eal/linux/eal.c| 10 -- lib/eal/linux/eal_alarm.c | 7 --- lib/eal/linux/eal_cpuflags.c | 2 -- lib/eal/linux/eal_debug.c | 5 - lib/eal/linux/eal_dev.c| 4 lib/eal/linux/eal_hugepage_info.c | 7 --- lib/eal/linux/eal_interrupts.c | 8 lib/eal/linux/eal_lcore.c | 7 --- lib/eal/linux/eal_log.c| 11 +-- lib/eal/linux/eal_memalloc.c | 8 lib/eal/linux/eal_memory.c | 9 - lib/eal/linux/eal_thread.c | 5 - lib/eal/linux/eal_timer.c | 15 --- lib/eal/linux/eal_vfio_mp_sync.c | 1 - lib/eal/unix/eal_file.c| 1 - lib/eal/unix/rte_thread.c | 1 - lib/eal/x86/rte_cycles.c | 1 - 44 files changed, 2 insertions(+), 201 deletions(-) diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c index e1e9976d8d..c0ee4e442f 100644 --- a/lib/eal/common/eal_common_dev.c +++ b/lib/eal/common/eal_common_dev.c @@ -5,20 +5,15 @@ #include #include -#include #include -#include #include #include #include #include -#include #include -#include #include #include -#include #include #include "eal_private.h" diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index 8c7650cf6c..c3c3a9e6e4 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include diff --git a/lib/eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c index f86802705a..1091065568 100644 --- a/lib/eal/common/eal_common_errno.c +++ b/lib/eal/common/eal_common_errno.c @@ -5,15 +5,11 @@ /* Use XSI-compliant portable version of strerror_r() */ #undef _GNU_SOURCE -#include #include #include -#include -#include #include #include -#include #ifdef RTE_EXEC_ENV_WINDOWS #define strerror_r(errnum, buf, buflen) strerror_s(buf, buflen, errnum) diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index 3a28a53247..f11f87979f 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -2,7 +2,6 @@ * Copyright(c) 2017-2018 Intel Corporation */ -#include #include #include #include @@ -14,9 +13,7 @@ #include #include #include -#include #include -#include #include "eal_filesystem.h" #include "eal_private.h" diff --git a/lib/eal/common/eal_common_hexdump.c b/lib/eal/common/eal_common_hexdump.c index 2d2179d411..63bbbdcf0a 100644 --- a/lib/eal/common/eal_common_hexdump.c +++ b/lib/eal/common/eal_common_hexdump.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ -#include #include -#include -#include #include #include diff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c index e95dadffb3..9f393b9bda 100644 --- a/lib/eal/common/eal_common_launch.c +++ b/lib/eal/common/eal_common_launch.c @@ -3,16 +3,10 @@ */ #include -#include -#include -#include #include -#include -#include #include #include -#include #include #include "eal_private.h" diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c in
[PATCH v4 06/53] vhost: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/vhost/fd_man.c | 6 -- lib/vhost/fd_man.h | 1 - lib/vhost/socket.c | 1 - lib/vhost/vdpa.c | 1 - lib/vhost/vhost.c | 4 lib/vhost/vhost.h | 6 -- lib/vhost/vhost_user.c | 2 -- lib/vhost/vhost_user.h | 1 - 8 files changed, 22 deletions(-) diff --git a/lib/vhost/fd_man.c b/lib/vhost/fd_man.c index 55d4856f9e..1876fada33 100644 --- a/lib/vhost/fd_man.c +++ b/lib/vhost/fd_man.c @@ -2,14 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#include #include -#include -#include -#include -#include #include -#include #include #include diff --git a/lib/vhost/fd_man.h b/lib/vhost/fd_man.h index 3ab5cfdd60..6f4499bdfa 100644 --- a/lib/vhost/fd_man.h +++ b/lib/vhost/fd_man.h @@ -4,7 +4,6 @@ #ifndef _FD_MAN_H_ #define _FD_MAN_H_ -#include #include #include diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index 82963c1e6d..c22d84a2cb 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c index 09ad5d866e..7c57b3f75b 100644 --- a/lib/vhost/vdpa.c +++ b/lib/vhost/vdpa.c @@ -8,7 +8,6 @@ * Device specific vhost lib */ -#include #include #include diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 13a9bb9dd1..40703b882f 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #ifdef RTE_LIBRTE_VHOST_NUMA @@ -13,13 +12,10 @@ #endif #include -#include #include -#include #include #include #include -#include #include "iotlb.h" #include "vhost.h" diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 7085e0885c..9f9cf65f76 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -5,23 +5,17 @@ #ifndef _VHOST_NET_CDEV_H_ #define _VHOST_NET_CDEV_H_ #include -#include #include -#include #include #include -#include #include -#include #include #include #include -#include #include #include "rte_vhost.h" -#include "rte_vdpa.h" #include "vdpa_driver.h" #include "rte_vhost_async.h" diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 5eb1dd6812..f8c216c453 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -27,10 +27,8 @@ #include #include #include -#include #include #include -#include #ifdef RTE_LIBRTE_VHOST_NUMA #include #endif diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h index 16fe03f889..7d6d6ae125 100644 --- a/lib/vhost/vhost_user.h +++ b/lib/vhost/vhost_user.h @@ -6,7 +6,6 @@ #define _VHOST_NET_USER_H #include -#include #include "rte_vhost.h" -- 2.25.1
[PATCH v4 07/53] timer: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/timer/rte_timer.c | 7 --- 1 file changed, 7 deletions(-) diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c index 6d19ce469b..b3f3e229f6 100644 --- a/lib/timer/rte_timer.c +++ b/lib/timer/rte_timer.c @@ -2,29 +2,22 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#include #include #include #include -#include #include #include #include #include #include -#include #include -#include -#include #include #include #include #include #include #include -#include -#include #include "rte_timer.h" -- 2.25.1
[PATCH v4 08/53] table: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/table/rte_swx_table_em.c | 1 -
lib/table/rte_swx_table_em.h | 1 -
lib/table/rte_swx_table_learner.c | 1 -
lib/table/rte_swx_table_learner.h | 1 -
lib/table/rte_swx_table_selector.c | 1 -
lib/table/rte_swx_table_wm.c | 2 --
lib/table/rte_swx_table_wm.h | 1 -
lib/table/rte_table_acl.c | 3 ---
lib/table/rte_table_array.c| 2 --
lib/table/rte_table_hash_cuckoo.c | 2 --
lib/table/rte_table_hash_ext.c | 2 --
lib/table/rte_table_hash_key16.c | 2 --
lib/table/rte_table_hash_key32.c | 2 --
lib/table/rte_table_hash_key8.c| 2 --
lib/table/rte_table_hash_lru.c | 2 --
lib/table/rte_table_lpm.c | 2 --
lib/table/rte_table_lpm_ipv6.c | 3 ---
lib/table/rte_table_stub.c | 1 -
lib/table/rte_table_stub.h | 1 -
19 files changed, 32 deletions(-)
diff --git a/lib/table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
index 03b28c4c9d..f783cfe282 100644
--- a/lib/table/rte_swx_table_em.c
+++ b/lib/table/rte_swx_table_em.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2020 Intel Corporation
*/
-#include
#include
#include
#include
diff --git a/lib/table/rte_swx_table_em.h b/lib/table/rte_swx_table_em.h
index 909ada483b..b7423dd060 100644
--- a/lib/table/rte_swx_table_em.h
+++ b/lib/table/rte_swx_table_em.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Exact Match Table
*/
-#include
#include
diff --git a/lib/table/rte_swx_table_learner.c
b/lib/table/rte_swx_table_learner.c
index c3c840ff06..15576c2aa3 100644
--- a/lib/table/rte_swx_table_learner.c
+++ b/lib/table/rte_swx_table_learner.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2020 Intel Corporation
*/
-#include
#include
#include
#include
diff --git a/lib/table/rte_swx_table_learner.h
b/lib/table/rte_swx_table_learner.h
index d6ec733655..eb9d7689fd 100644
--- a/lib/table/rte_swx_table_learner.h
+++ b/lib/table/rte_swx_table_learner.h
@@ -22,7 +22,6 @@ extern "C" {
*/
#include
-#include
#include
diff --git a/lib/table/rte_swx_table_selector.c
b/lib/table/rte_swx_table_selector.c
index 541ebc2213..ad99f18453 100644
--- a/lib/table/rte_swx_table_selector.c
+++ b/lib/table/rte_swx_table_selector.c
@@ -7,7 +7,6 @@
#include
#include
-#include
#include "rte_swx_table_selector.h"
diff --git a/lib/table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
index e260be1062..27a67b47bd 100644
--- a/lib/table/rte_swx_table_wm.c
+++ b/lib/table/rte_swx_table_wm.c
@@ -4,10 +4,8 @@
#include
#include
#include
-#include
#include
-#include
#include
#include
diff --git a/lib/table/rte_swx_table_wm.h b/lib/table/rte_swx_table_wm.h
index 9e228f971c..4fd52c0a17 100644
--- a/lib/table/rte_swx_table_wm.h
+++ b/lib/table/rte_swx_table_wm.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Wildcard Match Table
*/
-#include
#include
diff --git a/lib/table/rte_table_acl.c b/lib/table/rte_table_acl.c
index 14d54019f0..179a1da835 100644
--- a/lib/table/rte_table_acl.c
+++ b/lib/table/rte_table_acl.c
@@ -6,13 +6,10 @@
#include
#include
-#include
-#include
#include
#include
#include "rte_table_acl.h"
-#include
#ifdef RTE_TABLE_STATS_COLLECT
diff --git a/lib/table/rte_table_array.c b/lib/table/rte_table_array.c
index 8264c50c27..54a0c42f7d 100644
--- a/lib/table/rte_table_array.c
+++ b/lib/table/rte_table_array.c
@@ -6,8 +6,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_cuckoo.c
b/lib/table/rte_table_hash_cuckoo.c
index f024303330..c77eccf527 100644
--- a/lib/table/rte_table_hash_cuckoo.c
+++ b/lib/table/rte_table_hash_cuckoo.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
index 802a24fe0f..70ea84fa2e 100644
--- a/lib/table/rte_table_hash_ext.c
+++ b/lib/table/rte_table_hash_ext.c
@@ -6,8 +6,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
index c4384b114d..ea8195dc17 100644
--- a/lib/table/rte_table_hash_key16.c
+++ b/lib/table/rte_table_hash_key16.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
index 3e0031fe1e..87f83ce6f5 100644
--- a/lib/table/rte_table_hash_key32.c
+++ b/lib/table/rte_table_hash_key32.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
index 34e3ed1af9..7779a9d1a3 100644
--- a/lib/table/rte_table_hash_key8.c
+++ b/lib/table/rte_table_hash_key8.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
[PATCH v4 09/53] stack: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/stack/rte_stack.c | 2 --
lib/stack/rte_stack.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/lib/stack/rte_stack.c b/lib/stack/rte_stack.c
index 56bf2c8d6d..1fabec2bfe 100644
--- a/lib/stack/rte_stack.c
+++ b/lib/stack/rte_stack.c
@@ -6,12 +6,10 @@
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include "rte_stack.h"
diff --git a/lib/stack/rte_stack.h b/lib/stack/rte_stack.h
index 321f4cec1a..91fc570767 100644
--- a/lib/stack/rte_stack.h
+++ b/lib/stack/rte_stack.h
@@ -19,7 +19,6 @@
extern "C" {
#endif
-#include
#include
#include
#include
--
2.25.1
[PATCH v4 10/53] security: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/security/rte_security.c | 2 --
lib/security/rte_security.h | 3 ---
2 files changed, 5 deletions(-)
diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c
index 6e45a03fa0..4f5e4b4d49 100644
--- a/lib/security/rte_security.c
+++ b/lib/security/rte_security.c
@@ -5,10 +5,8 @@
*/
#include
-#include
#include
#include
-#include "rte_compat.h"
#include "rte_security.h"
#include "rte_security_driver.h"
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 1228b6c8b1..d54d993ccc 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -23,10 +23,7 @@ extern "C" {
#include
#include
#include
-#include
#include
-#include
-#include
/** IPSec protocol mode */
enum rte_security_ipsec_sa_mode {
--
2.25.1
[PATCH v4 11/53] sched: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/sched/rte_pie.c | 2 --
lib/sched/rte_red.h | 1 -
lib/sched/rte_sched.c | 1 -
lib/sched/rte_sched.h | 1 -
4 files changed, 5 deletions(-)
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index 934e9aee50..cdb7bab697 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -5,8 +5,6 @@
#include
#include "rte_pie.h"
-#include
-#include
#include
#ifdef __INTEL_COMPILER
diff --git a/lib/sched/rte_red.h b/lib/sched/rte_red.h
index f5843dab1b..80b43b6da0 100644
--- a/lib/sched/rte_red.h
+++ b/lib/sched/rte_red.h
@@ -18,7 +18,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index 62b3d2e315..e5c62e3d77 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -7,7 +7,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/lib/sched/rte_sched.h b/lib/sched/rte_sched.h
index 3c625ba169..5ece64e527 100644
--- a/lib/sched/rte_sched.h
+++ b/lib/sched/rte_sched.h
@@ -56,7 +56,6 @@ extern "C" {
*
*/
-#include
#include
#include
#include
--
2.25.1
[PATCH v4 12/53] ring: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ring/rte_ring.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index bb95962b0c..7945e5d9ed 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -8,7 +8,6 @@ */ #include -#include #include #include #include @@ -22,7 +21,6 @@ #include #include #include -#include #include #include "rte_ring.h" -- 2.25.1
[PATCH v4 13/53] rib: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/rib/rte_rib.c | 2 --
lib/rib/rte_rib.h | 1 -
lib/rib/rte_rib6.c | 2 --
lib/rib/rte_rib6.h | 1 -
4 files changed, 6 deletions(-)
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index 6c29e1c49a..cd9e823068 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -6,12 +6,10 @@
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/rib/rte_rib.h b/lib/rib/rte_rib.h
index bebb30f7d7..c18c4ca594 100644
--- a/lib/rib/rte_rib.h
+++ b/lib/rib/rte_rib.h
@@ -17,7 +17,6 @@
#include
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index 70405113b4..042ac1f090 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -6,12 +6,10 @@
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h
index 6f532265c6..fa8e9bf732 100644
--- a/lib/rib/rte_rib6.h
+++ b/lib/rib/rte_rib6.h
@@ -15,7 +15,6 @@
*/
#include
-#include
#include
#ifdef __cplusplus
--
2.25.1
[PATCH v4 14/53] reorder: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/reorder/rte_reorder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c index 9445853b79..f40a48201f 100644 --- a/lib/reorder/rte_reorder.c +++ b/lib/reorder/rte_reorder.c @@ -2,7 +2,6 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#include #include #include -- 2.25.1
[PATCH v4 15/53] regexdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/regexdev/rte_regexdev.c | 2 --
lib/regexdev/rte_regexdev.h | 3 ---
2 files changed, 5 deletions(-)
diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
index 04ab713730..02a388bc5d 100644
--- a/lib/regexdev/rte_regexdev.c
+++ b/lib/regexdev/rte_regexdev.c
@@ -5,8 +5,6 @@
#include
-#include
-#include
#include
#include
diff --git a/lib/regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
index 0bac46cda9..4ba67b0c25 100644
--- a/lib/regexdev/rte_regexdev.h
+++ b/lib/regexdev/rte_regexdev.h
@@ -199,11 +199,8 @@ extern "C" {
#endif
#include
-#include
#include
-#include
#include
-#include
#define RTE_REGEXDEV_NAME_MAX_LEN RTE_DEV_NAME_MAX_LEN
--
2.25.1
[PATCH v4 16/53] rcu: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/rcu/rte_rcu_qsbr.c | 4
lib/rcu/rte_rcu_qsbr.h | 4
2 files changed, 8 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index 7510db2f81..17be93e830 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -13,10 +13,6 @@
#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 62a420a785..d81bf5e8db 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -32,11 +32,7 @@ extern "C" {
#include
#include
#include
-#include
-#include
#include
-#include
-#include
#include
#include
#include
--
2.25.1
[PATCH v4 17/53] rawdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/rawdev/rte_rawdev.c | 14 -- 1 file changed, 14 deletions(-) diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c index a6134e76ea..2f0a4f132e 100644 --- a/lib/rawdev/rte_rawdev.c +++ b/lib/rawdev/rte_rawdev.c @@ -6,29 +6,15 @@ #include #include #include -#include #include #include #include -#include -#include #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include #include "rte_rawdev.h" -- 2.25.1
[PATCH v4 18/53] power: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Also added rte_string_fns.h to example app vm_power_manager for users without libbsd. Signed-off-by: Sean Morrissey --- examples/vm_power_manager/guest_cli/main.c | 1 + lib/power/guest_channel.c | 2 -- lib/power/power_acpi_cpufreq.c | 7 --- lib/power/power_acpi_cpufreq.h | 4 lib/power/power_common.h | 1 - lib/power/power_cppc_cpufreq.c | 1 - lib/power/power_cppc_cpufreq.h | 4 lib/power/power_kvm_vm.c | 1 - lib/power/power_kvm_vm.h | 4 lib/power/power_pstate_cpufreq.c | 7 --- lib/power/power_pstate_cpufreq.h | 4 lib/power/rte_power.c | 1 - lib/power/rte_power.h | 2 -- lib/power/rte_power_empty_poll.c | 2 -- 14 files changed, 1 insertion(+), 40 deletions(-) diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c index b8fa65ef15..9da50020ac 100644 --- a/examples/vm_power_manager/guest_cli/main.c +++ b/examples/vm_power_manager/guest_cli/main.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "vm_power_cli_guest.h" #include "parse.h" diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c index 474dd92998..969a9e5aaa 100644 --- a/lib/power/guest_channel.c +++ b/lib/power/guest_channel.c @@ -4,9 +4,7 @@ #include #include -#include #include -#include #include #include #include diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c index 402ed8c99b..6e57aca535 100644 --- a/lib/power/power_acpi_cpufreq.c +++ b/lib/power/power_acpi_cpufreq.c @@ -3,17 +3,10 @@ */ #include -#include -#include #include #include -#include -#include -#include -#include #include -#include #include #include "power_acpi_cpufreq.h" diff --git a/lib/power/power_acpi_cpufreq.h b/lib/power/power_acpi_cpufreq.h index 41675b9cd9..682fd9278c 100644 --- a/lib/power/power_acpi_cpufreq.h +++ b/lib/power/power_acpi_cpufreq.h @@ -10,10 +10,6 @@ * RTE Power Management via userspace ACPI cpufreq */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/power_common.h b/lib/power/power_common.h index 0b264edfa5..c1c7139276 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -5,7 +5,6 @@ #ifndef _POWER_COMMON_H_ #define _POWER_COMMON_H_ -#include #include diff --git a/lib/power/power_cppc_cpufreq.c b/lib/power/power_cppc_cpufreq.c index 25185a791c..ef06fbcd9e 100644 --- a/lib/power/power_cppc_cpufreq.c +++ b/lib/power/power_cppc_cpufreq.c @@ -4,7 +4,6 @@ */ #include -#include #include "power_cppc_cpufreq.h" #include "power_common.h" diff --git a/lib/power/power_cppc_cpufreq.h b/lib/power/power_cppc_cpufreq.h index 4e73c91b05..f4121b237e 100644 --- a/lib/power/power_cppc_cpufreq.h +++ b/lib/power/power_cppc_cpufreq.h @@ -11,10 +11,6 @@ * RTE Power Management via userspace CPPC cpufreq */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c index ab7d4b8cee..6a8109d449 100644 --- a/lib/power/power_kvm_vm.c +++ b/lib/power/power_kvm_vm.c @@ -9,7 +9,6 @@ #include "rte_power_guest_channel.h" #include "guest_channel.h" #include "power_kvm_vm.h" -#include "power_common.h" #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent" diff --git a/lib/power/power_kvm_vm.h b/lib/power/power_kvm_vm.h index 9a309a300f..303fcc041b 100644 --- a/lib/power/power_kvm_vm.h +++ b/lib/power/power_kvm_vm.h @@ -10,10 +10,6 @@ * RTE Power Management KVM VM */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c index 86f8a76e46..959eccffd8 100644 --- a/lib/power/power_pstate_cpufreq.c +++ b/lib/power/power_pstate_cpufreq.c @@ -3,20 +3,13 @@ */ #include -#include -#include #include -#include #include #include -#include #include #include -#include #include -#include -#include #include "power_pstate_cpufreq.h" #include "power_common.h" diff --git a/lib/power/power_pstate_cpufreq.h b/lib/power/power_pstate_cpufreq.h index 3260b32494..7bf64a518c 100644 --- a/lib/power/power_pstate_cpufreq.h +++ b/lib/power/power_pstate_cpufreq.h @@ -10,10 +10,6 @@ * RTE Power Management via Intel Pstate driver */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c index 3cba56bac9..0a6614be77 100644 --- a/lib/power/rte_power.c +++ b/lib/power/rte_power.c @@ -10,7 +10,6 @@ #include "power_cppc_cpufreq.h" #include "power_kvm_vm.h" #include "power_pstate_cpufreq.h" -#include "power_common.h" enum power_management_env global_default_en
[PATCH v4 19/53] port: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/port/rte_port_fd.h | 1 -
lib/port/rte_port_frag.c| 2 --
lib/port/rte_port_frag.h| 1 -
lib/port/rte_port_kni.c | 1 -
lib/port/rte_port_kni.h | 1 -
lib/port/rte_port_ras.c | 1 -
lib/port/rte_port_ras.h | 1 -
lib/port/rte_port_ring.h| 1 -
lib/port/rte_port_sched.c | 1 -
lib/port/rte_port_source_sink.c | 1 -
lib/port/rte_swx_port_fd.c | 1 -
lib/port/rte_swx_port_fd.h | 1 -
lib/port/rte_swx_port_ring.h| 1 -
13 files changed, 14 deletions(-)
diff --git a/lib/port/rte_port_fd.h b/lib/port/rte_port_fd.h
index e7620ef522..c8cfd9765a 100644
--- a/lib/port/rte_port_fd.h
+++ b/lib/port/rte_port_fd.h
@@ -20,7 +20,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
/** fd_reader port parameters */
diff --git a/lib/port/rte_port_frag.c b/lib/port/rte_port_frag.c
index 8a803fda11..e1f1892176 100644
--- a/lib/port/rte_port_frag.c
+++ b/lib/port/rte_port_frag.c
@@ -3,9 +3,7 @@
*/
#include
-#include
#include
-#include
#include "rte_port_frag.h"
diff --git a/lib/port/rte_port_frag.h b/lib/port/rte_port_frag.h
index 74321e4c4c..07060297f6 100644
--- a/lib/port/rte_port_frag.h
+++ b/lib/port/rte_port_frag.h
@@ -29,7 +29,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_kni.c b/lib/port/rte_port_kni.c
index 7b370f980a..1c7a6cb200 100644
--- a/lib/port/rte_port_kni.c
+++ b/lib/port/rte_port_kni.c
@@ -4,7 +4,6 @@
*/
#include
-#include
#include
#include
diff --git a/lib/port/rte_port_kni.h b/lib/port/rte_port_kni.h
index 9d318af17e..35c6253806 100644
--- a/lib/port/rte_port_kni.h
+++ b/lib/port/rte_port_kni.h
@@ -21,7 +21,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_ras.c b/lib/port/rte_port_ras.c
index 8508814bb2..e5de57da42 100644
--- a/lib/port/rte_port_ras.c
+++ b/lib/port/rte_port_ras.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include
#include
diff --git a/lib/port/rte_port_ras.h b/lib/port/rte_port_ras.h
index fa5accdc71..ee1d8ae21e 100644
--- a/lib/port/rte_port_ras.h
+++ b/lib/port/rte_port_ras.h
@@ -30,7 +30,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_ring.h b/lib/port/rte_port_ring.h
index c4f34e22fe..ba609b3436 100644
--- a/lib/port/rte_port_ring.h
+++ b/lib/port/rte_port_ring.h
@@ -26,7 +26,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_sched.c b/lib/port/rte_port_sched.c
index 1209fc121b..8a7d815ef3 100644
--- a/lib/port/rte_port_sched.c
+++ b/lib/port/rte_port_sched.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include "rte_port_sched.h"
diff --git a/lib/port/rte_port_source_sink.c b/lib/port/rte_port_source_sink.c
index 68575c9833..4928a5f706 100644
--- a/lib/port/rte_port_source_sink.c
+++ b/lib/port/rte_port_source_sink.c
@@ -5,7 +5,6 @@
#include
#include
-#include
#include
#include
diff --git a/lib/port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c
index aa7315a15a..51bcd3bb7b 100644
--- a/lib/port/rte_swx_port_fd.c
+++ b/lib/port/rte_swx_port_fd.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include
#include "rte_swx_port_fd.h"
diff --git a/lib/port/rte_swx_port_fd.h b/lib/port/rte_swx_port_fd.h
index ecf3349f5f..c1a9200a4f 100644
--- a/lib/port/rte_swx_port_fd.h
+++ b/lib/port/rte_swx_port_fd.h
@@ -16,7 +16,6 @@ extern "C" {
***/
#include
-#include
#include "rte_swx_port.h"
diff --git a/lib/port/rte_swx_port_ring.h b/lib/port/rte_swx_port_ring.h
index 859981f277..dc0ef9247c 100644
--- a/lib/port/rte_swx_port_ring.h
+++ b/lib/port/rte_swx_port_ring.h
@@ -16,7 +16,6 @@ extern "C" {
#include
-#include
#include "rte_swx_port.h"
--
2.25.1
[PATCH v4 20/53] pipeline: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/pipeline/rte_pipeline.c | 4
lib/pipeline/rte_port_in_action.c| 2 --
lib/pipeline/rte_swx_ctl.h | 2 --
lib/pipeline/rte_swx_pipeline.c | 1 -
lib/pipeline/rte_swx_pipeline.h | 1 -
lib/pipeline/rte_swx_pipeline_spec.c | 1 -
lib/pipeline/rte_table_action.c | 2 --
7 files changed, 13 deletions(-)
diff --git a/lib/pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
index f5f397d292..ff86c7cf96 100644
--- a/lib/pipeline/rte_pipeline.c
+++ b/lib/pipeline/rte_pipeline.c
@@ -6,10 +6,6 @@
#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/lib/pipeline/rte_port_in_action.c
b/lib/pipeline/rte_port_in_action.c
index e3b00df8d2..5818973250 100644
--- a/lib/pipeline/rte_port_in_action.c
+++ b/lib/pipeline/rte_port_in_action.c
@@ -6,9 +6,7 @@
#include
#include
-#include
#include
-#include
#include "rte_port_in_action.h"
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 82e62e70a7..ed752ad5eb 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Pipeline Control
*/
-#include
#include
#include
@@ -22,7 +21,6 @@ extern "C" {
#include "rte_swx_port.h"
#include "rte_swx_table.h"
-#include "rte_swx_table_selector.h"
struct rte_swx_pipeline;
diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 2145ca0a42..b39139edb8 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -4,7 +4,6 @@
#include
#include
#include
-#include
#include
#include "rte_swx_pipeline_internal.h"
diff --git a/lib/pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h
index 77141bd341..430e458335 100644
--- a/lib/pipeline/rte_swx_pipeline.h
+++ b/lib/pipeline/rte_swx_pipeline.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Pipeline
*/
-#include
#include
#include
diff --git a/lib/pipeline/rte_swx_pipeline_spec.c
b/lib/pipeline/rte_swx_pipeline_spec.c
index 07a7580ac8..8165a046ea 100644
--- a/lib/pipeline/rte_swx_pipeline_spec.c
+++ b/lib/pipeline/rte_swx_pipeline_spec.c
@@ -8,7 +8,6 @@
#include
#include "rte_swx_pipeline.h"
-#include "rte_swx_ctl.h"
#define MAX_LINE_LENGTH RTE_SWX_INSTRUCTION_SIZE
#define MAX_TOKENS RTE_SWX_INSTRUCTION_TOKENS_MAX
diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
index ebab2444d3..b1310be565 100644
--- a/lib/pipeline/rte_table_action.c
+++ b/lib/pipeline/rte_table_action.c
@@ -11,12 +11,10 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
#include "rte_table_action.h"
--
2.25.1
[PATCH v4 21/53] pdump: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/pdump/rte_pdump.c | 1 - lib/pdump/rte_pdump.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c index af450695ec..b3a62df591 100644 --- a/lib/pdump/rte_pdump.c +++ b/lib/pdump/rte_pdump.c @@ -2,7 +2,6 @@ * Copyright(c) 2016-2018 Intel Corporation */ -#include #include #include #include diff --git a/lib/pdump/rte_pdump.h b/lib/pdump/rte_pdump.h index 6efa0274f2..41c4b7800b 100644 --- a/lib/pdump/rte_pdump.h +++ b/lib/pdump/rte_pdump.h @@ -13,8 +13,6 @@ */ #include -#include -#include #include #ifdef __cplusplus -- 2.25.1
[PATCH v4 22/53] pci: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/pci/rte_pci.c | 15 +--
lib/pci/rte_pci.h | 2 --
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/lib/pci/rte_pci.c b/lib/pci/rte_pci.c
index c91be8b167..355772ff56 100644
--- a/lib/pci/rte_pci.c
+++ b/lib/pci/rte_pci.c
@@ -3,23 +3,10 @@
* Copyright 2013-2014 6WIND S.A.
*/
-#include
-#include
#include
#include
#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+
#include
#include "rte_pci.h"
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index 71cbd441c7..a096946260 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -17,9 +17,7 @@ extern "C" {
#endif
#include
-#include
#include
-#include
/*
* Conventional PCI and PCI-X Mode 1 devices have 256 bytes of
--
2.25.1
[PATCH v4 23/53] pcapng: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/pcapng/rte_pcapng.c | 1 -
lib/pcapng/rte_pcapng.h | 2 --
2 files changed, 3 deletions(-)
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index 03edabe73e..5ae96a5bc9 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
diff --git a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h
index 8d3fbb1941..7d2697c647 100644
--- a/lib/pcapng/rte_pcapng.h
+++ b/lib/pcapng/rte_pcapng.h
@@ -26,9 +26,7 @@
#include
#include
#include
-#include
#include
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v4 24/53] node: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/node/ethdev_ctrl.c | 2 -- lib/node/ethdev_rx.c | 1 - lib/node/ethdev_tx.c | 1 - lib/node/ip4_lookup.c | 5 - lib/node/ip4_rewrite.c | 4 lib/node/pkt_cls.c | 4 lib/node/pkt_drop.c| 1 - 7 files changed, 18 deletions(-) diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c index 13b8b705f0..5294607619 100644 --- a/lib/node/ethdev_ctrl.c +++ b/lib/node/ethdev_ctrl.c @@ -2,9 +2,7 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include #include -#include #include #include "rte_node_eth_api.h" diff --git a/lib/node/ethdev_rx.c b/lib/node/ethdev_rx.c index 4c23961505..a19237b42f 100644 --- a/lib/node/ethdev_rx.c +++ b/lib/node/ethdev_rx.c @@ -7,7 +7,6 @@ #include #include #include -#include #include "ethdev_rx_priv.h" #include "node_private.h" diff --git a/lib/node/ethdev_tx.c b/lib/node/ethdev_tx.c index 075149089f..7d2d72f823 100644 --- a/lib/node/ethdev_tx.c +++ b/lib/node/ethdev_tx.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "ethdev_tx_priv.h" diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c index d083a725fc..8bce03d7db 100644 --- a/lib/node/ip4_lookup.c +++ b/lib/node/ip4_lookup.c @@ -5,17 +5,12 @@ #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include "rte_node_ip4_api.h" diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c index 99ecb457ff..34a920df5e 100644 --- a/lib/node/ip4_rewrite.c +++ b/lib/node/ip4_rewrite.c @@ -2,16 +2,12 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include #include #include #include #include #include #include -#include -#include -#include #include #include "rte_node_ip4_api.h" diff --git a/lib/node/pkt_cls.c b/lib/node/pkt_cls.c index b95454dd72..3e75f2cf78 100644 --- a/lib/node/pkt_cls.c +++ b/lib/node/pkt_cls.c @@ -2,10 +2,6 @@ * Copyright (C) 2020 Marvell. */ -#include -#include -#include -#include #include #include diff --git a/lib/node/pkt_drop.c b/lib/node/pkt_drop.c index c350013236..1ad7fccd28 100644 --- a/lib/node/pkt_drop.c +++ b/lib/node/pkt_drop.c @@ -2,7 +2,6 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include #include #include -- 2.25.1
[PATCH v4 25/53] net: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/net/net_crc_avx512.c | 3 ---
lib/net/net_crc_sse.c| 1 -
lib/net/rte_arp.c| 1 -
lib/net/rte_ether.h | 1 -
lib/net/rte_net.h| 1 -
lib/net/rte_net_crc.c| 2 --
6 files changed, 9 deletions(-)
diff --git a/lib/net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
index 3740fe3c9d..f6a3ce9bcd 100644
--- a/lib/net/net_crc_avx512.c
+++ b/lib/net/net_crc_avx512.c
@@ -2,11 +2,8 @@
* Copyright(c) 2020 Intel Corporation
*/
-#include
#include
-#include
-#include
#include "net_crc.h"
diff --git a/lib/net/net_crc_sse.c b/lib/net/net_crc_sse.c
index 053b54b390..dd75845636 100644
--- a/lib/net/net_crc_sse.c
+++ b/lib/net/net_crc_sse.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include "net_crc.h"
diff --git a/lib/net/rte_arp.c b/lib/net/rte_arp.c
index 9f7eb6b375..22af519586 100644
--- a/lib/net/rte_arp.c
+++ b/lib/net/rte_arp.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#define RARP_PKT_SIZE 64
struct rte_mbuf *
diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index 3d9852d9e2..bf8a55ba06 100644
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -18,7 +18,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
diff --git a/lib/net/rte_net.h b/lib/net/rte_net.h
index 53a7f4d360..56611fc8f9 100644
--- a/lib/net/rte_net.h
+++ b/lib/net/rte_net.h
@@ -12,7 +12,6 @@ extern "C" {
#include
#include
#include
-#include
/**
* Structure containing header lengths associated to a packet, filled
diff --git a/lib/net/rte_net_crc.c b/lib/net/rte_net_crc.c
index d9a526ab7b..a685f9e7bb 100644
--- a/lib/net/rte_net_crc.c
+++ b/lib/net/rte_net_crc.c
@@ -3,13 +3,11 @@
*/
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
--
2.25.1
[PATCH v4 26/53] metrics: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/metrics/rte_metrics.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c index e2a0fbeda8..0c7878e65f 100644 --- a/lib/metrics/rte_metrics.c +++ b/lib/metrics/rte_metrics.c @@ -3,13 +3,10 @@ */ #include -#include #include #include -#include #include -#include #include #include -- 2.25.1
[PATCH v4 27/53] mempool: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/mempool/rte_mempool.c | 7 --- lib/mempool/rte_mempool.h | 4 2 files changed, 11 deletions(-) diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index c5a699b1d6..de59009baf 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -19,16 +18,10 @@ #include #include #include -#include -#include #include #include -#include -#include -#include #include #include -#include #include #include #include diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 1e7a3c1527..5f9f9ead9b 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -34,17 +34,13 @@ */ #include -#include #include -#include #include #include #include -#include #include #include -#include #include #include #include -- 2.25.1
[PATCH v4 28/53] member: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/member/rte_member.c | 2 --
lib/member/rte_member.h | 1 -
lib/member/rte_member_vbf.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/lib/member/rte_member.c b/lib/member/rte_member.c
index 9dd55a5adf..7e1632e6b5 100644
--- a/lib/member/rte_member.c
+++ b/lib/member/rte_member.c
@@ -5,9 +5,7 @@
#include
#include
-#include
#include
-#include
#include
#include
#include
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index c0689e233e..567ee0c84b 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -52,7 +52,6 @@ extern "C" {
#include
#include
-#include
/** The set ID type that stored internally in hash table based set summary. */
typedef uint16_t member_set_t;
diff --git a/lib/member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
index 8a232bae02..9df4620cff 100644
--- a/lib/member/rte_member_vbf.c
+++ b/lib/member/rte_member_vbf.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include
#include
--
2.25.1
[PATCH v4 29/53] mbuf: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/mbuf/rte_mbuf.c | 11 ---
lib/mbuf/rte_mbuf.h | 2 --
lib/mbuf/rte_mbuf_dyn.h | 2 --
lib/mbuf/rte_mbuf_pool_ops.c | 1 -
lib/mbuf/rte_mbuf_pool_ops.h | 1 -
5 files changed, 17 deletions(-)
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 604d77bbda..87592faccb 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -5,28 +5,17 @@
#include
#include
-#include
#include
-#include
#include
#include
-#include
-#include
-#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index dedf83c38d..9811e8c760 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -36,10 +36,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
diff --git a/lib/mbuf/rte_mbuf_dyn.h b/lib/mbuf/rte_mbuf_dyn.h
index 29abe8da53..ed8e57b350 100644
--- a/lib/mbuf/rte_mbuf_dyn.h
+++ b/lib/mbuf/rte_mbuf_dyn.h
@@ -68,9 +68,7 @@
#include
#include
-#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index f0e87a1412..4c91f4ce85 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include
#include
diff --git a/lib/mbuf/rte_mbuf_pool_ops.h b/lib/mbuf/rte_mbuf_pool_ops.h
index 7ed95a49a4..00cddb83ba 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.h
+++ b/lib/mbuf/rte_mbuf_pool_ops.h
@@ -14,7 +14,6 @@
* the best mempool ops available.
*/
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v4 30/53] lpm: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/lpm/rte_lpm.c | 7 ---
lib/lpm/rte_lpm.h | 4
lib/lpm/rte_lpm6.c | 7 ---
lib/lpm/rte_lpm6.h | 1 -
4 files changed, 19 deletions(-)
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index 002811f4de..cdcd1b7f9e 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -6,22 +6,15 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
#include
-#include /* for definition of RTE_CACHE_LINE_SIZE */
#include
-#include
#include
-#include
#include
#include
-#include
-#include
#include
#include "rte_lpm.h"
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index 5eb14c1748..eb91960e81 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -12,13 +12,9 @@
*/
#include
-#include
#include
-#include
#include
#include
-#include
-#include
#include
#include
#include
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 73768fc956..8d21aeddb8 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -4,23 +4,16 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
#include
-#include
#include
#include
-#include
#include
-#include
#include
#include
-#include
-#include
#include
#include
#include
diff --git a/lib/lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
index f96f3372e5..9b07260d5a 100644
--- a/lib/lpm/rte_lpm6.h
+++ b/lib/lpm/rte_lpm6.h
@@ -10,7 +10,6 @@
*/
#include
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v4 31/53] latencystats: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/latencystats/rte_latencystats.c | 4 1 file changed, 4 deletions(-) diff --git a/lib/latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c index ab8db7a139..8985a377db 100644 --- a/lib/latencystats/rte_latencystats.c +++ b/lib/latencystats/rte_latencystats.c @@ -2,13 +2,9 @@ * Copyright(c) 2018 Intel Corporation */ -#include -#include -#include #include #include -#include #include #include #include -- 2.25.1
[PATCH v4 32/53] kvargs: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/kvargs/rte_kvargs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c index 7010d3ac51..9a59c500bf 100644 --- a/lib/kvargs/rte_kvargs.c +++ b/lib/kvargs/rte_kvargs.c @@ -7,7 +7,6 @@ #include #include -#include #include "rte_kvargs.h" -- 2.25.1
[PATCH v4 33/53] kni: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/kni/rte_kni.c | 2 -- lib/kni/rte_kni.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c index fc8f0e7b5a..7971c56bb4 100644 --- a/lib/kni/rte_kni.c +++ b/lib/kni/rte_kni.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include @@ -20,7 +19,6 @@ #include #include #include -#include #include #include #include "rte_kni_fifo.h" diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h index b0eaf46104..b85d3dd32b 100644 --- a/lib/kni/rte_kni.h +++ b/lib/kni/rte_kni.h @@ -18,8 +18,6 @@ */ #include -#include -#include #include #include -- 2.25.1
[PATCH v4 34/53] jobstats: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/jobstats/rte_jobstats.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c index 9b8fde5d55..af565a14ea 100644 --- a/lib/jobstats/rte_jobstats.c +++ b/lib/jobstats/rte_jobstats.c @@ -7,10 +7,7 @@ #include #include -#include #include -#include -#include #include #include -- 2.25.1
[PATCH v4 35/53] ipsec: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ipsec/esp_inb.c | 1 - lib/ipsec/esp_outb.c | 1 - lib/ipsec/ipsec_sad.c | 1 - lib/ipsec/sa.c| 3 --- lib/ipsec/sa.h| 1 - 5 files changed, 7 deletions(-) diff --git a/lib/ipsec/esp_inb.c b/lib/ipsec/esp_inb.c index 636c850fa6..f159bf7460 100644 --- a/lib/ipsec/esp_inb.c +++ b/lib/ipsec/esp_inb.c @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c index 672e56aba0..6925bb9945 100644 --- a/lib/ipsec/esp_outb.c +++ b/lib/ipsec/esp_outb.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/lib/ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c index 531e1e323c..6f3860e3f5 100644 --- a/lib/ipsec/ipsec_sad.c +++ b/lib/ipsec/ipsec_sad.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include "rte_ipsec_sad.h" diff --git a/lib/ipsec/sa.c b/lib/ipsec/sa.c index cdb70af0cb..1b673b6a18 100644 --- a/lib/ipsec/sa.c +++ b/lib/ipsec/sa.c @@ -7,14 +7,11 @@ #include #include #include -#include #include "sa.h" #include "ipsec_sqn.h" #include "crypto.h" -#include "iph.h" #include "misc.h" -#include "pad.h" #define MBUF_MAX_L2_LENRTE_LEN2MASK(RTE_MBUF_L2_LEN_BITS, uint64_t) #define MBUF_MAX_L3_LENRTE_LEN2MASK(RTE_MBUF_L3_LEN_BITS, uint64_t) diff --git a/lib/ipsec/sa.h b/lib/ipsec/sa.h index 7503587b50..46f9a4df5b 100644 --- a/lib/ipsec/sa.h +++ b/lib/ipsec/sa.h @@ -5,7 +5,6 @@ #ifndef _SA_H_ #define _SA_H_ -#include #define IPSEC_MAX_HDR_SIZE 64 #define IPSEC_MAX_IV_SIZE 16 -- 2.25.1
[PATCH v4 39/53] graph: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/graph/graph_debug.c| 2 -- lib/graph/graph_ops.c | 1 - lib/graph/graph_populate.c | 2 -- lib/graph/node.c | 1 - 4 files changed, 6 deletions(-) diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c index f8aea16acb..b84412f5dd 100644 --- a/lib/graph/graph_debug.c +++ b/lib/graph/graph_debug.c @@ -2,8 +2,6 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include -#include #include "graph_private.h" diff --git a/lib/graph/graph_ops.c b/lib/graph/graph_ops.c index 3355953118..20db58d84e 100644 --- a/lib/graph/graph_ops.c +++ b/lib/graph/graph_ops.c @@ -5,7 +5,6 @@ #include #include -#include #include #include "graph_private.h" diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c index 093512efab..102fd6c29b 100644 --- a/lib/graph/graph_populate.c +++ b/lib/graph/graph_populate.c @@ -2,8 +2,6 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include -#include #include #include diff --git a/lib/graph/node.c b/lib/graph/node.c index 86ec4316f9..79230035a2 100644 --- a/lib/graph/node.c +++ b/lib/graph/node.c @@ -8,7 +8,6 @@ #include #include -#include #include #include -- 2.25.1
[PATCH v4 40/53] gpudev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/gpudev/gpudev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c index 9ae36dbae9..98bb759fb2 100644 --- a/lib/gpudev/gpudev.c +++ b/lib/gpudev/gpudev.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include -- 2.25.1
[PATCH v4 41/53] flow_classify: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/flow_classify/rte_flow_classify.c | 3 ---
lib/flow_classify/rte_flow_classify.h | 4
lib/flow_classify/rte_flow_classify_parse.c | 1 -
lib/flow_classify/rte_flow_classify_parse.h | 1 -
4 files changed, 9 deletions(-)
diff --git a/lib/flow_classify/rte_flow_classify.c
b/lib/flow_classify/rte_flow_classify.c
index d3ba2ed227..e3667306e5 100644
--- a/lib/flow_classify/rte_flow_classify.c
+++ b/lib/flow_classify/rte_flow_classify.c
@@ -3,12 +3,9 @@
*/
#include
-#include
#include
#include "rte_flow_classify_parse.h"
-#include
#include
-#include
static uint32_t unique_id = 1;
diff --git a/lib/flow_classify/rte_flow_classify.h
b/lib/flow_classify/rte_flow_classify.h
index 82ea92b6a6..39512b6206 100644
--- a/lib/flow_classify/rte_flow_classify.h
+++ b/lib/flow_classify/rte_flow_classify.h
@@ -45,11 +45,7 @@
#include
#include
-#include
-#include
#include
-#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/flow_classify/rte_flow_classify_parse.c
b/lib/flow_classify/rte_flow_classify_parse.c
index 465330291f..345d129d35 100644
--- a/lib/flow_classify/rte_flow_classify_parse.c
+++ b/lib/flow_classify/rte_flow_classify_parse.c
@@ -4,7 +4,6 @@
#include
#include "rte_flow_classify_parse.h"
-#include
struct classify_valid_pattern {
enum rte_flow_item_type *items;
diff --git a/lib/flow_classify/rte_flow_classify_parse.h
b/lib/flow_classify/rte_flow_classify_parse.h
index 365a07bd6d..7943efc0d4 100644
--- a/lib/flow_classify/rte_flow_classify_parse.h
+++ b/lib/flow_classify/rte_flow_classify_parse.h
@@ -6,7 +6,6 @@
#define _RTE_FLOW_CLASSIFY_PARSE_H_
#include
-#include
#include
#include
--
2.25.1
[PATCH v4 42/53] fib: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/fib/dir24_8.c | 4
lib/fib/rte_fib.c | 2 --
lib/fib/rte_fib.h | 1 -
lib/fib/rte_fib6.c | 2 --
lib/fib/rte_fib6.h | 1 -
lib/fib/trie.c | 5 -
lib/fib/trie.h | 2 --
7 files changed, 17 deletions(-)
diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c
index bb3bc9753b..a8ba4f64ca 100644
--- a/lib/fib/dir24_8.c
+++ b/lib/fib/dir24_8.c
@@ -4,15 +4,11 @@
*/
#include
-#include
#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 0cced97a77..8af4c40919 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -6,11 +6,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/fib/rte_fib.h b/lib/fib/rte_fib.h
index e592d3251a..90f28b7e11 100644
--- a/lib/fib/rte_fib.h
+++ b/lib/fib/rte_fib.h
@@ -17,7 +17,6 @@
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index eebee297d6..4b8e22b142 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -6,11 +6,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h
index cb133719e1..62a425d9af 100644
--- a/lib/fib/rte_fib6.h
+++ b/lib/fib/rte_fib6.h
@@ -17,7 +17,6 @@
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index 044095bf03..3e780afdaf 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -4,16 +4,11 @@
*/
#include
-#include
#include
-#include
-#include
#include
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/fib/trie.h b/lib/fib/trie.h
index 9fd15ae79f..3cf161ae25 100644
--- a/lib/fib/trie.h
+++ b/lib/fib/trie.h
@@ -10,8 +10,6 @@
* @file
* RTE IPv6 Longest Prefix Match (LPM)
*/
-#include
-#include
/* @internal Total number of tbl24 entries. */
#define TRIE_TBL24_NUM_ENT (1 << 24)
--
2.25.1
[PATCH v4 43/53] eventdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/eventdev/rte_event_ring.c | 6 --
lib/eventdev/rte_event_ring.h | 2 --
lib/eventdev/rte_event_timer_adapter.c | 5 -
lib/eventdev/rte_event_timer_adapter.h | 2 --
lib/eventdev/rte_eventdev.c| 11 ---
lib/eventdev/rte_eventdev.h| 2 --
6 files changed, 28 deletions(-)
diff --git a/lib/eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
index d27e23901d..c070715148 100644
--- a/lib/eventdev/rte_event_ring.c
+++ b/lib/eventdev/rte_event_ring.c
@@ -3,13 +3,7 @@
* Copyright(c) 2019 Arm Limited
*/
-#include
-#include
-#include
-#include
-#include
-#include
#include "rte_event_ring.h"
int
diff --git a/lib/eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
index c0861b0ec2..0a54f7fde2 100644
--- a/lib/eventdev/rte_event_ring.h
+++ b/lib/eventdev/rte_event_ring.h
@@ -17,8 +17,6 @@
#include
#include
-#include
-#include
#include
#include
#include "rte_eventdev.h"
diff --git a/lib/eventdev/rte_event_timer_adapter.c
b/lib/eventdev/rte_event_timer_adapter.c
index 9dad170b5a..7dc39386c9 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -6,19 +6,14 @@
#include
#include
#include
-#include
#include
-#include
-#include
#include
#include
-#include
#include
#include
#include
#include
-#include
#include "event_timer_adapter_pmd.h"
#include "eventdev_pmd.h"
diff --git a/lib/eventdev/rte_event_timer_adapter.h
b/lib/eventdev/rte_event_timer_adapter.h
index 1551741820..aefa322344 100644
--- a/lib/eventdev/rte_event_timer_adapter.h
+++ b/lib/eventdev/rte_event_timer_adapter.h
@@ -111,8 +111,6 @@
extern "C" {
#endif
-#include
-#include
#include "rte_eventdev.h"
#include "rte_eventdev_trace_fp.h"
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 79b9ea3a02..1c1b66de88 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -6,26 +6,15 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
-#include
#include
-#include
#include
-#include
#include
-#include
-#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index eef47d8acc..5738a8d9ea 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -211,10 +211,8 @@ extern "C" {
#endif
#include
-#include
#include
#include
-#include
#include
#include "rte_eventdev_trace_fp.h"
--
2.25.1
[PATCH v4 44/53] efd: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/efd/rte_efd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c index 86ef46863c..560cd78961 100644 --- a/lib/efd/rte_efd.c +++ b/lib/efd/rte_efd.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include @@ -21,11 +20,9 @@ #include #include #include -#include #include "rte_efd.h" #if defined(RTE_ARCH_X86) -#include "rte_efd_x86.h" #elif defined(RTE_ARCH_ARM64) #include "rte_efd_arm64.h" #endif -- 2.25.1
[PATCH v4 45/53] eal: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/eal/linux/eal_thread.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/eal/linux/eal_thread.c b/lib/eal/linux/eal_thread.c index 9a0250d762..fa6cd7e2c4 100644 --- a/lib/eal/linux/eal_thread.c +++ b/lib/eal/linux/eal_thread.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include -- 2.25.1
[PATCH v4 46/53] dmadev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/dmadev/rte_dmadev.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
index 4abe79c536..ad9e7a0975 100644
--- a/lib/dmadev/rte_dmadev.h
+++ b/lib/dmadev/rte_dmadev.h
@@ -149,7 +149,6 @@
#include
#include
#include
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v4 36/53] ip_frag: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ip_frag/rte_ip_frag_common.c | 1 - lib/ip_frag/rte_ipv4_fragmentation.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib/ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c index 2c781a6d33..c1de2e81b6 100644 --- a/lib/ip_frag/rte_ip_frag_common.c +++ b/lib/ip_frag/rte_ip_frag_common.c @@ -5,7 +5,6 @@ #include #include -#include #include #include "ip_frag_common.h" diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c index 2e7739d027..669682a0cf 100644 --- a/lib/ip_frag/rte_ipv4_fragmentation.c +++ b/lib/ip_frag/rte_ipv4_fragmentation.c @@ -6,8 +6,6 @@ #include #include -#include -#include #include #include "ip_frag_common.h" -- 2.25.1
[PATCH v4 37/53] hash: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/hash/rte_cuckoo_hash.c | 4
lib/hash/rte_fbk_hash.c| 6 --
lib/hash/rte_fbk_hash.h| 1 -
lib/hash/rte_thash.c | 1 -
lib/hash/rte_thash.h | 1 -
5 files changed, 13 deletions(-)
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 1191dfd81a..490f94af4b 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -7,7 +7,6 @@
#include
#include
#include
-#include
#include
#include
@@ -16,14 +15,11 @@
#include
#include
#include
-#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 576e8e6662..538b23a403 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -4,22 +4,16 @@
#include
#include
-#include
#include
#include
#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
-#include
#include
-#include
#include
#include "rte_fbk_hash.h"
diff --git a/lib/hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
index 9c3a61c1d6..b01126999b 100644
--- a/lib/hash/rte_fbk_hash.h
+++ b/lib/hash/rte_fbk_hash.h
@@ -24,7 +24,6 @@ extern "C" {
#include
-#include
#include
#include
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 6847e36f4b..0249883b8d 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -9,7 +9,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h
index c11ca0d5b8..451f64043a 100644
--- a/lib/hash/rte_thash.h
+++ b/lib/hash/rte_thash.h
@@ -21,7 +21,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
--
2.25.1
[PATCH v4 47/53] distributor: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/distributor/rte_distributor.c | 2 -- lib/distributor/rte_distributor_match_sse.c | 2 -- lib/distributor/rte_distributor_single.c| 2 -- 3 files changed, 6 deletions(-) diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c index c210cf86bd..3035b7a999 100644 --- a/lib/distributor/rte_distributor.c +++ b/lib/distributor/rte_distributor.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -14,7 +13,6 @@ #include #include #include -#include #include "rte_distributor.h" #include "rte_distributor_single.h" diff --git a/lib/distributor/rte_distributor_match_sse.c b/lib/distributor/rte_distributor_match_sse.c index e3b3b79264..11d8819278 100644 --- a/lib/distributor/rte_distributor_match_sse.c +++ b/lib/distributor/rte_distributor_match_sse.c @@ -3,10 +3,8 @@ */ #include -#include "rte_distributor.h" #include "distributor_private.h" #include "smmintrin.h" -#include "nmmintrin.h" void diff --git a/lib/distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c index b653620688..de90aa8bb5 100644 --- a/lib/distributor/rte_distributor_single.c +++ b/lib/distributor/rte_distributor_single.c @@ -4,9 +4,7 @@ #include #include -#include #include -#include #include #include #include -- 2.25.1
[PATCH v4 38/53] gro: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/gro/gro_tcp4.c | 1 - lib/gro/gro_tcp4.h | 2 -- lib/gro/gro_udp4.c | 1 - lib/gro/gro_udp4.h | 2 -- lib/gro/gro_vxlan_tcp4.c | 1 - lib/gro/gro_vxlan_udp4.c | 1 - lib/gro/rte_gro.c| 1 - 7 files changed, 9 deletions(-) diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index aff22178e3..7498c66141 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include "gro_tcp4.h" diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h index bb875a5ef0..212f97a042 100644 --- a/lib/gro/gro_tcp4.h +++ b/lib/gro/gro_tcp4.h @@ -5,9 +5,7 @@ #ifndef _GRO_TCP4_H_ #define _GRO_TCP4_H_ -#include #include -#include #define INVALID_ARRAY_INDEX 0xUL #define GRO_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c index e78dda7874..dd71135ada 100644 --- a/lib/gro/gro_udp4.c +++ b/lib/gro/gro_udp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include "gro_udp4.h" diff --git a/lib/gro/gro_udp4.h b/lib/gro/gro_udp4.h index d38b393f79..6467d7bc3b 100644 --- a/lib/gro/gro_udp4.h +++ b/lib/gro/gro_udp4.h @@ -6,8 +6,6 @@ #define _GRO_UDP4_H_ #include -#include -#include #define INVALID_ARRAY_INDEX 0xUL #define GRO_UDP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index 2005899afe..3be4deb7c7 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c index 4767c910bb..b78a7ae89e 100644 --- a/lib/gro/gro_vxlan_udp4.c +++ b/lib/gro/gro_vxlan_udp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c index 8ca4da67e9..6f7dd4d709 100644 --- a/lib/gro/rte_gro.c +++ b/lib/gro/rte_gro.c @@ -3,7 +3,6 @@ */ #include -#include #include #include -- 2.25.1
[PATCH v4 48/53] compressdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/compressdev/rte_comp.c| 1 -
lib/compressdev/rte_comp.h| 1 -
lib/compressdev/rte_compressdev.c | 1 -
lib/compressdev/rte_compressdev.h | 1 -
lib/compressdev/rte_compressdev_pmd.h | 2 --
5 files changed, 6 deletions(-)
diff --git a/lib/compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
index 3b0e46f96e..320c6dab92 100644
--- a/lib/compressdev/rte_comp.c
+++ b/lib/compressdev/rte_comp.c
@@ -3,7 +3,6 @@
*/
#include "rte_comp.h"
-#include "rte_compressdev.h"
#include "rte_compressdev_internal.h"
const char *
diff --git a/lib/compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
index 95306c5d03..cdb55e5887 100644
--- a/lib/compressdev/rte_comp.h
+++ b/lib/compressdev/rte_comp.h
@@ -16,7 +16,6 @@
extern "C" {
#endif
-#include
#include
/**
diff --git a/lib/compressdev/rte_compressdev.c
b/lib/compressdev/rte_compressdev.c
index 2e9218af68..202ee694d8 100644
--- a/lib/compressdev/rte_compressdev.c
+++ b/lib/compressdev/rte_compressdev.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include
diff --git a/lib/compressdev/rte_compressdev.h
b/lib/compressdev/rte_compressdev.h
index 2840c27c6c..aa865c4c03 100644
--- a/lib/compressdev/rte_compressdev.h
+++ b/lib/compressdev/rte_compressdev.h
@@ -21,7 +21,6 @@
extern "C" {
#endif
-#include
#include "rte_comp.h"
diff --git a/lib/compressdev/rte_compressdev_pmd.h
b/lib/compressdev/rte_compressdev_pmd.h
index f9a42d1f05..9fabc399c5 100644
--- a/lib/compressdev/rte_compressdev_pmd.h
+++ b/lib/compressdev/rte_compressdev_pmd.h
@@ -19,8 +19,6 @@ extern "C" {
#include
-#include
-#include
#include "rte_compressdev.h"
#include "rte_compressdev_internal.h"
--
2.25.1
[PATCH v4 49/53] cmdline: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/cmdline/cmdline.c| 2 --
lib/cmdline/cmdline_cirbuf.c | 1 -
lib/cmdline/cmdline_cirbuf.h | 1 -
lib/cmdline/cmdline_parse.c | 3 ---
lib/cmdline/cmdline_parse_num.c | 4
lib/cmdline/cmdline_parse_portlist.c | 3 ---
lib/cmdline/cmdline_parse_string.c | 4
lib/cmdline/cmdline_rdline.c | 2 --
lib/cmdline/cmdline_socket.c | 5 -
lib/cmdline/cmdline_socket.h | 1 -
lib/cmdline/cmdline_vt100.c | 3 ---
11 files changed, 29 deletions(-)
diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index 8f1854cb0b..e1009ba4c4 100644
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -9,8 +9,6 @@
#include
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/cmdline/cmdline_cirbuf.c b/lib/cmdline/cmdline_cirbuf.c
index 829a8af563..f9bd7cfd61 100644
--- a/lib/cmdline/cmdline_cirbuf.c
+++ b/lib/cmdline/cmdline_cirbuf.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include "cmdline_cirbuf.h"
diff --git a/lib/cmdline/cmdline_cirbuf.h b/lib/cmdline/cmdline_cirbuf.h
index c23b211ad4..c58fdabf00 100644
--- a/lib/cmdline/cmdline_cirbuf.h
+++ b/lib/cmdline/cmdline_cirbuf.h
@@ -7,7 +7,6 @@
#ifndef _CIRBUF_H_
#define _CIRBUF_H_
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/cmdline/cmdline_parse.c b/lib/cmdline/cmdline_parse.c
index f5cc934782..349ec87bd7 100644
--- a/lib/cmdline/cmdline_parse.c
+++ b/lib/cmdline/cmdline_parse.c
@@ -5,11 +5,8 @@
*/
#include
-#include
#include
#include
-#include
-#include
#include
diff --git a/lib/cmdline/cmdline_parse_num.c b/lib/cmdline/cmdline_parse_num.c
index b37dd94ae9..a4e68f262c 100644
--- a/lib/cmdline/cmdline_parse_num.c
+++ b/lib/cmdline/cmdline_parse_num.c
@@ -6,11 +6,7 @@
#include
#include
-#include
-#include
#include
-#include
-#include
#include
#include "cmdline_parse.h"
diff --git a/lib/cmdline/cmdline_parse_portlist.c
b/lib/cmdline/cmdline_parse_portlist.c
index e1aa07be4b..2e2294553a 100644
--- a/lib/cmdline/cmdline_parse_portlist.c
+++ b/lib/cmdline/cmdline_parse_portlist.c
@@ -6,11 +6,8 @@
#include
#include
-#include
-#include
#include
#include
-#include
#include
#include "cmdline_parse.h"
diff --git a/lib/cmdline/cmdline_parse_string.c
b/lib/cmdline/cmdline_parse_string.c
index 9cf41d0f76..d756638905 100644
--- a/lib/cmdline/cmdline_parse_string.c
+++ b/lib/cmdline/cmdline_parse_string.c
@@ -5,11 +5,7 @@
*/
#include
-#include
-#include
#include
-#include
-#include
#include
#include "cmdline_parse.h"
diff --git a/lib/cmdline/cmdline_rdline.c b/lib/cmdline/cmdline_rdline.c
index d92b1cda53..5cf723a012 100644
--- a/lib/cmdline/cmdline_rdline.c
+++ b/lib/cmdline/cmdline_rdline.c
@@ -6,9 +6,7 @@
#include
#include
-#include
#include
-#include
#include
#include
diff --git a/lib/cmdline/cmdline_socket.c b/lib/cmdline/cmdline_socket.c
index ebd5343754..d6c2431cb8 100644
--- a/lib/cmdline/cmdline_socket.c
+++ b/lib/cmdline/cmdline_socket.c
@@ -5,11 +5,6 @@
*/
#include
-#include
-#include
-#include
-#include
-#include
#include
#include "cmdline.h"
diff --git a/lib/cmdline/cmdline_socket.h b/lib/cmdline/cmdline_socket.h
index 80542e5599..a9c4ea26ad 100644
--- a/lib/cmdline/cmdline_socket.h
+++ b/lib/cmdline/cmdline_socket.h
@@ -8,7 +8,6 @@
#define _CMDLINE_SOCKET_H_
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/cmdline/cmdline_vt100.c b/lib/cmdline/cmdline_vt100.c
index bb968dd5fa..4c9a46c953 100644
--- a/lib/cmdline/cmdline_vt100.c
+++ b/lib/cmdline/cmdline_vt100.c
@@ -4,12 +4,9 @@
* All rights reserved.
*/
-#include
#include
#include
#include
-#include
-#include
#include "cmdline_vt100.h"
--
2.25.1
[PATCH v4 50/53] bpf: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/bpf/bpf.c | 4 lib/bpf/bpf_exec.c | 6 -- lib/bpf/bpf_jit_x86.c | 5 - lib/bpf/bpf_load.c | 8 lib/bpf/bpf_pkt.c | 12 lib/bpf/bpf_validate.c | 3 --- 6 files changed, 38 deletions(-) diff --git a/lib/bpf/bpf.c b/lib/bpf/bpf.c index 0caad2a8f0..1e1dd42a58 100644 --- a/lib/bpf/bpf.c +++ b/lib/bpf/bpf.c @@ -2,15 +2,11 @@ * Copyright(c) 2018 Intel Corporation */ -#include #include -#include #include #include -#include #include -#include #include "bpf_impl.h" diff --git a/lib/bpf/bpf_exec.c b/lib/bpf/bpf_exec.c index b921112feb..09f4a9a571 100644 --- a/lib/bpf/bpf_exec.c +++ b/lib/bpf/bpf_exec.c @@ -2,18 +2,12 @@ * Copyright(c) 2018 Intel Corporation */ -#include #include -#include -#include #include -#include #include #include #include -#include -#include #include #include "bpf_impl.h" diff --git a/lib/bpf/bpf_jit_x86.c b/lib/bpf/bpf_jit_x86.c index 518513376a..c1a30e0386 100644 --- a/lib/bpf/bpf_jit_x86.c +++ b/lib/bpf/bpf_jit_x86.c @@ -2,17 +2,12 @@ * Copyright(c) 2018 Intel Corporation */ -#include #include #include -#include #include #include #include -#include -#include -#include #include "bpf_impl.h" diff --git a/lib/bpf/bpf_load.c b/lib/bpf/bpf_load.c index 272f2ba11b..0c4ac7be6c 100644 --- a/lib/bpf/bpf_load.c +++ b/lib/bpf/bpf_load.c @@ -2,20 +2,12 @@ * Copyright(c) 2018 Intel Corporation */ -#include #include #include #include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include "bpf_impl.h" diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c index af422afc07..ffd2db7840 100644 --- a/lib/bpf/bpf_pkt.c +++ b/lib/bpf/bpf_pkt.c @@ -2,28 +2,16 @@ * Copyright(c) 2018 Intel Corporation */ -#include #include #include #include #include -#include -#include -#include -#include -#include #include #include -#include #include #include -#include -#include -#include -#include -#include #include #include #include diff --git a/lib/bpf/bpf_validate.c b/lib/bpf/bpf_validate.c index 09331258eb..9ff86fc970 100644 --- a/lib/bpf/bpf_validate.c +++ b/lib/bpf/bpf_validate.c @@ -2,7 +2,6 @@ * Copyright(c) 2018 Intel Corporation */ -#include #include #include #include @@ -10,8 +9,6 @@ #include #include -#include -#include #include "bpf_impl.h" -- 2.25.1
[PATCH v4 51/53] bbdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/bbdev/rte_bbdev.c | 4
lib/bbdev/rte_bbdev.h | 4
2 files changed, 8 deletions(-)
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index 7f353d4f7e..aaee7b7872 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -6,19 +6,15 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
#include
#include
#include
-#include
#include
-#include
#include
#include "rte_bbdev_op.h"
diff --git a/lib/bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
index 1dbcf73b0e..b88c88167e 100644
--- a/lib/bbdev/rte_bbdev.h
+++ b/lib/bbdev/rte_bbdev.h
@@ -26,12 +26,8 @@ extern "C" {
#include
#include
-#include
-#include
-#include
#include
-#include
#include "rte_bbdev_op.h"
--
2.25.1
[PATCH v4 52/53] cryptodev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/cryptodev/cryptodev_pmd.h | 4
lib/cryptodev/rte_cryptodev.c | 11 ---
lib/cryptodev/rte_cryptodev.h | 2 --
3 files changed, 17 deletions(-)
diff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h
index b9146f652c..8cf2da9b69 100644
--- a/lib/cryptodev/cryptodev_pmd.h
+++ b/lib/cryptodev/cryptodev_pmd.h
@@ -15,11 +15,7 @@
#include
-#include
-#include
#include
-#include
-#include
#include
#include
diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c
index a40536c5ea..8c1cccef0b 100644
--- a/lib/cryptodev/rte_cryptodev.c
+++ b/lib/cryptodev/rte_cryptodev.c
@@ -2,36 +2,25 @@
* Copyright(c) 2015-2020 Intel Corporation
*/
-#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
#include
-#include
-#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index 59ea5a54df..3493384fc7 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -20,9 +20,7 @@ extern "C" {
#include "rte_kvargs.h"
#include "rte_crypto.h"
-#include "rte_dev.h"
#include
-#include
#include
#include "rte_cryptodev_trace_fp.h"
--
2.25.1
[PATCH v4 53/53] acl: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/acl/rte_acl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c index 4e693b2488..a61c3ba188 100644 --- a/lib/acl/rte_acl.c +++ b/lib/acl/rte_acl.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "acl.h" -- 2.25.1
[PATCH] mempool: fix get objects from mempool with cache
A flush threshold for the mempool cache was introduced in DPDK version
1.3, but rte_mempool_do_generic_get() was not completely updated back
then, and some inefficiencies were introduced.
This patch fixes the following in rte_mempool_do_generic_get():
1. The code that initially screens the cache request was not updated
with the change in DPDK version 1.3.
The initial screening compared the request length to the cache size,
which was correct before, but became irrelevant with the introduction of
the flush threshold. E.g. the cache can hold up to flushthresh objects,
which is more than its size, so some requests were not served from the
cache, even though they could be.
The initial screening has now been corrected to match the initial
screening in rte_mempool_do_generic_put(), which verifies that a cache
is present, and that the length of the request does not overflow the
memory allocated for the cache.
2. The function is a helper for rte_mempool_generic_get(), so it must
behave according to the description of that function.
Specifically, objects must first be returned from the cache,
subsequently from the ring.
After the change in DPDK version 1.3, this was not the behavior when
the request was partially satisfied from the cache; instead, the objects
from the ring were returned ahead of the objects from the cache. This is
bad for CPUs with a small L1 cache, which benefit from having the hot
objects first in the returned array. (This is also the reason why
the function returns the objects in reverse order.)
Now, all code paths first return objects from the cache, subsequently
from the ring.
3. If the cache could not be backfilled, the function would attempt
to get all the requested objects from the ring (instead of only the
number of requested objects minus the objects available in the ring),
and the function would fail if that failed.
Now, the first part of the request is always satisfied from the cache,
and if the subsequent backfilling of the cache from the ring fails, only
the remaining requested objects are retrieved from the ring.
4. The code flow for satisfying the request from the cache was slightly
inefficient:
The likely code path where the objects are simply served from the cache
was treated as unlikely. Now it is treated as likely.
And in the code path where the cache was backfilled first, numbers were
added and subtracted from the cache length; now this code path simply
sets the cache length to its final value.
5. Some comments were not correct anymore.
The comments have been updated.
Most importanly, the description of the succesful return value was
inaccurate. Success only returns 0, not >= 0.
Signed-off-by: Morten Brørup
---
lib/mempool/rte_mempool.h | 81 ---
1 file changed, 59 insertions(+), 22 deletions(-)
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 1e7a3c1527..88f1b8b7ab 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -1443,6 +1443,10 @@ rte_mempool_put(struct rte_mempool *mp, void *obj)
/**
* @internal Get several objects from the mempool; used internally.
+ *
+ * If cache is enabled, objects are returned from the cache in Last In First
+ * Out (LIFO) order for the benefit of CPUs with small L1 cache.
+ *
* @param mp
* A pointer to the mempool structure.
* @param obj_table
@@ -1452,7 +1456,7 @@ rte_mempool_put(struct rte_mempool *mp, void *obj)
* @param cache
* A pointer to a mempool cache structure. May be NULL if not needed.
* @return
- * - >=0: Success; number of objects supplied.
+ * - 0: Success; got n objects.
* - <0: Error; code of ring dequeue function.
*/
static __rte_always_inline int
@@ -1463,38 +1467,71 @@ rte_mempool_do_generic_get(struct rte_mempool *mp, void
**obj_table,
uint32_t index, len;
void **cache_objs;
- /* No cache provided or cannot be satisfied from cache */
- if (unlikely(cache == NULL || n >= cache->size))
+ /* No cache provided or if get would overflow mem allocated for cache */
+ if (unlikely(cache == NULL || n > RTE_MEMPOOL_CACHE_MAX_SIZE))
goto ring_dequeue;
- cache_objs = cache->objs;
+ cache_objs = &cache->objs[cache->len];
+
+ if (n <= cache->len) {
+ /* The entire request can be satisfied from the cache. */
+ cache->len -= n;
+ for (index = 0; index < n; index++)
+ *obj_table++ = *--cache_objs;
- /* Can this be satisfied from the cache? */
- if (cache->len < n) {
- /* No. Backfill the cache first, and then fill from it */
- uint32_t req = n + (cache->size - cache->len);
+ RTE_MEMPOOL_STAT_ADD(mp, get_success_bulk, 1);
+ RTE_MEMPOOL_STAT_ADD(mp, get_success_objs, n);
- /* How many do we require i.e. number to fill the cache + the
request */
- ret = rte_mempool_ops_dequeue_bulk(mp,
-
Re: [PATCH v5] kni: allow configuring the kni thread granularity
On 1/14/2022 4:24 PM, Stephen Hemminger wrote: On Fri, 14 Jan 2022 17:18:19 +0200 Tudor Cornea wrote: +module_param(min_scheduling_interval, long, 0644); +MODULE_PARM_DESC(min_scheduling_interval, +"\t\tKni thread min scheduling interval (default=100 microseconds):\n" +"\t\t" +); + +module_param(max_scheduling_interval, long, 0644); +MODULE_PARM_DESC(max_scheduling_interval, +"\t\tKni thread max scheduling interval (default=200 microseconds):\n" +"\t\t" +); Please don't add more bad module parameter strings. The KNI author did something no other kernel modules do with tabs and double spacing, stop this bogus stuff. The patch is good, let's not block it for the module parameter string, all can be fixed with another patch. Can you please give a sample what is a common way of it, me or Tudor can do the patch? Is there any reason you have to use KNI at all. KNI is broken on many levels and is not fixable. What about virtio or tap?
Re: [PATCH v4 01/53] devtools: script to remove unused headers includes
On Fri, 14 Jan 2022 16:23:17 + Sean Morrissey wrote: > This script can be used for removing headers flagged for removal by the > include-what-you-use (IWYU) tool. The script has the ability to remove > headers from specified sub-directories or dpdk as a whole and tests the > build after each removal by calling meson compile. > > example usages: > > Remove headers flagged by iwyu_tool output file > $ ./devtools/process_iwyu.py iwyu.out -b build > > Remove headers flagged by iwyu_tool output file from sub-directory > $ ./devtools/process_iwyu.py iwyu.out -b build -d lib/kvargs > > Remove headers directly piped from the iwyu_tool > $ iwyu_tool -p build | ./devtools/process_iwyu.py - -b build > > Signed-off-by: Sean Morrissey > Signed-off-by: Conor Fogarty > > Reviewed-by: Bruce Richardson Could this be a shell script instead of python? That would prevent having to pull in more python library dependencies.
Re: [PATCH v4 01/53] devtools: script to remove unused headers includes
On Fri, Jan 14, 2022 at 09:02:40AM -0800, Stephen Hemminger wrote: > On Fri, 14 Jan 2022 16:23:17 + > Sean Morrissey wrote: > > > This script can be used for removing headers flagged for removal by the > > include-what-you-use (IWYU) tool. The script has the ability to remove > > headers from specified sub-directories or dpdk as a whole and tests the > > build after each removal by calling meson compile. > > > > example usages: > > > > Remove headers flagged by iwyu_tool output file > > $ ./devtools/process_iwyu.py iwyu.out -b build > > > > Remove headers flagged by iwyu_tool output file from sub-directory > > $ ./devtools/process_iwyu.py iwyu.out -b build -d lib/kvargs > > > > Remove headers directly piped from the iwyu_tool > > $ iwyu_tool -p build | ./devtools/process_iwyu.py - -b build > > > > Signed-off-by: Sean Morrissey > > Signed-off-by: Conor Fogarty > > > > Reviewed-by: Bruce Richardson > > Could this be a shell script instead of python? > That would prevent having to pull in more python library dependencies. Can you clarify what python library dependencies are you concerned about? AFAIK everything in this script is just from the standard built-in python library - Sean, perhaps you can confirm? Converting to shell would lead to something far less readable, IMHO, and it would be less portable to windows too in future. /Bruce
Re: [PATCH] net/bnxt: add back dependency to virt kmods
On Wed, Jan 12, 2022 at 5:42 AM Geoffrey Le Gourriérec
wrote:
>
> During a large refactoring sweep for 21.11, a previous commit
> removed the dependency the bnxt driver had on Linux virtual
> bus drivers, such as vfio-pci. This breaks port detection.
>
> This patch adds the kmod dependency back as it was.
>
> Fixes: 295968d17407 ("ethdev: add namespace")
> Signed-off-by: Geoffrey Le Gourriérec
Acked-by: Ajit Khaparde
Thanks. Patch applied to dpdk-next-net-brcm.
>
> ---
> drivers/net/bnxt/bnxt_ethdev.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index f79f33ab4e17..3ca6b7be7b6a 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -6302,4 +6302,5 @@ bool is_bnxt_supported(struct rte_eth_dev *dev)
> RTE_LOG_REGISTER_SUFFIX(bnxt_logtype_driver, driver, NOTICE);
> RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd);
> RTE_PMD_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map);
> +RTE_PMD_REGISTER_KMOD_DEP(net_bnxt, "* igb_uio | uio_pci_generic |
> vfio-pci");
>
> --
> 2.30.2
>
Re: [PATCH] app/testpmd: fix scheduling send burst interval
On 11/23/2021 4:32 PM, Viacheslav Ovsiienko wrote:
The first "set txtimes" command parameter specifies the time
interval between scheduled send bursts for single queue. This
interval should be the same for all the forwarding ports.
It requires to maintain the timing related variables on per
queue basis instead of per core, as currently implemented.
This resulted in wrong burst intervals if two or more cores
were generating the scheduled traffic for two or more ports
in txonly mode.
This patch moves the timing variable to the fstream structure.
Only txonly forwarding mode with enabled send scheduling is
affected.
Fixes: 4940344dab1d ("app/testpmd: add Tx scheduling command")
Cc: sta...@dpdk.org
Signed-off-by: Viacheslav Ovsiienko
Acked-by: Ferruh Yigit
Applied to dpdk-next-net/main, thanks.
Re: [RFC v2] ethdev: introduce ethdev dump API
On Wed, Jan 12, 2022 at 3:15 AM Min Hu (Connor) wrote:
>
> Thanks Morten, fixed in v3.
>
> 在 2022/1/12 15:20, Morten Brørup 写道:
> >> From: Min Hu (Connor) [mailto:humi...@huawei.com]
> >> Sent: Wednesday, 12 January 2022 03.40
> >>
> >> Added the ethdev dump API which provides functions for query private
> >> info
> >> from device. There exists many private properties in different PMD
> >> drivers,
> >> such as adapter state, Rx/Tx func algorithm in hns3 PMD. The
> >> information of
> >> these properties is important for debug. As the information is private,
> >> the new API is introduced.
Do you have any changes to testpmd to use this API?
> >>
> >> Signed-off-by: Min Hu (Connor)
> >> ---
> >> v2:
> >> * fix dump API name
> >> * adjust description in doc.
> >> ---
> >> doc/guides/rel_notes/release_22_03.rst | 7 +++
> >> lib/ethdev/ethdev_driver.h | 17 +
> >> lib/ethdev/rte_ethdev.c| 15 +++
> >> lib/ethdev/rte_ethdev.h| 16
> >> 4 files changed, 55 insertions(+)
> >>
> >> diff --git a/doc/guides/rel_notes/release_22_03.rst
> >> b/doc/guides/rel_notes/release_22_03.rst
> >> index 6d99d1eaa9..4f97df942d 100644
> >> --- a/doc/guides/rel_notes/release_22_03.rst
> >> +++ b/doc/guides/rel_notes/release_22_03.rst
> >> @@ -55,6 +55,13 @@ New Features
> >>Also, make sure to start the actual text at the margin.
> >>===
> >>
> >> +* **Added the private ethdev dump API, for query private info of
> >> ethdev.**
> >> +
> >> + Added the private ethdev dump API which provides functions for query
> >> + private info from device. There exists many private properties in
> >> + different PMD drivers. The information of these properties is
> >> important
> >> + for debug. As the information is private, the new API is introduced.
> >> +
> >>
> >> Removed Items
> >> -
> >> diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
> >> index d95605a355..e75ff3f15b 100644
> >> --- a/lib/ethdev/ethdev_driver.h
> >> +++ b/lib/ethdev/ethdev_driver.h
> >> @@ -990,6 +990,20 @@ typedef int (*eth_representor_info_get_t)(struct
> >> rte_eth_dev *dev,
> >> typedef int (*eth_rx_metadata_negotiate_t)(struct rte_eth_dev *dev,
> >> uint64_t *features);
> >>
> >> +/**
> >> + * @internal
> >> + * Get ethdev private info.
> >
> > Suggestion: Dump ethdev private info to a file.
> >
> >> + *
> >> + * @param file
> >> + * A pointer to a file for output.
> >> + * @param dev
> >> + * Port (ethdev) handle.
> >> + *
> >> + * @return
> >> + * Negative errno value on error, positive value on success.
> >> + */
> >> +typedef int (*eth_dev_priv_dump_t)(FILE *file, struct rte_eth_dev
> >> *dev);
> >> +
> >> /**
> >>* @internal A structure containing the functions exported by an
> >> Ethernet driver.
> >>*/
> >> @@ -1186,6 +1200,9 @@ struct eth_dev_ops {
> >> * kinds of metadata to the PMD
> >> */
> >> eth_rx_metadata_negotiate_t rx_metadata_negotiate;
> >> +
> >> +/** Dump ethdev private info */
> >> +eth_dev_priv_dump_t eth_dev_priv_dump;
> >> };
> >>
> >> /**
> >> diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
> >> index a1d475a292..9fc6d91d76 100644
> >> --- a/lib/ethdev/rte_ethdev.c
> >> +++ b/lib/ethdev/rte_ethdev.c
> >> @@ -6472,6 +6472,21 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id,
> >> uint64_t *features)
> >> (*dev->dev_ops->rx_metadata_negotiate)(dev,
> >> features));
> >> }
> >>
> >> +int
> >> +rte_eth_dev_priv_dump(FILE *file, uint16_t port_id)
> >> +{
> >> +struct rte_eth_dev *dev;
> >> +int ret;
> >> +
> >> +RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
> >> +dev = &rte_eth_devices[port_id];
> >> +
> >> +RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->eth_dev_priv_dump, -
> >> ENOTSUP);
> >> +ret = (*dev->dev_ops->eth_dev_priv_dump)(file, dev);
> >> +
> >> +return ret;
> >> +}
> >> +
> >> RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO);
> >>
> >> RTE_INIT(ethdev_init_telemetry)
> >> diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
> >> index fa299c8ad7..8e33e6927f 100644
> >> --- a/lib/ethdev/rte_ethdev.h
> >> +++ b/lib/ethdev/rte_ethdev.h
> >> @@ -5888,6 +5888,22 @@ rte_eth_tx_buffer(uint16_t port_id, uint16_t
> >> queue_id,
> >> return rte_eth_tx_buffer_flush(port_id, queue_id, buffer);
> >> }
> >>
> >> +/**
> >> + * @warning
> >> + * @b EXPERIMENTAL: this API may change, or be removed, without prior
> >> notice
> >> + *
> >> + * Get ethdev private info.
> >
> > Suggestion: Dump ethdev private info to a file.
> >
> >> + *
> >> + * @param file
> >> + * A pointer to a file for output.
> >> + * @param port_id
> >> + * The port identifier of the Ethernet device.
> >> + * @return
> >> + * Negative errno value on error, positive value on success.
> >> + */
> >> +_
Re:Re: [PATCH] net/bonding: fix RSS not work for bonding in DPDK21.11
Hi, I tested Mellanox CX5 and Intel E810.
The key is the call chain:
1.rte_eth_bond_create()
2.rte_eth_dev_configure(): bond_ethdev_configure() //internals->rss_key_len =
0, internals->rss_key can not be set properly
3.rte_eth_bond_slave_add():
__eth_bond_slave_add_lock_free()->eth_bond_slave_inherit_dev_info_rx_first() //
internals->rss_key_len will be set, but internals->rss_key is bad
4.rte_eth_dev_start()
examples/bond/main.c(bond_port_init()) use this call chain,too many apps refer
to this example.
thanks
邮件原文From："Min Hu (Connor)" To："俞文俊_yewu"
,tangchengchang
,"ferruh.yigit" Cc: dev
,stable Date：2022-01-14 16:50:54Subject：Re:
[PATCH] net/bonding: fix RSS not work for bonding in DPDK21.11Hi,在 2022/1/14
15:11, 俞文俊_yewu 写道:> Sorry，mq_mode is RTE_ETH_MQ_RX_RSS in rte_eth_conf.> > >
call chain:> >
rte_eth_bond_create()->rte_eth_dev_configure()->rte_eth_bond_slave_add()->rte_eth_dev_start()>
> > Consider this call chain, internals->rss_key_len is 0 in >
bond_ethdev_configure() when we call rte_eth_dev_configure().> > If
internals->rss_key_len is 0, internals->rss_key can not be set properly.Have
you done any test? Is it true that it doesn39t work for RSS? which NIC you
choose ?As I know, internals->rss_key_len will inherit dev info from slave,
justsee "eth_bond_slave_inherit_dev_info_rx_first". If slave port
reporthash_key_size, internals->rss_key_len could not be zero.> > Because
memcpy in bond_ethdev_configure() use internals->rss_key_len(it > is 0) as copy
size, and internals->rss_key will not be set in other > functions.> > > ---> >
e.g.:> > bond_ethdev_configure(struct rte_eth_dev *dev)> > {> > const char
*name = dev->device->name> > struct bond_dev_private *internals =
dev->data->dev_private> > ...> > > /*> > * If RSS is enabled, fill table with
default values and> > * set key to the value specified in port RSS
configuration.> > * Fall back to default RSS key if the key is not specified> >
*/> > if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) {> > struct
rte_eth_rss_conf *rss_conf => > &dev->data->dev_conf.rx_adv_conf.rss_conf> > >
if (rss_conf->rss_key != NULL) {> > if (internals->rss_key_len >
rss_conf->rss_key_len) {> > RTE_BOND_LOG(ERR, "Invalid rss key length(%u)",> >
rss_conf->rss_key_len)> > return -EINVAL> > }> > > memcpy(internals->rss_key,
rss_conf->rss_key,> > internals->rss_key_len)> > } else {> > if
(internals->rss_key_len > sizeof(default_rss_key)) {> > RTE_BOND_LOG(ERR,> >
"There is no suitable default hash key")> > return -EINVAL> > }> > >
memcpy(internals->rss_key, default_rss_key,> > internals->rss_key_len)>
> }> > > > Origin> From："Min Hu (Connor)" >
To："yuwenjun_yewu" ,tangchengchang
,"ferruh.yigit" > Cc: dev
,stable > Date：2022-01-14 08:59:21> Subject：Re:
[PATCH] net/bonding: fix RSS not work for bonding in DPDK21.11> > Hi,> > 在
2022/1/12 15:29, 俞文俊_yewu 写道:> > From
85c4e32996fc262dd6f69d0ce272ae8e8350 Mon Sep 17 00:00:00 2001> >> > From:
Yu Wenjun > >> > Date: Wed, 12 Jan 2022
15:01:10 +0800> >> > Subject: [PATCH] net/bonding: fix RSS not work for
bonding> >> >> > RSS don39t work when upgrade to DPDK21.11.> Cannot get your
meaning, Why RSS don39t work?> As mq_mode is not RTE_ETH_MQ_RX_RSS in
rte_eth_conf, RSS is off.> Please make it clearer, thanks.> > > >> >> >
e.g.:> >> > examples/bond/main.c:> >> > conf:> >> > static struct
rte_eth_conf port_conf = {> >> > .rxmode = {> >> > .mq_mode =
RTE_ETH_MQ_RX_NONE,> >> > .split_hdr_size = 0,> >> > },> >> >
.rx_adv_conf = {> >> > .rss_conf = {> >> > .rss_key = NULL,> >> > .rss_hf
= RTE_ETH_RSS_IP,> >> > },> >> > },> >> > .txmode = {> >> > .mq_mode =
RTE_ETH_MQ_TX_NONE,> >> > },> >> > }> >> >> > call chain:> >> >
rte_eth_bond_create()->rte_eth_dev_configure()->rte_eth_bond_slave_add()->rte_eth_dev_start()>
>> >> > Signed-off-by: Yu Wenjun > >>
> ---> >> > drivers/net/bonding/rte_eth_bond_pmd.c | 5 +> >> > 1
file changed, 5 insertions(+)> >> >> > diff --git
a/drivers/net/bonding/rte_eth_bond_pmd.c> >
b/drivers/net/bonding/rte_eth_bond_pmd.c> >> > index 84f4900ee5..31bcee15cf
100644> >> > --- a/drivers/net/bonding/rte_eth_bond_pmd.c> >> > +++
b/drivers/net/bonding/rte_eth_bond_pmd.c> >> > @@ -3504,6 +3504,11 @@
bond_ethdev_configure(struct rte_eth_dev *dev)> >> > if
(dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) {> >> > struct
rte_eth_rss_conf *rss_conf => >> > &dev->data->dev_conf.rx_adv_conf.rss_conf>
>> > +> >> > +if (internals->rss_key_len == 0) {> >> >
+internals->rss_key_len = sizeof(default_rss_key)> >> > +}> >> > +> >> >
if (rss_conf->rss_key != NULL) {> >> > if (internals->rss_key_len >
rss_conf->rss_key_len) {> >> > RTE_BOND_LOG(ERR, "Invalid rss key
length(%u)",> >> > --> >> > 2.32.0.windows.1> >> >> > Subject：Re: [PATCH]
net/bonding: fix RSS not work for bonding in
Re: [PATCH] net/mlx5: fix RSS expansion compilation
On 1/14/2022 3:16 PM, Gregory Etelson wrote:
For each item in flow rule pattern that can be expanded, RSS expansion
scheme returns ether specific next item flow item type or
RTE_FLOW_ITEM_TYPE_VOID or RTE_FLOW_ITEM_TYPE_END.
RTE_FLOW_ITEM_TYPE_END means that expansion has completed.
RTE_FLOW_ITEM_TYPE_VOID means that next flow item was not located yet
and the procedure will continue.
Current expansion scheme assigns RTE_FLOW_ITEM_TYPE_END for L2, L3 and
L4 rule items that set next protocol value to 0 in flow item mask.
The correct value in that case is RTE_FLOW_ITEM_TYPE_VOID.
Fixes: 342a22ef3928 ("net/mlx5: fix RSS expansion with explicit next protocol")
Squashed into relevant commit in next-net, thanks.
Please double check the code in next-net.
Signed-off-by: Gregory Etelson
Acked-by: Viacheslav Ovsiienko
<...>
[PATCH] net/memif: remove unnecessary rx_intr stub
The code in memif driver to stub out rx_irq_enable is unnecessary
and causes different error returns than other drivers.
The core ethdev code will return -ENOTSUP if the driver has
a null rx_queue_intr_enable callback.
Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD")
Cc: jgraj...@cisco.com
Signed-off-by: Stephen Hemminger
---
drivers/net/memif/rte_eth_memif.c | 19 ---
1 file changed, 19 deletions(-)
diff --git a/drivers/net/memif/rte_eth_memif.c
b/drivers/net/memif/rte_eth_memif.c
index 59cb5a82a23f..d3459c5007c4 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -1500,23 +1500,6 @@ memif_stats_reset(struct rte_eth_dev *dev)
return 0;
}
-static int
-memif_rx_queue_intr_enable(struct rte_eth_dev *dev __rte_unused,
- uint16_t qid __rte_unused)
-{
- MIF_LOG(WARNING, "Interrupt mode not supported.");
-
- return -1;
-}
-
-static int
-memif_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t qid __rte_unused)
-{
- struct pmd_internals *pmd __rte_unused = dev->data->dev_private;
-
- return 0;
-}
-
static const struct eth_dev_ops ops = {
.dev_start = memif_dev_start,
.dev_stop = memif_dev_stop,
@@ -1527,8 +1510,6 @@ static const struct eth_dev_ops ops = {
.rx_queue_setup = memif_rx_queue_setup,
.rx_queue_release = memif_rx_queue_release,
.tx_queue_release = memif_tx_queue_release,
- .rx_queue_intr_enable = memif_rx_queue_intr_enable,
- .rx_queue_intr_disable = memif_rx_queue_intr_disable,
.link_update = memif_link_update,
.stats_get = memif_stats_get,
.stats_reset = memif_stats_reset,
--
2.30.2
Re: [dpdk-dev] [PATCH] ethdev: modify comment of INTR RESET event
Hi Ferruh,
Sorry for the late reply. Please see inline.
On Mon, Sep 27, 2021 at 9:49 PM Ferruh Yigit wrote:
> On 7/26/2021 7:43 AM, Chengwen Feng wrote:
> > According to the definition of rte_eth_dev_reset(), the
> > RTE_ETH_EVENT_INTR_RESET event could also use when PF resets.
> >
>
> Can you please highlight the part in the 'rte_eth_dev_reset()' definition
> related to the RESET event usage for PF?
>
> > This patch modifies the comment of RTE_ETH_EVENT_INTR_RESET event, so
> > that it could use in all resets.
> >
>
> The original intention seems as the comment mentions, please check related
> commits [1].
>
> As far as I can get from below comments, usecase is,
> - PF sends reset command to VFs (driver internal command)
> - VF sends RESET event to application, to request reset to be performed by
> application.
>
> So event is more like a reset request from driver to application.
>
> Overall it is OK to extend the usage of the RESET event to PF, if there is
> a
> usecase for it. What is your usecase?
> And should we extend comment (API documentation) a little more to clarify
> when
> this even should be sent and what application should do when event
> received,
> what do you think?
>
> btw, cc'ed Ajit & Kales, as far as I remember in the past they suggest a
> recover
> event, maybe relevant with this discussion.
>
[Kalesh]: The recovery event we proposed was for a different purpose and
looks different from this.
In that case, PMD itself recovers from the FW error/reset conditions using
a handshaking protocol between PMD and the device FW without needing
application intervention.
I will send a new version of the patch set incorporating the comments I
received on the last version I had sent.
Regards,
Kalesh
>
>
>
> [1]
> Commit ae19955e7c86 ("i40evf: support reporting PF reset")
> Commit 514302ff6e00 ("ethdev: add NIC reset operation")
>
> > Signed-off-by: Chengwen Feng
> > ---
> > lib/ethdev/rte_ethdev.h | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
> > index d2b27c3..e6646a6 100644
> > --- a/lib/ethdev/rte_ethdev.h
> > +++ b/lib/ethdev/rte_ethdev.h
> > @@ -3499,8 +3499,7 @@ enum rte_eth_event_type {
> > RTE_ETH_EVENT_INTR_LSC, /**< lsc interrupt event */
> > RTE_ETH_EVENT_QUEUE_STATE,
> > /**< queue state event (enabled/disabled)
> */
> > - RTE_ETH_EVENT_INTR_RESET,
> > - /**< reset interrupt event, sent to VF on PF reset
> */
> > + RTE_ETH_EVENT_INTR_RESET, /**< reset interrupt event */
> > RTE_ETH_EVENT_VF_MBOX, /**< message from the VF received by PF */
> > RTE_ETH_EVENT_MACSEC, /**< MACsec offload related event */
> > RTE_ETH_EVENT_INTR_RMV, /**< device removal event */
> >
>
>
--
Regards,
Kalesh A P
