Re: [PATCH] maintainers: remove Pallavi as windows maintainer
> Pallavi Kadam is no longer working on DPDK, so she has requested that her > name be removed from the maintainers file. > > Signed-off-by: Bruce Richardson > Acked-by: Pallavi Kadam Applied, thanks.
Re: [PATCH v15 0/7] Lcore variables
17/10/2024 07:57, Mattias Rönnblom: > Mattias Rönnblom (7): > eal: add static per-lcore memory allocation facility > eal: add lcore variable functional tests > eal: add lcore variable performance test > random: keep PRNG state in lcore variable > power: keep per-lcore state in lcore variable > service: keep per-lcore state in lcore variable > eal: keep per-lcore power intrinsics state in lcore variable Would it possible to have the doc reworded in RST including an image of the layout? I can help, don't hesitate to plan a meeting if needed. If you could make a new version for this final touch, we could merge it in 24.11-rc2. Note: please reply to the cover letter of the first version for the next one, it would reduce the indentation in the message list.
[PATCH] ci: fix unit tests with Fedora 37
This was detected in UNH envs.
In Fedora 37 and other distributions, meson 0.57 breaks when calling
the unit tests (probably because of an incompatibility with Python 3.11):
$ meson test -C build --suite DPDK:fast-tests
ninja: Entering directory `/root/dpdk/build'
ninja: no work to do.
Exception in callback TestHarness._run_tests..test_done
()
at /usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py:1806
handle: .test_done
()
at /usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py:1806>
Traceback (most recent call last):
File "/usr/lib64/python3.11/asyncio/events.py", line 80, in _run
self._context.run(self._callback, *self._args)
File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
line 1808, in test_done
f.result()
File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
line 1803, in run_test
res = await test.run(self)
File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
line 1349, in run
await self._run_cmd(harness, cmd)
File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
line 1415, in _run_cmd
returncode, result, additional_error =
await p.wait(self.runobj.timeout)
^
File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
line 1241, in wait
await try_wait_one(p.wait(), timeout=timeout)
File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
line 1132, in try_wait_one
await asyncio.wait(awaitables,
File "/usr/lib64/python3.11/asyncio/tasks.py", line 425, in wait
raise TypeError("Passing coroutines is forbidden, use tasks
explicitly.")
TypeError: Passing coroutines is forbidden, use tasks explicitly.
/usr/lib64/python3.11/asyncio/events.py:80: RuntimeWarning: coroutine
'Process.wait' was never awaited
self._context.run(self._callback, *self._args)
RuntimeWarning: Enable tracemalloc to get the object allocation traceback
This issue is fixed by upgrading to 0.57.2.
Fixes: 6f3dbd306de0 ("build: increase minimum meson version to 0.57")
Suggested-by: Robin Jarry
Signed-off-by: David Marchand
---
Note: for now, this is a quick fix only for restoring unit tests in the
CI before rc1.
There is still the question of whether we should align the minimal
version to 0.57.2 too.
This can be rediscussed for rc2.
---
.ci/linux-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
index 8512a92b21..938d492cbb 100755
--- a/.ci/linux-setup.sh
+++ b/.ci/linux-setup.sh
@@ -4,7 +4,7 @@
[ "$(id -u)" != '0' ] || alias sudo=
# need to install as 'root' since some of the unit tests won't run without it
-sudo python3 -m pip install --upgrade 'meson==0.57.0'
+sudo python3 -m pip install --upgrade 'meson==0.57.2'
# setup hugepages. error ignored because having hugepage is not mandatory.
cat /proc/meminfo
--
2.46.2
[PATCH dpdk v5 01/17] net: split raw checksum functions in separate header
The checksum functions are used by both ipv4 and ipv6 functions. In
preparation of moving ipv6 symbols to a new header, move the checksum
related symbols to another dedicated header.
Update doxygen index accordingly.
Signed-off-by: Robin Jarry
Acked-by: Stephen Hemminger
---
doc/api/doxy-api-index.md | 1 +
lib/net/meson.build | 1 +
lib/net/rte_cksum.h | 180 ++
lib/net/rte_ip.h | 148 +--
4 files changed, 183 insertions(+), 147 deletions(-)
create mode 100644 lib/net/rte_cksum.h
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 27e66d1406c8..8b83af53a863 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -221,6 +221,7 @@ The public API headers are grouped by topics:
[bitops](@ref rte_bitops.h),
[approx fraction](@ref rte_approx.h),
[random](@ref rte_random.h),
+ [checksum](@ref rte_cksum.h),
[config file](@ref rte_cfgfile.h),
[key/value args](@ref rte_kvargs.h),
[argument parsing](@ref rte_argparse.h),
diff --git a/lib/net/meson.build b/lib/net/meson.build
index 06da7338ba97..ac76acd6a934 100644
--- a/lib/net/meson.build
+++ b/lib/net/meson.build
@@ -2,6 +2,7 @@
# Copyright(c) 2017-2020 Intel Corporation
headers = files(
+'rte_cksum.h',
'rte_ip.h',
'rte_tcp.h',
'rte_udp.h',
diff --git a/lib/net/rte_cksum.h b/lib/net/rte_cksum.h
new file mode 100644
index ..a8e8927952df
--- /dev/null
+++ b/lib/net/rte_cksum.h
@@ -0,0 +1,180 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 1982, 1986, 1990, 1993
+ * The Regents of the University of California.
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright(c) 2014 6WIND S.A.
+ * All rights reserved.
+ */
+
+#ifndef _RTE_CKSUM_H_
+#define _RTE_CKSUM_H_
+
+/**
+ * @file
+ *
+ * Protocol independent checksum utilities.
+ */
+
+#include
+
+#include
+#include
+#include
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * @internal Calculate a sum of all words in the buffer.
+ * Helper routine for the rte_raw_cksum().
+ *
+ * @param buf
+ * Pointer to the buffer.
+ * @param len
+ * Length of the buffer.
+ * @param sum
+ * Initial value of the sum.
+ * @return
+ * sum += Sum of all words in the buffer.
+ */
+static inline uint32_t
+__rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
+{
+ const void *end;
+
+ for (end = RTE_PTR_ADD(buf, RTE_ALIGN_FLOOR(len, sizeof(uint16_t)));
+buf != end; buf = RTE_PTR_ADD(buf, sizeof(uint16_t))) {
+ uint16_t v;
+
+ memcpy(&v, buf, sizeof(uint16_t));
+ sum += v;
+ }
+
+ /* if length is odd, keeping it byte order independent */
+ if (unlikely(len % 2)) {
+ uint16_t left = 0;
+
+ memcpy(&left, end, 1);
+ sum += left;
+ }
+
+ return sum;
+}
+
+/**
+ * @internal Reduce a sum to the non-complemented checksum.
+ * Helper routine for the rte_raw_cksum().
+ *
+ * @param sum
+ * Value of the sum.
+ * @return
+ * The non-complemented checksum.
+ */
+static inline uint16_t
+__rte_raw_cksum_reduce(uint32_t sum)
+{
+ sum = ((sum & 0x) >> 16) + (sum & 0x);
+ sum = ((sum & 0x) >> 16) + (sum & 0x);
+ return (uint16_t)sum;
+}
+
+/**
+ * Process the non-complemented checksum of a buffer.
+ *
+ * @param buf
+ * Pointer to the buffer.
+ * @param len
+ * Length of the buffer.
+ * @return
+ * The non-complemented checksum.
+ */
+static inline uint16_t
+rte_raw_cksum(const void *buf, size_t len)
+{
+ uint32_t sum;
+
+ sum = __rte_raw_cksum(buf, len, 0);
+ return __rte_raw_cksum_reduce(sum);
+}
+
+/**
+ * Compute the raw (non complemented) checksum of a packet.
+ *
+ * @param m
+ * The pointer to the mbuf.
+ * @param off
+ * The offset in bytes to start the checksum.
+ * @param len
+ * The length in bytes of the data to checksum.
+ * @param cksum
+ * A pointer to the checksum, filled on success.
+ * @return
+ * 0 on success, -1 on error (bad length or offset).
+ */
+static inline int
+rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len,
+ uint16_t *cksum)
+{
+ const struct rte_mbuf *seg;
+ const char *buf;
+ uint32_t sum, tmp;
+ uint32_t seglen, done;
+
+ /* easy case: all data in the first segment */
+ if (off + len <= rte_pktmbuf_data_len(m)) {
+ *cksum = rte_raw_cksum(rte_pktmbuf_mtod_offset(m,
+ const char *, off), len);
+ return 0;
+ }
+
+ if (unlikely(off + len > rte_pktmbuf_pkt_len(m)))
+ return -1; /* invalid params, return a dummy value */
+
+ /* else browse the segment to find offset */
+ seglen = 0;
+ for (seg = m; seg != NULL; seg = seg->next) {
+ seglen = rte_pktmbuf_data_len(seg);
+ if (off <
[PATCH dpdk v5 00/17] IPv6 APIs overhaul
Hi everyone,
As discussed recently [1], here is a first draft of the IPv6 APIs rework. The
API change was announced before the 24.07 release [2]. This series is intended
for 24.11.
[1] http://inbox.dpdk.org/dev/d2sr8t1h39cj.jrqfi6jeh...@redhat.com/
[2]
https://git.dpdk.org/dpdk/commit/?id=835d4c41e0ab58a115c2170c886ba6d3cc1b5764
I tried to keep the patches as small as possible; unfortunately some of them
are quite big and cannot be broken down if we want to preserve a bisectable
tree.
Thanks!
Cc: Bruce Richardson
Cc: Ferruh Yigit
Cc: Konstantin Ananyev
Cc: Morten Brørup
Cc: Stephen Hemminger
Cc: Vladimir Medvedkin
Changelog:
v5:
- rebase on e214d58eb87b ("net: improve VLAN header type alignment")
- fix include ordering
- improve doxygen api
- fix RTE_IPV6_U16_SPLIT to make sparse happy about 0x literals being
truncated
- reformat macros with \ only separated with a space
- update changelog with deprecated symbols and their replacements, if any
Robin Jarry (17):
net: split raw checksum functions in separate header
net: split IPv4 and IPv6 symbols in separate headers
net: add IPv6 address structure and utils
net: use IPv6 structure for packet headers
lpm6: use IPv6 address structure and utils
fib6: use IPv6 address structure and utils
rib6: use IPv6 address structure and utils
cmdline: use IPv6 address structure
node: use IPv6 address structure and utils
pipeline: use IPv6 structures
ipsec: use IPv6 address structure
security: use IPv6 address structure
hash: use IPv6 address structure
gro: use IPv6 address structure
flow: use IPv6 address structure
net: add utilities for well known IPv6 address types
net: add function to check IPv6 version
MAINTAINERS |1 +
app/graph/ethdev.c | 44 +-
app/graph/ethdev.h |9 +-
app/graph/ip6_route.c| 51 +-
app/graph/meson.build|2 +-
app/graph/neigh.c| 21 +-
app/graph/neigh_priv.h |4 +-
app/graph/route.h|8 +-
app/test-fib/main.c | 74 +-
app/test-flow-perf/actions_gen.c |4 +-
app/test-flow-perf/items_gen.c |4 +-
app/test-pipeline/pipeline_hash.c|4 +-
app/test-pipeline/pipeline_lpm_ipv6.c| 11 +-
app/test-pmd/cmdline.c |4 +-
app/test-pmd/cmdline_flow.c | 14 +-
app/test-pmd/testpmd.h | 16 +-
app/test-sad/main.c | 24 +-
app/test/meson.build |1 +
app/test/packet_burst_generator.c|4 +-
app/test/test_cmdline_ipaddr.c | 49 +-
app/test/test_fib6.c | 92 +-
app/test/test_fib6_perf.c|8 +-
app/test/test_ipfrag.c |4 +-
app/test/test_ipsec_sad.c| 46 +-
app/test/test_lpm6.c | 490 +++---
app/test/test_lpm6_data.h| 2025 +++---
app/test/test_lpm6_perf.c| 10 +-
app/test/test_net_ip6.c | 195 +++
app/test/test_reassembly_perf.c | 23 +-
app/test/test_rib6.c | 55 +-
app/test/test_table_combined.c |2 +-
app/test/test_table_tables.c |8 +-
app/test/test_thash.c| 46 +-
doc/api/doxy-api-index.md|4 +-
doc/guides/prog_guide/ipsec_lib.rst |4 +-
doc/guides/rel_notes/deprecation.rst | 42 -
doc/guides/rel_notes/release_24_11.rst | 61 +
drivers/common/cnxk/cnxk_security.c | 14 +-
drivers/net/bnxt/bnxt_flow.c | 12 +-
drivers/net/bonding/rte_eth_bond_pmd.c |6 +-
drivers/net/cxgbe/cxgbe_flow.c | 18 +-
drivers/net/dpaa2/dpaa2_flow.c | 22 +-
drivers/net/hinic/hinic_pmd_flow.c |6 +-
drivers/net/hinic/hinic_pmd_tx.c |2 +-
drivers/net/hns3/hns3_flow.c |8 +-
drivers/net/i40e/i40e_flow.c | 12 +-
drivers/net/iavf/iavf_fdir.c |8 +-
drivers/net/iavf/iavf_fsub.c |8 +-
drivers/net/iavf/iavf_ipsec_crypto.c |9 +-
drivers/net/ice/ice_fdir_filter.c| 12 +-
drivers/net/ice/ice_switch_filter.c | 16 +-
drivers/net/igc/igc_flow.c |4 +-
drivers/net/ixgbe/ixgbe_flow.c | 12 +-
drivers/net/ixgbe/ixgbe_ipsec.c |4 +-
drivers/net/mlx5/hws/mlx5dr_definer.c| 36 +-
drivers/net/mlx5/mlx5_flow.c |6 +-
drivers/net/mlx5/mlx5_flow_dv.c | 16 +-
drivers/net/mlx5/mlx5_flow_hw.c | 10 +-
drivers/net/mlx5/mlx5_flow_verbs.c |8 +-
drivers/net/mvpp2/mrvl_flow.c| 16 +-
drivers/net/nfp/flower/nfp_flower_flow.c | 34 +-
drivers/net/nfp/nfp_ipsec.c |4 +-
drivers/net/nfp/nfp_net_flow.c
Re: [PATCH] ci: fix unit tests with Fedora 37
Acked-by: Patrick Robb
[PATCH dpdk v5 06/17] fib6: use IPv6 address structure and utils
Replace ad-hoc uint8_t[16] array types in the API of rte_fib6 with
rte_ipv6_addr structures. Replace duplicate functions and macros with
common ones from rte_ip6.h. Update all code accordingly.
Signed-off-by: Robin Jarry
---
app/test-fib/main.c| 8 +-
app/test/test_fib6.c | 92 +-
app/test/test_fib6_perf.c | 8 +-
doc/guides/rel_notes/deprecation.rst | 4 -
doc/guides/rel_notes/release_24_11.rst | 6 ++
examples/l3fwd/l3fwd_fib.c | 39
lib/fib/meson.build| 3 +-
lib/fib/rte_fib6.c | 25 ++---
lib/fib/rte_fib6.h | 16 ++--
lib/fib/trie.c | 123 +++--
lib/fib/trie.h | 19 ++--
lib/fib/trie_avx512.c | 38
lib/fib/trie_avx512.h | 10 +-
13 files changed, 195 insertions(+), 196 deletions(-)
diff --git a/app/test-fib/main.c b/app/test-fib/main.c
index 9f45d03d81fb..6479f48cdf6c 100644
--- a/app/test-fib/main.c
+++ b/app/test-fib/main.c
@@ -1074,7 +1074,7 @@ run_v6(void)
for (k = config.print_fract, i = 0; k > 0; k--) {
start = rte_rdtsc_precise();
for (j = 0; j < (config.nb_routes - i) / k; j++) {
- ret = rte_fib6_add(fib, rt[i + j].addr.a,
+ ret = rte_fib6_add(fib, &rt[i + j].addr,
rt[i + j].depth, rt[i + j].nh);
if (unlikely(ret != 0)) {
printf("Can not add a route to FIB, err %d\n",
@@ -1119,7 +1119,7 @@ run_v6(void)
acc = 0;
for (i = 0; i < config.nb_lookup_ips; i += BURST_SZ) {
start = rte_rdtsc_precise();
- ret = rte_fib6_lookup_bulk(fib, &tbl6[i].a,
+ ret = rte_fib6_lookup_bulk(fib, &tbl6[i],
fib_nh, BURST_SZ);
acc += rte_rdtsc_precise() - start;
if (ret != 0) {
@@ -1146,7 +1146,7 @@ run_v6(void)
for (i = 0; i < config.nb_lookup_ips; i += BURST_SZ) {
rte_fib6_lookup_bulk(fib,
- &tbl6[i].a,
+ &tbl6[i],
fib_nh, BURST_SZ);
rte_lpm6_lookup_bulk_func(lpm,
&tbl6[i],
@@ -1166,7 +1166,7 @@ run_v6(void)
for (k = config.print_fract, i = 0; k > 0; k--) {
start = rte_rdtsc_precise();
for (j = 0; j < (config.nb_routes - i) / k; j++)
- rte_fib6_delete(fib, rt[i + j].addr.a, rt[i + j].depth);
+ rte_fib6_delete(fib, &rt[i + j].addr, rt[i + j].depth);
printf("AVG FIB delete %"PRIu64"\n",
(rte_rdtsc_precise() - start) / j);
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index 2f836238fbf7..79220a88b112 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -147,7 +147,7 @@ test_add_del_invalid(void)
struct rte_fib6 *fib = NULL;
struct rte_fib6_conf config;
uint64_t nh = 100;
- uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE] = {0};
+ struct rte_ipv6_addr ip = RTE_IPV6_ADDR_UNSPEC;
int ret;
uint8_t depth = 24;
@@ -157,12 +157,12 @@ test_add_del_invalid(void)
config.type = RTE_FIB6_DUMMY;
/* rte_fib6_add: fib == NULL */
- ret = rte_fib6_add(NULL, ip, depth, nh);
+ ret = rte_fib6_add(NULL, &ip, depth, nh);
RTE_TEST_ASSERT(ret < 0,
"Call succeeded with invalid parameters\n");
/* rte_fib6_delete: fib == NULL */
- ret = rte_fib6_delete(NULL, ip, depth);
+ ret = rte_fib6_delete(NULL, &ip, depth);
RTE_TEST_ASSERT(ret < 0,
"Call succeeded with invalid parameters\n");
@@ -170,13 +170,13 @@ test_add_del_invalid(void)
fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
- /* rte_fib6_add: depth > RTE_FIB6_MAXDEPTH */
- ret = rte_fib6_add(fib, ip, RTE_FIB6_MAXDEPTH + 1, nh);
+ /* rte_fib6_add: depth > RTE_IPV6_MAX_DEPTH */
+ ret = rte_fib6_add(fib, &ip, RTE_IPV6_MAX_DEPTH + 1, nh);
RTE_TEST_ASSERT(ret < 0,
"Call succeeded with invalid parameters\n");
- /* rte_fib6_delete: depth > RTE_FIB6_MAXDEPTH */
- ret = rte_fib6_delete(fib, ip, RTE_FIB6_MAXDEPTH + 1);
+ /* rte_fib6_delete: depth > RTE_IPV6_MAX_DEPTH */
+ ret = rte_fib6_delete(fib, &ip, RTE_IPV6_MAX_DEPTH + 1);
RTE_TEST_ASSERT(ret < 0,
"Call succeeded with invalid parameters\n");
@@ -212,22 +212,22 @@ test_get_invalid(void)
*/
static int
lookup_and_check_asc(struct rte_fib6 *fib,
- uint8_t ip_arr[RTE_FIB6_MAXDEPTH][RTE_FIB6_IPV6_ADDR_SIZE],
- uint8_t ip_missing[][
[PATCH dpdk v5 03/17] net: add IPv6 address structure and utils
There is currently no structure defined for IPv6 addresses. Introduce
one that is simply a uint8_t array of 16 elements. The idea is to ensure
this structure alignment is 1 so that it can be mapped directly on
unaligned packet memory.
Add utility functions and macros that use the newly added rte_ipv6_addr
structure. Add basic unit tests to ensure everything works as expected.
These functions will be used in the next commits to replace private
and/or duplicated functions.
Signed-off-by: Robin Jarry
---
MAINTAINERS| 1 +
app/test/meson.build | 1 +
app/test/test_net_ip6.c| 111 +
doc/guides/rel_notes/release_24_11.rst | 5 +
lib/net/rte_ip6.h | 213 +
5 files changed, 331 insertions(+)
create mode 100644 app/test/test_net_ip6.c
diff --git a/MAINTAINERS b/MAINTAINERS
index f09cda04c87d..b94bf57a2034 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1526,6 +1526,7 @@ F: lib/net/
F: app/test/test_cksum.c
F: app/test/test_cksum_perf.c
F: app/test/test_net_ether.c
+F: app/test/test_net_ip6.c
Packet CRC
M: Jasvinder Singh
diff --git a/app/test/meson.build b/app/test/meson.build
index fe248b786c8e..0f7e11969a44 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -131,6 +131,7 @@ source_file_deps = {
'test_metrics.c': ['metrics'],
'test_mp_secondary.c': ['hash'],
'test_net_ether.c': ['net'],
+'test_net_ip6.c': ['net'],
'test_pcapng.c': ['ethdev', 'net', 'pcapng', 'bus_vdev'],
'test_pdcp.c': ['eventdev', 'pdcp', 'net', 'timer', 'security'],
'test_pdump.c': ['pdump'] + sample_packet_forward_deps,
diff --git a/app/test/test_net_ip6.c b/app/test/test_net_ip6.c
new file mode 100644
index ..dcc80c1309d1
--- /dev/null
+++ b/app/test/test_net_ip6.c
@@ -0,0 +1,111 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2024 Robin Jarry
+ */
+
+#include
+
+#include "test.h"
+
+static const struct rte_ipv6_addr mask_full = RTE_IPV6_MASK_FULL;
+static const struct rte_ipv6_addr zero_addr = RTE_IPV6_ADDR_UNSPEC;
+
+static int
+test_ipv6_addr_mask(void)
+{
+ const struct rte_ipv6_addr masked_3 = RTE_IPV6(0xe000, 0, 0, 0, 0, 0,
0, 0);
+ const struct rte_ipv6_addr masked_42 = RTE_IPV6(0x, 0x, 0xffc0,
0, 0, 0, 0, 0);
+ const struct rte_ipv6_addr masked_85 =
+ RTE_IPV6(0x, 0x, 0x, 0x, 0x, 0xf800, 0, 0);
+ const struct rte_ipv6_addr masked_127 =
+ RTE_IPV6(0x, 0x, 0x, 0x, 0x, 0x,
0x, 0xfffe);
+ struct rte_ipv6_addr ip;
+
+ ip = mask_full;
+ rte_ipv6_addr_mask(&ip, 0);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &zero_addr), "");
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&zero_addr), 0, "");
+
+ ip = mask_full;
+ rte_ipv6_addr_mask(&ip, 3);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &masked_3), "");
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&masked_3), 3, "");
+
+ ip = mask_full;
+ rte_ipv6_addr_mask(&ip, 42);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &masked_42), "");
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&masked_42), 42, "");
+
+ ip = mask_full;
+ rte_ipv6_addr_mask(&ip, 85);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &masked_85), "");
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&masked_85), 85, "");
+
+ ip = mask_full;
+ rte_ipv6_addr_mask(&ip, 127);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &masked_127), "");
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&masked_127), 127, "");
+
+ ip = mask_full;
+ rte_ipv6_addr_mask(&ip, 128);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &mask_full), "");
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&mask_full), 128, "");
+
+ const struct rte_ipv6_addr mask_holed =
+ RTE_IPV6(0x, 0x, 0x, 0xefff, 0x, 0x,
0x, 0x);
+ TEST_ASSERT_EQUAL(rte_ipv6_mask_depth(&mask_holed), 51, "");
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_ipv6_addr_eq_prefix(void)
+{
+ const struct rte_ipv6_addr ip1 =
+ RTE_IPV6(0x2a01, 0xcb00, 0x0254, 0x3300, 0x1b9f, 0x8071,
0x67cd, 0xbf20);
+ const struct rte_ipv6_addr ip2 =
+ RTE_IPV6(0x2a01, 0xcb00, 0x0254, 0x3300, 0x6239, 0xe1f4,
0x7a0b, 0x2371);
+ const struct rte_ipv6_addr ip3 =
+ RTE_IPV6(0xfd10, 0x0039, 0x0208, 0x0001, 0x, 0x,
0x, 0x1008);
+
+ TEST_ASSERT(rte_ipv6_addr_eq_prefix(&ip1, &ip2, 1), "");
+ TEST_ASSERT(rte_ipv6_addr_eq_prefix(&ip1, &ip2, 37), "");
+ TEST_ASSERT(rte_ipv6_addr_eq_prefix(&ip1, &ip2, 64), "");
+ TEST_ASSERT(!rte_ipv6_addr_eq_prefix(&ip1, &ip2, 112), "");
+ TEST_ASSERT(rte_ipv6_addr_eq_prefix(&ip1, &ip3, 0), "");
+ TEST_ASSERT(!rte_ipv6_addr_eq_prefix(&ip1, &ip3, 13), "");
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_ipv6_addr_kind(void)
+{
+ TEST_ASSERT(rte_ipv6_addr_i
[PATCH dpdk v5 04/17] net: use IPv6 structure for packet headers
The rte_ipv6_hdr uses ad-hoc uint8_t[16] arrays to represent addresses.
Replace these arrays with the newly added rte_ipv6_addr structure. Adapt
all code accordingly.
Signed-off-by: Robin Jarry
---
app/test-flow-perf/items_gen.c | 4 +--
app/test-pipeline/pipeline_hash.c| 4 +--
app/test/packet_burst_generator.c| 4 +--
app/test/test_ipfrag.c | 4 +--
app/test/test_reassembly_perf.c | 23 +++---
app/test/test_thash.c| 8 ++---
doc/guides/rel_notes/deprecation.rst | 2 --
doc/guides/rel_notes/release_24_11.rst | 6
drivers/net/bnxt/bnxt_flow.c | 12
drivers/net/bonding/rte_eth_bond_pmd.c | 6 ++--
drivers/net/cxgbe/cxgbe_flow.c | 14 -
drivers/net/dpaa2/dpaa2_flow.c | 22 +++---
drivers/net/hinic/hinic_pmd_flow.c | 6 ++--
drivers/net/hinic/hinic_pmd_tx.c | 2 +-
drivers/net/hns3/hns3_flow.c | 8 ++---
drivers/net/i40e/i40e_flow.c | 12
drivers/net/iavf/iavf_fdir.c | 8 ++---
drivers/net/iavf/iavf_fsub.c | 8 ++---
drivers/net/iavf/iavf_ipsec_crypto.c | 6 ++--
drivers/net/ice/ice_fdir_filter.c| 12
drivers/net/ice/ice_switch_filter.c | 16 +-
drivers/net/igc/igc_flow.c | 4 +--
drivers/net/ixgbe/ixgbe_flow.c | 12
drivers/net/ixgbe/ixgbe_ipsec.c | 4 +--
drivers/net/mlx5/hws/mlx5dr_definer.c| 36 +++---
drivers/net/mlx5/mlx5_flow.c | 6 ++--
drivers/net/mlx5/mlx5_flow_dv.c | 16 --
drivers/net/mlx5/mlx5_flow_hw.c | 10 +++
drivers/net/mlx5/mlx5_flow_verbs.c | 8 ++---
drivers/net/mvpp2/mrvl_flow.c| 16 --
drivers/net/nfp/flower/nfp_flower_flow.c | 32 ++--
drivers/net/nfp/nfp_net_flow.c | 38 +++-
drivers/net/qede/qede_filter.c | 4 +--
drivers/net/sfc/sfc_flow.c | 22 +-
drivers/net/tap/tap_flow.c | 10 +++
drivers/net/txgbe/txgbe_flow.c | 12
drivers/net/txgbe/txgbe_ipsec.c | 4 +--
examples/ip_fragmentation/main.c | 2 +-
examples/ip_pipeline/pipeline.c | 16 +-
examples/ip_reassembly/main.c| 2 +-
examples/ipsec-secgw/flow.c | 33
examples/ipsec-secgw/ipsec.c | 8 ++---
examples/ipsec-secgw/sa.c| 4 +--
examples/ipsec-secgw/sad.h | 10 ---
examples/l3fwd/l3fwd_fib.c | 2 +-
examples/l3fwd/l3fwd_lpm.c | 4 +--
lib/ethdev/rte_flow.h| 6 ++--
lib/hash/rte_thash.h | 12
lib/ip_frag/rte_ipv6_reassembly.c| 4 +--
lib/net/rte_ip6.h| 6 ++--
lib/node/ip6_lookup.c| 10 +++
lib/pipeline/rte_swx_ipsec.c | 6 ++--
lib/pipeline/rte_table_action.c | 24 +++
53 files changed, 260 insertions(+), 310 deletions(-)
diff --git a/app/test-flow-perf/items_gen.c b/app/test-flow-perf/items_gen.c
index 4ae72509d445..c740e1838ffb 100644
--- a/app/test-flow-perf/items_gen.c
+++ b/app/test-flow-perf/items_gen.c
@@ -78,8 +78,8 @@ add_ipv6(struct rte_flow_item *items,
for (i = 0; i < 16; i++) {
/* Currently src_ip is limited to 32 bit */
if (i < 4)
- ipv6_specs[ti].hdr.src_addr[15 - i] = para.src_ip >> (i
* 8);
- ipv6_masks[ti].hdr.src_addr[15 - i] = 0xff;
+ ipv6_specs[ti].hdr.src_addr.a[15 - i] = para.src_ip >>
(i * 8);
+ ipv6_masks[ti].hdr.src_addr.a[15 - i] = 0xff;
}
items[items_counter].type = RTE_FLOW_ITEM_TYPE_IPV6;
diff --git a/app/test-pipeline/pipeline_hash.c
b/app/test-pipeline/pipeline_hash.c
index cab9c2098014..194e5c5dcc53 100644
--- a/app/test-pipeline/pipeline_hash.c
+++ b/app/test-pipeline/pipeline_hash.c
@@ -432,7 +432,6 @@ app_main_loop_rx_metadata(void) {
struct rte_ipv4_hdr *ip_hdr;
struct rte_ipv6_hdr *ipv6_hdr;
uint32_t ip_dst;
- uint8_t *ipv6_dst;
uint32_t *signature, *k32;
m = app.mbuf_rx.array[j];
@@ -452,9 +451,8 @@ app_main_loop_rx_metadata(void) {
} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type))
{
ipv6_hdr = (struct rte_ipv6_hdr *)
&m_data[sizeof(struct
rte_ether_hdr)];
- ipv6_dst = ipv6_hdr->dst_addr;
- memcpy(key, ipv6_dst, 16);
+ memcp
[PATCH dpdk v5 11/17] ipsec: use IPv6 address structure
Update rte_ipsec_sadv6_key to use rte_ipv6_addr structures instead of
uint8_t[16] arrays.
Signed-off-by: Robin Jarry
---
app/test-sad/main.c| 24 ++--
app/test/test_ipsec_sad.c | 46
doc/guides/prog_guide/ipsec_lib.rst| 4 +-
doc/guides/rel_notes/deprecation.rst | 2 -
doc/guides/rel_notes/release_24_11.rst | 2 +
examples/ipsec-secgw/flow.c| 20 ++--
examples/ipsec-secgw/ipsec.c | 33 ++
examples/ipsec-secgw/ipsec.h | 5 +-
examples/ipsec-secgw/parser.c | 2 +-
examples/ipsec-secgw/parser.h | 4 +-
examples/ipsec-secgw/rt.c | 4 +-
examples/ipsec-secgw/sa.c | 37 +++---
examples/ipsec-secgw/sad.h | 12 +-
examples/ipsec-secgw/sp6.c | 154 ++---
lib/ipsec/rte_ipsec_sad.h | 5 +-
15 files changed, 171 insertions(+), 183 deletions(-)
diff --git a/app/test-sad/main.c b/app/test-sad/main.c
index addfc0714521..54e3fa0c91e6 100644
--- a/app/test-sad/main.c
+++ b/app/test-sad/main.c
@@ -248,8 +248,8 @@ get_random_rules(struct rule *tbl, uint32_t nb_rules, int
rule_tbl)
(uint64_t)(edge + step));
if (config.ipv6) {
for (j = 0; j < 16; j++) {
- tbl[i].tuple.v6.dip[j] = rte_rand();
- tbl[i].tuple.v6.sip[j] = rte_rand();
+ tbl[i].tuple.v6.dip.a[j] = rte_rand();
+ tbl[i].tuple.v6.sip.a[j] = rte_rand();
}
} else {
tbl[i].tuple.v4.dip = rte_rand();
@@ -274,9 +274,9 @@ get_random_rules(struct rule *tbl, uint32_t nb_rules, int
rule_tbl)
(uint64_t)(edge + step));
if (config.ipv6) {
for (j = 0; j < 16; j++) {
- tbl[i].tuple.v6.dip[j] =
+ tbl[i].tuple.v6.dip.a[j] =
rte_rand();
- tbl[i].tuple.v6.sip[j] =
+ tbl[i].tuple.v6.sip.a[j] =
rte_rand();
}
} else {
@@ -289,12 +289,8 @@ get_random_rules(struct rule *tbl, uint32_t nb_rules, int
rule_tbl)
config.nb_rules].tuple.v4.spi;
if (config.ipv6) {
int r_idx = i % config.nb_rules;
- memcpy(tbl[i].tuple.v6.dip,
- rules_tbl[r_idx].tuple.v6.dip,
- sizeof(tbl[i].tuple.v6.dip));
- memcpy(tbl[i].tuple.v6.sip,
- rules_tbl[r_idx].tuple.v6.sip,
- sizeof(tbl[i].tuple.v6.sip));
+ tbl[i].tuple.v6.dip =
rules_tbl[r_idx].tuple.v6.dip;
+ tbl[i].tuple.v6.sip =
rules_tbl[r_idx].tuple.v6.sip;
} else {
tbl[i].tuple.v4.dip = rules_tbl[i %
config.nb_rules].tuple.v4.dip;
@@ -472,8 +468,8 @@ print_result(const union rte_ipsec_sad_key *key, void *res)
v4 = &key->v4;
v6 = &key->v6;
spi = (config.ipv6 == 0) ? v4->spi : v6->spi;
- dip = (config.ipv6 == 0) ? &v4->dip : (const void *)v6->dip;
- sip = (config.ipv6 == 0) ? &v4->sip : (const void *)v6->sip;
+ dip = (config.ipv6 == 0) ? &v4->dip : (const void *)&v6->dip;
+ sip = (config.ipv6 == 0) ? &v4->sip : (const void *)&v6->sip;
if (res == NULL) {
printf("TUPLE: ");
@@ -500,8 +496,8 @@ print_result(const union rte_ipsec_sad_key *key, void *res)
v4 = &rule->tuple.v4;
v6 = &rule->tuple.v6;
spi = (config.ipv6 == 0) ? v4->spi : v6->spi;
- dip = (config.ipv6 == 0) ? &v4->dip : (const void *)v6->dip;
- sip = (config.ipv6 == 0) ? &v4->sip : (const void *)v6->sip;
+ dip = (config.ipv6 == 0) ? &v4->dip : (const void *)&v6->dip;
+ sip = (config.ipv6 == 0) ? &v4->sip : (const void *)&v6->sip;
printf("\n\tpoints to RULE ID %zu ",
RTE_PTR_DIFF(res, rules_tbl)/sizeof(struct rule));
print_tuple(af, spi, dip, sip);
diff --git a/app/test/test_ipsec_sad.c b/app/test/test_ipsec_sad.c
index 7534f16f89d0..642643eb639e 100644
--- a/app/tes
[PATCH dpdk v5 09/17] node: use IPv6 address structure and utils
Replace ad-hoc uint8_t[16] arrays with rte_ipv6_addr structures. Replace
duplicated code with utils from rte_ip6.h.
Signed-off-by: Robin Jarry
---
app/graph/ethdev.c | 44 +++---
app/graph/ethdev.h | 9 ++---
app/graph/ip6_route.c | 51 +++---
app/graph/meson.build | 2 +-
app/graph/neigh.c | 21 ---
app/graph/neigh_priv.h | 4 +-
app/graph/route.h | 8 ++--
doc/guides/rel_notes/deprecation.rst | 2 -
doc/guides/rel_notes/release_24_11.rst | 2 +
examples/l3fwd-graph/main.c| 33 ++---
lib/node/ip6_lookup.c | 9 ++---
lib/node/rte_node_ip6_api.h| 3 +-
12 files changed, 66 insertions(+), 122 deletions(-)
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index 13ed791412e1..b890efecb52a 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -124,30 +124,19 @@ ethdev_portid_by_ip4(uint32_t ip, uint32_t mask)
}
int16_t
-ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask)
+ethdev_portid_by_ip6(struct rte_ipv6_addr *ip, struct rte_ipv6_addr *mask)
{
- int portid = -EINVAL;
struct ethdev *port;
- int j;
TAILQ_FOREACH(port, ð_node, next) {
- for (j = 0; j < ETHDEV_IPV6_ADDR_LEN; j++) {
- if (mask == NULL) {
- if ((port->ip6_addr.ip[j] &
port->ip6_addr.mask[j]) !=
- (ip[j] & port->ip6_addr.mask[j]))
- break;
-
- } else {
- if ((port->ip6_addr.ip[j] &
port->ip6_addr.mask[j]) !=
- (ip[j] & mask[j]))
- break;
- }
- }
- if (j == ETHDEV_IPV6_ADDR_LEN)
+ uint8_t depth = rte_ipv6_mask_depth(&port->ip6_addr.mask);
+ if (mask != NULL)
+ depth = RTE_MAX(depth, rte_ipv6_mask_depth(mask));
+ if (rte_ipv6_addr_eq_prefix(&port->ip6_addr.ip, ip, depth))
return port->config.port_id;
}
- return portid;
+ return -EINVAL;
}
void
@@ -285,7 +274,7 @@ ethdev_ip6_addr_add(const char *name, struct
ipv6_addr_config *config)
{
struct ethdev *eth_hdl;
uint16_t portid = 0;
- int rc, i;
+ int rc;
rc = rte_eth_dev_get_port_by_name(name, &portid);
if (rc < 0)
@@ -294,10 +283,8 @@ ethdev_ip6_addr_add(const char *name, struct
ipv6_addr_config *config)
eth_hdl = ethdev_port_by_id(portid);
if (eth_hdl) {
- for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++) {
- eth_hdl->ip6_addr.ip[i] = config->ip[i];
- eth_hdl->ip6_addr.mask[i] = config->mask[i];
- }
+ eth_hdl->ip6_addr.ip = config->ip;
+ eth_hdl->ip6_addr.mask = config->mask;
return 0;
}
rc = -EINVAL;
@@ -623,14 +610,11 @@ cmd_ethdev_dev_ip6_addr_add_parsed(void *parsed_result,
__rte_unused struct cmdl
void *data __rte_unused)
{
struct cmd_ethdev_dev_ip6_addr_add_result *res = parsed_result;
- struct ipv6_addr_config config;
- int rc = -EINVAL, i;
-
- for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.ip[i] = res->ip.addr.ipv6.a[i];
-
- for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.mask[i] = res->mask.addr.ipv6.a[i];
+ struct ipv6_addr_config config = {
+ .ip = res->ip.addr.ipv6,
+ .mask = res->mask.addr.ipv6,
+ };
+ int rc;
rc = ethdev_ip6_addr_add(res->dev, &config);
if (rc < 0)
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index d0de593fc743..046689ee5fc7 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -6,8 +6,7 @@
#define APP_GRAPH_ETHDEV_H
#include
-
-#define ETHDEV_IPV6_ADDR_LEN 16
+#include
struct ipv4_addr_config {
uint32_t ip;
@@ -15,8 +14,8 @@ struct ipv4_addr_config {
};
struct ipv6_addr_config {
- uint8_t ip[ETHDEV_IPV6_ADDR_LEN];
- uint8_t mask[ETHDEV_IPV6_ADDR_LEN];
+ struct rte_ipv6_addr ip;
+ struct rte_ipv6_addr mask;
};
extern uint32_t enabled_port_mask;
@@ -25,7 +24,7 @@ void ethdev_start(void);
void ethdev_stop(void);
void *ethdev_mempool_list_by_portid(uint16_t portid);
int16_t ethdev_portid_by_ip4(uint32_t ip, uint32_t mask);
-int16_t ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask);
+int16_t ethdev_portid_by_ip6(struct rte_ipv6_addr *ip, struct rte_ipv6_addr
*mask);
int16_t ethdev_txport_by_rxport_get(uint16_t portid_rx);
void ethdev_list_clean(void);
diff --git a/app/graph/ip6_route.c b/app/graph/ip6_route.c
index d91466cd78d6..ec53239b069b 100644
-
[PATCH dpdk v5 14/17] gro: use IPv6 address structure
Update tcp6_flow_key to use rte_ipv6_addr structures instead of
uint8_t[16] arrays.
Signed-off-by: Robin Jarry
---
doc/guides/rel_notes/deprecation.rst | 2 --
doc/guides/rel_notes/release_24_11.rst | 2 ++
lib/gro/gro_tcp6.c | 8
lib/gro/gro_tcp6.h | 6 --
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 005f8c3e66a1..bd2a7b877db0 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -70,8 +70,6 @@ Deprecation Notices
- ``struct rte_flow_item_icmp6_nd_na``
- ``struct rte_flow_action_set_ipv6``
- ``struct rte_flow_tunnel``
- gro
-- ``struct tcp6_flow_key``
* net, ethdev: The flow item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE``
is replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``.
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index fbde3d2ae826..bdedbc1f8a6f 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -299,6 +299,8 @@ API Changes
- ``RTE_FIB6_MAXDEPTH`` (deprecated, replaced with ``RTE_IPV6_MAX_DEPTH``)
hash
- ``struct rte_ipv6_tuple``
+ gro
+- ``struct tcp6_flow_key``
ipsec
- ``struct rte_ipsec_sadv6_key``
lpm
diff --git a/lib/gro/gro_tcp6.c b/lib/gro/gro_tcp6.c
index 6edfb6045cf6..ab4cd6c68bf0 100644
--- a/lib/gro/gro_tcp6.c
+++ b/lib/gro/gro_tcp6.c
@@ -99,8 +99,8 @@ insert_new_flow(struct gro_tcp6_tbl *tbl,
dst = &(tbl->flows[flow_idx].key);
ASSIGN_COMMON_TCP_KEY((&src->cmn_key), (&dst->cmn_key));
- memcpy(&dst->src_addr[0], &src->src_addr[0], sizeof(dst->src_addr));
- memcpy(&dst->dst_addr[0], &src->dst_addr[0], sizeof(dst->dst_addr));
+ dst->src_addr = src->src_addr;
+ dst->dst_addr = src->dst_addr;
dst->vtc_flow = src->vtc_flow;
tbl->flows[flow_idx].start_index = item_idx;
@@ -168,8 +168,8 @@ gro_tcp6_reassemble(struct rte_mbuf *pkt,
rte_ether_addr_copy(&(eth_hdr->src_addr), &(key.cmn_key.eth_saddr));
rte_ether_addr_copy(&(eth_hdr->dst_addr), &(key.cmn_key.eth_daddr));
- memcpy(&key.src_addr[0], &ipv6_hdr->src_addr, sizeof(key.src_addr));
- memcpy(&key.dst_addr[0], &ipv6_hdr->dst_addr, sizeof(key.dst_addr));
+ key.src_addr = ipv6_hdr->src_addr;
+ key.dst_addr = ipv6_hdr->dst_addr;
key.cmn_key.src_port = tcp_hdr->src_port;
key.cmn_key.dst_port = tcp_hdr->dst_port;
key.cmn_key.recv_ack = tcp_hdr->recv_ack;
diff --git a/lib/gro/gro_tcp6.h b/lib/gro/gro_tcp6.h
index 073122f0ec84..acf3971bb6e9 100644
--- a/lib/gro/gro_tcp6.h
+++ b/lib/gro/gro_tcp6.h
@@ -5,6 +5,8 @@
#ifndef _GRO_TCP6_H_
#define _GRO_TCP6_H_
+#include
+
#include "gro_tcp.h"
#define GRO_TCP6_TBL_MAX_ITEM_NUM (1024UL * 1024UL)
@@ -12,8 +14,8 @@
/* Header fields representing a TCP/IPv6 flow */
struct tcp6_flow_key {
struct cmn_tcp_key cmn_key;
- uint8_t src_addr[16];
- uint8_t dst_addr[16];
+ struct rte_ipv6_addr src_addr;
+ struct rte_ipv6_addr dst_addr;
rte_be32_t vtc_flow;
};
--
2.47.0
[PATCH dpdk v5 12/17] security: use IPv6 address structure
For consistency with the rest of the code base, update
rte_security_ipsec_tunnel_param to use rte_ipv6_addr structures instead
of in6_addr.
Signed-off-by: Robin Jarry
---
doc/guides/rel_notes/release_24_11.rst | 2 ++
drivers/common/cnxk/cnxk_security.c| 14 ++
drivers/net/iavf/iavf_ipsec_crypto.c | 3 +--
drivers/net/nfp/nfp_ipsec.c| 4 ++--
examples/ipsec-secgw/ipsec.c | 12 ++--
lib/pipeline/rte_swx_ipsec.c | 8 ++--
lib/security/rte_security.h| 5 +++--
7 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 77459dbbff33..f3d0e170d134 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -316,6 +316,8 @@ API Changes
- ``struct rte_swx_ipsec_sa_encap_params``
- ``struct rte_table_action_ipv6_header``
- ``struct rte_table_action_nat_params``
+ security
+- ``struct rte_security_ipsec_tunnel_param``
table
- ``struct rte_table_lpm_ipv6_key``
- ``RTE_LPM_IPV6_ADDR_SIZE`` (deprecated, replaced with
``RTE_IPV6_ADDR_SIZE``)
diff --git a/drivers/common/cnxk/cnxk_security.c
b/drivers/common/cnxk/cnxk_security.c
index e67c3f233187..c2871ad2bda5 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -271,9 +271,9 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa,
case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;
memcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.src_addr));
memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.dst_addr));
/* IP Source and Dest are in LE/CPU endian */
ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.src_addr);
@@ -472,9 +472,9 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;
memcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.src_addr));
memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.dst_addr));
/* IP Source and Dest are in LE/CPU endian */
ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.src_addr);
@@ -1087,10 +1087,8 @@ cnxk_on_ipsec_outb_sa_create(struct
rte_security_ipsec_xform *ipsec,
ip6->hop_limits = ipsec->tunnel.ipv6.hlimit ?
ipsec->tunnel.ipv6.hlimit :
0x40;
- memcpy(&ip6->src_addr, &ipsec->tunnel.ipv6.src_addr,
- sizeof(struct in6_addr));
- memcpy(&ip6->dst_addr, &ipsec->tunnel.ipv6.dst_addr,
- sizeof(struct in6_addr));
+ ip6->src_addr = ipsec->tunnel.ipv6.src_addr;
+ ip6->dst_addr = ipsec->tunnel.ipv6.dst_addr;
}
} else
ctx_len += sizeof(template->ip4);
diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c
b/drivers/net/iavf/iavf_ipsec_crypto.c
index 89dd5af5500f..90421a66c309 100644
--- a/drivers/net/iavf/iavf_ipsec_crypto.c
+++ b/drivers/net/iavf/iavf_ipsec_crypto.c
@@ -510,8 +510,7 @@ iavf_ipsec_crypto_security_association_add(struct
iavf_adapter *adapter,
*((uint32_t *)sa_cfg->dst_addr) =
htonl(conf->ipsec.tunnel.ipv4.dst_ip.s_addr);
} else {
- uint32_t *v6_dst_addr =
- (uint32_t *)conf->ipsec.tunnel.ipv6.dst_addr.s6_addr;
+ uint32_t *v6_dst_addr = (uint32_t
*)&conf->ipsec.tunnel.ipv6.dst_addr;
sa_cfg->virtchnl_ip_type = VIRTCHNL_IPV6;
diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c
index 89116af1b22f..13f2b850e59d 100644
--- a/drivers/net/nfp/nfp_ipsec.c
+++ b/drivers/net/nfp/nfp_ipsec.c
@@ -1042,8 +1042,8 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev,
cfg->dst_ip[0] = rte_be_to_cpu_32(dst_ip[0]);
cfg->ipv6 = 0;
} else if (type == RTE_SECURITY_IPSEC_TUNNEL_IPV6) {
- src_ip = (rte_be32_t
*)conf->ipsec.tunnel.ipv6.src_addr.s6_addr;
- dst_ip = (rte_be32_t
*)conf->ipsec.tunnel.ipv6.dst_addr.s6_addr;
+ src_ip = (rte_
[PATCH dpdk v5 16/17] net: add utilities for well known IPv6 address types
Add more utilities to work with IPv6 addresses. These functions will be
required in order to help building IPv6 routing applications.
Signed-off-by: Robin Jarry
Acked-by: Stephen Hemminger
---
app/test/test_net_ip6.c | 68 +
lib/net/rte_ip6.h | 209
2 files changed, 277 insertions(+)
diff --git a/app/test/test_net_ip6.c b/app/test/test_net_ip6.c
index dcc80c1309d1..94033421ad0b 100644
--- a/app/test/test_net_ip6.c
+++ b/app/test/test_net_ip6.c
@@ -81,20 +81,85 @@ static int
test_ipv6_addr_kind(void)
{
TEST_ASSERT(rte_ipv6_addr_is_unspec(&zero_addr), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&zero_addr), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_loopback(&zero_addr), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_mcast(&zero_addr), "");
const struct rte_ipv6_addr ucast =
RTE_IPV6(0x2a01, 0xcb00, 0x0254, 0x3300, 0x6239, 0xe1f4,
0x7a0b, 0x2371);
TEST_ASSERT(!rte_ipv6_addr_is_unspec(&ucast), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&ucast), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_loopback(&ucast), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_mcast(&ucast), "");
const struct rte_ipv6_addr mcast = RTE_IPV6(0xff01, 0, 0, 0, 0, 0, 0,
1);
TEST_ASSERT(!rte_ipv6_addr_is_unspec(&mcast), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&mcast), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_loopback(&mcast), "");
+ TEST_ASSERT(rte_ipv6_addr_is_mcast(&mcast), "");
const struct rte_ipv6_addr lo = RTE_IPV6_ADDR_LOOPBACK;
TEST_ASSERT(!rte_ipv6_addr_is_unspec(&lo), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_linklocal(&lo), "");
+ TEST_ASSERT(rte_ipv6_addr_is_loopback(&lo), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_mcast(&lo), "");
const struct rte_ipv6_addr local =
RTE_IPV6(0xfe80, 0, 0, 0, 0x5a84, 0xc52c, 0x6aef, 0x4639);
TEST_ASSERT(!rte_ipv6_addr_is_unspec(&local), "");
+ TEST_ASSERT(rte_ipv6_addr_is_linklocal(&local), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_loopback(&local), "");
+ TEST_ASSERT(!rte_ipv6_addr_is_mcast(&local), "");
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_ipv6_llocal_from_ethernet(void)
+{
+ const struct rte_ether_addr local_mac = {{0x04, 0x7b, 0xcb, 0x5c, 0x08,
0x44}};
+ const struct rte_ipv6_addr local_ip =
+ RTE_IPV6(0xfe80, 0, 0, 0, 0x047b, 0xcbff, 0xfe5c, 0x0844);
+ struct rte_ipv6_addr ip;
+
+ rte_ipv6_llocal_from_ethernet(&ip, &local_mac);
+ TEST_ASSERT(rte_ipv6_addr_eq(&ip, &local_ip), "");
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_ipv6_solnode_from_addr(void)
+{
+ struct rte_ipv6_addr sol;
+
+ const struct rte_ipv6_addr llocal =
+ RTE_IPV6(0xfe80, 0, 0, 0, 0x047b, 0xcbff, 0xfe5c, 0x0844);
+ const struct rte_ipv6_addr llocal_sol =
+ RTE_IPV6(0xff02, 0, 0, 0, 0, 0x0001, 0xff5c, 0x0844);
+ rte_ipv6_solnode_from_addr(&sol, &llocal);
+ TEST_ASSERT(rte_ipv6_addr_eq(&sol, &llocal_sol), "");
+
+ const struct rte_ipv6_addr ucast =
+ RTE_IPV6(0x2a01, 0xcb00, 0x0254, 0x3300, 0x1b9f, 0x8071,
0x67cd, 0xbf20);
+ const struct rte_ipv6_addr ucast_sol =
+ RTE_IPV6(0xff02, 0, 0, 0, 0, 0x0001, 0xffcd, 0xbf20);
+ rte_ipv6_solnode_from_addr(&sol, &ucast);
+ TEST_ASSERT(rte_ipv6_addr_eq(&sol, &ucast_sol), "");
+
+ return TEST_SUCCESS;
+}
+
+static int
+test_ether_mcast_from_ipv6(void)
+{
+ const struct rte_ether_addr mcast_mac = {{0x33, 0x33, 0xd3, 0x00, 0x02,
0x01}};
+ const struct rte_ipv6_addr mcast_ip =
+ RTE_IPV6(0xff02, 0, 0, 0x0201, 0, 0, 0xd300, 0x0201);
+ struct rte_ether_addr mac;
+
+ rte_ether_mcast_from_ipv6(&mac, &mcast_ip);
+ TEST_ASSERT(rte_is_same_ether_addr(&mac, &mcast_mac), "");
return TEST_SUCCESS;
}
@@ -105,6 +170,9 @@ test_net_ipv6(void)
TEST_ASSERT_SUCCESS(test_ipv6_addr_mask(), "");
TEST_ASSERT_SUCCESS(test_ipv6_addr_eq_prefix(), "");
TEST_ASSERT_SUCCESS(test_ipv6_addr_kind(), "");
+ TEST_ASSERT_SUCCESS(test_ipv6_llocal_from_ethernet(), "");
+ TEST_ASSERT_SUCCESS(test_ipv6_solnode_from_addr(), "");
+ TEST_ASSERT_SUCCESS(test_ether_mcast_from_ipv6(), "");
return TEST_SUCCESS;
}
diff --git a/lib/net/rte_ip6.h b/lib/net/rte_ip6.h
index 25a77277f050..12d33034a3f9 100644
--- a/lib/net/rte_ip6.h
+++ b/lib/net/rte_ip6.h
@@ -28,6 +28,7 @@
#include
#endif
+#include
#include
#include
#include
@@ -248,6 +249,214 @@ rte_ipv6_addr_is_unspec(const struct rte_ipv6_addr *ip)
/** Loopback IPv6 address as defined in RFC 4291, section 2.5.3. */
#define RTE_IPV6_ADDR_LOOPBACK RTE_IPV6(0, 0, 0, 0, 0, 0, 0, 1)
+/**
+ * Check if an IPv6 address is the loopback address as defined in RFC 4291,
+ * section 2.5.3.
+ *
+ * @param ip
+ * The address to check.
+ * @return
+ * @c true if
[PATCH dpdk v5 15/17] flow: use IPv6 address structure
Update rte_flow_tunnel, rte_flow_action_set_ipv6,
rte_flow_item_icmp6_nd_na and rte_flow_item_icmp6_nd_ns to use
rte_ipv6_addr structures instead of uint8_t[16] arrays.
Signed-off-by: Robin Jarry
---
app/test-flow-perf/actions_gen.c | 4 ++--
doc/guides/rel_notes/deprecation.rst | 10 --
doc/guides/rel_notes/release_24_11.rst | 5 +
drivers/net/cxgbe/cxgbe_flow.c | 4 ++--
drivers/net/nfp/flower/nfp_flower_flow.c | 2 +-
lib/ethdev/rte_flow.h| 16 +++-
6 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/app/test-flow-perf/actions_gen.c b/app/test-flow-perf/actions_gen.c
index b5336e83ff9f..54fcbacb98ce 100644
--- a/app/test-flow-perf/actions_gen.c
+++ b/app/test-flow-perf/actions_gen.c
@@ -304,7 +304,7 @@ add_set_src_ipv6(struct rte_flow_action *actions,
/* IPv6 value to set is random each time */
for (i = 0; i < 16; i++) {
- set_ipv6[para.core_idx].ipv6_addr[i] = ipv6 & 0xff;
+ set_ipv6[para.core_idx].ipv6_addr.a[i] = ipv6 & 0xff;
ipv6 = ipv6 >> 8;
}
@@ -327,7 +327,7 @@ add_set_dst_ipv6(struct rte_flow_action *actions,
/* IPv6 value to set is random each time */
for (i = 0; i < 16; i++) {
- set_ipv6[para.core_idx].ipv6_addr[i] = ipv6 & 0xff;
+ set_ipv6[para.core_idx].ipv6_addr.a[i] = ipv6 & 0xff;
ipv6 = ipv6 >> 8;
}
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index bd2a7b877db0..17b733200740 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -61,16 +61,6 @@ Deprecation Notices
us extending existing enum/define.
One solution can be using a fixed size array instead of ``.*MAX.*`` value.
-* net: A new IPv6 address structure will be introduced in DPDK 24.11.
- It will replace all ad-hoc ``uint8_t[16]`` arrays in all public APIs and
structures.
- The following libraries and symbols are expected to be affected:
-
- ethdev
-- ``struct rte_flow_item_icmp6_nd_ns``
-- ``struct rte_flow_item_icmp6_nd_na``
-- ``struct rte_flow_action_set_ipv6``
-- ``struct rte_flow_tunnel``
-
* net, ethdev: The flow item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE``
is replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``.
The struct ``rte_flow_item_vxlan_gpe`` and its mask
``rte_flow_item_vxlan_gpe_mask``
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index bdedbc1f8a6f..25f5e1f4cba5 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -291,6 +291,11 @@ API Changes
cmdline
- ``cmdline_ipaddr_t``
+ ethdev
+- ``struct rte_flow_action_set_ipv6``
+- ``struct rte_flow_item_icmp6_nd_na``
+- ``struct rte_flow_item_icmp6_nd_ns``
+- ``struct rte_flow_tunnel``
fib
- ``rte_fib6_add()``
- ``rte_fib6_delete()``
diff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c
index b6d169097c1a..14b9b49792bc 100644
--- a/drivers/net/cxgbe/cxgbe_flow.c
+++ b/drivers/net/cxgbe/cxgbe_flow.c
@@ -680,7 +680,7 @@ ch_rte_parse_atype_switch(const struct rte_flow_action *a,
"found.");
ipv6 = (const struct rte_flow_action_set_ipv6 *)a->conf;
- memcpy(fs->nat_fip, ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr));
+ memcpy(fs->nat_fip, &ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr));
*nmode |= 1 << 0;
break;
case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST:
@@ -693,7 +693,7 @@ ch_rte_parse_atype_switch(const struct rte_flow_action *a,
"found.");
ipv6 = (const struct rte_flow_action_set_ipv6 *)a->conf;
- memcpy(fs->nat_lip, ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr));
+ memcpy(fs->nat_lip, &ipv6->ipv6_addr, sizeof(ipv6->ipv6_addr));
*nmode |= 1 << 1;
break;
case RTE_FLOW_ACTION_TYPE_SET_TP_SRC:
diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c
b/drivers/net/nfp/flower/nfp_flower_flow.c
index 43574afea8ac..df3fd5e2a298 100644
--- a/drivers/net/nfp/flower/nfp_flower_flow.c
+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
@@ -3011,7 +3011,7 @@ nfp_flow_action_set_ipv6(char *act_data,
set_ip->reserved = 0;
for (i = 0; i < 4; i++) {
- rte_memcpy(&tmp, &set_ipv6->ipv6_addr[i * 4], 4);
+ rte_memcpy(&tmp, &set_ipv6->ipv6_addr.a[i * 4], 4);
set_ip->ipv6[i].exact = tmp;
set_ip->ipv6[i].mask = RTE_BE32(0x);
}
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index e8baedcc79d8..3d2ccdeb9226 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -1498,15 +1498,14 @@ struct rte_flow_item_icmp6_nd_ns {
uint8_t code; /**< ICMPv6 code, n
[PATCH dpdk v5 17/17] net: add function to check IPv6 version
Add a function to check the version in IPv6 headers.
Signed-off-by: Robin Jarry
---
app/test/test_net_ip6.c | 16
lib/net/rte_ip6.h | 16
2 files changed, 32 insertions(+)
diff --git a/app/test/test_net_ip6.c b/app/test/test_net_ip6.c
index 94033421ad0b..9cc10b1f714f 100644
--- a/app/test/test_net_ip6.c
+++ b/app/test/test_net_ip6.c
@@ -9,6 +9,21 @@
static const struct rte_ipv6_addr mask_full = RTE_IPV6_MASK_FULL;
static const struct rte_ipv6_addr zero_addr = RTE_IPV6_ADDR_UNSPEC;
+static int
+test_ipv6_check_version(void)
+{
+ struct rte_ipv6_hdr h;
+
+ h.vtc_flow = 0;
+ TEST_ASSERT_EQUAL(rte_ipv6_check_version(&h), -EINVAL, "");
+ h.vtc_flow = RTE_BE32(0x7f00ba44);
+ TEST_ASSERT_EQUAL(rte_ipv6_check_version(&h), -EINVAL, "");
+ h.vtc_flow = RTE_BE32(0x6badcaca);
+ TEST_ASSERT_EQUAL(rte_ipv6_check_version(&h), 0, "");
+
+ return 0;
+}
+
static int
test_ipv6_addr_mask(void)
{
@@ -167,6 +182,7 @@ test_ether_mcast_from_ipv6(void)
static int
test_net_ipv6(void)
{
+ TEST_ASSERT_SUCCESS(test_ipv6_check_version(), "");
TEST_ASSERT_SUCCESS(test_ipv6_addr_mask(), "");
TEST_ASSERT_SUCCESS(test_ipv6_addr_eq_prefix(), "");
TEST_ASSERT_SUCCESS(test_ipv6_addr_kind(), "");
diff --git a/lib/net/rte_ip6.h b/lib/net/rte_ip6.h
index 12d33034a3f9..25551f6e7414 100644
--- a/lib/net/rte_ip6.h
+++ b/lib/net/rte_ip6.h
@@ -469,6 +469,22 @@ struct rte_ipv6_hdr {
struct rte_ipv6_addr dst_addr; /**< IP address of destination host(s).
*/
} __rte_packed;
+/**
+ * Check that the IPv6 header version field is valid according to RFC 8200
section 3.
+ *
+ * @param ip
+ * The IPv6 header.
+ * @return
+ * @c 0 if the version field is valid. @c -EINVAL otherwise.
+ */
+static inline int rte_ipv6_check_version(const struct rte_ipv6_hdr *ip)
+{
+ uint8_t version = ((const uint8_t *)ip)[0];
+ if ((version & 0xf0) != 0x60)
+ return -EINVAL;
+ return 0;
+}
+
/* IPv6 routing extension type definition. */
#define RTE_IPV6_SRCRT_TYPE_4 4
--
2.47.0
Restrict max packet size on rx
Team, Does setting mtu using rte_eth_dev_set_mtu limit the maximum size of the packet received on the dpdk port to the configured mtu size? On an intel machine with ixgbe port, with mtu set to 1500, no rx-offloads enabled, ixgbe dpdk port is able to receive packets greater than 1500 size and even jumbo frames of size 9000, even though the peer is sending them fragmented with mtu of 1500. How do I restrict the port not to receive any frame greater than mtu size? Appreciate any help, Thanks. Rajasekhar
[PATCH dpdk v5 08/17] cmdline: use IPv6 address structure
The previous commits introduced a new rte_ipv6_addr structure without
any alignment requirements. It is not compatible with the in6_addr POSIX
type available in netinet/in.h.
The main issue is that in6_addr is not uniform on all platforms which
causes unaligned access warnings when compiling without
-Wno-address-of-packed-member (set in dpdk by default).
In order to have a consistent code base, replace in6_addr with
rte_ipv6_addr in the cmdline library. Update all code accordingly.
Signed-off-by: Robin Jarry
---
app/graph/ethdev.c | 4 +--
app/graph/ip6_route.c | 6 ++--
app/graph/neigh.c | 2 +-
app/test-pmd/cmdline.c | 4 +--
app/test-pmd/cmdline_flow.c| 14 +++-
app/test-pmd/testpmd.h | 16 -
app/test/test_cmdline_ipaddr.c | 49 --
doc/guides/rel_notes/release_24_11.rst | 2 ++
examples/cmdline/commands.c| 30 +++-
lib/cmdline/cmdline_parse_ipaddr.h | 3 +-
10 files changed, 34 insertions(+), 96 deletions(-)
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index cfc1b1856910..13ed791412e1 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -627,10 +627,10 @@ cmd_ethdev_dev_ip6_addr_add_parsed(void *parsed_result,
__rte_unused struct cmdl
int rc = -EINVAL, i;
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.ip[i] = res->ip.addr.ipv6.s6_addr[i];
+ config.ip[i] = res->ip.addr.ipv6.a[i];
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.mask[i] = res->mask.addr.ipv6.s6_addr[i];
+ config.mask[i] = res->mask.addr.ipv6.a[i];
rc = ethdev_ip6_addr_add(res->dev, &config);
if (rc < 0)
diff --git a/app/graph/ip6_route.c b/app/graph/ip6_route.c
index 834719ecaeb4..d91466cd78d6 100644
--- a/app/graph/ip6_route.c
+++ b/app/graph/ip6_route.c
@@ -157,13 +157,13 @@ cmd_ipv6_lookup_route_add_ipv6_parsed(void
*parsed_result, __rte_unused struct c
int rc = -EINVAL, i;
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.ip[i] = res->ip.addr.ipv6.s6_addr[i];
+ config.ip[i] = res->ip.addr.ipv6.a[i];
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.mask[i] = res->mask.addr.ipv6.s6_addr[i];
+ config.mask[i] = res->mask.addr.ipv6.a[i];
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.gateway[i] = res->via_ip.addr.ipv6.s6_addr[i];
+ config.gateway[i] = res->via_ip.addr.ipv6.a[i];
rc = route_ip6_add(&config);
if (rc)
diff --git a/app/graph/neigh.c b/app/graph/neigh.c
index 79fd542c8948..eb7a09f1f145 100644
--- a/app/graph/neigh.c
+++ b/app/graph/neigh.c
@@ -266,7 +266,7 @@ cmd_neigh_add_ipv6_parsed(void *parsed_result, __rte_unused
struct cmdline *cl,
uint64_t mac;
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- ip[i] = res->ip.addr.ipv6.s6_addr[i];
+ ip[i] = res->ip.addr.ipv6.a[i];
if (parser_mac_read(&mac, res->mac)) {
printf(MSG_ARG_INVALID, "mac");
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 76d906ee5a27..7e0666e9f634 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8977,9 +8977,7 @@ do { \
#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
do { \
if ((ip_addr).family == AF_INET6) \
- rte_memcpy(&(ip), \
-&((ip_addr).addr.ipv6), \
-sizeof(struct in6_addr)); \
+ ip = ip_addr.addr.ipv6; \
else { \
fprintf(stderr, "invalid parameter.\n"); \
return; \
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 5f71e5ba4440..1e4f2ebc556f 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -902,10 +902,8 @@ struct vxlan_encap_conf vxlan_encap_conf = {
.udp_dst = RTE_BE16(RTE_VXLAN_DEFAULT_PORT),
.ipv4_src = RTE_IPV4(127, 0, 0, 1),
.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
- .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
- .ipv6_dst = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11 },
+ .ipv6_src = RTE_IPV6_ADDR_LOOPBACK,
+ .ipv6_dst = RTE_IPV6(0, 0, 0, 0, 0, 0, 0, 0x),
.vlan_tci = 0,
.ip_tos = 0,
.ip_ttl = 255,
@@ -936,10 +934,8 @@ struct nvgre_encap_conf nvgre_encap_conf = {
.tni = { 0x00, 0x00, 0x00 },
.ipv4_src = RTE_IPV4(127, 0, 0, 1),
.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
- .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
- .ipv6_dst = { 0x00, 0x00,
[PATCH dpdk v5 07/17] rib6: use IPv6 address structure and utils
Replace ad-hoc uint8_t[16] array types in the API of rte_rib6 with
rte_ipv6_addr structures. Replace duplicate functions and macros with
common ones from rte_ip6.h. Update all code accordingly.
Signed-off-by: Robin Jarry
---
app/test/test_rib6.c | 55 ++--
doc/guides/rel_notes/deprecation.rst | 7 --
doc/guides/rel_notes/release_24_11.rst | 11 +++
lib/fib/rte_fib6.c | 8 +-
lib/fib/trie.c | 16 ++--
lib/rib/meson.build| 2 +-
lib/rib/rte_rib6.c | 112 ++---
lib/rib/rte_rib6.h | 27 --
8 files changed, 113 insertions(+), 125 deletions(-)
diff --git a/app/test/test_rib6.c b/app/test/test_rib6.c
index 33596fddb4e5..ba54a3794ea7 100644
--- a/app/test/test_rib6.c
+++ b/app/test/test_rib6.c
@@ -6,7 +6,7 @@
#include
#include
#include
-#include
+#include
#include
#include "test.h"
@@ -118,14 +118,14 @@ test_insert_invalid(void)
struct rte_rib6 *rib = NULL;
struct rte_rib6_node *node, *node1;
struct rte_rib6_conf config;
- uint8_t ip[RTE_RIB6_IPV6_ADDR_SIZE] = {0};
+ struct rte_ipv6_addr ip = {0};
uint8_t depth = 24;
config.max_nodes = MAX_RULES;
config.ext_sz = 0;
/* rte_rib6_insert: rib == NULL */
- node = rte_rib6_insert(NULL, ip, depth);
+ node = rte_rib6_insert(NULL, &ip, depth);
RTE_TEST_ASSERT(node == NULL,
"Call succeeded with invalid parameters\n");
@@ -134,14 +134,14 @@ test_insert_invalid(void)
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
/* rte_rib6_insert: depth > MAX_DEPTH */
- node = rte_rib6_insert(rib, ip, MAX_DEPTH + 1);
+ node = rte_rib6_insert(rib, &ip, MAX_DEPTH + 1);
RTE_TEST_ASSERT(node == NULL,
"Call succeeded with invalid parameters\n");
/* insert the same ip/depth twice*/
- node = rte_rib6_insert(rib, ip, depth);
+ node = rte_rib6_insert(rib, &ip, depth);
RTE_TEST_ASSERT(node != NULL, "Failed to insert rule\n");
- node1 = rte_rib6_insert(rib, ip, depth);
+ node1 = rte_rib6_insert(rib, &ip, depth);
RTE_TEST_ASSERT(node1 == NULL,
"Call succeeded with invalid parameters\n");
@@ -162,9 +162,8 @@ test_get_fn(void)
struct rte_rib6_node *node;
struct rte_rib6_conf config;
void *ext;
- uint8_t ip[RTE_RIB6_IPV6_ADDR_SIZE] = {192, 0, 2, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0};
- uint8_t ip_ret[RTE_RIB6_IPV6_ADDR_SIZE];
+ struct rte_ipv6_addr ip = RTE_IPV6(0xc000, 0x0200, 0, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr ip_ret;
uint64_t nh_set = 10;
uint64_t nh_ret;
uint8_t depth = 24;
@@ -177,11 +176,11 @@ test_get_fn(void)
rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
- node = rte_rib6_insert(rib, ip, depth);
+ node = rte_rib6_insert(rib, &ip, depth);
RTE_TEST_ASSERT(node != NULL, "Failed to insert rule\n");
/* test rte_rib6_get_ip() with incorrect args */
- ret = rte_rib6_get_ip(NULL, ip_ret);
+ ret = rte_rib6_get_ip(NULL, &ip_ret);
RTE_TEST_ASSERT(ret < 0,
"Call succeeded with invalid parameters\n");
ret = rte_rib6_get_ip(node, NULL);
@@ -215,8 +214,8 @@ test_get_fn(void)
"Call succeeded with invalid parameters\n");
/* check the return values */
- ret = rte_rib6_get_ip(node, ip_ret);
- RTE_TEST_ASSERT((ret == 0) && (rte_rib6_is_equal(ip_ret, ip)),
+ ret = rte_rib6_get_ip(node, &ip_ret);
+ RTE_TEST_ASSERT((ret == 0) && (rte_ipv6_addr_eq(&ip_ret, &ip)),
"Failed to get proper node ip\n");
ret = rte_rib6_get_depth(node, &depth_ret);
RTE_TEST_ASSERT((ret == 0) && (depth_ret == depth),
@@ -243,8 +242,7 @@ test_basic(void)
struct rte_rib6_node *node;
struct rte_rib6_conf config;
- uint8_t ip[RTE_RIB6_IPV6_ADDR_SIZE] = {192, 0, 2, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0};
+ struct rte_ipv6_addr ip = RTE_IPV6(0xc000, 0x0200, 0, 0, 0, 0, 0, 0);
uint64_t next_hop_add = 10;
uint64_t next_hop_return;
uint8_t depth = 24;
@@ -256,21 +254,21 @@ test_basic(void)
rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
- node = rte_rib6_insert(rib, ip, depth);
+ node = rte_rib6_insert(rib, &ip, depth);
RTE_TEST_ASSERT(node != NULL, "Failed to insert rule\n");
status = rte_rib6_set_nh(node, next_hop_add);
RTE_TEST_ASSERT(status == 0,
"Failed to set rte_rib_node field\n");
- node = rte_rib6_lookup(rib, ip);
+ node
[PATCH dpdk v5 13/17] hash: use IPv6 address structure
Update rte_ipv6_tuple to use rte_ipv6_addr structures instead of
uint8_t[16] arrays.
Signed-off-by: Robin Jarry
---
app/test/test_thash.c | 46 ++
doc/guides/rel_notes/deprecation.rst | 2 --
doc/guides/rel_notes/release_24_11.rst | 2 ++
lib/hash/rte_thash.h | 20 +--
4 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/app/test/test_thash.c b/app/test/test_thash.c
index 952da6a52954..0ad6943cf839 100644
--- a/app/test/test_thash.c
+++ b/app/test/test_thash.c
@@ -25,8 +25,8 @@ struct test_thash_v4 {
};
struct test_thash_v6 {
- uint8_t dst_ip[16];
- uint8_t src_ip[16];
+ struct rte_ipv6_addr dst_ip;
+ struct rte_ipv6_addr src_ip;
uint16_tdst_port;
uint16_tsrc_port;
uint32_thash_l3;
@@ -49,25 +49,19 @@ struct test_thash_v4 v4_tbl[] = {
struct test_thash_v6 v6_tbl[] = {
/*3ffe:2501:200:3::1*/
-{{0x3f, 0xfe, 0x25, 0x01, 0x02, 0x00, 0x00, 0x03,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,},
+{RTE_IPV6(0x3ffe, 0x2501, 0x0200, 0x0003, 0, 0, 0, 0x0001),
/*3ffe:2501:200:1fff::7*/
-{0x3f, 0xfe, 0x25, 0x01, 0x02, 0x00, 0x1f, 0xff,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,},
+RTE_IPV6(0x3ffe, 0x2501, 0x0200, 0x1fff, 0, 0, 0, 0x0007),
1766, 2794, 0x2cc18cd5, 0x40207d3d},
/*ff02::1*/
-{{0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,},
+{RTE_IPV6(0xff02, 0, 0, 0, 0, 0, 0, 0x0001),
/*3ffe:501:8::260:97ff:fe40:efab*/
-{0x3f, 0xfe, 0x05, 0x01, 0x00, 0x08, 0x00, 0x00,
-0x02, 0x60, 0x97, 0xff, 0xfe, 0x40, 0xef, 0xab,},
+RTE_IPV6(0x3ffe, 0x0501, 0x0008, 0, 0x0260, 0x97ff, 0xfe40, 0xefab),
4739, 14230, 0x0f0c461c, 0xdde51bbf},
/*fe80::200:f8ff:fe21:67cf*/
-{{0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x02, 0x00, 0xf8, 0xff, 0xfe, 0x21, 0x67, 0xcf,},
+{RTE_IPV6(0xfe80, 0, 0, 0, 0x0200, 0xf8ff, 0xfe21, 0x67cf),
/*3ffe:1900:4545:3:200:f8ff:fe21:67cf*/
-{0x3f, 0xfe, 0x19, 0x00, 0x45, 0x45, 0x00, 0x03,
-0x02, 0x00, 0xf8, 0xff, 0xfe, 0x21, 0x67, 0xcf,},
+RTE_IPV6(0x3ffe, 0x1900, 0x4545, 0x0003, 0x0200, 0xf8ff, 0xfe21, 0x67cf),
38024, 44251, 0x4b61e985, 0x02d1feef},
};
@@ -110,7 +104,7 @@ static const uint8_t big_rss_key[] = {
static int
test_toeplitz_hash_calc(void)
{
- uint32_t i, j;
+ uint32_t i;
union rte_thash_tuple tuple;
uint32_t rss_l3, rss_l3l4;
uint8_t rss_key_be[RTE_DIM(default_rss_key)];
@@ -145,10 +139,8 @@ test_toeplitz_hash_calc(void)
}
for (i = 0; i < RTE_DIM(v6_tbl); i++) {
/*Fill ipv6 hdr*/
- for (j = 0; j < RTE_DIM(ipv6_hdr.src_addr.a); j++)
- ipv6_hdr.src_addr.a[j] = v6_tbl[i].src_ip[j];
- for (j = 0; j < RTE_DIM(ipv6_hdr.dst_addr.a); j++)
- ipv6_hdr.dst_addr.a[j] = v6_tbl[i].dst_ip[j];
+ ipv6_hdr.src_addr = v6_tbl[i].src_ip;
+ ipv6_hdr.dst_addr = v6_tbl[i].dst_ip;
/*Load and convert ipv6 address into tuple*/
rte_thash_load_v6_addrs(&ipv6_hdr, &tuple);
tuple.v6.sport = v6_tbl[i].src_port;
@@ -176,7 +168,7 @@ test_toeplitz_hash_calc(void)
static int
test_toeplitz_hash_gfni(void)
{
- uint32_t i, j;
+ uint32_t i;
union rte_thash_tuple tuple;
uint32_t rss_l3, rss_l3l4;
uint64_t rss_key_matrixes[RTE_DIM(default_rss_key)];
@@ -204,10 +196,8 @@ test_toeplitz_hash_gfni(void)
}
for (i = 0; i < RTE_DIM(v6_tbl); i++) {
- for (j = 0; j < RTE_DIM(tuple.v6.src_addr); j++)
- tuple.v6.src_addr[j] = v6_tbl[i].src_ip[j];
- for (j = 0; j < RTE_DIM(tuple.v6.dst_addr); j++)
- tuple.v6.dst_addr[j] = v6_tbl[i].dst_ip[j];
+ tuple.v6.src_addr = v6_tbl[i].src_ip;
+ tuple.v6.dst_addr = v6_tbl[i].dst_ip;
tuple.v6.sport = rte_cpu_to_be_16(v6_tbl[i].dst_port);
tuple.v6.dport = rte_cpu_to_be_16(v6_tbl[i].src_port);
rss_l3 = rte_thash_gfni(rss_key_matrixes, (uint8_t *)&tuple,
@@ -299,7 +289,7 @@ enum {
static int
test_toeplitz_hash_gfni_bulk(void)
{
- uint32_t i, j;
+ uint32_t i;
union rte_thash_tuple tuple[2];
uint8_t *tuples[2];
uint32_t rss[2] = { 0 };
@@ -328,10 +318,8 @@ test_toeplitz_hash_gfni_bulk(void)
rte_memcpy(tuples[0], &tuple[0], RTE_THASH_V4_L4_LEN * 4);
/*Load IPv6 headers and copy it into the corresponding tuple*/
- for (j = 0; j < RTE_DIM(tuple[1].v6.src_addr); j++)
- tuple[1].v6.src_addr[j] = v6_tbl[i].src_ip[j];
- for (j = 0; j < RTE_DIM(tuple[1].v6.dst_addr); j++)
- tuple[1].v6.dst_addr[j] = v6_tbl[i].dst_ip[j];
+ tuple[1].v6.src_addr = v6_tbl[i].src_ip;
+ tuple[1].v6.dst_addr = v6_tbl
[PATCH dpdk v5 10/17] pipeline: use IPv6 structures
Update rte_table_action_ipv6_header and rte_table_action_nat_params to
use rte_ipv6_addr structures instead of uint8_t[16] arrays.
For consistency, also update rte_swx_ipsec_sa_encap_params to use
rte_ipv6_addr instead of in6_addr.
Signed-off-by: Robin Jarry
---
doc/guides/rel_notes/deprecation.rst | 2 -
doc/guides/rel_notes/release_24_11.rst | 4 ++
examples/ip_pipeline/cli.c | 61 +++---
examples/ip_pipeline/parser.c | 2 +-
examples/ip_pipeline/parser.h | 3 +-
examples/ip_pipeline/pipeline.h| 6 +--
examples/ip_pipeline/thread.c | 15 +++
lib/pipeline/rte_swx_ipsec.c | 16 ---
lib/pipeline/rte_swx_ipsec.h | 5 ++-
lib/pipeline/rte_table_action.c| 36 ++-
lib/pipeline/rte_table_action.h| 7 +--
11 files changed, 72 insertions(+), 85 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 14b7f151afc1..c41124ee6e4a 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -76,8 +76,6 @@ Deprecation Notices
- ``struct rte_ipv6_tuple``
ipsec
- ``struct rte_ipsec_sadv6_key``
- pipeline
-- ``struct rte_table_action_ipv6_header``
* net, ethdev: The flow item ``RTE_FLOW_ITEM_TYPE_VXLAN_GPE``
is replaced with ``RTE_FLOW_ITEM_TYPE_VXLAN``.
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 3b48f0ab5eb6..3e88a59861ab 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -310,6 +310,10 @@ API Changes
- ``struct rte_ipv6_hdr``
node
- ``rte_node_ip6_route_add()``
+ pipeline
+- ``struct rte_swx_ipsec_sa_encap_params``
+- ``struct rte_table_action_ipv6_header``
+- ``struct rte_table_action_nat_params``
table
- ``struct rte_table_lpm_ipv6_key``
- ``RTE_LPM_IPV6_ADDR_SIZE`` (deprecated, replaced with
``RTE_IPV6_ADDR_SIZE``)
diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index e8269ea90c11..92dfacdeb0fe 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -2587,8 +2587,8 @@ struct pkt_key_ipv6_5tuple {
uint16_t payload_length;
uint8_t proto;
uint8_t hop_limit;
- uint8_t sa[16];
- uint8_t da[16];
+ struct rte_ipv6_addr sa;
+ struct rte_ipv6_addr da;
uint16_t sp;
uint16_t dp;
} __rte_packed;
@@ -2598,7 +2598,7 @@ struct pkt_key_ipv4_addr {
} __rte_packed;
struct pkt_key_ipv6_addr {
- uint8_t addr[16];
+ struct rte_ipv6_addr addr;
} __rte_packed;
static uint32_t
@@ -2654,7 +2654,7 @@ parse_match(char **tokens,
}
m->match.acl.ipv4.da = rte_be_to_cpu_32(daddr.s_addr);
} else if (strcmp(tokens[4], "ipv6") == 0) {
- struct in6_addr saddr, daddr;
+ struct rte_ipv6_addr saddr, daddr;
m->match.acl.ip_version = 0;
@@ -2662,13 +2662,13 @@ parse_match(char **tokens,
snprintf(out, out_size, MSG_ARG_INVALID, "sa");
return 0;
}
- memcpy(m->match.acl.ipv6.sa, saddr.s6_addr, 16);
+ m->match.acl.ipv6.sa = saddr;
if (parse_ipv6_addr(tokens[7], &daddr) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "da");
return 0;
}
- memcpy(m->match.acl.ipv6.da, daddr.s6_addr, 16);
+ m->match.acl.ipv6.da = daddr;
} else {
snprintf(out, out_size, MSG_ARG_NOT_FOUND,
"ipv4 or ipv6");
@@ -2810,7 +2810,7 @@ parse_match(char **tokens,
if (strcmp(tokens[2], "ipv6_5tuple") == 0) {
struct pkt_key_ipv6_5tuple *ipv6 =
(struct pkt_key_ipv6_5tuple *)
m->match.hash.key;
- struct in6_addr saddr, daddr;
+ struct rte_ipv6_addr saddr, daddr;
uint16_t sp, dp;
uint8_t proto;
@@ -2846,8 +2846,8 @@ parse_match(char **tokens,
return 0;
}
- memcpy(ipv6->sa, saddr.s6_addr, 16);
- memcpy(ipv6->da, daddr.s6_addr, 16);
+ ipv6->sa = saddr;
+ ipv6->da = daddr;
ipv6->sp = rte_cpu_to_be_16(sp);
ipv6->dp = rte_cpu_to_be_16(dp);
ipv6->proto = proto;
@@ -2880,7 +2880,7 @@ parse_match(char **tokens,
if (strcmp(tokens[2], "ipv6_addr") == 0) {
struct pkt_key_ipv6_addr *ipv6_addr
Re: [PATCH dpdk v5 08/17] cmdline: use IPv6 address structure
On Fri, Oct 18, 2024 at 04:05:44PM +0200, Robin Jarry wrote: > The previous commits introduced a new rte_ipv6_addr structure without > any alignment requirements. It is not compatible with the in6_addr POSIX > type available in netinet/in.h. > > The main issue is that in6_addr is not uniform on all platforms which > causes unaligned access warnings when compiling without > -Wno-address-of-packed-member (set in dpdk by default). > > In order to have a consistent code base, replace in6_addr with > rte_ipv6_addr in the cmdline library. Update all code accordingly. > > Signed-off-by: Robin Jarry > --- > app/graph/ethdev.c | 4 +-- > app/graph/ip6_route.c | 6 ++-- > app/graph/neigh.c | 2 +- > app/test-pmd/cmdline.c | 4 +-- > app/test-pmd/cmdline_flow.c| 14 +++- > app/test-pmd/testpmd.h | 16 - > app/test/test_cmdline_ipaddr.c | 49 -- > doc/guides/rel_notes/release_24_11.rst | 2 ++ > examples/cmdline/commands.c| 30 +++- > lib/cmdline/cmdline_parse_ipaddr.h | 3 +- > 10 files changed, 34 insertions(+), 96 deletions(-) > Acked-by: Bruce Richardson
[PATCH v3 3/4] net/ice: add option to choose DDP package file
The "Dynamic Device Personalization" package is loaded at initialization
time by the driver, but the specific package file loaded depends upon
what package file is found first by searching through a hard-coded list
of firmware paths. To enable greater control over the package loading,
we can add a device option to choose a specific DDP package file to
load.
Signed-off-by: Bruce Richardson
Acked-by: Stephen Hemminger
---
doc/guides/nics/ice.rst | 9 +
drivers/net/ice/ice_ethdev.c | 35 +++
drivers/net/ice/ice_ethdev.h | 1 +
3 files changed, 45 insertions(+)
diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index 91b5a9b461..6c66dc8008 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -138,6 +138,15 @@ Runtime Configuration
-a 80:00.0,default-mac-disable=1
+- ``DDP Package File``
+
+ Rather than have the driver search for the DDP package to load,
+ or to override what package is used,
+ the ``ddp_pkg_file`` option can be used to provide the path to a specific
package file.
+ For example::
+
+-a 80:00.0,ddp_pkg_file=/path/to/ice-version.pkg
+
- ``Protocol extraction for per queue``
Configure the RX queues to do protocol extraction into mbuf for protocol
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 70298ac330..97092c8550 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -38,6 +38,7 @@
#define ICE_ONE_PPS_OUT_ARG "pps_out"
#define ICE_RX_LOW_LATENCY_ARG"rx_low_latency"
#define ICE_MBUF_CHECK_ARG "mbuf_check"
+#define ICE_DDP_FILENAME_ARG "ddp_pkg_file"
#define ICE_CYCLECOUNTER_MASK 0xULL
@@ -54,6 +55,7 @@ static const char * const ice_valid_args[] = {
ICE_RX_LOW_LATENCY_ARG,
ICE_DEFAULT_MAC_DISABLE,
ICE_MBUF_CHECK_ARG,
+ ICE_DDP_FILENAME_ARG,
NULL
};
@@ -696,6 +698,18 @@ handle_field_name_arg(__rte_unused const char *key, const
char *value,
return 0;
}
+static int
+handle_ddp_filename_arg(__rte_unused const char *key, const char *value, void
*name_args)
+{
+ const char **filename = name_args;
+ if (strlen(value) >= ICE_MAX_PKG_FILENAME_SIZE) {
+ PMD_DRV_LOG(ERR, "The DDP package filename is too long : '%s'",
value);
+ return -1;
+ }
+ *filename = strdup(value);
+ return 0;
+}
+
static void
ice_check_proto_xtr_support(struct ice_hw *hw)
{
@@ -1912,6 +1926,17 @@ int ice_load_pkg(struct ice_adapter *adapter, bool
use_dsn, uint64_t dsn)
size_t bufsz;
int err;
+ /* first read any explicitly referenced DDP file*/
+ if (adapter->devargs.ddp_filename != NULL) {
+ strlcpy(pkg_file, adapter->devargs.ddp_filename,
sizeof(pkg_file));
+ if (rte_firmware_read(pkg_file, &buf, &bufsz) == 0) {
+ goto load_fw;
+ } else {
+ PMD_INIT_LOG(ERR, "Cannot load DDP file: %s", pkg_file);
+ return -1;
+ }
+ }
+
memset(opt_ddp_filename, 0, ICE_MAX_PKG_FILENAME_SIZE);
snprintf(opt_ddp_filename, ICE_MAX_PKG_FILENAME_SIZE,
"ice-%016" PRIx64 ".pkg", dsn);
@@ -2259,6 +2284,13 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
ret = rte_kvargs_process(kvlist, ICE_RX_LOW_LATENCY_ARG,
&parse_bool, &ad->devargs.rx_low_latency);
+ if (ret)
+ goto bail;
+
+ ret = rte_kvargs_process(kvlist, ICE_DDP_FILENAME_ARG,
+&handle_ddp_filename_arg,
&ad->devargs.ddp_filename);
+ if (ret)
+ goto bail;
bail:
rte_kvargs_free(kvlist);
@@ -2762,6 +2794,8 @@ ice_dev_close(struct rte_eth_dev *dev)
ice_free_hw_tbls(hw);
rte_free(hw->port_info);
hw->port_info = NULL;
+ free((void *)(uintptr_t)ad->devargs.ddp_filename);
+ ad->devargs.ddp_filename = NULL;
ice_shutdown_all_ctrlq(hw, true);
rte_free(pf->proto_xtr);
pf->proto_xtr = NULL;
@@ -7135,6 +7169,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_ice,
ICE_PROTO_XTR_ARG
"=[queue:]"
ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
ICE_DEFAULT_MAC_DISABLE "=<0|1>"
+ ICE_DDP_FILENAME_ARG "="
ICE_RX_LOW_LATENCY_ARG "=<0|1>");
RTE_LOG_REGISTER_SUFFIX(ice_logtype_init, init, NOTICE);
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 57087c98ed..076cf595e8 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -569,6 +569,7 @@ struct ice_devargs {
/* Name of the field. */
char xtr_field_name[RTE_MBUF_DYN_NAMESIZE];
uint64_t mbuf_check;
+ const char *ddp_filename;
};
/**
--
2.43.0
[PATCH v3 1/4] net/ice: detect stopping a flow-director queue twice
If the flow-director queue is stopped at some point during the running
of an application, the shutdown procedure for the port issues an error
as it tries to stop the queue a second time, and fails to do so. We can
eliminate this error by setting the tail-register pointer to NULL on
stop, and checking for that condition in subsequent stop calls. Since
the register pointer is set on start, any restarting of the queue will
allow a stop call to progress as normal.
Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
Cc: sta...@dpdk.org
Signed-off-by: Bruce Richardson
Acked-by: Stephen Hemminger
---
drivers/net/ice/ice_rxtx.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index d2f9edc221..024d97cb46 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1139,6 +1139,10 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t
tx_queue_id)
tx_queue_id);
return -EINVAL;
}
+ if (txq->qtx_tail == NULL) {
+ PMD_DRV_LOG(INFO, "TX queue %u not started", tx_queue_id);
+ return 0;
+ }
vsi = txq->vsi;
q_ids[0] = txq->reg_idx;
@@ -1153,6 +1157,7 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t
tx_queue_id)
}
txq->tx_rel_mbufs(txq);
+ txq->qtx_tail = NULL;
return 0;
}
--
2.43.0
[PATCH v3 0/4] updates for net/ice driver
This patchset contains a set of updates for the ice driver, a number of which are in the area of the "rte_tm" APIs for Tx scheduling. These patches were previously submitted as part of a larger set[1], but separating them out here for easier review and merge ahead of the more substantial changes for scheduling in the last couple of patches in that set. [1] https://patches.dpdk.org/project/dpdk/list/?series=32758&state=* --- v3: dropped patch 4 completely from set, it was missing doc updates and it fits better with out sched changes. Will include in a later set v2: small update to patch 4 following review by Stephen. Bruce Richardson (4): net/ice: detect stopping a flow-director queue twice net/ice: improve Tx scheduler graph output net/ice: add option to choose DDP package file net/ice: limit the number of queues to sched capabilities doc/guides/nics/ice.rst| 9 ++ drivers/net/ice/ice_diagnose.c | 196 - drivers/net/ice/ice_ethdev.c | 60 +- drivers/net/ice/ice_ethdev.h | 1 + drivers/net/ice/ice_rxtx.c | 5 + 5 files changed, 139 insertions(+), 132 deletions(-) -- 2.43.0
[PATCH v3 4/4] net/ice: limit the number of queues to sched capabilities
Rather than assuming that each VSI can hold up to 256 queue pairs,
or the reported device limit, query the available nodes in the scheduler
tree to check that we are not overflowing the limit for number of
child scheduling nodes at each level. Do this by multiplying
max_children for each level beyond the VSI and using that as an
additional cap on the number of queues.
Signed-off-by: Bruce Richardson
Acked-by: Stephen Hemminger
---
drivers/net/ice/ice_ethdev.c | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 97092c8550..d5e94a6685 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -915,7 +915,7 @@ ice_vsi_config_default_rss(struct ice_aqc_vsi_props *info)
}
static int
-ice_vsi_config_tc_queue_mapping(struct ice_vsi *vsi,
+ice_vsi_config_tc_queue_mapping(struct ice_hw *hw, struct ice_vsi *vsi,
struct ice_aqc_vsi_props *info,
uint8_t enabled_tcmap)
{
@@ -931,13 +931,28 @@ ice_vsi_config_tc_queue_mapping(struct ice_vsi *vsi,
}
/* vector 0 is reserved and 1 vector for ctrl vsi */
- if (vsi->adapter->hw.func_caps.common_cap.num_msix_vectors < 2)
+ if (vsi->adapter->hw.func_caps.common_cap.num_msix_vectors < 2) {
vsi->nb_qps = 0;
- else
+ } else {
vsi->nb_qps = RTE_MIN
((uint16_t)vsi->adapter->hw.func_caps.common_cap.num_msix_vectors - 2,
RTE_MIN(vsi->nb_qps, ICE_MAX_Q_PER_TC));
+ /* cap max QPs to what the HW reports as num-children for each
layer.
+* Multiply num_children for each layer from the entry_point
layer to
+* the qgroup, or second-last layer.
+* Avoid any potential overflow by using uint32_t type and
breaking loop
+* once we have a number greater than the already configured
max.
+*/
+ uint32_t max_sched_vsi_nodes = 1;
+ for (uint8_t i = hw->sw_entry_point_layer; i <
hw->num_tx_sched_layers - 1; i++) {
+ max_sched_vsi_nodes *= hw->max_children[i];
+ if (max_sched_vsi_nodes >= vsi->nb_qps)
+ break;
+ }
+ vsi->nb_qps = RTE_MIN(vsi->nb_qps, max_sched_vsi_nodes);
+ }
+
/* nb_qps(hex) -> fls */
/* -> 0 */
/* 0001 -> 0 */
@@ -1709,7 +1724,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
rte_cpu_to_le_16(hw->func_caps.fd_fltr_best_effort);
/* Enable VLAN/UP trip */
- ret = ice_vsi_config_tc_queue_mapping(vsi,
+ ret = ice_vsi_config_tc_queue_mapping(hw, vsi,
&vsi_ctx.info,
ICE_DEFAULT_TCMAP);
if (ret) {
@@ -1733,7 +1748,7 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
vsi_ctx.info.fd_options = rte_cpu_to_le_16(cfg);
vsi_ctx.info.sw_id = hw->port_info->sw_id;
vsi_ctx.info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;
- ret = ice_vsi_config_tc_queue_mapping(vsi,
+ ret = ice_vsi_config_tc_queue_mapping(hw, vsi,
&vsi_ctx.info,
ICE_DEFAULT_TCMAP);
if (ret) {
--
2.43.0
[PATCH v3 2/4] net/ice: improve Tx scheduler graph output
The function to dump the TX scheduler topology only adds to the chart
nodes connected to TX queues or for the flow director VSI. Change the
function to work recursively from the root node and thereby include all
scheduler nodes, whether in use or not, in the dump.
Also, improve the output of the Tx scheduler graphing function:
* Add VSI details to each node in graph
* When number of children is >16, skip middle nodes to reduce size of
the graph, otherwise dot output is unviewable for large hierarchies
* For VSIs other than zero, use dot's clustering method to put those
VSIs into subgraphs with borders
* For leaf nodes, display queue numbers for the any nodes assigned to
ethdev NIC Tx queues
Signed-off-by: Bruce Richardson
Acked-by: Stephen Hemminger
---
drivers/net/ice/ice_diagnose.c | 196 -
1 file changed, 69 insertions(+), 127 deletions(-)
diff --git a/drivers/net/ice/ice_diagnose.c b/drivers/net/ice/ice_diagnose.c
index c357554707..623d84e37d 100644
--- a/drivers/net/ice/ice_diagnose.c
+++ b/drivers/net/ice/ice_diagnose.c
@@ -545,29 +545,15 @@ static void print_rl_profile(struct
ice_aqc_rl_profile_elem *prof,
fprintf(stream, "\t\t\t\t\t\n");
}
-static
-void print_elem_type(FILE *stream, u8 type)
+static const char *
+get_elem_type(u8 type)
{
- switch (type) {
- case 1:
- fprintf(stream, "root");
- break;
- case 2:
- fprintf(stream, "tc");
- break;
- case 3:
- fprintf(stream, "se_generic");
- break;
- case 4:
- fprintf(stream, "entry_point");
- break;
- case 5:
- fprintf(stream, "leaf");
- break;
- default:
- fprintf(stream, "%d", type);
- break;
- }
+ static const char * const ice_sched_node_types[] = {
+ "Undefined", "Root", "TC", "SE Generic", "SW Entry",
"Leaf"
+ };
+ if (type < RTE_DIM(ice_sched_node_types))
+ return ice_sched_node_types[type];
+ return "*UNKNOWN*";
}
static
@@ -602,7 +588,9 @@ void print_priority_mode(FILE *stream, bool flag)
}
static
-void print_node(struct ice_aqc_txsched_elem_data *data,
+void print_node(struct ice_sched_node *node,
+ struct rte_eth_dev_data *ethdata,
+ struct ice_aqc_txsched_elem_data *data,
struct ice_aqc_rl_profile_elem *cir_prof,
struct ice_aqc_rl_profile_elem *eir_prof,
struct ice_aqc_rl_profile_elem *shared_prof,
@@ -613,17 +601,19 @@ void print_node(struct ice_aqc_txsched_elem_data *data,
fprintf(stream, "\t\t\t\n");
- fprintf(stream, "\t\t\t\t\n");
- fprintf(stream, "\t\t\t\t\t teid \n");
- fprintf(stream, "\t\t\t\t\t %d \n", data->node_teid);
- fprintf(stream, "\t\t\t\t\n");
-
- fprintf(stream, "\t\t\t\t\n");
- fprintf(stream, "\t\t\t\t\t type \n");
- fprintf(stream, "\t\t\t\t\t");
- print_elem_type(stream, data->data.elem_type);
- fprintf(stream, "\n");
- fprintf(stream, "\t\t\t\t\n");
+ fprintf(stream, "\t\t\t\tteid%d\n",
data->node_teid);
+ fprintf(stream, "\t\t\t\ttype%s\n",
+ get_elem_type(data->data.elem_type));
+ fprintf(stream, "\t\t\t\tVSI%u\n",
node->vsi_handle);
+ if (data->data.elem_type == ICE_AQC_ELEM_TYPE_LEAF) {
+ for (uint16_t i = 0; i < ethdata->nb_tx_queues; i++) {
+ struct ice_tx_queue *q = ethdata->tx_queues[i];
+ if (q->q_teid == data->node_teid) {
+ fprintf(stream,
"\t\t\t\tTXQ%u\n", i);
+ break;
+ }
+ }
+ }
if (!detail)
goto brief;
@@ -705,8 +695,6 @@ void print_node(struct ice_aqc_txsched_elem_data *data,
fprintf(stream, "\t\tshape=plain\n");
fprintf(stream, "\t]\n");
- if (data->parent_teid != 0x)
- fprintf(stream, "\tNODE_%d -> NODE_%d\n", data->parent_teid,
data->node_teid);
}
static
@@ -731,112 +719,92 @@ int query_rl_profile(struct ice_hw *hw,
return 0;
}
-static
-int query_node(struct ice_hw *hw, uint32_t child, uint32_t *parent,
- uint8_t level, bool detail, FILE *stream)
+static int
+query_node(struct ice_hw *hw, struct rte_eth_dev_data *ethdata,
+ struct ice_sched_node *node, bool detail, FILE *stream)
{
- struct ice_aqc_txsched_elem_data data;
+ struct ice_aqc_txsched_elem_data *data = &node->info;
struct ice_aqc_rl_profile_elem cir_prof;
struct ice_aqc_rl_profile_elem eir_prof;
struct ice_aqc_rl_profile_elem shared_prof;
struct ice_aqc_rl_profile_elem *cp = NULL;
struct ice_aqc_rl_profile_elem *ep = NULL;
struct ice_aqc_rl_profile_elem *sp = NULL;
- in
Re: Restrict max packet size on rx
On Fri, 18 Oct 2024 22:19:35 +0530 Rajasekhar Pulluru wrote: > Thanks Stephen. > > On Fri, Oct 18, 2024 at 10:13 PM Stephen Hemminger < > step...@networkplumber.org> wrote: > > > On Fri, 18 Oct 2024 22:05:24 +0530 > > Rajasekhar Pulluru wrote: > > > > > Team, > > > Does setting mtu using rte_eth_dev_set_mtu limit the maximum size of the > > > packet received on the dpdk port to the configured mtu size? > > > > > > On an intel machine with ixgbe port, with mtu set to 1500, no rx-offloads > > > enabled, ixgbe dpdk port is able to receive packets greater than 1500 > > size > > > and even jumbo frames of size 9000, even though the peer is sending them > > > fragmented with mtu of 1500. > > > > > > How do I restrict the port not to receive any frame greater than mtu > > size? > > > > > > Appreciate any help, > > > Thanks. > > > Rajasekhar > > > > > > In networking, MTU and MRU are overlapping concepts. > > The MTU value is used as a hint to the driver as to what size buffer to > > allocate > > but it can use larger if it wants. If you have restrictions, then the > > application > > needs to enforce them. > > There are some drivers like ixgbe that need to round up the receive buffer to a power of 2. So it is possible to get 2K frames even with standard 1500 byte MTU.
Re: [PATCH] event/octeontx: resolve possible integer overflow
On Fri, 18 Oct 2024 13:29:03 +0530
Hanumanth Pothula wrote:
> The last argument passed to ssovf_parsekv() is an
> unsigned char*, but it is accessed as an integer.
> This can lead to an integer overflow.
>
> Hence, make ensure the argument is accessed as a char
> and for better error handling use strtol instead of atoi.
>
> Signed-off-by: Hanumanth Pothula
> ---
> drivers/event/octeontx/ssovf_evdev.c | 12 ++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/event/octeontx/ssovf_evdev.c
> b/drivers/event/octeontx/ssovf_evdev.c
> index 3a933b1db7..ccb447d33a 100644
> --- a/drivers/event/octeontx/ssovf_evdev.c
> +++ b/drivers/event/octeontx/ssovf_evdev.c
> @@ -719,8 +719,16 @@ ssovf_close(struct rte_eventdev *dev)
> static int
> ssovf_parsekv(const char *key __rte_unused, const char *value, void *opaque)
> {
> - int *flag = opaque;
> - *flag = !!atoi(value);
> + uint8_t *flag = (uint8_t *)opaque;
> + char *end;
> +
> + errno = 0;
> + *flag = (uint8_t)strtol(value, &end, 2);
> + if ((errno != 0) || (value == end)) {
> + ssovf_log_err("fail to get key val ret:%d err:%d", *flag,
> errno);
> + return -EINVAL;
> + }
> +
> return 0;
> }
Cast of opaque is unnecessary in C.
Use strtoul to avoid allowing negative numbers.
Passing 2 as argument makes it assume binary so 101 is legal value and returns 5
and it is not helping.
Why not:
diff --git a/drivers/event/octeontx/ssovf_evdev.c
b/drivers/event/octeontx/ssovf_evdev.c
index 3a933b1db7..9804f5bc59 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -717,10 +717,20 @@ ssovf_close(struct rte_eventdev *dev)
}
static int
-ssovf_parsekv(const char *key __rte_unused, const char *value, void *opaque)
+ssovf_parsekv(const char *key, const char *value, void *opaque)
{
- int *flag = opaque;
- *flag = !!atoi(value);
+ uint8_t *flag = opaque;
+ unsigned long v;
+ char *end;
+
+ errno = 0;
+ v = strtoul(value, &end, 0);
+ if (errno != 0 || end == value || *end != '\0') {
+ ssvf_log_err("invalid %s value %s", key, value);
+ return -EINVAL;
+ }
+
+ *flag = !!v;
return 0;
}
Re: [PATCH v4 0/6] refine argparse library
18/10/2024 03:09, fengchengwen: > Hi Thomas and David, > > This patchset was already acked by Stephen. > It missed in DPDK 24.07, hope merge in 24.11. > > Thanks > > On 2024/10/10 9:35, fengchengwen wrote: > > Hi Thomas and David, > > > > Kindly ping for merge. > > > > On 2024/10/10 3:33, Stephen Hemminger wrote: > >> On Mon, 18 Mar 2024 11:18:32 + > >> Chengwen Feng wrote: > >> > >>> I found a couple of issues when I revisited the argparse_autotest > >>> output, so got this patchset. > >>> > >>> Chengwen Feng (6): > >>> argparse: refine error message > >>> argparse: remove dead code > >>> argparse: replace flag enum with marco > >>> argparse: fix argument flags operate as uint32 type > >>> test/argparse: refine testcases > >>> argparse: fix doc don't display two hyphens > >>> > >>> --- > >>> v4: address Thomas's comment on 4/6 commit: > >>> - remove unused macros TEST_ARGPARSE_FLAG_HAS_ARG_BITMASK and > >>> TEST_ARGPARSE_FLAG_VAL_TYPE_BITMASK. > >>> v3: > >>> - address Thomas's comment on 4/6 comit. > >>> - add commit: fix doc don't display two hyphens. > >>> v2: address David Marchand's comment: > >>> - replace flag enum with marco. > >>> - replace flag's hardcode with macro in test_argparse.c. > >>> > >>> app/test/test_argparse.c | 65 +++- > >>> doc/guides/prog_guide/argparse_lib.rst | 47 +++--- > >>> lib/argparse/rte_argparse.c| 61 +- > >>> lib/argparse/rte_argparse.h| 85 -- > >>> 4 files changed, 127 insertions(+), 131 deletions(-) > >> > >> The verb refine is not usually used for edits to documents or software > >> that probably is a translation issue. > >> > >> Series-acked-by: Stephen Hemminger > > > > Thank Stephen Added Bugzilla ID, CC: stable, reworded as Stephen suggests, and applied. Note that the lists in doxygen comments does not look nice. You may look at this: https://www.doxygen.nl/manual/lists.html
[DPDK/core Bug 1409] arparse library assumes enum are 64 bit
https://bugs.dpdk.org/show_bug.cgi?id=1409 Thomas Monjalon (tho...@monjalon.net) changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #1 from Thomas Monjalon (tho...@monjalon.net) --- Resolved in http://git.dpdk.org/dpdk/commit/?id=bd0d68bdc3 -- You are receiving this mail because: You are the assignee for the bug.
[PATCH] common/cnxk: replace deprecated function for cross compilation
Some (newly introduced) use of "get_cross_property" was missed.
Convert to get_external_property.
Fixes: b0d0c84b3c0f ("build: replace deprecated function for cross compilation")
Signed-off-by: David Marchand
---
drivers/common/cnxk/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index dc2ddf1f20..abb0f6f01f 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -92,7 +92,7 @@ sources += files('cnxk_telemetry_bphy.c',
)
if meson.is_cross_build()
-soc_type = meson.get_cross_property('platform', '')
+soc_type = meson.get_external_property('platform', '')
else
soc_type = platform
endif
--
2.46.2
Re: [PATCH v26 00/15] Log subsystem improvements
Hello Stephen, On Wed, Oct 16, 2024 at 10:24 PM Stephen Hemminger wrote: > > Improvements and unification of logging library. > This version works on all platforms: Linux, Windows and FreeBSD. > > This is update to rework patch set. It adds several new features > to the console log output. > > * Putting a timestamp on console output which is useful for > analyzing performance of startup codes. Timestamp is optional > and must be enabled on command line. > > * Displaying console output with colors. > It uses the standard conventions used by many other Linux commands > for colorized display. The default is to enable color if the > console output is going to a terminal. But it can be always > on or disabled by command line flag. This default was chosen > based on what dmesg(1) command does. > > Color is used by many tools (vi, iproute2, git) because it is helpful; > DPDK drivers and libraries print lots of not very useful messages. > And having error messages highlighted in bold face helps. > This might also get users to pay more attention to error messages. > Many bug reports have earlier messages that are lost because > there are so many info messages. > > * Add support for automatic detection of systemd journal > protocol. If running as systemd service will get enhanced > logging. > > * Use of syslog is optional and the meaning of the > --syslog flag has changed. The default is *not* to use > syslog if output is going to a terminal. > > Add myself as maintainer for log because by now have added > more than previous authors. Thanks for the series. Overall, it looks good, but I am too short on time for merging in rc1 and I have some comments. I'll consider merging it in rc2. - The main point is the "automatic" aspect but we want to provide some way to force where the logs end up. With this series, the user has --syslog (whose meaning is changed) and --log-journal options to affect where the logs go. Can we get a single option? Like maybe --log-destination=console|syslog|journal|auto ? - I don't really understand why changing the --syslog is better. We lose the ability to select the syslog facility. Either this feature was useless, and I would rather deprecate or remove it explicitly (and the --syslog with it). Or we should keep it as is for compat reason. - The color and timestamping options only affect the console output, which is not clear with the --log-color / --log-timestamp names. Maybe we can enhance with some other name? - Did you test redirecting all logs to an external logging function? I suppose it still works, but it is important not to break such feature for OVS. -- David Marchand
Re: [PATCH] dma/idxd: set defaults for GRPCFG traffic class
On Fri, Oct 4, 2024 at 6:49 PM Bruce Richardson wrote: > > On Wed, Jun 26, 2024 at 05:45:23AM +, Shaiq Wani wrote: > > Set GRPCFG traffic class to value of 1 for best performance on current > > generation of accelerators. Applicable to gen1 and gen2 devices. > > > > Signed-off-by: Shaiq Wani > Acked-by: Bruce Richardson Applied, thanks. -- David Marchand
release candidate 24.11-rc1
A new DPDK release candidate is ready for testing: https://git.dpdk.org/dpdk/tag/?id=v24.11-rc1 There are 630 new patches in this snapshot, including many API/ABI compatibility breakages. This release won't be ABI-compatible with previous ones. Release notes: https://doc.dpdk.org/guides/rel_notes/release_24_11.html Highlights of 24.11-rc1: - bit set and atomic bit manipulation - IPv6 address API - Ethernet link lanes - flow table index action - Cisco enic VF - Marvell CN20K - symmetric crypto SM4 - asymmetric crypto EdDSA - event device pre-scheduling - event device independent enqueue Please test and report issues on bugs.dpdk.org. Few more new APIs may be added in -rc2. DPDK 24.11-rc2 is expected in more than two weeks (early November). Thank you everyone
[PATCH v5 28/47] net/bnxt: tf_ulp: modify return values to adhere to C coding standard
From: Shuanglin Wang
Modified return values of the several ULP utilities to comply C
coding standard. Like using macros EXIT_SUCCESS(0) and
EXIT_FAILURE(1) for the conventional status value for success
and failure, respectively. They are declared in the file stdlib.h.
Signed-off-by: Shuanglin Wang
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 172 +++
drivers/net/bnxt/tf_ulp/ulp_mapper_tf.c | 40 +++---
drivers/net/bnxt/tf_ulp/ulp_mapper_tfc.c | 50 +++
drivers/net/bnxt/tf_ulp/ulp_utils.c | 70 -
drivers/net/bnxt/tf_ulp/ulp_utils.h | 26 ++--
5 files changed, 181 insertions(+), 177 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index b44b25429f..ff57469aa3 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -573,7 +573,7 @@ ulp_mapper_fdb_opc_process(struct bnxt_ulp_mapper_parms
*parms,
/* get the fid from the regfile */
rc = ulp_regfile_read(parms->regfile, tbl->fdb_operand,
&val64);
- if (!rc) {
+ if (rc) {
BNXT_DRV_DBG(ERR, "regfile[%d] read oob\n",
tbl->fdb_operand);
return -EINVAL;
@@ -630,8 +630,8 @@ ulp_mapper_priority_opc_process(struct
bnxt_ulp_mapper_parms *parms,
*priority = tbl->pri_operand;
break;
case BNXT_ULP_PRI_OPC_REGFILE:
- if (!ulp_regfile_read(parms->regfile, tbl->pri_operand,
- ®val)) {
+ if (ulp_regfile_read(parms->regfile, tbl->pri_operand,
+®val)) {
BNXT_DRV_DBG(ERR, "regfile[%u] read oob\n",
tbl->pri_operand);
rc = -EINVAL;
@@ -880,8 +880,8 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms
*parms,
*value = 1;
break;
case BNXT_ULP_FIELD_SRC_CF:
- if (!ulp_operand_read(field_opr,
- (uint8_t *)&idx, sizeof(uint16_t))) {
+ if (ulp_operand_read(field_opr,
+(uint8_t *)&idx, sizeof(uint16_t))) {
BNXT_DRV_DBG(ERR, "CF operand read failed\n");
return -EINVAL;
}
@@ -896,15 +896,15 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms
*parms,
*value = ULP_COMP_FLD_IDX_RD(parms, idx);
break;
case BNXT_ULP_FIELD_SRC_RF:
- if (!ulp_operand_read(field_opr,
- (uint8_t *)&idx, sizeof(uint16_t))) {
+ if (ulp_operand_read(field_opr,
+(uint8_t *)&idx, sizeof(uint16_t))) {
BNXT_DRV_DBG(ERR, "RF operand read failed\n");
return -EINVAL;
}
idx = tfp_be_to_cpu_16(idx);
/* Uninitialized regfile entries return 0 */
- if (!ulp_regfile_read(parms->regfile, idx, &lregval) ||
+ if (ulp_regfile_read(parms->regfile, idx, &lregval) ||
sizeof(uint64_t) < bytelen) {
BNXT_DRV_DBG(ERR, "regfile[%d] read oob %u\n", idx,
bytelen);
@@ -915,8 +915,8 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms
*parms,
*value = tfp_be_to_cpu_64(lregval);
break;
case BNXT_ULP_FIELD_SRC_ACT_PROP:
- if (!ulp_operand_read(field_opr,
- (uint8_t *)&idx, sizeof(uint16_t))) {
+ if (ulp_operand_read(field_opr,
+(uint8_t *)&idx, sizeof(uint16_t))) {
BNXT_DRV_DBG(ERR, "Action operand read failed\n");
return -EINVAL;
}
@@ -940,8 +940,8 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms
*parms,
}
break;
case BNXT_ULP_FIELD_SRC_ACT_PROP_SZ:
- if (!ulp_operand_read(field_opr,
- (uint8_t *)&idx, sizeof(uint16_t))) {
+ if (ulp_operand_read(field_opr,
+(uint8_t *)&idx, sizeof(uint16_t))) {
BNXT_DRV_DBG(ERR, "Action sz operand read failed\n");
return -EINVAL;
}
@@ -954,8 +954,8 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms
*parms,
*val = &parms->act_prop->act_details[idx];
/* get the size index next */
- if (!ulp_operand_read(&field_opr[sizeof(uint1
Re: [PATCH] common/cnxk: replace deprecated function for cross compilation
On Fri, Oct 18, 2024 at 06:00:43PM +0200, David Marchand wrote:
> Some (newly introduced) use of "get_cross_property" was missed.
> Convert to get_external_property.
>
> Fixes: b0d0c84b3c0f ("build: replace deprecated function for cross
> compilation")
>
> Signed-off-by: David Marchand
> ---
Acked-by: Bruce Richardson
RE: [EXTERNAL] [PATCH] event/octeontx: resolve possible integer overflow
> The last argument passed to ssovf_parsekv() is an
> unsigned char*, but it is accessed as an integer.
> This can lead to an integer overflow.
>
> Hence, make ensure the argument is accessed as a char
> and for better error handling use strtol instead of atoi.
>
> Signed-off-by: Hanumanth Pothula
Acked-by: Pavan Nikhilesh
> ---
> drivers/event/octeontx/ssovf_evdev.c | 12 ++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/event/octeontx/ssovf_evdev.c
> b/drivers/event/octeontx/ssovf_evdev.c
> index 3a933b1db7..ccb447d33a 100644
> --- a/drivers/event/octeontx/ssovf_evdev.c
> +++ b/drivers/event/octeontx/ssovf_evdev.c
> @@ -719,8 +719,16 @@ ssovf_close(struct rte_eventdev *dev)
> static int
> ssovf_parsekv(const char *key __rte_unused, const char *value, void
> *opaque)
> {
> - int *flag = opaque;
> - *flag = !!atoi(value);
> + uint8_t *flag = (uint8_t *)opaque;
> + char *end;
> +
> + errno = 0;
> + *flag = (uint8_t)strtol(value, &end, 2);
> + if ((errno != 0) || (value == end)) {
> + ssovf_log_err("fail to get key val ret:%d err:%d", *flag,
> errno);
> + return -EINVAL;
> + }
> +
> return 0;
> }
>
> --
> 2.25.1
Re: [PATCH v2 03/18] net/r8169: add hardware registers access routines
On Fri, 18 Oct 2024 03:41:28 + 王颢 wrote: > Dear Stephen, > > In r8169 pmd, mdelay and udelay are macros. > #define mdelay rte_delay_ms > #define udelay rte_delay_us > > Best Regards, > Howard Wang That kind of redefinition can lead to confusion, can it be avoided?
Re: [PATCH v2 05/18] net/r8169: add support for hw config
On Fri, 18 Oct 2024 05:45:18 + 王颢 wrote: > Dear Stephen, > > As you can see, there are some issues with the current code regarding > whitespace and CODE_INDENT. I used astyle to adjust the code format with the > following command. However, I found that I could not fully meet the > checkpatch requirements (unless I modify them manually). Would you mind > providing some suggestions? For example, what tools do you use to standardize > the code? Thank you! > We do not expect all patches to be clean with checkpatch. But the indent warnings are valid. DPDK code should be indented with tabs.
Re: [PATCH 4/4] net/hns3: support outer VLAN flow match
On Fri, 18 Oct 2024 14:19:41 +0800
Jie Hai wrote:
> @@ -306,11 +324,16 @@ hns3_parse_devargs(struct rte_eth_dev *dev)
> &hns3_parse_dev_caps_mask, &dev_caps_mask);
> (void)rte_kvargs_process(kvlist, HNS3_DEVARG_MBX_TIME_LIMIT_MS,
> &hns3_parse_mbx_time_limit, &mbx_time_limit_ms);
> - if (!hns->is_vf)
> + if (!hns->is_vf) {
> (void)rte_kvargs_process(kvlist,
>HNS3_DEVARG_FDIR_VALN_MATCH_MODE,
>&hns3_parse_vlan_match_mode,
>&hns->pf.fdir.vlan_match_mode);
> + (void)rte_kvargs_process(kvlist,
> + HNS3_DEVARG_FDIR_TUPLE_CONFIG,
> + &hns3_parse_fdir_tuple_config,
> + &hns->pf.fdir.tuple_cfg);
> + }
>
Side question, why the casts to void here?
Is there some tool that is complaining (like old lint), or is there
some error handling missing.
RE: [PATCH v1 1/2] baseband/acc: FFT support in VRB2 PRQ device
Hi Maxime,
> -Original Message-
> From: Maxime Coquelin
> Sent: Friday, October 18, 2024 12:54 AM
> To: Chautru, Nicolas ; dev@dpdk.org
> Cc: hemant.agra...@nxp.com; Vargas, Hernan
> Subject: Re: [PATCH v1 1/2] baseband/acc: FFT support in VRB2 PRQ device
>
> Hi Nicolas,
>
> On 10/15/24 00:30, Nicolas Chautru wrote:
> > Supporting recent change in the device to extend FFT capability
> > processing in latest stepping.
> > Also including cosmetic change to VRB2 register definition.
> >
> > Signed-off-by: Nicolas Chautru
> > ---
> > drivers/baseband/acc/acc_common.h | 2 +-
> > drivers/baseband/acc/rte_vrb_pmd.c | 30 +-
> ---
> > drivers/baseband/acc/vrb2_vf_enum.h | 4 ++--
> > 3 files changed, 29 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/baseband/acc/acc_common.h
> > b/drivers/baseband/acc/acc_common.h
> > index 0c249d5b93..4c60b7896b 100644
> > --- a/drivers/baseband/acc/acc_common.h
> > +++ b/drivers/baseband/acc/acc_common.h
> > @@ -106,7 +106,7 @@
> > #define ACC_MAX_FCW_SIZE 128
> > #define ACC_IQ_SIZE4
> >
> > -#define ACC_FCW_FFT_BLEN_3 28
> > +#define ACC_FCW_FFT_BLEN_VRB2 128
> >
> > /* Constants from K0 computation from 3GPP 38.212 Table 5.4.2.1-2 */
> > #define ACC_N_ZC_1 66 /* N = 66 Zc for BG 1 */ diff --git
> > a/drivers/baseband/acc/rte_vrb_pmd.c
> > b/drivers/baseband/acc/rte_vrb_pmd.c
> > index 0455320c2a..5eb3e8dd48 100644
> > --- a/drivers/baseband/acc/rte_vrb_pmd.c
> > +++ b/drivers/baseband/acc/rte_vrb_pmd.c
> > @@ -1006,7 +1006,7 @@ vrb_queue_setup(struct rte_bbdev *dev,
> uint16_t queue_id,
> > case RTE_BBDEV_OP_FFT:
> > fcw_len = ACC_FCW_FFT_BLEN;
> > if (q->d->device_variant == VRB2_VARIANT)
> > - fcw_len = ACC_FCW_FFT_BLEN_3;
> > + fcw_len = ACC_FCW_FFT_BLEN_VRB2;
> > break;
> > case RTE_BBDEV_OP_MLDTS:
> > fcw_len = ACC_FCW_MLDTS_BLEN;
> > @@ -1402,7 +1402,11 @@ vrb_dev_info_get(struct rte_bbdev *dev, struct
> rte_bbdev_driver_info *dev_info)
> > RTE_BBDEV_FFT_FP16_INPUT
> |
> >
> RTE_BBDEV_FFT_FP16_OUTPUT |
> >
> RTE_BBDEV_FFT_POWER_MEAS |
> > -
> RTE_BBDEV_FFT_WINDOWING_BYPASS,
> > +
> RTE_BBDEV_FFT_WINDOWING_BYPASS |
> > +
> RTE_BBDEV_FFT_TIMING_OFFSET_PER_CS |
> > +
> RTE_BBDEV_FFT_TIMING_ERROR |
> > +
> RTE_BBDEV_FFT_DEWINDOWING |
> > +
> RTE_BBDEV_FFT_FREQ_RESAMPLING,
> > .num_buffers_src = 1,
> > .num_buffers_dst = 1,
> > .fft_windows_num = ACC_MAX_FFT_WIN,
> @@ -3725,6 +3729,8 @@
> > vrb1_fcw_fft_fill(struct rte_bbdev_fft_op *op, struct acc_fcw_fft *fcw)
> > static inline void
> > vrb2_fcw_fft_fill(struct rte_bbdev_fft_op *op, struct acc_fcw_fft_3 *fcw)
> > {
> > + uint8_t cs;
> > +
> > fcw->in_frame_size = op->fft.input_sequence_size;
> > fcw->leading_pad_size = op->fft.input_leading_padding;
> > fcw->out_frame_size = op->fft.output_sequence_size; @@ -3760,6
> > +3766,16 @@ vrb2_fcw_fft_fill(struct rte_bbdev_fft_op *op, struct
> acc_fcw_fft_3 *fcw)
> > fcw->bypass = 3;
> > else
> > fcw->bypass = 0;
> > +
> > + fcw->enable_dewin = check_bit(op->fft.op_flags,
> RTE_BBDEV_FFT_DEWINDOWING);
> > + fcw->freq_resample_mode = op->fft.freq_resample_mode;
> > + fcw->depad_output_size = fcw->freq_resample_mode == 0 ?
> > + op->fft.output_sequence_size : op-
> >fft.output_depadded_size;
> > + for (cs = 0; cs < RTE_BBDEV_MAX_CS; cs++) {
> > + fcw->cs_theta_0[cs] = op->fft.cs_theta_0[cs];
> > + fcw->cs_theta_d[cs] = op->fft.cs_theta_d[cs];
> > + fcw->cs_time_offset[cs] = op->fft.time_offset[cs];
> > + }
> > }
> >
> > static inline int
> > @@ -3782,8 +3798,14 @@ vrb_dma_desc_fft_fill(struct rte_bbdev_fft_op
> *op,
> > /* FCW already done */
> > acc_header_init(desc);
> >
> > - RTE_SET_USED(win_input);
> > - RTE_SET_USED(win_offset);
> > + if (win_en && win_input) {
> > + desc->data_ptrs[bd_idx].address =
> rte_pktmbuf_iova_offset(win_input, *win_offset);
> > + desc->data_ptrs[bd_idx].blen = op->fft.output_depadded_size
> * 2;
> > + desc->data_ptrs[bd_idx].blkid = ACC_DMA_BLKID_DEWIN_IN;
> > + desc->data_ptrs[bd_idx].last = 0;
> > + desc->data_ptrs[bd_idx].dma_ext = 0;
> > + bd_idx++;
> > + }
> >
> > desc->data_ptrs[bd_idx].address = rte_pktmbuf_iova_offset(input,
> *in_offset);
> > desc->data_ptrs[bd_idx].blen = op->fft.input_sequence_size *
> > ACC_IQ_SIZE; diff --git a/drivers/baseband/acc/vrb2_vf_enum.h
> > b/drivers/baseband/acc/vrb2_vf_enum.h
> > index 9c6e451010..1cc6986c67 100644
> > --- a/drivers/baseband/acc/vrb2_vf_enum.h
> > +++ b/drivers/baseband/acc/vrb2_vf_enum.h
> > @@ -18,8 +18,8 @@ enum {
>
RE: [PATCH v3] crypto/ipsec_mb: bump minimum IPsec MB version
Hey ARM folks, Intel IPsec MB minimum version is being bumped to 1.4. > -Original Message- > From: Dooley, Brian > Sent: Thursday 10 October 2024 11:13 > To: Ji, Kai ; De Lara Guarch, Pablo > > Cc: dev@dpdk.org; gak...@marvell.com; Dooley, Brian > > Subject: [PATCH v3] crypto/ipsec_mb: bump minimum IPsec MB version > > AESNI_MB SW PMDs increment Intel IPsec MB version to 1.4. > A minimum IPsec Multi-buffer version of 1.4 or greater is now required for the > 24.11 LTS release. > > Signed-off-by: Brian Dooley > Acked-by: Kai Ji > Acked-by: Pablo de Lara > --- > This patch relates to a deprecation notice sent in the 24.03 release. > Intel IPsec MB minimum version being bumped to 1.4 for the 24.11 release. > https://patches.dpdk.org/project/dpdk/patch/20240314103731.3242086- > 2-brian.doo...@intel.com/ > > v2: > Added release note > Remove more IMB_VERSION checks > v3: > Remove deprecation notice > --- > doc/guides/cryptodevs/aesni_gcm.rst | 3 +- > doc/guides/cryptodevs/aesni_mb.rst | 3 +- > doc/guides/cryptodevs/chacha20_poly1305.rst | 3 +- > doc/guides/cryptodevs/kasumi.rst| 3 +- > doc/guides/cryptodevs/snow3g.rst| 3 +- > doc/guides/cryptodevs/zuc.rst | 3 +- > doc/guides/rel_notes/deprecation.rst| 5 - > doc/guides/rel_notes/release_24_11.rst | 3 + > drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 24 -- > drivers/crypto/ipsec_mb/meson.build | 2 +- > drivers/crypto/ipsec_mb/pmd_aesni_mb.c | 268 +--- > drivers/crypto/ipsec_mb/pmd_aesni_mb_priv.h | 9 - > 12 files changed, 19 insertions(+), 310 deletions(-) > > diff --git a/doc/guides/cryptodevs/aesni_gcm.rst > b/doc/guides/cryptodevs/aesni_gcm.rst > index 3af1486553..7592d33da2 100644 > --- a/doc/guides/cryptodevs/aesni_gcm.rst > +++ b/doc/guides/cryptodevs/aesni_gcm.rst > @@ -74,7 +74,8 @@ and the external crypto libraries supported by them: > DPDK version Crypto library version > = > 20.11 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ Multi-buffer library 1.4 - 1.5 > = > > Initialization > diff --git a/doc/guides/cryptodevs/aesni_mb.rst > b/doc/guides/cryptodevs/aesni_mb.rst > index ca930be1bd..16d82147b2 100644 > --- a/doc/guides/cryptodevs/aesni_mb.rst > +++ b/doc/guides/cryptodevs/aesni_mb.rst > @@ -137,7 +137,8 @@ and the Multi-Buffer library version supported by > them: > DPDK versionMulti-buffer library version > == > 20.11 - 21.08 0.53 - 1.3 > - 21.11+ 1.0 - 1.5 > + 21.11 - 24.07 1.0 - 1.5 > + 24.11+ 1.4 - 1.5 > == > > Initialization > diff --git a/doc/guides/cryptodevs/chacha20_poly1305.rst > b/doc/guides/cryptodevs/chacha20_poly1305.rst > index 44cff85918..b5a980b247 100644 > --- a/doc/guides/cryptodevs/chacha20_poly1305.rst > +++ b/doc/guides/cryptodevs/chacha20_poly1305.rst > @@ -66,7 +66,8 @@ and the external crypto libraries supported by them: > = > DPDK version Crypto library version > = > - 21.11+ Multi-buffer library 1.0-1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ Multi-buffer library 1.4 - 1.5 > = > > Initialization > diff --git a/doc/guides/cryptodevs/kasumi.rst > b/doc/guides/cryptodevs/kasumi.rst > index 4070f025e1..b57f18b56f 100644 > --- a/doc/guides/cryptodevs/kasumi.rst > +++ b/doc/guides/cryptodevs/kasumi.rst > @@ -80,7 +80,8 @@ and the external crypto libraries supported by them: > DPDK version Crypto library version > = > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ Multi-buffer library 1.4 - 1.5 > = > > Initialization > diff --git a/doc/guides/cryptodevs/snow3g.rst > b/doc/guides/cryptodevs/snow3g.rst > index 6eb8229fb5..fb4e0448ac 100644 > --- a/doc/guides/cryptodevs/snow3g.rst > +++ b/doc/guides/cryptodevs/snow3g.rst > @@ -89,7 +89,8 @@ and the external crypto libraries supported by them: > DPDK version Crypto library version > = > 20.02 - 21.08 Multi-buffer library 0.53 - 1.3 > - 21.11+ Multi-buffer library 1.0 - 1.5 > + 21.11 - 24.07 Multi-buffer library 1.0 - 1.5 > + 24.11+ Multi-buffer library 1.4 - 1.5 > = > > Initialization
[PATCH dpdk v5 02/17] net: split IPv4 and IPv6 symbols in separate headers
Split IPv4 and IPv6 symbols in two separate headers. rte_ip4.h and
rte_ip6.h, respectively.
Update doxygen index accordingly.
Include rte_ip4.h and rte_ip6.h in rte_ip.h for backward compatibility
in applications.
Signed-off-by: Robin Jarry
Acked-by: Stephen Hemminger
---
doc/api/doxy-api-index.md | 3 +-
lib/net/meson.build | 2 +
lib/net/rte_ip.h| 694 +---
lib/net/{rte_ip.h => rte_ip4.h} | 325 +--
lib/net/{rte_ip.h => rte_ip6.h} | 352 +---
5 files changed, 16 insertions(+), 1360 deletions(-)
copy lib/net/{rte_ip.h => rte_ip4.h} (52%)
copy lib/net/{rte_ip.h => rte_ip6.h} (50%)
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 8b83af53a863..266c8b90dcfb 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -117,7 +117,8 @@ The public API headers are grouped by topics:
[IPsec group](@ref rte_ipsec_group.h),
[IPsec SA](@ref rte_ipsec_sa.h),
[IPsec SAD](@ref rte_ipsec_sad.h),
- [IP](@ref rte_ip.h),
+ [IPv4](@ref rte_ip4.h),
+ [IPv6](@ref rte_ip6.h),
[frag/reass](@ref rte_ip_frag.h),
[UDP](@ref rte_udp.h),
[SCTP](@ref rte_sctp.h),
diff --git a/lib/net/meson.build b/lib/net/meson.build
index ac76acd6a934..8afcc4ed372f 100644
--- a/lib/net/meson.build
+++ b/lib/net/meson.build
@@ -4,6 +4,8 @@
headers = files(
'rte_cksum.h',
'rte_ip.h',
+'rte_ip4.h',
+'rte_ip6.h',
'rte_tcp.h',
'rte_udp.h',
'rte_tls.h',
diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h
index 5cfe51955bcd..3807d82d0605 100644
--- a/lib/net/rte_ip.h
+++ b/lib/net/rte_ip.h
@@ -1,700 +1,12 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 1982, 1986, 1990, 1993
- * The Regents of the University of California.
- * Copyright(c) 2010-2014 Intel Corporation.
- * Copyright(c) 2014 6WIND S.A.
+ * Copyright (c) 2024 Robin Jarry
* All rights reserved.
*/
#ifndef _RTE_IP_H_
#define _RTE_IP_H_
-/**
- * @file
- *
- * IP-related defines
- */
-
-#include
-
-#ifdef RTE_EXEC_ENV_WINDOWS
-#include
-#else
-#include
-#include
-#include
-#include
-#include
-#include
-#endif
-
-#include
-#include
-#include
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * IPv4 Header
- */
-struct rte_ipv4_hdr {
- __extension__
- union {
- uint8_t version_ihl;/**< version and header length */
- struct {
-#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
- uint8_t ihl:4; /**< header length */
- uint8_t version:4; /**< version */
-#elif RTE_BYTE_ORDER == RTE_BIG_ENDIAN
- uint8_t version:4; /**< version */
- uint8_t ihl:4; /**< header length */
-#endif
- };
- };
- uint8_t type_of_service; /**< type of service */
- rte_be16_t total_length;/**< length of packet */
- rte_be16_t packet_id; /**< packet ID */
- rte_be16_t fragment_offset; /**< fragmentation offset */
- uint8_t time_to_live; /**< time to live */
- uint8_t next_proto_id; /**< protocol ID */
- rte_be16_t hdr_checksum;/**< header checksum */
- rte_be32_t src_addr;/**< source address */
- rte_be32_t dst_addr;/**< destination address */
-} __rte_packed;
-
-/** Create IPv4 address */
-#define RTE_IPV4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \
- (((b) & 0xff) << 16) | \
- (((c) & 0xff) << 8) | \
- ((d) & 0xff))
-
-/** Maximal IPv4 packet length (including a header) */
-#define RTE_IPV4_MAX_PKT_LEN65535
-
-/** Internet header length mask for version_ihl field */
-#define RTE_IPV4_HDR_IHL_MASK (0x0f)
-/**
- * Internet header length field multiplier (IHL field specifies overall header
- * length in number of 4-byte words)
- */
-#define RTE_IPV4_IHL_MULTIPLIER(4)
-
-/* Type of Service fields */
-#define RTE_IPV4_HDR_DSCP_MASK (0xfc)
-#define RTE_IPV4_HDR_ECN_MASK (0x03)
-#define RTE_IPV4_HDR_ECN_CERTE_IPV4_HDR_ECN_MASK
-
-/* Fragment Offset * Flags. */
-#defineRTE_IPV4_HDR_DF_SHIFT 14
-#defineRTE_IPV4_HDR_MF_SHIFT 13
-#defineRTE_IPV4_HDR_FO_SHIFT 3
-
-#defineRTE_IPV4_HDR_DF_FLAG(1 << RTE_IPV4_HDR_DF_SHIFT)
-#defineRTE_IPV4_HDR_MF_FLAG(1 << RTE_IPV4_HDR_MF_SHIFT)
-
-#defineRTE_IPV4_HDR_OFFSET_MASK((1 << RTE_IPV4_HDR_MF_SHIFT) -
1)
-
-#defineRTE_IPV4_HDR_OFFSET_UNITS 8
-
-/* IPv4 options */
-#define RTE_IPV4_HDR_OPT_EOL 0
-#define RTE_IPV4_HDR_OPT_NOP 1
-#define RTE_IPV4_HDR_OPT_COPIED(v) ((v) & 0x80)
-#define RTE_IPV4_HDR_OPT_MAX_LEN 40
-
-/*
- * IPv4 address types
- */
-#define RTE_IPV4_ANY ((uint32_t)0x) /**< 0.0.0.0 */
-#define RT
Re: Restrict max packet size on rx
On Fri, 18 Oct 2024 22:05:24 +0530 Rajasekhar Pulluru wrote: > Team, > Does setting mtu using rte_eth_dev_set_mtu limit the maximum size of the > packet received on the dpdk port to the configured mtu size? > > On an intel machine with ixgbe port, with mtu set to 1500, no rx-offloads > enabled, ixgbe dpdk port is able to receive packets greater than 1500 size > and even jumbo frames of size 9000, even though the peer is sending them > fragmented with mtu of 1500. > > How do I restrict the port not to receive any frame greater than mtu size? > > Appreciate any help, > Thanks. > Rajasekhar In networking, MTU and MRU are overlapping concepts. The MTU value is used as a hint to the driver as to what size buffer to allocate but it can use larger if it wants. If you have restrictions, then the application needs to enforce them.
Re: [PATCH v4] net: add bit fields to IPv6 header definition
On Tue, Jun 18, 2024 at 2:44 PM Morten Brørup wrote: > > From: Gregory Etelson [mailto:getel...@nvidia.com] > > > > DPDK IPv6 header definition combined the `version`, `traffic class` > > and `flow label` header fields into a single 32 bits structure member > > `vtc_flow`. > > > > The patch expands IPv6 header definition with dedicated structure > > members for the `version`, `traffic class` and `flow label` fields. > > The `traffic class` is also separated into DS and ECN fields. > > > > The patch also preserves existing `vtc_flow` structure member for > > backward compatibility. > > > > Signed-off-by: Gregory Etelson > Reviewed-by: Morten Brørup Applied, thanks. -- David Marchand
Re: [PATCH] common/cnxk: replace deprecated function for cross compilation
On Fri, Oct 18, 2024 at 6:26 PM Bruce Richardson
wrote:
>
> On Fri, Oct 18, 2024 at 06:00:43PM +0200, David Marchand wrote:
> > Some (newly introduced) use of "get_cross_property" was missed.
> > Convert to get_external_property.
> >
> > Fixes: b0d0c84b3c0f ("build: replace deprecated function for cross
> > compilation")
> >
> > Signed-off-by: David Marchand
> Acked-by: Bruce Richardson
Applied, thanks.
--
David Marchand
Re: Restrict max packet size on rx
Thanks Stephen. On Fri, Oct 18, 2024 at 10:13 PM Stephen Hemminger < step...@networkplumber.org> wrote: > On Fri, 18 Oct 2024 22:05:24 +0530 > Rajasekhar Pulluru wrote: > > > Team, > > Does setting mtu using rte_eth_dev_set_mtu limit the maximum size of the > > packet received on the dpdk port to the configured mtu size? > > > > On an intel machine with ixgbe port, with mtu set to 1500, no rx-offloads > > enabled, ixgbe dpdk port is able to receive packets greater than 1500 > size > > and even jumbo frames of size 9000, even though the peer is sending them > > fragmented with mtu of 1500. > > > > How do I restrict the port not to receive any frame greater than mtu > size? > > > > Appreciate any help, > > Thanks. > > Rajasekhar > > > In networking, MTU and MRU are overlapping concepts. > The MTU value is used as a hint to the driver as to what size buffer to > allocate > but it can use larger if it wants. If you have restrictions, then the > application > needs to enforce them. >
Re: [PATCH v6] doc: add new driver guidelines
06/10/2024 23:09, Ferruh Yigit: > On 10/6/2024 7:42 PM, Nandini Persad wrote: > > This document was created to assist contributors in creating DPDK drivers > > and provides suggestions and guidelines on how to upstream effectively. > > > > Signed-off-by: Ferruh Yigit > > Signed-off-by: Nandini Persad > > Reviewed-by: Stephen Hemminger > > Acked-by: Chengwen Feng > > Looks good to me, thanks. Applied with few formatting edits, thanks.
RE: [EXTERNAL] [PATCH v5 2/4] cryptodev: add ec points to sm2 op
>
>
> > -Original Message-
> > From: Akhil Goyal
> > Sent: Friday, October 11, 2024 2:18 PM
> > To: Kusztal, ArkadiuszX ; dev@dpdk.org
> > Cc: Dooley, Brian
> > Subject: RE: [EXTERNAL] [PATCH v5 2/4] cryptodev: add ec points to sm2 op
> >
> > > In the case when PMD cannot support the full process of the SM2, but
> > > elliptic curve computation only, additional fields are needed to
> > > handle such a case.
> > >
> > > Points C1, kP therefore were added to the SM2 crypto operation struct.
> > >
> > > Signed-off-by: Arkadiusz Kusztal
> > > ---
> > > lib/cryptodev/rte_crypto_asym.h | 53
> > > ++--
> > > -
> > > 1 file changed, 39 insertions(+), 14 deletions(-)
> > >
> > > diff --git a/lib/cryptodev/rte_crypto_asym.h
> > > b/lib/cryptodev/rte_crypto_asym.h index 2af6a307f6..65b1a081b1 100644
> > > --- a/lib/cryptodev/rte_crypto_asym.h
> > > +++ b/lib/cryptodev/rte_crypto_asym.h
> > > @@ -607,6 +607,8 @@ enum rte_crypto_sm2_op_capa {
> > > /**< Random number generator supported in SM2 ops. */
> > > RTE_CRYPTO_SM2_PH,
> > > /**< Prehash message before crypto op. */
> > > + RTE_CRYPTO_SM2_PARTIAL,
> > > + /**< Calculate elliptic curve points only. */
> > > };
> > >
> > > /**
> > > @@ -634,20 +636,43 @@ struct rte_crypto_sm2_op_param {
> > >* will be overwritten by the PMD with the decrypted length.
> > >*/
> > >
> > > - rte_crypto_param cipher;
> > > - /**<
> > > - * Pointer to input data
> > > - * - to be decrypted for SM2 private decrypt.
> > > - *
> > > - * Pointer to output data
> > > - * - for SM2 public encrypt.
> > > - * In this case the underlying array should have been allocated
> > > - * with enough memory to hold ciphertext output (at least X bytes
> > > - * for prime field curve of N bytes and for message M bytes,
> > > - * where X = (C1 || C2 || C3) and computed based on SM2 RFC as
> > > - * C1 (1 + N + N), C2 = M, C3 = N. The cipher.length field will
> > > - * be overwritten by the PMD with the encrypted length.
> > > - */
> > > + union {
> > > + rte_crypto_param cipher;
> > > + /**<
> > > + * Pointer to input data
> > > + * - to be decrypted for SM2 private decrypt.
> > > + *
> > > + * Pointer to output data
> > > + * - for SM2 public encrypt.
> > > + * In this case the underlying array should have been allocated
> > > + * with enough memory to hold ciphertext output (at least X
> > > bytes
> > > + * for prime field curve of N bytes and for message M bytes,
> > > + * where X = (C1 || C2 || C3) and computed based on SM2 RFC
> > > as
> > > + * C1 (1 + N + N), C2 = M, C3 = N. The cipher.length field will
> > > + * be overwritten by the PMD with the encrypted length.
> > > + */
> > > + struct {
> > > + struct rte_crypto_ec_point C1;
> > > + /**<
> > > + * This field is used only when PMD does not support
> > the
> > > full
> > > + * process of the SM2 encryption/decryption, but the
> > > elliptic
> > > + * curve part only.
> > > + *
> > > + * In the case of encryption, it is an output - point
> > > C1 =
> > > (x1,y1).
> > > + * In the case of decryption, if is an input - point C1
> > > =
> > > (x1,y1)
> > > + *
> > > + */
> > > + struct rte_crypto_ec_point kP;
> > > + /**<
> > > + * This field is used only when PMD does not support
> > the
> > > full
> > > + * process of the SM2 encryption/decryption, but the
> > > elliptic
> > > + * curve part only.
> > > + *
> > > + * It is an output in the encryption case, it is a point
> > > + * [k]P = (x2,y2)
> > > + */
> >
> > It is better to keep the variable names in lower case.
> > c1 and kp should be fine.
>
> The reason for keeping some of the letters in uppercase is that it
> corresponds to
> the general convention of naming for these types.
> That's why we have dQ, qInv in RSA key for example, not dq, qinv.
Those were missed in the review. We should not add new ones.
[PATCH dpdk v4 08/17] cmdline: use IPv6 address structure
The previous commits introduced a new rte_ipv6_addr structure without
any alignment requirements. It is not compatible with the in6_addr POSIX
type available in netinet/in.h.
The main issue is that in6_addr is not uniform on all platforms which
causes unaligned access warnings when compiling without
-Wno-address-of-packed-member (set in dpdk by default).
In order to have a consistent code base, replace in6_addr with
rte_ipv6_addr in the cmdline library. Update all code accordingly.
Signed-off-by: Robin Jarry
---
app/graph/ethdev.c | 4 +--
app/graph/ip6_route.c | 6 ++--
app/graph/neigh.c | 2 +-
app/test-pmd/cmdline.c | 4 +--
app/test-pmd/cmdline_flow.c| 14 +++-
app/test-pmd/testpmd.h | 16 -
app/test/test_cmdline_ipaddr.c | 49 --
doc/guides/rel_notes/release_24_11.rst | 2 ++
examples/cmdline/commands.c| 30 +++-
lib/cmdline/cmdline_parse_ipaddr.h | 3 +-
10 files changed, 34 insertions(+), 96 deletions(-)
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index cfc1b1856910..13ed791412e1 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -627,10 +627,10 @@ cmd_ethdev_dev_ip6_addr_add_parsed(void *parsed_result,
__rte_unused struct cmdl
int rc = -EINVAL, i;
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.ip[i] = res->ip.addr.ipv6.s6_addr[i];
+ config.ip[i] = res->ip.addr.ipv6.a[i];
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.mask[i] = res->mask.addr.ipv6.s6_addr[i];
+ config.mask[i] = res->mask.addr.ipv6.a[i];
rc = ethdev_ip6_addr_add(res->dev, &config);
if (rc < 0)
diff --git a/app/graph/ip6_route.c b/app/graph/ip6_route.c
index 834719ecaeb4..d91466cd78d6 100644
--- a/app/graph/ip6_route.c
+++ b/app/graph/ip6_route.c
@@ -157,13 +157,13 @@ cmd_ipv6_lookup_route_add_ipv6_parsed(void
*parsed_result, __rte_unused struct c
int rc = -EINVAL, i;
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.ip[i] = res->ip.addr.ipv6.s6_addr[i];
+ config.ip[i] = res->ip.addr.ipv6.a[i];
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.mask[i] = res->mask.addr.ipv6.s6_addr[i];
+ config.mask[i] = res->mask.addr.ipv6.a[i];
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- config.gateway[i] = res->via_ip.addr.ipv6.s6_addr[i];
+ config.gateway[i] = res->via_ip.addr.ipv6.a[i];
rc = route_ip6_add(&config);
if (rc)
diff --git a/app/graph/neigh.c b/app/graph/neigh.c
index 79fd542c8948..eb7a09f1f145 100644
--- a/app/graph/neigh.c
+++ b/app/graph/neigh.c
@@ -266,7 +266,7 @@ cmd_neigh_add_ipv6_parsed(void *parsed_result, __rte_unused
struct cmdline *cl,
uint64_t mac;
for (i = 0; i < ETHDEV_IPV6_ADDR_LEN; i++)
- ip[i] = res->ip.addr.ipv6.s6_addr[i];
+ ip[i] = res->ip.addr.ipv6.a[i];
if (parser_mac_read(&mac, res->mac)) {
printf(MSG_ARG_INVALID, "mac");
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 76d906ee5a27..7e0666e9f634 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8977,9 +8977,7 @@ do { \
#define IPV6_ADDR_TO_ARRAY(ip_addr, ip) \
do { \
if ((ip_addr).family == AF_INET6) \
- rte_memcpy(&(ip), \
-&((ip_addr).addr.ipv6), \
-sizeof(struct in6_addr)); \
+ ip = ip_addr.addr.ipv6; \
else { \
fprintf(stderr, "invalid parameter.\n"); \
return; \
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 5f71e5ba4440..1e4f2ebc556f 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -902,10 +902,8 @@ struct vxlan_encap_conf vxlan_encap_conf = {
.udp_dst = RTE_BE16(RTE_VXLAN_DEFAULT_PORT),
.ipv4_src = RTE_IPV4(127, 0, 0, 1),
.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
- .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
- .ipv6_dst = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11 },
+ .ipv6_src = RTE_IPV6_ADDR_LOOPBACK,
+ .ipv6_dst = RTE_IPV6(0, 0, 0, 0, 0, 0, 0, 0x),
.vlan_tci = 0,
.ip_tos = 0,
.ip_ttl = 255,
@@ -936,10 +934,8 @@ struct nvgre_encap_conf nvgre_encap_conf = {
.tni = { 0x00, 0x00, 0x00 },
.ipv4_src = RTE_IPV4(127, 0, 0, 1),
.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
- .ipv6_src = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
- .ipv6_dst = { 0x00, 0x00,
Re: [PATCH v4] hash: separate creation parameters checks
17/10/2024 17:10, Thomas Monjalon: > From: Niall Meade > > Separate name, entries and key_len parameter checks in rte_hash_create(). > Also make the error messages more informative/verbose > to help with debugging. > > Signed-off-by: Niall Meade > Acked-by: Stephen Hemminger > --- > v4: formatting details > sent for triggering a new CI run The community CI lab is not in a good shape today but I take the risk applying this patch.
Re: [PATCH dpdk v5 00/17] IPv6 APIs overhaul
On Fri, Oct 18, 2024 at 4:06 PM Robin Jarry wrote:
>
> Hi everyone,
>
> As discussed recently [1], here is a first draft of the IPv6 APIs rework. The
> API change was announced before the 24.07 release [2]. This series is intended
> for 24.11.
>
> [1] http://inbox.dpdk.org/dev/d2sr8t1h39cj.jrqfi6jeh...@redhat.com/
> [2]
> https://git.dpdk.org/dpdk/commit/?id=835d4c41e0ab58a115c2170c886ba6d3cc1b5764
>
> I tried to keep the patches as small as possible; unfortunately some of them
> are quite big and cannot be broken down if we want to preserve a bisectable
> tree.
>
> Thanks!
>
> Cc: Bruce Richardson
> Cc: Ferruh Yigit
> Cc: Konstantin Ananyev
> Cc: Morten Brørup
> Cc: Stephen Hemminger
> Cc: Vladimir Medvedkin
>
> Changelog:
>
> v5:
>
> - rebase on e214d58eb87b ("net: improve VLAN header type alignment")
> - fix include ordering
> - improve doxygen api
> - fix RTE_IPV6_U16_SPLIT to make sparse happy about 0x literals being
> truncated
> - reformat macros with \ only separated with a space
> - update changelog with deprecated symbols and their replacements, if any
>
> Robin Jarry (17):
> net: split raw checksum functions in separate header
> net: split IPv4 and IPv6 symbols in separate headers
> net: add IPv6 address structure and utils
> net: use IPv6 structure for packet headers
> lpm6: use IPv6 address structure and utils
> fib6: use IPv6 address structure and utils
> rib6: use IPv6 address structure and utils
> cmdline: use IPv6 address structure
> node: use IPv6 address structure and utils
> pipeline: use IPv6 structures
> ipsec: use IPv6 address structure
> security: use IPv6 address structure
> hash: use IPv6 address structure
> gro: use IPv6 address structure
> flow: use IPv6 address structure
> net: add utilities for well known IPv6 address types
> net: add function to check IPv6 version
>
> MAINTAINERS |1 +
> app/graph/ethdev.c | 44 +-
> app/graph/ethdev.h |9 +-
> app/graph/ip6_route.c| 51 +-
> app/graph/meson.build|2 +-
> app/graph/neigh.c| 21 +-
> app/graph/neigh_priv.h |4 +-
> app/graph/route.h|8 +-
> app/test-fib/main.c | 74 +-
> app/test-flow-perf/actions_gen.c |4 +-
> app/test-flow-perf/items_gen.c |4 +-
> app/test-pipeline/pipeline_hash.c|4 +-
> app/test-pipeline/pipeline_lpm_ipv6.c| 11 +-
> app/test-pmd/cmdline.c |4 +-
> app/test-pmd/cmdline_flow.c | 14 +-
> app/test-pmd/testpmd.h | 16 +-
> app/test-sad/main.c | 24 +-
> app/test/meson.build |1 +
> app/test/packet_burst_generator.c|4 +-
> app/test/test_cmdline_ipaddr.c | 49 +-
> app/test/test_fib6.c | 92 +-
> app/test/test_fib6_perf.c|8 +-
> app/test/test_ipfrag.c |4 +-
> app/test/test_ipsec_sad.c| 46 +-
> app/test/test_lpm6.c | 490 +++---
> app/test/test_lpm6_data.h| 2025 +++---
> app/test/test_lpm6_perf.c| 10 +-
> app/test/test_net_ip6.c | 195 +++
> app/test/test_reassembly_perf.c | 23 +-
> app/test/test_rib6.c | 55 +-
> app/test/test_table_combined.c |2 +-
> app/test/test_table_tables.c |8 +-
> app/test/test_thash.c| 46 +-
> doc/api/doxy-api-index.md|4 +-
> doc/guides/prog_guide/ipsec_lib.rst |4 +-
> doc/guides/rel_notes/deprecation.rst | 42 -
> doc/guides/rel_notes/release_24_11.rst | 61 +
> drivers/common/cnxk/cnxk_security.c | 14 +-
> drivers/net/bnxt/bnxt_flow.c | 12 +-
> drivers/net/bonding/rte_eth_bond_pmd.c |6 +-
> drivers/net/cxgbe/cxgbe_flow.c | 18 +-
> drivers/net/dpaa2/dpaa2_flow.c | 22 +-
> drivers/net/hinic/hinic_pmd_flow.c |6 +-
> drivers/net/hinic/hinic_pmd_tx.c |2 +-
> drivers/net/hns3/hns3_flow.c |8 +-
> drivers/net/i40e/i40e_flow.c | 12 +-
> drivers/net/iavf/iavf_fdir.c |8 +-
> drivers/net/iavf/iavf_fsub.c |8 +-
> drivers/net/iavf/iavf_ipsec_crypto.c |9 +-
> drivers/net/ice/ice_fdir_filter.c| 12 +-
> drivers/net/ice/ice_switch_filter.c | 16 +-
> drivers/net/igc/igc_flow.c |4 +-
> drivers/net/ixgbe/ixgbe_flow.c | 12 +-
> drivers/net/ixgbe/ixgbe_ipsec.c |4 +-
> drivers/net/mlx5/hws/mlx5dr_definer.c| 36 +-
> drivers/net/mlx5/mlx5_flow.c |6 +-
> drivers/net/mlx5/mlx5_flow_dv.c | 16 +-
> drivers/net/mlx5/mlx5_
Re: [PATCH v5 00/47] TruFlow update for Thor2
On Fri, 18 Oct 2024 14:40:37 +0530 Sriharsha Basavapatna wrote: > This patch series introduces TruFlow functionality for Broadcom Thor2 NIC. > > TruFlow(TF) is the software library that exposes CFA HW resources to > upper layer protocols or applications. This patch series implements the > tfc (tf_core) and the tf_ulp libraries as a part of the bnxt PMD, > so that upper layer APIs such as rte_flow can access the hardware. > > ** > v4->v5: > Updated below patches to use the new logging macro PMD_DRV_LOG_LINE(): > [PATCH 05/47] net/bnxt: tf_core: flow scale improvement > [PATCH 11/47] net/bnxt: tfc: support tf-core for Thor2 > [PATCH 16/47] net/bnxt: tf_ulp: miscellaneous fixes > [PATCH 17/47] net/bnxt: tf_ulp: support for Thor2 ulp layer > [PATCH 23/47] net/bnxt: tf_ulp: VFR updates for Thor 2 > [PATCH 33/47] net/bnxt: tf_ulp: support for dynamic tunnel ports > [PATCH 36/47] net/bnxt: tf_ulp: add support for rss flow query to ULP > [PATCH 38/47] net/bnxt: tf_ulp: inline utility functions and use > [PATCH 47/47] net/bnxt: tf_ulp: add stats cache for thor2 > > v3->v4: > Updated patch 0011 to fix a build error with clang in tfc_em.c. > > v2->v3: > Updated the below patch to fix errors reported by DPDK CICD tests. > 0011-net-bnxt-tfc-support-tf-core-for-Thor2.patch > > v1->v2: > Updated the below two patches to fix errors reported by DPDK CICD tests. > 0011-net-bnxt-tfc-support-tf-core-for-Thor2.patch > 0047-net-bnxt-tf_ulp-add-stats-cache-for-thor2.patch > ** > > Farah Smith (2): > net/bnxt: tf_core: Thor TF EM key size check > net/bnxt: tfc: support tf-core for Thor2 > > Jay Ding (2): > net/bnxt: tf_ulp: add action read and clear support > net/bnxt: tf_ulp: add rte_mtr support for Thor2 > > Kishore Padmanabha (21): > net/bnxt: tf_core: flow scale improvement > net/bnxt: tf_ulp: add support for vf to vf flow offload > net/bnxt: tf_ulp: add support for overlapping flows > net/bnxt: tf_ulp: convert recipe table to dynamic memory > net/bnxt: tf_ulp: add feature bit support > net/bnxt: tf_ulp: update template files > net/bnxt: tf_ulp: add support for tunnel flow stats > net/bnxt: tf_ulp: update template files > net/bnxt: tf_ulp: enable recipe id generation > net/bnxt: tf_ulp: fixed parent child db counters > net/bnxt: tf_ulp: update template files > net/bnxt: tf_ulp: add mask defaults when mask is not specified > net/bnxt: tf_ulp: add jump action support > net/bnxt: tf_ulp: add support for flow priority > net/bnxt: tf_ulp: support for dynamic tunnel ports > net/bnxt: tf_ulp: add track type feature to tables > net/bnxt: tf_ulp: update template files > net/bnxt: tf_ulp: support a few generic template items > net/bnxt: tf_ulp: update template files > net/bnxt: tf_ulp: enable support for truflow feature configuration > net/bnxt: tf_ulp: support a few feature extensions > > Manish Kurup (1): > net/bnxt: tf_ulp: Wh+ mirroring support > > Mike Baucom (2): > net/bnxt: tf_ulp: miscellaneous fixes > net/bnxt: tf_ulp: VFR updates for Thor 2 > > Peter Spreadborough (4): > net/bnxt: tf_ulp: inline utility functions and use likely/unlikely > net/bnxt: tf_ulp: switch ulp to use rte crc32 hash > net/bnxt: tf_ulp: update template files > net/bnxt: tf_ulp: add stats cache for thor2 > > Randy Schacher (5): > net/bnxt: tf_core: convert priority based TCAM manager to dynamic > allocation > net/bnxt: tf_core: remove dead AFM code from session-based priority > TCAM mgr > net/bnxt: tf_core: remove dead code from session-based priority TCAM > mgr > net/bnxt: tf_ulp: add vxlan-gpe base support > net/bnxt: tf_ulp: add support for rss flow query to ULP > > Sangtani Parag Satishbhai (1): > net/bnxt: tf_core: fix slice count in case of HA entry move > > Shahaji Bhosle (3): > net/bnxt: tf_core: fix wc tcam multi slice delete issue > net/bnxt: tf_core: tcam manager data corruption > net/bnxt: tf_ulp: add custom l2 etype tunnel support > > Shuanglin Wang (6): > net/bnxt: tf_core: External EM support cleanup > net/bnxt: tf_core: TF support flow scale query > net/bnxt: tf_ulp: support for Thor2 ulp layer > net/bnxt: tf_ulp: modify return values to adhere to C coding standard > net/bnxt: tf_ulp: TF support flow scale query > net/bnxt: tf_ulp: TFC support flow scale query for Thor2 > > drivers/net/bnxt/bnxt.h |41 +- > drivers/net/bnxt/bnxt_cpr.c |62 +- > drivers/net/bnxt/bnxt_cpr.h |24 +- > drivers/net/bnxt/bnxt_ethdev.c| 110 +- > drivers/net/bnxt/bnxt_flow.c | 5 +- > drivers/net/bnxt/bnxt_hwrm.c | 328 +- > drivers/net/bnxt/bnxt_hwrm.h |20 + > drivers/net/bnxt/bnxt_mpc.c | 828 + > drivers/net/bnxt/bnxt_mpc.h | 117 + > drivers/net/bnxt/bnxt_reps.c | 115 +- > drivers/net/bnxt/bnxt_ring.c
Re: [PATCH] ci: fix unit tests with Fedora 37
On Fri, Oct 18, 2024 at 3:57 PM David Marchand
wrote:
>
> This was detected in UNH envs.
>
> In Fedora 37 and other distributions, meson 0.57 breaks when calling
> the unit tests (probably because of an incompatibility with Python 3.11):
>
> $ meson test -C build --suite DPDK:fast-tests
> ninja: Entering directory `/root/dpdk/build'
> ninja: no work to do.
> Exception in callback TestHarness._run_tests..test_done
> ()
> at /usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py:1806
> handle: .test_done
> ()
> at /usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py:1806>
> Traceback (most recent call last):
> File "/usr/lib64/python3.11/asyncio/events.py", line 80, in _run
> self._context.run(self._callback, *self._args)
> File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
> line 1808, in test_done
> f.result()
> File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
> line 1803, in run_test
> res = await test.run(self)
>
> File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
> line 1349, in run
> await self._run_cmd(harness, cmd)
> File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
> line 1415, in _run_cmd
> returncode, result, additional_error =
> await p.wait(self.runobj.timeout)
> ^
> File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
> line 1241, in wait
> await try_wait_one(p.wait(), timeout=timeout)
> File "/usr/local/lib/python3.11/site-packages/mesonbuild/mtest.py",
> line 1132, in try_wait_one
> await asyncio.wait(awaitables,
> File "/usr/lib64/python3.11/asyncio/tasks.py", line 425, in wait
> raise TypeError("Passing coroutines is forbidden, use tasks
> explicitly.")
> TypeError: Passing coroutines is forbidden, use tasks explicitly.
> /usr/lib64/python3.11/asyncio/events.py:80: RuntimeWarning: coroutine
> 'Process.wait' was never awaited
> self._context.run(self._callback, *self._args)
> RuntimeWarning: Enable tracemalloc to get the object allocation traceback
>
> This issue is fixed by upgrading to 0.57.2.
>
> Fixes: 6f3dbd306de0 ("build: increase minimum meson version to 0.57")
>
> Suggested-by: Robin Jarry
> Signed-off-by: David Marchand
Acked-by: Patrick Robb
Applied, thanks.
--
David Marchand
Re: [PATCH] net/mvpp2: fix build with IPv6 address structure
18/10/2024 22:11, Thomas Monjalon:
> A structure has been created for IPv6 addresses
> replacing the byte arrays of the IPv6 header.
>
> This change was failing the compilation:
> mrvl_flow.c:1055:29: error: incompatible type for argument 1 of 'memcmp'
>
> Instead of adapting the memcmp call, a new function is used
> to compare an IPv6 address with an unspec (zero) address.
>
> Fixes: 89b5642d0d45 ("net: use IPv6 address structure for packet headers")
>
> Signed-off-by: Thomas Monjalon
Applied quickly for the release 24.11-rc1
[PATCH] net/mvpp2: fix build with IPv6 address structure
A structure has been created for IPv6 addresses
replacing the byte arrays of the IPv6 header.
This change was failing the compilation:
mrvl_flow.c:1055:29: error: incompatible type for argument 1 of 'memcmp'
Instead of adapting the memcmp call, a new function is used
to compare an IPv6 address with an unspec (zero) address.
Fixes: 89b5642d0d45 ("net: use IPv6 address structure for packet headers")
Signed-off-by: Thomas Monjalon
---
drivers/net/mvpp2/mrvl_flow.c | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
index 098523ada6..9932e28edc 100644
--- a/drivers/net/mvpp2/mrvl_flow.c
+++ b/drivers/net/mvpp2/mrvl_flow.c
@@ -1031,7 +1031,6 @@ mrvl_parse_ip6(const struct rte_flow_item *item,
struct rte_flow_error *error)
{
const struct rte_flow_item_ipv6 *spec = NULL, *mask = NULL;
- struct rte_ipv6_hdr zero;
uint32_t flow_mask;
int ret;
@@ -1043,8 +1042,6 @@ mrvl_parse_ip6(const struct rte_flow_item *item,
if (ret)
return ret;
- memset(&zero, 0, sizeof(zero));
-
if (mask->hdr.payload_len ||
mask->hdr.hop_limits) {
rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM,
@@ -1052,15 +1049,13 @@ mrvl_parse_ip6(const struct rte_flow_item *item,
return -rte_errno;
}
- if (memcmp(mask->hdr.src_addr,
- zero.src_addr, sizeof(mask->hdr.src_addr))) {
+ if (!rte_ipv6_addr_is_unspec(&mask->hdr.src_addr)) {
ret = mrvl_parse_ip6_sip(spec, mask, flow);
if (ret)
goto out;
}
- if (memcmp(mask->hdr.dst_addr,
- zero.dst_addr, sizeof(mask->hdr.dst_addr))) {
+ if (!rte_ipv6_addr_is_unspec(&mask->hdr.dst_addr)) {
ret = mrvl_parse_ip6_dip(spec, mask, flow);
if (ret)
goto out;
--
2.46.0
Re: [PATCH v3 2/4] hash: add dynamic polynomial calculation
Hi Stephen,
On 17/10/2024 04:23, Stephen Hemminger wrote:
On Wed, 16 Oct 2024 17:28:17 +0100
"Medvedkin, Vladimir" wrote:
Hi Stephen,
On 15/10/2024 23:29, Stephen Hemminger wrote:
On Fri, 11 Oct 2024 18:17:00 +
Vladimir Medvedkin wrote:
+
+uint32_t
+rte_thash_get_rand_poly(uint32_t poly_degree)
+{
+ uint32_t ret_poly;
+
+ if (poly_degree > 32)
Error log here?
+ return 0;
+
+ do
+ ret_poly = __thash_get_rand_poly(poly_degree);
+ while (thash_test_poly_order(ret_poly, poly_degree));
Unbounded loop adds some risk, should there be an upper limit on retries.
Thisis the probabilisticpartof the algorithm.
__thash_get_rand_poly() returns a random polynomial that either
satisfies the order criteria (element of the field must generate
multiplicative subgroup of order not less than some number), or not. The
probability that it does not meet this criteria is strictly less than 1.
Thus, with each attempt, the probability of not finding suitable
polynomial exponentially tends to zero.
Never trust probabilities to converge. Just add an upper bound of something big
like 32 tries and log error and give up.
I disagree. I don't want this to give up. Take a look at this algorithm
from the perspective of an equivalent bounded random function:
https://lxr.missinglinkelectronics.com/dpdk/lib/eal/common/rte_random.c#L171
or
https://elixir.bootlin.com/linux/v6.11.3/source/include/linux/random.h#L60
The job must be done. Imagine if these random functions may return
something like "EAGAIN". The caller needs random value at this pointto
continue, so there are only 2 options left - either panic or call the
function again.
We definitely don't want to panic here. But calling this algorithm again
will have the same effect as not having runtime bound inside the
algorithm at all. In other words, here I prefer to have "Las Vegas"
rather than "Monte Carlo" algorithm. And it make sense since in these
particular cases (i.e. my algorithm and bounded random implementations)
we have:
1. A simple deterministic algorithm for checking the complianceof
somerandomvariablewith a condition
2. Every random variable is independent from each other. So probability
of getting unsatisfying random variable after n steps drops
exponentially (negative outcome probabilities multiplies). That's why
those algorithms runtime expected value is bounded.
+
+ return ret_poly;
+}
diff --git a/lib/hash/version.map b/lib/hash/version.map
index 4f13f1d5aa..7ce6ab1121 100644
--- a/lib/hash/version.map
+++ b/lib/hash/version.map
@@ -61,4 +61,5 @@ INTERNAL {
rte_thash_gfni_stub;
rte_thash_gfni_bulk_stub;
+ rte_thash_get_rand_poly;
Why does this function need to be moved to its own file?
Only used in one place in rte_thash.c.
It was done just for convenience. If you insist, I'll move it to rte_thash.c
It is actually good to put in seperate file, but you can keep the old name.
Best to reserve names with rte_ prefix for user visible prefixes.
--
Regards,
Vladimir
Re: [PATCH] mbuf: add transport mode ESP packet type
On Thu, Aug 22, 2024 at 5:33 PM Alexander Kozyrev wrote: > > Support the IP Encapsulating Security Payload (ESP) in transport mode. > Currently, we have RTE_PTYPE_TUNNEL_ESP for the ESP tunnel mode. > Transport mode can be detected by parsing the "Next Header" field. > The Next Header is TCP for the transport mode and IP for the tunnel mode. > Add RTE_PTYPE_L4_ESP for the regular transport mode and > RTE_PTYPE_INNER_L4_ESP for the ESP over UDP packets. > > Signed-off-by: Alexander Kozyrev I am curious, where is the driver that implements this? -- David Marchand
Re: [PATCH dpdk v2] net: add more icmp types and code
18/10/2024 02:39, Morten Brørup: > > From: Robin Jarry [mailto:rja...@redhat.com] > > Sent: Friday, 18 October 2024 00.42 > > > > Add more ICMP message types and codes based on RFC 792. Change the > > namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow > > differentiation > > between types and codes. > > > > Do not include deprecated message types as described in RFC 6918. > > > > Link: https://www.rfc-editor.org/rfc/rfc792 > > Link: https://www.rfc-editor.org/rfc/rfc6918 > > Signed-off-by: Robin Jarry > > Acked-by: Stephen Hemminger > > Acked-by: Ferruh Yigit > > Acked-by: Morten Brørup Highlighted the API changes in the release notes, and applied, thanks.
Re: [PATCH v26 00/15] Log subsystem improvements
On Fri, 18 Oct 2024 19:07:18 +0200 David Marchand wrote: > Hello Stephen, > > On Wed, Oct 16, 2024 at 10:24 PM Stephen Hemminger > wrote: > > > > Improvements and unification of logging library. > > This version works on all platforms: Linux, Windows and FreeBSD. > > > > This is update to rework patch set. It adds several new features > > to the console log output. > > > > * Putting a timestamp on console output which is useful for > > analyzing performance of startup codes. Timestamp is optional > > and must be enabled on command line. > > > > * Displaying console output with colors. > > It uses the standard conventions used by many other Linux commands > > for colorized display. The default is to enable color if the > > console output is going to a terminal. But it can be always > > on or disabled by command line flag. This default was chosen > > based on what dmesg(1) command does. > > > > Color is used by many tools (vi, iproute2, git) because it is helpful; > > DPDK drivers and libraries print lots of not very useful messages. > > And having error messages highlighted in bold face helps. > > This might also get users to pay more attention to error messages. > > Many bug reports have earlier messages that are lost because > > there are so many info messages. > > > > * Add support for automatic detection of systemd journal > > protocol. If running as systemd service will get enhanced > > logging. > > > > * Use of syslog is optional and the meaning of the > > --syslog flag has changed. The default is *not* to use > > syslog if output is going to a terminal. > > > > Add myself as maintainer for log because by now have added > > more than previous authors. > > Thanks for the series. > > Overall, it looks good, but I am too short on time for merging in rc1 > and I have some comments. > I'll consider merging it in rc2. > > > - The main point is the "automatic" aspect but we want to provide some > way to force where the logs end up. > With this series, the user has --syslog (whose meaning is changed) and > --log-journal options to affect where the logs go. > Can we get a single option? > Like maybe --log-destination=console|syslog|journal|auto ? That could work. The goal here is to do the right thing without options. And reduce the duplication. Right now, applications end up logging to both console and syslog. > > - I don't really understand why changing the --syslog is better. > We lose the ability to select the syslog facility. > Either this feature was useless, and I would rather deprecate or > remove it explicitly (and the --syslog with it). > Or we should keep it as is for compat reason. Syslog facility really was pretty useless. The number of facilities is too small and there never was a good reason to have it. Maybe keep old option syntax as fallback? > > - The color and timestamping options only affect the console output, > which is not clear with the --log-color / --log-timestamp names. > Maybe we can enhance with some other name? Timestamp is unneeded with syslog or journal since they do it already. It is possible to force timestamp or color when going to a file (by setting log stream). Did consider that options could be: --color and --timestamp but seemed better to keep all log related options together. > > - Did you test redirecting all logs to an external logging function? > I suppose it still works, but it is important not to break such feature for > OVS. Did not have test for that, should be put in functional tests. I flip/flopped on default for color. I like the auto mode and it might make users see errors more. But concerned that things like CI which are capturing via pseudo-terminals might get color and not know what to do with it. Final version defaults to off.
[PATCH] net/netvsc: force TX VLAN offload on 801.2Q packet
From: Long Li
The VSP assumes the packet doesn't have VLAN tags. When VLAN tag is
present in a TX packet, always strip it and use PPI to send VLAN info
through VSP packet.
Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
Cc: Hui (Hui) Ling
Cc: Stephen Hemminger
Cc: Wei Hu
Cc: sta...@dpdk.org
Signed-off-by: Long Li
---
drivers/net/netvsc/hn_rxtx.c | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 9bf1ec5509..e58efe793e 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1518,14 +1518,32 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts)
for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) {
struct rte_mbuf *m = tx_pkts[nb_tx];
- uint32_t pkt_size = m->pkt_len + HN_RNDIS_PKT_LEN;
struct rndis_packet_msg *pkt;
struct hn_txdesc *txd;
+ uint32_t pkt_size;
txd = hn_txd_get(txq);
if (txd == NULL)
break;
+ if (!(m->ol_flags & RTE_MBUF_F_TX_VLAN)) {
+ struct rte_ether_hdr *eh =
+ rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
+ struct rte_vlan_hdr *vh;
+
+ /* Force TX vlan offloading for 801.2Q packet */
+ if (eh->ether_type ==
rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN)) {
+ vh = (struct rte_vlan_hdr *)(eh + 1);
+ m->ol_flags |= RTE_MBUF_F_TX_VLAN;
+ m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci);
+
+ /* Copy ether header over */
+ memmove(rte_pktmbuf_adj(m, sizeof(struct
rte_vlan_hdr)),
+ eh, 2 * RTE_ETHER_ADDR_LEN);
+ }
+ }
+ pkt_size = m->pkt_len + HN_RNDIS_PKT_LEN;
+
/* For small packets aggregate them in chimney buffer */
if (m->pkt_len <= hv->tx_copybreak &&
pkt_size <= txq->agg_szmax) {
--
2.25.1
Re: [PATCH v15 0/7] Lcore variables
On 2024-10-18 17:37, Thomas Monjalon wrote: 17/10/2024 07:57, Mattias Rönnblom: Mattias Rönnblom (7): eal: add static per-lcore memory allocation facility eal: add lcore variable functional tests eal: add lcore variable performance test random: keep PRNG state in lcore variable power: keep per-lcore state in lcore variable service: keep per-lcore state in lcore variable eal: keep per-lcore power intrinsics state in lcore variable Would it possible to have the doc reworded in RST including an image of the layout? Sure. I'll submit a new version with a programmer's guide included mid next week. Would that work for RC2? I can help, don't hesitate to plan a meeting if needed. Thanks! I don't think any meetings are required. If you could make a new version for this final touch, we could merge it in 24.11-rc2. Note: please reply to the cover letter of the first version for the next one, it would reduce the indentation in the message list. Can I find the message id of the cover letter on patchwork?
Re: [PATCH] net/gve: replace typedefs with macros in gve osdep
Hello Joshua,
On Fri, Oct 18, 2024 at 1:42 AM Joshua Washington wrote:
>
> Currently, a number of integer types are typedef'd to their
> corresponding upserspace or RTE values. This can be problematic if these
> types are already defined somewhere else, as it would cause type
> collisions. This patch changes the typedefs to #define macros which are
> only defined if the types are not defined already.
>
> Fixes: c9ba2caf6302 ("net/gve/base: add OS-specific implementation")
> Fixes: abf1242fbb84 ("net/gve: add struct members and typedefs for DQO")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Joshua Washington
> Suggested-by: David Marchand
Re-reading /usr/include/linux/types.h, I suspect the #ifndef on each
type is unneeded (since always true: those types are not #define'd in
the first place).
But in any case, this looks ok to me.
Thanks for the fix, applied in main.
--
David Marchand
[v1 02/12] net/enetc: Add RX and TX queue APIs for ENETC4 PMD
From: Vanshika Shukla
Introduces queue setup, release, start, and stop
APIs for ENETC4 RX and TX queues, enabling:
- Queue configuration and initialization
- Queue resource management (setup, release)
- Queue operation control (start, stop)
Signed-off-by: Apeksha Gupta
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 1 +
drivers/net/enetc/enetc.h | 13 +
drivers/net/enetc/enetc4_ethdev.c | 434
drivers/net/enetc/enetc4_vf.c | 8 +
drivers/net/enetc/enetc_rxtx.c | 32 +-
5 files changed, 485 insertions(+), 3 deletions(-)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index ca3b9ae992..37b548dcab 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Queue start/stop = Y
Linux= Y
ARMv8= Y
Usage doc= Y
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 87fc51b776..9901e434d9 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -98,6 +98,19 @@ int enetc4_dev_configure(struct rte_eth_dev *dev);
int enetc4_dev_close(struct rte_eth_dev *dev);
int enetc4_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
struct rte_eth_dev_info *dev_info);
+int enetc4_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
+ uint16_t nb_rx_desc, unsigned int socket_id
__rte_unused,
+ const struct rte_eth_rxconf *rx_conf,
+ struct rte_mempool *mb_pool);
+int enetc4_rx_queue_start(struct rte_eth_dev *dev, uint16_t qidx);
+int enetc4_rx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx);
+void enetc4_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
+int enetc4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
+ uint16_t nb_desc, unsigned int socket_id __rte_unused,
+ const struct rte_eth_txconf *tx_conf);
+int enetc4_tx_queue_start(struct rte_eth_dev *dev, uint16_t qidx);
+int enetc4_tx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx);
+void enetc4_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
/*
* enetc4_vf function prototype
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 3fe14bd5a6..4d05546308 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -143,10 +143,338 @@ enetc4_dev_infos_get(struct rte_eth_dev *dev
__rte_unused,
return 0;
}
+static int
+mark_memory_ncache(struct enetc_bdr *bdr, const char *mz_name, unsigned int
size)
+{
+ uint64_t huge_page;
+ const struct rte_memzone *mz;
+
+ mz = rte_memzone_reserve_aligned(mz_name,
+ size, SOCKET_ID_ANY,
+ RTE_MEMZONE_2MB, size);
+ if (mz) {
+ bdr->bd_base = mz->addr;
+ } else {
+ ENETC_PMD_ERR("Failed to allocate memzone!!,"
+ " please reserve 2MB size pages");
+ return -ENOMEM;
+ }
+ if (mz->hugepage_sz != size)
+ ENETC_PMD_WARN("Hugepage size of queue memzone %" PRIx64,
+ mz->hugepage_sz);
+ bdr->mz = mz;
+
+ /* Mark memory NON-CACHEABLE */
+ huge_page =
+ (uint64_t)RTE_PTR_ALIGN_FLOOR(bdr->bd_base, size);
+ mark_kpage_ncache(huge_page);
+
+ return 0;
+}
+
+static int
+enetc4_alloc_txbdr(uint16_t port_id, struct enetc_bdr *txr, uint16_t nb_desc)
+{
+ char mz_name[RTE_MEMZONE_NAMESIZE];
+ int size;
+
+ size = nb_desc * sizeof(struct enetc_swbd);
+ txr->q_swbd = rte_malloc(NULL, size, ENETC_BD_RING_ALIGN);
+ if (txr->q_swbd == NULL)
+ return -ENOMEM;
+
+ snprintf(mz_name, sizeof(mz_name), "bdt_addr_%d", port_id);
+ if (mark_memory_ncache(txr, mz_name, SIZE_2MB)) {
+ ENETC_PMD_ERR("Failed to mark BD memory non-cacheable!");
+ rte_free(txr->q_swbd);
+ txr->q_swbd = NULL;
+ return -ENOMEM;
+ }
+ txr->bd_count = nb_desc;
+ txr->next_to_clean = 0;
+ txr->next_to_use = 0;
+
+ return 0;
+}
+
+static void
+enetc4_free_bdr(struct enetc_bdr *rxr)
+{
+ rte_memzone_free(rxr->mz);
+ rxr->mz = NULL;
+ rte_free(rxr->q_swbd);
+ rxr->q_swbd = NULL;
+ rxr->bd_base = NULL;
+}
+
+static void
+enetc4_setup_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring)
+{
+ int idx = tx_ring->index;
+ phys_addr_t bd_address;
+
+ bd_address = (phys_addr_t)
+rte_mem_virt2iova((const void *)tx_ring->bd_base);
+ enetc4_txbdr_wr(hw, idx, ENETC_TBBAR0,
+ lower_32_bits((uint64_t)bd_address));
+ enetc4_txbdr_w
[v1 00/12] ENETC4 PMD support
From: Vanshika Shukla This series introduces a new ENETC4 PMD driver for NXP's i.MX95 SoC, enabling basic network operations. Vanshika Shukla (12): net/enetc: Add initial ENETC4 PMD driver support net/enetc: Add RX and TX queue APIs for ENETC4 PMD net/enetc: Optimize ENETC4 data path net/enetc: Add TX checksum offload and RX checksum validation net/enetc: Add basic statistics net/enetc: Add packet type parsing support net/enetc: Add support for multiple queues with RSS net/enetc: Add VF to PF messaging support and primary MAC setup net/enetc: Add multicast and promiscuous mode support net/enetc: Add link speed and status support net/enetc: Add link status notification support net/enetc: Add MAC and VLAN filter support MAINTAINERS|3 + config/arm/arm64_imx_linux_gcc | 17 + config/arm/meson.build | 14 + doc/guides/nics/enetc4.rst | 99 ++ doc/guides/nics/features/enetc4.ini| 22 + doc/guides/nics/index.rst |1 + doc/guides/rel_notes/release_24_11.rst |4 + drivers/net/enetc/base/enetc4_hw.h | 186 drivers/net/enetc/base/enetc_hw.h | 52 +- drivers/net/enetc/enetc.h | 246 - drivers/net/enetc/enetc4_ethdev.c | 1051 ++ drivers/net/enetc/enetc4_vf.c | 1364 drivers/net/enetc/enetc_cbdr.c | 311 ++ drivers/net/enetc/enetc_ethdev.c |5 +- drivers/net/enetc/enetc_rxtx.c | 171 ++- drivers/net/enetc/kpage_ncache_api.h | 70 ++ drivers/net/enetc/meson.build |5 +- drivers/net/enetc/ntmp.h | 110 ++ 18 files changed, 3690 insertions(+), 41 deletions(-) create mode 100644 config/arm/arm64_imx_linux_gcc create mode 100644 doc/guides/nics/enetc4.rst create mode 100644 doc/guides/nics/features/enetc4.ini create mode 100644 drivers/net/enetc/base/enetc4_hw.h create mode 100644 drivers/net/enetc/enetc4_ethdev.c create mode 100644 drivers/net/enetc/enetc4_vf.c create mode 100644 drivers/net/enetc/enetc_cbdr.c create mode 100644 drivers/net/enetc/kpage_ncache_api.h create mode 100644 drivers/net/enetc/ntmp.h -- 2.25.1
[v1 03/12] net/enetc: Optimize ENETC4 data path
From: Vanshika Shukla
Improves ENETC4 data path on i.MX95 Non-cache coherent platform by:
- Adding separate RX and TX functions.
- Reducing memory accesses
Signed-off-by: Apeksha Gupta
Signed-off-by: Gagandeep Singh
---
drivers/net/enetc/base/enetc4_hw.h | 2 +
drivers/net/enetc/enetc.h | 5 +
drivers/net/enetc/enetc4_ethdev.c | 4 +-
drivers/net/enetc/enetc_rxtx.c | 153 -
4 files changed, 138 insertions(+), 26 deletions(-)
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index 34a4ca3b02..759cfaba28 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -14,6 +14,8 @@
#define ENETC4_DEV_ID_VF 0xef00
#define PCI_VENDOR_ID_NXP 0x1131
+#define ENETC4_TXBD_FLAGS_FBIT(7)
+
/***ENETC port registers**/
#define ENETC4_PMR 0x10
#define ENETC4_PMR_EN (BIT(16) | BIT(17) | BIT(18))
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 9901e434d9..79c158513c 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -68,6 +68,7 @@ struct enetc_bdr {
struct rte_mempool *mb_pool; /* mbuf pool to populate RX ring. */
struct rte_eth_dev *ndev;
const struct rte_memzone *mz;
+ uint64_t ierrors;
};
/*
@@ -122,8 +123,12 @@ int enetc4_vf_dev_stop(struct rte_eth_dev *dev);
*/
uint16_t enetc_xmit_pkts(void *txq, struct rte_mbuf **tx_pkts,
uint16_t nb_pkts);
+uint16_t enetc_xmit_pkts_nc(void *txq, struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts);
uint16_t enetc_recv_pkts(void *rxq, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
+uint16_t enetc_recv_pkts_nc(void *rxq, struct rte_mbuf **rx_pkts,
+ uint16_t nb_pkts);
int enetc_refill_rx_ring(struct enetc_bdr *rx_ring, const int buff_cnt);
void enetc4_dev_hw_init(struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 4d05546308..290b90b9bc 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -651,8 +651,8 @@ enetc4_dev_hw_init(struct rte_eth_dev *eth_dev)
ENETC_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
- eth_dev->rx_pkt_burst = &enetc_recv_pkts;
- eth_dev->tx_pkt_burst = &enetc_xmit_pkts;
+ eth_dev->rx_pkt_burst = &enetc_recv_pkts_nc;
+ eth_dev->tx_pkt_burst = &enetc_xmit_pkts_nc;
/* Retrieving and storing the HW base address of device */
hw->hw.reg = (void *)pci_dev->mem_resource[0].addr;
diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c
index 1fc5f11339..d29b64ab56 100644
--- a/drivers/net/enetc/enetc_rxtx.c
+++ b/drivers/net/enetc/enetc_rxtx.c
@@ -86,12 +86,6 @@ enetc_xmit_pkts(void *tx_queue,
int i, start, bds_to_use;
struct enetc_tx_bd *txbd;
struct enetc_bdr *tx_ring = (struct enetc_bdr *)tx_queue;
- unsigned short buflen;
- uint8_t *data;
- int j;
-
- struct enetc_eth_hw *hw =
-
ENETC_DEV_PRIVATE_TO_HW(tx_ring->ndev->data->dev_private);
i = tx_ring->next_to_use;
@@ -103,12 +97,6 @@ enetc_xmit_pkts(void *tx_queue,
while (nb_pkts--) {
tx_ring->q_swbd[i].buffer_addr = tx_pkts[start];
- if (hw->device_id == ENETC4_DEV_ID || hw->device_id ==
ENETC4_DEV_ID_VF) {
- buflen =
rte_pktmbuf_pkt_len(tx_ring->q_swbd[i].buffer_addr);
- data = rte_pktmbuf_mtod(tx_ring->q_swbd[i].buffer_addr,
void *);
- for (j = 0; j <= buflen; j += RTE_CACHE_LINE_SIZE)
- dcbf(data + j);
- }
txbd = ENETC_TXBD(*tx_ring, i);
tx_swbd = &tx_ring->q_swbd[i];
txbd->frm_len = tx_pkts[start]->pkt_len;
@@ -136,6 +124,61 @@ enetc_xmit_pkts(void *tx_queue,
return start;
}
+uint16_t
+enetc_xmit_pkts_nc(void *tx_queue,
+ struct rte_mbuf **tx_pkts,
+ uint16_t nb_pkts)
+{
+ struct enetc_swbd *tx_swbd;
+ int i, start, bds_to_use;
+ struct enetc_tx_bd *txbd;
+ struct enetc_bdr *tx_ring = (struct enetc_bdr *)tx_queue;
+ unsigned int buflen, j;
+ uint8_t *data;
+
+ i = tx_ring->next_to_use;
+
+ bds_to_use = enetc_bd_unused(tx_ring);
+ if (bds_to_use < nb_pkts)
+ nb_pkts = bds_to_use;
+
+ start = 0;
+ while (nb_pkts--) {
+ tx_ring->q_swbd[i].buffer_addr = tx_pkts[start];
+
+ buflen = rte_pktmbuf_pkt_len(tx_ring->q_swbd[i].buffer_addr);
+ data = rte_pktmbuf_mtod(tx_ring->q_swbd[i].buffer_addr, void *);
+ for (j = 0; j <= buflen; j += RTE_CACHE_LINE_SIZE)
+
[v1 12/12] net/enetc: Add MAC and VLAN filter support
From: Vanshika Shukla
Introduces support for:
- Up to 4 MAC addresses filtering
- Up to 4 VLAN filters
Enhances packet filtering capabilities for ENETC4 PMD.
Signed-off-by: Vanshika Shukla
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 2 +
drivers/net/enetc/base/enetc4_hw.h | 3 +
drivers/net/enetc/enetc.h | 11 ++
drivers/net/enetc/enetc4_vf.c | 229 +++-
4 files changed, 244 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 31a1955215..87425f45c9 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -9,6 +9,8 @@ Speed capabilities = Y
Link status = Y
Promiscuous mode = Y
Allmulticast mode= Y
+Unicast MAC filter = Y
+VLAN filter = Y
RSS hash = Y
Packet type parsing = Y
Basic stats = Y
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index 2da779e351..e3eef6fe19 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -71,6 +71,9 @@ struct enetc_msg_swbd {
*/
#define ENETC4_MAC_MAXFRM_SIZE 2000
+/* Number of MAC Address Filter table entries */
+#define ENETC4_MAC_ENTRIES 4
+
/* Port MAC 0/1 Maximum Frame Length Register */
#define ENETC4_PM_MAXFRM(mac) (0x5014 + (mac) * 0x400)
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 6b37cd95dd..e79a0bf0a9 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -158,7 +158,10 @@ enum enetc_msg_cmd_class_id {
/* Enum for command IDs */
enum enetc_msg_cmd_id {
ENETC_CMD_ID_SET_PRIMARY_MAC = 0,
+ ENETC_MSG_ADD_EXACT_MAC_ENTRIES = 1,
ENETC_CMD_ID_SET_MAC_PROMISCUOUS = 5,
+ ENETC_MSG_ADD_EXACT_VLAN_ENTRIES = 0,
+ ENETC_MSG_REMOVE_EXACT_VLAN_ENTRIES = 1,
ENETC_CMD_ID_SET_VLAN_PROMISCUOUS = 4,
ENETC_CMD_ID_GET_LINK_STATUS = 0,
ENETC_CMD_ID_REGISTER_LINK_NOTIF = 1,
@@ -170,6 +173,14 @@ enum mac_addr_status {
ENETC_INVALID_MAC_ADDR = 0x0,
ENETC_DUPLICATE_MAC_ADDR = 0X1,
ENETC_MAC_ADDR_NOT_FOUND = 0X2,
+ ENETC_MAC_FILTER_NO_RESOURCE = 0x3
+};
+
+enum vlan_status {
+ ENETC_INVALID_VLAN_ENTRY = 0x0,
+ ENETC_DUPLICATE_VLAN_ENTRY = 0X1,
+ ENETC_VLAN_ENTRY_NOT_FOUND = 0x2,
+ ENETC_VLAN_NO_RESOURCE = 0x3
};
enum link_status {
diff --git a/drivers/net/enetc/enetc4_vf.c b/drivers/net/enetc/enetc4_vf.c
index 22266188ee..fb27557378 100644
--- a/drivers/net/enetc/enetc4_vf.c
+++ b/drivers/net/enetc/enetc4_vf.c
@@ -17,6 +17,10 @@
uint16_t enetc_crc_table[ENETC_CRC_TABLE_SIZE];
bool enetc_crc_gen;
+/* Supported Rx offloads */
+static uint64_t dev_vf_rx_offloads_sup =
+ RTE_ETH_RX_OFFLOAD_VLAN_FILTER;
+
static void
enetc_gen_crc_table(void)
{
@@ -53,6 +57,25 @@ enetc_crc_calc(uint16_t crc, const uint8_t *buffer, size_t
len)
return crc;
}
+static int
+enetc4_vf_dev_infos_get(struct rte_eth_dev *dev,
+ struct rte_eth_dev_info *dev_info)
+{
+ int ret = 0;
+
+ PMD_INIT_FUNC_TRACE();
+
+ ret = enetc4_dev_infos_get(dev, dev_info);
+ if (ret)
+ return ret;
+
+ dev_info->max_mtu = dev_info->max_rx_pktlen - (RTE_ETHER_HDR_LEN +
RTE_ETHER_CRC_LEN);
+ dev_info->max_mac_addrs = ENETC4_MAC_ENTRIES;
+ dev_info->rx_offload_capa |= dev_vf_rx_offloads_sup;
+
+ return 0;
+}
+
int
enetc4_vf_dev_stop(struct rte_eth_dev *dev __rte_unused)
{
@@ -810,6 +833,201 @@ enetc4_vf_vlan_promisc(struct rte_eth_dev *dev, bool
promisc_en)
return err;
}
+static int
+enetc4_vf_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *addr,
+ uint32_t index __rte_unused, uint32_t pool __rte_unused)
+{
+ struct enetc_eth_hw *hw =
ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+ struct enetc_msg_cmd_set_primary_mac *cmd;
+ struct enetc_msg_swbd *msg;
+ struct enetc_psi_reply_msg *reply_msg;
+ int msg_size;
+ int err = 0;
+
+ PMD_INIT_FUNC_TRACE();
+
+ if (!rte_is_valid_assigned_ether_addr(addr))
+ return -EINVAL;
+
+ reply_msg = rte_zmalloc(NULL, sizeof(*reply_msg), RTE_CACHE_LINE_SIZE);
+ if (!reply_msg) {
+ ENETC_PMD_ERR("Failed to alloc memory for reply_msg");
+ return -ENOMEM;
+ }
+
+ msg = rte_zmalloc(NULL, sizeof(*msg), RTE_CACHE_LINE_SIZE);
+ if (!msg) {
+ ENETC_PMD_ERR("Failed to alloc msg");
+ err = -ENOMEM;
+ rte_free(reply_msg);
+ return err;
+ }
+
+ msg_size = RTE_ALIGN(sizeof(struct enetc_msg_cmd_set_primary_mac),
+ ENETC_VSI_PSI_MSG_SIZE);
+ msg->vaddr = rte_zmalloc(NULL, msg_size, 0);
+ if (!msg->vadd
[v1 01/12] net/enetc: Add initial ENETC4 PMD driver support
From: Vanshika Shukla
This patch introduces a new ENETC4 PMD driver for NXP's i.MX95
SoC, enabling basic network operations. Key features include:
- Probe and teardown functions
- Hardware initialization for both Virtual Functions (VFs)
and Physical Function (PF)
Signed-off-by: Apeksha Gupta
Signed-off-by: Gagandeep Singh
Signed-off-by: Vanshika Shukla
---
MAINTAINERS| 3 +
config/arm/arm64_imx_linux_gcc | 17 ++
config/arm/meson.build | 14 ++
doc/guides/nics/enetc4.rst | 99
doc/guides/nics/features/enetc4.ini| 9 +
doc/guides/nics/index.rst | 1 +
doc/guides/rel_notes/release_24_11.rst | 4 +
drivers/net/enetc/base/enetc4_hw.h | 111 +
drivers/net/enetc/base/enetc_hw.h | 3 +-
drivers/net/enetc/enetc.h | 43 ++--
drivers/net/enetc/enetc4_ethdev.c | 309 +
drivers/net/enetc/enetc4_vf.c | 146
drivers/net/enetc/enetc_ethdev.c | 5 +-
drivers/net/enetc/kpage_ncache_api.h | 70 ++
drivers/net/enetc/meson.build | 4 +-
15 files changed, 816 insertions(+), 22 deletions(-)
create mode 100644 config/arm/arm64_imx_linux_gcc
create mode 100644 doc/guides/nics/enetc4.rst
create mode 100644 doc/guides/nics/features/enetc4.ini
create mode 100644 drivers/net/enetc/base/enetc4_hw.h
create mode 100644 drivers/net/enetc/enetc4_ethdev.c
create mode 100644 drivers/net/enetc/enetc4_vf.c
create mode 100644 drivers/net/enetc/kpage_ncache_api.h
diff --git a/MAINTAINERS b/MAINTAINERS
index f09cda04c8..b45524330c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -949,9 +949,12 @@ F: doc/guides/nics/features/dpaa2.ini
NXP enetc
M: Gagandeep Singh
M: Sachin Saxena
+M: Vanshika Shukla
F: drivers/net/enetc/
F: doc/guides/nics/enetc.rst
+F: doc/guides/nics/enetc4.rst
F: doc/guides/nics/features/enetc.ini
+F: doc/guides/nics/features/enetc4.ini
NXP enetfec - EXPERIMENTAL
M: Apeksha Gupta
diff --git a/config/arm/arm64_imx_linux_gcc b/config/arm/arm64_imx_linux_gcc
new file mode 100644
index 00..c876ae1d2b
--- /dev/null
+++ b/config/arm/arm64_imx_linux_gcc
@@ -0,0 +1,17 @@
+[binaries]
+c = ['ccache', 'aarch64-linux-gnu-gcc']
+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ar = 'aarch64-linux-gnu-ar'
+as = 'aarch64-linux-gnu-as'
+strip = 'aarch64-linux-gnu-strip'
+pkgconfig = 'aarch64-linux-gnu-pkg-config'
+pcap-config = ''
+
+[host_machine]
+system = 'linux'
+cpu_family = 'aarch64'
+cpu = 'armv8.2-a'
+endian = 'little'
+
+[properties]
+platform = 'imx'
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 55be7c8711..6112244f2c 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -561,6 +561,18 @@ soc_hip10 = {
'numa': true
}
+soc_imx = {
+'description': 'NXP IMX',
+'implementer': '0x41',
+'part_number': '0xd05',
+'flags': [
+['RTE_MACHINE', '"armv8a"'],
+['RTE_MAX_LCORE', 6],
+['RTE_MAX_NUMA_NODES', 1],
+],
+'numa': false,
+}
+
soc_kunpeng920 = {
'description': 'HiSilicon Kunpeng 920',
'implementer': '0x48',
@@ -684,6 +696,7 @@ graviton2: AWS Graviton2
graviton3: AWS Graviton3
graviton4: AWS Graviton4
hip10: HiSilicon HIP10
+imx: NXP IMX
kunpeng920: HiSilicon Kunpeng 920
kunpeng930: HiSilicon Kunpeng 930
n1sdp: Arm Neoverse N1SDP
@@ -722,6 +735,7 @@ socs = {
'graviton3': soc_graviton3,
'graviton4': soc_graviton4,
'hip10': soc_hip10,
+'imx': soc_imx,
'kunpeng920': soc_kunpeng920,
'kunpeng930': soc_kunpeng930,
'n1sdp': soc_n1sdp,
diff --git a/doc/guides/nics/enetc4.rst b/doc/guides/nics/enetc4.rst
new file mode 100644
index 00..8ffdc53376
--- /dev/null
+++ b/doc/guides/nics/enetc4.rst
@@ -0,0 +1,99 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright 2024 NXP
+
+ENETC4 Poll Mode Driver
+===
+
+The ENETC4 NIC PMD (**librte_net_enetc**) provides poll mode driver
+support for the inbuilt NIC found in the **NXP i.MX95** SoC.
+
+More information can be found at `NXP Official Website
+`_.
+
+This section provides an overview of the NXP ENETC4
+and how it is integrated into the DPDK.
+
+Contents summary
+
+- ENETC4 overview
+- Supported ENETC4 SoCs
+- PCI bus driver
+- NIC driver
+- Prerequisites
+- Driver compilation and testing
+
+ENETC4 Overview
+---
+
+ENETC4 is a PCI Integrated End Point(IEP). IEP implements
+peripheral devices in an SoC such that software sees them as PCIe device.
+ENETC4 is an evolution of BDR(Buffer Descriptor Ring) based networking
+IPs.
+
+This infrastructure simplifies adding support for IEP and facilitates in
foll
[v1 04/12] net/enetc: Add TX checksum offload and RX checksum validation
From: Vanshika Shukla
This patch add support for:
- L3 (IPv4, IPv6) TX checksum offload
- L4 (TCP, UDP) TX checksum offload
- RX checksum validation for IPv4, IPv6, TCP, UDP
Signed-off-by: Apeksha Gupta
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 2 ++
drivers/net/enetc/base/enetc4_hw.h | 14 ++
drivers/net/enetc/base/enetc_hw.h | 18 ++---
drivers/net/enetc/enetc.h | 5
drivers/net/enetc/enetc4_ethdev.c | 40 +
drivers/net/enetc/enetc_rxtx.c | 22
6 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 37b548dcab..55b3b95953 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,8 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+L3 checksum offload = Y
+L4 checksum offload = Y
Queue start/stop = Y
Linux= Y
ARMv8= Y
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index 759cfaba28..114d27f34b 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -14,12 +14,26 @@
#define ENETC4_DEV_ID_VF 0xef00
#define PCI_VENDOR_ID_NXP 0x1131
+/* enetc4 txbd flags */
+#define ENETC4_TXBD_FLAGS_L4CS BIT(0)
+#define ENETC4_TXBD_FLAGS_L_TX_CKSUM BIT(3)
#define ENETC4_TXBD_FLAGS_FBIT(7)
+/* L4 type */
+#define ENETC4_TXBD_L4T_UDPBIT(0)
+#define ENETC4_TXBD_L4T_TCPBIT(1)
+/* L3 type is set to 0 for IPv4 and 1 for IPv6 */
+#define ENETC4_TXBD_L3T0
+/* IPv4 checksum */
+#define ENETC4_TXBD_IPCS 1
/***ENETC port registers**/
#define ENETC4_PMR 0x10
#define ENETC4_PMR_EN (BIT(16) | BIT(17) | BIT(18))
+#define ENETC4_PARCSCR 0x9c
+#define L3_CKSUM BIT(0)
+#define L4_CKSUM BIT(1)
+
/* Port Station interface promiscuous MAC mode register */
#define ENETC4_PSIPMMR 0x200
#define PSIPMMR_SI0_MAC_UP BIT(0)
diff --git a/drivers/net/enetc/base/enetc_hw.h
b/drivers/net/enetc/base/enetc_hw.h
index 2d63c54db6..3cdfe23fc0 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -189,8 +189,7 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_TX_ADDR(txq, addr) ((void *)((txq)->enetc_txbdr + (addr)))
-#define ENETC_TXBD_FLAGS_IEBIT(13)
-#define ENETC_TXBD_FLAGS_F BIT(15)
+#define ENETC_TXBD_FLAGS_F BIT(7)
/* ENETC Parsed values (Little Endian) */
#define ENETC_PARSE_ERROR 0x8000
@@ -249,8 +248,19 @@ struct enetc_tx_bd {
uint64_t addr;
uint16_t buf_len;
uint16_t frm_len;
- uint16_t err_csum;
- uint16_t flags;
+ union {
+ struct {
+ uint8_t l3_start:7;
+ uint8_t ipcs:1;
+ uint8_t l3_hdr_size:7;
+ uint8_t l3t:1;
+ uint8_t resv:5;
+ uint8_t l4t:3;
+ uint8_t flags;
+ };/* default layout */
+ uint32_t txstart;
+ uint32_t lstatus;
+ };
};
/* RX buffer descriptor */
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 79c158513c..c29353a89b 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -45,6 +45,11 @@
#define ENETC_TXBD(BDR, i) (&(((struct enetc_tx_bd *)((BDR).bd_base))[i]))
#define ENETC_RXBD(BDR, i) (&(((union enetc_rx_bd *)((BDR).bd_base))[i]))
+#define ENETC4_MBUF_F_TX_IP_IPV4 (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4)
+#define ENETC4_TX_CKSUM_OFFLOAD_MASK (RTE_MBUF_F_TX_IP_CKSUM | \
+ RTE_MBUF_F_TX_TCP_CKSUM | \
+ RTE_MBUF_F_TX_UDP_CKSUM)
+
struct enetc_swbd {
struct rte_mbuf *buffer_addr;
};
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 290b90b9bc..02f048aa3c 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -11,6 +11,18 @@
#include "enetc_logs.h"
#include "enetc.h"
+/* Supported Rx offloads */
+static uint64_t dev_rx_offloads_sup =
+ RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
+ RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
+ RTE_ETH_RX_OFFLOAD_TCP_CKSUM;
+
+/* Supported Tx offloads */
+static uint64_t dev_tx_offloads_sup =
+ RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |
+ RTE_ETH_TX_OFFLOAD_UDP_CKSUM |
+ RTE_ETH_TX_OFFLOAD_TCP_CKSUM;
+
static int
enetc4_dev_start(struct rte_eth_dev *dev)
{
@@ -139,6 +151,8 @@ enetc4_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
dev_info->max_rx_queues = MAX_RX_RINGS;
dev_info->max_tx_queues = MAX_TX_RIN
[v1 07/12] net/enetc: Add support for multiple queues with RSS
From: Vanshika Shukla
Introduces support for multiple transmit and receive queues in ENETC4
PMD, enabling scalable packet processing, improved throughput, and
latency. Packet distribution is handled through Receive Side Scaling
(RSS).
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 1 +
drivers/net/enetc/base/enetc4_hw.h | 11 +
drivers/net/enetc/base/enetc_hw.h | 21 +-
drivers/net/enetc/enetc.h | 37 +++-
drivers/net/enetc/enetc4_ethdev.c | 145 +++--
drivers/net/enetc/enetc4_vf.c | 10 +-
drivers/net/enetc/enetc_cbdr.c | 311
drivers/net/enetc/meson.build | 5 +-
drivers/net/enetc/ntmp.h| 110 ++
9 files changed, 617 insertions(+), 34 deletions(-)
create mode 100644 drivers/net/enetc/enetc_cbdr.c
create mode 100644 drivers/net/enetc/ntmp.h
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 3356475317..79430d0018 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+RSS hash = Y
Packet type parsing = Y
Basic stats = Y
L3 checksum offload = Y
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index 874cdc4775..49446f2cb4 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -110,6 +110,17 @@
#define ENETC4_SITFRM0 0x328
#define ENETC4_SITDFCR 0x340
+/* Control BDR regs */
+#define ENETC4_SICBDRMR0x800
+#define ENETC4_SICBDRSR0x804 /* RO */
+#define ENETC4_SICBDRBAR0 0x810
+#define ENETC4_SICBDRBAR1 0x814
+#define ENETC4_SICBDRPIR 0x818
+#define ENETC4_SICBDRCIR 0x81c
+#define ENETC4_SICBDRLENR 0x820
+#define ENETC4_SICTR0 0x18
+#define ENETC4_SICTR1 0x1c
+
/* general register accessors */
#define enetc4_rd_reg(reg) rte_read32((void *)(reg))
#define enetc4_wr_reg(reg, val) rte_write32((val), (void *)(reg))
diff --git a/drivers/net/enetc/base/enetc_hw.h
b/drivers/net/enetc/base/enetc_hw.h
index 10bd3c050c..3cb56cd851 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -22,6 +22,10 @@
/* SI regs, offset: 0h */
#define ENETC_SIMR 0x0
#define ENETC_SIMR_EN BIT(31)
+#define ENETC_SIMR_RSSEBIT(0)
+
+/* BDR grouping*/
+#define ENETC_SIRBGCR 0x38
#define ENETC_SICAR0 0x40
#define ENETC_SICAR0_COHERENT 0x2B2B6727
@@ -29,6 +33,7 @@
#define ENETC_SIPMAR1 0x84
#define ENETC_SICAPR0 0x900
+#define ENETC_SICAPR0_BDR_MASK 0xFF
#define ENETC_SICAPR1 0x904
#define ENETC_SIMSITRV(n) (0xB00 + (n) * 0x4)
@@ -36,6 +41,11 @@
#define ENETC_SICCAPR 0x1200
+#define ENETC_SIPCAPR0 0x20
+#define ENETC_SIPCAPR0_RSS BIT(8)
+#define ENETC_SIRSSCAPR0x1600
+#define ENETC_SIRSSCAPR_GET_NUM_RSS(val) (BIT((val) & 0xf) * 32)
+
/* enum for BD type */
enum enetc_bdr_type {TX, RX};
@@ -44,6 +54,7 @@ enum enetc_bdr_type {TX, RX};
/* RX BDR reg offsets */
#define ENETC_RBMR 0x0 /* RX BDR mode register*/
#define ENETC_RBMR_EN BIT(31)
+#define ENETC_BMR_RESET0x0 /* BDR reset*/
#define ENETC_RBSR 0x4 /* Rx BDR status register*/
#define ENETC_RBBSR0x8 /* Rx BDR buffer size register*/
@@ -231,15 +242,6 @@ struct enetc_eth_mac_info {
uint8_t get_link_status;
};
-struct enetc_eth_hw {
- struct rte_eth_dev *ndev;
- struct enetc_hw hw;
- uint16_t device_id;
- uint16_t vendor_id;
- uint8_t revision_id;
- struct enetc_eth_mac_info mac;
-};
-
/* Transmit Descriptor */
struct enetc_tx_desc {
uint64_t addr;
@@ -292,5 +294,4 @@ union enetc_rx_bd {
};
} r;
};
-
#endif
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 8d4e432426..354cd761d7 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -10,7 +10,9 @@
#include "compat.h"
#include "base/enetc_hw.h"
+#include "base/enetc4_hw.h"
#include "enetc_logs.h"
+#include "ntmp.h"
#define PCI_VENDOR_ID_FREESCALE 0x1957
@@ -50,6 +52,18 @@
RTE_MBUF_F_TX_TCP_CKSUM | \
RTE_MBUF_F_TX_UDP_CKSUM)
+#define ENETC_CBD(R, i)(&(((struct enetc_cbd *)((R).bd_base))[i]))
+#define ENETC_CBDR_TIMEOUT 1000 /* In multiple of ENETC_CBDR_DELAY */
+#define ENETC_CBDR_DELAY 100 /* usecs */
+#define ENETC_CBDR_SIZE64
+#define ENETC_CBDR_ALIGN 128
+
+/* supported RSS */
+#define ENETC_RSS_OFFLOAD_ALL ( \
+ RTE
[v1 09/12] net/enetc: Add multicast and promiscuous mode support
From: Vanshika Shukla
Enables ENETC4 PMD to handle multicast and promiscuous modes.
Signed-off-by: Vanshika Shukla
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 2 +
drivers/net/enetc/enetc.h | 5 +
drivers/net/enetc/enetc4_ethdev.c | 40 +
drivers/net/enetc/enetc4_vf.c | 265
4 files changed, 312 insertions(+)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 79430d0018..36d536d1f2 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,8 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Promiscuous mode = Y
+Allmulticast mode= Y
RSS hash = Y
Packet type parsing = Y
Basic stats = Y
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index c0fba9d618..902912f4fb 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -144,15 +144,20 @@ struct enetc_eth_adapter {
#define ENETC_ALLMULTI_PROMISC_DIS 0x81
#define ENETC_ALLMULTI_PROMISC_EN 0x83
+#define ENETC_PROMISC_VLAN_DISABLE 0x1
+#define ENETC_PROMISC_VLAN_ENABLE 0x3
/* Enum for class IDs */
enum enetc_msg_cmd_class_id {
ENETC_CLASS_ID_MAC_FILTER = 0x20,
+ ENETC_CLASS_ID_VLAN_FILTER = 0x21,
};
/* Enum for command IDs */
enum enetc_msg_cmd_id {
ENETC_CMD_ID_SET_PRIMARY_MAC = 0,
+ ENETC_CMD_ID_SET_MAC_PROMISCUOUS = 5,
+ ENETC_CMD_ID_SET_VLAN_PROMISCUOUS = 4,
};
enum mac_addr_status {
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 075205a0e5..9df01b1e4d 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -592,6 +592,44 @@ enetc4_dev_close(struct rte_eth_dev *dev)
return ret;
}
+static int
+enetc4_promiscuous_enable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+ uint32_t psipmr = 0;
+
+ psipmr = enetc4_port_rd(enetc_hw, ENETC4_PSIPMMR);
+
+ /* Setting to enable promiscuous mode for all ports*/
+ psipmr |= PSIPMMR_SI_MAC_UP | PSIPMMR_SI_MAC_MP;
+
+ enetc4_port_wr(enetc_hw, ENETC4_PSIPMMR, psipmr);
+
+ return 0;
+}
+
+static int
+enetc4_promiscuous_disable(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+ uint32_t psipmr = 0;
+
+ /* Setting to disable promiscuous mode for SI0*/
+ psipmr = enetc4_port_rd(enetc_hw, ENETC4_PSIPMMR);
+ psipmr &= (~PSIPMMR_SI_MAC_UP);
+
+ if (dev->data->all_multicast == 0)
+ psipmr &= (~PSIPMMR_SI_MAC_MP);
+
+ enetc4_port_wr(enetc_hw, ENETC4_PSIPMMR, psipmr);
+
+ return 0;
+}
+
int
enetc4_dev_configure(struct rte_eth_dev *dev)
{
@@ -831,6 +869,8 @@ static const struct eth_dev_ops enetc4_ops = {
.dev_infos_get= enetc4_dev_infos_get,
.stats_get= enetc4_stats_get,
.stats_reset = enetc4_stats_reset,
+ .promiscuous_enable = enetc4_promiscuous_enable,
+ .promiscuous_disable = enetc4_promiscuous_disable,
.rx_queue_setup = enetc4_rx_queue_setup,
.rx_queue_start = enetc4_rx_queue_start,
.rx_queue_stop= enetc4_rx_queue_stop,
diff --git a/drivers/net/enetc/enetc4_vf.c b/drivers/net/enetc/enetc4_vf.c
index 6bdd476f0a..28cf83077c 100644
--- a/drivers/net/enetc/enetc4_vf.c
+++ b/drivers/net/enetc/enetc4_vf.c
@@ -303,6 +303,266 @@ enetc4_vf_set_mac_addr(struct rte_eth_dev *dev, struct
rte_ether_addr *addr)
return err;
}
+static int
+enetc4_vf_promisc_send_message(struct rte_eth_dev *dev, bool promisc_en)
+{
+ struct enetc_eth_hw *hw =
ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+ struct enetc_msg_cmd_set_promisc *cmd;
+ struct enetc_msg_swbd *msg;
+ int msg_size;
+ int err = 0;
+
+ msg = rte_zmalloc(NULL, sizeof(*msg), RTE_CACHE_LINE_SIZE);
+ if (!msg) {
+ ENETC_PMD_ERR("Failed to alloc msg");
+ err = -ENOMEM;
+ return err;
+ }
+
+ msg_size = RTE_ALIGN(sizeof(struct enetc_msg_cmd_set_promisc),
ENETC_VSI_PSI_MSG_SIZE);
+ msg->vaddr = rte_zmalloc(NULL, msg_size, 0);
+ if (!msg->vaddr) {
+ ENETC_PMD_ERR("Failed to alloc memory for msg");
+ rte_free(msg);
+ return -ENOMEM;
+ }
+
+ msg->dma = rte_mem_virt2iova((const void *)msg->vaddr);
+ msg->size = msg_size;
+
+ cmd = (struct enetc_msg_cmd_set_promisc *)msg->vaddr;
+
+ /* op_type is based on the result of message format
+*7 6 1
[v1 08/12] net/enetc: Add VF to PF messaging support and primary MAC setup
From: Vanshika Shukla
Introduces Virtual Function (VF) to Physical Function (PF) messaging,
enabling VFs to communicate with the Linux PF driver for feature
enablement.
This patch also adds primary MAC address setup capability,
allowing VFs to configure their MAC addresses.
Signed-off-by: Vanshika Shukla
Signed-off-by: Gagandeep Singh
---
drivers/net/enetc/base/enetc4_hw.h | 22 +++
drivers/net/enetc/enetc.h | 99 +++
drivers/net/enetc/enetc4_vf.c | 260 +
3 files changed, 381 insertions(+)
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index 49446f2cb4..f0b7563d22 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -14,6 +14,12 @@
#define ENETC4_DEV_ID_VF 0xef00
#define PCI_VENDOR_ID_NXP 0x1131
+struct enetc_msg_swbd {
+ void *vaddr;
+ uint64_t dma;
+ int size;
+};
+
/* enetc4 txbd flags */
#define ENETC4_TXBD_FLAGS_L4CS BIT(0)
#define ENETC4_TXBD_FLAGS_L_TX_CKSUM BIT(3)
@@ -103,6 +109,9 @@
#define IFMODE_SGMII 5
#define PM_IF_MODE_ENA BIT(15)
+#define ENETC4_DEF_VSI_WAIT_TIMEOUT_UPDATE 100
+#define ENETC4_DEF_VSI_WAIT_DELAY_UPDATE 2000 /* us */
+
/* Station interface statistics */
#define ENETC4_SIROCT0 0x300
#define ENETC4_SIRFRM0 0x308
@@ -110,6 +119,19 @@
#define ENETC4_SITFRM0 0x328
#define ENETC4_SITDFCR 0x340
+/* VSI MSG Registers */
+#define ENETC4_VSIMSGSR 0x204 /* RO */
+#define ENETC4_VSIMSGSR_MB BIT(0)
+#define ENETC4_VSIMSGSR_MS BIT(1)
+#define ENETC4_VSIMSGSNDAR0 0x210
+#define ENETC4_VSIMSGSNDAR1 0x214
+
+#define ENETC4_VSIMSGRR 0x208
+#define ENETC4_VSIMSGRR_MR BIT(0)
+
+#define ENETC_SIMSGSR_SET_MC(val) ((val) << 16)
+#define ENETC_SIMSGSR_GET_MC(val) ((val) >> 16)
+
/* Control BDR regs */
#define ENETC4_SICBDRMR0x800
#define ENETC4_SICBDRSR0x804 /* RO */
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 354cd761d7..c0fba9d618 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -41,6 +41,11 @@
/* eth name size */
#define ENETC_ETH_NAMESIZE 20
+#define ENETC_DEFAULT_MSG_SIZE 1024/* max size */
+
+/* Message length is in multiple of 32 bytes */
+#define ENETC_VSI_PSI_MSG_SIZE 32
+
/* size for marking hugepage non-cacheable */
#define SIZE_2MB 0x20
@@ -123,6 +128,100 @@ struct enetc_eth_adapter {
#define ENETC_DEV_PRIVATE_TO_INTR(adapter) \
(&((struct enetc_eth_adapter *)adapter)->intr)
+/* Class ID for PSI-TO-VSI messages */
+#define ENETC_MSG_CLASS_ID_CMD_SUCCESS 0x1
+#define ENETC_MSG_CLASS_ID_PERMISSION_DENY 0x2
+#define ENETC_MSG_CLASS_ID_CMD_NOT_SUPPORT 0x3
+#define ENETC_MSG_CLASS_ID_PSI_BUSY 0x4
+#define ENETC_MSG_CLASS_ID_CRC_ERROR0x5
+#define ENETC_MSG_CLASS_ID_PROTO_NOT_SUPPORT0x6
+#define ENETC_MSG_CLASS_ID_INVALID_MSG_LEN 0x7
+#define ENETC_MSG_CLASS_ID_CMD_TIMEOUT 0x8
+#define ENETC_MSG_CLASS_ID_CMD_DEFERED 0xf
+
+#define ENETC_PROMISC_DISABLE 0x41
+#define ENETC_PROMISC_ENABLE 0x43
+#define ENETC_ALLMULTI_PROMISC_DIS 0x81
+#define ENETC_ALLMULTI_PROMISC_EN 0x83
+
+
+/* Enum for class IDs */
+enum enetc_msg_cmd_class_id {
+ ENETC_CLASS_ID_MAC_FILTER = 0x20,
+};
+
+/* Enum for command IDs */
+enum enetc_msg_cmd_id {
+ ENETC_CMD_ID_SET_PRIMARY_MAC = 0,
+};
+
+enum mac_addr_status {
+ ENETC_INVALID_MAC_ADDR = 0x0,
+ ENETC_DUPLICATE_MAC_ADDR = 0X1,
+ ENETC_MAC_ADDR_NOT_FOUND = 0X2,
+};
+
+/* PSI-VSI command header format */
+struct enetc_msg_cmd_header {
+ uint16_t csum; /* INET_CHECKSUM */
+ uint8_t class_id; /* Command class type */
+ uint8_t cmd_id; /* Denotes the specific required action */
+ uint8_t proto_ver; /* Supported VSI-PSI command protocol version */
+ uint8_t len;/* Extended message body length */
+ uint8_t reserved_1;
+ uint8_t cookie; /* Control command execution asynchronously on PSI side
*/
+ uint64_t reserved_2;
+};
+
+/* VF-PF set primary MAC address message format */
+struct enetc_msg_cmd_set_primary_mac {
+ struct enetc_msg_cmd_header header;
+ uint8_t count; /* number of MAC addresses */
+ uint8_t reserved_1;
+ uint16_t reserved_2;
+ struct rte_ether_addr addr;
+};
+
+struct enetc_msg_cmd_set_promisc {
+ struct enetc_msg_cmd_header header;
+ uint8_t op_type;
+};
+
+struct enetc_msg_cmd_get_link_status {
+ struct enetc_msg_cmd_header header;
+};
+
+struct enetc_msg_cmd_get_link_speed {
+ struct enetc_msg_cmd_header header;
+};
+
+struct enetc_msg_cmd_set_vlan_promisc {
+ struct enetc_msg_cmd_header header;
+ ui
[v1 11/12] net/enetc: Add link status notification support
From: Vanshika Shukla
This patch supports link event notifications for ENETC4 PMD, enabling:
- Link up/down event notifications
- Notification of link speed changes
Signed-off-by: Gagandeep Singh
Signed-off-by: Vanshika Shukla
---
doc/guides/nics/features/enetc4.ini | 1 +
drivers/net/enetc/base/enetc4_hw.h | 9 +-
drivers/net/enetc/enetc.h | 3 +
drivers/net/enetc/enetc4_ethdev.c | 16 ++-
drivers/net/enetc/enetc4_vf.c | 215 +++-
5 files changed, 239 insertions(+), 5 deletions(-)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 78b06e9841..31a1955215 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Link status event= Y
Speed capabilities = Y
Link status = Y
Promiscuous mode = Y
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index d899b82b9c..2da779e351 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -128,7 +128,14 @@ struct enetc_msg_swbd {
#define ENETC4_SITFRM0 0x328
#define ENETC4_SITDFCR 0x340
-/* VSI MSG Registers */
+/* Station interface interrupts */
+#define ENETC4_SIMSIVR 0xA30
+#define ENETC4_VSIIER0xA00
+#define ENETC4_VSIIDR0xA08
+#define ENETC4_VSIIER_MRIE BIT(9)
+#define ENETC4_SI_INT_IDX0
+
+/* VSI Registers */
#define ENETC4_VSIMSGSR 0x204 /* RO */
#define ENETC4_VSIMSGSR_MB BIT(0)
#define ENETC4_VSIMSGSR_MS BIT(1)
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 7f5329de33..6b37cd95dd 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -161,6 +161,8 @@ enum enetc_msg_cmd_id {
ENETC_CMD_ID_SET_MAC_PROMISCUOUS = 5,
ENETC_CMD_ID_SET_VLAN_PROMISCUOUS = 4,
ENETC_CMD_ID_GET_LINK_STATUS = 0,
+ ENETC_CMD_ID_REGISTER_LINK_NOTIF = 1,
+ ENETC_CMD_ID_UNREGISTER_LINK_NOTIF = 2,
ENETC_CMD_ID_GET_LINK_SPEED = 0
};
@@ -280,6 +282,7 @@ const uint32_t *enetc4_supported_ptypes_get(struct
rte_eth_dev *dev __rte_unused
* enetc4_vf function prototype
*/
int enetc4_vf_dev_stop(struct rte_eth_dev *dev);
+int enetc4_vf_dev_intr(struct rte_eth_dev *eth_dev, bool enable);
/*
* RX/TX ENETC function prototypes
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 29283f2d44..ab420aa301 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -605,10 +605,13 @@ enetc4_dev_close(struct rte_eth_dev *dev)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
- if (hw->device_id == ENETC4_DEV_ID_VF)
+ if (hw->device_id == ENETC4_DEV_ID_VF) {
+ if (dev->data->dev_conf.intr_conf.lsc != 0)
+ enetc4_vf_dev_intr(dev, false);
ret = enetc4_vf_dev_stop(dev);
- else
+ } else {
ret = enetc4_dev_stop(dev);
+ }
if (dev->data->nb_rx_queues > 1) {
/* Disable RSS */
@@ -719,6 +722,15 @@ enetc4_dev_configure(struct rte_eth_dev *dev)
enetc4_port_wr(enetc_hw, ENETC4_PARCSCR, checksum);
+ /* Enable interrupts */
+ if (hw->device_id == ENETC4_DEV_ID_VF) {
+ if (dev->data->dev_conf.intr_conf.lsc != 0) {
+ ret = enetc4_vf_dev_intr(dev, true);
+ if (ret)
+ ENETC_PMD_WARN("Failed to setup link
interrupts");
+ }
+ }
+
/* Disable and reset RX and TX rings */
for (i = 0; i < dev->data->nb_rx_queues; i++)
enetc4_rxbdr_wr(enetc_hw, i, ENETC_RBMR, ENETC_BMR_RESET);
diff --git a/drivers/net/enetc/enetc4_vf.c b/drivers/net/enetc/enetc4_vf.c
index 307fabf2c6..22266188ee 100644
--- a/drivers/net/enetc/enetc4_vf.c
+++ b/drivers/net/enetc/enetc4_vf.c
@@ -144,6 +144,69 @@ enetc4_msg_vsi_reply_msg(struct enetc_hw *enetc_hw, struct
enetc_psi_reply_msg *
reply_msg->status = status;
}
+static void
+enetc4_msg_get_psi_msg(struct enetc_hw *enetc_hw, struct enetc_psi_reply_msg
*reply_msg)
+{
+ int vsimsgrr;
+ int8_t class_id = 0;
+ uint8_t status = 0;
+
+ vsimsgrr = enetc_rd(enetc_hw, ENETC4_VSIMSGRR);
+
+ /* Extracting 8 bits of message result in class_id */
+ class_id |= ((ENETC_SIMSGSR_GET_MC(vsimsgrr) >> 8) & 0xff);
+
+ /* Extracting 4 bits of message result in status */
+ status |= ((ENETC_SIMSGSR_GET_MC(vsimsgrr) >> 4) & 0xf);
+
+ reply_msg->class_id = class_id;
+ reply_msg->status = status;
+}
+
+static void
+enetc4_process_psi_msg(struct rte_eth_dev *eth_dev, struct enetc_hw *enetc_hw)
+{
+ struct enetc_psi_reply_msg *msg;
+ struct rte_eth_link link;
+
[v1 10/12] net/enetc: Add link speed and status support
From: Vanshika Shukla
This patch add support for link update operation.
Signed-off-by: Vanshika Shukla
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 2 +
drivers/net/enetc/base/enetc4_hw.h | 9 ++
drivers/net/enetc/enetc.h | 25
drivers/net/enetc/enetc4_ethdev.c | 44 ++
drivers/net/enetc/enetc4_vf.c | 216
5 files changed, 296 insertions(+)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 36d536d1f2..78b06e9841 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,8 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Speed capabilities = Y
+Link status = Y
Promiscuous mode = Y
Allmulticast mode= Y
RSS hash = Y
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index f0b7563d22..d899b82b9c 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -109,6 +109,15 @@ struct enetc_msg_swbd {
#define IFMODE_SGMII 5
#define PM_IF_MODE_ENA BIT(15)
+/* Port MAC 0 Interface Status Register */
+#define ENETC4_PM_IF_STATUS(mac) (0x5304 + (mac) * 0x400)
+#define ENETC4_LINK_MODE 0x0008ULL
+#define ENETC4_LINK_STATUS 0x0001ULL
+#define ENETC4_LINK_SPEED_MASK 0x0006ULL
+#define ENETC4_LINK_SPEED_10M0x0ULL
+#define ENETC4_LINK_SPEED_100M 0x0002ULL
+#define ENETC4_LINK_SPEED_1G 0x0004ULL
+
#define ENETC4_DEF_VSI_WAIT_TIMEOUT_UPDATE 100
#define ENETC4_DEF_VSI_WAIT_DELAY_UPDATE 2000 /* us */
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index 902912f4fb..7f5329de33 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -151,6 +151,8 @@ struct enetc_eth_adapter {
enum enetc_msg_cmd_class_id {
ENETC_CLASS_ID_MAC_FILTER = 0x20,
ENETC_CLASS_ID_VLAN_FILTER = 0x21,
+ ENETC_CLASS_ID_LINK_STATUS = 0x80,
+ ENETC_CLASS_ID_LINK_SPEED = 0x81
};
/* Enum for command IDs */
@@ -158,6 +160,8 @@ enum enetc_msg_cmd_id {
ENETC_CMD_ID_SET_PRIMARY_MAC = 0,
ENETC_CMD_ID_SET_MAC_PROMISCUOUS = 5,
ENETC_CMD_ID_SET_VLAN_PROMISCUOUS = 4,
+ ENETC_CMD_ID_GET_LINK_STATUS = 0,
+ ENETC_CMD_ID_GET_LINK_SPEED = 0
};
enum mac_addr_status {
@@ -166,6 +170,27 @@ enum mac_addr_status {
ENETC_MAC_ADDR_NOT_FOUND = 0X2,
};
+enum link_status {
+ ENETC_LINK_UP = 0x0,
+ ENETC_LINK_DOWN = 0x1
+};
+
+enum speed {
+ ENETC_SPEED_UNKNOWN = 0x0,
+ ENETC_SPEED_10_HALF_DUPLEX = 0x1,
+ ENETC_SPEED_10_FULL_DUPLEX = 0x2,
+ ENETC_SPEED_100_HALF_DUPLEX = 0x3,
+ ENETC_SPEED_100_FULL_DUPLEX = 0x4,
+ ENETC_SPEED_1000 = 0x5,
+ ENETC_SPEED_2500 = 0x6,
+ ENETC_SPEED_5000 = 0x7,
+ ENETC_SPEED_10G = 0x8,
+ ENETC_SPEED_25G = 0x9,
+ ENETC_SPEED_50G = 0xA,
+ ENETC_SPEED_100G = 0xB,
+ ENETC_SPEED_NOT_SUPPORTED = 0xF
+};
+
/* PSI-VSI command header format */
struct enetc_msg_cmd_header {
uint16_t csum; /* INET_CHECKSUM */
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 9df01b1e4d..29283f2d44 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -75,6 +75,49 @@ enetc4_dev_stop(struct rte_eth_dev *dev)
return 0;
}
+/* return 0 means link status changed, -1 means not changed */
+static int
+enetc4_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
+{
+ struct enetc_eth_hw *hw =
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+ struct rte_eth_link link;
+ uint32_t status;
+
+ PMD_INIT_FUNC_TRACE();
+
+ memset(&link, 0, sizeof(link));
+
+ status = enetc4_port_rd(enetc_hw, ENETC4_PM_IF_STATUS(0));
+
+ if (status & ENETC4_LINK_MODE)
+ link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
+ else
+ link.link_duplex = RTE_ETH_LINK_HALF_DUPLEX;
+
+ if (status & ENETC4_LINK_STATUS)
+ link.link_status = RTE_ETH_LINK_UP;
+ else
+ link.link_status = RTE_ETH_LINK_DOWN;
+
+ switch (status & ENETC4_LINK_SPEED_MASK) {
+ case ENETC4_LINK_SPEED_1G:
+ link.link_speed = RTE_ETH_SPEED_NUM_1G;
+ break;
+
+ case ENETC4_LINK_SPEED_100M:
+ link.link_speed = RTE_ETH_SPEED_NUM_100M;
+ break;
+
+ default:
+ case ENETC4_LINK_SPEED_10M:
+ link.link_speed = RTE_ETH_SPEED_NUM_10M;
+ }
+
+ return rte_eth_linkstatus_set(dev, &link);
+}
+
static int
enetc4_mac_init(struct enetc_eth_hw *hw, struct rte_eth_
[v1 05/12] net/enetc: Add basic statistics
From: Vanshika Shukla
Introduces basic statistics collection for ENETC4 PMD, including:
- Packet transmit/receive counts
- Byte transmit/receive counts
- Error counters (TX/RX drops, errors)
Signed-off-by: Apeksha Gupta
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 1 +
drivers/net/enetc/base/enetc4_hw.h | 7 +
drivers/net/enetc/base/enetc_hw.h | 5 +++-
drivers/net/enetc/enetc4_ethdev.c | 42 +
drivers/net/enetc/enetc4_vf.c | 24 +
5 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index 55b3b95953..e814852d2d 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Basic stats = Y
L3 checksum offload = Y
L4 checksum offload = Y
Queue start/stop = Y
diff --git a/drivers/net/enetc/base/enetc4_hw.h
b/drivers/net/enetc/base/enetc4_hw.h
index 114d27f34b..874cdc4775 100644
--- a/drivers/net/enetc/base/enetc4_hw.h
+++ b/drivers/net/enetc/base/enetc4_hw.h
@@ -103,6 +103,13 @@
#define IFMODE_SGMII 5
#define PM_IF_MODE_ENA BIT(15)
+/* Station interface statistics */
+#define ENETC4_SIROCT0 0x300
+#define ENETC4_SIRFRM0 0x308
+#define ENETC4_SITOCT0 0x320
+#define ENETC4_SITFRM0 0x328
+#define ENETC4_SITDFCR 0x340
+
/* general register accessors */
#define enetc4_rd_reg(reg) rte_read32((void *)(reg))
#define enetc4_wr_reg(reg, val) rte_write32((val), (void *)(reg))
diff --git a/drivers/net/enetc/base/enetc_hw.h
b/drivers/net/enetc/base/enetc_hw.h
index 3cdfe23fc0..3208d91bc5 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -278,7 +278,10 @@ union enetc_rx_bd {
union {
struct {
uint16_t flags;
- uint16_t error;
+ uint8_t error;
+ uint8_t resv:6;
+ uint8_t r:1;
+ uint8_t f:1;
};
uint32_t lstatus;
};
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 02f048aa3c..2db45ecf0c 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -484,6 +484,46 @@ enetc4_rx_queue_release(struct rte_eth_dev *dev, uint16_t
qid)
rte_free(rx_ring);
}
+static
+int enetc4_stats_get(struct rte_eth_dev *dev,
+ struct rte_eth_stats *stats)
+{
+ struct enetc_eth_hw *hw =
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+
+ /*
+* Total received packets, bad + good, if we want to get counters
+* of only good received packets then use ENETC4_PM_RFRM,
+* ENETC4_PM_TFRM registers.
+*/
+ stats->ipackets = enetc4_port_rd(enetc_hw, ENETC4_PM_RPKT(0));
+ stats->opackets = enetc4_port_rd(enetc_hw, ENETC4_PM_TPKT(0));
+ stats->ibytes = enetc4_port_rd(enetc_hw, ENETC4_PM_REOCT(0));
+ stats->obytes = enetc4_port_rd(enetc_hw, ENETC4_PM_TEOCT(0));
+ /*
+* Dropped + Truncated packets, use ENETC4_PM_RDRNTP(0) for without
+* truncated packets
+*/
+ stats->imissed = enetc4_port_rd(enetc_hw, ENETC4_PM_RDRP(0));
+ stats->ierrors = enetc4_port_rd(enetc_hw, ENETC4_PM_RERR(0));
+ stats->oerrors = enetc4_port_rd(enetc_hw, ENETC4_PM_TERR(0));
+
+ return 0;
+}
+
+static int
+enetc4_stats_reset(struct rte_eth_dev *dev)
+{
+ struct enetc_eth_hw *hw =
+ ENETC_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct enetc_hw *enetc_hw = &hw->hw;
+
+ enetc4_port_wr(enetc_hw, ENETC4_PM0_STAT_CONFIG, ENETC4_CLEAR_STATS);
+
+ return 0;
+}
+
int
enetc4_dev_close(struct rte_eth_dev *dev)
{
@@ -668,6 +708,8 @@ static const struct eth_dev_ops enetc4_ops = {
.dev_stop = enetc4_dev_stop,
.dev_close= enetc4_dev_close,
.dev_infos_get= enetc4_dev_infos_get,
+ .stats_get= enetc4_stats_get,
+ .stats_reset = enetc4_stats_reset,
.rx_queue_setup = enetc4_rx_queue_setup,
.rx_queue_start = enetc4_rx_queue_start,
.rx_queue_stop= enetc4_rx_queue_stop,
diff --git a/drivers/net/enetc/enetc4_vf.c b/drivers/net/enetc/enetc4_vf.c
index 0c68229a8d..0d35fc2e1c 100644
--- a/drivers/net/enetc/enetc4_vf.c
+++ b/drivers/net/enetc/enetc4_vf.c
@@ -26,6 +26,29 @@ enetc4_vf_dev_start(struct rte_eth_dev *dev __rte_unused)
return 0;
}
+static int
+enetc4_vf_stats_get(struct rte_eth_dev *dev,
+
[v1 06/12] net/enetc: Add packet type parsing support
From: Vanshika Shukla
Introduces packet type parsing for ENETC4 PMD, supporting:
- RTE_PTYPE_L2_ETHER (Ethernet II)
- RTE_PTYPE_L3_IPV4 (IPv4)
- RTE_PTYPE_L3_IPV6 (IPv6)
- RTE_PTYPE_L4_TCP (TCP)
- RTE_PTYPE_L4_UDP (UDP)
- RTE_PTYPE_L4_SCTP (SCTP)
- RTE_PTYPE_L4_ICMP (ICMP)
- RTE_PTYPE_L4_FRAG (IPv4/IPv6 fragmentation)
- RTE_PTYPE_TUNNEL_ESP (ESP tunneling)
Signed-off-by: Apeksha Gupta
Signed-off-by: Gagandeep Singh
---
doc/guides/nics/features/enetc4.ini | 1 +
drivers/net/enetc/base/enetc_hw.h | 5 +
drivers/net/enetc/enetc.h | 2 ++
drivers/net/enetc/enetc4_ethdev.c | 23 +++
drivers/net/enetc/enetc4_vf.c | 1 +
drivers/net/enetc/enetc_rxtx.c | 10 ++
6 files changed, 42 insertions(+)
diff --git a/doc/guides/nics/features/enetc4.ini
b/doc/guides/nics/features/enetc4.ini
index e814852d2d..3356475317 100644
--- a/doc/guides/nics/features/enetc4.ini
+++ b/doc/guides/nics/features/enetc4.ini
@@ -4,6 +4,7 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Packet type parsing = Y
Basic stats = Y
L3 checksum offload = Y
L4 checksum offload = Y
diff --git a/drivers/net/enetc/base/enetc_hw.h
b/drivers/net/enetc/base/enetc_hw.h
index 3208d91bc5..10bd3c050c 100644
--- a/drivers/net/enetc/base/enetc_hw.h
+++ b/drivers/net/enetc/base/enetc_hw.h
@@ -196,6 +196,7 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PKT_TYPE_ETHER0x0060
#define ENETC_PKT_TYPE_IPV4 0x
#define ENETC_PKT_TYPE_IPV6 0x0020
+#define ENETC_PKT_TYPE_IPV6_EXT 0x0080
#define ENETC_PKT_TYPE_IPV4_TCP \
(0x0010 | ENETC_PKT_TYPE_IPV4)
#define ENETC_PKT_TYPE_IPV6_TCP \
@@ -208,6 +209,10 @@ enum enetc_bdr_type {TX, RX};
(0x0013 | ENETC_PKT_TYPE_IPV4)
#define ENETC_PKT_TYPE_IPV6_SCTP \
(0x0013 | ENETC_PKT_TYPE_IPV6)
+#define ENETC_PKT_TYPE_IPV4_FRAG \
+ (0x0001 | ENETC_PKT_TYPE_IPV4)
+#define ENETC_PKT_TYPE_IPV6_FRAG \
+ (0x0001 | ENETC_PKT_TYPE_IPV6_EXT | ENETC_PKT_TYPE_IPV6)
#define ENETC_PKT_TYPE_IPV4_ICMP \
(0x0003 | ENETC_PKT_TYPE_IPV4)
#define ENETC_PKT_TYPE_IPV6_ICMP \
diff --git a/drivers/net/enetc/enetc.h b/drivers/net/enetc/enetc.h
index c29353a89b..8d4e432426 100644
--- a/drivers/net/enetc/enetc.h
+++ b/drivers/net/enetc/enetc.h
@@ -117,6 +117,8 @@ int enetc4_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
int enetc4_tx_queue_start(struct rte_eth_dev *dev, uint16_t qidx);
int enetc4_tx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx);
void enetc4_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
+const uint32_t *enetc4_supported_ptypes_get(struct rte_eth_dev *dev
__rte_unused,
+ size_t *no_of_elements);
/*
* enetc4_vf function prototype
diff --git a/drivers/net/enetc/enetc4_ethdev.c
b/drivers/net/enetc/enetc4_ethdev.c
index 2db45ecf0c..a57408fbe9 100644
--- a/drivers/net/enetc/enetc4_ethdev.c
+++ b/drivers/net/enetc/enetc4_ethdev.c
@@ -693,6 +693,28 @@ enetc4_tx_queue_stop(struct rte_eth_dev *dev, uint16_t
qidx)
return 0;
}
+const uint32_t *
+enetc4_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused,
+ size_t *no_of_elements)
+{
+ PMD_INIT_FUNC_TRACE();
+ static const uint32_t ptypes[] = {
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_L3_IPV4,
+ RTE_PTYPE_L3_IPV6,
+ RTE_PTYPE_L4_TCP,
+ RTE_PTYPE_L4_UDP,
+ RTE_PTYPE_L4_SCTP,
+ RTE_PTYPE_L4_ICMP,
+ RTE_PTYPE_L4_FRAG,
+ RTE_PTYPE_TUNNEL_ESP,
+ RTE_PTYPE_UNKNOWN
+ };
+
+ *no_of_elements = RTE_DIM(ptypes);
+ return ptypes;
+}
+
/*
* The set of PCI devices this driver supports
*/
@@ -718,6 +740,7 @@ static const struct eth_dev_ops enetc4_ops = {
.tx_queue_start = enetc4_tx_queue_start,
.tx_queue_stop= enetc4_tx_queue_stop,
.tx_queue_release = enetc4_tx_queue_release,
+ .dev_supported_ptypes_get = enetc4_supported_ptypes_get,
};
/*
diff --git a/drivers/net/enetc/enetc4_vf.c b/drivers/net/enetc/enetc4_vf.c
index 0d35fc2e1c..360bb0c710 100644
--- a/drivers/net/enetc/enetc4_vf.c
+++ b/drivers/net/enetc/enetc4_vf.c
@@ -73,6 +73,7 @@ static const struct eth_dev_ops enetc4_vf_ops = {
.tx_queue_start = enetc4_tx_queue_start,
.tx_queue_stop= enetc4_tx_queue_stop,
.tx_queue_release = enetc4_tx_queue_release,
+ .dev_supported_ptypes_get = enetc4_supported_ptypes_get,
};
static int
diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c
index 963bd6fb31..65c79e508f 100644
--- a/drivers/net/enetc/enetc_rxtx.c
+++ b/drivers/net/enetc/enetc_rxtx.c
@@ -389,6 +389,16 @@ enetc_dev_rx_parse(struct rte_mbuf *m, uint16_t
parse_resu
[PATCH v5 03/47] net/bnxt: tf_core: External EM support cleanup
From: Shuanglin Wang
Isolate external EM support as it is now defunct on Wh+.
Signed-off-by: Shuanglin Wang
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Shahaji Bhosle
Reviewed-by: Farah Smith
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/meson.build |2 -
drivers/net/bnxt/tf_core/tf_core.h | 34 +-
drivers/net/bnxt/tf_core/tf_device.c | 30 -
drivers/net/bnxt/tf_core/tf_device_p4.c | 17 +-
drivers/net/bnxt/tf_core/tf_device_p4.h |1 +
drivers/net/bnxt/tf_core/tf_device_p58.c |6 +-
drivers/net/bnxt/tf_core/tf_em.h | 361 +--
drivers/net/bnxt/tf_core/tf_em_common.c | 1191 --
drivers/net/bnxt/tf_core/tf_em_common.h |1 +
drivers/net/bnxt/tf_core/tf_em_host.c| 574 ---
drivers/net/bnxt/tf_core/tf_msg.c| 465 -
drivers/net/bnxt/tf_core/tf_tcam.c |1 -
12 files changed, 71 insertions(+), 2612 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/meson.build
b/drivers/net/bnxt/tf_core/meson.build
index ae44aa34cf..13a71738a0 100644
--- a/drivers/net/bnxt/tf_core/meson.build
+++ b/drivers/net/bnxt/tf_core/meson.build
@@ -21,9 +21,7 @@ sources += files(
'tf_device.c',
'tf_device_p4.c',
'tf_device_p58.c',
-'tf_em_common.c',
'tf_em_hash_internal.c',
-'tf_em_host.c',
'tf_em_internal.c',
'tf_global_cfg.c',
'tf_hash.c',
diff --git a/drivers/net/bnxt/tf_core/tf_core.h
b/drivers/net/bnxt/tf_core/tf_core.h
index 3da1d2a5ca..fd1ee2f454 100644
--- a/drivers/net/bnxt/tf_core/tf_core.h
+++ b/drivers/net/bnxt/tf_core/tf_core.h
@@ -21,9 +21,15 @@
/** BEGIN Truflow Core DEFINITIONS **/
+/**
+ * \cond DO_NOT_DOCUMENT
+ */
#define TF_KILOBYTE 1024
#define TF_MEGABYTE (1024 * 1024)
+/**
+ * \endcond
+ */
/**
* direction
*/
@@ -93,15 +99,19 @@ enum tf_sram_bank_id {
*
* Convert absolute offset to action record pointer in EEM record entry
* Convert action record pointer in EEM record entry to absolute offset
+ * \cond DO_NOT_DOCUMENT
*/
#define TF_ACT_REC_OFFSET_2_PTR(offset) ((offset) >> 4)
#define TF_ACT_REC_PTR_2_OFFSET(offset) ((offset) << 4)
-/*
+/**
* Helper Macros
*/
#define TF_BITS_2_BYTES(num_bits) (((num_bits) + 7) / 8)
+/**
+ * \endcond
+ */
/** BEGIN API FUNCTION PROTOTYPES/PARAMETERS **/
/**
@@ -147,6 +157,8 @@ enum tf_sram_bank_id {
* TruFlow session. Session ID is constructed from the passed in
* ctrl_chan_name in tf_open_session() together with an allocated
* fw_session_id. Done by TruFlow on tf_open_session().
+ *
+ * \cond DO_NOT_DOCUMENT
*/
union tf_session_id {
uint32_t id;
@@ -172,6 +184,10 @@ union tf_session_client_id {
uint8_t fw_session_client_id;
} internal;
};
+/**
+ * \endcond
+ */
+
/**
* Session Version
@@ -181,12 +197,17 @@ union tf_session_client_id {
* versions can be supported.
*
* Please see the TF_VER_MAJOR/MINOR and UPDATE defines.
+ *
+ * \cond DO_NOT_DOCUMENT
*/
struct tf_session_version {
uint8_t major;
uint8_t minor;
uint8_t update;
};
+/**
+ * \endcond
+ */
/**
* Session supported device types
@@ -485,6 +506,7 @@ struct tf_session_info {
*
* NOTE: This struct must be within the BNXT PMD struct bnxt
* (bp). This allows use of container_of() to get access to the PMD.
+ * \cond DO_NOT_DOCUMENT
*/
struct tf {
struct tf_session_info *session;
@@ -493,6 +515,9 @@ struct tf {
*/
void *bp;
};
+/**
+ * \endcond
+ */
/**
* Identifier resource definition
@@ -716,12 +741,15 @@ int tf_open_session(struct tf *tfp,
/**
* General internal resource info
- *
+ * \cond DO_NOT_DOCUMENT
*/
struct tf_resource_info {
uint16_t start;
uint16_t stride;
};
+/**
+ * \endcond
+ */
/**
* Identifier resource definition
@@ -2386,6 +2414,7 @@ struct tf_get_version_parms {
/* [out] major
*
* Version Major number.
+* \cond DO_NOT_DOCUMENT
*/
uint8_t major;
@@ -2402,6 +2431,7 @@ struct tf_get_version_parms {
uint8_t update;
/**
+* \endcond
* [out] dev_ident_caps
*
* fw available identifier resource list
diff --git a/drivers/net/bnxt/tf_core/tf_device.c
b/drivers/net/bnxt/tf_core/tf_device.c
index 02a9ebd7b2..d023194d0c 100644
--- a/drivers/net/bnxt/tf_core/tf_device.c
+++ b/drivers/net/bnxt/tf_core/tf_device.c
@@ -153,28 +153,6 @@ tf_dev_bind_p4(struct tf *tfp,
}
no_rsv_flag = false;
}
-
- /*
-* EEM
-*/
-
- em_cfg.cfg = tf_em_ext_p4;
- rsv_cnt = tf_dev_reservation_check(TF_EM_TBL_TYPE_MAX,
- em_cfg.cfg,
- (uint16_t *)resources->em_cnt);
- if (rsv_cnt) {
- em_cfg.num_elements = TF_EM_TBL_TYPE_MAX;
-
[PATCH v5 01/47] net/bnxt: tf_core: fix wc tcam multi slice delete issue
From: Shahaji Bhosle
FW tries to update the HWRM request data in the
delete case to update the mode bit and also
update invalid profile id. This update only
happens when the data is send over DMA. HWRM
requests are read only buffers and cannot be
updated. So driver now will always send WC
tcam set message over DMA channel.
Update tunnel alloc apis to provide error message.
Fixes: ca5e61bd562d ("net/bnxt: support EM and TCAM lookup with table scope")
Reviewed-by: Randy Schacher
Reviewed-by: Kishore Padmanabha
Signed-off-by: Shahaji Bhosle
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/tf_msg.c | 28 +++---
drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c | 17 +++--
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_msg.c
b/drivers/net/bnxt/tf_core/tf_msg.c
index 1c66c7e01a..4aa90f6b07 100644
--- a/drivers/net/bnxt/tf_core/tf_msg.c
+++ b/drivers/net/bnxt/tf_core/tf_msg.c
@@ -1612,20 +1612,20 @@ tf_msg_tcam_entry_set(struct tf *tfp,
req.result_size = parms->result_size;
data_size = 2 * req.key_size + req.result_size;
- if (data_size <= TF_PCI_BUF_SIZE_MAX) {
- /* use pci buffer */
- data = &req.dev_data[0];
- } else {
- /* use dma buffer */
- req.flags |= HWRM_TF_TCAM_SET_INPUT_FLAGS_DMA;
- rc = tf_msg_alloc_dma_buf(&buf, data_size);
- if (rc)
- goto cleanup;
- data = buf.va_addr;
- tfp_memcpy(&req.dev_data[0],
- &buf.pa_addr,
- sizeof(buf.pa_addr));
- }
+ /*
+* Always use dma buffer, as the delete multi slice
+* tcam entries not support with HWRM request buffer
+* only DMA'ed buffer can update the mode bits for
+* the delete to work
+*/
+ req.flags |= HWRM_TF_TCAM_SET_INPUT_FLAGS_DMA;
+ rc = tf_msg_alloc_dma_buf(&buf, data_size);
+ if (rc)
+ goto cleanup;
+ data = buf.va_addr;
+ tfp_memcpy(&req.dev_data[0],
+ &buf.pa_addr,
+ sizeof(buf.pa_addr));
tfp_memcpy(&data[0], parms->key, parms->key_size);
tfp_memcpy(&data[parms->key_size], parms->mask, parms->key_size);
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
b/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
index 75a0b77ac2..5734013b6d 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
@@ -32,9 +32,17 @@ bnxt_tunnel_dst_port_alloc(struct bnxt *bp,
uint16_t port,
uint8_t type)
{
- return bnxt_hwrm_tunnel_dst_port_alloc(bp,
+ int rc = 0;
+ rc = bnxt_hwrm_tunnel_dst_port_alloc(bp,
port,
type);
+ if (rc) {
+ PMD_DRV_LOG_LINE(ERR, "Tunnel type:%d alloc failed for port:%d
error:%s",
+type, port,
+(rc ==
HWRM_TUNNEL_DST_PORT_ALLOC_OUTPUT_ERROR_INFO_ERR_ALLOCATED) ?
+"already allocated" : "no resource");
+ }
+ return rc;
}
int
@@ -589,7 +597,12 @@ bnxt_pmd_global_tunnel_set(uint16_t port_id, uint8_t type,
}
rc = bnxt_hwrm_tunnel_dst_port_alloc(bp, udp_port, hwtype);
- if (!rc) {
+ if (rc) {
+ PMD_DRV_LOG_LINE(ERR, "Tunnel type:%d alloc failed for
port:%d error:%s",
+hwtype, udp_port,
+(rc ==
HWRM_TUNNEL_DST_PORT_ALLOC_OUTPUT_ERROR_INFO_ERR_ALLOCATED) ?
+"already allocated" : "no resource");
+ } else {
ulp_global_tunnel_db[type].ref_cnt++;
ulp_global_tunnel_db[type].dport = udp_port;
bnxt_pmd_global_reg_data_to_hndl(port_id,
bp->ecpri_upar_in_use,
--
2.39.3
[PATCH v5 04/47] net/bnxt: tf_core: Thor TF EM key size check
From: Farah Smith
The maximum EM key size is 640 bits for Thor. But the lookup record
+ the key size is 679 bits. This value must be rounded up to a 128 bit
aligned number. So the size check should be 96 bytes rather than 80.
This fix allows keys > 601 bits to be successfully inserted.
Fixes: 539931eab3a5 ("net/bnxt: support EM with FKB")
Signed-off-by: Farah Smith
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Farah Smith
Reviewed-by: Kishore Padmanabha
Reviewed-by: Shahaji Bhosle
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/tf_msg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/bnxt/tf_core/tf_msg.c
b/drivers/net/bnxt/tf_core/tf_msg.c
index 08e9783d52..dd5ea1c80e 100644
--- a/drivers/net/bnxt/tf_core/tf_msg.c
+++ b/drivers/net/bnxt/tf_core/tf_msg.c
@@ -25,7 +25,7 @@
*/
#define TF_MSG_SET_GLOBAL_CFG_DATA_SIZE 16
#define TF_MSG_EM_INSERT_KEY_SIZE64
-#define TF_MSG_EM_INSERT_RECORD_SIZE 80
+#define TF_MSG_EM_INSERT_RECORD_SIZE 96
#define TF_MSG_TBL_TYPE_SET_DATA_SIZE88
/* Compile check - Catch any msg changes that we depend on, like the
--
2.39.3
[PATCH v5 05/47] net/bnxt: tf_core: flow scale improvement
From: Kishore Padmanabha
Added logic to add flows to wildcard tcam if flows fail to be added to
exact match table.
Signed-off-by: Kishore Padmanabha
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
Reviewed-by: Shahaji Bhosle
Signed-off-by: Sriharsha Basavapatna
---
drivers/net/bnxt/tf_core/tf_em_hash_internal.c | 4 ++--
drivers/net/bnxt/tf_core/tf_msg.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
index 9c527e152d..8fa78be226 100644
--- a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
+++ b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
@@ -65,7 +65,7 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
PMD_DRV_LOG_LINE(ERR,
"%s, EM entry index allocation failed",
tf_dir_2_str(parms->dir));
- return -1;
+ return -ENOMEM; /* no more space to add entries */
}
if (dev->ops->tf_dev_cfa_key_hash == NULL)
@@ -87,7 +87,7 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
if (rc) {
/* Free the allocated index before returning */
dpool_free(pool, index);
- return -1;
+ return rc;
}
TF_SET_GFID(gfid,
diff --git a/drivers/net/bnxt/tf_core/tf_msg.c
b/drivers/net/bnxt/tf_core/tf_msg.c
index dd5ea1c80e..1ef828a1e9 100644
--- a/drivers/net/bnxt/tf_core/tf_msg.c
+++ b/drivers/net/bnxt/tf_core/tf_msg.c
@@ -925,7 +925,7 @@ tf_msg_hash_insert_em_internal_entry(struct tf *tfp,
if (msg_record_size > TF_MSG_EM_INSERT_RECORD_SIZE) {
rc = -EINVAL;
TFP_DRV_LOG(ERR,
- "%s: Record size to large, rc:%s\n",
+ "%s: Record size too large, rc:%s\n",
tf_dir_2_str(em_parms->dir),
strerror(-rc));
return rc;
--
2.39.3
[PATCH v5 02/47] net/bnxt: tf_core: tcam manager data corruption
From: Shahaji Bhosle
Max entries per session were not getting initialized
to 0, when the sessions were closed.
Reset max entries counter session when the session is initialized
Fixes: 97435d7906d7 ("net/bnxt: update Truflow core")
Signed-off-by: Shahaji Bhosle
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Farah Smith
Reviewed-by: Kishore Padmanabha
Reviewed-by: Shuanglin Wang
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/cfa_tcam_mgr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
index f26d93e7a9..9df2d2b937 100644
--- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
+++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
@@ -909,6 +909,7 @@ cfa_tcam_mgr_init(int sess_idx, enum
cfa_tcam_mgr_device_type type,
/* Now calculate the max entries per table and global max entries based
* on the updated table limits.
*/
+ cfa_tcam_mgr_max_entries[sess_idx] = 0;
for (dir = 0; dir < ARRAY_SIZE(cfa_tcam_mgr_tables[sess_idx]); dir++)
for (tbl_type = 0;
tbl_type < ARRAY_SIZE(cfa_tcam_mgr_tables[sess_idx][dir]);
@@ -958,8 +959,8 @@ cfa_tcam_mgr_init(int sess_idx, enum
cfa_tcam_mgr_device_type type,
if (parms != NULL)
parms->max_entries = cfa_tcam_mgr_max_entries[sess_idx];
- CFA_TCAM_MGR_LOG(INFO, "Global TCAM table initialized for sess_idx
%d.\n",
-sess_idx);
+ CFA_TCAM_MGR_LOG(DEBUG, "Global TCAM table initialized for sess_idx %d
max entries %d.\n",
+sess_idx, cfa_tcam_mgr_max_entries[sess_idx]);
return 0;
}
--
2.39.3
[PATCH v5 23/47] net/bnxt: tf_ulp: VFR updates for Thor 2
From: Mike Baucom
Update to VFR code to:
- add the endpoint (efid) to the session
- modify the generic tables to write the l2 context id
- tfc session code changes to allow the efid to be added to the sid
- release both rfid and efid from afm
This patch includes a few related changes:
Thor2 change the counter get to clear on request
Allow the caller to either clear on read or simply read based
on their request.
Reject duplicate EM flow entry
It is not necessary to add an duplicate EM entry to WC.
This change will reject it.
Signed-off-by: Mike Baucom
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Farah Smith
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_ethdev.c | 15 +++
drivers/net/bnxt/bnxt_reps.c | 63 ++---
drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 28 ++
drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 12 +++
drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c| 2 +
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 115 ++-
drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c | 11 ++-
drivers/net/bnxt/tf_ulp/ulp_mapper_tfc.c | 33 ++-
8 files changed, 231 insertions(+), 48 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 50b1e26126..2a0b06c97b 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1846,6 +1846,21 @@ int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
/* Initialize bnxt ULP port details */
if (bnxt_enable_ulp(bp)) {
+ if (BNXT_CHIP_P7(bp)) {
+ /* Need to release the Fid from AFM control */
+ rc = bnxt_hwrm_release_afm_func(bp, bp->fw_fid,
+ bp->fw_fid,
+
HWRM_CFA_RELEASE_AFM_FUNC_INPUT_TYPE_RFID,
+ 0);
+ if (rc) {
+ PMD_DRV_LOG_LINE(ERR,
+"Failed in hwrm release afm
func:%u rc=%d",
+bp->fw_fid, rc);
+ goto error;
+ }
+ PMD_DRV_LOG_LINE(DEBUG, "Released RFID:%d", bp->fw_fid);
+ }
+
rc = bnxt_ulp_port_init(bp);
if (rc)
goto error;
diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index 3f58f29ec6..00900ad631 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -34,7 +34,7 @@ static const struct eth_dev_ops bnxt_rep_dev_ops = {
static bool bnxt_rep_check_parent(struct bnxt_representor *rep)
{
- if (!rep->parent_dev->data->dev_private)
+ if (!rep->parent_dev->data || !rep->parent_dev->data->dev_private)
return false;
return true;
@@ -357,28 +357,41 @@ static int bnxt_tf_vfr_alloc(struct rte_eth_dev
*vfr_ethdev)
rc = bnxt_hwrm_release_afm_func(parent_bp,
vfr->fw_fid,
parent_bp->fw_fid,
- HWRM_CFA_RELEASE_AFM_FUNC_INPUT_TYPE_RFID,
+ HWRM_CFA_RELEASE_AFM_FUNC_INPUT_TYPE_EFID,
0);
- if (rc)
+ if (rc) {
PMD_DRV_LOG_LINE(ERR,
-"Failed in hwrm release afm func:%u
rc=%d",
-vfr->vf_id, rc);
+"Failed to release EFID:%d from
RFID:%d rc=%d",
+vfr->vf_id, parent_bp->fw_fid, rc);
+ goto error_del_rules;
+ }
+ PMD_DRV_LOG_LINE(DEBUG, "Released EFID:%d from RFID:%d",
+vfr->fw_fid, parent_bp->fw_fid);
+
} else {
rc = bnxt_hwrm_cfa_pair_alloc(parent_bp, vfr);
- if (rc)
+ if (rc) {
PMD_DRV_LOG_LINE(ERR,
"Failed in hwrm vfr alloc vfr:%u
rc=%d",
vfr->vf_id, rc);
+ goto error_del_rules;
+ }
}
+ /* if supported, it will add the vfr endpoint to the session, otherwise
+* it returns success
+*/
+ rc = bnxt_ulp_vfr_session_fid_add(parent_bp->ulp_ctx, vfr->fw_fid);
if (rc)
- (void)bnxt_ulp_delete_vfr_default_rules(vfr);
+ goto error_del_rules;
else
PMD_DRV_LOG_LINE(DEBUG,
"BNXT Port:%d VFR created and initialized",
vfr->dpdk_port_id);
-
+ return rc;
+error_del_rules:
+ (void)bnxt_ulp_d
[PATCH v5 30/47] net/bnxt: tf_ulp: add mask defaults when mask is not specified
From: Kishore Padmanabha
If application does not specify mask in a field description then
use the default mask values from dpdk header files.
This patch also includes the following related changes.
fix stats collection for shared session
The stats accumulation was being performed on default session,
it needs to get the correct session type to get shared session
counters.
updated ulp flow db for 64 bit handles
Updated the ulp flow database so that all the hardware handles
are 64 bit for all the resource types.
Template rejection with no tables fails for vf to vf
Fixed the template rejection logic to include the table even on
unconditional rejection. This was exposed for vf to vf traffic on
Thor 2 and resulted in a segmentation fault.
fix spec and default mask parsing for flow items.
Fixed the protocol header parsing when bith spec and mask are
not given.
Thor2 priority for l2 tcam records not adhered to
Fix l2 context records priority in template compiler
Fix flow handle mask offset
Fix cpu_to_le_16 macro issues
Fix misspellings in code
Signed-off-by: Kishore Padmanabha
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Shuanglin Wang
Reviewed-by: Shahaji Bhosle
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 6 +-
drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h | 2 +
drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tf.c | 17 +++--
drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c | 1 +
drivers/net/bnxt/tf_ulp/ulp_flow_db.c| 92 +---
drivers/net/bnxt/tf_ulp/ulp_flow_db.h| 27 +++
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 7 +-
drivers/net/bnxt/tf_ulp/ulp_mapper_tfc.c | 4 +-
drivers/net/bnxt/tf_ulp/ulp_matcher.c| 10 +--
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 64 +++--
10 files changed, 118 insertions(+), 112 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
index 0c46c7d4c9..eb2d14f3be 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
@@ -525,6 +525,7 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context
*ctxt,
bool found_cntr_resource = false;
bool found_parent_flow = false;
uint32_t pc_idx = 0;
+ uint32_t session_type = 0;
uint8_t dir;
ulp_fc_info = bnxt_ulp_cntxt_ptr2_fc_info_get(ctxt);
@@ -569,8 +570,9 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context
*ctxt,
}
dir = params.direction;
+ session_type = ulp_flow_db_shared_session_get(¶ms);
if (!(ulp_fc_info->flags & ULP_FLAG_FC_SW_AGG_EN)) {
- rc = fc_ops->ulp_flow_stat_get(ctxt, dir,
+ rc = fc_ops->ulp_flow_stat_get(ctxt, dir, session_type,
params.resource_hndl, count);
bnxt_ulp_cntxt_release_fdb_lock(ctxt);
return rc;
@@ -581,7 +583,7 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context
*ctxt,
BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) {
hw_cntr_id = params.resource_hndl;
if (!ulp_fc_info->num_counters) {
- rc = fc_ops->ulp_flow_stat_get(ctxt, dir,
+ rc = fc_ops->ulp_flow_stat_get(ctxt, dir, session_type,
hw_cntr_id, count);
bnxt_ulp_cntxt_release_fdb_lock(ctxt);
return rc;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
index daa2210728..0b81be7af9 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h
@@ -7,6 +7,7 @@
#define _ULP_FC_MGR_H_
#include "bnxt_ulp.h"
+#include "ulp_flow_db.h"
#define ULP_FLAG_FC_THREAD BIT(0)
#define ULP_FLAG_FC_SW_AGG_EN BIT(1)
@@ -28,6 +29,7 @@ struct bnxt_ulp_fc_core_ops {
int32_t
(*ulp_flow_stat_get)(struct bnxt_ulp_context *ctxt,
uint8_t direction,
+uint32_t session_type,
uint64_t handle,
struct rte_flow_query_count *count);
int32_t
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tf.c
b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tf.c
index 9c91569473..cd6d067bc9 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tf.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tf.c
@@ -157,17 +157,19 @@ ulp_fc_tf_update_accum_stats(struct bnxt_ulp_context
*ctxt,
enum tf_dir dir;
struct tf *tfp;
- tfp = bnxt_ulp_cntxt_tfp_get(ctxt, BNXT_ULP_SESSION_TYPE_DEFAULT);
- if (!tfp) {
- BNXT_DRV_DBG(ERR, "Failed to get the truflow pointer\n");
- return 0; /* This can happen, return for now with success */
- }
-
num_entries = dparms->flow_cou
[PATCH v5 26/47] net/bnxt: tf_ulp: enable recipe id generation
From: Kishore Padmanabha
Added support to generate recipe id generation.
This patch includes a few related changes:
fix segfault in the wildcard recipe process
The recipe id is being passed as 8 bit instead of 64bit
causing the crash.
Ported code using default_non_ha resource
Missing code to use default_non_ha resource if HA is
disabled.
fix move debug message from info to debug level
The action pointer does not exist for non representor ports
so it is a debug message.
Signed-off-by: Kishore Padmanabha
Signed-off-by: Shuanglin Wang
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Shahaji Bhosle
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c | 4 +
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 2 +-
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 257 +++---
drivers/net/bnxt/tf_ulp/ulp_mapper.h | 2 +
4 files changed, 196 insertions(+), 69 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
index 2d46d21a5d..0cc2b4e81d 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
@@ -257,6 +257,10 @@ ulp_tf_resources_get(struct bnxt_ulp_context *ulp_ctx,
return -EINVAL;
}
+ /* use DEFAULT_NON_HA instead of DEFAULT resources if HA is disabled */
+ if (ULP_APP_HA_IS_DYNAMIC(ulp_ctx))
+ stype = ulp_ctx->cfg_data->def_session_type;
+
unnamed = bnxt_ulp_resource_resv_list_get(&unum);
if (unnamed == NULL) {
BNXT_DRV_DBG(ERR, "Unable to get resource resv list.\n");
diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
index 82a653594f..099ae7adc8 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
@@ -1198,7 +1198,7 @@ ulp_default_flow_db_cfa_action_get(struct
bnxt_ulp_context *ulp_ctx,
BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
sub_typ, ¶ms);
if (rc) {
- BNXT_DRV_DBG(INFO, "CFA Action ptr not found for flow id %u\n",
+ BNXT_DRV_DBG(DEBUG, "CFA Action ptr not found for flow id %u\n",
flow_id);
return -ENOENT;
}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index e399c136f3..b44b25429f 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -1302,7 +1302,9 @@ ulp_mapper_key_recipe_tbl_deinit(struct
bnxt_ulp_mapper_data *mdata)
rte_free(recipes[idx]);
}
rte_free(mdata->key_recipe_info.recipes[dir][ftype]);
- mdata->key_recipe_info.recipes[dir][ftype] = NULL;
+ mdata->key_recipe_info.recipes[dir][ftype] = NULL;
+ rte_free(mdata->key_recipe_info.recipe_ba[dir][ftype]);
+ mdata->key_recipe_info.recipe_ba[dir][ftype] = NULL;
}
}
mdata->key_recipe_info.num_recipes = 0;
@@ -1315,8 +1317,9 @@ ulp_mapper_key_recipe_tbl_init(struct bnxt_ulp_context
*ulp_ctx,
struct bnxt_ulp_key_recipe_entry **recipes;
enum bnxt_ulp_direction dir;
uint32_t dev_id = 0, size_val;
- uint32_t num_recipes, ftype;
+ uint32_t num_recipes, ftype, pool_size;
int32_t rc = 0;
+ struct bitalloc *recipe_ba;
rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
if (rc) {
@@ -1327,20 +1330,43 @@ ulp_mapper_key_recipe_tbl_init(struct bnxt_ulp_context
*ulp_ctx,
if (!num_recipes)
return rc;
+ /* Need to write these values so that a failure will result in freeing
+* the memory in the deinit
+*/
+ mdata->key_recipe_info.num_recipes = num_recipes;
+ mdata->key_recipe_info.max_fields = BNXT_ULP_KEY_RECIPE_MAX_FLDS;
+
size_val = sizeof(struct bnxt_ulp_key_recipe_entry *);
+ pool_size = BITALLOC_SIZEOF(num_recipes);
+
+ /* The caller will deinit if failures occur, so just return fail instead
+* of attempting to free allocated memory
+**/
for (dir = 0; dir < BNXT_ULP_DIRECTION_LAST; dir++) {
for (ftype = 0; ftype < ULP_RECIPE_TYPE_MAX; ftype++) {
recipes = rte_zmalloc("key_recipe_list",
size_val * num_recipes, 0);
if (!recipes) {
- BNXT_DRV_DBG(ERR, "Uanable to alloc memory\n");
+ BNXT_DRV_DBG(ERR, "Unable to alloc memory\n");
return -ENOMEM;
}
mdata->key_recipe_info.recipes[dir][ftype] = recipes;
+
+ rec
[PATCH v5 27/47] net/bnxt: tf_ulp: fixed parent child db counters
From: Kishore Padmanabha
The locking for the parent child counters need to be done till the
stats are retrieved. Also the OVS is creating multiple F1 flows for
same tunnel hence reference count needs to be maintined for the F1
flows.
Fix name conflicts for class and action tables. Matcher allocates
hash tables for class and action entries. These tables should have
different names for each port.
Signed-off-by: Kishore Padmanabha
Signed-off-by: Shuanglin Wang
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 37 +--
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 22 ++--
drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 2 ++
drivers/net/bnxt/tf_ulp/ulp_matcher.c | 12 +++--
4 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
index b880b545da..0c46c7d4c9 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
@@ -563,23 +563,29 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context
*ctxt,
} while (!rc && nxt_resource_index);
- bnxt_ulp_cntxt_release_fdb_lock(ctxt);
-
- if (rc || !found_cntr_resource)
+ if (rc || !found_cntr_resource) {
+ bnxt_ulp_cntxt_release_fdb_lock(ctxt);
return rc;
+ }
dir = params.direction;
- if (!(ulp_fc_info->flags & ULP_FLAG_FC_SW_AGG_EN))
- return fc_ops->ulp_flow_stat_get(ctxt, dir,
-params.resource_hndl, count);
+ if (!(ulp_fc_info->flags & ULP_FLAG_FC_SW_AGG_EN)) {
+ rc = fc_ops->ulp_flow_stat_get(ctxt, dir,
+ params.resource_hndl, count);
+ bnxt_ulp_cntxt_release_fdb_lock(ctxt);
+ return rc;
+ }
if (!found_parent_flow &&
params.resource_sub_type ==
BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) {
hw_cntr_id = params.resource_hndl;
- if (!ulp_fc_info->num_counters)
- return fc_ops->ulp_flow_stat_get(ctxt, dir,
-hw_cntr_id, count);
+ if (!ulp_fc_info->num_counters) {
+ rc = fc_ops->ulp_flow_stat_get(ctxt, dir,
+ hw_cntr_id, count);
+ bnxt_ulp_cntxt_release_fdb_lock(ctxt);
+ return rc;
+ }
/* TODO:
* Think about optimizing with try_lock later
@@ -603,9 +609,14 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context
*ctxt,
params.resource_sub_type ==
BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT) {
/* Get stats from the parent child table */
- ulp_flow_db_parent_flow_count_get(ctxt, pc_idx,
- &count->hits, &count->bytes,
- count->reset);
+ if (ulp_flow_db_parent_flow_count_get(ctxt, flow_id,
+ pc_idx,
+ &count->hits,
+ &count->bytes,
+ count->reset)) {
+ bnxt_ulp_cntxt_release_fdb_lock(ctxt);
+ return -EIO;
+ }
if (count->hits)
count->hits_set = 1;
if (count->bytes)
@@ -613,7 +624,7 @@ int ulp_fc_mgr_query_count_get(struct bnxt_ulp_context
*ctxt,
} else {
rc = -EINVAL;
}
-
+ bnxt_ulp_cntxt_release_fdb_lock(ctxt);
return rc;
}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
index 099ae7adc8..679dab0f17 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
@@ -836,7 +836,6 @@ ulp_flow_db_fid_free(struct bnxt_ulp_context *ulp_ctxt,
#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
BNXT_DRV_DBG(DEBUG, "flow_id = %u:%u freed\n", flow_type, fid);
#endif
-
/* all good, return success */
return 0;
}
@@ -1383,13 +1382,12 @@ ulp_flow_db_pc_db_parent_flow_set(struct
bnxt_ulp_context *ulp_ctxt,
if (set_flag) {
pc_entry->parent_fid = parent_fid;
+ pc_entry->parent_ref_cnt++;
} else {
- if (pc_entry->parent_fid != parent_fid)
- BNXT_DRV_DBG(ERR, "Panic: invalid parent id\n");
- pc_entry->parent_fid = 0;
-
+ if (pc_entry->parent_ref_cnt > 0)
+ pc_entry->parent_ref_cnt--;
/* Free the
[PATCH v5 13/47] net/bnxt: tf_ulp: add custom l2 etype tunnel support
From: Shahaji Bhosle
Add hooks in the hwrm and ulp layer to enable,
custom tunnel header support on wh+ generic app(ovs).
Signed-off-by: Shahaji Bhosle
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt.h| 4 +++
drivers/net/bnxt/bnxt_hwrm.c | 18 ++
drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 54 ++
drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 3 ++
4 files changed, 79 insertions(+)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index ce10167e1f..b50ae71c1f 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -989,13 +989,17 @@ struct bnxt {
uint8_t vxlan_port_cnt;
uint8_t geneve_port_cnt;
uint8_t ecpri_port_cnt;
+ uint8_t l2_etype_tunnel_cnt;
uint16_tvxlan_port;
uint16_tgeneve_port;
uint16_tecpri_port;
uint16_tvxlan_fw_dst_port_id;
uint16_tgeneve_fw_dst_port_id;
uint16_tecpri_fw_dst_port_id;
+#define BNXT_L2_ETYPE_TUNNEL_ID 0x /* CUSTOM L2 ENCAP - VF representors */
+ uint16_tl2_etype_tunnel_id;
uint16_tecpri_upar_in_use;
+ uint8_t l2_etype_upar_in_use;
uint32_tfw_ver;
uint32_thwrm_spec_code;
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 97ea32b286..c102e2cdb3 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3542,6 +3542,10 @@ bnxt_free_tunnel_ports(struct bnxt *bp)
if (bp->ecpri_port_cnt)
bnxt_hwrm_tunnel_dst_port_free(bp, bp->ecpri_fw_dst_port_id,
HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_ECPRI);
+
+ if (bp->l2_etype_tunnel_cnt)
+ bnxt_hwrm_tunnel_dst_port_free(bp, bp->l2_etype_tunnel_id,
+ HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_L2_ETYPE);
}
void bnxt_free_all_hwrm_resources(struct bnxt *bp)
@@ -4839,6 +4843,10 @@ int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp,
uint16_t port,
bp->ecpri_port = port;
bp->ecpri_upar_in_use = resp->upar_in_use;
break;
+ case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_L2_ETYPE:
+ bp->l2_etype_tunnel_id = port;
+ bp->l2_etype_upar_in_use = resp->upar_in_use;
+ break;
default:
break;
}
@@ -4869,6 +4877,9 @@ int bnxt_hwrm_tunnel_upar_id_get(struct bnxt *bp, uint8_t
*upar_id,
case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_SRV6:
*upar_id = resp->upar_in_use;
break;
+ case HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_L2_ETYPE:
+ *upar_id = resp->upar_in_use;
+ break;
default:
/* INVALID UPAR Id if another tunnel type tries to retrieve */
*upar_id = 0xff;
@@ -4915,6 +4926,13 @@ int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp,
uint16_t port,
bp->ecpri_port_cnt = 0;
}
+ if (tunnel_type ==
+ HWRM_TUNNEL_DST_PORT_FREE_INPUT_TUNNEL_TYPE_L2_ETYPE) {
+ bp->l2_etype_tunnel_cnt = 0;
+ bp->l2_etype_tunnel_id = 0;
+ bp->l2_etype_upar_in_use = 0;
+ }
+
bnxt_hwrm_set_tpa(bp);
return rc;
}
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index 5afb4d4e3d..a0b252c6e4 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -454,6 +454,10 @@ bnxt_ulp_cntxt_app_caps_init(struct bnxt *bp,
}
}
+ if (info[i].flags & BNXT_ULP_APP_CAP_L2_ETYPE)
+ ulp_ctx->cfg_data->ulp_flags |=
+ BNXT_ULP_APP_L2_ETYPE;
+
bnxt_ulp_vxlan_ip_port_set(ulp_ctx, info[i].vxlan_ip_port);
bnxt_ulp_vxlan_port_set(ulp_ctx, info[i].vxlan_port);
bnxt_ulp_ecpri_udp_port_set(ulp_ctx, info[i].ecpri_udp_port);
@@ -1795,6 +1799,29 @@ bnxt_ulp_init(struct bnxt *bp,
return rc;
}
+static int
+ulp_l2_etype_tunnel_alloc(struct bnxt *bp)
+{
+ int rc = 0;
+
+ if (!ULP_APP_L2_ETYPE_SUPPORT(bp->ulp_ctx))
+ return rc;
+
+ if (bp->l2_etype_tunnel_cnt) {
+ BNXT_TF_DBG(DEBUG, "L2 ETYPE Custom Tunnel already
allocated\n");
+ return rc;
+ }
+ rc = bnxt_tunnel_dst_port_alloc(bp,
+ BNXT_L2_ETYPE_TUNNEL_ID,
+
HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_L2_ETYPE);
+ if (rc)
+ BNXT_TF_DBG(ERR, "Failed to set global L2 ETYPE Custo
[PATCH v5 14/47] net/bnxt: tf_ulp: add support for vf to vf flow offload
From: Kishore Padmanabha
Added support for the vf to vf flow offload for the whitney platform.
It includes the change of the pipeline from using vlan tags to using
custom L2 encap and decap of the packets.
Signed-off-by: Kishore Padmanabha
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Shahaji Bhosle
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 5
drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 32 +
drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 26
drivers/net/bnxt/tf_ulp/ulp_mapper.c| 6 +
drivers/net/bnxt/tf_ulp/ulp_port_db.c | 32 +
drivers/net/bnxt/tf_ulp/ulp_port_db.h | 13 ++
6 files changed, 114 insertions(+)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index a0b252c6e4..2f60f64069 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -1927,6 +1927,11 @@ bnxt_ulp_port_init(struct bnxt *bp)
}
}
+ /* setup the l2 etype tunnel for custom l2 encap/decap */
+ rc = ulp_l2_etype_tunnel_alloc(bp);
+ if (rc)
+ goto jump_to_error;
+
/* Update bnxt driver flags */
rc = ulp_dparms_dev_port_intf_update(bp, bp->ulp_ctx);
if (rc) {
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
index ad04644db4..2f159ae486 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
@@ -606,6 +606,38 @@ bnxt_ulp_action_handle_create(struct rte_eth_dev *dev,
BNXT_ULP_DIR_EGRESS);
}
+ /* perform the conversion from dpdk port to bnxt ifindex */
+ if (ulp_port_db_dev_port_to_ulp_index(ulp_ctx,
+ dev->data->port_id,
+ &ifindex)) {
+ BNXT_TF_DBG(ERR, "Port id is not valid\n");
+ goto parse_error;
+ }
+ port_type = ulp_port_db_port_type_get(ulp_ctx, ifindex);
+ if (port_type == BNXT_ULP_INTF_TYPE_INVALID) {
+ BNXT_TF_DBG(ERR, "Port type is not valid\n");
+ goto parse_error;
+ }
+
+ bnxt_ulp_init_parser_cf_defaults(¶ms, dev->data->port_id);
+
+ /* Emulating the match port for direction processing */
+ ULP_COMP_FLD_IDX_WR(¶ms, BNXT_ULP_CF_IDX_MATCH_PORT_TYPE,
+ port_type);
+
+ if ((params.dir_attr & BNXT_ULP_FLOW_ATTR_INGRESS) &&
+ port_type == BNXT_ULP_INTF_TYPE_VF_REP) {
+ ULP_COMP_FLD_IDX_WR(¶ms, BNXT_ULP_CF_IDX_DIRECTION,
+ BNXT_ULP_DIR_EGRESS);
+ } else {
+ /* Assign the input direction */
+ if (params.dir_attr & BNXT_ULP_FLOW_ATTR_INGRESS)
+ ULP_COMP_FLD_IDX_WR(¶ms, BNXT_ULP_CF_IDX_DIRECTION,
+ BNXT_ULP_DIR_INGRESS);
+ else
+ ULP_COMP_FLD_IDX_WR(¶ms, BNXT_ULP_CF_IDX_DIRECTION,
+ BNXT_ULP_DIR_EGRESS);
+ }
/* Parse the shared action */
ret = bnxt_ulp_rte_parser_act_parse(actions, ¶ms);
if (ret != BNXT_TF_RC_SUCCESS)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
index 8237dbd294..e2d281130e 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_def_rules.c
@@ -12,6 +12,10 @@
#include "ulp_flow_db.h"
#include "ulp_mapper.h"
+static void
+ulp_l2_custom_tunnel_id_update(struct bnxt *bp,
+ struct bnxt_ulp_mapper_create_parms *params);
+
struct bnxt_ulp_def_param_handler {
int32_t (*vfr_func)(struct bnxt_ulp_context *ulp_ctx,
struct ulp_tlv_param *param,
@@ -306,6 +310,7 @@ ulp_default_flow_create(struct rte_eth_dev *eth_dev,
struct ulp_rte_act_bitmap act = { 0 };
struct bnxt_ulp_context *ulp_ctx;
uint32_t type, ulp_flags = 0, fid;
+ struct bnxt *bp = eth_dev->data->dev_private;
int rc = 0;
memset(&mapper_params, 0, sizeof(mapper_params));
@@ -366,6 +371,9 @@ ulp_default_flow_create(struct rte_eth_dev *eth_dev,
ULP_COMP_FLD_IDX_WR(&mapper_params, BNXT_ULP_CF_IDX_VF_META_FID,
BNXT_ULP_META_VF_FLAG | mapper_params.func_id);
+ /* update the upar id */
+ ulp_l2_custom_tunnel_id_update(bp, &mapper_params);
+
BNXT_TF_DBG(DEBUG, "Creating default flow with template id: %u\n",
ulp_class_tid);
@@ -641,3 +649,21 @@ bnxt_ulp_delete_vfr_default_rules(struct bnxt_representor
*vfr)
memset(info, 0, sizeof(struct bnxt_ulp_vfr_rule_info));
return 0;
}
+
+static void
+ulp_l2_custom_tunnel_id_update(struct bnxt *bp,
+ st
[PATCH v5 15/47] net/bnxt: tf_ulp: Wh+ mirroring support
From: Manish Kurup
1. ULP fixes to enable primitives to support mirroring
2. RTE parser changes to support and use multiple ports in RTE
input msgs
3. Template changes required to support ingress mirroring
4. Template changes required to support egress mirroring
(using VFR pipeline)
Signed-off-by: Manish Kurup
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 8 +
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 179 ---
2 files changed, 167 insertions(+), 20 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 9dda70d75b..eb0f95cfee 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -3789,6 +3789,8 @@ ulp_mapper_func_info_process(struct bnxt_ulp_mapper_parms
*parms,
case BNXT_ULP_FUNC_OPC_GT:
case BNXT_ULP_FUNC_OPC_LE:
case BNXT_ULP_FUNC_OPC_LT:
+ case BNXT_ULP_FUNC_OPC_ADD:
+ case BNXT_ULP_FUNC_OPC_SUB:
process_src1 = 1;
process_src2 = 1;
break;
@@ -3841,6 +3843,12 @@ ulp_mapper_func_info_process(struct
bnxt_ulp_mapper_parms *parms,
if (res1 < res2)
res = 1;
break;
+ case BNXT_ULP_FUNC_OPC_ADD:
+ res = res1 + res2;
+ break;
+ case BNXT_ULP_FUNC_OPC_SUB:
+ res = res1 - res2;
+ break;
case BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF:
res = res1;
break;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index 013d8b0a59..da20b41c72 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -330,9 +330,21 @@ ulp_post_process_normal_flow(struct ulp_rte_parser_params
*params)
/* Evaluate the VF to VF flag */
if (act_port_set && act_port_type == BNXT_ULP_INTF_TYPE_VF_REP &&
- match_port_type == BNXT_ULP_INTF_TYPE_VF_REP)
- ULP_BITMAP_SET(params->act_bitmap.bits,
- BNXT_ULP_ACT_BIT_VF_TO_VF);
+match_port_type == BNXT_ULP_INTF_TYPE_VF_REP) {
+ if (!ULP_BITMAP_ISSET(params->act_bitmap.bits,
+ BNXT_ULP_ACT_BIT_MULTIPLE_PORT)) {
+ ULP_BITMAP_SET(params->act_bitmap.bits,
+ BNXT_ULP_ACT_BIT_VF_TO_VF);
+ } else {
+ if (ULP_COMP_FLD_IDX_RD(params,
BNXT_ULP_CF_IDX_MP_A_IS_VFREP) &&
+ ULP_COMP_FLD_IDX_RD(params,
BNXT_ULP_CF_IDX_MP_B_IS_VFREP))
+ ULP_BITMAP_SET(params->act_bitmap.bits,
+ BNXT_ULP_ACT_BIT_VF_TO_VF);
+ else
+ ULP_BITMAP_RESET(params->act_bitmap.bits,
+BNXT_ULP_ACT_BIT_VF_TO_VF);
+ }
+ }
/* Update the decrement ttl computational fields */
if (ULP_BITMAP_ISSET(params->act_bitmap.bits,
@@ -2349,15 +2361,74 @@ ulp_rte_count_act_handler(const struct rte_flow_action
*action_item,
return BNXT_TF_RC_SUCCESS;
}
+static bool ulp_rte_parser_is_portb_vfrep(struct ulp_rte_parser_params *param)
+{
+ return ULP_COMP_FLD_IDX_RD(param, BNXT_ULP_CF_IDX_MP_B_IS_VFREP);
+}
+
+/*
+ * Swaps info related to multi-port:
+ * common:
+ *BNXT_ULP_CF_IDX_MP_B_IS_VFREP, BNXT_ULP_CF_IDX_MP_A_IS_VFREP
+ *BNXT_ULP_CF_IDX_MP_PORT_A, BNXT_ULP_CF_IDX_MP_PORT_B
+ *
+ * ingress:
+ *BNXT_ULP_CF_IDX_MP_VNIC_B, BNXT_ULP_CF_IDX_MP_VNIC_A
+ *
+ * egress:
+ *BNXT_ULP_CF_IDX_MP_MDATA_B, BNXT_ULP_CF_IDX_MP_MDATA_A
+ *BNXT_ULP_CF_IDX_MP_VPORT_B, BNXT_ULP_CF_IDX_MP_VPORT_A
+ *
+ * Note: This is done as OVS could give us a non-VFREP port in port B, and we
+ * cannot use that to mirror, so we swap out the ports so that a VFREP is now
+ * in port B instead.
+ */
+static int32_t
+ulp_rte_parser_normalize_port_info(struct ulp_rte_parser_params *param)
+{
+ uint16_t mp_port_a, mp_port_b, mp_mdata_a, mp_mdata_b,
+mp_vport_a, mp_vport_b, mp_vnic_a, mp_vnic_b,
+mp_is_vfrep_a, mp_is_vfrep_b;
+
+ mp_is_vfrep_a = ULP_COMP_FLD_IDX_RD(param,
BNXT_ULP_CF_IDX_MP_A_IS_VFREP);
+ mp_is_vfrep_b = ULP_COMP_FLD_IDX_RD(param,
BNXT_ULP_CF_IDX_MP_B_IS_VFREP);
+ ULP_COMP_FLD_IDX_WR(param, BNXT_ULP_CF_IDX_MP_B_IS_VFREP,
mp_is_vfrep_a);
+ ULP_COMP_FLD_IDX_WR(param, BNXT_ULP_CF_IDX_MP_A_IS_VFREP,
mp_is_vfrep_b);
+
+ mp_port_a = ULP_COMP_FLD_IDX_RD(param, BNXT_ULP_CF_IDX_MP_PORT_A);
+ mp_port_b = ULP_COMP_FLD_IDX_RD(param, BNXT_ULP_CF_IDX_MP_PORT_B);
+ ULP_COMP_FLD_IDX_WR(param, BNXT_ULP_CF_IDX_MP_PORT_B, mp_port_a);
+ ULP_COMP_FLD_IDX_WR(param, BNXT_
[PATCH v5 16/47] net/bnxt: tf_ulp: miscellaneous fixes
From: Mike Baucom Template compiler modifications for v3 api: Compile named/unnamed shared app resources for the applications that are capable. Change app id signature with base zero offset: The app id is used in the calculation of the matching signatures and as app id value increases the output of the signature also increases to keep up the scale, the app id is reset to zero based offset. Also fix some whitespace errors. Add support for vxlan-gpe: Add support for enabling UPAR1 and UPAR2 to parse vxlan-gpe/nsh/ipv4 and vxlan-gpe/nsh/ipv6 packets for. Default parif handling for single port cards: Update Ingress default and offloaded flows to use driver function parif, instead of physical port parif. We have cards that use single physical port with two PFs on the same physical port, this causes the default physical port parif to be over written by the second PF. If you use driver function parif then single port with more than one PF can use its own parif and not step on each other. Note: We cannot support TWO VFs on the same PF, because driver function parif is based on PF fw id, so if two VFs on same PF are offloading flows they will get the same driver function parifs and this will interfere with each other. Support vxlan flow with vxlan-gpe port: The patch adds the APP_CAP_CUST_VXLAN flag, so that the app can create a custom vxlan flow, instead of vxlan-gpe flow, when the custom vxlan port is 4790. Synchronize async event handler and Truflow init: If Truflow is not initialized then bail out in async event handler gracefully. Add a new macro ulp_is_default_session_active(). Reduce the log level from info to debug: Default VFR action record get api in templates that do not support VFR report an info message which looks like an error. But it is benign and doesn't impact the functionality. So change the log level to debug from info. Read upar_in_use from tunnel_dst_port_alloc response: This patch reads the upar_in_use field from hwrm_tunnel_dst_port_alloc's response and stores inside the bp structure. Add API to configure hot upgrade: This patch adds an API that can be called to configure hot upgrade. If this API is not called then the driver relies on the environment variable to configure the hot upgrade feature. Add parser changes to support custom VxLAN: This patch writes UPAR1 tunnel header type to the computational field at index VXLAN_IP_UPAR_ID. Free custom vxlan tunnel port: The current code invokes ulp_cust_vxlan_free() while detaching a port from the session. This is incorrect since it should be freed only when the session reference count goes to zero. So move this to bnxt_ulp_deinit(). Parse UDP dport 4789 as VxLAN conditionally: Currently, the ULP parser is parsing UDP dport 4789 as VxLAN unconditionally. However for some apps, the requirement may be to consider UDP dport 4789 as non-tunnel. This patch fixes the problem by parsing UDP dport 4789 as non-tunnel when needed. Delete flow context for the port being deleted: Flow manager is running in alarm thread and the main thread is deleting the flow context causing garbage data to request flow count. Delete the ulp context before deleting the flows so that flow manager thread does not dereference invalid ulp context. Validate ulp context while parsing L4 proto type: In ulp_rte_l4_proto_type_update() we try to access bp->ulp_ctx without checking if it is valid. Add error checking and return if ulp_ctx has not been initialized. Otherwise it could crash the application. Fix a crash seen in bnxt_ulp_port_init(), in some conditions: The function bnxt_ulp_init() invokes ulp_ha_mgr_open() which could fail in some conditions. As part of the error processing and cleanup, bnxt_ulp_deinit() is called which frees ulp_ctx->cfg_data. When the control returns back to bnxt_ulp_port_init(), as part of its error handling it invokes ulp_cust_vxlan_free(). There we end up dereferencing ulp_ctx->cfg_data which is already freed. Fix this by updating the code (macro) to check for validity of cfg_data before accessing it. Support 256 vf representors: Extend ULP port database size Reduce Rx WC tcam slices from 6860 to 6572 Convert Rx VF rep default action record type from FULL to Compact Set the correct vxlan or vxlan-gpe header type: Appropriately configure the vxlan or vxlan_gpe header bit when an application supports any customer vxlan port. The initial code erroneously configures both vxlan and vxlan_gpe header bits when adding a vxlan flow with the vxlan_gpe port(4790). Remove endian converting code for port id. Free L2 Etype tunnel for each port stop: Update the point where ulp_l2_etype_tunnel_free() is called in bnxt_ulp_port_deinit(). Signed-off-by: Mike Baucom Signed
[PATCH v5 21/47] net/bnxt: tf_ulp: add action read and clear support
From: Jay Ding
Implement action read and clear support. Change flow
query count to reset the count after read in ULP.
Update cli cmds accordingly.
Fixed bnxt_mpc_xmit() to pad the mpc message to be
multiple of 16 bytes.
Signed-off-by: Jay Ding
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Michael Baucom
Reviewed-by: Farah Smith
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c
b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c
index f1bbce797d..2be37b59c2 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c
@@ -83,6 +83,10 @@ ulp_fc_tfc_flow_stat_get(struct bnxt_ulp_context *ctxt,
cmm_info.rsubtype = CFA_RSUBTYPE_CMM_ACT;
cmm_info.act_handle = handle;
cmm_info.dir = (enum cfa_dir)direction;
+ cmm_clr.clr = true;
+ cmm_clr.offset_in_byte = 0;
+ cmm_clr.sz_in_byte = sizeof(data64[ULP_FC_TFC_PKT_CNT_OFFS]) +
+sizeof(data64[ULP_FC_TFC_BYTE_CNT_OFFS]);
rc = tfc_act_get(tfcp, NULL, &cmm_info, &cmm_clr, data, &word_size);
if (rc) {
BNXT_DRV_DBG(ERR,
--
2.39.3
Re: [PATCH RESEND] malloc: fix allocation for a specific case with ASan
Recheck-request: iol-unit-amd64-testing
[PATCH v5 41/47] net/bnxt: tf_ulp: support a few generic template items
From: Kishore Padmanabha
This patch provides the following changes.
support generic template items
Add support for jump action, dynamic tunnels and
flow priority to thor2 platform.
fix generic application template
The queue action is enabled for Thor2 platform.
Enabled rejection check for every action template.
Fixed dynamic vxlan ip tunnel configuration.
fix vxlan ip customer tunnel
The upar id is not populated correctly to set the
tunnel id in the tcam table.
fix compiler warnings
This change fixes several compiler warnings.
Signed-off-by: Kishore Padmanabha
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 9 +
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 11 +++
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 12
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
index 3d48f42c1b..d30339393e 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
@@ -536,6 +536,15 @@ ulp_tfc_cntxt_app_caps_init(struct bnxt *bp, uint8_t
app_id, uint32_t dev_id)
}
}
ulp_ctx->cfg_data->feature_bits = info[i].feature_bits;
+ bnxt_ulp_default_app_priority_set(ulp_ctx,
+ info[i].default_priority);
+ bnxt_ulp_max_def_priority_set(ulp_ctx,
+ info[i].max_def_priority);
+ bnxt_ulp_min_flow_priority_set(ulp_ctx,
+ info[i].min_flow_priority);
+ bnxt_ulp_max_flow_priority_set(ulp_ctx,
+ info[i].max_flow_priority);
+
bnxt_ulp_cntxt_ptr2_default_class_bits_set(ulp_ctx,
info[i].default_class_bits);
bnxt_ulp_cntxt_ptr2_default_act_bits_set(ulp_ctx,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index f0d715d369..5dfe72df17 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -872,7 +872,7 @@ ulp_mapper_field_src_process(struct bnxt_ulp_mapper_parms
*parms,
struct bnxt_ulp_mapper_data *m;
uint8_t bit;
uint32_t port_id, val_size, field_size;
- uint16_t idx, size_idx, offset;
+ uint16_t idx = 0, size_idx = 0, offset = 0;
uint32_t bytelen = ULP_BITS_2_BYTE(bitlen);
uint8_t *buffer;
uint64_t lregval;
@@ -1291,7 +1291,7 @@ ulp_mapper_field_opc_next(struct bnxt_ulp_mapper_parms
*parms,
const char *name)
{
struct bnxt_ulp_mapper_field_info *field_info;
- uint16_t idx;
+ uint16_t idx = 0;
/* read the cond table index and count */
if (unlikely(ulp_operand_read(field_opr,
@@ -1594,7 +1594,7 @@ ulp_mapper_key_recipe_field_opc_next(struct
bnxt_ulp_mapper_parms *parms,
struct bnxt_ulp_mapper_field_info *ofld)
{
struct bnxt_ulp_mapper_field_info *field_info;
- uint16_t idx;
+ uint16_t idx = 0;
/* read the cond table index and count */
if (unlikely(ulp_operand_read(field_opr,
@@ -3777,11 +3777,6 @@ ulp_mapper_cond_reject_list_process(struct
bnxt_ulp_mapper_parms *parms,
/* set the rejection result to accept */
*res = 0;
- /* If act rej cond is not enabled then skip reject cond processing */
- if (parms->tmpl_type == BNXT_ULP_TEMPLATE_TYPE_ACTION &&
- !ULP_COMP_FLD_IDX_RD(parms, BNXT_ULP_CF_IDX_ACT_REJ_COND_EN))
- return rc;
-
/* get the reject condition list */
reject_info = ulp_mapper_tmpl_reject_list_get(parms, tid);
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index 72d3514647..dbd8a118df 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -1298,6 +1298,7 @@ ulp_rte_l4_proto_type_update(struct ulp_rte_parser_params
*params,
enum bnxt_ulp_hdr_bit hdr_bit)
{
uint16_t stat_port = 0;
+ struct bnxt *bp;
switch (hdr_bit) {
case BNXT_ULP_HDR_BIT_I_UDP:
@@ -1364,10 +1365,21 @@ ulp_rte_l4_proto_type_update(struct
ulp_rte_parser_params *params,
/* if udp and equal to static vxlan port then set tunnel bits*/
if (stat_port && dst_port == tfp_cpu_to_be_16(stat_port)) {
+ bp = bnxt_pmd_get_bp(params->port_id);
+ if (bp == NULL) {
+ BNXT_DRV_DBG(ERR, "Invalid bp\n");
+ return;
+ }
[PATCH v5 29/47] net/bnxt: tf_ulp: update template files
From: Kishore Padmanabha
This patch updates template files for the following list
of changes, that are being added in the next patch.
dynamic support for VF representor mode (template files only)
The configurable VF representor mode is removed and it is
dynamic. The action record is not populated for packets
transmitted to network, only packets being sent to VF rep
are sent with action records in the mbuf.
Thor2 priority for l2 tcam records not adhered to
Signed-off-by: Kishore Padmanabha
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
.../generic_templates/ulp_template_db_enum.h |8 +-
.../ulp_template_db_thor2_class.c | 28 +-
.../ulp_template_db_thor_class.c | 1748 +++--
3 files changed, 1116 insertions(+), 668 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
index ddd65a62b1..21972cc4ea 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
@@ -31,12 +31,12 @@
#define ULP_WH_PLUS_CLASS_COND_LIST_SIZE 50
#define ULP_WH_PLUS_CLASS_COND_OPER_LIST_SIZE 0
#define ULP_THOR_CLASS_TMPL_LIST_SIZE 5
-#define ULP_THOR_CLASS_TBL_LIST_SIZE 126
-#define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 605
+#define ULP_THOR_CLASS_TBL_LIST_SIZE 120
+#define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 646
#define ULP_THOR_CLASS_KEY_EXT_LIST_SIZE 615
#define ULP_THOR_CLASS_IDENT_LIST_SIZE 43
-#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 1252
-#define ULP_THOR_CLASS_COND_LIST_SIZE 3077
+#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 1253
+#define ULP_THOR_CLASS_COND_LIST_SIZE 3075
#define ULP_THOR_CLASS_COND_OPER_LIST_SIZE 7
#define ULP_THOR2_CLASS_TMPL_LIST_SIZE 5
#define ULP_THOR2_CLASS_TBL_LIST_SIZE 125
diff --git
a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor2_class.c
b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor2_class.c
index 99c56fea0c..bef9e7571c 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor2_class.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor2_class.c
@@ -290,8 +290,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor2_class_tbl_list[]
= {
.key_recipe_opcode = BNXT_ULP_KEY_RECIPE_OPC_NOP,
.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
.fdb_operand = BNXT_ULP_RF_IDX_RID,
- .pri_opcode = BNXT_ULP_PRI_OPC_APP_PRI_OR_CONST,
- .pri_operand = ULP_THOR2_SYM_L2_CTXT_PRI_APP,
+ .pri_opcode = BNXT_ULP_PRI_OPC_CONST,
+ .pri_operand = 140,
.ident_start_idx = 10,
.ident_nums = 1
},
@@ -310,8 +310,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor2_class_tbl_list[]
= {
.key_recipe_opcode = BNXT_ULP_KEY_RECIPE_OPC_NOP,
.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
.fdb_operand = BNXT_ULP_RF_IDX_RID,
- .pri_opcode = BNXT_ULP_PRI_OPC_APP_PRI_OR_CONST,
- .pri_operand = ULP_THOR2_SYM_L2_CTXT_PRI_APP,
+ .pri_opcode = BNXT_ULP_PRI_OPC_CONST,
+ .pri_operand = 140,
.key_start_idx = 15,
.blob_key_bit_size = 256,
.key_bit_size = 256,
@@ -17602,7 +17602,9 @@ struct bnxt_ulp_mapper_key_info
ulp_thor2_class_key_info_list[] = {
.description = "loopback",
.field_bit_size = 1,
.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
- .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+ .field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+ .field_opr1 = {
+ 0xff}
},
.field_info_spec = {
.description = "loopback",
@@ -30502,17 +30504,13 @@ struct bnxt_ulp_mapper_key_info
ulp_thor2_class_key_info_list[] = {
.description = "tun_hdr_type",
.field_bit_size = 5,
.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
- .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
- .field_opr1 = {
- ULP_THOR2_SYM_TUN_HDR_TYPE_NONE}
+ .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
},
.field_info_spec = {
.description = "tun_hdr_type",
.field_bit_size = 5,
.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
- .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
- .field_opr1 = {
- ULP_THOR2_SYM_TUN_HDR_TYPE_NONE}
+ .field_src1 = BNXT_ULP_FIELD_SRC_ZERO
}
},
{
@@ -30520,17 +30518,13 @@ struct bnxt_ulp_mapper_key_info
ulp_thor2_class_key_info_list[] = {
.description = "out_tun_hdr_type",
.field_bit_size = 5,
.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
- .field_src1 = BNXT_ULP_FIELD_SRC_CONST,
- .field_opr1 = {
- ULP_THOR2_SYM_TU
Re: [PATCH v1 2/2] baseband/acc: saturate input to 6 bits for VRB decoder
On 10/15/24 00:30, Nicolas Chautru wrote: Making the decoder more robust by forcing a default 6 bits LLR saturation to LDPC Decoder input. Signed-off-by: Nicolas Chautru --- drivers/baseband/acc/rte_vrb_pmd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c index 5eb3e8dd48..eb9892ff31 100644 --- a/drivers/baseband/acc/rte_vrb_pmd.c +++ b/drivers/baseband/acc/rte_vrb_pmd.c @@ -1799,6 +1799,9 @@ vrb_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc_fcw_ld *fcw, fcw->hcout_offset = 0; } + /* Force saturation to 6 bits LLR. */ + fcw->saturate_input = 1; + fcw->tb_crc_select = 0; if (check_bit(op->ldpc_dec.op_flags, RTE_BBDEV_LDPC_CRC_TYPE_24A_CHECK)) fcw->tb_crc_select = 2; Reviewed-by: Maxime Coquelin Thanks, Maxime
Re: [PATCH v4] mem: allow using ASan in multi-process mode
Recheck-request: iol-unit-amd64-testing
Re: [PATCH] net: improve vlan header type alignment
13/10/2024 10:35, Morten Brørup: > Ethernet packets can be VLAN tagged, i.e. an Ethernet header can have a > VLAN tag (a.k.a. VLAN header) embedded. > Since the Ethernet header is 2 byte aligned, and the VLAN tag is directly > related to the Ethernet header, the VLAN tag is also 2 byte aligned, so > packing the VLAN tag structure is not necessary. > > Furthermore, the Ethernet header type is implictly 2 byte aligned, so > removed the superfluous explicit 2 byte alignment. > > Added static_asserts to verify the size and alignment of the various > Ethernet types. > > Signed-off-by: Morten Brørup Applied, thanks.
[PATCH dpdk v4 12/17] security: use IPv6 address structure
For consistency with the rest of the code base, update
rte_security_ipsec_tunnel_param to use rte_ipv6_addr structures instead
of in6_addr.
Signed-off-by: Robin Jarry
---
doc/guides/rel_notes/release_24_11.rst | 2 ++
drivers/common/cnxk/cnxk_security.c| 14 ++
drivers/net/iavf/iavf_ipsec_crypto.c | 3 +--
drivers/net/nfp/nfp_ipsec.c| 4 ++--
examples/ipsec-secgw/ipsec.c | 12 ++--
lib/pipeline/rte_swx_ipsec.c | 8 ++--
lib/security/rte_security.h| 5 +++--
7 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index ca8b9441d430..05212a4cc2b3 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -312,6 +312,8 @@ API Changes
- ``struct rte_swx_ipsec_sa_encap_params``
- ``struct rte_table_action_ipv6_header``
- ``struct rte_table_action_nat_params``
+ security
+- ``struct rte_security_ipsec_tunnel_param``
table
- ``struct rte_table_lpm_ipv6_key``
rib
diff --git a/drivers/common/cnxk/cnxk_security.c
b/drivers/common/cnxk/cnxk_security.c
index e67c3f233187..c2871ad2bda5 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -271,9 +271,9 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa,
case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;
memcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.src_addr));
memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.dst_addr));
/* IP Source and Dest are in LE/CPU endian */
ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.src_addr);
@@ -472,9 +472,9 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;
memcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.src_addr));
memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
- sizeof(struct in6_addr));
+ sizeof(sa->outer_hdr.ipv6.dst_addr));
/* IP Source and Dest are in LE/CPU endian */
ot_ipsec_update_ipv6_addr_endianness((uint64_t
*)&sa->outer_hdr.ipv6.src_addr);
@@ -1087,10 +1087,8 @@ cnxk_on_ipsec_outb_sa_create(struct
rte_security_ipsec_xform *ipsec,
ip6->hop_limits = ipsec->tunnel.ipv6.hlimit ?
ipsec->tunnel.ipv6.hlimit :
0x40;
- memcpy(&ip6->src_addr, &ipsec->tunnel.ipv6.src_addr,
- sizeof(struct in6_addr));
- memcpy(&ip6->dst_addr, &ipsec->tunnel.ipv6.dst_addr,
- sizeof(struct in6_addr));
+ ip6->src_addr = ipsec->tunnel.ipv6.src_addr;
+ ip6->dst_addr = ipsec->tunnel.ipv6.dst_addr;
}
} else
ctx_len += sizeof(template->ip4);
diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c
b/drivers/net/iavf/iavf_ipsec_crypto.c
index 89dd5af5500f..90421a66c309 100644
--- a/drivers/net/iavf/iavf_ipsec_crypto.c
+++ b/drivers/net/iavf/iavf_ipsec_crypto.c
@@ -510,8 +510,7 @@ iavf_ipsec_crypto_security_association_add(struct
iavf_adapter *adapter,
*((uint32_t *)sa_cfg->dst_addr) =
htonl(conf->ipsec.tunnel.ipv4.dst_ip.s_addr);
} else {
- uint32_t *v6_dst_addr =
- (uint32_t *)conf->ipsec.tunnel.ipv6.dst_addr.s6_addr;
+ uint32_t *v6_dst_addr = (uint32_t
*)&conf->ipsec.tunnel.ipv6.dst_addr;
sa_cfg->virtchnl_ip_type = VIRTCHNL_IPV6;
diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c
index 89116af1b22f..13f2b850e59d 100644
--- a/drivers/net/nfp/nfp_ipsec.c
+++ b/drivers/net/nfp/nfp_ipsec.c
@@ -1042,8 +1042,8 @@ nfp_ipsec_msg_build(struct rte_eth_dev *eth_dev,
cfg->dst_ip[0] = rte_be_to_cpu_32(dst_ip[0]);
cfg->ipv6 = 0;
} else if (type == RTE_SECURITY_IPSEC_TUNNEL_IPV6) {
- src_ip = (rte_be32_t
*)conf->ipsec.tunnel.ipv6.src_addr.s6_addr;
- dst_ip = (rte_be32_t
*)conf->ipsec.tunnel.ipv6.dst_addr.s6_addr;
+ src_ip = (rte_be32_t
*)&conf->ipsec.tunnel.ipv6.src_addr;
+ dst_ip = (
Re: [PATCH v4] hash: separate creation parameters checks
>17/10/2024 17:10, Thomas Monjalon: >> From: Niall Meade >> >> Separate name, entries and key_len parameter checks in rte_hash_create(). >> Also make the error messages more informative/verbose >> to help with debugging. >> >> Signed-off-by: Niall Meade >> Acked-by: Stephen Hemminger >> --- >> v4: formatting details >> sent for triggering a new CI run > >The community CI lab is not in a good shape today >but I take the risk applying this patch. Thanks Thomas
[PATCH v5 06/47] net/bnxt: tf_core: TF support flow scale query
From: Shuanglin Wang
TF supports the flow scale query feature for OVS application.
The resource usage is tracked when opening a TF session
or adding/deleting a flow. The resources includes WC TCAM,
EM, Action, Counter, Meter, ACT_ENCAP, ACT_ENCAP, and SP_SMAC.
User can query the resource usage using niccli.
Several improvements on flow scale query feature:
1. Some default rules require both RX and TX resources;
need to update usage states on both direcitons.
2. Update resoure usage state for regular flows only.
3. Added a buffer dirty state to avoid unnecessary
state sync with firmware.
This feature is disabled by default. Using the build flag
-DTF_FLOW_SCALE_QUERY to enable it.
Signed-off-by: Shuanglin Wang
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
Signed-off-by: Sriharsha Basavapatna
---
drivers/net/bnxt/hsi_struct_def_dpdk.h| 342 --
drivers/net/bnxt/tf_core/cfa_tcam_mgr.c | 57 +-
.../net/bnxt/tf_core/cfa_tcam_mgr_device.h| 9 +
.../net/bnxt/tf_core/cfa_tcam_mgr_session.c | 13 +
.../net/bnxt/tf_core/cfa_tcam_mgr_session.h | 3 +
drivers/net/bnxt/tf_core/meson.build | 1 +
drivers/net/bnxt/tf_core/tf_core.c| 150 +
drivers/net/bnxt/tf_core/tf_core.h| 52 ++
drivers/net/bnxt/tf_core/tf_device.h | 65 ++
drivers/net/bnxt/tf_core/tf_device_p4.c | 10 +
drivers/net/bnxt/tf_core/tf_device_p58.c | 105 +++
.../net/bnxt/tf_core/tf_em_hash_internal.c| 28 +-
drivers/net/bnxt/tf_core/tf_em_internal.c | 7 +
drivers/net/bnxt/tf_core/tf_msg.c | 175 +
drivers/net/bnxt/tf_core/tf_msg.h | 57 ++
drivers/net/bnxt/tf_core/tf_resources.c | 608 ++
drivers/net/bnxt/tf_core/tf_resources.h | 129
drivers/net/bnxt/tf_core/tf_rm.c | 39 +-
drivers/net/bnxt/tf_core/tf_session.c | 10 +
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 16 +
20 files changed, 1806 insertions(+), 70 deletions(-)
create mode 100644 drivers/net/bnxt/tf_core/tf_resources.c
diff --git a/drivers/net/bnxt/hsi_struct_def_dpdk.h
b/drivers/net/bnxt/hsi_struct_def_dpdk.h
index 9beacd94aa..cec4b59d1a 100644
--- a/drivers/net/bnxt/hsi_struct_def_dpdk.h
+++ b/drivers/net/bnxt/hsi_struct_def_dpdk.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (c) 2014-2023 Broadcom Inc.
+ * Copyright (c) 2014-2024 Broadcom Inc.
* All rights reserved.
*
* DO NOT MODIFY!!! This file is automatically generated.
@@ -836,6 +836,10 @@ struct cmd_nums {
#define HWRM_TF_IF_TBL_SETUINT32_C(0x2fe)
/* Experimental */
#define HWRM_TF_IF_TBL_GETUINT32_C(0x2ff)
+ /* Experimental */
+ #define HWRM_TF_RESC_USAGE_SETUINT32_C(0x300)
+ /* Experimental */
+ #define HWRM_TF_RESC_USAGE_QUERY UINT32_C(0x301)
/* TruFlow command to check firmware table scope capabilities. */
#define HWRM_TFC_TBL_SCOPE_QCAPS UINT32_C(0x380)
/* TruFlow command to allocate a table scope ID and create the pools. */
@@ -14960,32 +14964,18 @@ struct hwrm_func_qcaps_output {
uint16_txid_partition_cap;
/*
* When this bit is '1', it indicates that FW is capable of
-* supporting partition based XID management for KTLS TX
+* supporting partition based XID management for Tx crypto
* key contexts.
*/
- #define HWRM_FUNC_QCAPS_OUTPUT_XID_PARTITION_CAP_KTLS_TKC \
+ #define HWRM_FUNC_QCAPS_OUTPUT_XID_PARTITION_CAP_TX_CK \
UINT32_C(0x1)
/*
* When this bit is '1', it indicates that FW is capable of
-* supporting partition based XID management for KTLS RX
+* supporting partition based XID management for Rx crypto
* key contexts.
*/
- #define HWRM_FUNC_QCAPS_OUTPUT_XID_PARTITION_CAP_KTLS_RKC \
+ #define HWRM_FUNC_QCAPS_OUTPUT_XID_PARTITION_CAP_RX_CK \
UINT32_C(0x2)
- /*
-* When this bit is '1', it indicates that FW is capable of
-* supporting partition based XID management for QUIC TX
-* key contexts.
-*/
- #define HWRM_FUNC_QCAPS_OUTPUT_XID_PARTITION_CAP_QUIC_TKC \
- UINT32_C(0x4)
- /*
-* When this bit is '1', it indicates that FW is capable of
-* supporting partition based XID management for QUIC RX
-* key contexts.
-*/
- #define HWRM_FUNC_QCAPS_OUTPUT_XID_PARTITION_CAP_QUIC_RKC \
- UINT32_C(0x8)
/*
* This value uniquely identifies the hardware NIC used by the
* function. The value returned will be the same for all functions.
@@ -15804,8 +15794,21 @@ struct hwrm_func_qcfg_output {
* initialize_fw.
*/
uint32_troce_max_gid_per_vf;
- /* Bitmap of context typ
