[dpdk-dev] [PATCH 0/2] bugfix for testpmd
This patchset contains two bugfixes for testpmd. Chengchang Tang (2): app/testpmd: fix integer overflow during get DCB conf app/testpmd: fix max queue number when configure Tx offloads app/test-pmd/cmdline.c | 2 +- app/test-pmd/testpmd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 1/2] app/testpmd: fix integer overflow during get DCB conf
From: Chengchang Tang
In C, constant is treated as integer. Therefore, if nb_queque_pools is
ETH_32_POOLS, the shift here may cause integer overflow.
Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
---
app/test-pmd/testpmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index afa2a6b..6784160 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3640,7 +3640,7 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf
*eth_conf,
for (i = 0; i < vmdq_rx_conf->nb_pool_maps; i++) {
vmdq_rx_conf->pool_map[i].vlan_id = vlan_tags[i];
vmdq_rx_conf->pool_map[i].pools =
- 1 << (i % vmdq_rx_conf->nb_queue_pools);
+ 1ULL << (i % vmdq_rx_conf->nb_queue_pools);
}
for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
vmdq_rx_conf->dcb_tc[i] = i % num_tcs;
--
2.7.4
[dpdk-dev] [PATCH 2/2] app/testpmd: fix max queue number when configure Tx offloads
From: Chengchang Tang
When txq offload is configured, max rxq is used as the max queue. This
patch fixes it.
Fixes: 74453ac9ef67 ("app/testpmd: fix queue offload configuration")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
---
app/test-pmd/cmdline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index f0fa6e8..1cb1027 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -4666,7 +4666,7 @@ cmd_config_queue_tx_offloads(struct rte_port *port)
int k;
/* Apply queue tx offloads configuration */
- for (k = 0; k < port->dev_info.max_rx_queues; k++)
+ for (k = 0; k < port->dev_info.max_tx_queues; k++)
port->tx_conf[k].offloads =
port->dev_conf.txmode.offloads;
}
--
2.7.4
[dpdk-dev] [PATCH] net/bonding: fix socket id check
From: Chengchang Tang
The socket ID entered by user is cast to an unsigned integer. However,
the value may be an illegal negative value, which may cause some
problems. In this case, an error should be returned.
In addition, the socket ID may be an invalid positive number, which is
also processed in this patch.
Fixes: 2efb58cbab6e ("bond: new link bonding library")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
---
drivers/net/bonding/rte_eth_bond_args.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_args.c
b/drivers/net/bonding/rte_eth_bond_args.c
index 8c5f90d..bcc0fe3 100644
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -207,12 +207,12 @@ bond_ethdev_parse_socket_id_kvarg(const char *key
__rte_unused,
return -1;
errno = 0;
- socket_id = (uint8_t)strtol(value, &endptr, 10);
+ socket_id = strtol(value, &endptr, 10);
if (*endptr != 0 || errno != 0)
return -1;
/* validate socket id value */
- if (socket_id >= 0) {
+ if (socket_id >= 0 && socket_id < RTE_MAX_NUMA_NODES) {
*(uint8_t *)extra_args = (uint8_t)socket_id;
return 0;
}
--
2.7.4
[dpdk-dev] [PATCH] net/mlx5: probe LAG representor with PF1 PCI address
In case of bonding, orchestrator wants to use same devargs for LAG and non-LAG scenario, to probe representor on PF1 using PF1 PCI address like ",representor=pf1vf[0-3]". This patch changes PCI address check policy to allow PF1 PCI address for representors on PF1. Note: detaching PF0 device can't remove representors on PF1. It's recommended to use primary(PF0) PCI address to probe representors on both PFs. Signed-off-by: Xueming Li --- drivers/net/mlx5/linux/mlx5_os.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 76c72d0e38..22271e289a 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1875,11 +1875,14 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev, tmp_str); break; } - /* Match PCI address. */ + /* Match PCI address, allows BDF0+pfx or BDFx+pfx. */ if (pci_dev->domain == pci_addr.domain && pci_dev->bus == pci_addr.bus && pci_dev->devid == pci_addr.devid && - pci_dev->function + owner == pci_addr.function) + ((pci_dev->function == 0 && + pci_dev->function + owner == pci_addr.function) || +(pci_dev->function == owner && + pci_addr.function == owner))) pf = info.port_name; /* Get ifindex. */ snprintf(tmp_str, sizeof(tmp_str), -- 2.25.1
[dpdk-dev] [PATCH] bpf: fix unreachable statement
From: HongBo Zheng
In function 'eval_jcc', judgment 'op == EBPF_JLT' occurs
twice, as a result, the corresponding second statement
cannot be accessed.
This patch fix this problem.
Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
lib/librte_bpf/bpf_validate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 9214f15..7b1291b 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -1115,7 +1115,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn
*ins)
eval_jsgt_jsle(trd, trs, frd, frs);
else if (op == EBPF_JSLE)
eval_jsgt_jsle(frd, frs, trd, trs);
- else if (op == EBPF_JLT)
+ else if (op == EBPF_JSLT)
eval_jslt_jsge(trd, trs, frd, frs);
else if (op == EBPF_JSGE)
eval_jslt_jsge(frd, frs, trd, trs);
--
2.7.4
[dpdk-dev] [PATCH v1] raw/ifpga: fix ifpga device name format
The device name format used in ifpga_rawdev_create() was changed to
"IFPGA:%02x:%02x.%x", but the format used in ifpga_rawdev_destroy()
was left as "IFPGA:%x:%02x.%x", it should be changed synchronously.
Fixes: 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree")
Cc: sta...@dpdk.org
Signed-off-by: Wei Huang
---
drivers/raw/ifpga/ifpga_rawdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index d9a46ef915..f591a87b49 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -1551,7 +1551,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)
}
memset(name, 0, sizeof(name));
- snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%x:%02x.%x",
+ snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%02x:%02x.%x",
pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function);
IFPGA_RAWDEV_PMD_INFO("Closing %s on NUMA node %d",
--
2.29.2
Re: [dpdk-dev] [PATCH v5] build: use platform option for generic and native
Hi Linkeš，
This patch cause vhost/virtio basic pvp test with 1518 packet size performance
drop about 9% on IA platform.
BR,
Yinan
> -Original Message-
> From: dev On Behalf Of Juraj Linkeš
> Sent: 2021年4月21日 16:38
> To: Thomas Monjalon
> Cc: david.march...@redhat.com; Richardson, Bruce
> ; honnappa.nagaraha...@arm.com;
> ruifeng.w...@arm.com; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v5] build: use platform option for generic
> and native
>
>
>
> > -Original Message-
> > From: Thomas Monjalon
> > Sent: Tuesday, April 20, 2021 10:36 AM
> > To: Juraj Linkeš
> > Cc: david.march...@redhat.com; bruce.richard...@intel.com;
> > honnappa.nagaraha...@arm.com; ruifeng.w...@arm.com;
> dev@dpdk.org
> > Subject: Re: [PATCH v5] build: use platform option for generic and native
> >
> > 20/04/2021 10:16, Juraj Linkeš:
> > > > option('platform', type: 'string', value: '',
> > > > - description: 'use configuration for a particular platform (such
> > > > as a
> SoC).')
> > > > +option('platform', type: 'string', value: 'generic',
> > > > + description: 'Platform to build, either "native", "generic" or
> > > > an
> > > > +Arm SoC. Please refer to the Linux build guide for more
> > > > +information.')
> > >
> > > The other thing we need to discuss is the fact that we're changing the
> behavior
> > in this patch from machine=native to platform=generic (and the implied
> > cpu_instruction_set=genetic which equals to machine=generic). We need
> more
> > feedback on this - Thomas, David? Should we include more people? The
> reason
> > for this change is we want the build without any meson options (specified
> on
> > cmdline) to be usable on as many different machines of the same
> architecture
> > (this is my understanding form the discussion with Bruce), which is the
> generic
> > platform. We could preserve the current behavior by setting the default
> to
> > native, so we just need more discussion.
> >
> > I don't understand why you need to change the behaviour.
>
> Well, we don't *need* to change the behavior - I don't mind it either way.
> We've come to this point after discussing the change with Bruce. I believe
> Bruce mentioned the intention of the build without any meson cmdline
> options was to produce a build usable on most machines that match the
> build architecture and the generic build fits better (native build being more
> tailored to the build machine as opposed to the generic build).
>
> I don't want to speak for Bruce though, so it'd be the best if he gave his
> thoughts on the matter.
>
> > If we change the behaviour, it must be done carefully after a deprecation
> notice
> > and an agreement of the Technical Board.
> >
> >
>
> Ok, one thing we could do is preserve the behavior in this patch and go
> through this process with a separate change.
Re: [dpdk-dev] [PATCH] pipeline: fix deallocate null pointer
> -Original Message-
> From: Min Hu (Connor)
> Sent: Thursday, April 22, 2021 7:39 AM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh ; Dumitrescu, Cristian
>
> Subject: [PATCH] pipeline: fix deallocate null pointer
>
> From: HongBo Zheng
>
> Fix deallocate null pointer in instruction_config, while
> pointer 'data' or 'instr' may be null.
>
> Fixes: a1711f948dbf ("pipeline: add SWX Rx and extract instructions")
> Cc: sta...@dpdk.org
>
> Signed-off-by: HongBo Zheng
> Signed-off-by: Min Hu (Connor)
> ---
> lib/librte_pipeline/rte_swx_pipeline.c | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_pipeline/rte_swx_pipeline.c
> b/lib/librte_pipeline/rte_swx_pipeline.c
> index 4455d91..6084635 100644
> --- a/lib/librte_pipeline/rte_swx_pipeline.c
> +++ b/lib/librte_pipeline/rte_swx_pipeline.c
> @@ -8015,8 +8015,10 @@ instruction_config(struct rte_swx_pipeline *p,
> return 0;
>
> error:
> - free(data);
> - free(instr);
> + if (data)
> + free(data);
> + if (instr)
> + free(instr);
> return err;
> }
>
> --
> 2.7.4
Hi,
NACK.
Thanks for the patch, but the tests for data and instr being non-NULL before
calling free are not required, because:
1. Both data and instr are initialized to NULL.
2. free(NULL) is supported.
Regards,
Cristian
Re: [dpdk-dev] [PATCH] drivers: fix indentation in build files
On Thu, Apr 22, 2021 at 12:03:57AM +0200, Thomas Monjalon wrote: > A couple of mistakes slipped in the mass change. > > More mistakes could happen, especially when rebasing pending patches, so > we need an automatic check. > I have a partially-done script from when I was doing the original reindenting work, which I'll clean up a little and send on shortly. It only checks indent of lists and I'm extending it to check for trailing commas, but it may serve as a basis for further checks. On the plus side, it does automatic fixing of those issues though. Running it will probably show up more minor misses, so I'd suggest holding off on this patch until then. Regards, /Bruce
[dpdk-dev] [Bug 238] [tree-wide] enhance getopt_long usage
https://bugs.dpdk.org/show_bug.cgi?id=238 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Status|CONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #8 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=270054edc9 -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] [PATCH] drivers/net: fix FW version get
On 4/21/21 7:30 PM, Ajit Khaparde wrote:
> On Wed, Apr 21, 2021 at 9:21 AM Ferruh Yigit wrote:
>>
>> Fixes a few different things:
>> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
>> zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
>> in ethdev layer
>> * Be sure required buffer size is returned if provided one is not big
>> enough, instead of returning success (0)
>> * Document in doxygen comment the '-EINVAL' is a valid return type
>> * Take into account that 'snprintf' can return negative value
>> * Cast length to 'size_t' to compare it with 'fw_size'
>>
>> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
>> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
>> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
>> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
>> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version get")
>> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
>> Fixes: 293430677e9c ("net/enic: add handler to return firmware version")
>> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
>> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
>> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
>> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
>> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
>> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
>> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
>> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
>> Fixes: f97b56f9f12e ("net/qede: support FW version query")
>> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
>> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
>> Fixes: 21913471202f ("ethdev: add firmware version get")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Ferruh Yigit
> Thanks!
> For bnxt,
> Acked-by: Ajit Khaparde
For net/sfc,
Acked-by: Andrew Rybchenko
[dpdk-dev] [RFC PATCH] devtools: script to check meson indentation of lists
This is a draft script developed when I was working on the whitespace rework
changes, since extended a little to attempt to fix some trailing comma issues.
Signed-off-by: Bruce Richardson
---
devtools/dpdk_meson_check.py | 106 +++
1 file changed, 106 insertions(+)
create mode 100755 devtools/dpdk_meson_check.py
diff --git a/devtools/dpdk_meson_check.py b/devtools/dpdk_meson_check.py
new file mode 100755
index 0..dc4c714ad
--- /dev/null
+++ b/devtools/dpdk_meson_check.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+'''
+A Python script to run some checks on meson.build files in DPDK
+'''
+
+import sys
+import os
+from os.path import relpath, join
+from argparse import ArgumentParser
+
+VERBOSE = False
+FIX = False
+
+def scan_dir(path):
+'''return meson.build files found in path'''
+for root, dirs, files in os.walk(path):
+if 'meson.build' in files:
+yield(relpath(join(root, 'meson.build')))
+
+
+def check_indentation(filename, contents):
+'''check that a list or files() is correctly indented'''
+infiles = False
+inlist = False
+edit_count = 0
+for lineno in range(len(contents)):
+line = contents[lineno].rstrip()
+if not line:
+continue
+if line.endswith('files('):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got "files(" when
already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got "files(" when
already parsing array list')
+infiles = True
+indent = 0
+while line[indent] == ' ':
+indent += 1
+indent += 8 # double indent required
+elif line.endswith('= ['):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got start of array
when already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got start of array
when already parsing array list')
+inlist = True
+indent = 0
+while line[indent] == ' ':
+indent += 1
+indent += 8 # double indent required
+elif infiles and (line.endswith(')') or line.strip().startswith(')')):
+infiles = False
+continue
+elif inlist and line.endswith(']') or line.strip().startswith(']'):
+inlist = False
+continue
+elif inlist or infiles:
+# skip further subarrays or lists
+if '[' in line or ']' in line:
+continue
+if not line.startswith(' ' * indent) or line[indent] == ' ':
+print(f'Error: Incorrect indent at {filename}:{lineno + 1}')
+contents[lineno] = (' ' * indent) + line.strip() + '\n'
+line = contents[lineno].rstrip()
+edit_count += 1
+if not line.endswith(',') and '#' not in line:
+# TODO: support stripping comment and adding ','
+print(f'Error: Missing trailing "," in list at
{filename}:{lineno + 1}')
+contents[lineno] = line + ',\n'
+line = contents[lineno].rstrip()
+edit_count += 1
+return edit_count
+
+
+def process_file(filename):
+'''run checks on file "filename"'''
+if VERBOSE:
+print(f'Processing {filename}')
+with open(filename) as f:
+contents = f.readlines()
+
+if check_indentation(filename, contents) > 0 and FIX:
+print(f"Fixing {filename}")
+with open(filename, 'w') as f:
+f.writelines(contents)
+
+
+def main():
+'''parse arguments and then call other functions to do work'''
+global VERBOSE
+global FIX
+parser = ArgumentParser(description='Run syntax checks on DPDK meson.build
files')
+parser.add_argument('-d', metavar='directory', default='.',
help='Directory to process')
+parser.add_argument('--fix', action='store_true', help='Attempt to fix
errors')
+parser.add_argument('-v', action='store_true', help='Verbose output')
+args = parser.parse_args()
+
+VERBOSE = args.v
+FIX = args.fix
+for f in scan_dir(args.d):
+process_file(f)
+
+if __name__ == "__main__":
+main()
--
2.27.0
Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq
On 22-Apr-21 7:15 AM, Richael Zhuang wrote: Currently in DPDK only acpi_cpufreq and pstate_cpufreq drivers are supported, which are both not available on arm64 platforms. Add support for cppc_cpufreq driver which works on most arm64 platforms. Signed-off-by: Richael Zhuang --- Just a general note: this looks like a copy-paste of pstate code. Which is perfectly fine, except that we can do better than copying some faults of the pstate code to other drivers. I've submitted a patch [1] attempting to fix some of the pressing issues and code duplication in pstate driver, but i'm sure with a fresh driver, you can do even better :) [1] http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1-anatoly.bura...@intel.com/ -- Thanks, Anatoly
[dpdk-dev] [PATCH v1] eal/arm64: fix aarch64 reg platform value
REG_PLATFORM only uses bit 0 to indicate whether the value retrieved
from hardware matches PLATFORM_STR.
Signed-off-by: Juraj Linkeš
Fixes: 97523f822ba9 ("eal/arm: add CPU flags for ARMv8")
Cc: jer...@marvell.com
Cc: sta...@dpdk.org
---
lib/eal/arm/rte_cpuflags.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
index e3a53bcece..e709a2800e 100644
--- a/lib/eal/arm/rte_cpuflags.c
+++ b/lib/eal/arm/rte_cpuflags.c
@@ -108,7 +108,7 @@ const struct feature_entry rte_cpu_feature_table[] = {
FEAT_DEF(SVEF32MM, REG_HWCAP2, 10)
FEAT_DEF(SVEF64MM, REG_HWCAP2, 11)
FEAT_DEF(SVEBF16, REG_HWCAP2, 12)
- FEAT_DEF(AARCH64, REG_PLATFORM, 1)
+ FEAT_DEF(AARCH64, REG_PLATFORM, 0)
};
#endif /* RTE_ARCH */
--
2.20.1
[dpdk-dev] [PATCH] test/timer: fix memzone reserve failure check
Segmentation fault may occur without checking if memzone
reserves succeed or not.
This patch fixed it.
Fixes: 50247fe03fe0 ("test/timer: exercise new APIs in secondary process")
Cc: sta...@dpdk.org
Signed-off-by: Min Hu (Connor)
---
app/test/test_timer_secondary.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c
index 1e8f1d4..281f5bd 100644
--- a/app/test/test_timer_secondary.c
+++ b/app/test/test_timer_secondary.c
@@ -125,6 +125,11 @@ test_timer_secondary(void)
mz = rte_memzone_reserve(TEST_INFO_MZ_NAME, sizeof(*test_info),
SOCKET_ID_ANY, 0);
+ if (mz == NULL) {
+ printf("Failed to reserve memzone\n");
+ return TEST_SKIPPED;
+ }
+
test_info = mz->addr;
TEST_ASSERT_NOT_NULL(test_info, "Couldn't allocate memory for "
"test data");
@@ -171,6 +176,11 @@ test_timer_secondary(void)
int i;
mz = rte_memzone_lookup(TEST_INFO_MZ_NAME);
+ if (mz == NULL) {
+ printf("Failed to lookup memzone\n");
+ return TEST_SKIPPED;
+ }
+
test_info = mz->addr;
TEST_ASSERT_NOT_NULL(test_info, "Couldn't lookup memzone for "
"test info");
--
2.7.4
Re: [dpdk-dev] [PATCH] drivers: fix indentation in build files
22/04/2021 10:39, Bruce Richardson: > On Thu, Apr 22, 2021 at 12:03:57AM +0200, Thomas Monjalon wrote: > > A couple of mistakes slipped in the mass change. > > > > More mistakes could happen, especially when rebasing pending patches, so > > we need an automatic check. > > > I have a partially-done script from when I was doing the original > reindenting work, which I'll clean up a little and send on shortly. > > It only checks indent of lists and I'm extending it to check for trailing > commas, but it may serve as a basis for further checks. On the plus side, > it does automatic fixing of those issues though. Running it will probably > show up more minor misses, so I'd suggest holding off on this patch until > then. OK, I've sent this patch just for remembering. I am happy to leave it to you for a v2 :) Feel free to change the author of course. Note: I've found tabs with this simple grep: git grep ' ' '**/meson.build' The tab is inserted with ^V-tab.
Re: [dpdk-dev] [PATCH v1] eal/arm64: fix aarch64 reg platform value
On Thu, Apr 22, 2021 at 2:41 PM Juraj Linkeš wrote:
>
> REG_PLATFORM only uses bit 0 to indicate whether the value retrieved
> from hardware matches PLATFORM_STR.
>
> Signed-off-by: Juraj Linkeš
> Fixes: 97523f822ba9 ("eal/arm: add CPU flags for ARMv8")
Fixes and cc stable should go above Signoff.
> Cc: jer...@marvell.com
> Cc: sta...@dpdk.org
Reviewed-by: Jerin Jacob
> ---
> lib/eal/arm/rte_cpuflags.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
> index e3a53bcece..e709a2800e 100644
> --- a/lib/eal/arm/rte_cpuflags.c
> +++ b/lib/eal/arm/rte_cpuflags.c
> @@ -108,7 +108,7 @@ const struct feature_entry rte_cpu_feature_table[] = {
> FEAT_DEF(SVEF32MM, REG_HWCAP2, 10)
> FEAT_DEF(SVEF64MM, REG_HWCAP2, 11)
> FEAT_DEF(SVEBF16, REG_HWCAP2, 12)
> - FEAT_DEF(AARCH64, REG_PLATFORM, 1)
> + FEAT_DEF(AARCH64, REG_PLATFORM, 0)
> };
> #endif /* RTE_ARCH */
>
> --
> 2.20.1
>
[dpdk-dev] [PATCH] bonding: fix overflow check
Buffer 'test_params->slave_port_ids' of size 6 accessed may
overflow, since its index 'i' can have value be is out of range.
This patch fixed it.
Fixes: 92073ef961ee ("bond: unit tests")
Cc: sta...@dpdk.org
Signed-off-by: Min Hu (Connor)
---
app/test/test_link_bonding.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index 8a5c831..b5a6042 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -2216,7 +2216,8 @@ test_activebackup_rx_burst(void)
"failed to get primary slave for bonded port (%d)",
test_params->bonded_port_id);
- for (i = 0; i < test_params->bonded_slave_count; i++) {
+ for (i = 0; i < test_params->bonded_slave_count &&
+ i < TEST_MAX_NUMBER_OF_PORTS; i++) {
/* Generate test bursts of packets to transmit */
TEST_ASSERT_EQUAL(generate_test_burst(
&gen_pkt_burst[0], burst_size, 0, 1, 0, 0, 0),
--
2.7.4
[dpdk-dev] [PATCH] baseband/turbo_sw: fix dereference of null
Return value of a function 'rte_malloc' is dereferenced without
checking, and may result in segmetation fault.
This patch fixed it.
Fixes: 31a7853d1ed9 ("baseband/turbo_sw: support large size code block")
Cc: sta...@dpdk.org
Signed-off-by: Min Hu (Connor)
---
app/test-bbdev/test_bbdev_perf.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 45b85b9..f94e2a9 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -957,6 +957,9 @@ init_op_data_objs(struct rte_bbdev_op_data *bufs,
if ((op_type == DATA_INPUT) && large_input) {
/* Allocate a fake overused mbuf */
data = rte_malloc(NULL, seg->length, 0);
+ TEST_ASSERT_NOT_NULL(data,
+ "rte malloc failed with %u bytes",
+ seg->length);
memcpy(data, seg->addr, seg->length);
m_head->buf_addr = data;
m_head->buf_iova = rte_malloc_virt2iova(data);
--
2.7.4
Re: [dpdk-dev] [PATCH v1] eal/arm64: fix aarch64 reg platform value
> -Original Message-
> From: Juraj Linkeš
> Sent: Thursday, April 22, 2021 5:12 PM
> To: tho...@monjalon.net; david.march...@redhat.com; Honnappa
> Nagarahalli ; Ruifeng Wang
> ; jer...@marvell.com
> Cc: dev@dpdk.org; Juraj Linkeš ;
> sta...@dpdk.org
> Subject: [PATCH v1] eal/arm64: fix aarch64 reg platform value
>
> REG_PLATFORM only uses bit 0 to indicate whether the value retrieved from
> hardware matches PLATFORM_STR.
>
> Signed-off-by: Juraj Linkeš
> Fixes: 97523f822ba9 ("eal/arm: add CPU flags for ARMv8")
> Cc: jer...@marvell.com
> Cc: sta...@dpdk.org
> ---
> lib/eal/arm/rte_cpuflags.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c index
> e3a53bcece..e709a2800e 100644
> --- a/lib/eal/arm/rte_cpuflags.c
> +++ b/lib/eal/arm/rte_cpuflags.c
> @@ -108,7 +108,7 @@ const struct feature_entry rte_cpu_feature_table[] =
> {
> FEAT_DEF(SVEF32MM, REG_HWCAP2, 10)
> FEAT_DEF(SVEF64MM, REG_HWCAP2, 11)
> FEAT_DEF(SVEBF16, REG_HWCAP2, 12)
> - FEAT_DEF(AARCH64, REG_PLATFORM, 1)
> + FEAT_DEF(AARCH64, REG_PLATFORM, 0)
> };
> #endif /* RTE_ARCH */
>
> --
> 2.20.1
Reviewed-by: Ruifeng Wang
Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq
> -Original Message- > From: Burakov, Anatoly > Sent: Thursday, April 22, 2021 5:06 PM > To: Richael Zhuang ; dev@dpdk.org > Cc: nd ; David Hunt > Subject: Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq > > On 22-Apr-21 7:15 AM, Richael Zhuang wrote: > > Currently in DPDK only acpi_cpufreq and pstate_cpufreq drivers are > > supported, which are both not available on arm64 platforms. Add > > support for cppc_cpufreq driver which works on most arm64 platforms. > > > > Signed-off-by: Richael Zhuang > > --- > > Just a general note: this looks like a copy-paste of pstate code. Which is > perfectly fine, except that we can do better than copying some faults of the > pstate code to other drivers. I've submitted a patch [1] attempting to fix > some of the pressing issues and code duplication in pstate driver, but i'm > sure with a fresh driver, you can do even better :) > > [1] > http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1- > anatoly.bura...@intel.com/ > > -- > Thanks, > Anatoly For CPPC is defined in acpi v5.0+ spec, I reused most code in acpi_cpufreq to get a quick workable version on our platform with only cppc driver. I have verified its basic functions. If you find some problems please help to point out thus I can rework it. Thanks . Best Regards, Richael
Re: [dpdk-dev] [PATCH] pipeline: fix deallocate null pointer
在 2021/4/22 16:36, Dumitrescu, Cristian 写道:
-Original Message-
From: Min Hu (Connor)
Sent: Thursday, April 22, 2021 7:39 AM
To: dev@dpdk.org
Cc: Yigit, Ferruh ; Dumitrescu, Cristian
Subject: [PATCH] pipeline: fix deallocate null pointer
From: HongBo Zheng
Fix deallocate null pointer in instruction_config, while
pointer 'data' or 'instr' may be null.
Fixes: a1711f948dbf ("pipeline: add SWX Rx and extract instructions")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
lib/librte_pipeline/rte_swx_pipeline.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/librte_pipeline/rte_swx_pipeline.c
b/lib/librte_pipeline/rte_swx_pipeline.c
index 4455d91..6084635 100644
--- a/lib/librte_pipeline/rte_swx_pipeline.c
+++ b/lib/librte_pipeline/rte_swx_pipeline.c
@@ -8015,8 +8015,10 @@ instruction_config(struct rte_swx_pipeline *p,
return 0;
error:
- free(data);
- free(instr);
+ if (data)
+ free(data);
+ if (instr)
+ free(instr);
return err;
}
--
2.7.4
Hi,
NACK.
Thanks for the patch, but the tests for data and instr being non-NULL before
calling free are not required, because:
1. Both data and instr are initialized to NULL.
2. free(NULL) is supported.
Agreed, thanks Cristian, this patch can be abandoned.
Regards,
Cristian
.
Re: [dpdk-dev] [RFC PATCH] devtools: script to check meson indentation of lists
On 22-Apr-21 10:02 AM, Bruce Richardson wrote:
This is a draft script developed when I was working on the whitespace rework
changes, since extended a little to attempt to fix some trailing comma issues.
Signed-off-by: Bruce Richardson
---
devtools/dpdk_meson_check.py | 106 +++
1 file changed, 106 insertions(+)
create mode 100755 devtools/dpdk_meson_check.py
diff --git a/devtools/dpdk_meson_check.py b/devtools/dpdk_meson_check.py
new file mode 100755
index 0..dc4c714ad
--- /dev/null
+++ b/devtools/dpdk_meson_check.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+'''
+A Python script to run some checks on meson.build files in DPDK
+'''
+
+import sys
+import os
+from os.path import relpath, join
+from argparse import ArgumentParser
+
+VERBOSE = False
+FIX = False
+
+def scan_dir(path):
+'''return meson.build files found in path'''
+for root, dirs, files in os.walk(path):
+if 'meson.build' in files:
+yield(relpath(join(root, 'meson.build')))
+
+
+def check_indentation(filename, contents):
+'''check that a list or files() is correctly indented'''
+infiles = False
+inlist = False
+edit_count = 0
+for lineno in range(len(contents)):
for lineno, line in enumerate(contents)
?
+line = contents[lineno].rstrip()
+if not line:
+continue
+if line.endswith('files('):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got "files(" when
already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got "files(" when
already parsing array list')
+infiles = True
+indent = 0
+while line[indent] == ' ':
+indent += 1
Here and in other places, if this is measuring length of indent, maybe
do something like:
indent = len(line) - len(line.lstrip(' '))
?
+indent += 8 # double indent required
+elif line.endswith('= ['):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got start of array
when already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got start of array
when already parsing array list')
+inlist = True
+indent = 0
+while line[indent] == ' ':
+indent += 1
+indent += 8 # double indent required
+elif infiles and (line.endswith(')') or line.strip().startswith(')')):
It's kinda hard to read with all the endswith/startswith, maybe extract
those into a function? e.g. 'elif infiles and is_file_start(line)'
+infiles = False
+continue
+elif inlist and line.endswith(']') or line.strip().startswith(']'):
+inlist = False
+continue
+elif inlist or infiles:
+# skip further subarrays or lists
+if '[' in line or ']' in line:
+continue
I guess you could make it recursive instead of giving up? Does this
happen with any kind of regularity?
+if not line.startswith(' ' * indent) or line[indent] == ' ':
+print(f'Error: Incorrect indent at {filename}:{lineno + 1}')
+contents[lineno] = (' ' * indent) + line.strip() + '\n'
+line = contents[lineno].rstrip()
+edit_count += 1
+if not line.endswith(',') and '#' not in line:
+# TODO: support stripping comment and adding ','
+print(f'Error: Missing trailing "," in list at
{filename}:{lineno + 1}')
+contents[lineno] = line + ',\n'
+line = contents[lineno].rstrip()
What is the point of setting `line` here?
+edit_count += 1
+return edit_count
+
+
+def process_file(filename):
+'''run checks on file "filename"'''
+if VERBOSE:
+print(f'Processing {filename}')
+with open(filename) as f:
+contents = f.readlines()
I guess meson build files don't get too big so it's OK to read the
entire file in memory and then work on it, rather than go line by line...
+
+if check_indentation(filename, contents) > 0 and FIX:
+print(f"Fixing {filename}")
+with open(filename, 'w') as f:
+f.writelines(contents)
+
+
+def main():
+'''parse arguments and then call other functions to do work'''
+global VERBOSE
+global FIX
Seems like globals are unnecessary here when you can just pass them into
process_file?
+parser = ArgumentParser(description='Run syntax checks on DPDK meson.build
files')
+parser.add_argument('-d', metavar='directory', default='.',
help='Directory to process')
+parser.add_argument('--fix', action='store_true', help='Attempt to fix
errors')
+parser.add_argument('-v', action='store_true',
Re: [dpdk-dev] [PATCH] test: fix flow classifier creating failure
> -Original Message-
> From: Min Hu (Connor)
> Sent: Thursday, April 22, 2021 7:14 AM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh ; Iremonger, Bernard
>
> Subject: [PATCH] test: fix flow classifier creating failure
>
> 'cls->cls' will be NULL if flow classifier create has failed, then
> segmentation
> fault will occur if the variable is used.
>
> This patch fixed it.
>
> Fixes: 9c9befea4f57 ("test: add flow classify unit tests")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Min Hu (Connor)
Acked-by: Bernard Iremonger
Re: [dpdk-dev] [RFC PATCH] devtools: script to check meson indentation of lists
On Thu, Apr 22, 2021 at 10:40:37AM +0100, Burakov, Anatoly wrote:
> On 22-Apr-21 10:02 AM, Bruce Richardson wrote:
> > This is a draft script developed when I was working on the whitespace rework
> > changes, since extended a little to attempt to fix some trailing comma
> > issues.
> >
> > Signed-off-by: Bruce Richardson
> > ---
> > devtools/dpdk_meson_check.py | 106 +++
> > 1 file changed, 106 insertions(+)
> > create mode 100755 devtools/dpdk_meson_check.py
> >
> > diff --git a/devtools/dpdk_meson_check.py b/devtools/dpdk_meson_check.py
> > new file mode 100755
> > index 0..dc4c714ad
> > --- /dev/null
> > +++ b/devtools/dpdk_meson_check.py
> > @@ -0,0 +1,106 @@
> > +#!/usr/bin/env python3
> > +# SPDX-License-Identifier: BSD-3-Clause
> > +# Copyright(c) 2021 Intel Corporation
> > +
> > +'''
> > +A Python script to run some checks on meson.build files in DPDK
> > +'''
> > +
> > +import sys
> > +import os
> > +from os.path import relpath, join
> > +from argparse import ArgumentParser
> > +
> > +VERBOSE = False
> > +FIX = False
> > +
> > +def scan_dir(path):
> > +'''return meson.build files found in path'''
> > +for root, dirs, files in os.walk(path):
> > +if 'meson.build' in files:
> > +yield(relpath(join(root, 'meson.build')))
> > +
> > +
> > +def check_indentation(filename, contents):
> > +'''check that a list or files() is correctly indented'''
> > +infiles = False
> > +inlist = False
> > +edit_count = 0
> > +for lineno in range(len(contents)):
>
> for lineno, line in enumerate(contents)
>
Yep, that's a good idea. Wasn't aware of enumerate. [Learn something new
every day, eh? :-)]
> ?
>
> > +line = contents[lineno].rstrip()
> > +if not line:
> > +continue
> > +if line.endswith('files('):
> > +if infiles:
> > +raise(f'Error parsing {filename}:{lineno}, got "files("
> > when already parsing files list')
> > +if inlist:
> > +print(f'Error parsing {filename}:{lineno}, got "files("
> > when already parsing array list')
> > +infiles = True
> > +indent = 0
> > +while line[indent] == ' ':
> > +indent += 1
>
> Here and in other places, if this is measuring length of indent, maybe do
> something like:
>
> indent = len(line) - len(line.lstrip(' '))
>
Yep, that is cleaner
> ?
>
> > +indent += 8 # double indent required
> > +elif line.endswith('= ['):
> > +if infiles:
> > +raise(f'Error parsing {filename}:{lineno}, got start of
> > array when already parsing files list')
> > +if inlist:
> > +print(f'Error parsing {filename}:{lineno}, got start of
> > array when already parsing array list')
> > +inlist = True
> > +indent = 0
> > +while line[indent] == ' ':
> > +indent += 1
> > +indent += 8 # double indent required
> > +elif infiles and (line.endswith(')') or
> > line.strip().startswith(')')):
>
> It's kinda hard to read with all the endswith/startswith, maybe extract
> those into a function? e.g. 'elif infiles and is_file_start(line)'
>
It is all a bit of a mess, yes, and needs cleaning up - which is why I
didn't previously send it with the patchset. Splitting into functions is
something I'll look at.
> > +infiles = False
> > +continue
> > +elif inlist and line.endswith(']') or line.strip().startswith(']'):
> > +inlist = False
> > +continue
> > +elif inlist or infiles:
> > +# skip further subarrays or lists
> > +if '[' in line or ']' in line:
> > +continue
>
> I guess you could make it recursive instead of giving up? Does this happen
> with any kind of regularity?
>
No, not that much, which is why I haven't explicitly tried to deal with it.
It would be good to support in future.
> > +if not line.startswith(' ' * indent) or line[indent] == ' ':
> > +print(f'Error: Incorrect indent at {filename}:{lineno +
> > 1}')
> > +contents[lineno] = (' ' * indent) + line.strip() + '\n'
> > +line = contents[lineno].rstrip()
> > +edit_count += 1
> > +if not line.endswith(',') and '#' not in line:
> > +# TODO: support stripping comment and adding ','
> > +print(f'Error: Missing trailing "," in list at
> > {filename}:{lineno + 1}')
> > +contents[lineno] = line + ',\n'
> > +line = contents[lineno].rstrip()
>
> What is the point of setting `line` here?
>
Because it allows us to make further checks using "line" as we add them
later.
The one question is whether it's worth using line as a shortcut for
contents[lineno] or not. I'd tend to keep it, as it also allows us not to
worry
Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq
On 22-Apr-21 10:29 AM, Richael Zhuang wrote: -Original Message- From: Burakov, Anatoly Sent: Thursday, April 22, 2021 5:06 PM To: Richael Zhuang ; dev@dpdk.org Cc: nd ; David Hunt Subject: Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq On 22-Apr-21 7:15 AM, Richael Zhuang wrote: Currently in DPDK only acpi_cpufreq and pstate_cpufreq drivers are supported, which are both not available on arm64 platforms. Add support for cppc_cpufreq driver which works on most arm64 platforms. Signed-off-by: Richael Zhuang --- Just a general note: this looks like a copy-paste of pstate code. Which is perfectly fine, except that we can do better than copying some faults of the pstate code to other drivers. I've submitted a patch [1] attempting to fix some of the pressing issues and code duplication in pstate driver, but i'm sure with a fresh driver, you can do even better :) [1] http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1- anatoly.bura...@intel.com/ -- Thanks, Anatoly For CPPC is defined in acpi v5.0+ spec, I reused most code in acpi_cpufreq to get a quick workable version on our platform with only cppc driver. I have verified its basic functions. If you find some problems please help to point out thus I can rework it. Thanks . Best Regards, Richael Well, pstate code was copied from ACPI so it does share the same flaws: - Lots of code duplication (e.g. snprintf for filename, fopen sequences, etc.) - Confusing and bug-prone error handling (e.g. return macros in the middle of a function) - Mixing power management logic and gory details of string handling Good examples of the above are in your `power_check_turbo()` function - lots of string handling code interspersed with file opens, and actual logic of power management. Please see the patch i linked earlier [1] to understand what kind of changes i'm suggesting. Perhaps you could do even better :) [1] http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1-anatoly.bura...@intel.com/ -- Thanks, Anatoly
Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq
> -Original Message- > From: Burakov, Anatoly > Sent: Thursday, April 22, 2021 6:00 PM > To: Richael Zhuang ; dev@dpdk.org > Cc: nd ; David Hunt > Subject: Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq > > On 22-Apr-21 10:29 AM, Richael Zhuang wrote: > > > > > >> -Original Message- > >> From: Burakov, Anatoly > >> Sent: Thursday, April 22, 2021 5:06 PM > >> To: Richael Zhuang ; dev@dpdk.org > >> Cc: nd ; David Hunt > >> Subject: Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc > >> cpufreq > >> > >> On 22-Apr-21 7:15 AM, Richael Zhuang wrote: > >>> Currently in DPDK only acpi_cpufreq and pstate_cpufreq drivers are > >>> supported, which are both not available on arm64 platforms. Add > >>> support for cppc_cpufreq driver which works on most arm64 platforms. > >>> > >>> Signed-off-by: Richael Zhuang > >>> --- > >> > >> Just a general note: this looks like a copy-paste of pstate code. > >> Which is perfectly fine, except that we can do better than copying > >> some faults of the pstate code to other drivers. I've submitted a > >> patch [1] attempting to fix some of the pressing issues and code > >> duplication in pstate driver, but i'm sure with a fresh driver, you > >> can do even better :) > >> > >> [1] > >> http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1- > >> anatoly.bura...@intel.com/ > >> > >> -- > >> Thanks, > >> Anatoly > > > > For CPPC is defined in acpi v5.0+ spec, I reused most code in acpi_cpufreq > to get a quick workable version on our platform with only cppc driver. I have > verified its basic functions. If you find some problems please help to point > out thus I can rework it. Thanks . > > > > Best Regards, > > Richael > > > > Well, pstate code was copied from ACPI so it does share the same flaws: > > - Lots of code duplication (e.g. snprintf for filename, fopen sequences, > etc.) > - Confusing and bug-prone error handling (e.g. return macros in the middle > of a function) > - Mixing power management logic and gory details of string handling > > Good examples of the above are in your `power_check_turbo()` function - > lots of string handling code interspersed with file opens, and actual logic of > power management. > > Please see the patch i linked earlier [1] to understand what kind of changes > i'm suggesting. Perhaps you could do even better :) > > [1] > http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1- > anatoly.bura...@intel.com/ > > -- > Thanks, > Anatoly Thanks. I'll rework it to make it look better. Best Regards, Richael
[dpdk-dev] [PATCH v1] net/ice: refactor input set fields for switch filter
Input set has been divided into inner and outer part to distinguish
different fields. However, the parse method of switch filter doesn't
match this update. Refactor switch filter to distingush inner and outer
input set in the same way as other filters. Clean ICE_INSET_TUN_* codes
since they are redundant.
Signed-off-by: Yuying Zhang
---
drivers/net/ice/ice_fdir_filter.c | 22 +-
drivers/net/ice/ice_generic_flow.h | 61 +--
drivers/net/ice/ice_switch_filter.c | 782
3 files changed, 355 insertions(+), 510 deletions(-)
diff --git a/drivers/net/ice/ice_fdir_filter.c
b/drivers/net/ice/ice_fdir_filter.c
index 3b8ea32b1a..ad2dc40815 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -72,7 +72,7 @@
#define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\
ICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \
- ICE_INSET_TUN_VXLAN_VNI)
+ ICE_INSET_VXLAN_VNI)
#define ICE_FDIR_INSET_IPV4_GTPU (\
ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)
@@ -893,17 +893,17 @@ ice_fdir_input_set_parse(uint64_t inset, enum
ice_flow_field *field)
{ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
{ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
{ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
- {ICE_INSET_TUN_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
- {ICE_INSET_TUN_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
- {ICE_INSET_TUN_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
- {ICE_INSET_TUN_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
- {ICE_INSET_TUN_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
- {ICE_INSET_TUN_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
- {ICE_INSET_TUN_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
- {ICE_INSET_TUN_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
+ {ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
+ {ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
+ {ICE_INSET_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
+ {ICE_INSET_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
+ {ICE_INSET_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
+ {ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
+ {ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
+ {ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
{ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID},
{ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI},
- {ICE_INSET_TUN_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
+ {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
};
for (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) {
@@ -1916,7 +1916,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter
*ad,
}
if (vxlan_mask->hdr.vx_vni)
- *input_set |= ICE_INSET_TUN_VXLAN_VNI;
+ *input_set |= ICE_INSET_VXLAN_VNI;
filter->input.vxlan_data.vni = vxlan_spec->hdr.vx_vni;
diff --git a/drivers/net/ice/ice_generic_flow.h
b/drivers/net/ice/ice_generic_flow.h
index a4d0b6671d..b7634b9662 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -92,64 +92,9 @@
/* tunnel */
-#define ICE_INSET_TUN_SMAC \
- (ICE_PROT_MAC | ICE_SMAC)
-#define ICE_INSET_TUN_DMAC \
- (ICE_PROT_MAC | ICE_DMAC)
-
-#define ICE_INSET_TUN_IPV4_SRC \
- (ICE_PROT_IPV4 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV4_DST \
- (ICE_PROT_IPV4 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV4_TTL \
- (ICE_PROT_IPV4 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV4_PROTO \
- (ICE_PROT_IPV4 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV4_TOS \
- (ICE_PROT_IPV4 | ICE_IP_TOS)
-#define ICE_INSET_TUN_IPV6_SRC \
- (ICE_PROT_IPV6 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV6_DST \
- (ICE_PROT_IPV6 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV6_HOP_LIMIT \
- (ICE_PROT_IPV6 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV6_NEXT_HDR \
- (ICE_PROT_IPV6 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV6_TC \
- (ICE_PROT_IPV6 | ICE_IP_TOS)
-
-#define ICE_INSET_TUN_TCP_SRC_PORT \
- (ICE_PROT_TCP | ICE_SPORT)
-#define ICE_INSET_TUN_TCP_DST_PORT \
- (ICE_PROT_TCP | ICE_DPORT)
-#define ICE_INSET_TUN_UDP_SRC_PORT \
- (ICE_PROT_UDP | ICE_SPORT)
-#define ICE_INSET_TUN_UDP_DST_PORT \
- (ICE_PROT_UDP | ICE_DPORT)
-#define ICE_INSET_TUN_SCTP_SRC_PORT \
- (ICE_PROT_SCTP | ICE_SPORT)
-#define ICE_INSET_TUN_SCTP_DST_PORT \
- (ICE_PROT_SCTP | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP4_SRC_PORT \
- (ICE_PROT_ICMP4 | ICE_SPORT)
-#define ICE_INSET_TUN_ICMP4_DST_PORT \
- (ICE_PROT_ICM
Re: [dpdk-dev] [PATCH 1/3] net/mlx5: fix unsupported offloads disablement
> Subject: [PATCH 1/3] net/mlx5: fix unsupported offloads disablement
>
> mlx5 offloads which are unsupported on Windows are currently disabled by
> checks with IBV/DV flags which are irrelevant to Windows.
>
> The checks are removed until they are fully available.
>
> Fixes: 93f4ece91a1f ("net/mlx5: spawn ethdev ports on Windows")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Tal Shnaiderman
> Acked-by: Matan Azrad
> ---
> drivers/net/mlx5/windows/mlx5_os.c | 15 +--
> 1 file changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/net/mlx5/windows/mlx5_os.c
> b/drivers/net/mlx5/windows/mlx5_os.c
> index 814063b5ce..5e53042b85 100644
> --- a/drivers/net/mlx5/windows/mlx5_os.c
> +++ b/drivers/net/mlx5/windows/mlx5_os.c
> @@ -359,11 +359,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
> config->swp = 0;
> config->ind_table_max_size =
> sh->device_attr.max_rwq_indirection_table_size;
> - if (RTE_CACHE_LINE_SIZE == 128 &&
> - !(device_attr.flags &
> MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP))
> - cqe_comp = 0;
> - else
> - cqe_comp = 1;
> + cqe_comp = 0;
> config->cqe_comp = cqe_comp;
> DRV_LOG(DEBUG, "tunnel offloading is not supported");
> config->tunnel_en = 0;
> @@ -424,8 +420,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
> err = mlx5_dev_check_sibling_config(priv, config);
> if (err)
> goto error;
> - config->hw_csum = !!(sh->device_attr.device_cap_flags_ex &
> - IBV_DEVICE_RAW_IP_CSUM);
> DRV_LOG(DEBUG, "checksum offloading is %ssupported",
> (config->hw_csum ? "" : "not "));
> DRV_LOG(DEBUG, "counters are not supported"); @@ -439,19
> +433,12 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
> config->ind_table_max_size = ETH_RSS_RETA_SIZE_512;
> DRV_LOG(DEBUG, "maximum Rx indirection table size is %u",
> config->ind_table_max_size);
> - config->hw_vlan_strip = !!(sh->device_attr.raw_packet_caps &
> -
> IBV_RAW_PACKET_CAP_CVLAN_STRIPPING);
> DRV_LOG(DEBUG, "VLAN stripping is %ssupported",
> (config->hw_vlan_strip ? "" : "not "));
> - config->hw_fcs_strip = !!(sh->device_attr.raw_packet_caps &
> - IBV_RAW_PACKET_CAP_SCATTER_FCS);
> if (config->hw_padding) {
> DRV_LOG(DEBUG, "Rx end alignment padding isn't
> supported");
> config->hw_padding = 0;
> }
> - config->tso = (sh->device_attr.max_tso > 0 &&
> - (sh->device_attr.tso_supported_qpts &
> -(1 << IBV_QPT_RAW_PACKET)));
> if (config->tso)
> config->tso_max_payload_sz = sh->device_attr.max_tso;
> DRV_LOG(DEBUG, "%sMPS is %s.",
> --
> 2.16.1.windows.4
Tested-by: Odi Assli
Re: [dpdk-dev] [PATCH 2/3] common/mlx5: read checksum capability from DevX
> Subject: [PATCH 2/3] common/mlx5: read checksum capability from DevX
>
> mlx5 in Windows needs the hca capability csum_cap to query the NIC for
> checksum offloading support
>
> Added the capability as part of the capabilities queried by the PMD using
> DevX.
>
> Signed-off-by: Tal Shnaiderman
> Acked-by: Matan Azrad
> ---
> drivers/common/mlx5/mlx5_devx_cmds.c | 2 ++
> drivers/common/mlx5/mlx5_devx_cmds.h | 1 +
> 2 files changed, 3 insertions(+)
>
> diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
> b/drivers/common/mlx5/mlx5_devx_cmds.c
> index 268bcd0d99..d2e4ab33a2 100644
> --- a/drivers/common/mlx5/mlx5_devx_cmds.c
> +++ b/drivers/common/mlx5/mlx5_devx_cmds.c
> @@ -837,6 +837,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
> hcattr = MLX5_ADDR_OF(query_hca_cap_out, out, capability);
> attr->wqe_vlan_insert =
> MLX5_GET(per_protocol_networking_offload_caps,
>hcattr, wqe_vlan_insert);
> + attr->csum_cap =
> MLX5_GET(per_protocol_networking_offload_caps,
> + hcattr, csum_cap);
> attr->lro_cap = MLX5_GET(per_protocol_networking_offload_caps,
> hcattr,
>lro_cap);
> attr->tunnel_lro_gre =
> MLX5_GET(per_protocol_networking_offload_caps,
> diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h
> b/drivers/common/mlx5/mlx5_devx_cmds.h
> index 67b5f771c6..1fb9130e51 100644
> --- a/drivers/common/mlx5/mlx5_devx_cmds.h
> +++ b/drivers/common/mlx5/mlx5_devx_cmds.h
> @@ -92,6 +92,7 @@ struct mlx5_hca_attr {
> uint32_t eth_net_offloads:1;
> uint32_t eth_virt:1;
> uint32_t wqe_vlan_insert:1;
> + uint32_t csum_cap:1;
> uint32_t wqe_inline_mode:2;
> uint32_t vport_inline_mode:3;
> uint32_t tunnel_stateless_geneve_rx:1;
> --
> 2.16.1.windows.4
Tested-by: Odi Assli
Re: [dpdk-dev] [PATCH 3/3] net/mlx5: support checksum offload on Windows
> Subject: [PATCH 3/3] net/mlx5: support checksum offload on Windows
>
> Support of the checksum offloading by checking the relevant FW capability
> (csum_cap) for NIC support.
>
> RX supported offloads:
>
> DEV_RX_OFFLOAD_IPV4_CKSUM
> DEV_RX_OFFLOAD_UDP_CKSUM
> DEV_RX_OFFLOAD_TCP_CKSUM
>
> TX supported offloads:
>
> DEV_TX_OFFLOAD_IPV4_CKSUM
> DEV_TX_OFFLOAD_UDP_CKSUM
> DEV_TX_OFFLOAD_TCP_CKSUM
>
> Signed-off-by: Tal Shnaiderman
> Acked-by: Matan Azrad
> ---
> drivers/net/mlx5/windows/mlx5_os.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/mlx5/windows/mlx5_os.c
> b/drivers/net/mlx5/windows/mlx5_os.c
> index 5e53042b85..3fe3f55f49 100644
> --- a/drivers/net/mlx5/windows/mlx5_os.c
> +++ b/drivers/net/mlx5/windows/mlx5_os.c
> @@ -420,8 +420,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
> err = mlx5_dev_check_sibling_config(priv, config);
> if (err)
> goto error;
> - DRV_LOG(DEBUG, "checksum offloading is %ssupported",
> - (config->hw_csum ? "" : "not "));
> DRV_LOG(DEBUG, "counters are not supported");
> config->ind_table_max_size =
> sh->device_attr.max_rwq_indirection_table_size;
> @@ -464,6 +462,9 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
> sh->cmng.relaxed_ordering_read =
> config->hca_attr.relaxed_ordering_read;
> }
> + config->hw_csum = config->hca_attr.csum_cap;
> + DRV_LOG(DEBUG, "checksum offloading is %ssupported",
> + (config->hw_csum ? "" : "not "));
> }
> if (config->devx) {
> uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
> --
> 2.16.1.windows.4
Tested-by: Odi Assli
Re: [dpdk-dev] [RFC PATCH] devtools: script to check meson indentation of lists
On 22-Apr-21 10:58 AM, Bruce Richardson wrote:
On Thu, Apr 22, 2021 at 10:40:37AM +0100, Burakov, Anatoly wrote:
On 22-Apr-21 10:02 AM, Bruce Richardson wrote:
This is a draft script developed when I was working on the whitespace rework
changes, since extended a little to attempt to fix some trailing comma issues.
Signed-off-by: Bruce Richardson
---
devtools/dpdk_meson_check.py | 106 +++
1 file changed, 106 insertions(+)
create mode 100755 devtools/dpdk_meson_check.py
diff --git a/devtools/dpdk_meson_check.py b/devtools/dpdk_meson_check.py
new file mode 100755
index 0..dc4c714ad
--- /dev/null
+++ b/devtools/dpdk_meson_check.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+'''
+A Python script to run some checks on meson.build files in DPDK
+'''
+
+import sys
+import os
+from os.path import relpath, join
+from argparse import ArgumentParser
+
+VERBOSE = False
+FIX = False
+
+def scan_dir(path):
+'''return meson.build files found in path'''
+for root, dirs, files in os.walk(path):
+if 'meson.build' in files:
+yield(relpath(join(root, 'meson.build')))
+
+
+def check_indentation(filename, contents):
+'''check that a list or files() is correctly indented'''
+infiles = False
+inlist = False
+edit_count = 0
+for lineno in range(len(contents)):
for lineno, line in enumerate(contents)
Yep, that's a good idea. Wasn't aware of enumerate. [Learn something new
every day, eh? :-)]
?
+line = contents[lineno].rstrip()
+if not line:
+continue
+if line.endswith('files('):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got "files(" when
already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got "files(" when
already parsing array list')
+infiles = True
+indent = 0
+while line[indent] == ' ':
+indent += 1
Here and in other places, if this is measuring length of indent, maybe do
something like:
indent = len(line) - len(line.lstrip(' '))
Yep, that is cleaner
?
+indent += 8 # double indent required
+elif line.endswith('= ['):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got start of array
when already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got start of array
when already parsing array list')
+inlist = True
+indent = 0
+while line[indent] == ' ':
+indent += 1
+indent += 8 # double indent required
+elif infiles and (line.endswith(')') or line.strip().startswith(')')):
It's kinda hard to read with all the endswith/startswith, maybe extract
those into a function? e.g. 'elif infiles and is_file_start(line)'
It is all a bit of a mess, yes, and needs cleaning up - which is why I
didn't previously send it with the patchset. Splitting into functions is
something I'll look at.
+infiles = False
+continue
+elif inlist and line.endswith(']') or line.strip().startswith(']'):
+inlist = False
+continue
+elif inlist or infiles:
+# skip further subarrays or lists
+if '[' in line or ']' in line:
+continue
I guess you could make it recursive instead of giving up? Does this happen
with any kind of regularity?
No, not that much, which is why I haven't explicitly tried to deal with it.
It would be good to support in future.
+if not line.startswith(' ' * indent) or line[indent] == ' ':
+print(f'Error: Incorrect indent at {filename}:{lineno + 1}')
+contents[lineno] = (' ' * indent) + line.strip() + '\n'
+line = contents[lineno].rstrip()
+edit_count += 1
+if not line.endswith(',') and '#' not in line:
+# TODO: support stripping comment and adding ','
+print(f'Error: Missing trailing "," in list at
{filename}:{lineno + 1}')
+contents[lineno] = line + ',\n'
+line = contents[lineno].rstrip()
What is the point of setting `line` here?
Because it allows us to make further checks using "line" as we add them
later.
The one question is whether it's worth using line as a shortcut for
contents[lineno] or not. I'd tend to keep it, as it also allows us not to
worry about the '\n' at the end. Then again, other rework might just change
the whole script to strip off all the '\n' post-read and add them back
again pre-write.
Again, further cleanup work.
Well, yes, i got that, it's just that as far as i can tell, the last
"line = ..." is at the end of the iteration, so there's no point in
setting it. Maybe i'm missing some
Re: [dpdk-dev] [PATCH] autotest: disable lcores_autotest on ppc
On Wed, 2021-04-21 at 17:06 +0200, Thomas Monjalon wrote: > 20/04/2021 13:45, luca.bocca...@gmail.com: > > This test consistently times out on ppc64 builds. Disable it. > > It looks like hiding an issue. > Is there any specific reason for this timeout? As mentioned in the message, there's nothing useful in the logs, it just times out. -- Kind regards, Luca Boccassi
Re: [dpdk-dev] [RFC PATCH] devtools: script to check meson indentation of lists
On Thu, Apr 22, 2021 at 11:21:26AM +0100, Burakov, Anatoly wrote:
> On 22-Apr-21 10:58 AM, Bruce Richardson wrote:
> > On Thu, Apr 22, 2021 at 10:40:37AM +0100, Burakov, Anatoly wrote:
> > > On 22-Apr-21 10:02 AM, Bruce Richardson wrote:
> > > > This is a draft script developed when I was working on the whitespace
> > > > rework
> > > > changes, since extended a little to attempt to fix some trailing comma
> > > > issues.
> > > >
> > > > Signed-off-by: Bruce Richardson
> > > > ---
> > > > +if not line.endswith(',') and '#' not in line:
> > > > +# TODO: support stripping comment and adding ','
> > > > +print(f'Error: Missing trailing "," in list at
> > > > {filename}:{lineno + 1}')
> > > > +contents[lineno] = line + ',\n'
> > > > +line = contents[lineno].rstrip()
> > >
> > > What is the point of setting `line` here?
> > >
> > Because it allows us to make further checks using "line" as we add them
> > later.
> > The one question is whether it's worth using line as a shortcut for
> > contents[lineno] or not. I'd tend to keep it, as it also allows us not to
> > worry about the '\n' at the end. Then again, other rework might just change
> > the whole script to strip off all the '\n' post-read and add them back
> > again pre-write.
> >
> > Again, further cleanup work.
>
> Well, yes, i got that, it's just that as far as i can tell, the last "line =
> ..." is at the end of the iteration, so there's no point in setting it.
> Maybe i'm missing something :)
No, you are not, and indeed it is at the very end. The fact it's there is
to make sure it's not forgotten when adding in new checks. It also allows
the checks to be reordered easier. Think of it like the trailing comma on a
list! :-)
> >
> > > > +edit_count += 1
> > > > +return edit_count
> > > > +
> > > > +
> > > > +def process_file(filename):
> > > > +'''run checks on file "filename"'''
> > > > +if VERBOSE:
> > > > +print(f'Processing {filename}')
> > > > +with open(filename) as f:
> > > > +contents = f.readlines()
> > >
> > > I guess meson build files don't get too big so it's OK to read the entire
> > > file in memory and then work on it, rather than go line by line...
> > >
> > This was a deliberate choice when starting the script. For now the script
> > only checks indentation and formatting of lists, but ideally in future it
> > should check other things, e.g. alphabetical order of lists, or formatting
> > of other parts. Rather than checking it all in one go, the script is
> > structured so that we can call multiple functions with "contents" each of
> > which does the processing without constantly re-reading and rewriting the
> > file. Something like sorting a list alphabetically also requires changing
> > multiple lines at a time, which is easier to do with lists that when
> > streaming input.
>
> Right, gotcha.
>
> >
> > > > +
> > > > +if check_indentation(filename, contents) > 0 and FIX:
> > > > +print(f"Fixing {filename}")
> > > > +with open(filename, 'w') as f:
> > > > +f.writelines(contents)
> > > > +
> > > > +
> > > > +def main():
> > > > +'''parse arguments and then call other functions to do work'''
> > > > +global VERBOSE
> > > > +global FIX
> > >
> > > Seems like globals are unnecessary here when you can just pass them into
> > > process_file?
> > >
> > Yes, they can just be passed, but I actually prefer to have those as
> > globals rather than having larger parameter lists. It's also possible that
> > e.g. verbose, should need to be passed through multiple levels of functions.
> > Personal preference, though really.
>
> Static analyzers (e.g. pylint) will complain about it, which is why i
> usually avoid those unless really necessary :) For something like "verbose",
> sure, one could argue that it's OK to have it as a global, but FIX is
> definitely something that could be a parameter, as you don't seem to use it
> anywhere other than in process_file(), nor would it seem likely that it will
> be used in the future.
>
Yep, agreed. Fix can be just a parameter. It may be that it's kept as a
global here is for consistency with verbose, but more likely it's just an
oversight on my part. I will change it to parameter instead in any next
revision.
/Bruce
Re: [dpdk-dev] [PATCH v7 0/4] net/mlx5: support meter policy operations
Hi,
> -Original Message-
> From: Li Zhang
> Sent: Wednesday, April 21, 2021 6:12 AM
> To: dek...@nvidia.com; Ori Kam ; Slava Ovsiienko
> ; Matan Azrad ; Shahaf
> Shuler
> Cc: dev@dpdk.org; NBU-Contact-Thomas Monjalon
> ; Raslan Darawsheh ; Roni
> Bar Yanai
> Subject: [PATCH v7 0/4] net/mlx5: support meter policy operations
>
> MLX5 PMD checks the validation of actions in policy while add
> a new meter policy, if pass the validation, allocates the new
> policy object from the meter policy indexed memory pool.
>
> It is common to use the same policy for multiple meters.
> MLX5 PMD supports two types of policy: termination policy and
> no-termination policy.
>
> The termination policy must have a fate action as in the policy
> actions, it can support QUEUE, RSS, PORT_ID, DROP, JUMP, MARK and
> SET_TAG
> actions if policy color is GREEN, also supports DROP action
> if policy color is RED.
>
> The no-termination policy uses policy ID 0 as default policy,
> it is created internal and cannot be changed by API. The default
> policy red action is drop, green action is jump to suffix table.
> Create this policy by policy API with green/yellow no action,
> red with drop action.
> One example in testpmd command:
> add port meter policy 0 g_actions end y_actions end r_actions drop / end
>
> Depends-on: series=16520 ("Add ASO meter support in MLX5 PMD ")
> https://patchwork.dpdk.org/project/dpdk/list/?series=16520
>
> Depends-on: series=16524 ("Support meter policy API ")
> https://patchwork.dpdk.org/project/dpdk/list/?series=16524
>
> v7:
> * Rebase.
> V6:
> * Fix comments about Depends-on.
> V5:
> * Fix comments about destory meter on different ports.
> V4:
> * Fix comments about rte_mtr_meter_policy_add.
> V3:
> * Fix comments about Depends-on.
> V2:
> * Add MLX5_MTR_DEFAULT_POLICY_ID in MLX5 PMD.
>
> Li Zhang (3):
> net/mlx5: support meter policy operations
> net/mlx5: support meter creation with policy
> net/mlx5: prepare sub-policy for a flow with meter
>
> Shun Hao (1):
> net/mlx5: connect meter policy to created flows
>
> doc/guides/nics/mlx5.rst | 12 +
> drivers/net/mlx5/linux/mlx5_os.c | 13 +-
> drivers/net/mlx5/mlx5.c| 77 +-
> drivers/net/mlx5/mlx5.h| 212 +++-
> drivers/net/mlx5/mlx5_flow.c | 654 --
> drivers/net/mlx5/mlx5_flow.h | 119 +-
> drivers/net/mlx5/mlx5_flow_aso.c | 10 +-
> drivers/net/mlx5/mlx5_flow_dv.c| 1896
> ++--
> drivers/net/mlx5/mlx5_flow_meter.c | 742 ++-
> drivers/net/mlx5/mlx5_trigger.c|1 +
> 10 files changed, 3373 insertions(+), 363 deletions(-)
>
> --
> 2.27.0
Series applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
Re: [dpdk-dev] [PATCH] autotest: disable lcores_autotest on ppc
22/04/2021 12:26, Luca Boccassi: > On Wed, 2021-04-21 at 17:06 +0200, Thomas Monjalon wrote: > > 20/04/2021 13:45, luca.bocca...@gmail.com: > > > This test consistently times out on ppc64 builds. Disable it. > > > > It looks like hiding an issue. > > Is there any specific reason for this timeout? > > As mentioned in the message, there's nothing useful in the logs, it > just times out. OK but it could be fixed probably instead of disabling.
Re: [dpdk-dev] [PATCH v2] mbuf: support eCPRI hardware packet type
> 20/04/2021 04:17, Liu, Lingyu: > > Hi Olivier, > > > > This new packet type will be used by iavf driver to map ECPRI hardware > packet. > > This is the patch which will use this new hardware packet type. > > http://patchwork.dpdk.org/project/dpdk/patch/20210420083817.10741-3- > li > > ngyu@intel.com/ > > I think it does not reply Olivier's question about how it will be used. > Why is it important to report this packet type in mbuf? > > PS: please do not top-post > In current implementation(w/o this patch), when receiving a eCPRI packet, testpmd prints like this: "port 2/queue 0: received 1 packets src=00:00:00:00:00:00 - dst=00:11:22:33:44:77 - type=0x0800 - length=60 - nb_segs=1 - hw ptype: L2_ETHER L3_IPV4_EXT_UNKNOWN L4_UDP - sw ptype: L2_ETHER L3_IPV4 L4_UDP - l2_len=14 - l3_len=20 - l4_len=8 - Receive queue=0x0 ol_flags: PKT_RX_L4_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_UNKNOWN" We can't know the hw ptype. After adding this patch, when receiving an eCPRI packet, testpmd can print like this: " port 1/queue 0: received 1 packets src=00:00:00:00:00:00 - dst=00:11:22:33:44:11 - type=0x0800 - length=60 - nb_segs=1 - hw ptype: L2_ETHER L3_IPV4_EXT_UNKNOWN L4_UDP TUNNEL_ECPRI - sw ptype: L2_ETHER L3_IPV4 L4_UDP - l2_len=14 - l3_len=20 - l4_len=8 - ECPRI packet: packet type =58001, Destination UDP port =20771 - Receive queue=0x0 ol_flags: PKT_RX_L4_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_UNKNOWN " Then apps can recognize the packet type using hw ptype. This supports more complete packet types and protocols. > > > > From: Olivier Matz > > > > > > Hi Lingyu, > > > > > > On Sat, Apr 17, 2021 at 09:25:31AM +, Lingyu Liu wrote: > > > > Add L2_ETHER_ECPRI and L4_UDP_TUNNEL_ECPRI in RTE_PTYPE. > > > > > > > > Signed-off-by: Lingyu Liu > > > > Acked-by: Hemant Agrawal > > > > > > The number of available packet types for tunnels is quite low > > > (already mentionned in this thread [1]). > > > > > > [1] > > > https://patches.dpdk.org/project/dpdk/patch/20210408081720.23314-3- > > > ktejas...@marvell.com > > > > > > Can you give some details about how it will be used? For instance, > > > which driver will set it, which kind of application will use it. > > > > > > Thanks, > > > Olivier > >
Re: [dpdk-dev] [PATCH v1] raw/ifpga: fix ifpga device name format
Hi,
> -Original Message-
> From: Huang, Wei
> Sent: Thursday, April 22, 2021 16:27
> To: dev@dpdk.org; Xu, Rosen ; Zhang, Qi Z
>
> Cc: sta...@dpdk.org; Zhang, Tianfei ; Yigit, Ferruh
> ; Huang, Wei
> Subject: [PATCH v1] raw/ifpga: fix ifpga device name format
>
> The device name format used in ifpga_rawdev_create() was changed to
> "IFPGA:%02x:%02x.%x", but the format used in ifpga_rawdev_destroy() was
> left as "IFPGA:%x:%02x.%x", it should be changed synchronously.
>
> Fixes: 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Wei Huang
> ---
> drivers/raw/ifpga/ifpga_rawdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c
> b/drivers/raw/ifpga/ifpga_rawdev.c
> index d9a46ef915..f591a87b49 100644
> --- a/drivers/raw/ifpga/ifpga_rawdev.c
> +++ b/drivers/raw/ifpga/ifpga_rawdev.c
> @@ -1551,7 +1551,7 @@ ifpga_rawdev_destroy(struct rte_pci_device
> *pci_dev)
> }
>
> memset(name, 0, sizeof(name));
> - snprintf(name, RTE_RAWDEV_NAME_MAX_LEN,
> "IFPGA:%x:%02x.%x",
> + snprintf(name, RTE_RAWDEV_NAME_MAX_LEN,
> "IFPGA:%02x:%02x.%x",
> pci_dev->addr.bus, pci_dev->addr.devid, pci_dev-
> >addr.function);
>
> IFPGA_RAWDEV_PMD_INFO("Closing %s on NUMA node %d",
> --
> 2.29.2
Acked-by: Rosen Xu
Re: [dpdk-dev] [PATCH] bpf: fix unreachable statement
> From: HongBo Zheng
>
> In function 'eval_jcc', judgment 'op == EBPF_JLT' occurs
> twice, as a result, the corresponding second statement
> cannot be accessed.
>
> This patch fix this problem.
>
> Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program")
> Cc: sta...@dpdk.org
>
> Signed-off-by: HongBo Zheng
> Signed-off-by: Min Hu (Connor)
> ---
> lib/librte_bpf/bpf_validate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
> index 9214f15..7b1291b 100644
> --- a/lib/librte_bpf/bpf_validate.c
> +++ b/lib/librte_bpf/bpf_validate.c
> @@ -1115,7 +1115,7 @@ eval_jcc(struct bpf_verifier *bvf, const struct
> ebpf_insn *ins)
> eval_jsgt_jsle(trd, trs, frd, frs);
> else if (op == EBPF_JSLE)
> eval_jsgt_jsle(frd, frs, trd, trs);
> - else if (op == EBPF_JLT)
> + else if (op == EBPF_JSLT)
> eval_jslt_jsge(trd, trs, frd, frs);
> else if (op == EBPF_JSGE)
> eval_jslt_jsge(frd, frs, trd, trs);
> --
Acked-by: Konstantin Ananyev
> 2.7.4
[dpdk-dev] [PATCH 0/2] bugfix for tap device
This patchset contains two bugfixes for tap device. Chengchang Tang (2): net/tap: fix log loss when state fails to be restored net/tap: fix tap interrupt vector array size drivers/net/tap/rte_eth_tap.c | 6 +- drivers/net/tap/tap_intr.c| 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 1/2] net/tap: fix log loss when state fails to be restored
From: Chengchang Tang
After restoring the remote states, the return value of ioctl() is not
checked. Therefore, users cannot know whether the remote state is
restored successfully.
This patch add log for restoring failure.
Fixes: 4810d3af8343 ("net/tap: restore state of remote device when closing")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
---
drivers/net/tap/rte_eth_tap.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 68baa18..6007c78 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -1101,6 +1101,7 @@ tap_dev_close(struct rte_eth_dev *dev)
struct pmd_internals *internals = dev->data->dev_private;
struct pmd_process_private *process_private = dev->process_private;
struct rx_queue *rxq;
+ int ret;
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
rte_free(dev->process_private);
@@ -1133,8 +1134,11 @@ tap_dev_close(struct rte_eth_dev *dev)
if (internals->remote_if_index) {
/* Restore initial remote state */
- ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
+ ret = ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
&internals->remote_initial_flags);
+ if (ret)
+ TAP_LOG(ERR, "restore remote state failed: %d", ret);
+
}
rte_mempool_free(internals->gso_ctx_mp);
--
2.7.4
[dpdk-dev] [PATCH 2/2] net/tap: fix tap interrupt vector array size
From: Chengchang Tang
The size of the current interrupt vector array is fixed to an integer.
This patch will create an interrupt vector array based on the number
of rxqs.
Fixes: 4870a8cdd968 ("net/tap: support Rx interrupt")
Cc: sta...@dpdk.org
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
---
drivers/net/tap/tap_intr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c
index 5cf4f17..1cacc15 100644
--- a/drivers/net/tap/tap_intr.c
+++ b/drivers/net/tap/tap_intr.c
@@ -59,7 +59,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev)
if (!dev->data->dev_conf.intr_conf.rxq)
return 0;
- intr_handle->intr_vec = malloc(sizeof(intr_handle->intr_vec[rxqs_n]));
+ intr_handle->intr_vec = malloc(sizeof(int) * rxqs_n);
if (intr_handle->intr_vec == NULL) {
rte_errno = ENOMEM;
TAP_LOG(ERR,
--
2.7.4
Re: [dpdk-dev] [PATCH] bpf: delete meaningless code
>
> 在 2021/4/21 19:43, Ananyev, Konstantin 写道:
> >>
> >> 'rd->u.max = rd->u.max' is meaningless which should be deleted.
> >>
> >> This patch fixed it.
> >>
> >> Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program")
> >> Cc: sta...@dpdk.org
> >
> > As I remember, I did it on purpose.
> > Some old (but still supported) version of clang complained
> > about unitialized variable.
>
> Well, how about like this ?
> uint64_t tmp = rd->u.max;
> if (op == BPF_MOD)
> tmp = RTE_MIN(tmp, tmp - 1);
> rd->u.max = tmp;
Then, I think it should be:
tmp = RTE_MIN(tmp, rs->u.max - 1);
Or just leave things as they are right now.
Nothing is broken here.
> >
> >> Signed-off-by: Min Hu (Connor)
> >> ---
> >> lib/librte_bpf/bpf_validate.c | 2 --
> >> 1 file changed, 2 deletions(-)
> >>
> >> diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
> >> index 9214f15..c5ad951 100644
> >> --- a/lib/librte_bpf/bpf_validate.c
> >> +++ b/lib/librte_bpf/bpf_validate.c
> >> @@ -517,8 +517,6 @@ eval_divmod(uint32_t op, struct bpf_reg_val *rd,
> >> struct bpf_reg_val *rs,
> >>} else {
> >>if (op == BPF_MOD)
> >>rd->u.max = RTE_MIN(rd->u.max, rs->u.max - 1);
> >> - else
> >> - rd->u.max = rd->u.max;
> >>rd->u.min = 0;
> >>}
> >>
> >> --
> >> 2.7.4
> >
> > .
> >
Re: [dpdk-dev] [PATCH] bpf: delete meaningless code
在 2021/4/22 19:29, Ananyev, Konstantin 写道:
在 2021/4/21 19:43, Ananyev, Konstantin 写道:
'rd->u.max = rd->u.max' is meaningless which should be deleted.
This patch fixed it.
Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program")
Cc: sta...@dpdk.org
As I remember, I did it on purpose.
Some old (but still supported) version of clang complained
about unitialized variable.
Well, how about like this ?
uint64_t tmp = rd->u.max;
if (op == BPF_MOD)
tmp = RTE_MIN(tmp, tmp - 1);
rd->u.max = tmp;
Then, I think it should be:
tmp = RTE_MIN(tmp, rs->u.max - 1);
Or just leave things as they are right now.
Nothing is broken here.
OK, this patch can be abandoned ,thanks.
Signed-off-by: Min Hu (Connor)
---
lib/librte_bpf/bpf_validate.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 9214f15..c5ad951 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -517,8 +517,6 @@ eval_divmod(uint32_t op, struct bpf_reg_val *rd, struct
bpf_reg_val *rs,
} else {
if (op == BPF_MOD)
rd->u.max = RTE_MIN(rd->u.max, rs->u.max - 1);
- else
- rd->u.max = rd->u.max;
rd->u.min = 0;
}
--
2.7.4
.
.
Re: [dpdk-dev] [PATCH] drivers/net: fix FW version get
> -Original Message-
> From: Yigit, Ferruh
> Sent: Thursday, April 22, 2021 00:21
> To: Igor Russkikh ; Pavel Belous
> ; Somalapuram
> Amaranath ; Ajit Khaparde ;
> Somnath Kotur
> ; Hemant Agrawal ; Sachin
> Saxena
> ; Guo, Jia ; Wang, Haiyue
> ; Daley,
> John ; Hyong Youb Kim ; Min Hu
> (Connor) ;
> Yisen Zhuang ; Lijun Ou ; Xing,
> Beilei
> ; Yang, Qiming ; Zhang, Qi Z
> ;
> Andrew Boyer ; Jerin Jacob ; Nithin
> Dabilpuram
> ; Kiran Kumar K ; Rasesh
> Mody ;
> Devendra Singh Rawat ; Andrew Rybchenko
> ;
> Jiawen Wu ; Jian Wang ;
> Thomas Monjalon
> ; Selwin Sebastian ; Remy
> Horton
> ; Chunsong Feng ; Huisong Li
> ;
> Hao Chen ; Wei Hu (Xavier) ;
> Wu, Jingjing
> ; Lu, Wenzhuo ; Li, Xiaoyun
> ; Zhang,
> AlvinX ; Shannon Nelson ;
> Alfredo Cardigliano
> ; Vamsi Attunuru ; Yash Sharma
> ;
> Ivan Malov ; Andrew Lee
> Cc: Yigit, Ferruh ; dev@dpdk.org; sta...@dpdk.org
> Subject: [PATCH] drivers/net: fix FW version get
>
> Fixes a few different things:
> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
> zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
> in ethdev layer
> * Be sure required buffer size is returned if provided one is not big
> enough, instead of returning success (0)
> * Document in doxygen comment the '-EINVAL' is a valid return type
> * Take into account that 'snprintf' can return negative value
> * Cast length to 'size_t' to compare it with 'fw_size'
>
> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version get")
> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
> Fixes: 293430677e9c ("net/enic: add handler to return firmware version")
> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
> Fixes: f97b56f9f12e ("net/qede: support FW version query")
> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
> Fixes: 21913471202f ("ethdev: add firmware version get")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
> ---
> Cc: pavel.bel...@aquantia.com
> Cc: selwin.sebast...@amd.com
> Cc: hemant.agra...@nxp.com
> Cc: qiming.y...@intel.com
> Cc: hyon...@cisco.com
> Cc: xavier.hu...@huawei.com
> Cc: wenzhuo...@intel.com
> Cc: alvinx.zh...@intel.com
> Cc: cardigli...@ntop.org
> Cc: vattun...@marvell.com
> Cc: rm...@marvell.com
> Cc: ivan.ma...@oktetlabs.ru
> Cc: jiawe...@trustnetic.com
> ---
> drivers/net/atlantic/atl_ethdev.c | 7 ---
> drivers/net/axgbe/axgbe_rxtx.c | 4
> drivers/net/bnxt/bnxt_ethdev.c | 4 +++-
> drivers/net/dpaa/dpaa_ethdev.c | 6 --
> drivers/net/dpaa2/dpaa2_ethdev.c| 4 +++-
> drivers/net/e1000/igb_ethdev.c | 4 +++-
> drivers/net/enic/enic_ethdev.c | 15 ++-
> drivers/net/hns3/hns3_ethdev.c | 5 -
> drivers/net/hns3/hns3_ethdev_vf.c | 5 -
> drivers/net/i40e/i40e_ethdev.c | 4 +++-
> drivers/net/ice/ice_ethdev.c| 4 +++-
> drivers/net/igc/igc_ethdev.c| 4 +++-
> drivers/net/ionic/ionic_ethdev.c| 15 +--
> drivers/net/ixgbe/ixgbe_ethdev.c| 4 +++-
> drivers/net/octeontx2/otx2_ethdev_ops.c | 2 +-
> drivers/net/qede/qede_ethdev.c | 3 ---
> drivers/net/sfc/sfc_ethdev.c| 8
> drivers/net/txgbe/txgbe_ethdev.c| 4 +++-
> lib/librte_ethdev/rte_ethdev.h | 1 +
> 19 files changed, 61 insertions(+), 42 deletions(-)
>
For e1000/igc/ixgbe
Acked-by: Haiyue Wang
> --
> 2.30.2
[dpdk-dev] [PATCH 0/2] bugfix for graph
This patchset contains two bugfixes for graph. HongBo Zheng (2): graph: fix memory leak graph: fix dereferencing null pointer lib/librte_graph/graph_stats.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 2/2] graph: fix dereferencing null pointer
From: HongBo Zheng
In function 'stats_mem_init', pointer 'stats' should
be confirmed not null before memset it.
Fixes: af1ae8b6a32c ("graph: implement stats")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
lib/librte_graph/graph_stats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_graph/graph_stats.c b/lib/librte_graph/graph_stats.c
index f698bb3..bdc8652 100644
--- a/lib/librte_graph/graph_stats.c
+++ b/lib/librte_graph/graph_stats.c
@@ -119,8 +119,8 @@ stats_mem_init(struct cluster *cluster,
cluster_node_size = RTE_ALIGN(cluster_node_size, RTE_CACHE_LINE_SIZE);
stats = realloc(NULL, sz);
- memset(stats, 0, sz);
if (stats) {
+ memset(stats, 0, sz);
stats->fn = fn;
stats->cluster_node_size = cluster_node_size;
stats->max_nodes = 0;
--
2.7.4
[dpdk-dev] [PATCH 1/2] graph: fix memory leak
From: HongBo Zheng
Fix function 'stats_mem_populate' return without
free dynamic memory referenced by 'stats'.
Fixes: af1ae8b6a32c ("graph: implement stats")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
lib/librte_graph/graph_stats.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/librte_graph/graph_stats.c b/lib/librte_graph/graph_stats.c
index 125e08d..f698bb3 100644
--- a/lib/librte_graph/graph_stats.c
+++ b/lib/librte_graph/graph_stats.c
@@ -174,7 +174,7 @@ stats_mem_populate(struct rte_graph_cluster_stats
**stats_in,
cluster->stat.hz = rte_get_timer_hz();
node = graph_node_id_to_ptr(graph, id);
if (node == NULL)
- SET_ERR_JMP(ENOENT, err, "Failed to find node %s in graph %s",
+ SET_ERR_JMP(ENOENT, free, "Failed to find node %s in graph %s",
graph_node->node->name, graph->name);
cluster->nodes[cluster->nb_nodes++] = node;
@@ -183,6 +183,8 @@ stats_mem_populate(struct rte_graph_cluster_stats
**stats_in,
*stats_in = stats;
return 0;
+free:
+ free(stats);
err:
return -rte_errno;
}
--
2.7.4
Re: [dpdk-dev] [PATCH] autotest: disable lcores_autotest on ppc
On Thu, 2021-04-22 at 13:01 +0200, Thomas Monjalon wrote: > 22/04/2021 12:26, Luca Boccassi: > > On Wed, 2021-04-21 at 17:06 +0200, Thomas Monjalon wrote: > > > 20/04/2021 13:45, luca.bocca...@gmail.com: > > > > This test consistently times out on ppc64 builds. Disable it. > > > > > > It looks like hiding an issue. > > > Is there any specific reason for this timeout? > > > > As mentioned in the message, there's nothing useful in the logs, it > > just times out. > > OK but it could be fixed probably instead of disabling. I'm sure it could, and it would be great if somebody would do so - but I do not have either the time or the hardware to take care of PPC-specific problems, apart from the bare minimum to remove blockers to get things done for Debian 11. -- Kind regards, Luca Boccassi
Re: [dpdk-dev] [PATCH] autotest: disable lcores_autotest on ppc
22/04/2021 14:36, Luca Boccassi: > On Thu, 2021-04-22 at 13:01 +0200, Thomas Monjalon wrote: > > 22/04/2021 12:26, Luca Boccassi: > > > On Wed, 2021-04-21 at 17:06 +0200, Thomas Monjalon wrote: > > > > 20/04/2021 13:45, luca.bocca...@gmail.com: > > > > > This test consistently times out on ppc64 builds. Disable it. > > > > > > > > It looks like hiding an issue. > > > > Is there any specific reason for this timeout? > > > > > > As mentioned in the message, there's nothing useful in the logs, it > > > just times out. > > > > OK but it could be fixed probably instead of disabling. > > I'm sure it could, and it would be great if somebody would do so - but > I do not have either the time or the hardware to take care of > PPC-specific problems, apart from the bare minimum to remove blockers > to get things done for Debian 11. First things first, let's Cc the PPC maintainer: David Christensen
[dpdk-dev] [PATCH v17 0/8] aarch64 -> aarch32 cross compilation support
Add support for aarch32 cross build in meson and add aarch64 -> aarch32 cross build to Travis. Aarch32 is an execution state that allows execution of 32-bit code on armv8 machines. This execution state contains a superset of previous armv7 32-bit instructions and features. Thus the aarch32 build is distinct from arvm7 build. v4: Removed disabled drivers which actually build on arm32. Also tested the patchset with series 9609 which fixes underlying failures. v5: Changed the condition for running test-null.sh in ci. Re-uploaded after underlying fixes have been committed. v6: Changed the condition for running test-null.sh again. Reworked the patch to do aarch32 build instead of arvm7-a build. Simplified meson build flags. Changed commit msgs. Added 32b qualifier to .travis.yml. Added a patch with fixes for bnxt. Added a patch with cross compilation docs. v7: Rebased the patchset. v8: Removed Makefile additions from net/bnxt patch. v9: Changed ci test-null.sh condition, only run it if not cross-compiling aarch64 nor aarch32. Cleaned up docs. v10: Fixed doc: add aarch32 build guidance commit message. v11: Rebase and fix scf and bnxt after rebase. v12: Dropped one superfluous net/bnxt patch. v13: Rebased and fixed net/virtio build by removing NEON for aarch32. v14: Fixed docs build. v15: Rebased. v16: Updated arm CPU flags. v17: Fixed build condition in 1/8, updated 4/8. Acked-by: Aaron Conole Juraj Linkeš (5): net/virtio: fix aarch32 build eal/arm: update CPU flags build: add aarch32 meson build flags build: add aarch32 to meson cross-compilation ci: add aarch64 -> aarch32 cross compiling jobs Phil Yang (1): doc: add aarch32 build guidance Ruifeng Wang (2): net/sfc: fix aarch32 build net/bnxt: fix aarch32 build .ci/linux-build.sh| 7 +++- .travis.yml | 19 ++ config/arm/arm32_armv8a_linux_gcc | 17 + config/arm/meson.build| 32 +--- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 38 +++ drivers/common/sfc_efx/meson.build| 2 +- drivers/net/bnxt/meson.build | 2 +- drivers/net/sfc/meson.build | 2 +- drivers/net/virtio/meson.build| 2 +- lib/eal/arm/include/rte_cpuflags_32.h | 1 + lib/eal/arm/rte_cpuflags.c| 10 - 11 files changed, 113 insertions(+), 19 deletions(-) create mode 100644 config/arm/arm32_armv8a_linux_gcc -- 2.20.1
[dpdk-dev] [PATCH v17 1/8] net/sfc: fix aarch32 build
From: Ruifeng Wang
The sfc PMD was enabled for aarch32 which is 32-bit mode but has
cpu_family set to aarch64.
As sfc support only 64-bit system, it should be disabled for aarch32.
Updated meson file to disable sfc for aarch32 build.
Fixes: 141d2870675a ("net/sfc: support aarch64 architecture")
Cc: arybche...@solarflare.com
Cc: sta...@dpdk.org
Signed-off-by: Ruifeng Wang
---
drivers/common/sfc_efx/meson.build | 2 +-
drivers/net/sfc/meson.build| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/common/sfc_efx/meson.build
b/drivers/common/sfc_efx/meson.build
index d87ba396b4..2d14186ecd 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -10,7 +10,7 @@ if is_windows
reason = 'not supported on Windows'
endif
-if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir
!= 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+if (arch_subdir != 'x86' and arch_subdir != 'arm') or (not
dpdk_conf.get('RTE_ARCH_64'))
build = false
reason = 'only supported on x86_64 and aarch64'
endif
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index b58425bf99..619d1e3b7d 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -12,7 +12,7 @@ if is_windows
subdir_done()
endif
-if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir
!= 'arm' or not host_machine.cpu_family().startswith('aarch64'))
+if (arch_subdir != 'x86' and arch_subdir != 'arm') or (not
dpdk_conf.get('RTE_ARCH_64'))
build = false
reason = 'only supported on x86_64 and aarch64'
endif
--
2.20.1
[dpdk-dev] [PATCH v17 2/8] net/bnxt: fix aarch32 build
From: Ruifeng Wang
NEON vector path of the PMD needs aarch64 support. But it was
enabled for aarch32 build as well because aarch32 build had
cpu_family set to aarch64. So build for aarch32 will fail due
to unsupported intrinsics.
Fix aarch32 build by updating meson file to exclude NEON vector
implementation for aarch32.
Fixes: 398358341419 ("net/bnxt: support NEON")
Cc: lance.richard...@broadcom.com
Cc: sta...@dpdk.org
Signed-off-by: Ruifeng Wang
Reviewed-by: Lance Richardson
---
drivers/net/bnxt/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 117c753489..5a72989915 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -82,6 +82,6 @@ sources = files(
if arch_subdir == 'x86'
sources += files('bnxt_rxtx_vec_sse.c')
-elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
+elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
sources += files('bnxt_rxtx_vec_neon.c')
endif
--
2.20.1
[dpdk-dev] [PATCH v17 3/8] net/virtio: fix aarch32 build
NEON vector path of the PMD needs aarch64 support. But it was
enabled for aarch32 build as well because aarch32 build had
cpu_family set to aarch64. So build for aarch32 will fail due
to unsupported intrinsics.
Fix aarch32 build by updating meson file to exclude NEON vector
implementation for aarch32.
Fixes: 749799482a72 ("net/virtio: add to meson build")
Cc: bruce.richard...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Juraj Linkeš
Reviewed-by: Maxime Coquelin
---
drivers/net/virtio/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index 81b0a61baf..01a333ada2 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -41,7 +41,7 @@ if arch_subdir == 'x86'
sources += files('virtio_rxtx_simple_sse.c')
elif arch_subdir == 'ppc'
sources += files('virtio_rxtx_simple_altivec.c')
-elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
+elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
sources += files('virtio_rxtx_packed.c')
sources += files('virtio_rxtx_simple_neon.c')
endif
--
2.20.1
[dpdk-dev] [PATCH v17 4/8] eal/arm: update CPU flags
There are two execution states on armv8 architecture, aarch64 and
aarch32. Add PLATFORM_STR for the latter and update RTE_ARCH_* flags
according to e9b97392640.
Signed-off-by: Juraj Linkeš
---
lib/eal/arm/include/rte_cpuflags_32.h | 1 +
lib/eal/arm/rte_cpuflags.c| 10 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/lib/eal/arm/include/rte_cpuflags_32.h
b/lib/eal/arm/include/rte_cpuflags_32.h
index b5347be1ec..4e254428a2 100644
--- a/lib/eal/arm/include/rte_cpuflags_32.h
+++ b/lib/eal/arm/include/rte_cpuflags_32.h
@@ -41,6 +41,7 @@ enum rte_cpu_flag_t {
RTE_CPUFLAG_SHA2,
RTE_CPUFLAG_CRC32,
RTE_CPUFLAG_V7L,
+ RTE_CPUFLAG_V8L,
/* The last item */
RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
};
diff --git a/lib/eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c
index e3a53bcece..9e5b68b066 100644
--- a/lib/eal/arm/rte_cpuflags.c
+++ b/lib/eal/arm/rte_cpuflags.c
@@ -46,8 +46,12 @@ struct feature_entry {
#define FEAT_DEF(name, reg, bit) \
[RTE_CPUFLAG_##name] = {reg, bit, #name},
+#ifdef RTE_ARCH_32
#ifdef RTE_ARCH_ARMv7
#define PLATFORM_STR "v7l"
+#elif defined RTE_ARCH_ARMv8_AARCH32
+#define PLATFORM_STR "v8l"
+#endif
typedef Elf32_auxv_t _Elfx_auxv_t;
const struct feature_entry rte_cpu_feature_table[] = {
@@ -78,10 +82,14 @@ const struct feature_entry rte_cpu_feature_table[] = {
FEAT_DEF(SHA1, REG_HWCAP2, 2)
FEAT_DEF(SHA2, REG_HWCAP2, 3)
FEAT_DEF(CRC32, REG_HWCAP2, 4)
+ #ifdef RTE_ARCH_ARMv7
FEAT_DEF(V7L, REG_PLATFORM, 0)
+ #elif defined RTE_ARCH_ARMv8_AARCH32
+ FEAT_DEF(V8L, REG_PLATFORM, 0)
+ #endif
};
-#elif defined RTE_ARCH_ARM64
+#elif defined RTE_ARCH_64
#define PLATFORM_STR "aarch64"
typedef Elf64_auxv_t _Elfx_auxv_t;
--
2.20.1
[dpdk-dev] [PATCH v17 5/8] build: add aarch32 meson build flags
Add aarch32 extra build flags and aarch32 machine flags to generic
machine args.
Also modify how arm flags are updated in meson build - for 32-bit build,
update only if cross-compiling.
Signed-off-by: Juraj Linkeš
Acked-by: Ruifeng Wang
---
config/arm/meson.build | 32 ++--
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 22cd81319c..f0da1b8cb9 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -67,7 +67,15 @@ part_number_config_arm = {
['RTE_MAX_LCORE', 64],
['RTE_MAX_NUMA_NODES', 1]
]
-}
+},
+'aarch32': {
+'machine_args': ['-march=armv8-a',
+ '-mfpu=neon'],
+'flags': [
+['RTE_ARCH_ARM_NEON_MEMCPY', false],
+['RTE_ARCH_STRICT_ALIGN', true],
+['RTE_ARCH_ARMv8_AARCH32', true]
+]}
}
implementer_arm = {
'description': 'Arm',
@@ -342,14 +350,25 @@ socs = {
dpdk_conf.set('RTE_ARCH_ARM', 1)
dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
+update_flags = false
+soc_flags = []
if dpdk_conf.get('RTE_ARCH_32')
-# armv7 build
+# 32-bit build
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
-dpdk_conf.set('RTE_ARCH_ARMv7', 1)
-# the minimum architecture supported, armv7-a, needs the following,
-machine_args += '-mfpu=neon'
+if meson.is_cross_build()
+update_flags = true
+implementer_id = meson.get_cross_property('implementer_id')
+part_number = meson.get_cross_property('part_number')
+flags_common = []
+else
+# armv7 build
+dpdk_conf.set('RTE_ARCH_ARMv7', true)
+# the minimum architecture supported, armv7-a, needs the following,
+machine_args += '-mfpu=neon'
+endif
else
# aarch64 build
+update_flags = true
soc = get_option('platform')
soc_config = {}
if not meson.is_cross_build()
@@ -386,7 +405,6 @@ else
soc_config = socs.get(soc, {'not_supported': true})
endif
-soc_flags = []
if soc_config.has_key('not_supported')
error('SoC @0@ not supported.'.format(soc))
elif soc_config != {}
@@ -401,7 +419,9 @@ else
disable_drivers += ',' + soc_config.get('disable_drivers', '')
enable_drivers += ',' + soc_config.get('enable_drivers', '')
endif
+endif
+if update_flags
if implementers.has_key(implementer_id)
implementer_config = implementers[implementer_id]
else
--
2.20.1
[dpdk-dev] [PATCH v17 6/8] build: add aarch32 to meson cross-compilation
Create meson cross file arm32_armv8a_linux_gcc. Use arm-linux-gnueabihf- toolset which comes with standard packages on most used systems, such as Ubuntu and CentOS. Signed-off-by: Juraj Linkeš Acked-by: Ruifeng Wang --- config/arm/arm32_armv8a_linux_gcc | 17 + 1 file changed, 17 insertions(+) create mode 100644 config/arm/arm32_armv8a_linux_gcc diff --git a/config/arm/arm32_armv8a_linux_gcc b/config/arm/arm32_armv8a_linux_gcc new file mode 100644 index 00..6299d5c887 --- /dev/null +++ b/config/arm/arm32_armv8a_linux_gcc @@ -0,0 +1,17 @@ +[binaries] +c = 'arm-linux-gnueabihf-gcc' +cpp = 'arm-linux-gnueabihf-cpp' +ar = 'arm-linux-gnueabihf-gcc-ar' +strip = 'arm-linux-gnueabihf-strip' +pkgconfig = 'arm-linux-gnueabihf-pkg-config' +pcap-config = '' + +[host_machine] +system = 'linux' +cpu_family = 'aarch32' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementer_id = '0x41' +part_number = 'aarch32' -- 2.20.1
[dpdk-dev] [PATCH v17 7/8] ci: add aarch64 -> aarch32 cross compiling jobs
Add two jobs (static and shared libs), both building on aarch64 and producing 32-bit arm binaries executable on armv8-a, but not armv7. Do not run tests in these jobs. Signed-off-by: Juraj Linkeš Reviewed-by: Ruifeng Wang Acked-by: Aaron Conole --- .ci/linux-build.sh | 7 ++- .travis.yml| 19 +++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 91e43a975b..73a9c234ca 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -62,6 +62,11 @@ if [ "$AARCH64" = "true" ]; then fi fi +if [ "$AARCH32" = "true" ]; then +# convert the arch specifier +OPTS="$OPTS --cross-file config/arm/arm32_armv8a_linux_gcc" +fi + if [ "$BUILD_DOCS" = "true" ]; then OPTS="$OPTS -Denable_docs=true" fi @@ -84,7 +89,7 @@ OPTS="$OPTS -Dcheck_includes=true" meson build --werror $OPTS ninja -C build -if [ "$AARCH64" != "true" ]; then +if [ "$AARCH64" != "true" ] && [ "$AARCH32" != "true" ]; then failed= configure_coredump devtools/test-null.sh || failed="true" diff --git a/.travis.yml b/.travis.yml index 898cffd998..bb94221d08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,10 @@ _aarch64_clang_packages: &aarch64_clang_packages - *required_packages - [libgcc-7-dev-arm64-cross, libatomic1-arm64-cross, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu] +_arm_32b_packages: &arm_32b_packages + - *required_packages + - [gcc-arm-linux-gnueabihf, libc6-dev-armhf-cross, pkg-config-arm-linux-gnueabihf] + _libabigail_build_packages: &libabigail_build_packages - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev] @@ -168,3 +172,18 @@ jobs: virt: vm group: edge compiler: clang + # aarch64 cross-compiling aarch32 jobs + - env: DEF_LIB="shared" AARCH32=true +arch: arm64 +compiler: gcc +addons: + apt: +packages: + - *arm_32b_packages + - env: DEF_LIB="static" AARCH32=true +arch: arm64 +compiler: gcc +addons: + apt: +packages: + - *arm_32b_packages -- 2.20.1
[dpdk-dev] [PATCH v17 8/8] doc: add aarch32 build guidance
From: Phil Yang Add cross-compiling guidance for 32-bit aarch32 DPDK on aarch64 host. Signed-off-by: Phil Yang Acked-by: Ruifeng Wang Acked-by: Aaron Conole --- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 38 +++ 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index 3857cdefe9..df10383aa8 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -1,15 +1,16 @@ .. SPDX-License-Identifier: BSD-3-Clause -Copyright(c) 2020 ARM Corporation. +Copyright(c) 2021 ARM Corporation. -Cross compiling DPDK for ARM64 -== -This chapter describes how to cross compile DPDK for ARM64 from x86 build hosts. +Cross compile DPDK for aarch64 and aarch32 +== +This chapter describes how to cross compile DPDK for aarch64 on x86 build +machines and compile 32-bit aarch32 DPDK on aarch64 build machines. .. note:: - Whilst it is recommended to natively build DPDK on ARM64 (just - like with x86), it is also possible to cross compile DPDK for ARM64. - An ARM64 cross compiler GNU toolchain or an LLVM/clang toolchain + Whilst it is recommended to natively build DPDK on aarch64 (just + like with x86), it is also possible to cross compile DPDK for aarch64. + An aarch64 cross compiler GNU toolchain or an LLVM/clang toolchain may be used for cross-compilation. @@ -54,6 +55,11 @@ To install it in Ubuntu:: sudo apt install pkg-config-aarch64-linux-gnu +For aarch32, install ``pkg-config-arm-linux-gnueabihf``:: + + sudo apt install pkg-config-arm-linux-gnueabihf + + GNU toolchain - @@ -72,16 +78,30 @@ the following description is an example of this version. .. code-block:: console + # aarch64 binaries wget https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz +.. code-block:: console + + # aarch32 binaries + wget https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz + + Unzip and add into the PATH ~~~ .. code-block:: console + # aarch64 tar -xvf gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz export PATH=$PATH:/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu/bin +.. code-block:: console + + # aarch32 + tar -xvf gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz + export PATH=$PATH:/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf/bin + .. note:: For the host requirements and other info, refer to the release note section: https://releases.linaro.org/components/toolchain/binaries/ @@ -118,6 +138,10 @@ command:: meson aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc ninja -C aarch64-build-gcc +If the target machine is aarch32 we can use the following command:: + + meson aarch32-build --cross-file config/arm/arm32_armv8a_linux_gcc + ninja -C aarch32-build LLVM/Clang toolchain -- 2.20.1
Re: [dpdk-dev] [PATCH 1/2] net/i40e: fix veb index negative was not checked
> -Original Message- > From: dev On Behalf Of Min Hu (Connor) > Sent: Wednesday, April 21, 2021 10:33 AM > To: dev@dpdk.org > Cc: Yigit, Ferruh ; Xing, Beilei > ; > Guo, Jia > Subject: [dpdk-dev] [PATCH 1/2] net/i40e: fix veb index negative was not > checked > > From: Chengwen Feng > > This patch adds checking for veb index negative when parsing veb list. > > Fixes: 79f2248219c0 (net/i40e: add floating VEB option) > Cc: sta...@dpdk.org > > Signed-off-by: Chengwen Feng > Signed-off-by: Min Hu (Connor) Acked-by: Qi Zhang Applied to dpdk-next-net-intel. Thanks Qi
Re: [dpdk-dev] [PATCH 2/2] net/i40e: remove redundant judgment
> -Original Message-
> From: dev On Behalf Of Min Hu (Connor)
> Sent: Wednesday, April 21, 2021 10:33 AM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh ; Xing, Beilei
> ;
> Guo, Jia
> Subject: [dpdk-dev] [PATCH 2/2] net/i40e: remove redundant judgment
>
> From: Chengwen Feng
>
> The vsi pointer is always valid, so it no need to judge it's validity.
>
> Fixes: b6583ee40265 ("i40e: full VMDQ pools support")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Chengwen Feng
> Signed-off-by: Min Hu (Connor)
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
[dpdk-dev] [Bug 684] lcores_autotest consistently times out on ppc64el
https://bugs.dpdk.org/show_bug.cgi?id=684 Bug ID: 684 Summary: lcores_autotest consistently times out on ppc64el Product: DPDK Version: 20.11 Hardware: POWER OS: Linux Status: UNCONFIRMED Severity: normal Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: luca.bocca...@gmail.com Target Milestone: --- No useful error message with verbose logging, it just times out after 30s. Works fine on other architectures. Example: https://ci.debian.net/data/autopkgtest/unstable/ppc64el/d/dpdk/11755163/log.gz -- You are receiving this mail because: You are the assignee for the bug.
Re: [dpdk-dev] [PATCH] autotest: disable lcores_autotest on ppc
On Thu, 2021-04-22 at 14:43 +0200, Thomas Monjalon wrote: > 22/04/2021 14:36, Luca Boccassi: > > On Thu, 2021-04-22 at 13:01 +0200, Thomas Monjalon wrote: > > > 22/04/2021 12:26, Luca Boccassi: > > > > On Wed, 2021-04-21 at 17:06 +0200, Thomas Monjalon wrote: > > > > > 20/04/2021 13:45, luca.bocca...@gmail.com: > > > > > > This test consistently times out on ppc64 builds. Disable it. > > > > > > > > > > It looks like hiding an issue. > > > > > Is there any specific reason for this timeout? > > > > > > > > As mentioned in the message, there's nothing useful in the logs, it > > > > just times out. > > > > > > OK but it could be fixed probably instead of disabling. > > > > I'm sure it could, and it would be great if somebody would do so - but > > I do not have either the time or the hardware to take care of > > PPC-specific problems, apart from the bare minimum to remove blockers > > to get things done for Debian 11. > > First things first, let's Cc the PPC maintainer: > David Christensen https://bugs.dpdk.org/show_bug.cgi?id=684 -- Kind regards, Luca Boccassi
[dpdk-dev] [Bug 685] ring_autotest consistently crashes with SIGBUS on armhf/armv7
https://bugs.dpdk.org/show_bug.cgi?id=685 Bug ID: 685 Summary: ring_autotest consistently crashes with SIGBUS on armhf/armv7 Product: DPDK Version: 20.11 Hardware: ARM OS: Linux Status: UNCONFIRMED Severity: normal Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: luca.bocca...@gmail.com Target Milestone: --- ring_autotest consistently crashes with SIGBUS when running on Debian armhf (armv7). This is running in a container, without root privileges, and without hugepages - as part of the fast suite. There is no useful log message with verbose debugging. Example: https://ci.debian.net/data/autopkgtest/testing/armhf/d/dpdk/11831498/log.gz -- You are receiving this mail because: You are the assignee for the bug.
[dpdk-dev] [PATCH v1 1/4] test/power: fix check for cpu frequency
Different drivers present the current cpu core frequency in different
sysfs iles. Some present it in cpuinfo_cur_freq, some in scaling_cur_freq,
and some actually present it in both.
This patch attempts to open one, if that fails, tries the other.
Fixes: d550a8cc31f3 ("app/test: enhance power manager unit tests")
Cc: sta...@dpdk.org
Signed-off-by: David Hunt
---
app/test/test_power_cpufreq.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index f753d24ac5..52f58ef8b2 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -39,8 +39,10 @@ test_power_caps(void)
#define TEST_FREQ_ROUNDING_DELTA 5
#define TEST_ROUND_FREQ_TO_N_10 10
-#define TEST_POWER_SYSFILE_CUR_FREQ \
+#define TEST_POWER_SYSFILE_CPUINFO_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"
+#define TEST_POWER_SYSFILE_SCALING_FREQ \
+ "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq"
static uint32_t total_freq_num;
static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
@@ -58,12 +60,19 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
int i;
if (snprintf(fullpath, sizeof(fullpath),
- TEST_POWER_SYSFILE_CUR_FREQ, lcore_id) < 0) {
+ TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
return 0;
}
f = fopen(fullpath, "r");
if (f == NULL) {
- return 0;
+ if (snprintf(fullpath, sizeof(fullpath),
+ TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
+ return 0;
+ }
+ f = fopen(fullpath, "r");
+ if (f == NULL) {
+ return 0;
+ }
}
for (i = 0; i < MAX_LOOP; i++) {
fflush(f);
--
2.17.1
[dpdk-dev] [PATCH v1 3/4] test/power: fix low freq test when turbo enabled
With the intel_pstate driver and turbo enabled, indexing is slightly
different to normal, so to get the test to work properly, enable
turbo at the start.
Fixes: ed7c51a6a680 ("app/test: vm power management")
Cc: sta...@dpdk.org
Signed-off-by: David Hunt
---
app/test/test_power_cpufreq.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 33a68cf645..e2be807318 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -249,6 +249,8 @@ check_power_freq_down(void)
{
int ret;
+ rte_power_freq_enable_turbo(TEST_POWER_LCORE_ID);
+
/* test with an invalid lcore id */
ret = rte_power_freq_down(TEST_POWER_LCORE_INVALID);
if (ret >= 0) {
--
2.17.1
[dpdk-dev] [PATCH v1 2/4] test/power: add turbo mode to freq check function
With the intel_pstate driver and turbo enabled, the top frequency in
the frequency array is the P1+1, i.e. 231, whereas the frequency
shown in scaling_cur_freq could be a lot higher.
This patch adds a flag to the check_cur_freq function so that we can
specify if a frequency is greater than expected (turbo mode), in which
case the check should be successful.
Fixes: aeaeaf5f2d62 ("test/power: add cases for turbo feature")
Cc: sta...@dpdk.org
Signed-off-by: David Hunt
---
app/test/test_power_cpufreq.c | 27 +++
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 52f58ef8b2..33a68cf645 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -48,7 +48,7 @@ static uint32_t total_freq_num;
static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
static int
-check_cur_freq(unsigned lcore_id, uint32_t idx)
+check_cur_freq(unsigned int lcore_id, uint32_t idx, int turbo)
{
#define TEST_POWER_CONVERT_TO_DECIMAL 10
#define MAX_LOOP 100
@@ -90,7 +90,10 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
/ TEST_ROUND_FREQ_TO_N_10;
freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_10;
- ret = (freqs[idx] == freq_conv ? 0 : -1);
+ if (turbo)
+ ret = (freqs[idx] <= freq_conv ? 0 : -1);
+ else
+ ret = (freqs[idx] == freq_conv ? 0 : -1);
if (ret == 0)
break;
@@ -183,7 +186,7 @@ check_power_get_freq(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, count);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, count, 0);
if (ret < 0)
return -1;
@@ -233,7 +236,7 @@ check_power_set_freq(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, 0);
if (ret < 0)
return -1;
@@ -269,7 +272,7 @@ check_power_freq_down(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, 0);
if (ret < 0)
return -1;
@@ -288,7 +291,7 @@ check_power_freq_down(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, 1);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, 0);
if (ret < 0)
return -1;
@@ -324,7 +327,7 @@ check_power_freq_up(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 2);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 2, 0);
if (ret < 0)
return -1;
@@ -343,7 +346,7 @@ check_power_freq_up(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, 1);
if (ret < 0)
return -1;
@@ -371,7 +374,7 @@ check_power_freq_max(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, 1);
if (ret < 0)
return -1;
@@ -399,7 +402,7 @@ check_power_freq_min(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, 0);
if (ret < 0)
return -1;
@@ -433,7 +436,7 @@ check_power_turbo(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, 1);
if (ret < 0)
return -1;
@@ -452,7 +455,7 @@ check_power_turbo(void)
}
/* Check the current frequency */
- ret = check_cur_freq(TEST_POWER_LCORE_ID, 1);
+ ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, 0);
if (ret < 0)
return -1;
--
2.17.1
[dpdk-dev] [PATCH v1 4/4] test/power: fix turbo test
when turbo is enabled or disabled, the frequency is set to a low non-turbo
frequency, so we need to set to the frequency expected by the test before
checking.
Fixes: aeaeaf5f2d62 ("test/power: add cases for turbo feature")
Cc: sta...@dpdk.org
Signed-off-by: David Hunt
---
app/test/test_power_cpufreq.c | 12
1 file changed, 12 insertions(+)
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index e2be807318..ceffebc428 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -436,6 +436,12 @@ check_power_turbo(void)
TEST_POWER_LCORE_ID);
return -1;
}
+ ret = rte_power_freq_max(TEST_POWER_LCORE_ID);
+ if (ret < 0) {
+ printf("Fail to scale up the freq to max on lcore %u\n",
+ TEST_POWER_LCORE_ID);
+ return -1;
+ }
/* Check the current frequency */
ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, 1);
@@ -455,6 +461,12 @@ check_power_turbo(void)
TEST_POWER_LCORE_ID);
return -1;
}
+ ret = rte_power_freq_max(TEST_POWER_LCORE_ID);
+ if (ret < 0) {
+ printf("Fail to scale up the freq to max on lcore %u\n",
+ TEST_POWER_LCORE_ID);
+ return -1;
+ }
/* Check the current frequency */
ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, 0);
--
2.17.1
[dpdk-dev] DPDK Release Status Meeting 22/04/2021
Release status meeting minutes {Date}
=
:Date: 22 April 2021
:toc:
.Agenda:
* Release Dates
* -rc1 status
* Subtrees
* LTS
* Opens
.Participants:
* Arm
* Broadcom
* Debian/Microsoft
* Intel
* Individual contributor(s)
* Marvell
* Nvidia
* Red Hat
Release Dates
-
* `v21.05` dates
- -rc1 is released on Wednesday, 21 April
** http://inbox.dpdk.org/dev/4984397.K2Fab8RJsf@thomas/
- -rc2: Wednesday, 5 May
- Release:Friday, 14 May
* 1-5 May is Labor Day holiday in PRC.
rc1 status
--
* -rc1 released yesterday, not enough testing done yet
* Initial Intel testing did not found any major or blocking issue
Subtrees
* main
- mbuf eCPRI there is no enough review
** will miss this release
- ioat driver updates, postponed to -rc2
- There is Windows build issue, will fix it
- Will improve log registration
** Some work already done/merge, will try to add more in this release
- There is a patch that batch renamed some folders
** https://git.dpdk.org/dpdk/commit/?id=99a2dd955fba
** Please be aware of the change, this will break some git blame output
- The indentation of meson files changed
** https://git.dpdk.org/dpdk/commit/?id=6fc406593ac1
** Maintainers should be careful on this change
* next-net
- majority of the ethdev patches are merged
** the mutex update for the multi-process left, discussions going on
** testpmd multi-process patch not merged, may be postponed to next release
- driver/testpmd patches and fixes for -rc2
* next-crypto
- Ciara's patch can waiting for new version
- Two PMDs for -rc2
** mlx5 crypto PMD
** NXP baseband PMD
* next-eventdev
- Patches merged for -rc1, dlb and CNXK eventdev driver for -rc2
- For dlb2, waiting for techboard decision on rename
* next-virtio
- Remaining patches will be considered for -rc2
* next-net-brcm
- Majority of the patches made the -rc1, not much for -rc2
* next-net-intel
- A base code updated expected for -rc2
- There are more fixes and driver updated in the backlog
* next-net-mlx
- All planned features are merged for -rc1
- There will be some more features for -rc2
** Some are already in the mail list
* next-net-mrvl
- CNXK net driver will be merged on -rc2
LTS
---
* `v19.11.8` is released
-
http://inbox.dpdk.org/dev/20210416094441.1315964-1-christian.ehrha...@canonical.com/
* `v20.11` (next version is `v20.11.2`)
- Not much update at this stage
Opens
-
* There is a better to way to include the code into documentation
-
https://patches.dpdk.org/project/dpdk/patch/20210421091146.1384708-1-conor.wa...@intel.com/
- We should use this method instead of copy/paste code into doc
- It would be nice to have a generic cleanup on existing documentation
* There are some new Bugzilla defect for build issues
- Kevin submitted Bugzilla defects for it
- Reproduces on Fedora 34 (which will be released soon)
- Wide range of compiler versions are supported
** Because large variety of OS versions are supported
* There is a new security team member, working on security issues can continue
after he ramped up
.DPDK Release Status Meetings
*
The DPDK Release Status Meeting is intended for DPDK Committers to discuss the
status of the master tree and sub-trees, and for project managers to track
progress or milestone dates.
The meeting occurs on every Thursdays at 8:30 UTC. on https://meet.jit.si/DPDK
If you wish to attend just send an email to
"John McNamara " for the invite.
*
[dpdk-dev] [21.08 PATCH v3 1/1] power: refactor pstate sysfs handling
Currently, pstate sysfs handling code is a bit of an unmaintainable
mess, which has contributed to various errors leading to bugs. Refactor
the code in a way that makes it more maintainable and less error prone.
Signed-off-by: Anatoly Burakov
---
lib/power/meson.build| 7 +
lib/power/power_pstate_cpufreq.c | 357 ---
2 files changed, 191 insertions(+), 173 deletions(-)
diff --git a/lib/power/meson.build b/lib/power/meson.build
index a2cc9fe2ef..85324d48d2 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -5,6 +5,13 @@ if not is_linux
build = false
reason = 'only supported on Linux'
endif
+
+# we do some snprintf magic so silence format-nonliteral
+flag_nonliteral = '-Wno-format-nonliteral'
+if cc.has_argument(flag_nonliteral)
+ cflags += flag_nonliteral
+endif
+
sources = files(
'guest_channel.c',
'power_acpi_cpufreq.c',
diff --git a/lib/power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c
index 2cfc54acf3..4357ac4920 100644
--- a/lib/power/power_pstate_cpufreq.c
+++ b/lib/power/power_pstate_cpufreq.c
@@ -37,6 +37,13 @@
} \
} while (0)
+#define FOPEN_OR_ERR_GOTO(f, label) do { \
+ if ((f) == NULL) { \
+ RTE_LOG(ERR, POWER, "File not opened\n"); \
+ goto label; \
+ } \
+} while (0)
+
#define FOPS_OR_NULL_GOTO(ret, label) do { \
if ((ret) == NULL) { \
RTE_LOG(ERR, POWER, "fgets returns nothing\n"); \
@@ -148,97 +155,145 @@ out: close(fd);
return ret;
}
+static int
+open_core_sysfs_file(const char *template, unsigned int core, const char *mode,
+ FILE **f)
+{
+ char fullpath[PATH_MAX];
+ FILE *tmpf;
+
+ /* silenced -Wformat-nonliteral here */
+ snprintf(fullpath, sizeof(fullpath), template, core);
+ tmpf = fopen(fullpath, mode);
+ if (tmpf == NULL)
+ return -1;
+ *f = tmpf;
+
+ return 0;
+}
+
+static int
+read_core_sysfs_u32(FILE *f, uint32_t *val)
+{
+ char buf[BUFSIZ];
+ uint32_t fval;
+ char *s;
+
+ s = fgets(buf, sizeof(buf), f);
+ if (s == NULL)
+ return -1;
+
+ /* fgets puts null terminator in, but do this just in case */
+ buf[BUFSIZ - 1] = '\0';
+
+ /* strip off any terminating newlines */
+ *strchrnul(buf, '\n') = '\0';
+
+ fval = strtoul(buf, NULL, POWER_CONVERT_TO_DECIMAL);
+
+ /* write the value */
+ *val = fval;
+
+ return 0;
+}
+
+static int
+read_core_sysfs_s(FILE *f, char *buf, unsigned int len)
+{
+ char *s;
+
+ s = fgets(buf, len, f);
+ if (s == NULL)
+ return -1;
+
+ /* fgets puts null terminator in, but do this just in case */
+ buf[len - 1] = '\0';
+
+ /* strip off any terminating newlines */
+ *strchrnul(buf, '\n') = '\0';
+
+ return 0;
+}
+
+static int
+write_core_sysfs_s(FILE *f, const char *str)
+{
+ int ret;
+
+ ret = fseek(f, 0, SEEK_SET);
+ if (ret != 0)
+ return -1;
+
+ ret = fputs(str, f);
+ if (ret != 0)
+ return -1;
+
+ /* flush the output */
+ ret = fflush(f);
+ if (ret != 0)
+ return -1;
+
+ return 0;
+}
+
/**
* It is to fopen the sys file for the future setting the lcore frequency.
*/
static int
power_init_for_setting_freq(struct pstate_power_info *pi)
{
- FILE *f_min, *f_max, *f_base = NULL, *f_base_max;
- char fullpath_min[PATH_MAX];
- char fullpath_max[PATH_MAX];
- char fullpath_base[PATH_MAX];
- char fullpath_base_max[PATH_MAX];
- char buf_base[BUFSIZ];
- char *s_base;
- char *s_base_max;
- uint32_t base_ratio = 0;
- uint32_t base_max_ratio = 0;
- uint64_t max_non_turbo = 0;
- int ret_val = 0;
-
- snprintf(fullpath_base_max,
- sizeof(fullpath_base_max),
- POWER_SYSFILE_BASE_MAX_FREQ,
- pi->lcore_id);
- f_base_max = fopen(fullpath_base_max, "r");
- FOPEN_OR_ERR_RET(f_base_max, -1);
- if (f_base_max != NULL) {
- s_base_max = fgets(buf_base, sizeof(buf_base), f_base_max);
-
- /* close the file unconditionally */
- fclose(f_base_max);
- f_base_max = NULL;
-
- FOPS_OR_NULL_GOTO(s_base_max, out);
-
- buf_base[BUFSIZ-1] = '\0';
- if (strlen(buf_base))
- /* Strip off terminating '\n' */
- strtok(buf_base, "\n");
-
- base_max_ratio =
- strtoul(buf_base, NULL, POWER_CONVERT_TO_DECIMAL)
- / BUS_FREQ;
- }
-
- snprintf(fullpath_min, sizeof(fullpath_min), POWER_SYSFILE_MIN_FREQ,
- pi->lcore_id);
- f_min
Re: [dpdk-dev] [PATCH] baseband/turbo_sw: fix dereference of null
> -Original Message-
> From: Min Hu (Connor)
> Sent: Thursday, April 22, 2021 2:25 AM
>
> Return value of a function 'rte_malloc' is dereferenced without checking,
> and may result in segmetation fault.
>
> This patch fixed it.
>
> Fixes: 31a7853d1ed9 ("baseband/turbo_sw: support large size code block")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Min Hu (Connor)
Acked-by: Nicolas Chautru
> ---
> app/test-bbdev/test_bbdev_perf.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-
> bbdev/test_bbdev_perf.c
> index 45b85b9..f94e2a9 100644
> --- a/app/test-bbdev/test_bbdev_perf.c
> +++ b/app/test-bbdev/test_bbdev_perf.c
> @@ -957,6 +957,9 @@ init_op_data_objs(struct rte_bbdev_op_data *bufs,
> if ((op_type == DATA_INPUT) && large_input) {
> /* Allocate a fake overused mbuf */
> data = rte_malloc(NULL, seg->length, 0);
> + TEST_ASSERT_NOT_NULL(data,
> + "rte malloc failed with %u bytes",
> + seg->length);
> memcpy(data, seg->addr, seg->length);
> m_head->buf_addr = data;
> m_head->buf_iova =
> rte_malloc_virt2iova(data);
> --
> 2.7.4
Re: [dpdk-dev] [PATCH 2/2] net/tap: fix tap interrupt vector array size
On Thu, 22 Apr 2021 19:27:14 +0800 "Min Hu (Connor)" wrote: > diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c > index 5cf4f17..1cacc15 100644 > --- a/drivers/net/tap/tap_intr.c > +++ b/drivers/net/tap/tap_intr.c > @@ -59,7 +59,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev) > > if (!dev->data->dev_conf.intr_conf.rxq) > return 0; > - intr_handle->intr_vec = malloc(sizeof(intr_handle->intr_vec[rxqs_n])); > + intr_handle->intr_vec = malloc(sizeof(int) * rxqs_n); Maybe calloc() here would be good idea?
Re: [dpdk-dev] [PATCH v1 2/4] test/power: add turbo mode to freq check function
On 22-Apr-21 3:40 PM, David Hunt wrote:
With the intel_pstate driver and turbo enabled, the top frequency in
the frequency array is the P1+1, i.e. 231, whereas the frequency
shown in scaling_cur_freq could be a lot higher.
This patch adds a flag to the check_cur_freq function so that we can
specify if a frequency is greater than expected (turbo mode), in which
case the check should be successful.
Fixes: aeaeaf5f2d62 ("test/power: add cases for turbo feature")
Cc: sta...@dpdk.org
Signed-off-by: David Hunt
---
app/test/test_power_cpufreq.c | 27 +++
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 52f58ef8b2..33a68cf645 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -48,7 +48,7 @@ static uint32_t total_freq_num;
static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
static int
-check_cur_freq(unsigned lcore_id, uint32_t idx)
+check_cur_freq(unsigned int lcore_id, uint32_t idx, int turbo)
Nitpicking, but stdbool exists :) it would be nice to use bool type for
bool variables, not int.
--
Thanks,
Anatoly
Re: [dpdk-dev] [EXT] [PATCH] drivers/net: fix FW version get
> From: Ferruh Yigit
> Sent: Wednesday, April 21, 2021 9:51 PM
>
> Fixes a few different things:
> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
> zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
> in ethdev layer
> * Be sure required buffer size is returned if provided one is not big
> enough, instead of returning success (0)
> * Document in doxygen comment the '-EINVAL' is a valid return type
> * Take into account that 'snprintf' can return negative value
> * Cast length to 'size_t' to compare it with 'fw_size'
>
> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version get")
> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
> Fixes: 293430677e9c ("net/enic: add handler to return firmware version")
> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
> Fixes: f97b56f9f12e ("net/qede: support FW version query")
> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
> Fixes: 21913471202f ("ethdev: add firmware version get")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
> ---
For qede, thanks ferruh.
Acked-by: Rasesh Mody
> Cc: pavel.bel...@aquantia.com
> Cc: selwin.sebast...@amd.com
> Cc: hemant.agra...@nxp.com
> Cc: qiming.y...@intel.com
> Cc: hyon...@cisco.com
> Cc: xavier.hu...@huawei.com
> Cc: wenzhuo...@intel.com
> Cc: alvinx.zh...@intel.com
> Cc: cardigli...@ntop.org
> Cc: vattun...@marvell.com
> Cc: rm...@marvell.com
> Cc: ivan.ma...@oktetlabs.ru
> Cc: jiawe...@trustnetic.com
> ---
> drivers/net/atlantic/atl_ethdev.c | 7 ---
> drivers/net/axgbe/axgbe_rxtx.c | 4
> drivers/net/bnxt/bnxt_ethdev.c | 4 +++-
> drivers/net/dpaa/dpaa_ethdev.c | 6 --
> drivers/net/dpaa2/dpaa2_ethdev.c| 4 +++-
> drivers/net/e1000/igb_ethdev.c | 4 +++-
> drivers/net/enic/enic_ethdev.c | 15 ++-
> drivers/net/hns3/hns3_ethdev.c | 5 -
> drivers/net/hns3/hns3_ethdev_vf.c | 5 -
> drivers/net/i40e/i40e_ethdev.c | 4 +++-
> drivers/net/ice/ice_ethdev.c| 4 +++-
> drivers/net/igc/igc_ethdev.c| 4 +++-
> drivers/net/ionic/ionic_ethdev.c| 15 +--
> drivers/net/ixgbe/ixgbe_ethdev.c| 4 +++-
> drivers/net/octeontx2/otx2_ethdev_ops.c | 2 +-
> drivers/net/qede/qede_ethdev.c | 3 ---
> drivers/net/sfc/sfc_ethdev.c| 8
> drivers/net/txgbe/txgbe_ethdev.c| 4 +++-
> lib/librte_ethdev/rte_ethdev.h | 1 +
> 19 files changed, 61 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/net/atlantic/atl_ethdev.c
> b/drivers/net/atlantic/atl_ethdev.c
> index 473f6209f6aa..ce7f814f255d 100644
> --- a/drivers/net/atlantic/atl_ethdev.c
> +++ b/drivers/net/atlantic/atl_ethdev.c
> @@ -1073,7 +1073,7 @@ atl_fw_version_get(struct rte_eth_dev *dev, char
> *fw_version, size_t fw_size) {
> struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> uint32_t fw_ver = 0;
> - unsigned int ret = 0;
> + int ret = 0;
>
> ret = hw_atl_utils_get_fw_version(hw, &fw_ver);
> if (ret)
> @@ -1081,10 +1081,11 @@ atl_fw_version_get(struct rte_eth_dev *dev,
> char *fw_version, size_t fw_size)
>
> ret = snprintf(fw_version, fw_size, "%u.%u.%u", fw_ver >> 24,
> (fw_ver >> 16) & 0xFFU, fw_ver & 0xU);
> + if (ret < 0)
> + return -EINVAL;
>
> ret += 1; /* add string null-terminator */
> -
> - if (fw_size < ret)
> + if (fw_size < (size_t)ret)
> return ret;
>
> return 0;
> diff --git a/drivers/net/axgbe/axgbe_rxtx.c
> b/drivers/net/axgbe/axgbe_rxtx.c index e34bb6d448fc..33f709a6bb02
> 100644
> --- a/drivers/net/axgbe/axgbe_rxtx.c
> +++ b/drivers/net/axgbe/axgbe_rxtx.c
> @@ -623,9 +623,6 @@ int axgbe_dev_fw_version_get(struct rte_eth_dev
> *eth_dev,
> pdata = (struct axgbe_port *)eth_dev->data->dev_private;
> hw_feat = &pdata->hw_feat;
>
> - if (fw_version == NULL)
> - return -EINVAL;
> -
> ret = snprintf(fw_version, fw_size, "%d.%d.%d",
> AXGMAC_GET_BITS(hw_feat->version, MAC_VR,
> US
Re: [dpdk-dev] [PATCH v3 2/2] lib/mempool: distinguish debug counters from cache and pool
Hi Olivier,
Thank you for your comments!
> On Apr 21, 2021, at 11:29 AM, Olivier Matz wrote:
>
> Hi Dharmik,
>
> Please see some comments below.
>
> On Mon, Apr 19, 2021 at 07:08:00PM -0500, Dharmik Thakkar wrote:
>> From: Joyce Kong
>>
>> If cache is enabled, objects will be retrieved/put from/to cache,
>> subsequently from/to the common pool. Now the debug stats calculate
>> the objects retrieved/put from/to cache and pool together, it is
>> better to distinguish them.
>>
>> Signed-off-by: Joyce Kong
>> Signed-off-by: Dharmik Thakkar
>> Reviewed-by: Ruifeng Wang
>> Reviewed-by: Honnappa Nagarahalli
>> ---
>> lib/librte_mempool/rte_mempool.c | 24
>> lib/librte_mempool/rte_mempool.h | 47 ++--
>> 2 files changed, 57 insertions(+), 14 deletions(-)
>>
>> diff --git a/lib/librte_mempool/rte_mempool.c
>> b/lib/librte_mempool/rte_mempool.c
>> index afb1239c8d48..339f14455624 100644
>> --- a/lib/librte_mempool/rte_mempool.c
>> +++ b/lib/librte_mempool/rte_mempool.c
>> @@ -1244,6 +1244,18 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
>> for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
>> sum.put_bulk += mp->stats[lcore_id].put_bulk;
>> sum.put_objs += mp->stats[lcore_id].put_objs;
>> +sum.put_common_pool_bulk +=
>> +mp->stats[lcore_id].put_common_pool_bulk;
>> +sum.put_common_pool_objs +=
>> +mp->stats[lcore_id].put_common_pool_objs;
>> +sum.put_cache_bulk += mp->stats[lcore_id].put_cache_bulk;
>> +sum.put_cache_objs += mp->stats[lcore_id].put_cache_objs;
>> +sum.get_common_pool_bulk +=
>> +mp->stats[lcore_id].get_common_pool_bulk;
>> +sum.get_common_pool_objs +=
>> +mp->stats[lcore_id].get_common_pool_objs;
>> +sum.get_cache_bulk += mp->stats[lcore_id].get_cache_bulk;
>> +sum.get_cache_objs += mp->stats[lcore_id].get_cache_objs;
>> sum.get_success_bulk += mp->stats[lcore_id].get_success_bulk;
>> sum.get_success_objs += mp->stats[lcore_id].get_success_objs;
>> sum.get_fail_bulk += mp->stats[lcore_id].get_fail_bulk;
>> @@ -1254,6 +1266,18 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
>> fprintf(f, " stats:\n");
>> fprintf(f, "put_bulk=%"PRIu64"\n", sum.put_bulk);
>> fprintf(f, "put_objs=%"PRIu64"\n", sum.put_objs);
>> +fprintf(f, "put_common_pool_bulk=%"PRIu64"\n",
>> +sum.put_common_pool_bulk);
>> +fprintf(f, "put_common_pool_objs=%"PRIu64"\n",
>> +sum.put_common_pool_objs);
>> +fprintf(f, "put_cache_bulk=%"PRIu64"\n", sum.put_cache_bulk);
>> +fprintf(f, "put_cache_objs=%"PRIu64"\n", sum.put_cache_objs);
>> +fprintf(f, "get_common_pool_bulk=%"PRIu64"\n",
>> +sum.get_common_pool_bulk);
>> +fprintf(f, "get_common_pool_objs=%"PRIu64"\n",
>> +sum.get_common_pool_objs);
>> +fprintf(f, "get_cache_bulk=%"PRIu64"\n", sum.get_cache_bulk);
>> +fprintf(f, "get_cache_objs=%"PRIu64"\n", sum.get_cache_objs);
>> fprintf(f, "get_success_bulk=%"PRIu64"\n", sum.get_success_bulk);
>> fprintf(f, "get_success_objs=%"PRIu64"\n", sum.get_success_objs);
>> fprintf(f, "get_fail_bulk=%"PRIu64"\n", sum.get_fail_bulk);
>> diff --git a/lib/librte_mempool/rte_mempool.h
>> b/lib/librte_mempool/rte_mempool.h
>> index 848a19226149..0959f8a3f367 100644
>> --- a/lib/librte_mempool/rte_mempool.h
>> +++ b/lib/librte_mempool/rte_mempool.h
>> @@ -66,12 +66,20 @@ extern "C" {
>> * A structure that stores the mempool statistics (per-lcore).
>> */
>> struct rte_mempool_debug_stats {
>> -uint64_t put_bulk; /**< Number of puts. */
>> -uint64_t put_objs; /**< Number of objects successfully put. */
>> -uint64_t get_success_bulk; /**< Successful allocation number. */
>> -uint64_t get_success_objs; /**< Objects successfully allocated. */
>> -uint64_t get_fail_bulk;/**< Failed allocation number. */
>> -uint64_t get_fail_objs;/**< Objects that failed to be allocated. */
>> +uint64_t put_bulk;/**< Number of puts. */
>> +uint64_t put_objs;/**< Number of objects successfully
>> put. */
>> +uint64_t put_common_pool_bulk;/**< Number of bulks enqueued in
>> common pool. */
>> +uint64_t put_common_pool_objs;/**< Number of objects enqueued in
>> common pool. */
>> +uint64_t put_cache_bulk; /**< Number of bulks enqueued in
>> cache. */
>> +uint64_t put_cache_objs; /**< Number of objects enqueued in
>> cache. */
>> +uint64_t get_common_pool_bulk;/**< Number of bulks dequeued from
>> common pool. */
>> +uint64_t get_
Re: [dpdk-dev] [PATCH v3 2/2] lib/mempool: distinguish debug counters from cache and pool
> >> diff --git a/lib/librte_mempool/rte_mempool.h
> >> b/lib/librte_mempool/rte_mempool.h
> >> index 848a19226149..0959f8a3f367 100644
> >> --- a/lib/librte_mempool/rte_mempool.h
> >> +++ b/lib/librte_mempool/rte_mempool.h
> >> @@ -66,12 +66,20 @@ extern "C" {
> >> * A structure that stores the mempool statistics (per-lcore).
> >> */
> >> struct rte_mempool_debug_stats {
> >> -uint64_t put_bulk; /**< Number of puts. */
> >> -uint64_t put_objs; /**< Number of objects successfully put. */
> >> -uint64_t get_success_bulk; /**< Successful allocation number. */
> >> -uint64_t get_success_objs; /**< Objects successfully allocated. */
> >> -uint64_t get_fail_bulk;/**< Failed allocation number. */
> >> -uint64_t get_fail_objs;/**< Objects that failed to be allocated. */
> >> +uint64_t put_bulk; /**< Number of puts. */ uint64_t put_objs; /**<
> >> +Number of objects successfully put. */ uint64_t
> >> +put_common_pool_bulk; /**< Number of bulks enqueued in common
> pool.
> >> +*/ uint64_t put_common_pool_objs; /**< Number of objects enqueued
> >> +in common pool. */ uint64_t put_cache_bulk; /**< Number of bulks
> >> +enqueued in cache. */ uint64_t put_cache_objs; /**< Number of objects
> enqueued in cache. */
> >> +uint64_t get_common_pool_bulk;/**< Number of bulks dequeued from
> common pool. */
> >> +uint64_t get_common_pool_objs; /**< Number of objects dequeued from
> >> +common pool. */ uint64_t get_cache_bulk; /**< Number of bulks
> >> +dequeued from cache. */ uint64_t get_cache_objs; /**< Number of
> >> +objects dequeued from cache. */ uint64_t get_success_bulk; /**<
> >> +Successful allocation number. */ uint64_t get_success_objs; /**<
> >> +Objects successfully allocated. */ uint64_t get_fail_bulk; /**<
> >> +Failed allocation number. */ uint64_t get_fail_objs; /**< Objects
> >> +that failed to be allocated. */
> >
> > I missed it the first time, but this changes the size of the
> > rte_mempool_debug_stats structure. I think we don't care about this
> > ABI breakage because this structure is only defined if
> > RTE_LIBRTE_MEMPOOL_DEBUG is set. But just in case, adding Ray as Cc.
>
> Agreed, thank you!
>
> >
> > About the field themselves, I'm not certain that there is an added
> > value to have stats for cache gets and puts. My feeling is that the
> > important stat to monitor is the access to common pool, because it is
> > the one that highlights a possible performance impact (contention).
> > The cache stats are more or less equal to "success + fail - common".
> > Moreover, it will simplify the patch and avoid risks of mistakes.
> >
> > What do you think?
Agree as well. Can you please add a comment making a note of this in the stats
structure?
>
> Yes, I think the cache stats can be removed.
> Also, please correct me if I’m wrong; but, in my understanding, the cache
> stats
> are equal to “success - common”. Is adding “fail” required?
>
> >
Re: [dpdk-dev] [PATCH v6 05/10] app/testpmd: add clock_gettime_monotonic
On Tue, Apr 20, 2021 at 09:09:52AM +, Ananyev, Konstantin wrote:
>
>
> >
> > Add clock_gettime_monotonic for testpmd on Windows
> >
> > Signed-off-by: Jie Zhou
> > Signed-off-by: Jie Zhou
> > ---
> > app/test-pmd/config.c | 33 -
> > 1 file changed, 32 insertions(+), 1 deletion(-)
> >
> > diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> > index ef0b9784d..a5f8fec5b 100644
> > --- a/app/test-pmd/config.c
> > +++ b/app/test-pmd/config.c
> > @@ -63,6 +63,12 @@
> >
> > #define NS_PER_SEC 1E9
> >
> > +#ifdef RTE_EXEC_ENV_WINDOWS
> > +#define _clock_gettime_monotonic(cur_time)
> > clock_gettime_monotonic(&cur_time)
> > +#else
> > +#define _clock_gettime_monotonic(cur_time) clock_gettime(CLOCK_TYPE_ID,
> > &cur_time)
> > +#endif
> > +
> > static char *flowtype_to_str(uint16_t flow_type);
> >
> > static const struct {
> > @@ -170,6 +176,27 @@ print_ethaddr(const char *name, struct rte_ether_addr
> > *eth_addr)
> > printf("%s%s", name, buf);
> > }
> >
> > +#ifdef RTE_EXEC_ENV_WINDOWS
>
> Do we really need to pollute testpmd code with all these ifdefs?
> Might be better to move it into a separate .h?
Thanks Konstantin for the suggestion. In V7 move this into config.h, together
with the NS_PER_SEC def etc.
>
> > +static int
> > +clock_gettime_monotonic(struct timespec *tp)
> > +{
> > + LARGE_INTEGER pf, pc;
> > + LONGLONG nsec;
> > +
> > + if (QueryPerformanceFrequency(&pf) == 0)
> > + return -1;
> > +
> > + if (QueryPerformanceCounter(&pc) == 0)
> > + return -1;
> > +
> > + nsec = pc.QuadPart * NS_PER_SEC / pf.QuadPart;
> > + tp->tv_sec = nsec / NS_PER_SEC;
> > + tp->tv_nsec = nsec - tp->tv_sec * NS_PER_SEC;
> > +
> > + return 0;
> > +}
> > +#endif
> > +
Re: [dpdk-dev] [PATCH v17 2/8] net/bnxt: fix aarch32 build
On Thu, Apr 22, 2021 at 5:49 AM Juraj Linkeš wrote:
>
> From: Ruifeng Wang
>
> NEON vector path of the PMD needs aarch64 support. But it was
> enabled for aarch32 build as well because aarch32 build had
> cpu_family set to aarch64. So build for aarch32 will fail due
> to unsupported intrinsics.
>
> Fix aarch32 build by updating meson file to exclude NEON vector
> implementation for aarch32.
>
> Fixes: 398358341419 ("net/bnxt: support NEON")
> Cc: lance.richard...@broadcom.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ruifeng Wang
> Reviewed-by: Lance Richardson
Acked-by: Ajit Khaparde
> ---
> drivers/net/bnxt/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
> index 117c753489..5a72989915 100644
> --- a/drivers/net/bnxt/meson.build
> +++ b/drivers/net/bnxt/meson.build
> @@ -82,6 +82,6 @@ sources = files(
>
> if arch_subdir == 'x86'
> sources += files('bnxt_rxtx_vec_sse.c')
> -elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
> +elif arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
> sources += files('bnxt_rxtx_vec_neon.c')
> endif
> --
> 2.20.1
>
[dpdk-dev] [PATCH v7 01/10] lib: build libraries that testpmd depends on
Enable building libraries that testpmd depends on Signed-off-by: Jie Zhou Signed-off-by: Jie Zhou --- lib/meson.build | 7 +++ 1 file changed, 7 insertions(+) diff --git a/lib/meson.build b/lib/meson.build index c9a20f65b..2d499b238 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -76,8 +76,15 @@ if is_windows 'ethdev', 'pci', 'cmdline', +'metrics', 'hash', +'timer', +'bitratestats', 'cfgfile', +'gro', +'gso', +'latencystats', +'pdump', ] # only supported libraries for windows endif -- 2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 02/10] eal/windows: add necessary macros
Add required macros by testpmd on Windows in rte_os_shim.h Signed-off-by: Jie Zhou Signed-off-by: Jie Zhou --- lib/eal/windows/include/rte_os_shim.h | 9 + 1 file changed, 9 insertions(+) diff --git a/lib/eal/windows/include/rte_os_shim.h b/lib/eal/windows/include/rte_os_shim.h index 433fa02c4..e60f27400 100644 --- a/lib/eal/windows/include/rte_os_shim.h +++ b/lib/eal/windows/include/rte_os_shim.h @@ -20,6 +20,7 @@ #define strdup(str) _strdup(str) #define strtok_r(str, delim, saveptr) strtok_s(str, delim, saveptr) +#define strcasecmp _stricmp #define strncasecmp(s1, s2, count) _strnicmp(s1, s2, count) #define open(path, flags, ...) _open(path, flags, ##__VA_ARGS__) @@ -36,6 +37,14 @@ #define IPPROTO_SCTP 132 #endif +#ifndef IPDEFTTL +#define IPDEFTTL 64 +#endif + +#ifndef S_ISREG +#define S_ISREG(mode) (((mode)&S_IFMT) == S_IFREG) +#endif + #ifdef RTE_TOOLCHAIN_GCC #define TIME_UTC 1 -- 2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 03/10] eal/windows: add device event stubs
Add device event stubs in eal_dev.c for Windows
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
lib/eal/windows/eal_dev.c | 33 +
lib/eal/windows/meson.build | 1 +
2 files changed, 34 insertions(+)
create mode 100644 lib/eal/windows/eal_dev.c
diff --git a/lib/eal/windows/eal_dev.c b/lib/eal/windows/eal_dev.c
new file mode 100644
index 0..35191056f
--- /dev/null
+++ b/lib/eal/windows/eal_dev.c
@@ -0,0 +1,33 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#include
+
+int
+rte_dev_event_monitor_start(void)
+{
+ RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
+ return -1;
+}
+
+int
+rte_dev_event_monitor_stop(void)
+{
+ RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
+ return -1;
+}
+
+int
+rte_dev_hotplug_handle_enable(void)
+{
+ RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
+ return -1;
+}
+
+int
+rte_dev_hotplug_handle_disable(void)
+{
+ RTE_LOG(ERR, EAL, "Device event is not supported for Windows\n");
+ return -1;
+}
diff --git a/lib/eal/windows/meson.build b/lib/eal/windows/meson.build
index ff9cbec41..fc12fefd0 100644
--- a/lib/eal/windows/meson.build
+++ b/lib/eal/windows/meson.build
@@ -7,6 +7,7 @@ sources += files(
'eal.c',
'eal_alarm.c',
'eal_debug.c',
+'eal_dev.c',
'eal_file.c',
'eal_hugepages.c',
'eal_interrupts.c',
--
2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 00/10] app/testpmd: enable testpmd on Windows
This patchset is to enable testpmd on windows. It mainly includes: - Enable building libraries on Windows that testpmd depends on - Add necessary macros required by testpmd on Windows in rte_os_shim.h - Add device event stubs for Windows - Resolve name collisions with Windows types - Add clock_gettime in testpmd on Windows - Fix parse_fec_mode to return fec_capa instead of mode - Replace POSIX specific codes - Disable unsupported Apps build on Windows - Enable testpmd build on Windows Future work: - Some issues discovered at validation need further investigations * Perf inconsistency: TPUT fluctuated significantly from runs * After traffic stop, port stats shows pps being 0 while bps not * mempool allocation only succeed with native. Other methods failed at rte_mem_lock/VirtualLock. - Hot-plug on Windows not supported yet - Support mempool allocation native mode only for now --- V7 changes: - Resolve V6 patch set applying conflicts due to recent upstream merges of linux testpmd changes, lib\meson.build format change, lib path changes, and sources change in meson.build under app\ - Move Windows clock_gettime related code from config.c into config.h and leverage rte_os_shim.h for timespec_get - Fix a "BAD_SIGN_OFF" warning for patch "[v6,09/10] app/testpmd: fix unused function warnings" --- V6 changes: - Fix "unused function" compilation warning when neither i40e nor ixgbe presents --- V5 changes: - Remove macro trailing semicolon which missed to include in V4 --- V4 changes: - Split previous patch into more granular patches - Remove the bypass of rte_eal_cleanup at exit - Move all added macros into rte_os_shim.h - Remove redundant headers after the rte_os_shim patch merge - Revert the mman APIs replacement to leave relevant part UNIX only - Keep Windows library list the same structure and order as the Unix library list in lib meson.build --- V3 changes: - Split one patch into patchset - Replace mman APIs with rte_mem_xxx APIs - Use OS independant rte_rand - Add device event stubs for Windows - Disable unsupported Apps --- V2 changes: - Fix commit message log long line issue - Fix coding style issues of pointer location - Fix indentation issue - Fix FreeBSD2101 compilation issue of AF_INET undeclared --- Jie Zhou (10): lib: build libraries that testpmd depends on eal/windows: add necessary macros eal/windows: add device event stubs app/testpmd: resolve name collisions app/testpmd: add clock_gettime on Windows app/testpmd: fix parse_fec_mode return type app/testpmd: replace POSIX specific code app/testpmd: fix headers inclusion app/testpmd: fix unused function warnings app/testpmd: enable building testpmd on Windows app/meson.build | 4 - app/pdump/meson.build | 6 + app/proc-info/meson.build | 6 + app/test-acl/meson.build | 6 + app/test-bbdev/meson.build| 6 + app/test-cmdline/meson.build | 6 + app/test-compress-perf/meson.build| 6 + app/test-crypto-perf/meson.build | 6 + app/test-eventdev/meson.build | 6 + app/test-fib/meson.build | 6 + app/test-flow-perf/meson.build| 6 + app/test-pipeline/meson.build | 6 + app/test-pmd/cmdline.c| 12 +- app/test-pmd/cmdline_flow.c | 514 +- app/test-pmd/config.c | 96 +++-- app/test-pmd/config.h | 66 app/test-pmd/csumonly.c | 2 +- app/test-pmd/icmpecho.c | 4 +- app/test-pmd/ieee1588fwd.c| 8 +- app/test-pmd/parameters.c | 11 +- app/test-pmd/testpmd.c| 21 +- app/test-pmd/testpmd.h| 5 +- app/test-regex/meson.build| 6 + app/test-sad/meson.build | 6 + app/test/meson.build | 6 + lib/eal/windows/eal_dev.c | 33 ++ lib/eal/windows/include/rte_os_shim.h | 9 + lib/eal/windows/meson.build | 1 + lib/meson.build | 7 + 29 files changed, 542 insertions(+), 335 deletions(-) create mode 100644 app/test-pmd/config.h create mode 100644 lib/eal/windows/eal_dev.c -- 2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 04/10] app/testpmd: resolve name collisions
Resolve name collisions with Windows types
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
app/test-pmd/cmdline_flow.c | 512 ++--
1 file changed, 256 insertions(+), 256 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 594734199..888b9179b 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -40,22 +40,22 @@ enum index {
END_SET,
/* Common tokens. */
- INTEGER,
- UNSIGNED,
- PREFIX,
- BOOLEAN,
- STRING,
- HEX,
- FILE_PATH,
- MAC_ADDR,
- IPV4_ADDR,
- IPV6_ADDR,
- RULE_ID,
- PORT_ID,
- GROUP_ID,
- PRIORITY_LEVEL,
- INDIRECT_ACTION_ID,
- POLICY_ID,
+ COMMON_INTEGER,
+ COMMON_UNSIGNED,
+ COMMON_PREFIX,
+ COMMON_BOOLEAN,
+ COMMON_STRING,
+ COMMON_HEX,
+ COMMON_FILE_PATH,
+ COMMON_MAC_ADDR,
+ COMMON_IPV4_ADDR,
+ COMMON_IPV6_ADDR,
+ COMMON_RULE_ID,
+ COMMON_PORT_ID,
+ COMMON_GROUP_ID,
+ COMMON_PRIORITY_LEVEL,
+ COMMON_INDIRECT_ACTION_ID,
+ COMMON_POLICY_ID,
/* TOP-level command. */
ADD,
@@ -104,13 +104,13 @@ enum index {
AGED_DESTROY,
/* Validate/create arguments. */
- GROUP,
- PRIORITY,
- INGRESS,
- EGRESS,
- TRANSFER,
- TUNNEL_SET,
- TUNNEL_MATCH,
+ VC_GROUP,
+ VC_PRIORITY,
+ VC_INGRESS,
+ VC_EGRESS,
+ VC_TRANSFER,
+ VC_TUNNEL_SET,
+ VC_TUNNEL_MATCH,
/* Dump arguments */
DUMP_ALL,
@@ -133,7 +133,7 @@ enum index {
INDIRECT_ACTION_DESTROY_ID,
/* Validate/create pattern. */
- PATTERN,
+ ITEM_PATTERN,
ITEM_PARAM_IS,
ITEM_PARAM_SPEC,
ITEM_PARAM_LAST,
@@ -890,14 +890,14 @@ static const enum index next_ia_subcmd[] = {
};
static const enum index next_vc_attr[] = {
- GROUP,
- PRIORITY,
- INGRESS,
- EGRESS,
- TRANSFER,
- TUNNEL_SET,
- TUNNEL_MATCH,
- PATTERN,
+ VC_GROUP,
+ VC_PRIORITY,
+ VC_INGRESS,
+ VC_EGRESS,
+ VC_TRANSFER,
+ VC_TUNNEL_SET,
+ VC_TUNNEL_MATCH,
+ ITEM_PATTERN,
ZERO,
};
@@ -908,7 +908,7 @@ static const enum index next_destroy_attr[] = {
};
static const enum index next_dump_attr[] = {
- FILE_PATH,
+ COMMON_FILE_PATH,
END,
ZERO,
};
@@ -1911,111 +1911,111 @@ static const struct token token_list[] = {
.help = "set command may end here",
},
/* Common tokens. */
- [INTEGER] = {
+ [COMMON_INTEGER] = {
.name = "{int}",
.type = "INTEGER",
.help = "integer value",
.call = parse_int,
.comp = comp_none,
},
- [UNSIGNED] = {
+ [COMMON_UNSIGNED] = {
.name = "{unsigned}",
.type = "UNSIGNED",
.help = "unsigned integer value",
.call = parse_int,
.comp = comp_none,
},
- [PREFIX] = {
+ [COMMON_PREFIX] = {
.name = "{prefix}",
.type = "PREFIX",
.help = "prefix length for bit-mask",
.call = parse_prefix,
.comp = comp_none,
},
- [BOOLEAN] = {
+ [COMMON_BOOLEAN] = {
.name = "{boolean}",
.type = "BOOLEAN",
.help = "any boolean value",
.call = parse_boolean,
.comp = comp_boolean,
},
- [STRING] = {
+ [COMMON_STRING] = {
.name = "{string}",
.type = "STRING",
.help = "fixed string",
.call = parse_string,
.comp = comp_none,
},
- [HEX] = {
+ [COMMON_HEX] = {
.name = "{hex}",
.type = "HEX",
.help = "fixed string",
.call = parse_hex,
},
- [FILE_PATH] = {
+ [COMMON_FILE_PATH] = {
.name = "{file path}",
.type = "STRING",
.help = "file path",
.call = parse_string0,
.comp = comp_none,
},
- [MAC_ADDR] = {
+ [COMMON_MAC_ADDR] = {
.name = "{MAC address}",
.type = "MAC-48",
.help = "standard MAC address notation",
.call = parse_mac_addr,
.comp = comp_none,
},
- [IPV4_ADDR] = {
+ [COMMON_IPV4_ADDR] = {
.name = "{IPv4 address}",
.type = "IPV4 ADDRESS",
.help = "standard IPv4 address notation",
.call = parse_ipv4_addr,
.comp = comp_none,
},
- [IPV6_ADDR] = {
+ [COMMON_IPV6_ADDR] = {
[dpdk-dev] [PATCH v7 08/10] app/testpmd: fix headers inclusion
- Include rte_os_shim.h in testpmd.h - Remove redundant headers Signed-off-by: Jie Zhou Signed-off-by: Jie Zhou --- app/test-pmd/cmdline.c | 3 --- app/test-pmd/cmdline_flow.c | 2 -- app/test-pmd/parameters.c | 1 - app/test-pmd/testpmd.h | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index f0636ca9b..2fbef3320 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -10,9 +10,6 @@ #include #include #include -#include -#include - #include #include diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 888b9179b..a3cd4773a 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -10,8 +10,6 @@ #include #include #include -#include -#include #include #include diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 4c3cbbac3..5e69d2aa8 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index a4115861b..f96eec71a 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include -- 2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 06/10] app/testpmd: fix parse_fec_mode return type
Fix parse_fec_mode to return fec_capa instead of mode
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
app/test-pmd/cmdline.c | 6 +++---
app/test-pmd/config.c | 4 ++--
app/test-pmd/testpmd.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 12efbc0ca..d804ee233 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -16984,17 +16984,17 @@ cmd_set_port_fec_mode_parsed(
{
struct cmd_set_port_fec_mode *res = parsed_result;
uint16_t port_id = res->port_id;
- uint32_t mode;
+ uint32_t fec_capa;
int ret;
- ret = parse_fec_mode(res->fec_value, &mode);
+ ret = parse_fec_mode(res->fec_value, &fec_capa);
if (ret < 0) {
printf("Unknown fec mode: %s for Port %d\n", res->fec_value,
port_id);
return;
}
- ret = rte_eth_fec_set(port_id, mode);
+ ret = rte_eth_fec_set(port_id, fec_capa);
if (ret == -ENOTSUP) {
printf("Function not implemented\n");
return;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 9fbf2f5f7..dadc44031 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3542,13 +3542,13 @@ set_tx_pkt_split(const char *name)
}
int
-parse_fec_mode(const char *name, uint32_t *mode)
+parse_fec_mode(const char *name, uint32_t *fec_capa)
{
uint8_t i;
for (i = 0; i < RTE_DIM(fec_mode_name); i++) {
if (strcmp(fec_mode_name[i].name, name) == 0) {
- *mode = RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
+ *fec_capa =
RTE_ETH_FEC_MODE_TO_CAPA(fec_mode_name[i].mode);
return 0;
}
}
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 6ca872db8..1d104213b 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -886,7 +886,7 @@ void show_tx_pkt_segments(void);
void set_tx_pkt_times(unsigned int *tx_times);
void show_tx_pkt_times(void);
void set_tx_pkt_split(const char *name);
-int parse_fec_mode(const char *name, enum rte_eth_fec_mode *mode);
+int parse_fec_mode(const char *name, uint32_t *fec_capa);
void show_fec_capability(uint32_t num, struct rte_eth_fec_capa
*speed_fec_capa);
void set_nb_pkt_per_burst(uint16_t pkt_burst);
char *list_pkt_forwarding_modes(void);
--
2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 05/10] app/testpmd: add clock_gettime on Windows
Add clock_gettime for testpmd on Windows in config.h
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
app/test-pmd/config.c | 10 ++-
app/test-pmd/config.h | 66 +++
2 files changed, 68 insertions(+), 8 deletions(-)
create mode 100644 app/test-pmd/config.h
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e189062ef..9fbf2f5f7 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -54,17 +54,10 @@
#include "testpmd.h"
#include "cmdline_mtr.h"
+#include "config.h"
#define ETHDEV_FWVERS_LEN 32
-#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
-#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
-#else
-#define CLOCK_TYPE_ID CLOCK_MONOTONIC
-#endif
-
-#define NS_PER_SEC 1E9
-
static char *flowtype_to_str(uint16_t flow_type);
static const struct {
@@ -205,6 +198,7 @@ nic_stats_display(portid_t port_id)
"%-"PRIu64"\n", stats.opackets, stats.oerrors, stats.obytes);
diff_ns = 0;
+
if (clock_gettime(CLOCK_TYPE_ID, &cur_time) == 0) {
uint64_t ns;
diff --git a/app/test-pmd/config.h b/app/test-pmd/config.h
new file mode 100644
index 0..e21bed576
--- /dev/null
+++ b/app/test-pmd/config.h
@@ -0,0 +1,66 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Microsoft Corporation
+ */
+
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+#include
+
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC
+#endif
+
+#define NS_PER_SEC 1E9
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+
+/* Identifier for system-wide realtime clock. */
+#define CLOCK_REALTIME 0
+/* Monotonic system-wide clock. */
+#define CLOCK_MONOTONIC1
+/* High-resolution timer from the CPU. */
+#define CLOCK_PROCESS_CPUTIME_ID 2
+/* Thread-specific CPU-time clock. */
+#define CLOCK_THREAD_CPUTIME_ID3
+
+typedef int clockid_t;
+
+#ifndef clock_gettime
+#define clock_gettime _clock_gettime
+#endif
+
+static int
+_clock_gettime(clockid_t clock_id, struct timespec* tp)
+{
+ LARGE_INTEGER pf, pc;
+ LONGLONG nsec;
+
+ switch (clock_id) {
+ case CLOCK_REALTIME:
+ if (timespec_get(tp, TIME_UTC) != TIME_UTC)
+ return -1;
+
+ return 0;
+ case CLOCK_MONOTONIC:
+ if (QueryPerformanceFrequency(&pf) == 0)
+ return -1;
+
+ if (QueryPerformanceCounter(&pc) == 0)
+ return -1;
+
+ nsec = pc.QuadPart * NS_PER_SEC / pf.QuadPart;
+ tp->tv_sec = nsec / NS_PER_SEC;
+ tp->tv_nsec = nsec - tp->tv_sec * NS_PER_SEC;
+
+ return 0;
+ default:
+ return -1;
+ }
+}
+
+#endif /* RTE_EXEC_ENV_WINDOWS */
+
+#endif /* _CONFIG_H_ */
--
2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 07/10] app/testpmd: replace POSIX specific code
- Make printf format OS independent
- Replace htons with RTE_BE16
- Replace POSIX specific inet_aton with OS independent inet_pton
- Replace sleep with rte_delay_us_sleep
- Repalce random with rte_rand
- #ifndef mman related code on Windows for now
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
app/test-pmd/cmdline.c | 3 +--
app/test-pmd/csumonly.c| 2 +-
app/test-pmd/icmpecho.c| 4 ++--
app/test-pmd/ieee1588fwd.c | 8
app/test-pmd/parameters.c | 10 +++---
app/test-pmd/testpmd.c | 21 -
app/test-pmd/testpmd.h | 2 +-
7 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d804ee233..f0636ca9b 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -3601,7 +3600,7 @@ cmdline_parse_inst_t cmd_stop = {
/* *** SET CORELIST and PORTLIST CONFIGURATION *** */
unsigned int
-parse_item_list(char* str, const char* item_name, unsigned int max_items,
+parse_item_list(const char *str, const char *item_name, unsigned int max_items,
unsigned int *parsed_items, int check_unique_values)
{
unsigned int nb_item;
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 6b4df335f..089936587 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -696,7 +696,7 @@ pkt_copy_split(const struct rte_mbuf *pkt)
mp = current_fwd_lcore()->mbp;
if (tx_pkt_split == TX_PKT_SPLIT_RND)
- nb_seg = random() % tx_pkt_nb_segs + 1;
+ nb_seg = rte_rand() % tx_pkt_nb_segs + 1;
else
nb_seg = tx_pkt_nb_segs;
diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index af6f7e790..8948f28eb 100644
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -474,8 +474,8 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
}
icmp_h->icmp_type = RTE_IP_ICMP_ECHO_REPLY;
cksum = ~icmp_h->icmp_cksum & 0x;
- cksum += ~htons(RTE_IP_ICMP_ECHO_REQUEST << 8) & 0x;
- cksum += htons(RTE_IP_ICMP_ECHO_REPLY << 8);
+ cksum += ~RTE_BE16(RTE_IP_ICMP_ECHO_REQUEST << 8) & 0x;
+ cksum += RTE_BE16(RTE_IP_ICMP_ECHO_REPLY << 8);
cksum = (cksum & 0x) + (cksum >> 16);
cksum = (cksum & 0x) + (cksum >> 16);
icmp_h->icmp_cksum = ~cksum;
diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c
index e3b98e3e0..034f238c3 100644
--- a/app/test-pmd/ieee1588fwd.c
+++ b/app/test-pmd/ieee1588fwd.c
@@ -60,8 +60,8 @@ port_ieee1588_rx_timestamp_check(portid_t pi, uint32_t index)
printf("Port %u RX timestamp registers not valid\n", pi);
return;
}
- printf("Port %u RX timestamp value %lu s %lu ns\n",
- pi, timestamp.tv_sec, timestamp.tv_nsec);
+ printf("Port %u RX timestamp value %ju s %lu ns\n",
+ pi, (uintmax_t)timestamp.tv_sec, timestamp.tv_nsec);
}
#define MAX_TX_TMST_WAIT_MICROSECS 1000 /**< 1 milli-second */
@@ -83,9 +83,9 @@ port_ieee1588_tx_timestamp_check(portid_t pi)
pi, MAX_TX_TMST_WAIT_MICROSECS);
return;
}
- printf("Port %u TX timestamp value %lu s %lu ns validated after "
+ printf("Port %u TX timestamp value %ju s %lu ns validated after "
"%u micro-second%s\n",
- pi, timestamp.tv_sec, timestamp.tv_nsec, wait_us,
+ pi, (uintmax_t)timestamp.tv_sec, timestamp.tv_nsec, wait_us,
(wait_us == 1) ? "" : "s");
}
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index f3954c1c6..4c3cbbac3 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -185,8 +185,10 @@ usage(char* progname)
printf(" --hot-plug: enable hot plug for device.\n");
printf(" --vxlan-gpe-port=N: UPD port of tunnel VXLAN-GPE\n");
printf(" --geneve-parsed-port=N: UPD port to parse GENEVE tunnel
protocol\n");
+#ifndef RTE_EXEC_ENV_WINDOWS
printf(" --mlockall: lock all memory\n");
printf(" --no-mlockall: do not lock all memory\n");
+#endif
printf(" --mp-alloc : mempool allocation
method.\n"
"native: use regular DPDK memory to create and populate
mempool\n"
"anon: use regular DPDK memory to create and anonymous
memory to populate mempool\n"
@@ -211,7 +213,7 @@ usage(char* progname)
#ifdef RTE_LIB_CMDLINE
static int
-init_peer_eth_addrs(char *config_filename)
+init_peer_eth_addrs(const char *config_filename)
{
FILE *config_file;
portid_t i;
@@ -610,8 +612,10 @@ launch_args_parse(int argc, char** argv)
{ "hot-plug", 0, 0, 0 },
{ "vxlan-gpe-port", 1, 0, 0 },
[dpdk-dev] [PATCH v7 09/10] app/testpmd: fix unused function warnings
Function print_fdir_mask and print_fdir_flex_payload is only called
when either i40e or ixgbe presents. Add #if defined to remove
"unused function" compilation warning.
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
app/test-pmd/config.c | 82 +--
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index dadc44031..e7edad216 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -4358,6 +4358,47 @@ set_record_burst_stats(uint8_t on_off)
record_burst_stats = on_off;
}
+static char*
+flowtype_to_str(uint16_t flow_type)
+{
+ struct flow_type_info {
+ char str[32];
+ uint16_t ftype;
+ };
+
+ uint8_t i;
+ static struct flow_type_info flowtype_str_table[] = {
+ {"raw", RTE_ETH_FLOW_RAW},
+ {"ipv4", RTE_ETH_FLOW_IPV4},
+ {"ipv4-frag", RTE_ETH_FLOW_FRAG_IPV4},
+ {"ipv4-tcp", RTE_ETH_FLOW_NONFRAG_IPV4_TCP},
+ {"ipv4-udp", RTE_ETH_FLOW_NONFRAG_IPV4_UDP},
+ {"ipv4-sctp", RTE_ETH_FLOW_NONFRAG_IPV4_SCTP},
+ {"ipv4-other", RTE_ETH_FLOW_NONFRAG_IPV4_OTHER},
+ {"ipv6", RTE_ETH_FLOW_IPV6},
+ {"ipv6-frag", RTE_ETH_FLOW_FRAG_IPV6},
+ {"ipv6-tcp", RTE_ETH_FLOW_NONFRAG_IPV6_TCP},
+ {"ipv6-udp", RTE_ETH_FLOW_NONFRAG_IPV6_UDP},
+ {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
+ {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
+ {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
+ {"port", RTE_ETH_FLOW_PORT},
+ {"vxlan", RTE_ETH_FLOW_VXLAN},
+ {"geneve", RTE_ETH_FLOW_GENEVE},
+ {"nvgre", RTE_ETH_FLOW_NVGRE},
+ {"vxlan-gpe", RTE_ETH_FLOW_VXLAN_GPE},
+ };
+
+ for (i = 0; i < RTE_DIM(flowtype_str_table); i++) {
+ if (flowtype_str_table[i].ftype == flow_type)
+ return flowtype_str_table[i].str;
+ }
+
+ return NULL;
+}
+
+#if defined(RTE_NET_I40E) || defined(RTE_NET_IXGBE)
+
static inline void
print_fdir_mask(struct rte_eth_fdir_masks *mask)
{
@@ -4417,47 +4458,6 @@ print_fdir_flex_payload(struct rte_eth_fdir_flex_conf
*flex_conf, uint32_t num)
printf("\n");
}
-static char *
-flowtype_to_str(uint16_t flow_type)
-{
- struct flow_type_info {
- char str[32];
- uint16_t ftype;
- };
-
- uint8_t i;
- static struct flow_type_info flowtype_str_table[] = {
- {"raw", RTE_ETH_FLOW_RAW},
- {"ipv4", RTE_ETH_FLOW_IPV4},
- {"ipv4-frag", RTE_ETH_FLOW_FRAG_IPV4},
- {"ipv4-tcp", RTE_ETH_FLOW_NONFRAG_IPV4_TCP},
- {"ipv4-udp", RTE_ETH_FLOW_NONFRAG_IPV4_UDP},
- {"ipv4-sctp", RTE_ETH_FLOW_NONFRAG_IPV4_SCTP},
- {"ipv4-other", RTE_ETH_FLOW_NONFRAG_IPV4_OTHER},
- {"ipv6", RTE_ETH_FLOW_IPV6},
- {"ipv6-frag", RTE_ETH_FLOW_FRAG_IPV6},
- {"ipv6-tcp", RTE_ETH_FLOW_NONFRAG_IPV6_TCP},
- {"ipv6-udp", RTE_ETH_FLOW_NONFRAG_IPV6_UDP},
- {"ipv6-sctp", RTE_ETH_FLOW_NONFRAG_IPV6_SCTP},
- {"ipv6-other", RTE_ETH_FLOW_NONFRAG_IPV6_OTHER},
- {"l2_payload", RTE_ETH_FLOW_L2_PAYLOAD},
- {"port", RTE_ETH_FLOW_PORT},
- {"vxlan", RTE_ETH_FLOW_VXLAN},
- {"geneve", RTE_ETH_FLOW_GENEVE},
- {"nvgre", RTE_ETH_FLOW_NVGRE},
- {"vxlan-gpe", RTE_ETH_FLOW_VXLAN_GPE},
- };
-
- for (i = 0; i < RTE_DIM(flowtype_str_table); i++) {
- if (flowtype_str_table[i].ftype == flow_type)
- return flowtype_str_table[i].str;
- }
-
- return NULL;
-}
-
-#if defined(RTE_NET_I40E) || defined(RTE_NET_IXGBE)
-
static inline void
print_fdir_flex_mask(struct rte_eth_fdir_flex_conf *flex_conf, uint32_t num)
{
--
2.30.0.vfs.0.2
[dpdk-dev] [PATCH v7 10/10] app/testpmd: enable building testpmd on Windows
From: Jie Zhou
- Disable unsupported Apps on Windows
- Enable building of testpmd on Windows
Signed-off-by: Jie Zhou
Signed-off-by: Jie Zhou
---
app/meson.build| 4
app/pdump/meson.build | 6 ++
app/proc-info/meson.build | 6 ++
app/test-acl/meson.build | 6 ++
app/test-bbdev/meson.build | 6 ++
app/test-cmdline/meson.build | 6 ++
app/test-compress-perf/meson.build | 6 ++
app/test-crypto-perf/meson.build | 6 ++
app/test-eventdev/meson.build | 6 ++
app/test-fib/meson.build | 6 ++
app/test-flow-perf/meson.build | 6 ++
app/test-pipeline/meson.build | 6 ++
app/test-regex/meson.build | 6 ++
app/test-sad/meson.build | 6 ++
app/test/meson.build | 6 ++
15 files changed, 84 insertions(+), 4 deletions(-)
diff --git a/app/meson.build b/app/meson.build
index 35e53861b..4c6049807 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,10 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
-if is_windows
-subdir_done()
-endif
-
apps = [
'pdump',
'proc-info',
diff --git a/app/pdump/meson.build b/app/pdump/meson.build
index 7bb908e04..db1fcadbf 100644
--- a/app/pdump/meson.build
+++ b/app/pdump/meson.build
@@ -1,5 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('main.c')
deps += ['ethdev', 'kvargs', 'pdump']
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index f050c4a9b..82ed05bb0 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -1,5 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('main.c')
deps += ['ethdev', 'metrics', 'security']
diff --git a/app/test-acl/meson.build b/app/test-acl/meson.build
index d5c2581b4..14d36b33e 100644
--- a/app/test-acl/meson.build
+++ b/app/test-acl/meson.build
@@ -1,5 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2019 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('main.c')
deps += ['acl', 'net']
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 57335641f..edb9deef8 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'main.c',
'test_bbdev.c',
diff --git a/app/test-cmdline/meson.build b/app/test-cmdline/meson.build
index 9d0a9aeb6..089882120 100644
--- a/app/test-cmdline/meson.build
+++ b/app/test-cmdline/meson.build
@@ -1,5 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2019 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('commands.c', 'cmdline_test.c')
deps += 'cmdline'
diff --git a/app/test-compress-perf/meson.build
b/app/test-compress-perf/meson.build
index 3f79e2da9..f29c6ee86 100644
--- a/app/test-compress-perf/meson.build
+++ b/app/test-compress-perf/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'comp_perf_options_parse.c',
'comp_perf_test_common.c',
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 20444b791..ef3582a87 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'cperf_ops.c',
'cperf_options_parsing.c',
diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 04117dbe4..08a3ba78a 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'evt_main.c',
'evt_options.c',
diff --git a/app/test-fib/meson.build b/app/test-fib/meson.build
index f74ac651c..3360ea02b 100644
--- a/app/test-fib/meson.build
+++ b/ap
[dpdk-dev] [PATCH v4 0/2] lib/mempool: add debug stats
- Add debug counters for objects put/get to/from the common pool. - Make __MEMPOOL_STAT_ADD() more generic --- v4: - Remove cache stats v3: - Add a patch to make stat add macro generic - Remove other stat add/subtract macros - Rename counters for better understanding - Add put/get cache bulk counters v2: - Fix typo in the commit message --- Dharmik Thakkar (1): lib/mempool: make stats macro generic Joyce Kong (1): lib/mempool: distinguish debug counters from cache and pool lib/mempool/rte_mempool.c | 16 ++ lib/mempool/rte_mempool.h | 67 +++ 2 files changed, 56 insertions(+), 27 deletions(-) -- 2.17.1
[dpdk-dev] [PATCH v4 2/2] lib/mempool: distinguish debug counters from cache and pool
From: Joyce Kong
If cache is enabled, objects will be retrieved/put from/to cache,
subsequently from/to the common pool. Now the debug stats calculate
the objects retrieved/put from/to cache and pool together, it is
better to distinguish them.
Signed-off-by: Joyce Kong
Signed-off-by: Dharmik Thakkar
Reviewed-by: Ruifeng Wang
Reviewed-by: Honnappa Nagarahalli
---
lib/mempool/rte_mempool.c | 16 +++
lib/mempool/rte_mempool.h | 43 ++-
2 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index afb1239c8d48..e9343c2a7f6b 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -1244,6 +1244,14 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
sum.put_bulk += mp->stats[lcore_id].put_bulk;
sum.put_objs += mp->stats[lcore_id].put_objs;
+ sum.put_common_pool_bulk +=
+ mp->stats[lcore_id].put_common_pool_bulk;
+ sum.put_common_pool_objs +=
+ mp->stats[lcore_id].put_common_pool_objs;
+ sum.get_common_pool_bulk +=
+ mp->stats[lcore_id].get_common_pool_bulk;
+ sum.get_common_pool_objs +=
+ mp->stats[lcore_id].get_common_pool_objs;
sum.get_success_bulk += mp->stats[lcore_id].get_success_bulk;
sum.get_success_objs += mp->stats[lcore_id].get_success_objs;
sum.get_fail_bulk += mp->stats[lcore_id].get_fail_bulk;
@@ -1254,6 +1262,14 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
fprintf(f, " stats:\n");
fprintf(f, "put_bulk=%"PRIu64"\n", sum.put_bulk);
fprintf(f, "put_objs=%"PRIu64"\n", sum.put_objs);
+ fprintf(f, "put_common_pool_bulk=%"PRIu64"\n",
+ sum.put_common_pool_bulk);
+ fprintf(f, "put_common_pool_objs=%"PRIu64"\n",
+ sum.put_common_pool_objs);
+ fprintf(f, "get_common_pool_bulk=%"PRIu64"\n",
+ sum.get_common_pool_bulk);
+ fprintf(f, "get_common_pool_objs=%"PRIu64"\n",
+ sum.get_common_pool_objs);
fprintf(f, "get_success_bulk=%"PRIu64"\n", sum.get_success_bulk);
fprintf(f, "get_success_objs=%"PRIu64"\n", sum.get_success_objs);
fprintf(f, "get_fail_bulk=%"PRIu64"\n", sum.get_fail_bulk);
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 848a19226149..4343b287dc4e 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -64,14 +64,21 @@ extern "C" {
#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
/**
* A structure that stores the mempool statistics (per-lcore).
+ * Note: Cache stats (put_cache_bulk/objs, get_cache_bulk/objs) are not
+ * captured since they can be calculated from other stats.
+ * For example: put_cache_objs = put_objs - put_common_pool_objs.
*/
struct rte_mempool_debug_stats {
- uint64_t put_bulk; /**< Number of puts. */
- uint64_t put_objs; /**< Number of objects successfully put. */
- uint64_t get_success_bulk; /**< Successful allocation number. */
- uint64_t get_success_objs; /**< Objects successfully allocated. */
- uint64_t get_fail_bulk;/**< Failed allocation number. */
- uint64_t get_fail_objs;/**< Objects that failed to be allocated. */
+ uint64_t put_bulk;/**< Number of puts. */
+ uint64_t put_objs;/**< Number of objects successfully
put. */
+ uint64_t put_common_pool_bulk;/**< Number of bulks enqueued in
common pool. */
+ uint64_t put_common_pool_objs;/**< Number of objects enqueued in
common pool. */
+ uint64_t get_common_pool_bulk;/**< Number of bulks dequeued from
common pool. */
+ uint64_t get_common_pool_objs;/**< Number of objects dequeued from
common pool. */
+ uint64_t get_success_bulk;/**< Successful allocation number. */
+ uint64_t get_success_objs;/**< Objects successfully allocated.
*/
+ uint64_t get_fail_bulk; /**< Failed allocation number. */
+ uint64_t get_fail_objs; /**< Objects that failed to be
allocated. */
/** Successful allocation number of contiguous blocks. */
uint64_t get_success_blks;
/** Failed allocation number of contiguous blocks. */
@@ -699,10 +706,18 @@ rte_mempool_ops_dequeue_bulk(struct rte_mempool *mp,
void **obj_table, unsigned n)
{
struct rte_mempool_ops *ops;
+ int ret;
rte_mempool_trace_ops_dequeue_bulk(mp, obj_table, n);
ops = rte_mempool_get_ops(mp->ops_index);
- return ops->dequeue(mp, obj_table, n);
+ ret = ops-
[dpdk-dev] [PATCH v4 1/2] lib/mempool: make stats macro generic
Make __MEMPOOL_STAT_ADD macro more generic and delete
__MEMPOOL_CONTIG_BLOCKS_STAT_ADD macro
Suggested-by: Olivier Matz
Signed-off-by: Dharmik Thakkar
Reviewed-by: Ruifeng Wang
Reviewed-by: Honnappa Nagarahalli
Acked-by: Olivier Matz
---
lib/mempool/rte_mempool.h | 34 --
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index c551cf733acf..848a19226149 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -273,20 +273,11 @@ struct rte_mempool {
#define __MEMPOOL_STAT_ADD(mp, name, n) do {\
unsigned __lcore_id = rte_lcore_id(); \
if (__lcore_id < RTE_MAX_LCORE) { \
- mp->stats[__lcore_id].name##_objs += n; \
- mp->stats[__lcore_id].name##_bulk += 1; \
+ mp->stats[__lcore_id].name += n;\
} \
} while(0)
-#define __MEMPOOL_CONTIG_BLOCKS_STAT_ADD(mp, name, n) do {\
- unsigned int __lcore_id = rte_lcore_id(); \
- if (__lcore_id < RTE_MAX_LCORE) { \
- mp->stats[__lcore_id].name##_blks += n; \
- mp->stats[__lcore_id].name##_bulk += 1; \
- } \
- } while (0)
#else
#define __MEMPOOL_STAT_ADD(mp, name, n) do {} while(0)
-#define __MEMPOOL_CONTIG_BLOCKS_STAT_ADD(mp, name, n) do {} while (0)
#endif
/**
@@ -1288,7 +1279,8 @@ __mempool_generic_put(struct rte_mempool *mp, void *
const *obj_table,
void **cache_objs;
/* increment stat now, adding in mempool always success */
- __MEMPOOL_STAT_ADD(mp, put, n);
+ __MEMPOOL_STAT_ADD(mp, put_bulk, 1);
+ __MEMPOOL_STAT_ADD(mp, put_objs, n);
/* No cache provided or if put would overflow mem allocated for cache */
if (unlikely(cache == NULL || n > RTE_MEMPOOL_CACHE_MAX_SIZE))
@@ -1446,7 +1438,8 @@ __mempool_generic_get(struct rte_mempool *mp, void
**obj_table,
cache->len -= n;
- __MEMPOOL_STAT_ADD(mp, get_success, n);
+ __MEMPOOL_STAT_ADD(mp, get_success_bulk, 1);
+ __MEMPOOL_STAT_ADD(mp, get_success_objs, n);
return 0;
@@ -1455,10 +1448,13 @@ __mempool_generic_get(struct rte_mempool *mp, void
**obj_table,
/* get remaining objects from ring */
ret = rte_mempool_ops_dequeue_bulk(mp, obj_table, n);
- if (ret < 0)
- __MEMPOOL_STAT_ADD(mp, get_fail, n);
- else
- __MEMPOOL_STAT_ADD(mp, get_success, n);
+ if (ret < 0) {
+ __MEMPOOL_STAT_ADD(mp, get_fail_bulk, 1);
+ __MEMPOOL_STAT_ADD(mp, get_fail_objs, n);
+ } else {
+ __MEMPOOL_STAT_ADD(mp, get_success_bulk, 1);
+ __MEMPOOL_STAT_ADD(mp, get_success_objs, n);
+ }
return ret;
}
@@ -1581,11 +1577,13 @@ rte_mempool_get_contig_blocks(struct rte_mempool *mp,
ret = rte_mempool_ops_dequeue_contig_blocks(mp, first_obj_table, n);
if (ret == 0) {
- __MEMPOOL_CONTIG_BLOCKS_STAT_ADD(mp, get_success, n);
+ __MEMPOOL_STAT_ADD(mp, get_success_bulk, 1);
+ __MEMPOOL_STAT_ADD(mp, get_success_blks, n);
__mempool_contig_blocks_check_cookies(mp, first_obj_table, n,
1);
} else {
- __MEMPOOL_CONTIG_BLOCKS_STAT_ADD(mp, get_fail, n);
+ __MEMPOOL_STAT_ADD(mp, get_fail_bulk, 1);
+ __MEMPOOL_STAT_ADD(mp, get_fail_blks, n);
}
rte_mempool_trace_get_contig_blocks(mp, first_obj_table, n);
--
2.17.1
Re: [dpdk-dev] [PATCH] drivers/net: fix FW version get
On April 22, 2021 12:21 AM, Ferruh Yigit wrote:
> Fixes a few different things:
> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
> zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
> in ethdev layer
> * Be sure required buffer size is returned if provided one is not big
> enough, instead of returning success (0)
> * Document in doxygen comment the '-EINVAL' is a valid return type
> * Take into account that 'snprintf' can return negative value
> * Cast length to 'size_t' to compare it with 'fw_size'
>
> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version get")
> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
> Fixes: 293430677e9c ("net/enic: add handler to return firmware version")
> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
> Fixes: f97b56f9f12e ("net/qede: support FW version query")
> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
> Fixes: 21913471202f ("ethdev: add firmware version get")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
<...>
> diff --git a/drivers/net/txgbe/txgbe_ethdev.c
> b/drivers/net/txgbe/txgbe_ethdev.c
> index 97796f040b43..8dbe3da5c2c9 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.c
> +++ b/drivers/net/txgbe/txgbe_ethdev.c
> @@ -2582,9 +2582,11 @@ txgbe_fw_version_get(struct rte_eth_dev *dev,
> char *fw_version, size_t fw_size)
> hw->phy.get_fw_version(hw, &etrack_id);
>
> ret = snprintf(fw_version, fw_size, "0x%08x", etrack_id);
> + if (ret < 0)
> + return -EINVAL;
>
> ret += 1; /* add the size of '\0' */
> - if (fw_size < (u32)ret)
> + if (fw_size < (size_t)ret)
> return ret;
> else
> return 0;
For txgbe,
Acked-by: Jiawen Wu
Re: [dpdk-dev] [PATCH] drivers/net: fix FW version get
> -Original Message-
> From: Yigit, Ferruh
> Sent: Thursday, April 22, 2021 12:21 AM
> To: Igor Russkikh ; Pavel Belous
> ; Somalapuram Amaranath
> ; Ajit Khaparde ;
> Somnath Kotur ; Hemant Agrawal
> ; Sachin Saxena ;
> Guo, Jia ; Wang, Haiyue ;
> Daley, John ; Hyong Youb Kim ;
> Min Hu (Connor) ; Yisen Zhuang
> ; Lijun Ou ; Xing, Beilei
> ; Yang, Qiming ; Zhang, Qi Z
> ; Andrew Boyer ; Jerin Jacob
> ; Nithin Dabilpuram ;
> Kiran Kumar K ; Rasesh Mody
> ; Devendra Singh Rawat ;
> Andrew Rybchenko ; Jiawen Wu
> ; Jian Wang ;
> Thomas Monjalon ; Selwin Sebastian
> ; Remy Horton ;
> Chunsong Feng ; Huisong Li
> ; Hao Chen ; Wei Hu
> (Xavier) ; Wu, Jingjing ;
> Lu, Wenzhuo ; Li, Xiaoyun ;
> Zhang, AlvinX ; Shannon Nelson
> ; Alfredo Cardigliano ;
> Vamsi Attunuru ; Yash Sharma
> ; Ivan Malov ; Andrew
> Lee
> Cc: Yigit, Ferruh ; dev@dpdk.org; sta...@dpdk.org
> Subject: [PATCH] drivers/net: fix FW version get
>
> Fixes a few different things:
> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
> zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
> in ethdev layer
> * Be sure required buffer size is returned if provided one is not big
> enough, instead of returning success (0)
> * Document in doxygen comment the '-EINVAL' is a valid return type
> * Take into account that 'snprintf' can return negative value
> * Cast length to 'size_t' to compare it with 'fw_size'
>
> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version get")
> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
> Fixes: 293430677e9c ("net/enic: add handler to return firmware version")
> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
> Fixes: f97b56f9f12e ("net/qede: support FW version query")
> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
> Fixes: 21913471202f ("ethdev: add firmware version get")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
> ---
<...>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index e6206a7e5100..66d23d698ea0 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -3687,9 +3687,11 @@ i40e_fw_version_get(struct rte_eth_dev *dev,
> char *fw_version, size_t fw_size)
>((hw->nvm.version >> 4) & 0xff),
>(hw->nvm.version & 0xf), hw->nvm.eetrack,
>ver, build, patch);
> + if (ret < 0)
> + return -EINVAL;
>
> ret += 1; /* add the size of '\0' */
> - if (fw_size < (u32)ret)
> + if (fw_size < (size_t)ret)
> return ret;
> else
> return 0;
For i40e,
Acked-by: Beilei Xing
Re: [dpdk-dev] [PATCH] drivers/net: fix FW version get
On April 22, 2021 12:21 AM, Ferruh Yigit wrote:
> Fixes a few different things:
> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
> zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
> in ethdev layer
> * Be sure required buffer size is returned if provided one is not big
> enough, instead of returning success (0)
> * Document in doxygen comment the '-EINVAL' is a valid return type
> * Take into account that 'snprintf' can return negative value
> * Cast length to 'size_t' to compare it with 'fw_size'
>
> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version
> get")
> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
> Fixes: 293430677e9c ("net/enic: add handler to return firmware
> version")
> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
> Fixes: f97b56f9f12e ("net/qede: support FW version query")
> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
> Fixes: 21913471202f ("ethdev: add firmware version get")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Ferruh Yigit
<...>
> diff --git a/drivers/net/txgbe/txgbe_ethdev.c
> b/drivers/net/txgbe/txgbe_ethdev.c
> index 97796f040b43..8dbe3da5c2c9 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.c
> +++ b/drivers/net/txgbe/txgbe_ethdev.c
> @@ -2582,9 +2582,11 @@ txgbe_fw_version_get(struct rte_eth_dev *dev,
> char *fw_version, size_t fw_size)
> hw->phy.get_fw_version(hw, &etrack_id);
>
> ret = snprintf(fw_version, fw_size, "0x%08x", etrack_id);
> + if (ret < 0)
> + return -EINVAL;
>
> ret += 1; /* add the size of '\0' */
> - if (fw_size < (u32)ret)
> + if (fw_size < (size_t)ret)
> return ret;
> else
> return 0;
For txgbe,
Acked-by: Jiawen Wu
Re: [dpdk-dev] [PATCH] drivers/net: fix FW version get
Acked-by: Hemant Agrawal
Re: [dpdk-dev] [EXT] [PATCH 1/2] graph: fix memory leak
> -Original Message-
> From: Min Hu (Connor)
> Sent: Thursday, April 22, 2021 5:22 PM
> To: dev@dpdk.org
> Cc: ferruh.yi...@intel.com; Jerin Jacob Kollanukkaran ;
> Kiran Kumar Kokkilagadda
> Subject: [EXT] [PATCH 1/2] graph: fix memory leak
>
> External Email
>
> --
> From: HongBo Zheng
>
> Fix function 'stats_mem_populate' return without free dynamic memory
> referenced by 'stats'.
>
> Fixes: af1ae8b6a32c ("graph: implement stats")
> Cc: sta...@dpdk.org
>
> Signed-off-by: HongBo Zheng
> Signed-off-by: Min Hu (Connor)
> ---
> lib/librte_graph/graph_stats.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_graph/graph_stats.c b/lib/librte_graph/graph_stats.c
> index
> 125e08d..f698bb3 100644
> --- a/lib/librte_graph/graph_stats.c
> +++ b/lib/librte_graph/graph_stats.c
> @@ -174,7 +174,7 @@ stats_mem_populate(struct rte_graph_cluster_stats
> **stats_in,
> cluster->stat.hz = rte_get_timer_hz();
> node = graph_node_id_to_ptr(graph, id);
> if (node == NULL)
> - SET_ERR_JMP(ENOENT, err, "Failed to find node %s in graph
> %s",
> + SET_ERR_JMP(ENOENT, free, "Failed to find node %s in graph
> %s",
> graph_node->node->name, graph->name);
> cluster->nodes[cluster->nb_nodes++] = node;
>
> @@ -183,6 +183,8 @@ stats_mem_populate(struct rte_graph_cluster_stats
> **stats_in,
> *stats_in = stats;
>
> return 0;
> +free:
> + free(stats);
> err:
> return -rte_errno;
> }
> --
> 2.7.4
Reviewed-by: Kiran Kumar K
Re: [dpdk-dev] [EXT] [PATCH 2/2] graph: fix dereferencing null pointer
> -Original Message-
> From: Min Hu (Connor)
> Sent: Thursday, April 22, 2021 5:22 PM
> To: dev@dpdk.org
> Cc: ferruh.yi...@intel.com; Jerin Jacob Kollanukkaran ;
> Kiran Kumar Kokkilagadda
> Subject: [EXT] [PATCH 2/2] graph: fix dereferencing null pointer
>
> External Email
>
> --
> From: HongBo Zheng
>
> In function 'stats_mem_init', pointer 'stats' should be confirmed not null
> before
> memset it.
>
> Fixes: af1ae8b6a32c ("graph: implement stats")
> Cc: sta...@dpdk.org
>
> Signed-off-by: HongBo Zheng
> Signed-off-by: Min Hu (Connor)
> ---
> lib/librte_graph/graph_stats.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_graph/graph_stats.c b/lib/librte_graph/graph_stats.c
> index
> f698bb3..bdc8652 100644
> --- a/lib/librte_graph/graph_stats.c
> +++ b/lib/librte_graph/graph_stats.c
> @@ -119,8 +119,8 @@ stats_mem_init(struct cluster *cluster,
> cluster_node_size = RTE_ALIGN(cluster_node_size,
> RTE_CACHE_LINE_SIZE);
>
> stats = realloc(NULL, sz);
> - memset(stats, 0, sz);
> if (stats) {
> + memset(stats, 0, sz);
> stats->fn = fn;
> stats->cluster_node_size = cluster_node_size;
> stats->max_nodes = 0;
> --
> 2.7.4
Reviewed-by: Kiran Kumar K
[dpdk-dev] [PATCH] net/bnxt: fix to remove unused function parameters
From: Kalesh AP
1. Clean up unused function parameters.
2. Declare no external referenced function as static and remove
their prototye from the header file.
Fixes: ec77c6298301 ("net/bnxt: add stats context allocation")
Fixes: 200b64ba0be8 ("net/bnxt: free statistics context")
Cc: sta...@dpdk.org
Signed-off-by: Kalesh AP
Reviewed-by: Somnath Kotur
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_hwrm.c | 10 --
drivers/net/bnxt/bnxt_hwrm.h | 4
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index cb2064d..931ecea 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1899,8 +1899,7 @@ int bnxt_hwrm_stat_clear(struct bnxt *bp, struct
bnxt_cp_ring_info *cpr)
return rc;
}
-int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
- unsigned int idx __rte_unused)
+static int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info
*cpr)
{
int rc;
struct hwrm_stat_ctx_alloc_input req = {.req_type = 0 };
@@ -1923,8 +1922,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct
bnxt_cp_ring_info *cpr,
return rc;
}
-int bnxt_hwrm_stat_ctx_free(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
- unsigned int idx __rte_unused)
+static int bnxt_hwrm_stat_ctx_free(struct bnxt *bp, struct bnxt_cp_ring_info
*cpr)
{
int rc;
struct hwrm_stat_ctx_free_input req = {.req_type = 0 };
@@ -2594,7 +2592,7 @@ bnxt_free_all_hwrm_stat_ctxs(struct bnxt *bp)
bp->grp_info[i].fw_stats_ctx = -1;
}
if (cpr->hw_stats_ctx_id != HWRM_NA_SIGNATURE) {
- rc = bnxt_hwrm_stat_ctx_free(bp, cpr, i);
+ rc = bnxt_hwrm_stat_ctx_free(bp, cpr);
cpr->hw_stats_ctx_id = HWRM_NA_SIGNATURE;
if (rc)
return rc;
@@ -2621,7 +2619,7 @@ int bnxt_alloc_all_hwrm_stat_ctxs(struct bnxt *bp)
cpr = rxq->cp_ring;
}
- rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr, i);
+ rc = bnxt_hwrm_stat_ctx_alloc(bp, cpr);
if (rc)
return rc;
diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 0c2e32c..61b3050 100644
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -168,10 +168,6 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int
idx);
int bnxt_hwrm_ring_grp_free(struct bnxt *bp, unsigned int idx);
int bnxt_hwrm_stat_clear(struct bnxt *bp, struct bnxt_cp_ring_info *cpr);
-int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp,
-struct bnxt_cp_ring_info *cpr, unsigned int idx);
-int bnxt_hwrm_stat_ctx_free(struct bnxt *bp,
- struct bnxt_cp_ring_info *cpr, unsigned int idx);
int bnxt_hwrm_ctx_qstats(struct bnxt *bp, uint32_t cid, int idx,
struct rte_eth_stats *stats, uint8_t rx);
--
2.10.1
