RE: [EXTERNAL] Re: [PATCH v6 0/2] devtools: add tracepoint check in checkpatch
>On Wed, 9 Oct 2024 06:03:58 + >Ankur Dwivedi wrote: > >> >> Please let me know if this patch series can be merged in DPDK or if >> >> there are >> >any comments. >> > >> >Not sure why the patch got ignored. >> >Perhaps if check-tracepoint was run first against existing code; add >> >to check- patch later. >> >> check-tracepoint reads a patch and checks if a newly added function in a >library has the trace in it or not. >> For existing code trace can be added manually. Trace was added for existing >functions in 23.03 release. >> > >> >And the skip list is empty, is that right? >> Yes. >> If trace is not required for a new library function, the function name can be >added in skiplist. >> The checkpatch will ignore trace check for that function. >> > is all of existing cryptodev ethdev ... ok now? >> >> No, it's not completely ok. Few functions does not have trace added. >Majority have trace added. > > >I wonder if a coccinelle script might be better for this. Not sure if newly added functions can be detected in coccinelle script. In this patch the already existing build_map_changes shell function was detecting this. >Rather than adding more checks to already annoying checkpatch.
RE: [PATCH v3 0/4] Enhance headers check
For the series, Acked-by: Morten Brørup
Re: [PATCH v1 1/2] baseband/acc: FFT support in VRB2 PRQ device
Hi,
On 10/18/24 20:42, Chautru, Nicolas wrote:
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 {
VRB2_VfHiInfoRingIntWrEnVf = 0x0020,
VRB2_VfHiInfoRingPf2VfWrEnVf = 0x0024,
VRB2_VfHiMsixVectorMapperVf = 0x0060,
-
RE: [PATCH v1] config/x86: add lcore support for AMD EPYC Zen5 platforms
Acked-by: Morten Brørup
Re: [PATCH v3 0/4] updates for net/ice driver
On Fri, Oct 18, 2024 at 03:38:18PM +0100, Bruce Richardson wrote: > 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. > Recheck-request: rebase=main,iol-compile-amd64-testing,iol-compile-arm64-testing
[PATCH v3 1/4] bitset: fix build for GCC without experimental API
For a reason similar to the change on bitops header, hide bitset
implementation relying on experimental API.
Fixes: 99a1197647d8 ("eal: add bitset type")
Signed-off-by: David Marchand
---
Changes since v2:
- added a runtime assert so that an application won't call those
experimental APIs,
---
lib/eal/include/rte_bitset.h | 132 +++
1 file changed, 132 insertions(+)
diff --git a/lib/eal/include/rte_bitset.h b/lib/eal/include/rte_bitset.h
index 27b7a2e34d..116121eec4 100644
--- a/lib/eal/include/rte_bitset.h
+++ b/lib/eal/include/rte_bitset.h
@@ -255,7 +255,13 @@ __rte_experimental
static inline bool
rte_bitset_test(const uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __RTE_BITSET_DELEGATE(rte_bit_test, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -277,7 +283,13 @@ __rte_experimental
static inline void
rte_bitset_set(uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE(rte_bit_set, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -299,7 +311,13 @@ __rte_experimental
static inline void
rte_bitset_clear(uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE(rte_bit_clear, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -323,7 +341,14 @@ __rte_experimental
static inline void
rte_bitset_assign(uint64_t *bitset, size_t bit_num, bool bit_value)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_assign, bitset, bit_num, bit_value);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(bit_value);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -345,7 +370,13 @@ __rte_experimental
static inline void
rte_bitset_flip(uint64_t *bitset, size_t bit_num)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE(rte_bit_flip, bitset, bit_num);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -370,7 +401,14 @@ __rte_experimental
static inline bool
rte_bitset_atomic_test(const uint64_t *bitset, size_t bit_num, int
memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return __RTE_BITSET_DELEGATE_N(rte_bit_atomic_test, bitset, bit_num,
memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -399,7 +437,14 @@ __rte_experimental
static inline void
rte_bitset_atomic_set(uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_set, bitset, bit_num,
memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -428,7 +473,14 @@ __rte_experimental
static inline void
rte_bitset_atomic_clear(uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_clear, bitset, bit_num,
memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -459,7 +511,15 @@ __rte_experimental
static inline void
rte_bitset_atomic_assign(uint64_t *bitset, size_t bit_num, bool bit_value, int
memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_assign, bitset, bit_num,
bit_value, memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(bit_value);
+ RTE_SET_USED(memory_order);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -488,7 +548,14 @@ __rte_experimental
static inline void
rte_bitset_atomic_flip(uint64_t *bitset, size_t bit_num, int memory_order)
{
+#ifdef ALLOW_EXPERIMENTAL_API
__RTE_BITSET_DELEGATE_N(rte_bit_atomic_flip, bitset, bit_num,
memory_order);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(bit_num);
+ RTE_SET_USED(memory_order);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -524,7 +591,13 @@ __rte_experimental
static inline void
rte_bitset_clear_all(uint64_t *bitset, size_t size)
{
+#ifdef ALLOW_EXPERIMENTAL_API
rte_bitset_init(bitset, size);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_VERIFY(false);
+#endif
}
/**
@@ -576,7 +649,13 @@ __rte_experimental
static inline size_t
rte_bitset_count_clear(const uint64_t *bitset, size_t size)
{
+#ifdef ALLOW_EXPERIMENTAL_API
return size - rte_bitset_count_set(bitset, size);
+#else
+ RTE_SET_USED(bitset);
+ RTE_SET_USED(size);
+ RTE_VERIFY(false);
+#endif
}
#define __RT
[PATCH v3 4/4] buildtools/chkincs: check driver specific headers
Only driver headers exported by libraries were checked.
Add driver specific headers to the checked headers list.
This reveals a small issue with the vmbus driver header as some driver
headers rely on it.
Fixes: b232b2aa212b ("buildtools/chkincs: check SDK headers for C++
compatibility")
Fixes: 84aaf06d817c ("bus/vmbus: make driver-only headers private")
Signed-off-by: David Marchand
---
buildtools/chkincs/meson.build | 3 +++
drivers/meson.build| 1 +
2 files changed, 4 insertions(+)
diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index 787d70272b..ed65105599 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -19,6 +19,9 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
# some driver SDK headers depend on these two buses, which are mandatory in
build
# so we always include them in deps list
deps = [get_variable('shared_rte_bus_vdev'),
get_variable('shared_rte_bus_pci')]
+if dpdk_conf.has('RTE_BUS_VMBUS')
+deps += get_variable('shared_rte_bus_vmbus')
+endif
# add the rest of the libs to the dependencies
foreach l:dpdk_libs_enabled
deps += get_variable('shared_rte_' + l)
diff --git a/drivers/meson.build b/drivers/meson.build
index 2733306698..5270160c56 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -220,6 +220,7 @@ foreach subpath:subdirs
if get_option('enable_driver_sdk')
install_headers(driver_sdk_headers)
endif
+dpdk_chkinc_headers += driver_sdk_headers
if headers.length() > 0
dpdk_includes += include_directories(drv_path)
--
2.46.2
[PATCH v3 0/4] Enhance headers check
We currently check that exported headers are fine with -DALLOW_EXPERIMENTAL_API and -DALLOW_INTERNAL_API. Such a check won't catch issues when build is broken in the absence of those flags, which is the common case for applications consuming DPDK. This series adds more coverage. -- David Marchand Changes since v2: - rebased on rc1, - added check when calling rte_bitset without ALLOW_EXPERIMENTAL_API, - added checks (and fixes) on driver specific headers, David Marchand (4): bitset: fix build for GCC without experimental API buildtools/chkincs: check headers with stable API only bus/ifpga: use C linkage where appropriate in driver header buildtools/chkincs: check driver specific headers buildtools/chkincs/meson.build | 30 +- drivers/bus/ifpga/bus_ifpga_driver.h | 8 +- drivers/meson.build | 1 + lib/eal/include/rte_bitset.h | 132 +++ 4 files changed, 165 insertions(+), 6 deletions(-) -- 2.46.2
[PATCH v3 2/4] buildtools/chkincs: check headers with stable API only
An exported header should be usable w/ and w/o ALLOW_EXPERIMENTAL_API so
that an application that only wants stable API may include it.
Plus, the widely common case is that an application will not use
internal API.
Cover those cases but keep the original test.
Signed-off-by: David Marchand
---
buildtools/chkincs/meson.build | 27 +--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index 8da221fc33..787d70272b 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -12,8 +12,6 @@ gen_c_files = generator(gen_c_file_for_header,
arguments: ['@INPUT@', '@OUTPUT@'])
cflags = machine_args
-cflags += '-DALLOW_EXPERIMENTAL_API'
-cflags += '-DALLOW_INTERNAL_API'
sources = files('main.c')
sources += gen_c_files.process(dpdk_chkinc_headers)
@@ -32,6 +30,18 @@ executable('chkincs', sources,
dependencies: deps,
install: false)
+executable('chkincs-exp', sources,
+c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
+include_directories: includes,
+dependencies: deps,
+install: false)
+
+executable('chkincs-all', sources,
+c_args: [cflags, '-DALLOW_EXPERIMENTAL_API', '-DALLOW_INTERNAL_API'],
+include_directories: includes,
+dependencies: deps,
+install: false)
+
# run tests for c++ builds also
if not add_languages('cpp', required: false)
subdir_done()
@@ -49,3 +59,16 @@ executable('chkincs-cpp', cpp_sources,
include_directories: includes,
dependencies: deps,
install: false)
+
+executable('chkincs-cpp-exp', cpp_sources,
+cpp_args: ['-include', 'rte_config.h', cflags,
'-DALLOW_EXPERIMENTAL_API'],
+include_directories: includes,
+dependencies: deps,
+install: false)
+
+executable('chkincs-cpp-all', cpp_sources,
+cpp_args: ['-include', 'rte_config.h', cflags,
'-DALLOW_EXPERIMENTAL_API',
+ '-DALLOW_INTERNAL_API'],
+include_directories: includes,
+dependencies: deps,
+install: false)
--
2.46.2
[PATCH v3 3/4] bus/ifpga: use C linkage where appropriate in driver header
This driver was missed when cleaning up most of the headers.
Fixes: 719834a6849e ("use C linkage where appropriate in headers")
Signed-off-by: David Marchand
---
drivers/bus/ifpga/bus_ifpga_driver.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/bus/ifpga/bus_ifpga_driver.h
b/drivers/bus/ifpga/bus_ifpga_driver.h
index 5bbe36d6e0..a42afc7d75 100644
--- a/drivers/bus/ifpga/bus_ifpga_driver.h
+++ b/drivers/bus/ifpga/bus_ifpga_driver.h
@@ -11,16 +11,16 @@
* RTE Intel FPGA Bus Interface
*/
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include
#include
#include
#include
#include
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
#define IFPGA_BUS_NAME ifpga
/* Forward declarations */
--
2.46.2
Re: [PATCH v3 2/4] buildtools/chkincs: check headers with stable API only
On Mon, Oct 21, 2024 at 06:04:45PM +0200, David Marchand wrote: > An exported header should be usable w/ and w/o ALLOW_EXPERIMENTAL_API so > that an application that only wants stable API may include it. > > Plus, the widely common case is that an application will not use > internal API. > > Cover those cases but keep the original test. > > Signed-off-by: David Marchand > --- Acked-by: Bruce Richardson
[PATCH v6 0/7] Stage-Ordered API and other extensions for ring library
From: Konstantin Ananyev
NOTE UPFRONT: this version is still not ready for merging.
Missing items:
- ARM/PPC tests passing
- PG update
v5 -> v6
- fix problem with ring_stress_autotest (Phanendra)
- added more checks and debug output
v4 -> v5
- fix public API/doc comments from Jerin
- update devtools/build-dict.sh (Stephen)
- fix MSVC warnings
- introduce new test-suite for meson (stress) with
ring_stress_autotest and soring_stress_autotest in it
- enhance error report in tests
- reorder some sync code in soring and add extra checks
(for better debuggability)
v3 -> v4:
- fix compilation/doxygen complains (attempt #2)
- updated release notes
v2 -> v3:
- fix compilation/doxygen complains
- dropped patch:
"examples/l3fwd: make ACL work in pipeline and eventdev modes": [2]
As was mentioned in the patch desctiption it was way too big,
controversial and incomplete. If the community is ok to introduce
pipeline model into the l3fwd, then it is propbably worth to be
a separate patch series.
v1 -> v2:
- rename 'elmst/objst' to 'meta' (Morten)
- introduce new data-path APIs set: one with both meta{} and objs[],
second with just objs[] (Morten)
- split data-path APIs into burst/bulk flavours (same as rte_ring)
- added dump function for te_soring and improved dump() for rte_ring.
- dropped patch:
" ring: minimize reads of the counterpart cache-line"
- no performance gain observed
- actually it does change behavior of conventional rte_ring
enqueue/dequeue APIs -
it could return available/free less then actually exist in the ring.
As in some other libs we reliy on that information - it will
introduce problems.
The main aim of these series is to extend ring library with
new API that allows user to create/use Staged-Ordered-Ring (SORING)
abstraction. In addition to that there are few other patches that serve
different purposes:
- first two patches are just code reordering to de-duplicate
and generalize existing rte_ring code.
- patch #3 extends rte_ring_dump() to correctly print head/tail metadata
for different sync modes.
- next two patches introduce SORING API into the ring library and
provide UT for it.
SORING overview
===
Staged-Ordered-Ring (SORING) provides a SW abstraction for 'ordered' queues
with multiple processing 'stages'. It is based on conventional DPDK
rte_ring, re-uses many of its concepts, and even substantial part of
its code.
It can be viewed as an 'extension' of rte_ring functionality.
In particular, main SORING properties:
- circular ring buffer with fixed size objects
- producer, consumer plus multiple processing stages in between.
- allows to split objects processing into multiple stages.
- objects remain in the same ring while moving from one stage to the other,
initial order is preserved, no extra copying needed.
- preserves the ingress order of objects within the queue across multiple
stages
- each stage (and producer/consumer) can be served by single and/or
multiple threads.
- number of stages, size and number of objects in the ring are
configurable at ring initialization time.
Data-path API provides four main operations:
- enqueue/dequeue works in the same manner as for conventional rte_ring,
all rte_ring synchronization types are supported.
- acquire/release - for each stage there is an acquire (start) and
release (finish) operation. After some objects are 'acquired' -
given thread can safely assume that it has exclusive ownership of
these objects till it will invoke 'release' for them.
After 'release', objects can be 'acquired' by next stage and/or dequeued
by the consumer (in case of last stage).
Expected use-case: applications that uses pipeline model
(probably with multiple stages) for packet processing, when preserving
incoming packet order is important.
The concept of ‘ring with stages’ is similar to DPDK OPDL eventdev PMD [1],
but the internals are different.
In particular, SORING maintains internal array of 'states' for each element
in the ring that is shared by all threads/processes that access the ring.
That allows 'release' to avoid excessive waits on the tail value and helps
to improve performancei and scalability.
In terms of performance, with our measurements rte_soring and
conventional rte_ring provide nearly identical numbers.
As an example, on our SUT: Intel ICX CPU @ 2.00GHz,
l3fwd (--lookup=acl) in pipeline mode [2] both
rte_ring and rte_soring reach ~20Mpps for single I/O lcore and same
number of worker lcores.
[1]
https://www.dpdk.org/wp-content/uploads/sites/35/2018/06/DPDK-China2017-Ma-OPDL.pdf
[2]
https://patchwork.dpdk.org/project/dpdk/patch/20240906131348.804-7-konstantin.v.anan...@yandex.ru/
Eimear Morrissey (1):
ring: make dump function more verbose
Konstantin Ananyev (6):
test/ring: fix failure with custom number of lcores
ring: common functions for 'move head' ops
ring: make copying functions generic
ring/soring: introduce Staged Ordered Ring
app/test: add unit
[PATCH v6 5/7] ring/soring: introduce Staged Ordered Ring
From: Konstantin Ananyev
Staged-Ordered-Ring (SORING) provides a SW abstraction for 'ordered' queues
with multiple processing 'stages'.
It is based on conventional DPDK rte_ring, re-uses many of its concepts,
and even substantial part of its code.
It can be viewed as an 'extension' of rte_ring functionality.
In particular, main SORING properties:
- circular ring buffer with fixed size objects
- producer, consumer plus multiple processing stages in the middle.
- allows to split objects processing into multiple stages.
- objects remain in the same ring while moving from one stage to the other,
initial order is preserved, no extra copying needed.
- preserves the ingress order of objects within the queue across multiple
stages, i.e.:
at the same stage multiple threads can process objects from the ring in
any order, but for the next stage objects will always appear in the
original order.
- each stage (and producer/consumer) can be served by single and/or
multiple threads.
- number of stages, size and number of objects in the ring are
configurable at ring initialization time.
Data-path API provides four main operations:
- enqueue/dequeue works in the same manner as for conventional rte_ring,
all rte_ring synchronization types are supported.
- acquire/release - for each stage there is an acquire (start) and
release (finish) operation.
after some objects are 'acquired' - given thread can safely assume that
it has exclusive possession of these objects till 'release' for them is
invoked.
Note that right now user has to release exactly the same number of
objects that was acquired before.
After 'release', objects can be 'acquired' by next stage and/or dequeued
by the consumer (in case of last stage).
Expected use-case: applications that uses pipeline model
(probably with multiple stages) for packet processing, when preserving
incoming packet order is important. I.E.: IPsec processing, etc.
Signed-off-by: Eimear Morrissey
Signed-off-by: Konstantin Ananyev
---
devtools/build-dict.sh | 1 +
doc/api/doxy-api-index.md | 1 +
doc/guides/rel_notes/release_24_11.rst | 8 +
lib/ring/meson.build | 4 +-
lib/ring/rte_soring.c | 201 +
lib/ring/rte_soring.h | 555 +++
lib/ring/soring.c | 593 +
lib/ring/soring.h | 127 ++
lib/ring/version.map | 19 +
9 files changed, 1507 insertions(+), 2 deletions(-)
create mode 100644 lib/ring/rte_soring.c
create mode 100644 lib/ring/rte_soring.h
create mode 100644 lib/ring/soring.c
create mode 100644 lib/ring/soring.h
diff --git a/devtools/build-dict.sh b/devtools/build-dict.sh
index a8cac49029..5eb592abfa 100755
--- a/devtools/build-dict.sh
+++ b/devtools/build-dict.sh
@@ -17,6 +17,7 @@ sed '/^..->/d' |
sed '/^uint->/d' |
sed "/^doesn'->/d" |
sed '/^wasn->/d' |
+sed '/^soring->/d' |
# print to stdout
cat
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 266c8b90dc..ac7f3cd010 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -173,6 +173,7 @@ The public API headers are grouped by topics:
[mbuf](@ref rte_mbuf.h),
[mbuf pool ops](@ref rte_mbuf_pool_ops.h),
[ring](@ref rte_ring.h),
+ [soring](@ref rte_soring.h),
[stack](@ref rte_stack.h),
[tailq](@ref rte_tailq.h),
[bitset](@ref rte_bitset.h),
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index fa4822d928..b8684d9f78 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -247,6 +247,14 @@ New Features
Added ability for node to advertise and update multiple xstat counters,
that can be retrieved using ``rte_graph_cluster_stats_get``.
+* **Add Staged-Ordered-Ring (SORING) API to the rte_ring library.**
+
+ New API to the ring library to provide a SW abstraction for
+ 'ordered' queues with multiple processing 'stages'.
+ It is based on conventional DPDK rte_ring, re-uses many of its concepts,
+ and even substantial part of its code.
+ It can be viewed as an 'extension' of rte_ring functionality.
+
Removed Items
-
diff --git a/lib/ring/meson.build b/lib/ring/meson.build
index 7fca958ed7..21f2c12989 100644
--- a/lib/ring/meson.build
+++ b/lib/ring/meson.build
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
-sources = files('rte_ring.c')
-headers = files('rte_ring.h')
+sources = files('rte_ring.c', 'rte_soring.c', 'soring.c')
+headers = files('rte_ring.h', 'rte_soring.h')
# most sub-headers are not for direct inclusion
indirect_headers += files (
'rte_ring_core.h',
diff --git a/lib/ring/rte_soring.c b/lib/ring/rte_soring.c
new file mode 100644
index 00..46378ff845
--- /dev/null
+++ b/lib/ring/rte_soring.c
@@ -0,0 +1,201 @@
+/* SPDX-L
[PATCH v6 3/7] ring: make copying functions generic
From: Konstantin Ananyev
Note upfront: that change doesn't introduce any functional
or performance changes.
It is just a code-reordering for:
- improve code modularity and re-usability
- ability in future to re-use the same code to introduce new functionality
There is no real need for enqueue_elems()/dequeue_elems()
to get pointer to actual rte_ring structure, instead it is enough to pass
a pointer to actual elements buffer inside the ring.
In return, we'll get a copying functions that could be used for other
queueing abstractions that do have circular ring buffer inside.
Signed-off-by: Konstantin Ananyev
---
lib/ring/rte_ring_elem_pvt.h | 115 ---
1 file changed, 67 insertions(+), 48 deletions(-)
diff --git a/lib/ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h
index 3a83668a08..6eafae121f 100644
--- a/lib/ring/rte_ring_elem_pvt.h
+++ b/lib/ring/rte_ring_elem_pvt.h
@@ -17,12 +17,14 @@
#endif
static __rte_always_inline void
-__rte_ring_enqueue_elems_32(struct rte_ring *r, const uint32_t size,
- uint32_t idx, const void *obj_table, uint32_t n)
+__rte_ring_enqueue_elems_32(void *ring_table, const void *obj_table,
+ uint32_t size, uint32_t idx, uint32_t n)
{
unsigned int i;
- uint32_t *ring = (uint32_t *)&r[1];
+
+ uint32_t *ring = (uint32_t *)ring_table;
const uint32_t *obj = (const uint32_t *)obj_table;
+
if (likely(idx + n <= size)) {
for (i = 0; i < (n & ~0x7); i += 8, idx += 8) {
ring[idx] = obj[i];
@@ -60,14 +62,14 @@ __rte_ring_enqueue_elems_32(struct rte_ring *r, const
uint32_t size,
}
static __rte_always_inline void
-__rte_ring_enqueue_elems_64(struct rte_ring *r, uint32_t prod_head,
- const void *obj_table, uint32_t n)
+__rte_ring_enqueue_elems_64(void *ring_table, const void *obj_table,
+ uint32_t size, uint32_t idx, uint32_t n)
{
unsigned int i;
- const uint32_t size = r->size;
- uint32_t idx = prod_head & r->mask;
- uint64_t *ring = (uint64_t *)&r[1];
+
+ uint64_t *ring = (uint64_t *)ring_table;
const unaligned_uint64_t *obj = (const unaligned_uint64_t *)obj_table;
+
if (likely(idx + n <= size)) {
for (i = 0; i < (n & ~0x3); i += 4, idx += 4) {
ring[idx] = obj[i];
@@ -93,14 +95,14 @@ __rte_ring_enqueue_elems_64(struct rte_ring *r, uint32_t
prod_head,
}
static __rte_always_inline void
-__rte_ring_enqueue_elems_128(struct rte_ring *r, uint32_t prod_head,
- const void *obj_table, uint32_t n)
+__rte_ring_enqueue_elems_128(void *ring_table, const void *obj_table,
+ uint32_t size, uint32_t idx, uint32_t n)
{
unsigned int i;
- const uint32_t size = r->size;
- uint32_t idx = prod_head & r->mask;
- rte_int128_t *ring = (rte_int128_t *)&r[1];
+
+ rte_int128_t *ring = (rte_int128_t *)ring_table;
const rte_int128_t *obj = (const rte_int128_t *)obj_table;
+
if (likely(idx + n <= size)) {
for (i = 0; i < (n & ~0x1); i += 2, idx += 2)
memcpy((void *)(ring + idx),
@@ -126,37 +128,47 @@ __rte_ring_enqueue_elems_128(struct rte_ring *r, uint32_t
prod_head,
* single and multi producer enqueue functions.
*/
static __rte_always_inline void
-__rte_ring_enqueue_elems(struct rte_ring *r, uint32_t prod_head,
- const void *obj_table, uint32_t esize, uint32_t num)
+__rte_ring_do_enqueue_elems(void *ring_table, const void *obj_table,
+ uint32_t size, uint32_t idx, uint32_t esize, uint32_t num)
{
/* 8B and 16B copies implemented individually to retain
* the current performance.
*/
if (esize == 8)
- __rte_ring_enqueue_elems_64(r, prod_head, obj_table, num);
+ __rte_ring_enqueue_elems_64(ring_table, obj_table, size,
+ idx, num);
else if (esize == 16)
- __rte_ring_enqueue_elems_128(r, prod_head, obj_table, num);
+ __rte_ring_enqueue_elems_128(ring_table, obj_table, size,
+ idx, num);
else {
- uint32_t idx, scale, nr_idx, nr_num, nr_size;
+ uint32_t scale, nr_idx, nr_num, nr_size;
/* Normalize to uint32_t */
scale = esize / sizeof(uint32_t);
nr_num = num * scale;
- idx = prod_head & r->mask;
nr_idx = idx * scale;
- nr_size = r->size * scale;
- __rte_ring_enqueue_elems_32(r, nr_size, nr_idx,
- obj_table, nr_num);
+ nr_size = size * scale;
+ __rte_ring_enqueue_elems_32(ring_table, obj_table, nr_size,
+ nr_idx, nr_num);
}
}
static __rte_always_inline void
-__rte_ring_dequeue_elems_32(struct rte_ring *r, const uint32_t size,
- ui
[PATCH v6 6/7] app/test: add unit tests for soring API
From: Konstantin Ananyev
Add both functional and stess test-cases for soring API.
Stress test serves as both functional and performance test of soring
enqueue/dequeue/acquire/release operations under high contention
(for both over committed and non-over committed scenarios).
Signed-off-by: Eimear Morrissey
Signed-off-by: Konstantin Ananyev
---
app/test/meson.build | 3 +
app/test/test_soring.c | 442 +++
app/test/test_soring_mt_stress.c | 40 ++
app/test/test_soring_stress.c | 48 ++
app/test/test_soring_stress.h | 35 ++
app/test/test_soring_stress_impl.h | 834 +
6 files changed, 1402 insertions(+)
create mode 100644 app/test/test_soring.c
create mode 100644 app/test/test_soring_mt_stress.c
create mode 100644 app/test/test_soring_stress.c
create mode 100644 app/test/test_soring_stress.h
create mode 100644 app/test/test_soring_stress_impl.h
diff --git a/app/test/meson.build b/app/test/meson.build
index 0f7e11969a..e59f27fd51 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -177,6 +177,9 @@ source_file_deps = {
'test_security_proto.c' : ['cryptodev', 'security'],
'test_seqlock.c': [],
'test_service_cores.c': [],
+'test_soring.c': [],
+'test_soring_mt_stress.c': [],
+'test_soring_stress.c': [],
'test_spinlock.c': [],
'test_stack.c': ['stack'],
'test_stack_perf.c': ['stack'],
diff --git a/app/test/test_soring.c b/app/test/test_soring.c
new file mode 100644
index 00..b2110305a7
--- /dev/null
+++ b/app/test/test_soring.c
@@ -0,0 +1,442 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Huawei Technologies Co., Ltd
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "test.h"
+
+#define MAX_ACQUIRED 20
+
+#define SORING_TEST_ASSERT(val, expected) do { \
+ RTE_TEST_ASSERT(expected == val, \
+ "%s: expected %u got %u\n", #val, expected, val); \
+} while (0)
+
+static void
+set_soring_init_param(struct rte_soring_param *prm,
+ const char *name, uint32_t esize, uint32_t elems,
+ uint32_t stages, uint32_t stsize,
+ enum rte_ring_sync_type rst_prod,
+ enum rte_ring_sync_type rst_cons)
+{
+ prm->name = name;
+ prm->elem_size = esize;
+ prm->elems = elems;
+ prm->stages = stages;
+ prm->meta_size = stsize;
+ prm->prod_synt = rst_prod;
+ prm->cons_synt = rst_cons;
+}
+
+static int
+move_forward_stage(struct rte_soring *sor,
+ uint32_t num_packets, uint32_t stage)
+{
+ uint32_t acquired;
+ uint32_t ftoken;
+ uint32_t *acquired_objs[MAX_ACQUIRED];
+
+ acquired = rte_soring_acquire_bulk(sor, acquired_objs, stage,
+ num_packets, &ftoken, NULL);
+ SORING_TEST_ASSERT(acquired, num_packets);
+ rte_soring_release(sor, NULL, stage, num_packets,
+ ftoken);
+
+ return 0;
+}
+
+/*
+ * struct rte_soring_param param checking.
+ */
+static int
+test_soring_init(void)
+{
+ struct rte_soring *sor = NULL;
+ struct rte_soring_param prm;
+ int rc;
+ size_t sz;
+ memset(&prm, 0, sizeof(prm));
+
+/*init memory*/
+ set_soring_init_param(&prm, "alloc_memory", sizeof(uintptr_t),
+ 4, 1, 4, RTE_RING_SYNC_MT, RTE_RING_SYNC_MT);
+ sz = rte_soring_get_memsize(&prm);
+ sor = rte_zmalloc(NULL, sz, RTE_CACHE_LINE_SIZE);
+ RTE_TEST_ASSERT_NOT_NULL(sor, "could not allocate memory for soring");
+
+ set_soring_init_param(&prm, "test_invalid_stages", sizeof(uintptr_t),
+ 4, 0, 4, RTE_RING_SYNC_MT, RTE_RING_SYNC_MT);
+ rc = rte_soring_init(sor, &prm);
+ RTE_TEST_ASSERT_FAIL(rc, "initted soring with invalid num stages");
+
+ set_soring_init_param(&prm, "test_invalid_esize", 0,
+ 4, 1, 4, RTE_RING_SYNC_MT, RTE_RING_SYNC_MT);
+ rc = rte_soring_init(sor, &prm);
+ RTE_TEST_ASSERT_FAIL(rc, "initted soring with 0 esize");
+
+ set_soring_init_param(&prm, "test_invalid_esize", 9,
+ 4, 1, 4, RTE_RING_SYNC_MT, RTE_RING_SYNC_MT);
+ rc = rte_soring_init(sor, &prm);
+ RTE_TEST_ASSERT_FAIL(rc, "initted soring with esize not multiple of 4");
+
+ set_soring_init_param(&prm, "test_invalid_rsize", sizeof(uintptr_t),
+ 4, 1, 3, RTE_RING_SYNC_MT, RTE_RING_SYNC_MT);
+ rc = rte_soring_init(sor, &prm);
+ RTE_TEST_ASSERT_FAIL(rc, "initted soring with rcsize not multiple of
4");
+
+ set_soring_init_param(&prm, "test_invalid_elems", sizeof(uintptr_t),
+ RTE_SORING_ELEM_MAX + 1, 1, 4, RTE_RING_SYNC_MT,
+
[PATCH v6 2/7] ring: common functions for 'move head' ops
From: Konstantin Ananyev
Note upfront: that change doesn't introduce any functional or
performance changes.
It is just a code-reordering for:
- code deduplication
- ability in future to re-use the same code to introduce new functionality
For each sync mode corresponding move_prod_head() and
move_cons_head() are nearly identical to each other,
the only differences are:
- do we need to use a @capacity to calculate number of entries or not.
- what we need to update (prod/cons) and what is used as
read-only counterpart.
So instead of having 2 copies of nearly identical functions,
introduce a new common one that could be used by both functions:
move_prod_head() and move_cons_head().
As another positive thing - we can get rid of referencing whole rte_ring
structure in that new common sub-function.
Signed-off-by: Konstantin Ananyev
---
lib/ring/rte_ring_c11_pvt.h | 134 +--
lib/ring/rte_ring_elem_pvt.h | 66 +++
lib/ring/rte_ring_generic_pvt.h | 121
lib/ring/rte_ring_hts_elem_pvt.h | 85 ++--
lib/ring/rte_ring_rts_elem_pvt.h | 85 ++--
5 files changed, 149 insertions(+), 342 deletions(-)
diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h
index 629b2d9288..048933ddc6 100644
--- a/lib/ring/rte_ring_c11_pvt.h
+++ b/lib/ring/rte_ring_c11_pvt.h
@@ -28,41 +28,19 @@ __rte_ring_update_tail(struct rte_ring_headtail *ht,
uint32_t old_val,
rte_atomic_store_explicit(&ht->tail, new_val, rte_memory_order_release);
}
-/**
- * @internal This function updates the producer head for enqueue
- *
- * @param r
- * A pointer to the ring structure
- * @param is_sp
- * Indicates whether multi-producer path is needed or not
- * @param n
- * The number of elements we will want to enqueue, i.e. how far should the
- * head be moved
- * @param behavior
- * RTE_RING_QUEUE_FIXED:Enqueue a fixed number of items from a ring
- * RTE_RING_QUEUE_VARIABLE: Enqueue as many items as possible from ring
- * @param old_head
- * Returns head value as it was before the move, i.e. where enqueue starts
- * @param new_head
- * Returns the current/new head value i.e. where enqueue finishes
- * @param free_entries
- * Returns the amount of free space in the ring BEFORE head was moved
- * @return
- * Actual number of objects enqueued.
- * If behavior == RTE_RING_QUEUE_FIXED, this will be 0 or n only.
- */
static __rte_always_inline unsigned int
-__rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp,
- unsigned int n, enum rte_ring_queue_behavior behavior,
- uint32_t *old_head, uint32_t *new_head,
- uint32_t *free_entries)
+__rte_ring_headtail_move_head(struct rte_ring_headtail *d,
+ const struct rte_ring_headtail *s, uint32_t capacity,
+ unsigned int is_st, unsigned int n,
+ enum rte_ring_queue_behavior behavior,
+ uint32_t *old_head, uint32_t *new_head, uint32_t *entries)
{
- const uint32_t capacity = r->capacity;
- uint32_t cons_tail;
- unsigned int max = n;
+ uint32_t stail;
int success;
+ unsigned int max = n;
- *old_head = rte_atomic_load_explicit(&r->prod.head,
rte_memory_order_relaxed);
+ *old_head = rte_atomic_load_explicit(&d->head,
+ rte_memory_order_relaxed);
do {
/* Reset n to the initial burst count */
n = max;
@@ -73,112 +51,36 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int
is_sp,
/* load-acquire synchronize with store-release of ht->tail
* in update_tail.
*/
- cons_tail = rte_atomic_load_explicit(&r->cons.tail,
+ stail = rte_atomic_load_explicit(&s->tail,
rte_memory_order_acquire);
/* The subtraction is done between two unsigned 32bits value
* (the result is always modulo 32 bits even if we have
-* *old_head > cons_tail). So 'free_entries' is always between 0
+* *old_head > s->tail). So 'free_entries' is always between 0
* and capacity (which is < size).
*/
- *free_entries = (capacity + cons_tail - *old_head);
+ *entries = (capacity + stail - *old_head);
/* check that we have enough room in ring */
- if (unlikely(n > *free_entries))
+ if (unlikely(n > *entries))
n = (behavior == RTE_RING_QUEUE_FIXED) ?
- 0 : *free_entries;
+ 0 : *entries;
if (n == 0)
return 0;
*new_head = *old_head + n;
- if (is_sp) {
- r->prod.head = *new_head;
+ if
[PATCH v6 1/7] test/ring: fix failure with custom number of lcores
From: Konstantin Ananyev
ring_stress_autotest fails to initialize the ring when RTE_MAX_LCORE value
is not a number of 2.
There is a flaw in calculation required number of elements in the ring.
Fix it by aligning number of elements to next power of 2.
Fixes: bf28df24e915 ("test/ring: add contention stress test")
Cc: sta...@dpdk.org
Reported-by: Phanendra Vukkisala
Signed-off-by: Konstantin Ananyev
---
app/test/test_ring_stress_impl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/test/test_ring_stress_impl.h b/app/test/test_ring_stress_impl.h
index 8b0bfb11fe..ee5274aeef 100644
--- a/app/test/test_ring_stress_impl.h
+++ b/app/test/test_ring_stress_impl.h
@@ -297,7 +297,7 @@ mt1_init(struct rte_ring **rng, void **data, uint32_t num)
*data = elm;
/* alloc ring */
- nr = 2 * num;
+ nr = rte_align32pow2(2 * num);
sz = rte_ring_get_memsize(nr);
r = rte_zmalloc(NULL, sz, alignof(typeof(*r)));
if (r == NULL) {
--
2.35.3
[PATCH v6 4/7] ring: make dump function more verbose
From: Eimear Morrissey
The current rte_ring_dump function uses the generic rte_ring_headtail
structure to access head/tail positions. This is incorrect for the RTS
case where the head is stored in a different offset in the union of
structs. Switching to a separate function for each sync type allows
to dump correct head/tail values and extra metadata.
Signed-off-by: Eimear Morrissey
---
.mailmap | 1 +
app/test/test_ring_stress_impl.h | 1 +
lib/ring/rte_ring.c | 87 ++--
lib/ring/rte_ring.h | 15 ++
lib/ring/version.map | 7 +++
5 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/.mailmap b/.mailmap
index 5290420258..7d6fb51ca8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -388,6 +388,7 @@ Eduard Serra
Edward Makarov
Edwin Brossette
Eelco Chaudron
+Eimear Morrissey
Elad Nachman
Elad Persiko
Elena Agostini
diff --git a/app/test/test_ring_stress_impl.h b/app/test/test_ring_stress_impl.h
index ee5274aeef..f99a7ff675 100644
--- a/app/test/test_ring_stress_impl.h
+++ b/app/test/test_ring_stress_impl.h
@@ -380,6 +380,7 @@ test_mt1(int (*test)(void *))
}
lcore_stat_dump(stdout, UINT32_MAX, &arg[mc].stats);
+ rte_ring_dump(stdout, r);
mt1_fini(r, data);
return rc;
}
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index aebb6d6728..261f2a06db 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -364,20 +364,99 @@ rte_ring_free(struct rte_ring *r)
rte_free(te);
}
+static const char *
+ring_get_sync_type(const enum rte_ring_sync_type st)
+{
+ switch (st) {
+ case RTE_RING_SYNC_ST:
+ return "single thread";
+ case RTE_RING_SYNC_MT:
+ return "multi thread";
+ case RTE_RING_SYNC_MT_RTS:
+ return "multi thread - RTS";
+ case RTE_RING_SYNC_MT_HTS:
+ return "multi thread - HTS";
+ default:
+ return "unknown";
+ }
+}
+
+static void
+ring_dump_ht_headtail(FILE *f, const char *prefix,
+ const struct rte_ring_headtail *ht)
+{
+ fprintf(f, "%ssync_type=%s\n", prefix,
+ ring_get_sync_type(ht->sync_type));
+ fprintf(f, "%shead=%"PRIu32"\n", prefix, ht->head);
+ fprintf(f, "%stail=%"PRIu32"\n", prefix, ht->tail);
+}
+
+static void
+ring_dump_rts_headtail(FILE *f, const char *prefix,
+ const struct rte_ring_rts_headtail *rts)
+{
+ fprintf(f, "%ssync_type=%s\n", prefix,
+ ring_get_sync_type(rts->sync_type));
+ fprintf(f, "%shead.pos=%"PRIu32"\n", prefix, rts->head.val.pos);
+ fprintf(f, "%shead.cnt=%"PRIu32"\n", prefix, rts->head.val.cnt);
+ fprintf(f, "%stail.pos=%"PRIu32"\n", prefix, rts->tail.val.pos);
+ fprintf(f, "%stail.cnt=%"PRIu32"\n", prefix, rts->tail.val.cnt);
+ fprintf(f, "%shtd_max=%"PRIu32"\n", prefix, rts->htd_max);
+}
+
+static void
+ring_dump_hts_headtail(FILE *f, const char *prefix,
+ const struct rte_ring_hts_headtail *hts)
+{
+ fprintf(f, "%ssync_type=%s\n", prefix,
+ ring_get_sync_type(hts->sync_type));
+ fprintf(f, "%shead=%"PRIu32"\n", prefix, hts->ht.pos.head);
+ fprintf(f, "%stail=%"PRIu32"\n", prefix, hts->ht.pos.tail);
+}
+
+void
+rte_ring_headtail_dump(FILE *f, const char *prefix,
+ const struct rte_ring_headtail *r)
+{
+ if (f == NULL || r == NULL)
+ return;
+
+ prefix = (prefix != NULL) ? prefix : "";
+
+ switch (r->sync_type) {
+ case RTE_RING_SYNC_ST:
+ case RTE_RING_SYNC_MT:
+ ring_dump_ht_headtail(f, prefix, r);
+ break;
+ case RTE_RING_SYNC_MT_RTS:
+ ring_dump_rts_headtail(f, prefix,
+ (const struct rte_ring_rts_headtail *)r);
+ break;
+ case RTE_RING_SYNC_MT_HTS:
+ ring_dump_hts_headtail(f, prefix,
+ (const struct rte_ring_hts_headtail *)r);
+ break;
+ default:
+ RING_LOG(ERR, "Invalid ring sync type detected");
+ }
+}
+
/* dump the status of the ring on the console */
void
rte_ring_dump(FILE *f, const struct rte_ring *r)
{
+ if (f == NULL || r == NULL)
+ return;
+
fprintf(f, "ring <%s>@%p\n", r->name, r);
fprintf(f, " flags=%x\n", r->flags);
fprintf(f, " size=%"PRIu32"\n", r->size);
fprintf(f, " capacity=%"PRIu32"\n", r->capacity);
- fprintf(f, " ct=%"PRIu32"\n", r->cons.tail);
- fprintf(f, " ch=%"PRIu32"\n", r->cons.head);
- fprintf(f, " pt=%"PRIu32"\n", r->prod.tail);
- fprintf(f, " ph=%"PRIu32"\n", r->prod.head);
fprintf(f, " used=%u\n", rte_ring_count(r));
fprintf(f, " avail=%u\n", rte_ring_free_count(r));
+
+ rte_ring_headtail_dump(f, " cons.", &(r->cons));
+ rte_rin
Re: [PATCH v6 06/47] net/bnxt: tf_core: TF support flow scale query
On Mon, 21 Oct 2024 13:55:26 +0530 Sriharsha Basavapatna wrote: > 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 ### [PATCH] net/bnxt: tf_core: TF support flow scale query WARNING:TYPO_SPELLING: 'direcitons' may be misspelled - perhaps 'directions'? #14: need to update usage states on both direcitons. ^^ WARNING:TYPO_SPELLING: 'resoure' may be misspelled - perhaps 'resource'? #15: 2. Update resoure usage state for regular flows only. ^^^ WARNING:LONG_LINE_COMMENT: line length of 296 exceeds 120 columns #220: FILE: drivers/net/bnxt/hsi_struct_def_dpdk.h:23264: +/* Common structure to cast crypto key split entries. This casting is required in the following HWRM command inputs/outputs if the backing store type is TX_CK or RX_CK. 1. hwrm_func_backing_store_cfg_v2_input 2. hwrm_func_backing_store_qcfg_v2_output 3. hwrm_func_backing_store_qcaps_v2_output */
RE: [EXTERNAL] Re: [PATCH v5 1/1] examples/l2fwd-jobstats: fix lock availability
ping
> -Original Message-
> From: Rakesh Kudurumalla
> Sent: Friday, August 16, 2024 10:55 AM
> To: Stephen Hemminger
> Cc: ferruh.yi...@amd.com; andrew.rybche...@oktetlabs.ru;
> or...@nvidia.com; tho...@monjalon.net; dev@dpdk.org; Jerin Jacob
> ; Nithin Kumar Dabilpuram
> ; sta...@dpdk.org
> Subject: RE: [EXTERNAL] Re: [PATCH v5 1/1] examples/l2fwd-jobstats: fix lock
> availability
>
>
>
> > -Original Message-
> > From: Stephen Hemminger
> > Sent: Sunday, August 11, 2024 9:47 PM
> > To: Rakesh Kudurumalla
> > Cc: ferruh.yi...@amd.com; andrew.rybche...@oktetlabs.ru;
> > or...@nvidia.com; tho...@monjalon.net; dev@dpdk.org; Jerin Jacob
> > ; Nithin Kumar Dabilpuram
> > ; sta...@dpdk.org
> > Subject: [EXTERNAL] Re: [PATCH v5 1/1] examples/l2fwd-jobstats: fix
> > lock availability
> >
> > On Sun, 11 Aug 2024 21: 29: 57 +0530 Rakesh Kudurumalla
> > marvell. com> wrote: > Race condition between jobstats and time
> > metrics > for forwarding and flushing is maintained using spinlock.
> > > Timer metrics are not displayed
> > On Sun, 11 Aug 2024 21:29:57 +0530
> > Rakesh Kudurumalla wrote:
> >
> > > Race condition between jobstats and time metrics for forwarding and
> > > flushing is maintained using spinlock.
> > > Timer metrics are not displayed properly due to the frequent
> > > unavailability of the lock.This patch fixes the issue by introducing
> > > a delay before acquiring the lock in the loop. This delay allows for
> > > betteravailability of the lock, ensuring that show_lcore_stats() can
> > > periodically update the statistics even when forwarding jobs are
> > > running.
> > >
> > > Fixes: 204896f8d66c ("examples/l2fwd-jobstats: add new example")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Rakesh Kudurumalla
> >
> > Would be better if this code used RCU and not a lock
>
> Currently the jobstats app uses the lock only for collecting single snapshot
> of
> different statistics and printing the same from main core. With RCU since we
> cannot pause the worker core to collect such a single snapshot, integrating
> RCU would need a full redesign of the application and would take lot of
> effort.
Re: [RFC v3 00/10] eventdev: remove single-event enqueue and dequeue
On Fri, Oct 18, 2024 at 1:14 AM Mattias Rönnblom wrote: > > Remove the single-event enqueue and dequeue functions from the > eventdev "ops" struct, to reduce complexity, leaving performance > unaffected. > > This ABI change has been announced as a DPDK deprication notice, > originally scheduled for DPDK 23.11. > > Mattias Rönnblom (9): Changes look good. Please send the NON RFC version of the series ASAP. I will merge it for rc2 (rc1 is created now) > event/dsw: remove single event enqueue and dequeue > event/dlb2: remove single event enqueue and dequeue > event/octeontx: remove single event enqueue and dequeue > event/sw: remove single event enqueue and dequeue > event/dpaa: remove single event enqueue and dequeue > event/dpaa2: remove single event enqueue and dequeue > event/opdl: remove single event enqueue and dequeue > event/skeleton: remove single event enqueue and dequeue > eventdev: remove single event enqueue and dequeue > > Pavan Nikhilesh (1): > event/cnxk: remove single event enqueue and dequeue > drivers/event/sw/sw_evdev_worker.c | 12 > lib/eventdev/eventdev_pmd.h| 4 -- > lib/eventdev/eventdev_private.c| 22 --- > lib/eventdev/rte_eventdev.h| 21 ++ > lib/eventdev/rte_eventdev_core.h | 11 > 25 files changed, 52 insertions(+), 427 deletions(-) > > -- > 2.43.0 >
[PATCH v6 47/47] net/bnxt: tf_ulp: add stats cache for thor2
From: Peter Spreadborough
This change adds a stats cache for Thor2 flows using counters.
Flow stats will be harvested periodically in the background
and stats reads by the application will be returned stats from
the cache and not by initiating a read from HW.
This change also adds read-clear functionality for counter resets
and restructures the stats collection while loop to
guarantee full coverage of entries added or removed during the
collection period.
Signed-off-by: Peter Spreadborough
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Jay Ding
Reviewed-by: Shahaji Bhosle
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 2 +
drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 16 +-
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 10 +
drivers/net/bnxt/tf_ulp/bnxt_ulp_utils.h | 26 ++
drivers/net/bnxt/tf_ulp/meson.build | 4 +-
drivers/net/bnxt/tf_ulp/ulp_fc_mgr_tfc.c | 13 +
drivers/net/bnxt/tf_ulp/ulp_flow_db.c| 4 +
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 73
drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c | 532 +++
drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h | 142 ++
drivers/net/bnxt/tf_ulp/ulp_sc_mgr_tfc.c | 60 +++
11 files changed, 880 insertions(+), 2 deletions(-)
create mode 100644 drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c
create mode 100644 drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h
create mode 100644 drivers/net/bnxt/tf_ulp/ulp_sc_mgr_tfc.c
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index a35f79f167..83fb205f68 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -162,6 +162,8 @@ struct bnxt_ulp_data {
uint64_tfeature_bits;
uint64_tdefault_class_bits;
uint64_tdefault_act_bits;
+ struct ulp_fc_tfc_stats_cache_entry *stats_cache;
+ struct bnxt_ulp_sc_info *sc_info;
};
enum bnxt_ulp_tfo_type {
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
index 334eda99ce..2c22582e1c 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
@@ -670,6 +670,7 @@ bnxt_ulp_flow_query(struct rte_eth_dev *eth_dev,
struct bnxt_ulp_context *ulp_ctx;
struct rte_flow_action_rss *rss_conf;
struct rte_flow_query_count *count;
+ enum bnxt_ulp_device_id dev_id;
uint32_t flow_id;
ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(eth_dev);
@@ -681,6 +682,15 @@ bnxt_ulp_flow_query(struct rte_eth_dev *eth_dev,
return -EINVAL;
}
+ rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
+ if (rc) {
+ BNXT_DRV_DBG(ERR, "Can't identify the device\n");
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Failed to query flow.");
+ return -EINVAL;
+ }
+
flow_id = (uint32_t)(uintptr_t)flow;
switch (action->type) {
@@ -696,7 +706,11 @@ bnxt_ulp_flow_query(struct rte_eth_dev *eth_dev,
break;
case RTE_FLOW_ACTION_TYPE_COUNT:
count = data;
- rc = ulp_fc_mgr_query_count_get(ulp_ctx, flow_id, count);
+ if (dev_id == BNXT_ULP_DEVICE_ID_THOR2)
+ rc = ulp_sc_mgr_query_count_get(ulp_ctx, flow_id,
count);
+ else
+ rc = ulp_fc_mgr_query_count_get(ulp_ctx, flow_id,
count);
+
if (unlikely(rc)) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
index d83f3df884..6d7ec0ffec 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
@@ -26,6 +26,7 @@
#include "ulp_template_struct.h"
#include "ulp_mark_mgr.h"
#include "ulp_fc_mgr.h"
+#include "ulp_sc_mgr.h"
#include "ulp_flow_db.h"
#include "ulp_mapper.h"
#include "ulp_matcher.h"
@@ -888,6 +889,9 @@ ulp_tfc_deinit(struct bnxt *bp,
BNXT_DRV_DBG(ERR, "Failed to close HA (%d)\n", rc);
}
+ /* Delete the Stats Counter Manager */
+ ulp_sc_mgr_deinit(bp->ulp_ctx);
+
/* cleanup the flow database */
ulp_flow_db_deinit(bp->ulp_ctx);
@@ -1044,6 +1048,12 @@ ulp_tfc_init(struct bnxt *bp,
goto jump_to_error;
}
+ rc = ulp_sc_mgr_init(bp->ulp_ctx);
+ if (rc) {
+ BNXT_DRV_DBG(ERR, "Failed to initialize ulp stats cache mgr\n");
+ goto jump_to_error;
+ }
+
rc = bnxt_ulp_cntxt_dev_id_get(bp->ulp_ctx, &ulp_dev_id);
if (rc) {
BNXT_DRV_DBG(ERR, "Unable to get device id from ulp.\n");
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_util
[PATCH v6 45/47] net/bnxt: tf_ulp: support a few feature extensions
From: Kishore Padmanabha
This patch supports the following features.
add support for port table write operation
Added support for port table write operation from the
template so that template can write mirror id details into
the port database.
support generic template for socket direct
Support the socket direct feature, which is disabled by
default. User could enable it with meson configuration
parameter truflow feature bit.
add support for truflow promiscuous mode
The truflow application supports promiscuous mode to enable
or disable receiving the packets with unknown destination
mac addresses.
set metadata for profile tcam entry
The metadata higher bits are currently used for profile
tcam entry. To make better use of EM entries, it is better
to use metadata fully instead of only the higher bits of
the metadata.
support the group miss action
Generic template supports the feature of setting group miss
action with the following rte command:
flow group 0 group_id 1 ingress set_miss_actions jump
group 3 / end
fix some build failures
This change resolves a build issue seen on some OS's and
compiler versions.
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/bnxt_ulp.h | 31 +++
drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 27 ++-
drivers/net/bnxt/tf_ulp/ulp_alloc_tbl.c | 4 +
drivers/net/bnxt/tf_ulp/ulp_def_rules.c | 286 ++-
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 43 +++-
drivers/net/bnxt/tf_ulp/ulp_port_db.c| 89 +++
drivers/net/bnxt/tf_ulp/ulp_port_db.h| 28 +++
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 17 ++
8 files changed, 520 insertions(+), 5 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index 758b9deb63..a35f79f167 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -92,9 +92,19 @@ enum bnxt_rte_flow_action_type {
BNXT_RTE_FLOW_ACTION_TYPE_LAST
};
+#define BNXT_ULP_MAX_GROUP_CNT 8
+struct bnxt_ulp_grp_rule_info {
+ uint32_tgroup_id;
+ uint32_tflow_id;
+ uint8_t dir;
+ uint8_t valid;
+};
+
struct bnxt_ulp_df_rule_info {
uint32_tdef_port_flow_id;
+ uint32_tpromisc_flow_id;
uint8_t valid;
+ struct bnxt_ulp_grp_rule_info grp_df_rule[BNXT_ULP_MAX_GROUP_CNT];
};
struct bnxt_ulp_vfr_rule_info {
@@ -291,4 +301,25 @@ bnxt_ulp_cntxt_entry_acquire(void *arg);
void
bnxt_ulp_cntxt_entry_release(void);
+int32_t
+bnxt_ulp_promisc_mode_set(struct bnxt *bp, uint8_t enable);
+
+int32_t
+bnxt_ulp_set_prio_attribute(struct ulp_rte_parser_params *params,
+ const struct rte_flow_attr *attr);
+
+void
+bnxt_ulp_set_dir_attributes(struct ulp_rte_parser_params *params,
+ const struct rte_flow_attr *attr);
+
+void
+bnxt_ulp_init_parser_cf_defaults(struct ulp_rte_parser_params *params,
+uint16_t port_id);
+
+int32_t
+bnxt_ulp_grp_miss_act_set(struct rte_eth_dev *dev,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_action actions[],
+ uint32_t *flow_id);
+
#endif /* _BNXT_ULP_H_ */
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
index eea05e129a..334eda99ce 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
@@ -66,7 +66,7 @@ bnxt_ulp_flow_validate_args(const struct rte_flow_attr *attr,
return BNXT_TF_RC_SUCCESS;
}
-static inline void
+void
bnxt_ulp_set_dir_attributes(struct ulp_rte_parser_params *params,
const struct rte_flow_attr *attr)
{
@@ -86,7 +86,7 @@ bnxt_ulp_set_dir_attributes(struct ulp_rte_parser_params
*params,
}
}
-static int32_t
+int32_t
bnxt_ulp_set_prio_attribute(struct ulp_rte_parser_params *params,
const struct rte_flow_attr *attr)
{
@@ -117,7 +117,7 @@ bnxt_ulp_set_prio_attribute(struct ulp_rte_parser_params
*params,
return 0;
}
-static inline void
+void
bnxt_ulp_init_parser_cf_defaults(struct ulp_rte_parser_params *params,
uint16_t port_id)
{
@@ -268,6 +268,26 @@ bnxt_ulp_init_mapper_params(struct bnxt_ulp_mapper_parms
*mparms,
ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_SOCKET_DIRECT_VPORT,
(vport == 1) ? 2 : 1);
}
+
+ /* Update the socket direct svif when socket_
RE: [RFC 1/2] eal: add llc aware functions
[AMD Official Use Only - AMD Internal Distribution Only] > > > > > > > 1. if there are specific SoC which do not populate the information > > > > at all? If yes are they in DTS? > > > > > > This information is populated correctly for all SOCs, comment was on > > > the script. > > > > Please note, I am not running any script. The command LCORE_GET_LLC is > > executed using C function `open`. As per suggestion of Stephen we have > > replied we will change to C function logic to get details. > > Hope there is no longer confusion on this? > > > If this is implemented using sysfs, then it needs to handle caveats like > SFONLY > mode. > Perhaps consulting /sys/bus/cpu/devices/cpu%u/cache/index[0-9]/type would > help. > However, I prefer using hwloc to get this information accurately. New version (rfc-v2) shared soon, implemented using hwloc libraries rather than `sysfs`. I hope with the distro hwloc pakages it will work with ` Neoverse N1 can disable the use of SLC as LLC (a BIOS setting) If SLC is not used as LLC` > > Thanks > > --wathsala
[PATCH v6 34/47] net/bnxt: tf_ulp: add rte_mtr support for Thor2
From: Jay Ding
1. Implement Thor2 meter template tables
2. Add Thor2 meter support in ULP
3. Make rte_mtr API implementation device independent
to adapt Thor2 meter hw change
4. Fix the round issue in xir calculation
Signed-off-by: Jay Ding
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 12 +-
drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c | 273 +++
drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c| 113 +-
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 47 +++-
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 12 +-
5 files changed, 246 insertions(+), 211 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index d62a9df5f0..4868339478 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -12,6 +12,7 @@
#include "rte_version.h"
#include "rte_ethdev.h"
+#include "rte_mtr.h"
#include "bnxt.h"
#include "ulp_template_db_enum.h"
@@ -231,6 +232,10 @@ struct bnxt_ulp_core_ops {
int32_t
(*ulp_vfr_session_fid_rem)(struct bnxt_ulp_context *ulp_ctx,
uint16_t rep_fid);
+
+ int32_t
+ (*ulp_mtr_cap_get)(struct bnxt *bp,
+ struct rte_mtr_capabilities *cap);
};
extern const struct bnxt_ulp_core_ops bnxt_ulp_tf_core_ops;
@@ -566,9 +571,6 @@ bnxt_ulp_cntxt_ecpri_udp_port_set(struct bnxt_ulp_context
*ulp_ctx,
unsigned int
bnxt_ulp_cntxt_ecpri_udp_port_get(struct bnxt_ulp_context *ulp_ctx);
-int32_t
-bnxt_flow_meter_init(struct bnxt *bp);
-
uint32_t
bnxt_ulp_cntxt_convert_dev_id(uint32_t ulp_dev_id);
@@ -618,4 +620,8 @@ bnxt_ulp_vfr_session_fid_add(struct bnxt_ulp_context
*ulp_ctx,
int32_t
bnxt_ulp_vfr_session_fid_rem(struct bnxt_ulp_context *ulp_ctx,
uint16_t vfr_fid);
+
+int32_t
+bnxt_flow_mtr_init(struct bnxt *bp __rte_unused);
+
#endif /* _BNXT_ULP_H_ */
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c
index 61d006fc08..37b5cc4dfb 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_meter.c
@@ -40,122 +40,24 @@
/**
* Meter init status
*/
-int bnxt_meter_initialized;
+int bnxt_mtr_initialized;
-/**
- * Internal api to config global config.
- * returns 0 on success.
- */
-static int32_t
-bnxt_meter_global_cfg_update(struct bnxt *bp,
-enum tf_dir dir,
-enum tf_global_config_type type,
-uint32_t offset,
-uint32_t value,
-uint32_t set_flag)
-{
- uint32_t global_cfg = 0;
- struct tf_global_cfg_parms parms = { 0 };
- struct tf *tfp;
- int32_t rc = 0;
-
- parms.dir = dir,
- parms.type = type,
- parms.offset = offset,
- parms.config = (uint8_t *)&global_cfg,
- parms.config_sz_in_bytes = sizeof(global_cfg);
-
- tfp = bnxt_ulp_bp_tfp_get(bp, BNXT_ULP_SESSION_TYPE_DEFAULT);
- rc = tf_get_global_cfg(tfp, &parms);
- if (rc) {
- BNXT_DRV_DBG(ERR, "Failed to get global cfg 0x%x rc:%d\n",
-type, rc);
- return rc;
- }
-
- if (set_flag)
- global_cfg |= value;
- else
- global_cfg &= ~value;
-
- rc = tf_set_global_cfg(tfp, &parms);
- if (rc) {
- BNXT_DRV_DBG(ERR, "Failed to set global cfg 0x%x rc:%d\n",
-type, rc);
- return rc;
- }
- return rc;
-}
-
-/**
- * When a port is initialized by dpdk. This functions is called
- * to enable the meter and initializes the meter global configurations.
- */
-#define BNXT_THOR_FMTCR_NUM_MET_MET_1K (0x7UL << 20)
-#define BNXT_THOR_FMTCR_CNTRS_ENABLE (0x1UL << 25)
-#define BNXT_THOR_FMTCR_INTERVAL_1K (1024)
int32_t
-bnxt_flow_meter_init(struct bnxt *bp)
+bnxt_flow_mtr_init(struct bnxt *bp __rte_unused)
{
- int rc = 0;
-
- /*
-* Enable metering. Set the meter global configuration register.
-* Set number of meter to 1K. Disable the drop counter for now.
-*/
- rc = bnxt_meter_global_cfg_update(bp, TF_DIR_RX, TF_METER_CFG,
- 0,
- BNXT_THOR_FMTCR_NUM_MET_MET_1K,
- 1);
- if (rc) {
- BNXT_DRV_DBG(ERR, "Failed to set rx meter configuration\n");
- goto jump_to_error;
- }
-
- rc = bnxt_meter_global_cfg_update(bp, TF_DIR_TX, TF_METER_CFG,
- 0,
- BNXT_THOR_FMTCR_NUM_MET_MET_1K,
- 1);
- if (rc) {
- BNXT_DRV_DBG(ERR, "Failed to set tx meter configuration\n");
-
[PATCH v6 44/47] net/bnxt: tf_ulp: enable support for truflow feature configuration
From: Kishore Padmanabha
Added truflow feature bit meson configuration parameter to enable
optional capability features of the appplication.
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_tf.c| 6 -
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 6 -
drivers/net/bnxt/tf_ulp/bnxt_ulp_utils.h | 32
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
index c591f9327c..fa7e8fe000 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
@@ -476,7 +476,11 @@ ulp_tf_cntxt_app_caps_init(struct bnxt *bp,
info[i].min_flow_priority);
bnxt_ulp_max_flow_priority_set(ulp_ctx,
info[i].max_flow_priority);
- ulp_ctx->cfg_data->feature_bits = info[i].feature_bits;
+ /* Update the capability feature bits*/
+ if (bnxt_ulp_cap_feat_process(info[i].feature_bits,
+ &ulp_ctx->cfg_data->feature_bits))
+ return -EINVAL;
+
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/bnxt_ulp_tfc.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
index ebbc5a85a9..d83f3df884 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
@@ -536,7 +536,11 @@ ulp_tfc_cntxt_app_caps_init(struct bnxt *bp, uint8_t
app_id, uint32_t dev_id)
"Socket Direct feature is
enabled\n");
}
}
- ulp_ctx->cfg_data->feature_bits = info[i].feature_bits;
+ /* Update the capability feature bits*/
+ if (bnxt_ulp_cap_feat_process(info[i].feature_bits,
+ &ulp_ctx->cfg_data->feature_bits))
+ return -EINVAL;
+
bnxt_ulp_default_app_priority_set(ulp_ctx,
info[i].default_priority);
bnxt_ulp_max_def_priority_set(ulp_ctx,
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_utils.h
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_utils.h
index 26087526e8..edc75da05e 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_utils.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_utils.h
@@ -1035,4 +1035,36 @@ bnxt_ulp_vfr_session_fid_rem(struct bnxt_ulp_context
*ulp_ctx,
return rc;
}
+static inline int32_t
+bnxt_ulp_cap_feat_process(uint64_t feat_bits, uint64_t *out_bits)
+{
+#ifdef RTE_BNXT_TF_FEAT_BITS
+ uint64_t bit = RTE_BNXT_TF_FEAT_BITS;
+#else
+ uint64_t bit = 0;
+#endif
+
+ *out_bits = 0;
+ if ((feat_bits | bit) != feat_bits) {
+ BNXT_DRV_DBG(ERR, "Invalid TF feature bit is set %" PRIu64 "\n",
+bit);
+ return -EINVAL;
+ }
+ if ((bit & BNXT_ULP_FEATURE_BIT_PARENT_DMAC) &&
+ (bit & BNXT_ULP_FEATURE_BIT_PORT_DMAC)) {
+ BNXT_DRV_DBG(ERR, "Invalid both Port and Parent Mac set\n");
+ return -EINVAL;
+ }
+
+ if (bit & BNXT_ULP_FEATURE_BIT_PARENT_DMAC)
+ BNXT_DRV_DBG(ERR, "Parent Mac Address Feature is enabled\n");
+ if (bit & BNXT_ULP_FEATURE_BIT_PORT_DMAC)
+ BNXT_DRV_DBG(ERR, "Port Mac Address Feature is enabled\n");
+ if (bit & BNXT_ULP_FEATURE_BIT_MULTI_TUNNEL_FLOW)
+ BNXT_DRV_DBG(ERR, "Multi Tunnel Flow Feature is enabled\n");
+
+ *out_bits = bit;
+ return 0;
+}
+
#endif /* _BNXT_ULP_UTILS_H_ */
--
2.39.3
[PATCH v6 35/47] net/bnxt: tf_ulp: 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.
This feature is disabled by default. Using the build flag
-DTF_FLOW_SCALE_QUERY to enable it.
Improvement on flow scale query feature
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.
Signed-off-by: Shuanglin Wang
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 17 +
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 13 +
2 files changed, 30 insertions(+)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
index 79e2931e43..e7ac617d7a 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
@@ -12,6 +12,9 @@
#include "ulp_flow_db.h"
#include "ulp_fc_mgr.h"
#include "ulp_tun.h"
+#ifdef TF_FLOW_SCALE_QUERY
+#include "tf_resources.h"
+#endif /* TF_FLOW_SCALE_QUERY */
#define ULP_FLOW_DB_RES_DIR_BIT31
#define ULP_FLOW_DB_RES_DIR_MASK 0x8000
@@ -956,8 +959,15 @@ ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx,
return -EINVAL;
}
+#ifdef TF_FLOW_SCALE_QUERY
+ tf_resc_pause_usage_update();
+#endif
while (!ulp_flow_db_next_entry_get(flow_db, flow_type, &fid))
ulp_mapper_resources_free(ulp_ctx, flow_type, fid, NULL);
+#ifdef TF_FLOW_SCALE_QUERY
+ tf_resc_resume_usage_update();
+ tf_resc_usage_update_all(ulp_ctx->bp);
+#endif
bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);
@@ -994,6 +1004,9 @@ ulp_flow_db_function_flow_flush(struct bnxt_ulp_context
*ulp_ctx,
return -EINVAL;
}
+#ifdef TF_FLOW_SCALE_QUERY
+ tf_resc_pause_usage_update();
+#endif
while (!ulp_flow_db_next_entry_get(flow_db, BNXT_ULP_FDB_TYPE_REGULAR,
&flow_id)) {
if (flow_db->func_id_tbl[flow_id] == func_id)
@@ -1002,6 +1015,10 @@ ulp_flow_db_function_flow_flush(struct bnxt_ulp_context
*ulp_ctx,
flow_id,
NULL);
}
+#ifdef TF_FLOW_SCALE_QUERY
+ tf_resc_resume_usage_update();
+ tf_resc_usage_update_all(ulp_ctx->bp);
+#endif
bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);
return 0;
}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 17e5b99562..3bf0307980 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -21,6 +21,9 @@
#include "ulp_port_db.h"
#include "ulp_ha_mgr.h"
#include "bnxt_tf_pmd_shim.h"
+#ifdef TF_FLOW_SCALE_QUERY
+#include "tf_resources.h"
+#endif /* TF_FLOW_SCALE_QUERY */
static uint8_t mapper_fld_zeros[16] = { 0 };
@@ -4315,6 +4318,12 @@ ulp_mapper_resources_free(struct bnxt_ulp_context
*ulp_ctx,
if (rc)
frc = rc;
+#ifdef TF_FLOW_SCALE_QUERY
+ /* update for regular flows only */
+ if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
+ tf_resc_usage_update_all(ulp_ctx->bp);
+#endif /* TF_FLOW_SCALE_QUERY */
+
return frc;
}
@@ -4464,6 +4473,10 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,
goto flow_error;
}
+#ifdef TF_FLOW_SCALE_QUERY
+ tf_resc_usage_update_all(ulp_ctx->bp);
+#endif /* TF_FLOW_SCALE_QUERY */
+
return rc;
batch_error:
--
2.39.3
[PATCH v6 39/47] net/bnxt: tf_ulp: switch ulp to use rte crc32 hash
From: Peter Spreadborough
The RTE hash is highly optimized and will use HW acceleration
when available.
Signed-off-by: Peter Spreadborough
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c | 4
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 4
drivers/net/bnxt/tf_ulp/ulp_gen_hash.c | 28 ++
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
index 99a6bac0ce..c591f9327c 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tf.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include "bnxt.h"
#include "bnxt_ulp.h"
@@ -1457,6 +1458,9 @@ ulp_tf_init(struct bnxt *bp,
int rc;
uint32_t ulp_dev_id = BNXT_ULP_DEVICE_ID_LAST;
+ /* Select 64bit SSE4.2 intrinsic if available */
+ rte_hash_crc_set_alg(CRC32_SSE42_x64);
+
/* Allocate and Initialize the ulp context. */
rc = ulp_tf_ctx_init(bp, session);
if (rc) {
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
index d7decacc26..3d48f42c1b 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include "bnxt.h"
#include "bnxt_ulp.h"
@@ -925,6 +926,9 @@ ulp_tfc_init(struct bnxt *bp,
uint16_t sid;
int rc;
+ /* Select 64bit SSE4.2 intrinsic if available */
+ rte_hash_crc_set_alg(CRC32_SSE42_x64);
+
rc = bnxt_ulp_devid_get(bp, &ulp_dev_id);
if (rc) {
BNXT_DRV_DBG(ERR, "Unable to get device id from ulp.\n");
diff --git a/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
b/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
index 17bb9c6b32..7d68bfc778 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_gen_hash.c
@@ -5,10 +5,10 @@
#include
#include
+#include
#include "bnxt_tf_common.h"
#include "ulp_gen_hash.h"
#include "ulp_utils.h"
-#include "tf_hash.h"
static
int32_t ulp_bit_alloc_list_alloc(struct bit_alloc_list *blist,
@@ -203,8 +203,29 @@ ulp_gen_hash_tbl_list_key_search(struct ulp_gen_hash_tbl
*hash_tbl,
}
/* calculate the hash */
- hash_id = tf_hash_calc_crc32(entry->key_data,
-hash_tbl->key_tbl.data_size);
+ switch (hash_tbl->key_tbl.data_size) {
+ case 1:
+ hash_id = rte_hash_crc_1byte(*entry->key_data,
+~0U);
+ break;
+ case 2:
+ hash_id = rte_hash_crc_2byte(*((uint16_t *)entry->key_data),
+~0U);
+ break;
+ case 4:
+ hash_id = rte_hash_crc_4byte(*((uint32_t *)entry->key_data),
+~0U);
+ break;
+ case 8:
+ hash_id = rte_hash_crc_8byte(*((uint64_t *)entry->key_data),
+~0U);
+ break;
+ default:
+ hash_id = rte_hash_crc(entry->key_data,
+ hash_tbl->key_tbl.data_size,
+ ~0U);
+ break;
+ }
hash_id = (uint16_t)(((hash_id >> 16) & 0x) ^ (hash_id & 0x));
hash_id &= hash_tbl->hash_mask;
hash_id = hash_id * hash_tbl->hash_bkt_num;
@@ -375,4 +396,3 @@ ulp_gen_hash_tbl_list_del(struct ulp_gen_hash_tbl *hash_tbl,
return 0;
}
-
--
2.39.3
[PATCH v6 36/47] net/bnxt: tf_ulp: add support for rss flow query to ULP
From: Randy Schacher
Support flow query rss command for truflow in ULP layer.
Signed-off-by: Randy Schacher
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/bnxt_vnic.c| 39 +-
drivers/net/bnxt/bnxt_vnic.h| 6 +++
drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 71 +
3 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index 29124a6b9d..7b028f2ee5 100644
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -30,6 +30,7 @@
((BNXT_VNIC_BITMAP_SIZE - 1) - \
((i) % BNXT_VNIC_BITMAP_SIZE))) & 1)
+static uint16_t rss_query_queues[BNXT_VNIC_MAX_QUEUE_SIZE];
/*
* VNIC Functions
*/
@@ -777,16 +778,21 @@ bnxt_vnic_rss_create(struct bnxt *bp,
}
/* hwrm_type conversion */
+ vnic->hash_f = rss_info->rss_func;
+ vnic->rss_types = rss_info->rss_types;
vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss_info->rss_types);
vnic->hash_mode = bnxt_rte_to_hwrm_hash_level(bp, rss_info->rss_types,
rss_info->rss_level);
/* configure the key */
- if (!rss_info->key_len)
+ if (!rss_info->key_len) {
/* If hash key has not been specified, use random hash key.*/
bnxt_prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE);
- else
+ vnic->key_len = HW_HASH_KEY_SIZE;
+ } else {
memcpy(vnic->rss_hash_key, rss_info->key, rss_info->key_len);
+ vnic->key_len = rss_info->key_len;
+ }
/* Prepare the indirection table */
bnxt_vnic_populate_rss_table(bp, vnic);
@@ -820,6 +826,35 @@ bnxt_vnic_rss_create(struct bnxt *bp,
return NULL;
}
+void
+bnxt_vnic_rss_query_info_fill(struct bnxt *bp,
+ struct rte_flow_action_rss *rss_conf,
+ uint16_t vnic_id)
+{
+ struct bnxt_vnic_info *vnic_info;
+ int idx;
+
+ vnic_info = bnxt_vnic_queue_db_get_vnic(bp, vnic_id);
+ if (vnic_info == NULL) {
+ PMD_DRV_LOG_LINE(ERR, "lookup failed for id %d", vnic_id);
+ return;
+ }
+
+ rss_conf->key_len = vnic_info->key_len;
+ rss_conf->key = vnic_info->rss_hash_key;
+ rss_conf->func = vnic_info->hash_f;
+ rss_conf->level = vnic_info->hash_mode;
+ rss_conf->types = vnic_info->rss_types;
+
+ memset(rss_query_queues, 0, sizeof(rss_query_queues));
+ for (idx = 0; idx < BNXT_VNIC_MAX_QUEUE_SIZE; idx++)
+ if (BNXT_VNIC_BITMAP_GET(vnic_info->queue_bitmap, idx)) {
+ rss_query_queues[rss_conf->queue_num] = idx;
+ rss_conf->queue_num += 1;
+ }
+ rss_conf->queue = (const uint16_t *)&rss_query_queues;
+}
+
int32_t
bnxt_vnic_rss_queue_status_update(struct bnxt *bp, struct bnxt_vnic_info *vnic)
{
diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h
index fe3fc4e540..c4a7c5257c 100644
--- a/drivers/net/bnxt/bnxt_vnic.h
+++ b/drivers/net/bnxt/bnxt_vnic.h
@@ -75,10 +75,13 @@ struct bnxt_vnic_info {
boolrss_dflt_cr;
uint16_tref_cnt;
uint64_tqueue_bitmap[BNXT_VNIC_MAX_QUEUE_SZ_IN_64BITS];
+ uint64_trss_types;
+ uint32_tkey_len; /**< Hash key length in bytes. */
STAILQ_HEAD(, bnxt_filter_info) filter;
STAILQ_HEAD(, rte_flow) flow_list;
uint8_t ring_select_mode;
+ enum rte_eth_hash_function hash_f;
enum rte_eth_hash_function hash_f_local;
uint64_trss_types_local;
uint8_t metadata_format;
@@ -121,6 +124,9 @@ int32_t bnxt_vnic_queue_db_init(struct bnxt *bp);
int32_t bnxt_vnic_queue_db_deinit(struct bnxt *bp);
void bnxt_vnic_queue_db_update_dlft_vnic(struct bnxt *bp);
+void bnxt_vnic_rss_query_info_fill(struct bnxt *bp,
+ struct rte_flow_action_rss *rss_conf,
+ uint16_t vnic_id);
int32_t
bnxt_vnic_rss_queue_status_update(struct bnxt *bp, struct bnxt_vnic_info
*vnic);
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
index 85fb03e922..4c99c785c0 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c
@@ -577,6 +577,66 @@ bnxt_ulp_flow_flush(struct rte_eth_dev *eth_dev,
return ret;
}
+/*
+ * Fill the rte_flow_query_rss 'rss_conf' argument passed
+ * in the rte_flow_query() with the values obtained and
+ * accumulated locally.
+ *
+ * ctxt [in] The ulp context for the flow counter manager
+ *
+ * flow_id [in] The HW flow ID
+ *
+ * rss_conf [out] The rte_flow_query_count 'data' that is set
+ *
+ */
+static int ulp
[PATCH v6 42/47] net/bnxt: tf_ulp: TFC support flow scale query for Thor2
From: Shuanglin Wang
TFC supports the flow scale query feature for OVS application.
The resource usage(WC-TCAM) is tracked inside Thor2 firmware.
This patch is to query the wc-tcam usage info when adding/
deleting a flow. It is just for debugging purpose and disabled by
default.
Using the build flag -DTF_FLOW_SCALE_QUERY to enable it.
And users should use niccli to query the resource usage.
Signed-off-by: Shuanglin Wang
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c | 6 ++
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 9 +
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 26 --
drivers/net/bnxt/tf_ulp/ulp_mapper.h | 5 +
4 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
index d30339393e..ebbc5a85a9 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_tfc.c
@@ -34,6 +34,7 @@
#include "ulp_ha_mgr.h"
#include "bnxt_tf_pmd_shim.h"
#include "ulp_template_db_tbl.h"
+#include "tfc_resources.h"
/* define to enable shared table scope */
#define TFC_SHARED_TBL_SCOPE_ENABLE 0
@@ -1053,6 +1054,11 @@ ulp_tfc_init(struct bnxt *bp,
}
}
+#ifdef TF_FLOW_SCALE_QUERY
+ /* Query resource statstics from firmware */
+ tfc_resc_usage_query_all(bp);
+#endif /* TF_FLOW_SCALE_QUERY */
+
BNXT_DRV_DBG(DEBUG, "ulp ctx has been initialized\n");
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 341c8c2dfe..8984808b67 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c
@@ -15,6 +15,7 @@
#include "ulp_tun.h"
#ifdef TF_FLOW_SCALE_QUERY
#include "tf_resources.h"
+#include "tfc_resources.h"
#endif /* TF_FLOW_SCALE_QUERY */
#define ULP_FLOW_DB_RES_DIR_BIT31
@@ -963,11 +964,12 @@ ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx,
#ifdef TF_FLOW_SCALE_QUERY
tf_resc_pause_usage_update();
#endif
+
while (!ulp_flow_db_next_entry_get(flow_db, flow_type, &fid))
ulp_mapper_resources_free(ulp_ctx, flow_type, fid, NULL);
+
#ifdef TF_FLOW_SCALE_QUERY
- tf_resc_resume_usage_update();
- tf_resc_usage_update_all(ulp_ctx->bp);
+ ulp_resc_usage_sync(ulp_ctx);
#endif
bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);
@@ -1017,8 +1019,7 @@ ulp_flow_db_function_flow_flush(struct bnxt_ulp_context
*ulp_ctx,
NULL);
}
#ifdef TF_FLOW_SCALE_QUERY
- tf_resc_resume_usage_update();
- tf_resc_usage_update_all(ulp_ctx->bp);
+ ulp_resc_usage_sync(ulp_ctx);
#endif
bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);
return 0;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 5dfe72df17..c595e7cfc3 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -24,6 +24,7 @@
#include "bnxt_tf_pmd_shim.h"
#ifdef TF_FLOW_SCALE_QUERY
#include "tf_resources.h"
+#include "tfc_resources.h"
#endif /* TF_FLOW_SCALE_QUERY */
static uint8_t mapper_fld_zeros[16] = { 0 };
@@ -4322,7 +4323,7 @@ ulp_mapper_resources_free(struct bnxt_ulp_context
*ulp_ctx,
#ifdef TF_FLOW_SCALE_QUERY
/* update for regular flows only */
if (flow_type == BNXT_ULP_FDB_TYPE_REGULAR)
- tf_resc_usage_update_all(ulp_ctx->bp);
+ ulp_resc_usage_sync(ulp_ctx);
#endif /* TF_FLOW_SCALE_QUERY */
return frc;
@@ -4475,7 +4476,7 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,
}
#ifdef TF_FLOW_SCALE_QUERY
- tf_resc_usage_update_all(ulp_ctx->bp);
+ ulp_resc_usage_sync(ulp_ctx);
#endif /* TF_FLOW_SCALE_QUERY */
return rc;
@@ -4514,6 +4515,27 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,
return rc;
}
+#ifdef TF_FLOW_SCALE_QUERY
+/* Sync resource usage state with firmware */
+int ulp_resc_usage_sync(struct bnxt_ulp_context *ulp_ctx)
+{
+ uint32_t dev_id;
+ if (unlikely(bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id))) {
+ BNXT_DRV_DBG(ERR, "Invalid ulp context\n");
+ return -EINVAL;
+ }
+
+ if (dev_id == BNXT_ULP_DEVICE_ID_THOR) {
+ tf_resc_resume_usage_update();
+ tf_resc_usage_update_all(ulp_ctx->bp);
+ } else if (dev_id == BNXT_ULP_DEVICE_ID_THOR2) {
+ tfc_resc_usage_query_all(ulp_ctx->bp);
+ }
+
+ return 0;
+}
+#endif /* TF_FLOW_SCALE_QUERY */
+
int32_t
ulp_mapper_init(struct bnxt_ulp_context *ulp_ctx)
{
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.h
b/drivers/net/bnxt/tf_ulp/ulp_mapper.h
index 0f43e2a8b5..d2fc716232 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.h
@@ -
[PATCH v6 09/47] net/bnxt: tf_core: remove dead AFM code from session-based priority TCAM mgr
From: Randy Schacher
Remove references to AFM allocated memory which is no longer
supported with TCAM mgr and truflow
Signed-off-by: Randy Schacher
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Farah Smith
Reviewed-by: Kishore Padmanabha
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/cfa_tcam_mgr.c | 121
drivers/net/bnxt/tf_core/cfa_tcam_mgr.h | 27 +-
drivers/net/bnxt/tf_core/cfa_tcam_mgr_p4.c | 320 +++-
drivers/net/bnxt/tf_core/cfa_tcam_mgr_p58.c | 320 +++-
drivers/net/bnxt/tf_core/tf_resources.c | 4 +-
drivers/net/bnxt/tf_core/tf_tcam_mgr_msg.c | 18 +-
6 files changed, 143 insertions(+), 667 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
index 165376182e..380e828da8 100644
--- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
+++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
@@ -20,23 +20,23 @@
#define TF_TCAM_SLICE_INVALID (-1)
static int physical_table_types[CFA_TCAM_MGR_TBL_TYPE_MAX] = {
- [CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_HIGH_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_HIGH] =
TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
- [CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_LOW_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_LOW] =
TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
- [CFA_TCAM_MGR_TBL_TYPE_PROF_TCAM_APPS]=
+ [CFA_TCAM_MGR_TBL_TYPE_PROF_TCAM] =
TF_TCAM_TBL_TYPE_PROF_TCAM,
- [CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_WC_TCAM] =
TF_TCAM_TBL_TYPE_WC_TCAM,
- [CFA_TCAM_MGR_TBL_TYPE_SP_TCAM_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_SP_TCAM] =
TF_TCAM_TBL_TYPE_SP_TCAM,
- [CFA_TCAM_MGR_TBL_TYPE_CT_RULE_TCAM_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_CT_RULE_TCAM] =
TF_TCAM_TBL_TYPE_CT_RULE_TCAM,
- [CFA_TCAM_MGR_TBL_TYPE_VEB_TCAM_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_VEB_TCAM] =
TF_TCAM_TBL_TYPE_VEB_TCAM,
- [CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_HIGH_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_HIGH] =
TF_TCAM_TBL_TYPE_WC_TCAM_HIGH,
- [CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_LOW_APPS] =
+ [CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_LOW] =
TF_TCAM_TBL_TYPE_WC_TCAM_LOW,
};
@@ -53,41 +53,23 @@ const char *
cfa_tcam_mgr_tbl_2_str(enum cfa_tcam_mgr_tbl_type tcam_type)
{
switch (tcam_type) {
- case CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_HIGH_AFM:
- return "l2_ctxt_tcam_high AFM";
- case CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_HIGH_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_HIGH:
return "l2_ctxt_tcam_high Apps";
- case CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_LOW_AFM:
- return "l2_ctxt_tcam_low AFM";
- case CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_LOW_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_L2_CTXT_TCAM_LOW:
return "l2_ctxt_tcam_low Apps";
- case CFA_TCAM_MGR_TBL_TYPE_PROF_TCAM_AFM:
- return "prof_tcam AFM";
- case CFA_TCAM_MGR_TBL_TYPE_PROF_TCAM_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_PROF_TCAM:
return "prof_tcam Apps";
- case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_AFM:
- return "wc_tcam AFM";
- case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM:
return "wc_tcam Apps";
- case CFA_TCAM_MGR_TBL_TYPE_VEB_TCAM_AFM:
- return "veb_tcam AFM";
- case CFA_TCAM_MGR_TBL_TYPE_VEB_TCAM_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_VEB_TCAM:
return "veb_tcam Apps";
- case CFA_TCAM_MGR_TBL_TYPE_SP_TCAM_AFM:
- return "sp_tcam AFM";
- case CFA_TCAM_MGR_TBL_TYPE_SP_TCAM_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_SP_TCAM:
return "sp_tcam Apps";
- case CFA_TCAM_MGR_TBL_TYPE_CT_RULE_TCAM_AFM:
- return "ct_rule_tcam AFM";
- case CFA_TCAM_MGR_TBL_TYPE_CT_RULE_TCAM_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_CT_RULE_TCAM:
return "ct_rule_tcam Apps";
- case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_HIGH_AFM:
- return "wc_tcam_high AFM";
- case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_HIGH_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_HIGH:
return "wc_tcam_high Apps";
- case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_LOW_AFM:
- return "wc_tcam_low AFM";
- case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_LOW_APPS:
+ case CFA_TCAM_MGR_TBL_TYPE_WC_TCAM_LOW:
return "wc_tcam_low Apps";
default:
return "Invalid tcam table type";
@@ -972,10 +954,13 @@ cfa_tcam_mgr_bitmap_alloc(struct tf *tfp __rte_unused,
/* Allocate first index to avoid idx 0 */
first_idx = ba_alloc(tcam_mgr_data->session_bmp);
- if (first_idx == BA_FAIL)
+
[PATCH v6 19/47] net/bnxt: tf_ulp: convert recipe table to dynamic memory
From: Kishore Padmanabha
Converted the recipe table allocation from static model to dynamic
memory allocation model.
Signed-off-by: Kishore Padmanabha
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 175 +++
drivers/net/bnxt/tf_ulp/ulp_mapper.h | 5 +-
2 files changed, 97 insertions(+), 83 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 7045efffad..a7b35bf292 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -1280,65 +1280,71 @@ ulp_mapper_field_opc_next(struct bnxt_ulp_mapper_parms
*parms,
static void
ulp_mapper_key_recipe_tbl_deinit(struct bnxt_ulp_mapper_data *mdata)
{
+ struct bnxt_ulp_key_recipe_entry **recipes;
enum bnxt_ulp_direction dir;
+ uint32_t idx, ftype;
+
+ /* If recipe table is not initialized then exit */
+ if (!mdata->key_recipe_info.num_recipes)
+ return;
for (dir = 0; dir < BNXT_ULP_DIRECTION_LAST; dir++) {
- rte_free(mdata->key_recipe_info.em_recipes[dir]);
- rte_free(mdata->key_recipe_info.wc_recipes[dir]);
+ for (ftype = 0; ftype < ULP_RECIPE_TYPE_MAX; ftype++) {
+ recipes = mdata->key_recipe_info.recipes[dir][ftype];
+ for (idx = 0; idx < mdata->key_recipe_info.num_recipes;
+ idx++) {
+ if (recipes[idx])
+ 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.num_recipes = 0;
}
static int32_t
ulp_mapper_key_recipe_tbl_init(struct bnxt_ulp_context *ulp_ctx,
struct bnxt_ulp_mapper_data *mdata)
{
- struct bnxt_ulp_key_recipe_entry *recipes;
+ struct bnxt_ulp_key_recipe_entry **recipes;
enum bnxt_ulp_direction dir;
- uint32_t dev_id = 0;
- uint32_t num_recipes;
+ uint32_t dev_id = 0, size_val;
+ uint32_t num_recipes, ftype;
int32_t rc = 0;
rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
if (rc) {
BNXT_DRV_DBG(ERR, "Unable to get device id from ulp.\n");
- return rc;
+ return -EINVAL;
}
num_recipes = bnxt_ulp_num_key_recipes_get(ulp_ctx);
if (!num_recipes)
- return 0;
+ return rc;
+ size_val = sizeof(struct bnxt_ulp_key_recipe_entry *);
for (dir = 0; dir < BNXT_ULP_DIRECTION_LAST; dir++) {
- recipes = rte_zmalloc("key_recipe_em",
- sizeof(struct bnxt_ulp_key_recipe_entry) *
- num_recipes, 0);
- if (!recipes)
- goto error;
- mdata->key_recipe_info.em_recipes[dir] = recipes;
-
- recipes = rte_zmalloc("key_recipe_wc",
- sizeof(struct bnxt_ulp_key_recipe_entry) *
- num_recipes, 0);
- if (!recipes)
- goto error;
- mdata->key_recipe_info.wc_recipes[dir] = recipes;
+ 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");
+ return -ENOMEM;
+ }
+ mdata->key_recipe_info.recipes[dir][ftype] = recipes;
+ }
}
-
mdata->key_recipe_info.num_recipes = num_recipes;
mdata->key_recipe_info.max_fields = BNXT_ULP_KEY_RECIPE_MAX_FLDS;
-
- return 0;
-error:
- (void)ulp_mapper_key_recipe_tbl_deinit(mdata);
- return -ENOMEM;
+ return rc;
}
-static struct bnxt_ulp_key_recipe_entry *
-ulp_mapper_key_recipe_entry_get(struct bnxt_ulp_context *ulp_ctx,
- enum bnxt_ulp_direction dir,
- enum bnxt_ulp_resource_sub_type stype,
- uint8_t recipe_id, uint8_t *max_fields)
+static struct bnxt_ulp_mapper_data *
+ulp_mapper_key_recipe_args_validate(struct bnxt_ulp_context *ulp_ctx,
+ enum bnxt_ulp_direction dir,
+ enum bnxt_ulp_resource_sub_type stype,
+ uint8_t recipe_id)
{
- struct bnxt_ulp_key_recipe_entry *recipes;
struct bnxt_ulp_mapper_data *mdata;
mdata = (struct bn
[PATCH v6 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 v6 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 v4 0/6] refine argparse library
On 2024/10/18 22:46, Thomas Monjalon wrote: > 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. Thanks > > Note that the lists in doxygen comments does not look nice. > You may look at this: https://www.doxygen.nl/manual/lists.html I'll look at it and push another commit if needed. > >
[v3,4/5] raw/gdtc: add support for enqueue operation
Add rawdev enqueue operation for gdtc devices.
Signed-off-by: Yong Zhang
---
drivers/raw/gdtc/gdtc_rawdev.c | 220 +
drivers/raw/gdtc/gdtc_rawdev.h | 19 +++
2 files changed, 239 insertions(+)
diff --git a/drivers/raw/gdtc/gdtc_rawdev.c b/drivers/raw/gdtc/gdtc_rawdev.c
index 9a1f939ee8..03f7cc1a8e 100644
--- a/drivers/raw/gdtc/gdtc_rawdev.c
+++ b/drivers/raw/gdtc/gdtc_rawdev.c
@@ -43,10 +43,34 @@
/* Register offset */
#define ZXDH_GDMA_BASE_OFFSET 0x10
#define ZXDH_GDMA_EXT_ADDR_OFFSET 0x218
+#define ZXDH_GDMA_SAR_LOW_OFFSET0x200
+#define ZXDH_GDMA_DAR_LOW_OFFSET0x204
+#define ZXDH_GDMA_SAR_HIGH_OFFSET 0x234
+#define ZXDH_GDMA_DAR_HIGH_OFFSET 0x238
+#define ZXDH_GDMA_XFERSIZE_OFFSET 0x208
#define ZXDH_GDMA_CONTROL_OFFSET0x230
+#define ZXDH_GDMA_TC_STATUS_OFFSET 0x0
+#define ZXDH_GDMA_STATUS_CLEAN_OFFSET 0x80
+#define ZXDH_GDMA_LLI_L_OFFSET 0x21c
+#define ZXDH_GDMA_LLI_H_OFFSET 0x220
+#define ZXDH_GDMA_CHAN_CONTINUE_OFFSET 0x224
#define ZXDH_GDMA_TC_CNT_OFFSET 0x23c
#define ZXDH_GDMA_LLI_USER_OFFSET 0x228
+/* Control register */
+#define ZXDH_GDMA_CHAN_ENABLE 0x1
+#define ZXDH_GDMA_CHAN_DISABLE 0
+#define ZXDH_GDMA_SOFT_CHAN 0x2
+#define ZXDH_GDMA_TC_INTR_ENABLE0x10
+#define ZXDH_GDMA_ALL_INTR_ENABLE 0x30
+#define ZXDH_GDMA_SBS_SHIFT 6 /* src burst size
*/
+#define ZXDH_GDMA_SBL_SHIFT 9 /* src burst
length */
+#define ZXDH_GDMA_DBS_SHIFT 13 /* dest burst size
*/
+#define ZXDH_GDMA_BURST_SIZE_MIN0x1 /* 1 byte */
+#define ZXDH_GDMA_BURST_SIZE_MEDIUM 0x4 /* 4 word */
+#define ZXDH_GDMA_BURST_SIZE_MAX0x6 /* 16 word */
+#define ZXDH_GDMA_DEFAULT_BURST_LEN 0xf /* 16 beats */
+#define ZXDH_GDMA_TC_CNT_ENABLE (1 << 27)
#define ZXDH_GDMA_CHAN_FORCE_CLOSE (1 << 31)
/* TC count & Error interrupt status register */
@@ -58,9 +82,15 @@
#define ZXDH_GDMA_TC_CNT_CLEAN (1)
#define ZXDH_GDMA_CHAN_SHIFT0x80
+#define ZXDH_GDMA_LINK_END_NODE (1 << 30)
+#define ZXDH_GDMA_CHAN_CONTINUE (1)
+
#define LOW32_MASK 0x
#define LOW16_MASK 0x
+#define IDX_TO_ADDR(addr, idx, t) \
+ ((t)((uintptr_t)(addr) + (idx) * sizeof(struct zxdh_gdma_buff_desc)))
+
static int zxdh_gdma_queue_init(struct rte_rawdev *dev, uint16_t queue_id);
static int zxdh_gdma_queue_free(struct rte_rawdev *dev, uint16_t queue_id);
@@ -308,6 +338,194 @@ zxdh_gdma_rawdev_get_attr(struct rte_rawdev *dev,
return 0;
}
+
+static inline void
+zxdh_gdma_control_cal(uint32_t *val, uint8_t tc_enable)
+{
+ *val = (ZXDH_GDMA_CHAN_ENABLE |
+ ZXDH_GDMA_SOFT_CHAN |
+ (ZXDH_GDMA_DEFAULT_BURST_LEN << ZXDH_GDMA_SBL_SHIFT) |
+ (ZXDH_GDMA_BURST_SIZE_MAX << ZXDH_GDMA_SBS_SHIFT) |
+ (ZXDH_GDMA_BURST_SIZE_MAX << ZXDH_GDMA_DBS_SHIFT));
+
+ if (tc_enable != 0)
+ *val |= ZXDH_GDMA_TC_CNT_ENABLE;
+}
+
+static inline uint32_t
+zxdh_gdma_user_get(struct zxdh_gdma_queue *queue, struct zxdh_gdma_job *job)
+{
+ uint32_t src_user = 0;
+ uint32_t dst_user = 0;
+
+ if ((job->flags & ZXDH_GDMA_JOB_DIR_MASK) == 0) {
+ ZXDH_PMD_LOG(DEBUG, "job flags:0x%x default user:0x%x",
+ job->flags,
queue->user);
+ return queue->user;
+ } else if ((job->flags & ZXDH_GDMA_JOB_DIR_TX) != 0) {
+ src_user = ZXDH_GDMA_ZF_USER;
+ dst_user = ((job->pf_id << ZXDH_GDMA_PF_NUM_SHIFT) |
+ ((job->ep_id + ZXDH_GDMA_EPID_OFFSET) <<
ZXDH_GDMA_EP_ID_SHIFT));
+
+ if (job->vf_id != 0)
+ dst_user |= (ZXDH_GDMA_VF_EN |
+((job->vf_id - 1) <<
ZXDH_GDMA_VF_NUM_SHIFT));
+ } else {
+ dst_user = ZXDH_GDMA_ZF_USER;
+ src_user = ((job->pf_id << ZXDH_GDMA_PF_NUM_SHIFT) |
+ ((job->ep_id + ZXDH_GDMA_EPID_OFFSET) <<
ZXDH_GDMA_EP_ID_SHIFT));
+
+ if (job->vf_id != 0)
+ src_user |= (ZXDH_GDMA_VF_EN |
+((job->vf_id - 1) <<
ZXDH_GDMA_VF_NUM_SHIFT));
+ }
+ ZXDH_PMD_LOG(DEBUG, "job flags:0x%x ep_id:%u, pf_id:%u, vf_id:%u,
user:0x%x",
+ job->flags, job->ep_id,
job->pf_id, job->vf_id,
+
[v3,3/5] raw/gdtc: add support for standard rawdev operations
Add support for rawdev operations such as dev_start and dev_stop.
Signed-off-by: Yong Zhang
---
drivers/raw/gdtc/gdtc_rawdev.c | 136 -
drivers/raw/gdtc/gdtc_rawdev.h | 10 +++
2 files changed, 145 insertions(+), 1 deletion(-)
diff --git a/drivers/raw/gdtc/gdtc_rawdev.c b/drivers/raw/gdtc/gdtc_rawdev.c
index c4f02cfd20..9a1f939ee8 100644
--- a/drivers/raw/gdtc/gdtc_rawdev.c
+++ b/drivers/raw/gdtc/gdtc_rawdev.c
@@ -103,6 +103,96 @@ zxdh_gdma_write_reg(struct rte_rawdev *dev, uint16_t
queue_id, uint32_t offset,
*(uint32_t *)(gdmadev->base_addr + addr) = val;
}
+static int
+zxdh_gdma_rawdev_info_get(struct rte_rawdev *dev,
+ __rte_unused rte_rawdev_obj_t
dev_info,
+ __rte_unused size_t
dev_info_size)
+{
+ if (dev == NULL)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int
+zxdh_gdma_rawdev_configure(const struct rte_rawdev *dev,
+ rte_rawdev_obj_t config,
+ size_t config_size)
+{
+ struct zxdh_gdma_config *gdma_config = NULL;
+
+ if ((dev == NULL) ||
+ (config == NULL) ||
+ (config_size != sizeof(struct zxdh_gdma_config)))
+ return -EINVAL;
+
+ gdma_config = (struct zxdh_gdma_config *)config;
+ if (gdma_config->max_vqs > ZXDH_GDMA_TOTAL_CHAN_NUM) {
+ ZXDH_PMD_LOG(ERR, "gdma supports up to %d queues",
ZXDH_GDMA_TOTAL_CHAN_NUM);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int
+zxdh_gdma_rawdev_start(struct rte_rawdev *dev)
+{
+ struct zxdh_gdma_rawdev *gdmadev = NULL;
+
+ if (dev == NULL)
+ return -EINVAL;
+
+ gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ gdmadev->device_state = ZXDH_GDMA_DEV_RUNNING;
+
+ return 0;
+}
+
+static void
+zxdh_gdma_rawdev_stop(struct rte_rawdev *dev)
+{
+ struct zxdh_gdma_rawdev *gdmadev = NULL;
+
+ if (dev == NULL)
+ return;
+
+ gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ gdmadev->device_state = ZXDH_GDMA_DEV_STOPPED;
+}
+
+static int
+zxdh_gdma_rawdev_reset(struct rte_rawdev *dev)
+{
+ if (dev == NULL)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int
+zxdh_gdma_rawdev_close(struct rte_rawdev *dev)
+{
+ struct zxdh_gdma_rawdev *gdmadev = NULL;
+ struct zxdh_gdma_queue *queue = NULL;
+ uint16_t queue_id = 0;
+
+ if (dev == NULL)
+ return -EINVAL;
+
+ for (queue_id = 0; queue_id < ZXDH_GDMA_TOTAL_CHAN_NUM; queue_id++) {
+ queue = zxdh_gdma_get_queue(dev, queue_id);
+ if ((queue == NULL) || (queue->enable == 0))
+ continue;
+
+ zxdh_gdma_queue_free(dev, queue_id);
+ }
+ gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ gdmadev->device_state = ZXDH_GDMA_DEV_STOPPED;
+
+ return 0;
+}
+
static int
zxdh_gdma_rawdev_queue_setup(struct rte_rawdev *dev,
uint16_t queue_id,
@@ -184,8 +274,52 @@ zxdh_gdma_rawdev_queue_setup(struct rte_rawdev *dev,
return queue_id;
}
+static int
+zxdh_gdma_rawdev_queue_release(struct rte_rawdev *dev, uint16_t queue_id)
+{
+ struct zxdh_gdma_queue *queue = NULL;
+
+ if (dev == NULL)
+ return -EINVAL;
+
+ queue = zxdh_gdma_get_queue(dev, queue_id);
+ if ((queue == NULL) || (queue->enable == 0))
+ return -EINVAL;
+
+ zxdh_gdma_queue_free(dev, queue_id);
+
+ return 0;
+}
+
+static int
+zxdh_gdma_rawdev_get_attr(struct rte_rawdev *dev,
+ __rte_unused const char
*attr_name,
+ uint64_t *attr_value)
+{
+ struct zxdh_gdma_rawdev *gdmadev = NULL;
+ struct zxdh_gdma_attr *gdma_attr = NULL;
+
+ if ((dev == NULL) || (attr_value == NULL))
+ return -EINVAL;
+
+ gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ gdma_attr = (struct zxdh_gdma_attr *)attr_value;
+ gdma_attr->num_hw_queues = gdmadev->used_num;
+
+ return 0;
+}
static const struct rte_rawdev_ops zxdh_gdma_rawdev_ops = {
+ .dev_info_get = zxdh_gdma_rawdev_info_get,
+ .dev_configure = zxdh_gdma_rawdev_configure,
+ .dev_start = zxdh_gdma_rawdev_start,
+ .dev_stop = zxdh_gdma_rawdev_stop,
+ .dev_close = zxdh_gdma_rawdev_close,
+ .dev_reset = zxdh_gdma_rawdev_reset,
+
.queue_setup = zxdh_gdma_rawdev_queue_setup,
+ .queue_release = zxdh_gdma_rawdev_queue_release,
+
+ .attr_get = zxdh_gdma_rawdev_get_attr,
};
static int
@@ -248,7 +382,7 @@ zxdh_gdma_queue_init(struct rte_rawdev *dev, uint16_t
queue_id)
ZXDH_PMD_LOG(INFO, "queue%u ring phy addr:0x%"PRIx64" virt addr:%p",
[v3,5/5] raw/gdtc: add support for dequeue operation
Add rawdev dequeue operation for gdtc devices.
Signed-off-by: Yong Zhang
---
drivers/raw/gdtc/gdtc_rawdev.c | 113 +
1 file changed, 113 insertions(+)
diff --git a/drivers/raw/gdtc/gdtc_rawdev.c b/drivers/raw/gdtc/gdtc_rawdev.c
index 03f7cc1a8e..8e9543f402 100644
--- a/drivers/raw/gdtc/gdtc_rawdev.c
+++ b/drivers/raw/gdtc/gdtc_rawdev.c
@@ -88,6 +88,8 @@
#define LOW32_MASK 0x
#define LOW16_MASK 0x
+#define ZXDH_GDMA_TC_CNT_MAX0x1
+
#define IDX_TO_ADDR(addr, idx, t) \
((t)((uintptr_t)(addr) + (idx) * sizeof(struct zxdh_gdma_buff_desc)))
@@ -526,6 +528,116 @@ zxdh_gdma_rawdev_enqueue_bufs(struct rte_rawdev *dev,
return count;
}
+
+static inline void
+zxdh_gdma_used_idx_update(struct zxdh_gdma_queue *queue, uint16_t cnt, uint8_t
data_bd_err)
+{
+ uint16_t idx = 0;
+
+ if (queue->sw_ring.used_idx + cnt < queue->queue_size)
+ queue->sw_ring.used_idx += cnt;
+ else
+ queue->sw_ring.used_idx = queue->sw_ring.used_idx + cnt -
queue->queue_size;
+
+ if (data_bd_err == 1) {
+ /* Update job status, the last job status is error */
+ if (queue->sw_ring.used_idx == 0)
+ idx = queue->queue_size - 1;
+ else
+ idx = queue->sw_ring.used_idx - 1;
+
+ queue->sw_ring.job[idx]->status = 1;
+ }
+}
+
+static int
+zxdh_gdma_rawdev_dequeue_bufs(struct rte_rawdev *dev,
+ __rte_unused struct
rte_rawdev_buf **buffers,
+ uint32_t count,
+ rte_rawdev_obj_t context)
+{
+ struct zxdh_gdma_queue *queue = NULL;
+ struct zxdh_gdma_enqdeq *e_context = NULL;
+ uint16_t queue_id = 0;
+ uint32_t val = 0;
+ uint16_t tc_cnt = 0;
+ uint16_t diff_cnt = 0;
+ uint16_t i = 0;
+ uint16_t bd_idx = 0;
+ uint64_t next_bd_addr = 0;
+ uint8_t data_bd_err = 0;
+
+ if ((dev == NULL) || (context == NULL))
+ return -EINVAL;
+
+ e_context = (struct zxdh_gdma_enqdeq *)context;
+ queue_id = e_context->vq_id;
+ queue = zxdh_gdma_get_queue(dev, queue_id);
+ if ((queue == NULL) || (queue->enable == 0))
+ return -EINVAL;
+
+ if (queue->sw_ring.pend_cnt == 0)
+ goto deq_job;
+
+ /* Get data transmit count */
+ val = zxdh_gdma_read_reg(dev, queue_id, ZXDH_GDMA_TC_CNT_OFFSET);
+ tc_cnt = val & LOW16_MASK;
+ if (tc_cnt >= queue->tc_cnt)
+ diff_cnt = tc_cnt - queue->tc_cnt;
+ else
+ diff_cnt = tc_cnt + ZXDH_GDMA_TC_CNT_MAX - queue->tc_cnt;
+
+ queue->tc_cnt = tc_cnt;
+
+ /* Data transmit error, channel stopped */
+ if ((val & ZXDH_GDMA_ERR_STATUS) != 0) {
+ next_bd_addr = zxdh_gdma_read_reg(dev, queue_id,
ZXDH_GDMA_LLI_L_OFFSET);
+ next_bd_addr |= ((uint64_t)zxdh_gdma_read_reg(dev, queue_id,
+ ZXDH_GDMA_LLI_H_OFFSET)
<< 32);
+ next_bd_addr = next_bd_addr << 6;
+ bd_idx = (next_bd_addr - queue->ring.ring_mem) / sizeof(struct
zxdh_gdma_buff_desc);
+ if ((val & ZXDH_GDMA_SRC_DATA_ERR) || (val &
ZXDH_GDMA_DST_ADDR_ERR)) {
+ diff_cnt++;
+ data_bd_err = 1;
+ }
+ ZXDH_PMD_LOG(INFO, "queue%d is err(0x%x) next_bd_idx:%u
ll_addr:0x%"PRIx64" def user:0x%x",
+ queue_id, val, bd_idx, next_bd_addr,
queue->user);
+
+ ZXDH_PMD_LOG(INFO, "Clean up error status");
+ val = ZXDH_GDMA_ERR_STATUS | ZXDH_GDMA_ERR_INTR_ENABLE;
+ zxdh_gdma_write_reg(dev, queue_id, ZXDH_GDMA_TC_CNT_OFFSET,
val);
+
+ ZXDH_PMD_LOG(INFO, "Restart channel");
+ zxdh_gdma_write_reg(dev, queue_id, ZXDH_GDMA_XFERSIZE_OFFSET,
0);
+ zxdh_gdma_control_cal(&val, 0);
+ zxdh_gdma_write_reg(dev, queue_id, ZXDH_GDMA_CONTROL_OFFSET,
val);
+ }
+
+ if (diff_cnt != 0) {
+ zxdh_gdma_used_idx_update(queue, diff_cnt, data_bd_err);
+ queue->sw_ring.deq_cnt += diff_cnt;
+ queue->sw_ring.pend_cnt -= diff_cnt;
+ }
+
+deq_job:
+ if (queue->sw_ring.deq_cnt == 0)
+ return 0;
+ else if (queue->sw_ring.deq_cnt < count)
+ count = queue->sw_ring.deq_cnt;
+
+ queue->sw_ring.deq_cnt -= count;
+
+ for (i = 0; i < count; i++) {
+ e_context->job[i] = queue->sw_ring.job[queue->sw_ring.deq_idx];
+ queue->sw_ring.job[queue->sw_ring.deq_idx] = NULL;
+ if (++queue->sw_ring.deq_idx >= queue->queue_size)
+
[v3,1/5] raw/gdtc: introduce gdtc raw device driver
Introduce rawdev driver support for GDTC which
can help to connect two separate hosts with each other.
Signed-off-by: Yong Zhang
---
MAINTAINERS| 5 +
doc/guides/rawdevs/gdtc.rst| 35 ++
doc/guides/rawdevs/index.rst | 1 +
drivers/raw/gdtc/gdtc_rawdev.c | 212 +
drivers/raw/gdtc/gdtc_rawdev.h | 120 +++
drivers/raw/gdtc/meson.build | 5 +
drivers/raw/meson.build| 1 +
7 files changed, 379 insertions(+)
create mode 100644 doc/guides/rawdevs/gdtc.rst
create mode 100644 drivers/raw/gdtc/gdtc_rawdev.c
create mode 100644 drivers/raw/gdtc/gdtc_rawdev.h
create mode 100644 drivers/raw/gdtc/meson.build
diff --git a/MAINTAINERS b/MAINTAINERS
index c5a703b5c0..32fc4c801e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1511,6 +1511,11 @@ M: Gagandeep Singh
F: drivers/raw/dpaa2_cmdif/
F: doc/guides/rawdevs/dpaa2_cmdif.rst
+ZTE GDTC
+M: Yong Zhang
+F: drivers/raw/gdtc/
+F: doc/guides/rawdevs/gdtc.rst
+
Packet processing
-
diff --git a/doc/guides/rawdevs/gdtc.rst b/doc/guides/rawdevs/gdtc.rst
new file mode 100644
index 00..7e4e648c89
--- /dev/null
+++ b/doc/guides/rawdevs/gdtc.rst
@@ -0,0 +1,35 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright 2024 ZTE Corporation
+
+GDTC Rawdev Driver
+==
+
+The ``gdtc`` rawdev driver is an implementation of the rawdev API,
+that provides communication between two separate hosts.
+This is achieved via using the GDMA controller of Dinghai SoC,
+which can be configured through exposed MPF device.
+
+Device Setup
+-
+
+Using the GDTC PMD driver does not require the MPF device to bind
+additional user-space IO driver.
+
+Before performing actual data transmission, it is necessary to
+call ``rte_rawdev_queue_setup()`` to obtain an available queue ID.
+
+For data transfer, utilize the standard ``rte_rawdev_enqueue_buffers()`` API.
+The data transfer status can be queried via ``rte_rawdev_dequeue_buffers()``,
+which will return the number of successfully transferred data items.
+
+Initialization
+--
+
+The ``gdtc`` rawdev driver needs to work in IOVA PA mode.
+Consider using ``--iova-mode=pa`` in the EAL options.
+
+Platform Requirement
+
+
+This PMD is only supported on ZTE Neo Platforms:
+- Neo X510/X512
diff --git a/doc/guides/rawdevs/index.rst b/doc/guides/rawdevs/index.rst
index f34315f051..921f3a120c 100644
--- a/doc/guides/rawdevs/index.rst
+++ b/doc/guides/rawdevs/index.rst
@@ -16,3 +16,4 @@ application through rawdev API.
dpaa2_cmdif
ifpga
ntb
+gdtc
diff --git a/drivers/raw/gdtc/gdtc_rawdev.c b/drivers/raw/gdtc/gdtc_rawdev.c
new file mode 100644
index 00..436658d850
--- /dev/null
+++ b/drivers/raw/gdtc/gdtc_rawdev.c
@@ -0,0 +1,212 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2024 ZTE Corporation
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "gdtc_rawdev.h"
+
+/* Register offset */
+#define ZXDH_GDMA_BASE_OFFSET 0x10
+
+#define ZXDH_GDMA_CHAN_SHIFT0x80
+char zxdh_gdma_driver_name[] = "rawdev_zxdh_gdma";
+char dev_name[] = "zxdh_gdma";
+
+uint32_t
+zxdh_gdma_read_reg(struct rte_rawdev *dev, uint16_t queue_id, uint32_t offset)
+{
+ struct zxdh_gdma_rawdev *gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ uint32_t addr = 0;
+ uint32_t val = 0;
+
+ addr = offset + queue_id * ZXDH_GDMA_CHAN_SHIFT;
+ val = *(uint32_t *)(gdmadev->base_addr + addr);
+
+ return val;
+}
+
+void
+zxdh_gdma_write_reg(struct rte_rawdev *dev, uint16_t queue_id, uint32_t
offset, uint32_t val)
+{
+ struct zxdh_gdma_rawdev *gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ uint32_t addr = 0;
+
+ addr = offset + queue_id * ZXDH_GDMA_CHAN_SHIFT;
+ *(uint32_t *)(gdmadev->base_addr + addr) = val;
+}
+
+static const struct rte_rawdev_ops zxdh_gdma_rawdev_ops = {
+};
+
+static int
+zxdh_gdma_map_resource(struct rte_pci_device *dev)
+{
+ int fd = -1;
+ char devname[PATH_MAX];
+ void *mapaddr = NULL;
+ struct rte_pci_addr *loc;
+
+ loc = &dev->addr;
+ snprintf(devname, sizeof(devname), "%s/" PCI_PRI_FMT "/resource0",
+ rte_pci_get_sysfs_path(),
+ loc->domain, loc->bus, loc->devid,
+ loc->function);
+
+ fd = open(devname, O_RDWR);
+ if (fd < 0) {
+ ZXDH_PMD_LOG(ERR, "Cannot open %s: %s", devname,
strerror(errno));
+ return -1;
+ }
+
+ /* Map the PCI memory resource of device */
+ mapaddr = rte_mem_map(NULL, (size_t)dev->mem_resource[0].len,
+ RTE_PROT_READ | RTE_PROT_WRITE
[v3,2/5] raw/gdtc: add support for queue setup operation
Add queue initialization and release interface.
Signed-off-by: Yong Zhang
---
drivers/raw/gdtc/gdtc_rawdev.c | 242 +
drivers/raw/gdtc/gdtc_rawdev.h | 19 +++
2 files changed, 261 insertions(+)
diff --git a/drivers/raw/gdtc/gdtc_rawdev.c b/drivers/raw/gdtc/gdtc_rawdev.c
index 436658d850..c4f02cfd20 100644
--- a/drivers/raw/gdtc/gdtc_rawdev.c
+++ b/drivers/raw/gdtc/gdtc_rawdev.c
@@ -28,13 +28,58 @@
#include "gdtc_rawdev.h"
+/*
+ * User define:
+ * ep_id-bit[15:12] vfunc_num-bit[11:4] func_num-bit[3:1] vfunc_active-bit0
+ * host ep_id:5~8 zf ep_id:9
+ */
+#define ZXDH_GDMA_ZF_USER 0x9000 /* ep4 pf0 */
+#define ZXDH_GDMA_PF_NUM_SHIFT 1
+#define ZXDH_GDMA_VF_NUM_SHIFT 4
+#define ZXDH_GDMA_EP_ID_SHIFT 12
+#define ZXDH_GDMA_VF_EN 1
+#define ZXDH_GDMA_EPID_OFFSET 5
+
/* Register offset */
#define ZXDH_GDMA_BASE_OFFSET 0x10
+#define ZXDH_GDMA_EXT_ADDR_OFFSET 0x218
+#define ZXDH_GDMA_CONTROL_OFFSET0x230
+#define ZXDH_GDMA_TC_CNT_OFFSET 0x23c
+#define ZXDH_GDMA_LLI_USER_OFFSET 0x228
+
+#define ZXDH_GDMA_CHAN_FORCE_CLOSE (1 << 31)
+
+/* TC count & Error interrupt status register */
+#define ZXDH_GDMA_SRC_LLI_ERR (1 << 16)
+#define ZXDH_GDMA_SRC_DATA_ERR (1 << 17)
+#define ZXDH_GDMA_DST_ADDR_ERR (1 << 18)
+#define ZXDH_GDMA_ERR_STATUS(1 << 19)
+#define ZXDH_GDMA_ERR_INTR_ENABLE (1 << 20)
+#define ZXDH_GDMA_TC_CNT_CLEAN (1)
#define ZXDH_GDMA_CHAN_SHIFT0x80
+#define LOW32_MASK 0x
+#define LOW16_MASK 0x
+
+static int zxdh_gdma_queue_init(struct rte_rawdev *dev, uint16_t queue_id);
+static int zxdh_gdma_queue_free(struct rte_rawdev *dev, uint16_t queue_id);
+
char zxdh_gdma_driver_name[] = "rawdev_zxdh_gdma";
char dev_name[] = "zxdh_gdma";
+static inline struct zxdh_gdma_queue *
+zxdh_gdma_get_queue(struct rte_rawdev *dev, uint16_t queue_id)
+{
+ struct zxdh_gdma_rawdev *gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+
+ if (queue_id >= ZXDH_GDMA_TOTAL_CHAN_NUM) {
+ ZXDH_PMD_LOG(ERR, "queue id %d is invalid", queue_id);
+ return NULL;
+ }
+
+ return &(gdmadev->vqs[queue_id]);
+}
+
uint32_t
zxdh_gdma_read_reg(struct rte_rawdev *dev, uint16_t queue_id, uint32_t offset)
{
@@ -58,9 +103,206 @@ zxdh_gdma_write_reg(struct rte_rawdev *dev, uint16_t
queue_id, uint32_t offset,
*(uint32_t *)(gdmadev->base_addr + addr) = val;
}
+static int
+zxdh_gdma_rawdev_queue_setup(struct rte_rawdev *dev,
+uint16_t queue_id,
+rte_rawdev_obj_t
queue_conf,
+size_t conf_size)
+{
+ struct zxdh_gdma_rawdev *gdmadev = NULL;
+ struct zxdh_gdma_queue *queue = NULL;
+ struct zxdh_gdma_queue_config *qconfig = NULL;
+ struct zxdh_gdma_rbp *rbp = NULL;
+ uint16_t i = 0;
+ uint8_t is_txq = 0;
+ uint32_t src_user = 0;
+ uint32_t dst_user = 0;
+
+ if (dev == NULL)
+ return -EINVAL;
+
+ if ((queue_conf == NULL) || (conf_size != sizeof(struct
zxdh_gdma_queue_config)))
+ return -EINVAL;
+
+ gdmadev = zxdh_gdma_rawdev_get_priv(dev);
+ qconfig = (struct zxdh_gdma_queue_config *)queue_conf;
+
+ for (i = 0; i < ZXDH_GDMA_TOTAL_CHAN_NUM; i++) {
+ if (gdmadev->vqs[i].enable == 0)
+ break;
+ }
+ if (i >= ZXDH_GDMA_TOTAL_CHAN_NUM) {
+ ZXDH_PMD_LOG(ERR, "Failed to setup queue, no avail queues");
+ return -1;
+ }
+ queue_id = i;
+ if (zxdh_gdma_queue_init(dev, queue_id) != 0) {
+ ZXDH_PMD_LOG(ERR, "Failed to init queue");
+ return -1;
+ }
+ queue = &(gdmadev->vqs[queue_id]);
+
+ rbp = qconfig->rbp;
+ if ((rbp->srbp != 0) && (rbp->drbp == 0)) {
+ is_txq = 0;
+ dst_user = ZXDH_GDMA_ZF_USER;
+ src_user = ((rbp->spfid << ZXDH_GDMA_PF_NUM_SHIFT) |
+ ((rbp->sportid + ZXDH_GDMA_EPID_OFFSET) <<
ZXDH_GDMA_EP_ID_SHIFT));
+
+ if (rbp->svfid != 0)
+ src_user |= (ZXDH_GDMA_VF_EN |
+((rbp->svfid - 1) <<
ZXDH_GDMA_VF_NUM_SHIFT));
+
+ ZXDH_PMD_LOG(DEBUG, "rxq->qidx:%d setup src_user(ep:%d pf:%d
vf:%d) success",
+ queue_id, (uint8_t)rbp->sportid,
(uint8_t)rbp->spfid,
+ (uint8_t)rbp->svfid);
+ } else if ((rbp->srbp == 0
[PATCH v6 00/47] TruFlow update for Thor2
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. ** v5->v6: Updated the below patch to fix a build error reported in rte_free(). [PATCH 11/47] net/bnxt: tfc: support tf-core for Thor2 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 |19 +- drivers/net/bnxt/bnxt_ring.h |54 +- drivers/net/bnxt/bnxt_rxr.c | 5 +- drivers/net/bnxt/bnxt
[PATCH v6 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 v6 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 v6 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 v6 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 v6 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
[PATCH v6 07/47] net/bnxt: tf_core: fix slice count in case of HA entry move
From: Sangtani Parag Satishbhai When entries are moved during HA, a shared move function transfers TCAM entries by using get/set message APIs, and the slice number of the entry is required to accomplish the movement. The slice number is calculated as the product of row_slice and entry size. Before calling get/set message APIs, the source entry size should be updated with the destination entry size; otherwise, it might corrupt the slice number field, which may result in writing an incorrect entry. A fix is made which now copies the entry size from the source to the destination before calling get/set message APIs, ensuring the correct slice number is modified. Signed-off-by: Sangtani Parag Satishbhai Reviewed-by: Sriharsha Basavapatna Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_core/cfa_tcam_mgr.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c index 349f52caba..33b1e4121e 100644 --- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c +++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c @@ -1717,6 +1717,11 @@ cfa_tcam_mgr_shared_entry_move(int sess_idx, struct cfa_tcam_mgr_context *contex uint8_t key[CFA_TCAM_MGR_MAX_KEY_SIZE]; uint8_t mask[CFA_TCAM_MGR_MAX_KEY_SIZE]; uint8_t result[CFA_TCAM_MGR_MAX_KEY_SIZE]; + /* +* Copy entry size before moving else if +* slice number is non zero and entry size is zero it will cause issues +*/ + dst_row->entry_size = src_row->entry_size; int rc; @@ -1791,7 +1796,6 @@ cfa_tcam_mgr_shared_entry_move(int sess_idx, struct cfa_tcam_mgr_context *contex ROW_ENTRY_SET(dst_row, dst_row_slice); dst_row->entries[dst_row_slice] = entry_id; - dst_row->entry_size = src_row->entry_size; dst_row->priority = src_row->priority; ROW_ENTRY_CLEAR(src_row, entry->slice); entry->row = dst_row_index; -- 2.39.3
[PATCH v6 10/47] net/bnxt: tf_core: remove dead code from session-based priority TCAM mgr
From: Randy Schacher
Remove references to tx_tcam_supported and rx_tcam_supported
logic which chooses between FW-based tcam resource allocation
and driver-based tcam manager.
Signed-off-by: Randy Schacher
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Peter Spreadborough
Reviewed-by: Manish Kurup
Reviewed-by: Farah Smith
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/cfa_tcam_mgr.c| 46
drivers/net/bnxt/tf_core/cfa_tcam_mgr.h| 29 --
drivers/net/bnxt/tf_core/tf_session.h | 5 -
drivers/net/bnxt/tf_core/tf_tcam.c | 294 +
drivers/net/bnxt/tf_core/tf_tcam_mgr_msg.c | 28 --
drivers/net/bnxt/tf_core/tf_tcam_mgr_msg.h | 6 -
6 files changed, 8 insertions(+), 400 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
index 380e828da8..3875a0b934 100644
--- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
+++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c
@@ -1079,52 +1079,6 @@ cfa_tcam_mgr_init(struct tf *tfp, enum
cfa_tcam_mgr_device_type type,
return 0;
}
-int
-cfa_tcam_mgr_qcaps(struct tf *tfp __rte_unused,
- struct cfa_tcam_mgr_qcaps_parms *parms)
-{
- struct cfa_tcam_mgr_data *tcam_mgr_data;
- struct tf_session *tfs;
- unsigned int type;
- int rc;
-
- CFA_TCAM_MGR_CHECK_PARMS2(tfp, parms);
-
- rc = tf_session_get_session_internal(tfp, &tfs);
- if (rc)
- return rc;
-
- tcam_mgr_data = tfs->tcam_mgr_handle;
- if (!tcam_mgr_data) {
- CFA_TCAM_MGR_LOG_0(ERR, "No TCAM data created for session.\n");
- return -CFA_TCAM_MGR_ERR_CODE(PERM);
- }
-
- /*
-* This code will indicate if TCAM Manager is managing a logical TCAM
-* table or not. If not, then the physical TCAM will have to be
-* accessed using the traditional methods.
-*/
- parms->rx_tcam_supported = 0;
- parms->tx_tcam_supported = 0;
- for (type = 0; type < CFA_TCAM_MGR_TBL_TYPE_MAX; type++) {
- if (tcam_mgr_data->cfa_tcam_mgr_tables[TF_DIR_RX]
- [type].max_entries > 0 &&
- tcam_mgr_data->cfa_tcam_mgr_tables[TF_DIR_RX]
- [type].hcapi_type > 0)
- parms->rx_tcam_supported |=
- 1 << cfa_tcam_mgr_get_phys_table_type(type);
- if (tcam_mgr_data->cfa_tcam_mgr_tables[TF_DIR_TX]
- [type].max_entries > 0 &&
- tcam_mgr_data->cfa_tcam_mgr_tables[TF_DIR_TX]
- [type].hcapi_type > 0)
- parms->tx_tcam_supported |=
- 1 << cfa_tcam_mgr_get_phys_table_type(type);
- }
-
- return 0;
-}
-
static
int cfa_tcam_mgr_validate_tcam_cnt(struct tf *tfp __rte_unused,
struct cfa_tcam_mgr_data *tcam_mgr_data,
diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
index 25654a8351..1cbd25e7d1 100644
--- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
+++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.h
@@ -122,18 +122,6 @@ struct cfa_tcam_mgr_init_parms {
uint32_t max_entries;
};
-/**
- * TCAM Manager initialization parameters
- */
-struct cfa_tcam_mgr_qcaps_parms {
- /**
-* [out] Bitmasks. Set if TCAM Manager is managing a logical TCAM.
-* Each bitmask is indexed by logical TCAM table ID.
-*/
- uint32_t rx_tcam_supported;
- uint32_t tx_tcam_supported;
-};
-
/**
* TCAM Manager configuration parameters
*/
@@ -369,23 +357,6 @@ cfa_tcam_mgr_init(struct tf *tfp, enum
cfa_tcam_mgr_device_type type,
int
cfa_tcam_mgr_get_phys_table_type(enum cfa_tcam_mgr_tbl_type type);
-/**
- * Queries the capabilities of TCAM Manager.
- *
- * [in] context
- * Pointer to context information
- *
- * [out] parms
- * Pointer to parameters to be returned
- *
- * Returns
- * - (0) if successful.
- * - (<0) on failure.
- */
-int
-cfa_tcam_mgr_qcaps(struct tf *tfp __rte_unused,
- struct cfa_tcam_mgr_qcaps_parms *parms);
-
/**
* Initializes the TCAM module with the requested DBs. Must be
* invoked as the first thing before any of the access functions.
diff --git a/drivers/net/bnxt/tf_core/tf_session.h
b/drivers/net/bnxt/tf_core/tf_session.h
index d46d89e9e9..7668e9d0e0 100644
--- a/drivers/net/bnxt/tf_core/tf_session.h
+++ b/drivers/net/bnxt/tf_core/tf_session.h
@@ -174,11 +174,6 @@ struct tf_session {
*/
uint16_t wc_num_slices_per_row;
- /**
-* Indicates if TCAM is controlled by TCAM Manager
-*/
- int tcam_mgr_control[TF_DIR_MAX][TF_TCAM_TBL_TYPE_MAX];
-
/**
* TCAM Manager handle pointing to session based tcam memory
*/
diff --git a/drivers/net/bnxt/tf_core/tf_tcam.c
b/drivers/net/bnxt/tf_core/t
[PATCH v6 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 v6 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 v6 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 v6 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 v6 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 v6 25/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.
- enable recipe id generation
- fix segfault in the wildcard recipe process
Signed-off-by: Kishore Padmanabha
Signed-off-by: Sriharsha Basavapatna
Reviewed-by: Ajit Khaparde
---
.../generic_templates/ulp_template_db_enum.h | 115 +++---
.../generic_templates/ulp_template_db_tbl.c | 8 +-
.../ulp_template_db_thor2_class.c | 352 +++--
.../ulp_template_db_thor_class.c | 372 --
4 files changed, 547 insertions(+), 300 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 240acbc564..ddd65a62b1 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
@@ -6,7 +6,7 @@
#ifndef ULP_TEMPLATE_DB_H_
#define ULP_TEMPLATE_DB_H_
-#define BNXT_ULP_REGFILE_MAX_SZ 81
+#define BNXT_ULP_REGFILE_MAX_SZ 82
#define BNXT_ULP_MAX_NUM_DEVICES 5
#define BNXT_ULP_LOG2_MAX_NUM_DEV 2.32192809488736
#define BNXT_ULP_GEN_TBL_MAX_SZ 50
@@ -31,19 +31,19 @@
#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 122
+#define ULP_THOR_CLASS_TBL_LIST_SIZE 126
#define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 605
#define ULP_THOR_CLASS_KEY_EXT_LIST_SIZE 615
-#define ULP_THOR_CLASS_IDENT_LIST_SIZE 39
-#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 1248
+#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_COND_OPER_LIST_SIZE 7
#define ULP_THOR2_CLASS_TMPL_LIST_SIZE 5
-#define ULP_THOR2_CLASS_TBL_LIST_SIZE 121
+#define ULP_THOR2_CLASS_TBL_LIST_SIZE 125
#define ULP_THOR2_CLASS_KEY_INFO_LIST_SIZE 665
#define ULP_THOR2_CLASS_KEY_EXT_LIST_SIZE 628
-#define ULP_THOR2_CLASS_IDENT_LIST_SIZE 49
-#define ULP_THOR2_CLASS_RESULT_FIELD_LIST_SIZE 1512
+#define ULP_THOR2_CLASS_IDENT_LIST_SIZE 53
+#define ULP_THOR2_CLASS_RESULT_FIELD_LIST_SIZE 1516
#define ULP_THOR2_CLASS_COND_LIST_SIZE 3298
#define ULP_THOR2_CLASS_COND_OPER_LIST_SIZE 7
#define ULP_WH_PLUS_ACT_TMPL_LIST_SIZE 11
@@ -699,8 +699,10 @@ enum bnxt_ulp_key_recipe_opc {
enum bnxt_ulp_key_recipe_tbl_opc {
BNXT_ULP_KEY_RECIPE_TBL_OPC_NOT_USED = 0,
- BNXT_ULP_KEY_RECIPE_TBL_OPC_WR_REGFILE = 1,
- BNXT_ULP_KEY_RECIPE_TBL_OPC_LAST = 2
+ BNXT_ULP_KEY_RECIPE_TBL_OPC_ALLOC_REGFILE = 1,
+ BNXT_ULP_KEY_RECIPE_TBL_OPC_ALLOC_WR_REGFILE = 2,
+ BNXT_ULP_KEY_RECIPE_TBL_OPC_WR_REGFILE = 3,
+ BNXT_ULP_KEY_RECIPE_TBL_OPC_LAST = 4
};
enum bnxt_ulp_mark_db_opc {
@@ -795,53 +797,54 @@ enum bnxt_ulp_rf_idx {
BNXT_ULP_RF_IDX_HDR_SIG_ID = 32,
BNXT_ULP_RF_IDX_FLOW_SIG_ID = 33,
BNXT_ULP_RF_IDX_RID = 34,
- BNXT_ULP_RF_IDX_RID_1 = 35,
- BNXT_ULP_RF_IDX_WC_KEY_ID_0 = 36,
- BNXT_ULP_RF_IDX_EM_KEY_ID_0 = 37,
- BNXT_ULP_RF_IDX_DRV_FUNC_MAC = 38,
- BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC = 39,
- BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR = 40,
- BNXT_ULP_RF_IDX_CC = 41,
- BNXT_ULP_RF_IDX_CF_FLOW_SIG_ID = 42,
- BNXT_ULP_RF_IDX_PHY_PORT = 43,
- BNXT_ULP_RF_IDX_METADATA_PROF = 44,
- BNXT_ULP_RF_IDX_MODIFY_PTR = 45,
- BNXT_ULP_RF_IDX_SOCK_DIR_SVIF = 46,
- BNXT_ULP_RF_IDX_SOCK_DIR_PARIF = 47,
- BNXT_ULP_RF_IDX_SOCK_DIR_ACT_PTR = 48,
- BNXT_ULP_RF_IDX_SOCK_DIR_PARENT_MAC = 49,
- BNXT_ULP_RF_IDX_RSS_VNIC = 50,
- BNXT_ULP_RF_IDX_PORT_IS_PF = 51,
- BNXT_ULP_RF_IDX_METER_PROFILE_PTR_0 = 52,
- BNXT_ULP_RF_IDX_METER_PTR_0 = 53,
- BNXT_ULP_RF_IDX_REF_CNT = 54,
- BNXT_ULP_RF_IDX_RF_0 = 55,
- BNXT_ULP_RF_IDX_RF_1 = 56,
- BNXT_ULP_RF_IDX_RF_2 = 57,
- BNXT_ULP_RF_IDX_RF_3 = 58,
- BNXT_ULP_RF_IDX_RF_4 = 59,
- BNXT_ULP_RF_IDX_RF_5 = 60,
- BNXT_ULP_RF_IDX_RF_6 = 61,
- BNXT_ULP_RF_IDX_RF_7 = 62,
- BNXT_ULP_RF_IDX_CMM_ACT_HNDL = 63,
- BNXT_ULP_RF_IDX_CMM_STAT_HNDL = 64,
- BNXT_ULP_RF_IDX_CMM_MOD_HNDL = 65,
- BNXT_ULP_RF_IDX_CMM_ENC_HNDL = 66,
- BNXT_ULP_RF_IDX_CMM_SRP_HNDL = 67,
- BNXT_ULP_RF_IDX_VF_FUNC_METADATA = 68,
- BNXT_ULP_RF_IDX_CHAIN_ID_METADATA = 69,
- BNXT_ULP_RF_IDX_RECYCLE_CNT = 70,
- BNXT_ULP_RF_IDX_DEST_VNIC = 71,
- BNXT_ULP_RF_IDX_DEST_VPORT = 72,
- BNXT_ULP_RF_IDX_DEST_METADATA = 73,
- BNXT_ULP_RF_IDX_PROF_TCAM_PRI = 74,
- BNXT_ULP_RF_IDX_EM_INSERT_FAIL = 75,
- BNXT_ULP_RF_IDX_PROF_TCAM_PRIORITY = 76,
- BNXT_ULP_RF_IDX_TERM_FLOW = 77,
- BNXT_ULP_RF_IDX_O_DMAC = 78,
- BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_F1 = 79,
- BNXT_ULP_RF_IDX_CMM_STAT_HNDL_F1 = 80,
- BNXT_ULP_RF_IDX_LAST = 81
+
[PATCH v6 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 v6 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: [RFC 0/2] introduce LLC aware functions
[AMD Official Use Only - AMD Internal Distribution Only] > > When are you going to send a new version? We had been testing this on various Intel and AMD platforms. We have completed testing over sub-NUMA domains on both SoC. We will be sharing the new patch (rfc-v2) before 22 Oct 2024. > > Need: > - new functions need to be marked experimental > - has to build cleanly on all platforms. > - need functional tests > - address all the other review comments
[PATCH v6 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
[PATCH v6 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 v6 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
RE: [PATCH v1 1/2] baseband/acc: FFT support in VRB2 PRQ device
Hi Maxime,
Do you want me to send a v2 for this or you can change the comment before
applying?
"Also, take the opportunity to fix some unused VRB2 registers definitions".
> -Original Message-
> From: Maxime Coquelin
> Sent: Monday, October 21, 2024 8:06 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,
>
> On 10/18/24 20:42, Chautru, Nicolas wrote:
> > 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_inpu
Re: [PATCH v1 1/2] baseband/acc: FFT support in VRB2 PRQ device
On 10/21/24 22:12, Chautru, Nicolas wrote:
Hi Maxime,
Do you want me to send a v2 for this or you can change the comment before
applying?
"Also, take the opportunity to fix some unused VRB2 registers definitions".
I can do it while applying.
Thanks,
Maxime
-Original Message-
From: Maxime Coquelin
Sent: Monday, October 21, 2024 8:06 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,
On 10/18/24 20:42, Chautru, Nicolas wrote:
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 =
Re: [PATCH v3 3/9] raw/cnxk_rvu_lf: add PMD API to get BAR addresses
08/10/2024 20:49, Akhil Goyal: > Added rte_pmd_rvu_lf_bar_get() API to get BAR address > for application to configure hardware. In my opinion, we should not return PCI BAR addresses to an application. We should make an effort to have all theses details managed in the driver. Giving this level of access to an app is a door we should probably not open. > +/** > + * Get BAR addresses for the RVU LF device. > + * > + * @param dev_id > + * device id of RVU LF device > + * @param bar_num > + * BAR number for which address is required > + * @param[out] va > + *Virtual address of the BAR. 0 if not mapped > + * @param[out] mask > + *BAR address mask, 0 if not mapped > + * > + * @return > + * Returns 0 on success, negative error code otherwise > + */ > +__rte_experimental > +int rte_pmd_rvu_lf_bar_get(uint8_t dev_id, uint8_t bar_num, size_t *va, > size_t *mask); The cover letter does not talk about this. The announced features are: " - Register mailbox callbacks for the other side to process mailboxes. - Register interrupt handler callbacks. - Process mailbox. - Set range of message IDs allowed for communication. " Having mailbox, callbacks and message IDs is perfectly fine. It should not be needed to get PCI BARs for this purpose. Maybe a level of abstraction is needed here. Also I feel mailbox messaging is something we could make generic in rte_device. As you may understand, I'm not a big fan of how the feature is implemented in this series.
[PATCH v1 72/73] net/ntnic: add meter module
From: Danylo Vodopianov
Meter module was added:
1. add/remove profile
2. create/destroy flow
3. add/remove meter policy
4. read/update stats
eth_dev_ops struct was extended with ops above.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/include/ntos_drv.h | 14 +
drivers/net/ntnic/meson.build | 2 +
.../net/ntnic/nthw/ntnic_meter/ntnic_meter.c | 483 ++
drivers/net/ntnic/ntnic_ethdev.c | 11 +-
drivers/net/ntnic/ntnic_mod_reg.c | 18 +
drivers/net/ntnic/ntnic_mod_reg.h | 11 +
6 files changed, 538 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
diff --git a/drivers/net/ntnic/include/ntos_drv.h
b/drivers/net/ntnic/include/ntos_drv.h
index 7b3c8ff3d6..f6ce442d17 100644
--- a/drivers/net/ntnic/include/ntos_drv.h
+++ b/drivers/net/ntnic/include/ntos_drv.h
@@ -12,6 +12,7 @@
#include
#include
+#include "rte_mtr.h"
#include "stream_binary_flow_api.h"
#include "nthw_drv.h"
@@ -90,6 +91,19 @@ struct __rte_cache_aligned ntnic_tx_queue {
enum fpga_info_profile profile; /* Inline / Capture */
};
+struct nt_mtr_profile {
+ LIST_ENTRY(nt_mtr_profile) next;
+ uint32_t profile_id;
+ struct rte_mtr_meter_profile profile;
+};
+
+struct nt_mtr {
+ LIST_ENTRY(nt_mtr) next;
+ uint32_t mtr_id;
+ int shared;
+ struct nt_mtr_profile *profile;
+};
+
struct pmd_internals {
const struct rte_pci_device *pci_dev;
struct flow_eth_dev *flw_dev;
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index 8c6d02a5ec..ca46541ef3 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -17,6 +17,7 @@ includes = [
include_directories('nthw'),
include_directories('nthw/supported'),
include_directories('nthw/model'),
+include_directories('nthw/ntnic_meter'),
include_directories('nthw/flow_filter'),
include_directories('nthw/flow_api'),
include_directories('nim/'),
@@ -92,6 +93,7 @@ sources = files(
'nthw/flow_filter/flow_nthw_tx_cpy.c',
'nthw/flow_filter/flow_nthw_tx_ins.c',
'nthw/flow_filter/flow_nthw_tx_rpl.c',
+'nthw/ntnic_meter/ntnic_meter.c',
'nthw/model/nthw_fpga_model.c',
'nthw/nthw_platform.c',
'nthw/nthw_rac.c',
diff --git a/drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
b/drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
new file mode 100644
index 00..e4e8fe0c7d
--- /dev/null
+++ b/drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
@@ -0,0 +1,483 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Napatech A/S
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include "ntos_drv.h"
+#include "ntlog.h"
+#include "nt_util.h"
+#include "ntos_system.h"
+#include "ntnic_mod_reg.h"
+
+static inline uint8_t get_caller_id(uint16_t port)
+{
+ return MAX_VDPA_PORTS + (uint8_t)(port & 0x7f) + 1;
+}
+
+struct qos_integer_fractional {
+ uint32_t integer;
+ uint32_t fractional;/* 1/1024 */
+};
+
+/*
+ * Inline FLM metering
+ */
+
+static int eth_mtr_capabilities_get_inline(struct rte_eth_dev *eth_dev,
+ struct rte_mtr_capabilities *cap,
+ struct rte_mtr_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ uint8_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ if (!profile_inline_ops->flow_mtr_supported(internals->flw_dev)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Ethernet device does not support metering");
+ }
+
+ memset(cap, 0x0, sizeof(struct rte_mtr_capabilities));
+
+ /* MBR records use 28-bit integers */
+ cap->n_max =
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev,
+ caller_id);
+ cap->n_shared_max = cap->n_max;
+
+ cap->identical = 0;
+ cap->shared_identical = 0;
+
+ cap->shared_n_flows_per_mtr_max = UINT32_MAX;
+
+ /* Limited by number of MBR record ids per FLM learn record */
+ cap->chaining_n_mtrs_per_flow_max = 4;
+
+ cap->chaining_use_prev_mtr_color_supported = 0;
+ cap->chaining_use_prev_mtr_color_enforced = 0;
+
+ cap->meter_rate_max = (uint64_t)(0xfff << 0xf) * 1099;
+
+ cap->stats_mask = RTE_MTR_STATS_N_PKTS_GREEN |
RTE_MTR_STATS_N_BYTES_GREEN;
+
+ /* Only color-blind mode is supported */
+ cap->color_aware_srtcm_rfc2697_supported = 0;
+ cap->color_aware_trtcm_rfc2698_supported = 0;
+ cap->color_aware
[PATCH v1 69/73] net/ntnic: add thread termination
From: Danylo Vodopianov
Introduce clear_pdrv to unregister driver
from global tracking.
Modify drv_deinit to call clear_pdirv and ensure
safe termination.
Add flm sta and age event free.
Signed-off-by: Danylo Vodopianov
---
.../flow_api/profile_inline/flm_age_queue.c | 10 +++
.../flow_api/profile_inline/flm_age_queue.h | 1 +
.../flow_api/profile_inline/flm_evt_queue.c | 76 +++
.../flow_api/profile_inline/flm_evt_queue.h | 1 +
drivers/net/ntnic/ntnic_ethdev.c | 12 +++
5 files changed, 100 insertions(+)
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
index fc192ff05d..ad916a7bcc 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
@@ -46,6 +46,16 @@ void flm_age_queue_free(uint8_t port, uint16_t caller_id)
rte_ring_free(q);
}
+void flm_age_queue_free_all(void)
+{
+ int i;
+ int j;
+
+ for (i = 0; i < MAX_EVT_AGE_PORTS; i++)
+ for (j = 0; j < MAX_EVT_AGE_QUEUES; j++)
+ flm_age_queue_free(i, j);
+}
+
struct rte_ring *flm_age_queue_create(uint8_t port, uint16_t caller_id,
unsigned int count)
{
char name[20];
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
index 27154836c5..55c410ac86 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
@@ -32,6 +32,7 @@ int flm_age_event_get(uint8_t port);
void flm_age_event_set(uint8_t port);
void flm_age_event_clear(uint8_t port);
void flm_age_queue_free(uint8_t port, uint16_t caller_id);
+void flm_age_queue_free_all(void);
struct rte_ring *flm_age_queue_create(uint8_t port, uint16_t caller_id,
unsigned int count);
void flm_age_queue_put(uint16_t caller_id, struct flm_age_event_s *obj);
int flm_age_queue_get(uint16_t caller_id, struct flm_age_event_s *obj);
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
index db9687714f..761609a0ea 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
@@ -25,6 +25,82 @@ static struct rte_ring *stat_q_local[MAX_STAT_LCL_QUEUES];
/* Remote queues for flm status records */
static struct rte_ring *stat_q_remote[MAX_STAT_RMT_QUEUES];
+static void flm_inf_sta_queue_free(uint8_t port, uint8_t caller)
+{
+ struct rte_ring *q = NULL;
+
+ /* If queues is not created, then ignore and return */
+ switch (caller) {
+ case FLM_INFO_LOCAL:
+ if (port < MAX_INFO_LCL_QUEUES && info_q_local[port] != NULL) {
+ q = info_q_local[port];
+ info_q_local[port] = NULL;
+ }
+
+ break;
+
+ case FLM_INFO_REMOTE:
+ if (port < MAX_INFO_RMT_QUEUES && info_q_remote[port] != NULL) {
+ q = info_q_remote[port];
+ info_q_remote[port] = NULL;
+ }
+
+ break;
+
+ case FLM_STAT_LOCAL:
+ if (port < MAX_STAT_LCL_QUEUES && stat_q_local[port] != NULL) {
+ q = stat_q_local[port];
+ stat_q_local[port] = NULL;
+ }
+
+ break;
+
+ case FLM_STAT_REMOTE:
+ if (port < MAX_STAT_RMT_QUEUES && stat_q_remote[port] != NULL) {
+ q = stat_q_remote[port];
+ stat_q_remote[port] = NULL;
+ }
+
+ break;
+
+ default:
+ NT_LOG(ERR, FILTER, "FLM queue free illegal caller: %u",
caller);
+ break;
+ }
+
+ if (q)
+ rte_ring_free(q);
+}
+
+void flm_inf_sta_queue_free_all(uint8_t caller)
+{
+ int count = 0;
+
+ switch (caller) {
+ case FLM_INFO_LOCAL:
+ count = MAX_INFO_LCL_QUEUES;
+ break;
+
+ case FLM_INFO_REMOTE:
+ count = MAX_INFO_RMT_QUEUES;
+ break;
+
+ case FLM_STAT_LOCAL:
+ count = MAX_STAT_LCL_QUEUES;
+ break;
+
+ case FLM_STAT_REMOTE:
+ count = MAX_STAT_RMT_QUEUES;
+ break;
+
+ default:
+ NT_LOG(ERR, FILTER, "FLM queue free illegal caller: %u",
caller);
+ return;
+ }
+
+ for (int i = 0; i < count; i++)
+ flm_inf_sta_queue_free(i, caller);
+}
static struct rte_ring *flm_evt_queue_create(uint8_t port, uint8_t caller)
{
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
index 3a61
[PATCH v1 73/73] net/ntnic: add meter documentation
From: Danylo Vodopianov ntnic.ini was extended with rte_flow action meter support. Signed-off-by: Danylo Vodopianov --- doc/guides/nics/features/ntnic.ini | 1 + doc/guides/nics/ntnic.rst | 1 + doc/guides/rel_notes/release_24_11.rst | 1 + 3 files changed, 3 insertions(+) diff --git a/doc/guides/nics/features/ntnic.ini b/doc/guides/nics/features/ntnic.ini index af2981ccf6..ecb0605de6 100644 --- a/doc/guides/nics/features/ntnic.ini +++ b/doc/guides/nics/features/ntnic.ini @@ -43,3 +43,4 @@ queue= Y raw_decap= Y raw_encap= Y rss = Y +meter= Y \ No newline at end of file diff --git a/doc/guides/nics/ntnic.rst b/doc/guides/nics/ntnic.rst index e5a8d71892..4ae94b161c 100644 --- a/doc/guides/nics/ntnic.rst +++ b/doc/guides/nics/ntnic.rst @@ -70,6 +70,7 @@ Features - Exact match of 140 million flows and policies. - Basic stats - Extended stats +- Flow metering, including meter policy API. Limitations ~~~ diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 5be9660287..b4a0bdf245 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -163,6 +163,7 @@ New Features * Added initialization of FPGA modules related to flow HW offload * Added basic handling of the virtual queues * Added age rte flow action support + * Added meter flow metering and flow policy support * **Added cryptodev queue pair reset support.** -- 2.45.0
[PATCH v1 68/73] net/ntnic: add aged flow event
From: Danylo Vodopianov
Port thread was extended with new age event callback handler.
LRN, INF, STA registers getter setter was added.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/include/hw_mod_backend.h| 7 +
.../net/ntnic/nthw/flow_api/flow_id_table.c | 16 +++
.../net/ntnic/nthw/flow_api/flow_id_table.h | 3 +
.../ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c | 75 +++
.../flow_api/profile_inline/flm_age_queue.c | 28
.../flow_api/profile_inline/flm_age_queue.h | 12 ++
.../flow_api/profile_inline/flm_evt_queue.c | 20 +++
.../flow_api/profile_inline/flm_evt_queue.h | 1 +
.../profile_inline/flow_api_profile_inline.c | 121 ++
drivers/net/ntnic/ntnic_ethdev.c | 16 +++
10 files changed, 299 insertions(+)
diff --git a/drivers/net/ntnic/include/hw_mod_backend.h
b/drivers/net/ntnic/include/hw_mod_backend.h
index 9cd9d92823..92e1205640 100644
--- a/drivers/net/ntnic/include/hw_mod_backend.h
+++ b/drivers/net/ntnic/include/hw_mod_backend.h
@@ -688,6 +688,9 @@ int hw_mod_flm_rcp_set_mask(struct flow_api_backend_s *be,
enum hw_flm_e field,
int hw_mod_flm_rcp_set(struct flow_api_backend_s *be, enum hw_flm_e field, int
index,
uint32_t value);
+int hw_mod_flm_buf_ctrl_update(struct flow_api_backend_s *be);
+int hw_mod_flm_buf_ctrl_get(struct flow_api_backend_s *be, enum hw_flm_e
field, uint32_t *value);
+
int hw_mod_flm_stat_update(struct flow_api_backend_s *be);
int hw_mod_flm_stat_get(struct flow_api_backend_s *be, enum hw_flm_e field,
uint32_t *value);
@@ -695,6 +698,10 @@ int hw_mod_flm_lrn_data_set_flush(struct
flow_api_backend_s *be, enum hw_flm_e f
const uint32_t *value, uint32_t records,
uint32_t *handled_records, uint32_t *inf_word_cnt,
uint32_t *sta_word_cnt);
+int hw_mod_flm_inf_sta_data_update_get(struct flow_api_backend_s *be, enum
hw_flm_e field,
+ uint32_t *inf_value, uint32_t inf_size,
+ uint32_t *inf_word_cnt, uint32_t *sta_value,
+ uint32_t sta_size, uint32_t *sta_word_cnt);
int hw_mod_flm_scrub_flush(struct flow_api_backend_s *be, int start_idx, int
count);
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_id_table.c
b/drivers/net/ntnic/nthw/flow_api/flow_id_table.c
index 5635ac4524..a3f5e1d7f7 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_id_table.c
+++ b/drivers/net/ntnic/nthw/flow_api/flow_id_table.c
@@ -129,3 +129,19 @@ void ntnic_id_table_free_id(void *id_table, uint32_t id)
pthread_mutex_unlock(&handle->mtx);
}
+
+void ntnic_id_table_find(void *id_table, uint32_t id, union flm_handles
*flm_h, uint8_t *caller_id,
+ uint8_t *type)
+{
+ struct ntnic_id_table_data *handle = id_table;
+
+ pthread_mutex_lock(&handle->mtx);
+
+ struct ntnic_id_table_element *element =
ntnic_id_table_array_find_element(handle, id);
+
+ *caller_id = element->caller_id;
+ *type = element->type;
+ memcpy(flm_h, &element->handle, sizeof(union flm_handles));
+
+ pthread_mutex_unlock(&handle->mtx);
+}
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_id_table.h
b/drivers/net/ntnic/nthw/flow_api/flow_id_table.h
index e190fe4a11..edb4f42729 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_id_table.h
+++ b/drivers/net/ntnic/nthw/flow_api/flow_id_table.h
@@ -20,4 +20,7 @@ uint32_t ntnic_id_table_get_id(void *id_table, union
flm_handles flm_h, uint8_t
uint8_t type);
void ntnic_id_table_free_id(void *id_table, uint32_t id);
+void ntnic_id_table_find(void *id_table, uint32_t id, union flm_handles
*flm_h, uint8_t *caller_id,
+ uint8_t *type);
+
#endif /* FLOW_ID_TABLE_H_ */
diff --git a/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
b/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
index 1845f74166..996abfb28d 100644
--- a/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
+++ b/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
@@ -712,6 +712,52 @@ int hw_mod_flm_rcp_set(struct flow_api_backend_s *be, enum
hw_flm_e field, int i
return hw_mod_flm_rcp_mod(be, field, index, &value, 0);
}
+
+int hw_mod_flm_buf_ctrl_update(struct flow_api_backend_s *be)
+{
+ return be->iface->flm_buf_ctrl_update(be->be_dev, &be->flm);
+}
+
+static int hw_mod_flm_buf_ctrl_mod_get(struct flow_api_backend_s *be, enum
hw_flm_e field,
+ uint32_t *value)
+{
+ int get = 1;/* Only get supported */
+
+ switch (_VER_) {
+ case 25:
+ switch (field) {
+ case HW_FLM_BUF_CTRL_LRN_FREE:
+ GET_SET(be->flm.v25.buf_ctrl->lrn_free, value);
+ break;
+
+ case HW_FLM_BUF_CTRL_INF_AVAIL:
+ GET_SET(be->flm.v25.buf_ctrl->inf_avail, value);
+ break;
+
+ case HW_FLM_BUF_CTRL_STA_AVAIL:
+ GET_SET(be->flm.v25.buf_ctrl->sta_avail, value);
+ break;
+
+ default:
+
[PATCH v1 71/73] net/ntnic: add meter API
From: Danylo Vodopianov
Add meter API and implementation to the profile inline.
management functions were extended with meter flow support.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/include/flow_api.h | 1 +
drivers/net/ntnic/include/flow_api_engine.h | 5 +
.../flow_api/profile_inline/flm_evt_queue.c | 21 +
.../flow_api/profile_inline/flm_evt_queue.h | 1 +
.../profile_inline/flow_api_profile_inline.c | 534 +-
drivers/net/ntnic/ntnic_mod_reg.h | 34 ++
6 files changed, 578 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ntnic/include/flow_api.h
b/drivers/net/ntnic/include/flow_api.h
index 89f071d982..032063712a 100644
--- a/drivers/net/ntnic/include/flow_api.h
+++ b/drivers/net/ntnic/include/flow_api.h
@@ -100,6 +100,7 @@ struct flow_nic_dev {
void *km_res_handle;
void *kcc_res_handle;
+ void *flm_mtr_handle;
void *group_handle;
void *hw_db_handle;
void *id_table_handle;
diff --git a/drivers/net/ntnic/include/flow_api_engine.h
b/drivers/net/ntnic/include/flow_api_engine.h
index 155a9e1fd6..8f1a6419f3 100644
--- a/drivers/net/ntnic/include/flow_api_engine.h
+++ b/drivers/net/ntnic/include/flow_api_engine.h
@@ -57,6 +57,7 @@ enum res_type_e {
#define MAX_TCAM_START_OFFSETS 4
+#define MAX_FLM_MTRS_SUPPORTED 4
#define MAX_CPY_WRITERS_SUPPORTED 8
#define MAX_MATCH_FIELDS 16
@@ -215,6 +216,8 @@ struct nic_flow_def {
uint32_t jump_to_group;
+ uint32_t mtr_ids[MAX_FLM_MTRS_SUPPORTED];
+
int full_offload;
/*
@@ -307,6 +310,8 @@ struct flow_handle {
uint32_t flm_db_idx_counter;
uint32_t flm_db_idxs[RES_COUNT];
+ uint32_t flm_mtr_ids[MAX_FLM_MTRS_SUPPORTED];
+
uint32_t flm_data[10];
uint8_t flm_prot;
uint8_t flm_kid;
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
index 761609a0ea..d76c7da568 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
@@ -234,6 +234,27 @@ int flm_sta_queue_put(uint8_t port, bool remote, struct
flm_status_event_s *obj)
return 0;
}
+void flm_inf_queue_put(uint8_t port, bool remote, struct flm_info_event_s *obj)
+{
+ int ret;
+
+ /* If queues is not created, then ignore and return */
+ if (!remote) {
+ if (port < MAX_INFO_LCL_QUEUES && info_q_local[port] != NULL) {
+ ret = rte_ring_sp_enqueue_elem(info_q_local[port], obj,
FLM_EVT_ELEM_SIZE);
+
+ if (ret != 0)
+ NT_LOG(DBG, FILTER, "FLM local info queue
full");
+ }
+
+ } else if (port < MAX_INFO_RMT_QUEUES && info_q_remote[port] != NULL) {
+ ret = rte_ring_sp_enqueue_elem(info_q_remote[port], obj,
FLM_EVT_ELEM_SIZE);
+
+ if (ret != 0)
+ NT_LOG(DBG, FILTER, "FLM remote info queue full");
+ }
+}
+
int flm_inf_queue_get(uint8_t port, bool remote, struct flm_info_event_s *obj)
{
int ret;
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
index d61b282472..ee8175cf25 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
@@ -48,6 +48,7 @@ enum {
#define FLM_STAT_ELEM_SIZE sizeof(struct flm_status_event_s)
void flm_inf_sta_queue_free_all(uint8_t caller);
+void flm_inf_queue_put(uint8_t port, bool remote, struct flm_info_event_s
*obj);
int flm_inf_queue_get(uint8_t port, bool remote, struct flm_info_event_s *obj);
int flm_sta_queue_put(uint8_t port, bool remote, struct flm_status_event_s
*obj);
diff --git
a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
index 72e79b2f86..1738e55fbe 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
@@ -20,6 +20,10 @@
#include "flow_api_profile_inline.h"
#include "ntnic_mod_reg.h"
+#define FLM_MTR_PROFILE_SIZE 0x10
+#define FLM_MTR_STAT_SIZE 0x100
+#define UINT64_MSB ((uint64_t)1 << 63)
+
#define DMA_BLOCK_SIZE 256
#define DMA_OVERHEAD 20
#define WORDS_PER_STA_DATA (sizeof(struct flm_v25_sta_data_s) /
sizeof(uint32_t))
@@ -45,8 +49,336 @@
#define NT_FLM_OP_UNLEARN 0
#define NT_FLM_OP_LEARN 1
+#define NT_FLM_MISS_FLOW_TYPE 0
+#define NT_FLM_UNHANDLED_FLOW_TYPE 1
+#define NT_FLM_VIOLATING_MBR_FLOW_TYPE 15
+
+#define NT_VIOLATING_MBR_CFN 0
+#define NT_VIOLATING_MBR_QSL 1
+
+#define POLICING_PARAMETER_
[PATCH v1 67/73] net/ntnic: add info and configure flow API
From: Danylo Vodopianov
Inline profile was extended with flow info and create APIS.
Module which operate with age queue was extended with
create and free operations.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/include/flow_api.h | 3 +
drivers/net/ntnic/nthw/flow_api/flow_api.c| 19 +
.../flow_api/profile_inline/flm_age_queue.c | 79 +++
.../flow_api/profile_inline/flm_age_queue.h | 5 ++
.../profile_inline/flow_api_profile_inline.c | 59 ++
.../profile_inline/flow_api_profile_inline.h | 9 +++
drivers/net/ntnic/ntnic_mod_reg.h | 9 +++
7 files changed, 168 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ntnic/include/flow_api.h
b/drivers/net/ntnic/include/flow_api.h
index ed96f77bc0..89f071d982 100644
--- a/drivers/net/ntnic/include/flow_api.h
+++ b/drivers/net/ntnic/include/flow_api.h
@@ -77,6 +77,9 @@ struct flow_eth_dev {
/* QSL_HSH index if RSS needed QSL v6+ */
int rss_target_id;
+ /* The size of buffer for aged out flow list */
+ uint32_t nb_aging_objects;
+
struct flow_eth_dev *next;
};
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_api.c
b/drivers/net/ntnic/nthw/flow_api/flow_api.c
index d30f7ee2da..009b56c258 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_api.c
+++ b/drivers/net/ntnic/nthw/flow_api/flow_api.c
@@ -1085,12 +1085,6 @@ static int flow_info_get(struct flow_eth_dev *dev,
uint8_t caller_id,
struct rte_flow_port_info *port_info, struct rte_flow_queue_info
*queue_info,
struct rte_flow_error *error)
{
- (void)dev;
- (void)caller_id;
- (void)port_info;
- (void)queue_info;
- (void)error;
-
const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
if (profile_inline_ops == NULL) {
@@ -1098,20 +1092,14 @@ static int flow_info_get(struct flow_eth_dev *dev,
uint8_t caller_id,
return -1;
}
- return 0;
+ return profile_inline_ops->flow_info_get_profile_inline(dev, caller_id,
port_info,
+ queue_info, error);
}
static int flow_configure(struct flow_eth_dev *dev, uint8_t caller_id,
const struct rte_flow_port_attr *port_attr, uint16_t nb_queue,
const struct rte_flow_queue_attr *queue_attr[], struct rte_flow_error
*error)
{
- (void)dev;
- (void)caller_id;
- (void)port_attr;
- (void)queue_attr;
- (void)nb_queue;
- (void)error;
-
const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
if (profile_inline_ops == NULL) {
@@ -1119,7 +1107,8 @@ static int flow_configure(struct flow_eth_dev *dev,
uint8_t caller_id,
return -1;
}
- return 0;
+ return profile_inline_ops->flow_configure_profile_inline(dev,
caller_id, port_attr,
+ nb_queue, queue_attr, error);
}
int flow_get_flm_stats(struct flow_nic_dev *ndev, uint64_t *data, uint64_t
size)
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
index f6f04009fe..1022583c4f 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
@@ -4,12 +4,91 @@
*/
#include
+#include
+#include
+#include
#include "ntlog.h"
#include "flm_age_queue.h"
/* Queues for flm aged events */
static struct rte_ring *age_queue[MAX_EVT_AGE_QUEUES];
+static uint16_t age_event[MAX_EVT_AGE_PORTS];
+
+void flm_age_queue_free(uint8_t port, uint16_t caller_id)
+{
+ struct rte_ring *q = NULL;
+
+ if (port < MAX_EVT_AGE_PORTS)
+ rte_atomic_flag_clear_explicit(&age_event[port],
rte_memory_order_seq_cst);
+
+ if (caller_id < MAX_EVT_AGE_QUEUES && age_queue[caller_id] != NULL) {
+ q = age_queue[caller_id];
+ age_queue[caller_id] = NULL;
+ }
+
+ if (q != NULL)
+ rte_ring_free(q);
+}
+
+struct rte_ring *flm_age_queue_create(uint8_t port, uint16_t caller_id,
unsigned int count)
+{
+ char name[20];
+ struct rte_ring *q = NULL;
+
+ if (rte_is_power_of_2(count) == false || count > RTE_RING_SZ_MASK) {
+ NT_LOG(WRN,
+ FILTER,
+ "FLM aged event queue number of elements (%u) is
invalid, must be power of 2, and not exceed %u",
+ count,
+ RTE_RING_SZ_MASK);
+ return NULL;
+ }
+
+ if (port >= MAX_EVT_AGE_PORTS) {
+ NT_LOG(WRN,
+ FILTER,
+ "FLM aged event queue cannot be created for port %u.
Max supported port is %u",
+ port,
+ MAX_EVT_AGE_PORTS - 1);
+ return NULL;
+ }
+
+ rte_atomic_flag_clear_explicit(&age_event[port
[PATCH v1 62/73] net/ntnic: added flow statistics
From: Danylo Vodopianov
xstats was extended with flow statistics support.
Additional counters that shows learn, unlearn, lps, aps
and other.
Signed-off-by: Danylo Vodopianov
---
.../net/ntnic/adapter/nt4ga_stat/nt4ga_stat.c | 40
drivers/net/ntnic/include/hw_mod_backend.h| 3 +
drivers/net/ntnic/include/ntdrv_4ga.h | 1 +
drivers/net/ntnic/meson.build | 1 +
drivers/net/ntnic/nthw/flow_api/flow_api.c| 11 +-
.../ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c | 142 ++
.../flow_api/profile_inline/flm_evt_queue.c | 176 ++
.../flow_api/profile_inline/flm_evt_queue.h | 52 ++
.../profile_inline/flow_api_profile_inline.c | 46 +
.../profile_inline/flow_api_profile_inline.h | 6 +
drivers/net/ntnic/nthw/rte_pmd_ntnic.h| 43 +
drivers/net/ntnic/ntnic_ethdev.c | 132 +
drivers/net/ntnic/ntnic_mod_reg.h | 7 +
13 files changed, 656 insertions(+), 4 deletions(-)
create mode 100644
drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.c
create mode 100644
drivers/net/ntnic/nthw/flow_api/profile_inline/flm_evt_queue.h
create mode 100644 drivers/net/ntnic/nthw/rte_pmd_ntnic.h
diff --git a/drivers/net/ntnic/adapter/nt4ga_stat/nt4ga_stat.c
b/drivers/net/ntnic/adapter/nt4ga_stat/nt4ga_stat.c
index 3afc5b7853..8fedfdcd04 100644
--- a/drivers/net/ntnic/adapter/nt4ga_stat/nt4ga_stat.c
+++ b/drivers/net/ntnic/adapter/nt4ga_stat/nt4ga_stat.c
@@ -189,6 +189,24 @@ static int nt4ga_stat_setup(struct adapter_info_s
*p_adapter_info)
return -1;
}
+ if (get_flow_filter_ops() != NULL) {
+ struct flow_nic_dev *ndev =
p_adapter_info->nt4ga_filter.mp_flow_device;
+ p_nt4ga_stat->flm_stat_ver = ndev->be.flm.ver;
+ p_nt4ga_stat->mp_stat_structs_flm = calloc(1, sizeof(struct
flm_counters_v1));
+
+ if (!p_nt4ga_stat->mp_stat_structs_flm) {
+ NT_LOG_DBGX(ERR, GENERAL, "Cannot allocate mem.");
+ return -1;
+ }
+
+ p_nt4ga_stat->mp_stat_structs_flm->max_aps =
+
nthw_fpga_get_product_param(p_adapter_info->fpga_info.mp_fpga,
+ NT_FLM_LOAD_APS_MAX, 0);
+ p_nt4ga_stat->mp_stat_structs_flm->max_lps =
+
nthw_fpga_get_product_param(p_adapter_info->fpga_info.mp_fpga,
+ NT_FLM_LOAD_LPS_MAX, 0);
+ }
+
p_nt4ga_stat->mp_port_load =
calloc(NUM_ADAPTER_PORTS_MAX, sizeof(struct
port_load_counters));
@@ -236,6 +254,7 @@ static int nt4ga_stat_collect_cap_v1_stats(struct
adapter_info_s *p_adapter_info
return -1;
nthw_stat_t *p_nthw_stat = p_nt4ga_stat->mp_nthw_stat;
+ struct flow_nic_dev *ndev = p_adapter_info->nt4ga_filter.mp_flow_device;
const int n_rx_ports = p_nt4ga_stat->mn_rx_ports;
const int n_tx_ports = p_nt4ga_stat->mn_tx_ports;
@@ -542,6 +561,27 @@ static int nt4ga_stat_collect_cap_v1_stats(struct
adapter_info_s *p_adapter_info
(uint64_t)(((__uint128_t)val * 32ULL) /
PORT_LOAD_WINDOWS_SIZE);
}
+ /* Update and get FLM stats */
+ flow_filter_ops->flow_get_flm_stats(ndev, (uint64_t
*)p_nt4ga_stat->mp_stat_structs_flm,
+ sizeof(struct flm_counters_v1) / sizeof(uint64_t));
+
+ /*
+* Calculate correct load values:
+* rpp = nthw_fpga_get_product_param(p_fpga, NT_RPP_PER_PS, 0);
+* bin = (uint32_t)(((FLM_LOAD_WINDOWS_SIZE * 1ULL) /
(32ULL * rpp)) - 1ULL);
+* load_aps = ((uint64_t)load_aps * 1ULL) /
(uint64_t)((bin+1) * rpp);
+* load_lps = ((uint64_t)load_lps * 1ULL) /
(uint64_t)((bin+1) * rpp);
+*
+* Simplified it gives:
+*
+* load_lps = (load_lps * 32ULL) / FLM_LOAD_WINDOWS_SIZE
+* load_aps = (load_aps * 32ULL) / FLM_LOAD_WINDOWS_SIZE
+*/
+
+ p_nt4ga_stat->mp_stat_structs_flm->load_aps =
+ (p_nt4ga_stat->mp_stat_structs_flm->load_aps * 32ULL) /
FLM_LOAD_WINDOWS_SIZE;
+ p_nt4ga_stat->mp_stat_structs_flm->load_lps =
+ (p_nt4ga_stat->mp_stat_structs_flm->load_lps * 32ULL) /
FLM_LOAD_WINDOWS_SIZE;
return 0;
}
diff --git a/drivers/net/ntnic/include/hw_mod_backend.h
b/drivers/net/ntnic/include/hw_mod_backend.h
index 17d5755634..9cd9d92823 100644
--- a/drivers/net/ntnic/include/hw_mod_backend.h
+++ b/drivers/net/ntnic/include/hw_mod_backend.h
@@ -688,6 +688,9 @@ int hw_mod_flm_rcp_set_mask(struct flow_api_backend_s *be,
enum hw_flm_e field,
int hw_mod_flm_rcp_set(struct flow_api_backend_s *be, enum hw_flm_e field, int
index,
uint32_t value);
+int hw_mod_flm_stat_update(struct flow_api_backend_s *be);
+int hw_mod_flm_stat_get(struct flow_api_backend_s *be, enum hw_flm_e field,
uint32_t *value
[PATCH v1 58/73] net/ntnic: add tsm module
From: Danylo Vodopianov
tsm module which operate with timers
in the physical nic was added.
Necessary defines and implementation were added.
The Time Stamp Module controls every aspect of packet timestamping,
including time synchronization, time stamp format, PTP protocol, etc.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/meson.build | 1 +
.../net/ntnic/nthw/core/include/nthw_tsm.h| 56 ++
drivers/net/ntnic/nthw/core/nthw_fpga.c | 47 +
drivers/net/ntnic/nthw/core/nthw_tsm.c| 167 ++
.../ntnic/nthw/supported/nthw_fpga_mod_defs.h | 1 +
.../ntnic/nthw/supported/nthw_fpga_reg_defs.h | 1 +
.../nthw/supported/nthw_fpga_reg_defs_tsm.h | 28 +++
7 files changed, 301 insertions(+)
create mode 100644 drivers/net/ntnic/nthw/core/include/nthw_tsm.h
create mode 100644 drivers/net/ntnic/nthw/core/nthw_tsm.c
create mode 100644 drivers/net/ntnic/nthw/supported/nthw_fpga_reg_defs_tsm.h
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index ed5a201fd5..a6c4fec0be 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -41,6 +41,7 @@ sources = files(
'nthw/core/nt200a0x/reset/nthw_fpga_rst_nt200a0x.c',
'nthw/core/nthw_fpga.c',
'nthw/core/nthw_gmf.c',
+'nthw/core/nthw_tsm.c',
'nthw/core/nthw_gpio_phy.c',
'nthw/core/nthw_hif.c',
'nthw/core/nthw_i2cm.c',
diff --git a/drivers/net/ntnic/nthw/core/include/nthw_tsm.h
b/drivers/net/ntnic/nthw/core/include/nthw_tsm.h
new file mode 100644
index 00..0a3bcdcaf5
--- /dev/null
+++ b/drivers/net/ntnic/nthw/core/include/nthw_tsm.h
@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Napatech A/S
+ */
+
+#ifndef __NTHW_TSM_H__
+#define __NTHW_TSM_H__
+
+#include "stdint.h"
+
+#include "nthw_fpga_model.h"
+
+struct nthw_tsm {
+ nthw_fpga_t *mp_fpga;
+ nthw_module_t *mp_mod_tsm;
+ int mn_instance;
+
+ nthw_field_t *mp_fld_config_ts_format;
+
+ nthw_field_t *mp_fld_timer_ctrl_timer_en_t0;
+ nthw_field_t *mp_fld_timer_ctrl_timer_en_t1;
+
+ nthw_field_t *mp_fld_timer_timer_t0_max_count;
+
+ nthw_field_t *mp_fld_timer_timer_t1_max_count;
+
+ nthw_register_t *mp_reg_ts_lo;
+ nthw_field_t *mp_fld_ts_lo;
+
+ nthw_register_t *mp_reg_ts_hi;
+ nthw_field_t *mp_fld_ts_hi;
+
+ nthw_register_t *mp_reg_time_lo;
+ nthw_field_t *mp_fld_time_lo;
+
+ nthw_register_t *mp_reg_time_hi;
+ nthw_field_t *mp_fld_time_hi;
+};
+
+typedef struct nthw_tsm nthw_tsm_t;
+typedef struct nthw_tsm nthw_tsm;
+
+nthw_tsm_t *nthw_tsm_new(void);
+int nthw_tsm_init(nthw_tsm_t *p, nthw_fpga_t *p_fpga, int n_instance);
+
+int nthw_tsm_get_ts(nthw_tsm_t *p, uint64_t *p_ts);
+int nthw_tsm_get_time(nthw_tsm_t *p, uint64_t *p_time);
+
+int nthw_tsm_set_timer_t0_enable(nthw_tsm_t *p, bool b_enable);
+int nthw_tsm_set_timer_t0_max_count(nthw_tsm_t *p, uint32_t n_timer_val);
+int nthw_tsm_set_timer_t1_enable(nthw_tsm_t *p, bool b_enable);
+int nthw_tsm_set_timer_t1_max_count(nthw_tsm_t *p, uint32_t n_timer_val);
+
+int nthw_tsm_set_config_ts_format(nthw_tsm_t *p, uint32_t n_val);
+
+#endif /* __NTHW_TSM_H__ */
diff --git a/drivers/net/ntnic/nthw/core/nthw_fpga.c
b/drivers/net/ntnic/nthw/core/nthw_fpga.c
index 9448c29de1..ca69a9d5b1 100644
--- a/drivers/net/ntnic/nthw/core/nthw_fpga.c
+++ b/drivers/net/ntnic/nthw/core/nthw_fpga.c
@@ -13,6 +13,8 @@
#include "nthw_fpga_instances.h"
#include "nthw_fpga_mod_str_map.h"
+#include "nthw_tsm.h"
+
#include
int nthw_fpga_get_param_info(struct fpga_info_s *p_fpga_info, nthw_fpga_t
*p_fpga)
@@ -179,6 +181,7 @@ int nthw_fpga_init(struct fpga_info_s *p_fpga_info)
nthw_hif_t *p_nthw_hif = NULL;
nthw_pcie3_t *p_nthw_pcie3 = NULL;
nthw_rac_t *p_nthw_rac = NULL;
+ nthw_tsm_t *p_nthw_tsm = NULL;
mcu_info_t *p_mcu_info = &p_fpga_info->mcu_info;
uint64_t n_fpga_ident = 0;
@@ -331,6 +334,50 @@ int nthw_fpga_init(struct fpga_info_s *p_fpga_info)
p_fpga_info->mp_nthw_hif = p_nthw_hif;
+ p_nthw_tsm = nthw_tsm_new();
+
+ if (p_nthw_tsm) {
+ nthw_tsm_init(p_nthw_tsm, p_fpga, 0);
+
+ nthw_tsm_set_config_ts_format(p_nthw_tsm, 1); /* 1 = TSM: TS
format native */
+
+ /* Timer T0 - stat toggle timer */
+ nthw_tsm_set_timer_t0_enable(p_nthw_tsm, false);
+ nthw_tsm_set_timer_t0_max_count(p_nthw_tsm, 50 * 1000 * 1000);
/* ns */
+ nthw_tsm_set_timer_t0_enable(p_nthw_tsm, true);
+
+ /* Timer T1 - keep alive timer */
+ nthw_tsm_set_timer_t1_enable(p_nthw_tsm, false);
+ nthw_tsm_set_timer_t1_max_count(p_nthw_tsm, 100 * 1000 * 1000);
/* ns */
+ nthw_tsm_set_timer_t1_enable(p_nthw_tsm, true);
+ }
+
+ p_fpga_info->mp_nthw_tsm = p_nthw_tsm;
+
+ /* TSM sa
[PATCH v1 66/73] net/ntnic: add aged API to the inline profile
From: Danylo Vodopianov
Added implementation for flow get aged API.
Module which operate with age queue was extended with
get, count and size operations.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/meson.build | 1 +
.../flow_api/profile_inline/flm_age_queue.c | 49 ++
.../flow_api/profile_inline/flm_age_queue.h | 24 +
.../profile_inline/flow_api_profile_inline.c | 51 +++
.../profile_inline/flow_api_profile_inline.h | 6 +++
5 files changed, 131 insertions(+)
create mode 100644
drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
create mode 100644
drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index c0b7729929..8c6d02a5ec 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -58,6 +58,7 @@ sources = files(
'nthw/flow_api/flow_group.c',
'nthw/flow_api/flow_id_table.c',
'nthw/flow_api/hw_mod/hw_mod_backend.c',
+'nthw/flow_api/profile_inline/flm_age_queue.c',
'nthw/flow_api/profile_inline/flm_lrn_queue.c',
'nthw/flow_api/profile_inline/flm_evt_queue.c',
'nthw/flow_api/profile_inline/flow_api_profile_inline.c',
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
new file mode 100644
index 00..f6f04009fe
--- /dev/null
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.c
@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Napatech A/S
+ */
+
+#include
+
+#include "ntlog.h"
+#include "flm_age_queue.h"
+
+/* Queues for flm aged events */
+static struct rte_ring *age_queue[MAX_EVT_AGE_QUEUES];
+
+int flm_age_queue_get(uint16_t caller_id, struct flm_age_event_s *obj)
+{
+ int ret;
+
+ /* If queues is not created, then ignore and return */
+ if (caller_id < MAX_EVT_AGE_QUEUES && age_queue[caller_id] != NULL) {
+ ret = rte_ring_sc_dequeue_elem(age_queue[caller_id], obj,
FLM_AGE_ELEM_SIZE);
+
+ if (ret != 0)
+ NT_LOG(DBG, FILTER, "FLM aged event queue empty");
+
+ return ret;
+ }
+
+ return -ENOENT;
+}
+
+unsigned int flm_age_queue_count(uint16_t caller_id)
+{
+ unsigned int ret = 0;
+
+ if (caller_id < MAX_EVT_AGE_QUEUES && age_queue[caller_id] != NULL)
+ ret = rte_ring_count(age_queue[caller_id]);
+
+ return ret;
+}
+
+unsigned int flm_age_queue_get_size(uint16_t caller_id)
+{
+ unsigned int ret = 0;
+
+ if (caller_id < MAX_EVT_AGE_QUEUES && age_queue[caller_id] != NULL)
+ ret = rte_ring_get_size(age_queue[caller_id]);
+
+ return ret;
+}
diff --git a/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
new file mode 100644
index 00..d61609cc01
--- /dev/null
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flm_age_queue.h
@@ -0,0 +1,24 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Napatech A/S
+ */
+
+#ifndef _FLM_AGE_QUEUE_H_
+#define _FLM_AGE_QUEUE_H_
+
+#include "stdint.h"
+
+struct flm_age_event_s {
+ void *context;
+};
+
+/* Max number of event queues */
+#define MAX_EVT_AGE_QUEUES 256
+
+#define FLM_AGE_ELEM_SIZE sizeof(struct flm_age_event_s)
+
+int flm_age_queue_get(uint16_t caller_id, struct flm_age_event_s *obj);
+unsigned int flm_age_queue_count(uint16_t caller_id);
+unsigned int flm_age_queue_get_size(uint16_t caller_id);
+
+#endif /* _FLM_AGE_QUEUE_H_ */
diff --git
a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
index 9c401f5ec2..bcc61821ab 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
@@ -7,6 +7,7 @@
#include "nt_util.h"
#include "hw_mod_backend.h"
+#include "flm_age_queue.h"
#include "flm_lrn_queue.h"
#include "flow_api.h"
#include "flow_api_engine.h"
@@ -4399,6 +4400,55 @@ static void dump_flm_data(const uint32_t *data, FILE
*file)
}
}
+int flow_get_aged_flows_profile_inline(struct flow_eth_dev *dev,
+ uint16_t caller_id,
+ void **context,
+ uint32_t nb_contexts,
+ struct rte_flow_error *error)
+{
+ (void)dev;
+ flow_nic_set_error(ERR_SUCCESS, error);
+
+ unsigned int queue_size = flm_age_queue_get_size(caller_id);
+
+ if (queue_size == 0) {
+ error->type = RTE_FLOW_ERROR_TYPE_UNSPECIFIED;
+ error->message = "Aged queue size is not configured";
+ return -1;
+ }
+
+ unsigned int queue_count = flm_age_queue_count(caller_id);
+
+ if (context == NULL)
+ ret
Re: [PATCH v2 0/7] DTS external DPDK build
Hi Luca, I noticed in the new version of this series the "improve statistics" patch was taken out, was there any reason for this? I believe Juraj wanted to create a feature that wrote all of the test suite/case summaries in a JSON/text output file, is this going to be implemented later or in a different format? https://patches.dpdk.org/project/dpdk/patch/20240906132656.21729-13-juraj.lin...@pantheon.tech/ On Mon, Oct 21, 2024 at 9:49 AM Luca Vizzarro wrote: > Hello, > > taking over this patchset from Tomáš, who no longer contributes to > DTS. Please find in this cover letter the changes I've made. > > v2: > - rebased on top of dts-next and resolved conflicts > - fixed bugs > - rephrased some docstrings > - improved settings naming for less ambiguity > - improved commit subjects and bodies > > Kind regards, > Luca > > Tomáš Ďurovec (7): > dts: rename build target to DPDK build > dts: enforce one dpdk build per test run > dts: fix remote session file transfer vars > dts: enable copying directories to and from nodes > dts: add support for externally compiled DPDK > doc: update argument options for external DPDK build > dts: remove git ref option > > doc/guides/tools/dts.rst | 82 ++-- > dts/conf.yaml | 18 +- > dts/framework/config/__init__.py | 142 ++- > dts/framework/config/conf_yaml_schema.json| 72 +++- > dts/framework/config/types.py | 19 +- > dts/framework/exception.py| 4 +- > dts/framework/logger.py | 4 - > dts/framework/remote_session/dpdk_shell.py| 2 +- > .../remote_session/remote_session.py | 24 +- > dts/framework/remote_session/ssh_session.py | 18 +- > dts/framework/runner.py | 139 ++- > dts/framework/settings.py | 202 +++--- > dts/framework/test_result.py | 124 ++ > dts/framework/test_suite.py | 2 +- > dts/framework/testbed_model/node.py | 22 +- > dts/framework/testbed_model/os_session.py | 209 -- > dts/framework/testbed_model/posix_session.py | 141 ++- > dts/framework/testbed_model/sut_node.py | 376 -- > dts/framework/utils.py| 164 +++- > dts/tests/TestSuite_smoke_tests.py| 2 +- > 20 files changed, 1130 insertions(+), 636 deletions(-) > > -- > 2.43.0 > >
[PATCH v1 63/73] net/ntnic: add scrub registers
From: Danylo Vodopianov
Scrub fields were added to the fpga map file
Remove duplicated macro
Signed-off-by: Danylo Vodopianov
---
.../supported/nthw_fpga_9563_055_049_.c | 17 -
drivers/net/ntnic/ntnic_ethdev.c| 3 ---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
index 620968ceb6..f1033ca949 100644
--- a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
+++ b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
@@ -728,7 +728,7 @@ static nthw_fpga_field_init_s flm_lrn_data_fields[] = {
{ FLM_LRN_DATA_PRIO, 2, 691, 0x }, { FLM_LRN_DATA_PROT, 8, 320,
0x },
{ FLM_LRN_DATA_QFI, 6, 704, 0x }, { FLM_LRN_DATA_QW0, 128, 192,
0x },
{ FLM_LRN_DATA_QW4, 128, 64, 0x }, { FLM_LRN_DATA_RATE, 16, 416,
0x },
- { FLM_LRN_DATA_RQI, 1, 710, 0x },
+ { FLM_LRN_DATA_RQI, 1, 710, 0x }, { FLM_LRN_DATA_SCRUB_PROF, 4,
712, 0x },
{ FLM_LRN_DATA_SIZE, 16, 432, 0x }, { FLM_LRN_DATA_STAT_PROF, 4,
687, 0x },
{ FLM_LRN_DATA_SW8, 32, 32, 0x }, { FLM_LRN_DATA_SW9, 32, 0, 0x
},
{ FLM_LRN_DATA_TEID, 32, 368, 0x }, { FLM_LRN_DATA_VOL_IDX, 3, 684,
0x },
@@ -782,6 +782,18 @@ static nthw_fpga_field_init_s flm_scan_fields[] = {
{ FLM_SCAN_I, 16, 0, 0 },
};
+static nthw_fpga_field_init_s flm_scrub_ctrl_fields[] = {
+ { FLM_SCRUB_CTRL_ADR, 4, 0, 0x },
+ { FLM_SCRUB_CTRL_CNT, 16, 16, 0x },
+};
+
+static nthw_fpga_field_init_s flm_scrub_data_fields[] = {
+ { FLM_SCRUB_DATA_DEL, 1, 12, 0 },
+ { FLM_SCRUB_DATA_INF, 1, 13, 0 },
+ { FLM_SCRUB_DATA_R, 4, 8, 0 },
+ { FLM_SCRUB_DATA_T, 8, 0, 0 },
+};
+
static nthw_fpga_field_init_s flm_status_fields[] = {
{ FLM_STATUS_CACHE_BUFFER_CRITICAL, 1, 12, 0x },
{ FLM_STATUS_CALIB_FAIL, 3, 3, 0 },
@@ -921,6 +933,8 @@ static nthw_fpga_register_init_s flm_registers[] = {
{ FLM_RCP_CTRL, 8, 32, NTHW_FPGA_REG_TYPE_WO, 0, 2, flm_rcp_ctrl_fields
},
{ FLM_RCP_DATA, 9, 403, NTHW_FPGA_REG_TYPE_WO, 0, 19,
flm_rcp_data_fields },
{ FLM_SCAN, 2, 16, NTHW_FPGA_REG_TYPE_WO, 0, 1, flm_scan_fields },
+ { FLM_SCRUB_CTRL, 10, 32, NTHW_FPGA_REG_TYPE_WO, 0, 2,
flm_scrub_ctrl_fields },
+ { FLM_SCRUB_DATA, 11, 14, NTHW_FPGA_REG_TYPE_WO, 0, 4,
flm_scrub_data_fields },
{ FLM_STATUS, 1, 17, NTHW_FPGA_REG_TYPE_MIXED, 0, 9, flm_status_fields
},
{ FLM_STAT_AUL_DONE, 41, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
flm_stat_aul_done_fields },
{ FLM_STAT_AUL_FAIL, 43, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
flm_stat_aul_fail_fields },
@@ -3058,6 +3072,7 @@ static nthw_fpga_prod_param_s product_parameters[] = {
{ NT_FLM_PRESENT, 1 },
{ NT_FLM_PRIOS, 4 },
{ NT_FLM_PST_PROFILES, 16 },
+ { NT_FLM_SCRUB_PROFILES, 16 },
{ NT_FLM_SIZE_MB, 12288 },
{ NT_FLM_STATEFUL, 1 },
{ NT_FLM_VARIANT, 2 },
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index 9c286a4f35..263b3ee7d4 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -47,9 +47,6 @@ const rte_thread_attr_t thread_attr = { .priority =
RTE_THREAD_PRIORITY_NORMAL }
#define SG_HW_RX_PKT_BUFFER_SIZE (1024 << 1)
#define SG_HW_TX_PKT_BUFFER_SIZE (1024 << 1)
-/* Max RSS queues */
-#define MAX_QUEUES 125
-
#define NUM_VQ_SEGS(_data_size_)
\
({
\
size_t _size = (_data_size_);
\
--
2.45.0
[PATCH v1 60/73] net/ntnic: add TSM module
From: Oleksandr Kolomeiets
fpga map was extended with tsm module
support which enable statistics functionality.
Signed-off-by: Oleksandr Kolomeiets
---
doc/guides/nics/features/ntnic.ini| 1 +
.../supported/nthw_fpga_9563_055_049_.c | 394 +-
.../nthw/supported/nthw_fpga_mod_str_map.c| 1 +
.../nthw/supported/nthw_fpga_reg_defs_tsm.h | 177
4 files changed, 572 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/features/ntnic.ini
b/doc/guides/nics/features/ntnic.ini
index e5d5abd0ed..64351bcdc7 100644
--- a/doc/guides/nics/features/ntnic.ini
+++ b/doc/guides/nics/features/ntnic.ini
@@ -12,6 +12,7 @@ Unicast MAC filter = Y
Multicast MAC filter = Y
RSS hash = Y
RSS key update = Y
+Basic stats = Y
Linux= Y
x86-64 = Y
diff --git a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
index efdb084cd6..620968ceb6 100644
--- a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
+++ b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
@@ -2575,6 +2575,397 @@ static nthw_fpga_register_init_s sta_registers[] = {
{ STA_STATUS, 7, 1, NTHW_FPGA_REG_TYPE_RC1, 0, 1, sta_status_fields },
};
+static nthw_fpga_field_init_s tsm_con0_config_fields[] = {
+ { TSM_CON0_CONFIG_BLIND, 5, 8, 9 }, { TSM_CON0_CONFIG_DC_SRC, 3, 5, 0 },
+ { TSM_CON0_CONFIG_PORT, 3, 0, 0 }, { TSM_CON0_CONFIG_PPSIN_2_5V, 1, 13,
0 },
+ { TSM_CON0_CONFIG_SAMPLE_EDGE, 2, 3, 2 },
+};
+
+static nthw_fpga_field_init_s tsm_con0_interface_fields[] = {
+ { TSM_CON0_INTERFACE_EX_TERM, 2, 0, 3 }, {
TSM_CON0_INTERFACE_IN_REF_PWM, 8, 12, 128 },
+ { TSM_CON0_INTERFACE_PWM_ENA, 1, 2, 0 }, { TSM_CON0_INTERFACE_RESERVED,
1, 3, 0 },
+ { TSM_CON0_INTERFACE_VTERM_PWM, 8, 4, 0 },
+};
+
+static nthw_fpga_field_init_s tsm_con0_sample_hi_fields[] = {
+ { TSM_CON0_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con0_sample_lo_fields[] = {
+ { TSM_CON0_SAMPLE_LO_NS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con1_config_fields[] = {
+ { TSM_CON1_CONFIG_BLIND, 5, 8, 9 }, { TSM_CON1_CONFIG_DC_SRC, 3, 5, 0 },
+ { TSM_CON1_CONFIG_PORT, 3, 0, 0 }, { TSM_CON1_CONFIG_PPSIN_2_5V, 1, 13,
0 },
+ { TSM_CON1_CONFIG_SAMPLE_EDGE, 2, 3, 2 },
+};
+
+static nthw_fpga_field_init_s tsm_con1_sample_hi_fields[] = {
+ { TSM_CON1_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con1_sample_lo_fields[] = {
+ { TSM_CON1_SAMPLE_LO_NS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con2_config_fields[] = {
+ { TSM_CON2_CONFIG_BLIND, 5, 8, 9 }, { TSM_CON2_CONFIG_DC_SRC, 3, 5, 0 },
+ { TSM_CON2_CONFIG_PORT, 3, 0, 0 }, { TSM_CON2_CONFIG_PPSIN_2_5V, 1, 13,
0 },
+ { TSM_CON2_CONFIG_SAMPLE_EDGE, 2, 3, 2 },
+};
+
+static nthw_fpga_field_init_s tsm_con2_sample_hi_fields[] = {
+ { TSM_CON2_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con2_sample_lo_fields[] = {
+ { TSM_CON2_SAMPLE_LO_NS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con3_config_fields[] = {
+ { TSM_CON3_CONFIG_BLIND, 5, 5, 26 },
+ { TSM_CON3_CONFIG_PORT, 3, 0, 1 },
+ { TSM_CON3_CONFIG_SAMPLE_EDGE, 2, 3, 1 },
+};
+
+static nthw_fpga_field_init_s tsm_con3_sample_hi_fields[] = {
+ { TSM_CON3_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con3_sample_lo_fields[] = {
+ { TSM_CON3_SAMPLE_LO_NS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con4_config_fields[] = {
+ { TSM_CON4_CONFIG_BLIND, 5, 5, 26 },
+ { TSM_CON4_CONFIG_PORT, 3, 0, 1 },
+ { TSM_CON4_CONFIG_SAMPLE_EDGE, 2, 3, 1 },
+};
+
+static nthw_fpga_field_init_s tsm_con4_sample_hi_fields[] = {
+ { TSM_CON4_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con4_sample_lo_fields[] = {
+ { TSM_CON4_SAMPLE_LO_NS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con5_config_fields[] = {
+ { TSM_CON5_CONFIG_BLIND, 5, 5, 26 },
+ { TSM_CON5_CONFIG_PORT, 3, 0, 1 },
+ { TSM_CON5_CONFIG_SAMPLE_EDGE, 2, 3, 1 },
+};
+
+static nthw_fpga_field_init_s tsm_con5_sample_hi_fields[] = {
+ { TSM_CON5_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con5_sample_lo_fields[] = {
+ { TSM_CON5_SAMPLE_LO_TIME, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con6_config_fields[] = {
+ { TSM_CON6_CONFIG_BLIND, 5, 5, 26 },
+ { TSM_CON6_CONFIG_PORT, 3, 0, 1 },
+ { TSM_CON6_CONFIG_SAMPLE_EDGE, 2, 3, 1 },
+};
+
+static nthw_fpga_field_init_s tsm_con6_sample_hi_fields[] = {
+ { TSM_CON6_SAMPLE_HI_SEC, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s tsm_con6_sample_lo_fields[] = {
+ { TSM_CON6_SAMPLE_LO_NS, 32, 0, 0x },
+};
+
+static nthw_fp
[PATCH v1 61/73] net/ntnic: add xstats
From: Danylo Vodopianov
Extended statistics implementation and
initialization were added.
eth_dev_ops api was extended with new xstats apis.
Signed-off-by: Danylo Vodopianov
---
doc/guides/nics/features/ntnic.ini| 1 +
drivers/net/ntnic/include/ntnic_stat.h| 36 +
drivers/net/ntnic/meson.build | 1 +
drivers/net/ntnic/ntnic_ethdev.c | 112 +++
drivers/net/ntnic/ntnic_mod_reg.c | 15 +
drivers/net/ntnic/ntnic_mod_reg.h | 28 +
drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c | 829 ++
7 files changed, 1022 insertions(+)
create mode 100644 drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c
diff --git a/doc/guides/nics/features/ntnic.ini
b/doc/guides/nics/features/ntnic.ini
index 64351bcdc7..947c7ba3a1 100644
--- a/doc/guides/nics/features/ntnic.ini
+++ b/doc/guides/nics/features/ntnic.ini
@@ -13,6 +13,7 @@ Multicast MAC filter = Y
RSS hash = Y
RSS key update = Y
Basic stats = Y
+Extended stats = Y
Linux= Y
x86-64 = Y
diff --git a/drivers/net/ntnic/include/ntnic_stat.h
b/drivers/net/ntnic/include/ntnic_stat.h
index 0735dbc085..4d4affa3cf 100644
--- a/drivers/net/ntnic/include/ntnic_stat.h
+++ b/drivers/net/ntnic/include/ntnic_stat.h
@@ -169,6 +169,39 @@ struct port_counters_v2 {
};
struct flm_counters_v1 {
+ /* FLM 0.17 */
+ uint64_t current;
+ uint64_t learn_done;
+ uint64_t learn_ignore;
+ uint64_t learn_fail;
+ uint64_t unlearn_done;
+ uint64_t unlearn_ignore;
+ uint64_t auto_unlearn_done;
+ uint64_t auto_unlearn_ignore;
+ uint64_t auto_unlearn_fail;
+ uint64_t timeout_unlearn_done;
+ uint64_t rel_done;
+ uint64_t rel_ignore;
+ /* FLM 0.20 */
+ uint64_t prb_done;
+ uint64_t prb_ignore;
+ uint64_t sta_done;
+ uint64_t inf_done;
+ uint64_t inf_skip;
+ uint64_t pck_hit;
+ uint64_t pck_miss;
+ uint64_t pck_unh;
+ uint64_t pck_dis;
+ uint64_t csh_hit;
+ uint64_t csh_miss;
+ uint64_t csh_unh;
+ uint64_t cuc_start;
+ uint64_t cuc_move;
+ /* FLM 0.17 Load */
+ uint64_t load_lps;
+ uint64_t load_aps;
+ uint64_t max_lps;
+ uint64_t max_aps;
};
struct nt4ga_stat_s {
@@ -200,6 +233,9 @@ struct nt4ga_stat_s {
struct host_buffer_counters *mp_stat_structs_hb;
struct port_load_counters *mp_port_load;
+ int flm_stat_ver;
+ struct flm_counters_v1 *mp_stat_structs_flm;
+
/* Rx/Tx totals: */
uint64_t n_totals_reset_timestamp; /* timestamp for last totals
reset */
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index a6c4fec0be..e59ac5bdb3 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -31,6 +31,7 @@ sources = files(
'link_mgmt/nt4ga_link.c',
'nim/i2c_nim.c',
'ntnic_filter/ntnic_filter.c',
+'ntnic_xstats/ntnic_xstats.c',
'nthw/dbs/nthw_dbs.c',
'nthw/supported/nthw_fpga_9563_055_049_.c',
'nthw/supported/nthw_fpga_instances.c',
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index f94340f489..f6a74c7df2 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -1496,6 +1496,113 @@ static int dev_flow_ops_get(struct rte_eth_dev *dev
__rte_unused, const struct r
return 0;
}
+static int eth_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat
*stats, unsigned int n)
+{
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+ int if_index = internals->n_intf_no;
+ int nb_xstats;
+
+ const struct ntnic_xstats_ops *ntnic_xstats_ops =
get_ntnic_xstats_ops();
+
+ if (ntnic_xstats_ops == NULL) {
+ NT_LOG(INF, NTNIC, "ntnic_xstats module not included");
+ return -1;
+ }
+
+ pthread_mutex_lock(&p_nt_drv->stat_lck);
+ nb_xstats = ntnic_xstats_ops->nthw_xstats_get(p_nt4ga_stat, stats, n,
if_index);
+ pthread_mutex_unlock(&p_nt_drv->stat_lck);
+ return nb_xstats;
+}
+
+static int eth_xstats_get_by_id(struct rte_eth_dev *eth_dev,
+ const uint64_t *ids,
+ uint64_t *values,
+ unsigned int n)
+{
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+ int if_index = internals->n_intf_no;
+ int nb_xstats;
+
+ const struct ntnic_xstats_ops *ntnic_xstats_ops =
get_ntnic_xstats_ops();
+
+ i
[PATCH v1 34/73] net/ntnic: add flm rcp module
From: Danylo Vodopianov
The Flow Matcher module is a high-performance stateful SDRAM lookup
and programming engine which supported exact match lookup
in line-rate of up to hundreds of millions of flows.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/include/hw_mod_backend.h| 4 +
.../ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c | 133
.../profile_inline/flow_api_hw_db_inline.c| 195 +-
.../profile_inline/flow_api_hw_db_inline.h| 20 ++
.../profile_inline/flow_api_profile_inline.c | 40 +++-
5 files changed, 388 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ntnic/include/hw_mod_backend.h
b/drivers/net/ntnic/include/hw_mod_backend.h
index de662c4ed1..13722c30a9 100644
--- a/drivers/net/ntnic/include/hw_mod_backend.h
+++ b/drivers/net/ntnic/include/hw_mod_backend.h
@@ -683,6 +683,10 @@ int hw_mod_flm_pst_set(struct flow_api_backend_s *be, enum
hw_flm_e field, int i
uint32_t value);
int hw_mod_flm_rcp_flush(struct flow_api_backend_s *be, int start_idx, int
count);
+int hw_mod_flm_rcp_set_mask(struct flow_api_backend_s *be, enum hw_flm_e
field, int index,
+ uint32_t *value);
+int hw_mod_flm_rcp_set(struct flow_api_backend_s *be, enum hw_flm_e field, int
index,
+ uint32_t value);
int hw_mod_flm_scrub_flush(struct flow_api_backend_s *be, int start_idx, int
count);
diff --git a/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
b/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
index f5eaea7c4e..0a7e90c04f 100644
--- a/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
+++ b/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
@@ -579,3 +579,136 @@ int hw_mod_flm_scrub_flush(struct flow_api_backend_s *be,
int start_idx, int cou
}
return be->iface->flm_scrub_flush(be->be_dev, &be->flm, start_idx,
count);
}
+
+static int hw_mod_flm_rcp_mod(struct flow_api_backend_s *be, enum hw_flm_e
field, int index,
+ uint32_t *value, int get)
+{
+ switch (_VER_) {
+ case 25:
+ switch (field) {
+ case HW_FLM_RCP_PRESET_ALL:
+ if (get) {
+ UNSUP_FIELD_LOG;
+ return UNSUP_FIELD;
+ }
+
+ memset(&be->flm.v25.rcp[index], (uint8_t)*value,
+ sizeof(struct flm_v25_rcp_s));
+ break;
+
+ case HW_FLM_RCP_LOOKUP:
+ GET_SET(be->flm.v25.rcp[index].lookup, value);
+ break;
+
+ case HW_FLM_RCP_QW0_DYN:
+ GET_SET(be->flm.v25.rcp[index].qw0_dyn, value);
+ break;
+
+ case HW_FLM_RCP_QW0_OFS:
+ GET_SET(be->flm.v25.rcp[index].qw0_ofs, value);
+ break;
+
+ case HW_FLM_RCP_QW0_SEL:
+ GET_SET(be->flm.v25.rcp[index].qw0_sel, value);
+ break;
+
+ case HW_FLM_RCP_QW4_DYN:
+ GET_SET(be->flm.v25.rcp[index].qw4_dyn, value);
+ break;
+
+ case HW_FLM_RCP_QW4_OFS:
+ GET_SET(be->flm.v25.rcp[index].qw4_ofs, value);
+ break;
+
+ case HW_FLM_RCP_SW8_DYN:
+ GET_SET(be->flm.v25.rcp[index].sw8_dyn, value);
+ break;
+
+ case HW_FLM_RCP_SW8_OFS:
+ GET_SET(be->flm.v25.rcp[index].sw8_ofs, value);
+ break;
+
+ case HW_FLM_RCP_SW8_SEL:
+ GET_SET(be->flm.v25.rcp[index].sw8_sel, value);
+ break;
+
+ case HW_FLM_RCP_SW9_DYN:
+ GET_SET(be->flm.v25.rcp[index].sw9_dyn, value);
+ break;
+
+ case HW_FLM_RCP_SW9_OFS:
+ GET_SET(be->flm.v25.rcp[index].sw9_ofs, value);
+ break;
+
+ case HW_FLM_RCP_MASK:
+ if (get) {
+ memcpy(value, be->flm.v25.rcp[index].mask,
+ sizeof(((struct flm_v25_rcp_s
*)0)->mask));
+
+ } else {
+ memcpy(be->flm.v25.rcp[index].mask, value,
+ sizeof(((struct flm_v25_rcp_s
*)0)->mask));
+ }
+
+ break;
+
+ case HW_FLM_RCP_KID:
+ GET_SET(be->flm.v25.rcp[index].kid, value);
+ break;
+
+ case HW_FLM_RCP_OPN:
+ GET_SET(be->flm.v25.rcp[index].opn, value);
+ break;
+
+ case HW_FLM_RCP_IPN:
+ GET_SET(be->flm.v25.rcp[index].ipn, value);
+ break;
+
+ case HW_FLM_RCP_BYT_DYN:
+
[PATCH v1 65/73] net/ntnic: added flow aged APIs
From: Danylo Vodopianov
FLow aged API was added to the flow_filter_ops.
Signed-off-by: Danylo Vodopianov
---
drivers/net/ntnic/nthw/flow_api/flow_api.c| 71 +++
drivers/net/ntnic/ntnic_filter/ntnic_filter.c | 88 +++
drivers/net/ntnic/ntnic_mod_reg.h | 23 +
3 files changed, 182 insertions(+)
diff --git a/drivers/net/ntnic/nthw/flow_api/flow_api.c
b/drivers/net/ntnic/nthw/flow_api/flow_api.c
index 3d6bec2009..d30f7ee2da 100644
--- a/drivers/net/ntnic/nthw/flow_api/flow_api.c
+++ b/drivers/net/ntnic/nthw/flow_api/flow_api.c
@@ -1058,6 +1058,70 @@ int flow_nic_set_hasher_fields(struct flow_nic_dev
*ndev, int hsh_idx,
return profile_inline_ops->flow_nic_set_hasher_fields_inline(ndev,
hsh_idx, rss_conf);
}
+static int flow_get_aged_flows(struct flow_eth_dev *dev,
+ uint16_t caller_id,
+ void **context,
+ uint32_t nb_contexts,
+ struct rte_flow_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG_DBGX(ERR, FILTER, "profile_inline_ops uninitialized");
+ return -1;
+ }
+
+ if (nb_contexts > 0 && !context) {
+ error->type = RTE_FLOW_ERROR_TYPE_UNSPECIFIED;
+ error->message = "rte_flow_get_aged_flows - empty context";
+ return -1;
+ }
+
+ return profile_inline_ops->flow_get_aged_flows_profile_inline(dev,
caller_id, context,
+ nb_contexts, error);
+}
+
+static int flow_info_get(struct flow_eth_dev *dev, uint8_t caller_id,
+ struct rte_flow_port_info *port_info, struct rte_flow_queue_info
*queue_info,
+ struct rte_flow_error *error)
+{
+ (void)dev;
+ (void)caller_id;
+ (void)port_info;
+ (void)queue_info;
+ (void)error;
+
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG_DBGX(ERR, FILTER, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ return 0;
+}
+
+static int flow_configure(struct flow_eth_dev *dev, uint8_t caller_id,
+ const struct rte_flow_port_attr *port_attr, uint16_t nb_queue,
+ const struct rte_flow_queue_attr *queue_attr[], struct rte_flow_error
*error)
+{
+ (void)dev;
+ (void)caller_id;
+ (void)port_attr;
+ (void)queue_attr;
+ (void)nb_queue;
+ (void)error;
+
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG_DBGX(ERR, FILTER, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ return 0;
+}
+
int flow_get_flm_stats(struct flow_nic_dev *ndev, uint64_t *data, uint64_t
size)
{
const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
@@ -1086,6 +1150,13 @@ static const struct flow_filter_ops ops = {
.flow_flush = flow_flush,
.flow_dev_dump = flow_dev_dump,
.flow_get_flm_stats = flow_get_flm_stats,
+ .flow_get_aged_flows = flow_get_aged_flows,
+
+ /*
+* NT Flow asynchronous operations API
+*/
+ .flow_info_get = flow_info_get,
+ .flow_configure = flow_configure,
/*
* Other
diff --git a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
index e2fce02afa..9f8670b32d 100644
--- a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
+++ b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
@@ -718,6 +718,91 @@ static int eth_flow_dev_dump(struct rte_eth_dev *eth_dev,
return res;
}
+static int eth_flow_get_aged_flows(struct rte_eth_dev *eth_dev,
+ void **context,
+ uint32_t nb_contexts,
+ struct rte_flow_error *error)
+{
+ const struct flow_filter_ops *flow_filter_ops = get_flow_filter_ops();
+
+ if (flow_filter_ops == NULL) {
+ NT_LOG_DBGX(ERR, NTNIC, "flow_filter module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ static struct rte_flow_error flow_error = {
+ .type = RTE_FLOW_ERROR_TYPE_NONE,
+ .message = "none" };
+
+ uint16_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ int res = flow_filter_ops->flow_get_aged_flows(internals->flw_dev,
caller_id, context,
+ nb_contexts, &flow_error);
+
+ convert_error(error, &flow_error);
+ return res;
+}
+
+/*
+ * NT Flow asynchronous operations API
+ */
+
+static int eth_flow_info_get(struct rte_eth_dev *dev, struct
rte_flow_port_info *port_info,
+ struct rte_flow_queue_info *queue_info, struct rte_flow_error *error)
+{
+ const struct flow_filter_ops *flow_filter_ops = get_flow_filter_ops(
[PATCH v1 59/73] net/ntnic: add STA module
From: Oleksandr Kolomeiets
fpga map was extended with STA module
support which enable statistics functionality.
Signed-off-by: Oleksandr Kolomeiets
---
.../supported/nthw_fpga_9563_055_049_.c | 92 ++-
.../nthw/supported/nthw_fpga_mod_str_map.c| 1 +
.../nthw/supported/nthw_fpga_reg_defs_sta.h | 8 ++
3 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
index a3d9f94fc6..efdb084cd6 100644
--- a/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
+++ b/drivers/net/ntnic/nthw/supported/nthw_fpga_9563_055_049_.c
@@ -2486,6 +2486,95 @@ static nthw_fpga_register_init_s slc_registers[] = {
{ SLC_RCP_DATA, 1, 36, NTHW_FPGA_REG_TYPE_WO, 0, 7, slc_rcp_data_fields
},
};
+static nthw_fpga_field_init_s sta_byte_fields[] = {
+ { STA_BYTE_CNT, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_cfg_fields[] = {
+ { STA_CFG_CNT_CLEAR, 1, 1, 0 },
+ { STA_CFG_DMA_ENA, 1, 0, 0 },
+};
+
+static nthw_fpga_field_init_s sta_cv_err_fields[] = {
+ { STA_CV_ERR_CNT, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_fcs_err_fields[] = {
+ { STA_FCS_ERR_CNT, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_host_adr_lsb_fields[] = {
+ { STA_HOST_ADR_LSB_LSB, 32, 0, 0 },
+};
+
+static nthw_fpga_field_init_s sta_host_adr_msb_fields[] = {
+ { STA_HOST_ADR_MSB_MSB, 32, 0, 0 },
+};
+
+static nthw_fpga_field_init_s sta_load_bin_fields[] = {
+ { STA_LOAD_BIN_BIN, 32, 0, 8388607 },
+};
+
+static nthw_fpga_field_init_s sta_load_bps_rx_0_fields[] = {
+ { STA_LOAD_BPS_RX_0_BPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_bps_rx_1_fields[] = {
+ { STA_LOAD_BPS_RX_1_BPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_bps_tx_0_fields[] = {
+ { STA_LOAD_BPS_TX_0_BPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_bps_tx_1_fields[] = {
+ { STA_LOAD_BPS_TX_1_BPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_pps_rx_0_fields[] = {
+ { STA_LOAD_PPS_RX_0_PPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_pps_rx_1_fields[] = {
+ { STA_LOAD_PPS_RX_1_PPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_pps_tx_0_fields[] = {
+ { STA_LOAD_PPS_TX_0_PPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_load_pps_tx_1_fields[] = {
+ { STA_LOAD_PPS_TX_1_PPS, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_pckt_fields[] = {
+ { STA_PCKT_CNT, 32, 0, 0x },
+};
+
+static nthw_fpga_field_init_s sta_status_fields[] = {
+ { STA_STATUS_STAT_TOGGLE_MISSED, 1, 0, 0x },
+};
+
+static nthw_fpga_register_init_s sta_registers[] = {
+ { STA_BYTE, 4, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1, sta_byte_fields },
+ { STA_CFG, 0, 2, NTHW_FPGA_REG_TYPE_RW, 0, 2, sta_cfg_fields },
+ { STA_CV_ERR, 5, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1, sta_cv_err_fields },
+ { STA_FCS_ERR, 6, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1, sta_fcs_err_fields },
+ { STA_HOST_ADR_LSB, 1, 32, NTHW_FPGA_REG_TYPE_WO, 0, 1,
sta_host_adr_lsb_fields },
+ { STA_HOST_ADR_MSB, 2, 32, NTHW_FPGA_REG_TYPE_WO, 0, 1,
sta_host_adr_msb_fields },
+ { STA_LOAD_BIN, 8, 32, NTHW_FPGA_REG_TYPE_WO, 8388607, 1,
sta_load_bin_fields },
+ { STA_LOAD_BPS_RX_0, 11, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_bps_rx_0_fields },
+ { STA_LOAD_BPS_RX_1, 13, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_bps_rx_1_fields },
+ { STA_LOAD_BPS_TX_0, 15, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_bps_tx_0_fields },
+ { STA_LOAD_BPS_TX_1, 17, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_bps_tx_1_fields },
+ { STA_LOAD_PPS_RX_0, 10, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_pps_rx_0_fields },
+ { STA_LOAD_PPS_RX_1, 12, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_pps_rx_1_fields },
+ { STA_LOAD_PPS_TX_0, 14, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_pps_tx_0_fields },
+ { STA_LOAD_PPS_TX_1, 16, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1,
sta_load_pps_tx_1_fields },
+ { STA_PCKT, 3, 32, NTHW_FPGA_REG_TYPE_RO, 0, 1, sta_pckt_fields },
+ { STA_STATUS, 7, 1, NTHW_FPGA_REG_TYPE_RC1, 0, 1, sta_status_fields },
+};
+
static nthw_fpga_module_init_s fpga_modules[] = {
{ MOD_CAT, 0, MOD_CAT, 0, 21, NTHW_FPGA_BUS_TYPE_RAB1, 768, 34,
cat_registers },
{ MOD_CSU, 0, MOD_CSU, 0, 0, NTHW_FPGA_BUS_TYPE_RAB1, 9728, 2,
csu_registers },
@@ -2537,6 +2626,7 @@ static nthw_fpga_module_init_s fpga_modules[] = {
{ MOD_TX_CPY, 0, MOD_CPY, 0, 4, NTHW_FPGA_BUS_TYPE_RAB1, 9216, 26,
cpy_registers },
{ MOD_TX_INS, 0, MOD_INS, 0, 2, NTHW_FPGA_BUS_TYPE_RAB1, 8704, 2,
ins_registers },
{ MOD_TX_RPL, 0, MOD_RPL, 0, 4, NTHW_FPGA_BUS_TYPE_RAB1, 8960, 6,
rpl_registers },
+ { MOD_STA, 0, MOD_STA, 0, 9, NTHW_FPGA_BUS_TYPE
[PATCH v1 70/73] net/ntnic: add age documentation
From: Danylo Vodopianov ntnic.rst document was exntede with age feature specification. ntnic.ini was extended with rte_flow action age support. Signed-off-by: Danylo Vodopianov --- doc/guides/nics/features/ntnic.ini | 1 + doc/guides/nics/ntnic.rst | 18 ++ doc/guides/rel_notes/release_24_11.rst | 15 +-- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/features/ntnic.ini b/doc/guides/nics/features/ntnic.ini index 947c7ba3a1..af2981ccf6 100644 --- a/doc/guides/nics/features/ntnic.ini +++ b/doc/guides/nics/features/ntnic.ini @@ -33,6 +33,7 @@ udp = Y vlan = Y [rte_flow actions] +age = Y drop = Y jump = Y mark = Y diff --git a/doc/guides/nics/ntnic.rst b/doc/guides/nics/ntnic.rst index e7e1cbcff7..e5a8d71892 100644 --- a/doc/guides/nics/ntnic.rst +++ b/doc/guides/nics/ntnic.rst @@ -148,3 +148,21 @@ FILTER To enable logging on all levels use wildcard in the following way:: --log-level=pmd.net.ntnic.*,8 + +Flow Scanner + + +Flow Scanner is DPDK mechanism that constantly and periodically scans the RTE flow tables to check for aged-out flows. +When flow timeout is reached, i.e. no packets were matched by the flow within timeout period, +``RTE_ETH_EVENT_FLOW_AGED`` event is reported, and flow is marked as aged-out. + +Therefore, flow scanner functionality is closely connected to the RTE flows' ``age`` action. + +There are list of characteristics that ``age timeout`` action has: +- functions only in group > 0; +- flow timeout is specified in seconds; +- flow scanner checks flows age timeout once in 1-480 seconds, therefore, flows may not age-out immediately, depedning on how big are intervals of flow scanner mechanism checks; +- aging counters can display maximum of **n - 1** aged flows when aging counters are set to **n**; +- overall 15 different timeouts can be specified for the flows at the same time (note that this limit is combined for all actions, therefore, 15 different actions can be created at the same time, maximum limit of 15 can be reached only across different groups - when 5 flows with different timeouts are created per one group, otherwise the limit within one group is 14 distinct flows); +- after flow is aged-out it's not automatically deleted; +- aged-out flow can be updated with ``flow update`` command, and its aged-out status will be reverted; diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index fa4822d928..5be9660287 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -154,12 +154,15 @@ New Features * **Updated Napatech ntnic net driver [EXPERIMENTAL].** - * Updated supported version of the FPGA to 9563.55.49. - * Extended and fixed logging. - * Added NT flow filter initialization. - * Added NT flow backend initialization. - * Added initialization of FPGA modules related to flow HW offload. - * Added basic handling of the virtual queues. + * Update supported version of the FPGA to 9563.55.49 + * Fix Coverity issues + * Fix issues related to release 24.07 + * Extended and fixed the implementation of the logging + * Added NT flow filter init API + * Added NT flow backend initialization API + * Added initialization of FPGA modules related to flow HW offload + * Added basic handling of the virtual queues + * Added age rte flow action support * **Added cryptodev queue pair reset support.** -- 2.45.0
[PATCH v3 0/7] DTS external DPDK build
Hello, sending a fix for some minor problems found in the meantime. v3: - added Tomáš to mailmap - fixed docstrings - amended commit subject v2: - rebased on top of dts-next and resolved conflicts - fixed bugs - rephrased some docstrings - improved settings naming for less ambiguity - improved commit subjects and bodies Kind regards, Luca Tomáš Ďurovec (7): dts: rename build target to DPDK build dts: enforce one dpdk build per test run dts: change remote and local paths objects dts: enable copying directories to and from nodes dts: add support for externally compiled DPDK doc: update argument options for external DPDK build dts: remove git ref option .mailmap | 1 + doc/guides/tools/dts.rst | 82 ++-- dts/conf.yaml | 18 +- dts/framework/config/__init__.py | 142 ++- dts/framework/config/conf_yaml_schema.json| 72 +++- dts/framework/config/types.py | 19 +- dts/framework/exception.py| 4 +- dts/framework/logger.py | 4 - dts/framework/remote_session/dpdk_shell.py| 2 +- .../remote_session/remote_session.py | 24 +- dts/framework/remote_session/ssh_session.py | 18 +- dts/framework/runner.py | 139 ++- dts/framework/settings.py | 202 +++--- dts/framework/test_result.py | 124 ++ dts/framework/test_suite.py | 2 +- dts/framework/testbed_model/node.py | 22 +- dts/framework/testbed_model/os_session.py | 209 -- dts/framework/testbed_model/posix_session.py | 141 ++- dts/framework/testbed_model/sut_node.py | 376 -- dts/framework/utils.py| 164 +++- dts/tests/TestSuite_smoke_tests.py| 2 +- 21 files changed, 1131 insertions(+), 636 deletions(-) -- 2.43.0
[PATCH v3 1/7] dts: rename build target to DPDK build
From: Tomáš Ďurovec
Since the DPDK may already be built, some more general name
is needed that includes both the DPDK location and the build
config (if we are going to build).
Signed-off-by: Tomáš Ďurovec
Signed-off-by: Luca Vizzarro
---
.mailmap | 1 +
dts/conf.yaml | 2 +-
dts/framework/config/__init__.py | 26 ++---
dts/framework/config/conf_yaml_schema.json | 10 +-
dts/framework/config/types.py | 4 +-
dts/framework/logger.py| 4 +-
dts/framework/runner.py| 112 ++---
dts/framework/settings.py | 2 +-
dts/framework/test_result.py | 72 +++--
dts/framework/test_suite.py| 2 +-
dts/framework/testbed_model/sut_node.py| 55 +-
dts/tests/TestSuite_smoke_tests.py | 2 +-
12 files changed, 143 insertions(+), 149 deletions(-)
diff --git a/.mailmap b/.mailmap
index 4a508bafad..c27d58bb0e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1498,6 +1498,7 @@ Ting Xu
Tingting Liao
Tiwei Bie
Todd Fujinaka
+Tomáš Ďurovec
Tomasz Cel
Tomasz Duszynski
Tomasz Jonak
diff --git a/dts/conf.yaml b/dts/conf.yaml
index ca5e87636e..1363e93580 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -4,7 +4,7 @@
test_runs:
# define one test run environment
- - build_targets:
+ - dpdk_builds:
- arch: x86_64
os: linux
cpu: native
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 269d9ec318..c243716010 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -45,8 +45,8 @@
from typing_extensions import Self
from framework.config.types import (
-BuildTargetConfigDict,
ConfigurationDict,
+DPDKBuildConfigDict,
NodeConfigDict,
PortConfigDict,
TestRunConfigDict,
@@ -335,7 +335,7 @@ class NodeInfo:
@dataclass(slots=True, frozen=True)
-class BuildTargetConfiguration:
+class DPDKBuildConfiguration:
"""DPDK build configuration.
The configuration used for building DPDK.
@@ -358,7 +358,7 @@ class BuildTargetConfiguration:
name: str
@classmethod
-def from_dict(cls, d: BuildTargetConfigDict) -> Self:
+def from_dict(cls, d: DPDKBuildConfigDict) -> Self:
r"""A convenience method that processes the inputs before creating an
instance.
`arch`, `os`, `cpu` and `compiler` are converted to :class:`Enum`\s and
@@ -368,7 +368,7 @@ def from_dict(cls, d: BuildTargetConfigDict) -> Self:
d: The configuration dictionary.
Returns:
-The build target configuration instance.
+The DPDK build configuration instance.
"""
return cls(
arch=Architecture(d["arch"]),
@@ -381,8 +381,8 @@ def from_dict(cls, d: BuildTargetConfigDict) -> Self:
@dataclass(slots=True, frozen=True)
-class BuildTargetInfo:
-"""Various versions and other information about a build target.
+class DPDKBuildInfo:
+"""Various versions and other information about a DPDK build.
Attributes:
dpdk_version: The DPDK version that was built.
@@ -437,7 +437,7 @@ class TestRunConfiguration:
and with what DPDK build.
Attributes:
-build_targets: A list of DPDK builds to test.
+dpdk_builds: A list of DPDK builds to test.
perf: Whether to run performance tests.
func: Whether to run functional tests.
skip_smoke_tests: Whether to skip smoke tests.
@@ -448,7 +448,7 @@ class TestRunConfiguration:
random_seed: The seed to use for pseudo-random generation.
"""
-build_targets: list[BuildTargetConfiguration]
+dpdk_builds: list[DPDKBuildConfiguration]
perf: bool
func: bool
skip_smoke_tests: bool
@@ -466,7 +466,7 @@ def from_dict(
) -> Self:
"""A convenience method that processes the inputs before creating an
instance.
-The build target and the test suite config are transformed into their
respective objects.
+The DPDK build and the test suite config are transformed into their
respective objects.
SUT and TG configurations are taken from `node_map`. The other
(:class:`bool`) attributes
are just stored.
@@ -477,8 +477,8 @@ def from_dict(
Returns:
The test run configuration instance.
"""
-build_targets: list[BuildTargetConfiguration] = list(
-map(BuildTargetConfiguration.from_dict, d["build_targets"])
+dpdk_builds: list[DPDKBuildConfiguration] = list(
+map(DPDKBuildConfiguration.from_dict, d["dpdk_builds"])
)
test_suites: list[TestSuiteConfig] =
list(map(TestSuiteConfig.from_dict, d["test_suites"]))
sut_name = d["system_under_test_node"]["node_name"]
@@ -501,7 +501,7 @@ def from_dict(
)
random_seed = d.get("random_seed", None)
[PATCH v3 2/7] dts: enforce one dpdk build per test run
From: Tomáš Ďurovec
Given a pre-built DPDK repository can be supplied to DTS, there is no
need to define multiple build targets. To simplify the process this
change makes each test run use only one DPDK build whether it's
pre-built or it needs to be built by DTS.
Signed-off-by: Tomáš Ďurovec
Signed-off-by: Luca Vizzarro
---
dts/conf.yaml | 14 +--
dts/framework/config/__init__.py | 9 +-
dts/framework/config/conf_yaml_schema.json | 10 +-
dts/framework/config/types.py | 2 +-
dts/framework/logger.py| 4 -
dts/framework/runner.py| 117 +---
dts/framework/test_result.py | 119 ++---
dts/framework/test_suite.py| 2 +-
dts/framework/testbed_model/sut_node.py| 6 +-
dts/tests/TestSuite_smoke_tests.py | 2 +-
10 files changed, 80 insertions(+), 205 deletions(-)
diff --git a/dts/conf.yaml b/dts/conf.yaml
index 1363e93580..814744a1fc 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -4,13 +4,13 @@
test_runs:
# define one test run environment
- - dpdk_builds:
- - arch: x86_64
-os: linux
-cpu: native
-# the combination of the following two makes CC="ccache gcc"
-compiler: gcc
-compiler_wrapper: ccache
+ - dpdk_build:
+ arch: x86_64
+ os: linux
+ cpu: native
+ # the combination of the following two makes CC="ccache gcc"
+ compiler: gcc
+ compiler_wrapper: ccache
perf: false # disable performance testing
func: true # enable functional testing
skip_smoke_tests: false # optional
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index c243716010..49b2e8d016 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -437,7 +437,7 @@ class TestRunConfiguration:
and with what DPDK build.
Attributes:
-dpdk_builds: A list of DPDK builds to test.
+dpdk_build: A DPDK build to test.
perf: Whether to run performance tests.
func: Whether to run functional tests.
skip_smoke_tests: Whether to skip smoke tests.
@@ -448,7 +448,7 @@ class TestRunConfiguration:
random_seed: The seed to use for pseudo-random generation.
"""
-dpdk_builds: list[DPDKBuildConfiguration]
+dpdk_build: DPDKBuildConfiguration
perf: bool
func: bool
skip_smoke_tests: bool
@@ -477,9 +477,6 @@ def from_dict(
Returns:
The test run configuration instance.
"""
-dpdk_builds: list[DPDKBuildConfiguration] = list(
-map(DPDKBuildConfiguration.from_dict, d["dpdk_builds"])
-)
test_suites: list[TestSuiteConfig] =
list(map(TestSuiteConfig.from_dict, d["test_suites"]))
sut_name = d["system_under_test_node"]["node_name"]
skip_smoke_tests = d.get("skip_smoke_tests", False)
@@ -501,7 +498,7 @@ def from_dict(
)
random_seed = d.get("random_seed", None)
return cls(
-dpdk_builds=dpdk_builds,
+dpdk_build=DPDKBuildConfiguration.from_dict(d["dpdk_build"]),
perf=d["perf"],
func=d["func"],
skip_smoke_tests=skip_smoke_tests,
diff --git a/dts/framework/config/conf_yaml_schema.json
b/dts/framework/config/conf_yaml_schema.json
index 927a73ac6c..94d7efa5f5 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -327,12 +327,8 @@
"items": {
"type": "object",
"properties": {
- "dpdk_builds": {
-"type": "array",
-"items": {
- "$ref": "#/definitions/dpdk_build"
-},
-"minimum": 1
+ "dpdk_build": {
+"$ref": "#/definitions/dpdk_build"
},
"perf": {
"type": "boolean",
@@ -387,7 +383,7 @@
},
"additionalProperties": false,
"required": [
- "dpdk_builds",
+ "dpdk_build",
"perf",
"func",
"test_suites",
diff --git a/dts/framework/config/types.py b/dts/framework/config/types.py
index 4f450267d1..a710c20d6a 100644
--- a/dts/framework/config/types.py
+++ b/dts/framework/config/types.py
@@ -108,7 +108,7 @@ class TestRunConfigDict(TypedDict):
"""Allowed keys and values."""
#:
-dpdk_builds: list[DPDKBuildConfigDict]
+dpdk_build: DPDKBuildConfigDict
#:
perf: bool
#:
diff --git a/dts/framework/logger.py b/dts/framework/logger.py
index 3fbe618219..d2b8e37da4 100644
--- a/dts/framework/logger.py
+++ b/dts/framework/logger.py
@@ -33,16 +33,12 @@ class DtsStage(StrEnum):
#:
test_run_setup = auto()
#:
-dpdk_build_setup = auto()
-#:
test_suite_setup = auto()
#:
test_suite = auto()
#:
test_suite_teardown = auto()
#:
-dpdk_build_teardown = auto()
-#:
[PATCH v3 7/7] dts: remove git ref option
From: Tomáš Ďurovec
Given the whole DPDK tree directory can now be copied to the nodes,
there is no more need to use the git ref option, as the tree can be
controlled directly by the user.
Signed-off-by: Tomáš Ďurovec
Signed-off-by: Luca Vizzarro
---
doc/guides/tools/dts.rst | 9 ---
dts/framework/settings.py | 48 ++-
dts/framework/utils.py| 119 +-
3 files changed, 7 insertions(+), 169 deletions(-)
diff --git a/doc/guides/tools/dts.rst b/doc/guides/tools/dts.rst
index 7b90c4856e..a00d987ece 100644
--- a/doc/guides/tools/dts.rst
+++ b/doc/guides/tools/dts.rst
@@ -237,9 +237,6 @@ DTS is run with ``main.py`` located in the ``dts``
directory after entering Poet
-t SECONDS, --timeout SECONDS
[DTS_TIMEOUT] The default timeout for all DTS
operations except for compiling DPDK. (default: 15)
-v, --verbose [DTS_VERBOSE] Specify to enable verbose output,
logging all messages to the console. (default: False)
- --revision ID, --rev ID, --git-ref ID
- [DTS_DPDK_REVISION_ID] Git revision ID to test.
Could be commit, tag, tree ID etc. To test local changes, first
- commit them, then use their commit ID. (default:
None)
--compile-timeout SECONDS
[DTS_COMPILE_TIMEOUT] The timeout for compiling
DPDK. (default: 1200)
--test-suite TEST_SUITE [TEST_CASES ...]
@@ -275,12 +272,6 @@ The minimum DTS needs is a config file and a pre-built
DPDK or DPDK
sources location which can be specified in said config file or on the
command line or environment variables.
-Example command for running DTS with the template configuration and DPDK tag
v23.11:
-
-.. code-block:: console
-
- (dts-py3.10) $ ./main.py --git-ref v23.11
-
DTS Results
~~~
diff --git a/dts/framework/settings.py b/dts/framework/settings.py
index 08529805da..a452319b90 100644
--- a/dts/framework/settings.py
+++ b/dts/framework/settings.py
@@ -42,21 +42,14 @@
.. option:: --dpdk-tree
.. envvar:: DTS_DPDK_TREE
-The path to the DPDK source tree directory to test. Cannot be used in
conjunction with --tarball
-and --revision.
+The path to the DPDK source tree directory to test. Cannot be used in
conjunction with
+--tarball.
.. option:: --tarball, --snapshot
.. envvar:: DTS_DPDK_TARBALL
The path to the DPDK source tarball to test. DPDK must be contained in a
folder with the same
-name as the tarball file. Cannot be used in conjunction with --dpdk-tree
and
---revision.
-
-.. option:: --revision, --rev, --git-ref
-.. envvar:: DTS_DPDK_REVISION_ID
-
-Git revision ID to test. Could be commit, tag, tree ID etc. To test local
changes, first commit
-them, then use their commit ID. Cannot be used in conjunction with
--dpdk-tree and --tarball.
+name as the tarball file. Cannot be used in conjunction with --dpdk-tree.
.. option:: --remote-source
.. envvar:: DTS_REMOTE_SOURCE
@@ -109,8 +102,6 @@
from typing import Callable
from .config import DPDKLocation, TestSuiteConfig
-from .exception import ConfigurationError
-from .utils import DPDKGitTarball, get_commit_id
@dataclass(slots=True)
@@ -257,14 +248,6 @@ def _get_help_string(self, action):
return help
-def _parse_revision_id(rev_id: str) -> str:
-"""Validate revision ID and retrieve corresponding commit ID."""
-try:
-return get_commit_id(rev_id)
-except ConfigurationError:
-raise argparse.ArgumentTypeError("The Git revision ID supplied is
invalid or ambiguous")
-
-
def _required_with_one_of(parser: _DTSArgumentParser, action: Action,
*required_dests: str) -> None:
"""Verify that `action` is listed together with at least one of
`required_dests`.
@@ -372,7 +355,7 @@ def _get_parser() -> _DTSArgumentParser:
action = dpdk_source.add_argument(
"--dpdk-tree",
help="The path to the DPDK source tree directory to test. Cannot be
used in conjunction "
-"with --tarball and --revision.",
+"with --tarball.",
metavar="DIR_PATH",
dest="dpdk_tree_path",
)
@@ -382,26 +365,12 @@ def _get_parser() -> _DTSArgumentParser:
"--tarball",
"--snapshot",
help="The path to the DPDK source tarball to test. DPDK must be
contained in a folder with "
-"the same name as the tarball file. Cannot be used in conjunction with
--dpdk-tree and "
-"--revision.",
+"the same name as the tarball file. Cannot be used in conjunction with
--dpdk-tree.",
metavar="FILE_PATH",
dest="dpdk_tarball_path",
)
_add_env_var_to_action(action, "DPDK_TARBALL")
-action = dpdk_source.add_argument(
-"--revision",
-"--rev",
-"--git-ref",
-type=_parse_revision_id,
-help="Git revision ID to test. Could be commit, tag, tree ID etc. To
test local changes, "
-"first com
[PATCH v3 4/7] dts: enable copying directories to and from nodes
From: Tomáš Ďurovec
Currently there is no support to transfer whole directories between the
DTS host and the nodes. This change adds this new feature.
Signed-off-by: Tomáš Ďurovec
Signed-off-by: Luca Vizzarro
---
dts/framework/testbed_model/os_session.py| 120 ++-
dts/framework/testbed_model/posix_session.py | 88 +-
dts/framework/utils.py | 91 +-
3 files changed, 287 insertions(+), 12 deletions(-)
diff --git a/dts/framework/testbed_model/os_session.py
b/dts/framework/testbed_model/os_session.py
index 1aac3659bf..6c3f84dec1 100644
--- a/dts/framework/testbed_model/os_session.py
+++ b/dts/framework/testbed_model/os_session.py
@@ -25,7 +25,7 @@
from abc import ABC, abstractmethod
from collections.abc import Iterable
from ipaddress import IPv4Interface, IPv6Interface
-from pathlib import Path, PurePath
+from pathlib import Path, PurePath, PurePosixPath
from typing import Union
from framework.config import Architecture, NodeConfiguration, NodeInfo
@@ -38,7 +38,7 @@
)
from framework.remote_session.remote_session import CommandResult
from framework.settings import SETTINGS
-from framework.utils import MesonArgs
+from framework.utils import MesonArgs, TarCompressionFormat
from .cpu import LogicalCore
from .port import Port
@@ -203,6 +203,95 @@ def copy_to(self, source_file: str | Path,
destination_dir: str | PurePath) -> N
will be saved.
"""
+@abstractmethod
+def copy_dir_from(
+self,
+source_dir: str | PurePath,
+destination_dir: str | Path,
+compress_format: TarCompressionFormat = TarCompressionFormat.none,
+exclude: str | list[str] | None = None,
+) -> None:
+"""Copy a directory from the remote node to the local filesystem.
+
+Copy `source_dir` from the remote node associated with this remote
session to
+`destination_dir` on the local filesystem. The new local directory
will be created
+at `destination_dir` path.
+
+Example:
+source_dir = '/remote/path/to/source'
+destination_dir = '/local/path/to/destination'
+compress_format = TarCompressionFormat.xz
+
+The method will:
+1. Create a tarball from `source_dir`, resulting in:
+'/remote/path/to/source.tar.xz',
+2. Copy '/remote/path/to/source.tar.xz' to
+'/local/path/to/destination/source.tar.xz',
+3. Extract the contents of the tarball, resulting in:
+'/local/path/to/destination/source/',
+4. Remove the tarball after extraction
+('/local/path/to/destination/source.tar.xz').
+
+Final Path Structure:
+'/local/path/to/destination/source/'
+
+Args:
+source_dir: The directory on the remote node.
+destination_dir: The directory path on the local filesystem.
+compress_format: The compression format to use. Defaults to no
compression.
+exclude: Patterns for files or directories to exclude from the
tarball.
+These patterns are used with `tar`'s `--exclude` option.
+"""
+
+@abstractmethod
+def copy_dir_to(
+self,
+source_dir: str | Path,
+destination_dir: str | PurePath,
+compress_format: TarCompressionFormat = TarCompressionFormat.none,
+exclude: str | list[str] | None = None,
+) -> None:
+"""Copy a directory from the local filesystem to the remote node.
+
+Copy `source_dir` from the local filesystem to `destination_dir` on
the remote node
+associated with this remote session. The new remote directory will be
created at
+`destination_dir` path.
+
+Example:
+source_dir = '/local/path/to/source'
+destination_dir = '/remote/path/to/destination'
+compress_format = TarCompressionFormat.xz
+
+The method will:
+1. Create a tarball from `source_dir`, resulting in:
+'/local/path/to/source.tar.xz',
+2. Copy '/local/path/to/source.tar.xz' to
+'/remote/path/to/destination/source.tar.xz',
+3. Extract the contents of the tarball, resulting in:
+'/remote/path/to/destination/source/',
+4. Remove the tarball after extraction
+('/remote/path/to/destination/source.tar.xz').
+
+Final Path Structure:
+'/remote/path/to/destination/source/'
+
+Args:
+source_dir: The directory on the local filesystem.
+destination_dir: The directory path on the remote node.
+compress_format: The compression format to use. Defaults to no
compression.
+exclude: Patterns for files or directories to exclude from the
tarball.
+T
[PATCH v3 3/7] dts: change remote and local paths objects
From: Tomáš Ďurovec The OSSession (and its subclasses) should accept PurePaths for remote paths to translate from OS-unaware (PurePath) to OS-aware (Path) only on the remote side. For local paths, they should accept Paths, as Python is OS-aware locally. Signed-off-by: Tomáš Ďurovec Signed-off-by: Luca Vizzarro --- .../remote_session/remote_session.py | 24 ++-- dts/framework/remote_session/ssh_session.py | 18 dts/framework/testbed_model/os_session.py | 28 --- dts/framework/testbed_model/posix_session.py | 18 4 files changed, 30 insertions(+), 58 deletions(-) diff --git a/dts/framework/remote_session/remote_session.py b/dts/framework/remote_session/remote_session.py index 8c580b070f..ab83f5b266 100644 --- a/dts/framework/remote_session/remote_session.py +++ b/dts/framework/remote_session/remote_session.py @@ -12,7 +12,7 @@ from abc import ABC, abstractmethod from dataclasses import InitVar, dataclass, field -from pathlib import PurePath +from pathlib import Path, PurePath from framework.config import NodeConfiguration from framework.exception import RemoteCommandExecutionError @@ -196,35 +196,29 @@ def is_alive(self) -> bool: """Check whether the remote session is still responding.""" @abstractmethod -def copy_from( -self, -source_file: str | PurePath, -destination_file: str | PurePath, -) -> None: +def copy_from(self, source_file: str | PurePath, destination_dir: str | Path) -> None: """Copy a file from the remote Node to the local filesystem. Copy `source_file` from the remote Node associated with this remote session -to `destination_file` on the local filesystem. +to `destination_dir` on the local filesystem. Args: source_file: The file on the remote Node. -destination_file: A file or directory path on the local filesystem. +destination_dir: The directory path on the local filesystem where the `source_file` +will be saved. """ @abstractmethod -def copy_to( -self, -source_file: str | PurePath, -destination_file: str | PurePath, -) -> None: +def copy_to(self, source_file: str | Path, destination_dir: str | PurePath) -> None: """Copy a file from local filesystem to the remote Node. -Copy `source_file` from local filesystem to `destination_file` on the remote Node +Copy `source_file` from local filesystem to `destination_dir` on the remote Node associated with this remote session. Args: source_file: The file on the local filesystem. -destination_file: A file or directory path on the remote Node. +destination_dir: The directory path on the remote Node where the `source_file` +will be saved. """ @abstractmethod diff --git a/dts/framework/remote_session/ssh_session.py b/dts/framework/remote_session/ssh_session.py index 66f8176833..329121913f 100644 --- a/dts/framework/remote_session/ssh_session.py +++ b/dts/framework/remote_session/ssh_session.py @@ -5,7 +5,7 @@ import socket import traceback -from pathlib import PurePath +from pathlib import Path, PurePath from fabric import Connection # type: ignore[import-untyped] from invoke.exceptions import ( # type: ignore[import-untyped] @@ -103,21 +103,13 @@ def is_alive(self) -> bool: """Overrides :meth:`~.remote_session.RemoteSession.is_alive`.""" return self.session.is_connected -def copy_from( -self, -source_file: str | PurePath, -destination_file: str | PurePath, -) -> None: +def copy_from(self, source_file: str | PurePath, destination_dir: str | Path) -> None: """Overrides :meth:`~.remote_session.RemoteSession.copy_from`.""" -self.session.get(str(destination_file), str(source_file)) +self.session.get(str(source_file), str(destination_dir)) -def copy_to( -self, -source_file: str | PurePath, -destination_file: str | PurePath, -) -> None: +def copy_to(self, source_file: str | Path, destination_dir: str | PurePath) -> None: """Overrides :meth:`~.remote_session.RemoteSession.copy_to`.""" -self.session.put(str(source_file), str(destination_file)) +self.session.put(str(source_file), str(destination_dir)) def close(self) -> None: """Overrides :meth:`~.remote_session.RemoteSession.close`.""" diff --git a/dts/framework/testbed_model/os_session.py b/dts/framework/testbed_model/os_session.py index 79f56b289b..1aac3659bf 100644 --- a/dts/framework/testbed_model/os_session.py +++ b/dts/framework/testbed_model/os_session.py @@ -25,7 +25,7 @@ from abc import ABC, abstractmethod from collections.abc import Iterable from ipaddress import IPv4Interface, IPv6Interface -from pathlib import PurePath +fr
[PATCH v3 6/7] doc: update argument options for external DPDK build
From: Tomáš Ďurovec By adding support for external build, we extend the argument documentation for supported options. Signed-off-by: Tomáš Ďurovec Signed-off-by: Luca Vizzarro --- doc/guides/tools/dts.rst | 75 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/doc/guides/tools/dts.rst b/doc/guides/tools/dts.rst index 65cce9e5ed..7b90c4856e 100644 --- a/doc/guides/tools/dts.rst +++ b/doc/guides/tools/dts.rst @@ -195,10 +195,10 @@ Running DTS --- DTS needs to know which nodes to connect to and what hardware to use on those nodes. -Once that's configured, either a DPDK source code tarball or a Git revision ID -of choice needs to be supplied. -DTS will use this to compile DPDK on the SUT node -and then run the tests with the newly built binaries. +Once that's configured, either a DPDK source code tarball or tree folder need to be supplied whether +these are on your DTS host machine or the SUT node. +DTS can accept a pre-compiled build placed in a subdirectory, or it will compile DPDK on the SUT +node, and then run the tests with the newly built binaries. Configuring DTS @@ -221,44 +221,59 @@ DTS is run with ``main.py`` located in the ``dts`` directory after entering Poet .. code-block:: console (dts-py3.10) $ ./main.py --help - usage: main.py [-h] [--config-file FILE_PATH] [--output-dir DIR_PATH] [-t SECONDS] [-v] [-s] (--tarball FILE_PATH | --revision ID) - [--compile-timeout SECONDS] [--test-suite TEST_SUITE [TEST_CASES ...]] [--re-run N_TIMES] + usage: main.py [-h] [--config-file FILE_PATH] [--output-dir DIR_PATH] [-t SECONDS] [-v] [--dpdk-tree DIR_PATH | --tarball FILE_PATH] [--remote-source] + [--precompiled-build-dir DIR_NAME] [--compile-timeout SECONDS] [--test-suite TEST_SUITE [TEST_CASES ...]] [--re-run N_TIMES] + [--random-seed NUMBER] - Run DPDK test suites. All options may be specified with the environment variables provided in brackets. Command line arguments have higher - priority. + Run DPDK test suites. All options may be specified with the environment variables provided in brackets. Command line arguments have higher priority. options: - -h, --helpshow this help message and exit - --config-file FILE_PATH - [DTS_CFG_FILE] The configuration file that describes the test cases, SUTs and targets. (default: conf.yaml) - --output-dir DIR_PATH, --output DIR_PATH + -h, --helpshow this help message and exit + --config-file FILE_PATH + [DTS_CFG_FILE] The configuration file that describes the test cases, SUTs and DPDK build configs. (default: + /home/lucviz01/dpdk/dts/conf.yaml) + --output-dir DIR_PATH, --output DIR_PATH [DTS_OUTPUT_DIR] Output directory where DTS logs and results are saved. (default: output) - -t SECONDS, --timeout SECONDS + -t SECONDS, --timeout SECONDS [DTS_TIMEOUT] The default timeout for all DTS operations except for compiling DPDK. (default: 15) - -v, --verbose [DTS_VERBOSE] Specify to enable verbose output, logging all messages to the console. (default: False) - -s, --skip-setup [DTS_SKIP_SETUP] Specify to skip all setup steps on SUT and TG nodes. (default: False) - --tarball FILE_PATH, --snapshot FILE_PATH - [DTS_DPDK_TARBALL] Path to DPDK source code tarball to test. (default: None) - --revision ID, --rev ID, --git-ref ID + -v, --verbose [DTS_VERBOSE] Specify to enable verbose output, logging all messages to the console. (default: False) + --revision ID, --rev ID, --git-ref ID [DTS_DPDK_REVISION_ID] Git revision ID to test. Could be commit, tag, tree ID etc. To test local changes, first commit them, then use their commit ID. (default: None) - --compile-timeout SECONDS + --compile-timeout SECONDS [DTS_COMPILE_TIMEOUT] The timeout for compiling DPDK. (default: 1200) - --test-suite TEST_SUITE [TEST_CASES ...] - [DTS_TEST_SUITES] A list containing a test suite with test cases. The first parameter is the test suite name, and - the rest are test case names, which are optional. May be specified multiple times. To specify multiple test suites - in the environment variable, join the lists with a comma. Examples: --test-suite suite case case --test-suite - suite case ... | DTS_TEST_SUITES='suite case case, suite case, ...' | --test-suite suite --test-suite suite case - ... | DTS_TEST_SUITES='suite, suite case, ...' (default: []) - --re-run N_TIMES, --re_run N_TIMES + --test-suite TEST_SUITE [TEST_CASES ...] + [DTS_T
[PATCH v3 5/7] dts: add support for externally compiled DPDK
From: Tomáš Ďurovec
Enable the user to use either a DPDK source tree directory or a
tarball, with and without a pre-built build directory. These can be
stored on either SUT node or the DTS host. The DPDK build setup or the
pre-built binaries can be specified through the configuration file,
the command line arguments or environment variables.
Signed-off-by: Tomáš Ďurovec
Signed-off-by: Luca Vizzarro
---
dts/conf.yaml| 24 +-
dts/framework/config/__init__.py | 123 ++-
dts/framework/config/conf_yaml_schema.json | 62 +++-
dts/framework/config/types.py| 17 +-
dts/framework/exception.py | 4 +-
dts/framework/remote_session/dpdk_shell.py | 2 +-
dts/framework/runner.py | 8 +-
dts/framework/settings.py| 200 +--
dts/framework/test_result.py | 23 +-
dts/framework/testbed_model/node.py | 22 +-
dts/framework/testbed_model/os_session.py| 63 +++-
dts/framework/testbed_model/posix_session.py | 39 ++-
dts/framework/testbed_model/sut_node.py | 351 +--
13 files changed, 732 insertions(+), 206 deletions(-)
diff --git a/dts/conf.yaml b/dts/conf.yaml
index 814744a1fc..8a65a481d6 100644
--- a/dts/conf.yaml
+++ b/dts/conf.yaml
@@ -5,12 +5,24 @@
test_runs:
# define one test run environment
- dpdk_build:
- arch: x86_64
- os: linux
- cpu: native
- # the combination of the following two makes CC="ccache gcc"
- compiler: gcc
- compiler_wrapper: ccache
+ # dpdk_tree: Commented out because `tarball` is defined.
+ tarball: dpdk-tarball.tar.xz
+ # Either `dpdk_tree` or `tarball` can be defined, but not both.
+ remote: false # Optional, defaults to false. If it's true, the
`dpdk_tree` or `tarball`
+# is located on the SUT node, instead of the execution
host.
+
+ # precompiled_build_dir: Commented out because `build_options` is
defined.
+ build_options:
+arch: x86_64
+os: linux
+cpu: native
+# the combination of the following two makes CC="ccache gcc"
+compiler: gcc
+compiler_wrapper: ccache # Optional.
+ # If `precompiled_build_dir` is defined, DPDK has been pre-built and the
build directory is
+ # in a subdirectory of DPDK tree root directory. Otherwise, will be
using the `build_options`
+ # to build the DPDK from source. Either `precompiled_build_dir` or
`build_options` can be
+ # defined, but not both.
perf: false # disable performance testing
func: true # enable functional testing
skip_smoke_tests: false # optional
diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 49b2e8d016..d0d95d00c7 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -35,6 +35,7 @@
import json
import os.path
+import tarfile
from dataclasses import dataclass, fields
from enum import auto, unique
from pathlib import Path
@@ -47,6 +48,7 @@
from framework.config.types import (
ConfigurationDict,
DPDKBuildConfigDict,
+DPDKConfigurationDict,
NodeConfigDict,
PortConfigDict,
TestRunConfigDict,
@@ -380,6 +382,117 @@ def from_dict(cls, d: DPDKBuildConfigDict) -> Self:
)
+@dataclass(slots=True, frozen=True)
+class DPDKLocation:
+"""DPDK location.
+
+The path to the DPDK sources, build dir and type of location.
+
+Attributes:
+dpdk_tree: The path to the DPDK source tree directory. Only one of
`dpdk_tree` or `tarball`
+must be provided.
+tarball: The path to the DPDK tarball. Only one of `dpdk_tree` or
`tarball` must be
+provided.
+remote: Optional, defaults to :data:`False`. If :data:`True`,
`dpdk_tree` or `tarball` is
+located on the SUT node, instead of the execution host.
+build_dir: If it's defined, DPDK has been pre-compiled and the build
directory is located in
+a subdirectory of `dpdk_tree` or `tarball` root directory.
Otherwise, will be using
+`build_options` from configuration to build the DPDK from source.
+"""
+
+dpdk_tree: str | None
+tarball: str | None
+remote: bool
+build_dir: str | None
+
+@classmethod
+def from_dict(cls, d: DPDKConfigurationDict) -> Self:
+"""A convenience method that processes and validates the inputs before
creating an instance.
+
+Validate existence and format of `dpdk_tree` or `tarball` on local
filesystem, if
+`remote` is False.
+
+Args:
+d: The configuration dictionary.
+
+Returns:
+The DPDK location instance.
+
+Raises:
+ConfigurationError: If `dpdk_tree` or `tarball` not found in local
filesystem or they
+aren't in the right format.
+"""
+dpdk_tree = d.get("dpdk_tree")
+t
[PATCH v1 64/73] net/ntnic: update documentation
From: Oleksandr Kolomeiets Update required documentation Signed-off-by: Oleksandr Kolomeiets --- doc/guides/nics/ntnic.rst | 30 ++ 1 file changed, 30 insertions(+) diff --git a/doc/guides/nics/ntnic.rst b/doc/guides/nics/ntnic.rst index 2c160ae592..e7e1cbcff7 100644 --- a/doc/guides/nics/ntnic.rst +++ b/doc/guides/nics/ntnic.rst @@ -40,6 +40,36 @@ Features - Unicast MAC filter - Multicast MAC filter - Promiscuous mode (Enable only. The device always run promiscuous mode) +- Multiple TX and RX queues. +- Scattered and gather for TX and RX. +- RSS hash +- RSS key update +- RSS based on VLAN or 5-tuple. +- RSS using different combinations of fields: L3 only, L4 only or both, and +source only, destination only or both. +- Several RSS hash keys, one for each flow type. +- Default RSS operation with no hash key specification. +- VLAN filtering. +- RX VLAN stripping via raw decap. +- TX VLAN insertion via raw encap. +- Flow API. +- Multiple process. +- Tunnel types: GTP. +- Tunnel HW offload: Packet type, inner/outer RSS, IP and UDP checksum +verification. +- Support for multiple rte_flow groups. +- Encapsulation and decapsulation of GTP data. +- Packet modification: NAT, TTL decrement, DSCP tagging +- Traffic mirroring. +- Jumbo frame support. +- Port and queue statistics. +- RMON statistics in extended stats. +- Flow metering, including meter policy API. +- Link state information. +- CAM and TCAM based matching. +- Exact match of 140 million flows and policies. +- Basic stats +- Extended stats Limitations ~~~ -- 2.45.0
Re: [RFC v3 00/10] eventdev: remove single-event enqueue and dequeue
On 2024-10-21 09:25, Jerin Jacob wrote: On Fri, Oct 18, 2024 at 1:14 AM Mattias Rönnblom wrote: Remove the single-event enqueue and dequeue functions from the eventdev "ops" struct, to reduce complexity, leaving performance unaffected. This ABI change has been announced as a DPDK deprication notice, originally scheduled for DPDK 23.11. Mattias Rönnblom (9): Changes look good. Please send the NON RFC version of the series ASAP. I will merge it for rc2 (rc1 is created now) Without any more changes? OK. event/dsw: remove single event enqueue and dequeue event/dlb2: remove single event enqueue and dequeue event/octeontx: remove single event enqueue and dequeue event/sw: remove single event enqueue and dequeue event/dpaa: remove single event enqueue and dequeue event/dpaa2: remove single event enqueue and dequeue event/opdl: remove single event enqueue and dequeue event/skeleton: remove single event enqueue and dequeue eventdev: remove single event enqueue and dequeue Pavan Nikhilesh (1): event/cnxk: remove single event enqueue and dequeue drivers/event/sw/sw_evdev_worker.c | 12 lib/eventdev/eventdev_pmd.h| 4 -- lib/eventdev/eventdev_private.c| 22 --- lib/eventdev/rte_eventdev.h| 21 ++ lib/eventdev/rte_eventdev_core.h | 11 25 files changed, 52 insertions(+), 427 deletions(-) -- 2.43.0
[DPDK/other Bug 1569] dpdk-devbind not recognizing Hyper-V synthetic network adapters
https://bugs.dpdk.org/show_bug.cgi?id=1569 Bug ID: 1569 Summary: dpdk-devbind not recognizing Hyper-V synthetic network adapters Product: DPDK Version: 24.03 Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: ofe...@claroty.com Target Milestone: --- Hello, A client of our installed on a Hyper-V Ubuntu VM a synthetic network adapter. It looks really strange. For example, in `lspci` we don't see any network adapters, but in `lshw -class network` we do see them. I see that dpdk-devbind is iterating on the PCIs, I assume that similarly to lspci, so it doesn't find them either. Is there a way to solve it in dpdk, or is it simply not supported? Would changing it to emulated network adapter should work? Thanks ahead -- You are receiving this mail because: You are the assignee for the bug.
Re: [PATCH v6 5/9] net/zxdh: add msg chan enable implementation
16/10/2024 10:18, Junlong Wang:
> Add msg chan enable implementation to support
> send msg to get infos.
Would be interesting to explain which module is receiving the message.
> +union VPORT {
Why uppercase? for differenciate with vport below?
In general we tend to use only lowercase.
> + uint16_t vport;
> + struct {
> + uint16_t vfid:8;
> + uint16_t pfid:3;
> + uint16_t vf_flag:1;
> + uint16_t epid:3;
> + uint16_t direct_flag:1;
> + };
> +};
I am curious about the spinlock function below.
What is it doing exactly?
> +static int32_t zxdh_spinlock_lock(uint32_t virt_lock_id, uint64_t virt_addr,
> + uint64_t label_addr, uint16_t
> primary_id)
> +{
> + uint32_t lock_rd_cnt = 0;
> +
> + do {
> + /* read to lock */
> + uint8_t spl_val = spinklock_read(virt_addr, virt_lock_id);
typo, it should be spinlock_read
> +
> + if (spl_val == 0) {
> + label_write((uint64_t)label_addr, virt_lock_id,
> primary_id);
> + break;
> + }
> + rte_delay_us_block(SPINLOCK_POLLING_SPAN_US);
> + lock_rd_cnt++;
> + } while (lock_rd_cnt < MAX_HARD_SPINLOCK_ASK_TIMES);
> + if (lock_rd_cnt >= MAX_HARD_SPINLOCK_ASK_TIMES)
> + return -1;
> +
> + return 0;
> +}
[...]
> +pthread_spinlock_t chan_lock;
> +static int zxdh_bar_chan_lock(uint8_t src, uint8_t dst, uint16_t src_pcieid,
> uint64_t virt_addr)
> +{
> + int ret = 0;
> + uint8_t src_index = zxdh_bar_msg_src_index_trans(src);
> + uint8_t dst_index = zxdh_bar_msg_dst_index_trans(dst);
> +
> + if (src_index == BAR_MSG_SRC_ERR || dst_index == BAR_MSG_DST_ERR) {
> + PMD_MSG_LOG(ERR, "lock ERR: chan doesn't exist.");
> + return BAR_MSG_ERR_TYPE;
> + }
> + uint16_t idx = lock_type_tbl[src_index][dst_index];
> +
> + if (idx == LOCK_TYPE_SOFT)
> + pthread_spin_lock(&chan_lock);
In general we avoid the pthread.h functions.
Do you know we have rte_spinlock_lock()?
> + else
> + ret = zxdh_bar_hard_lock(src_pcieid, dst, virt_addr);
> +
> + if (ret != 0)
> + PMD_MSG_LOG(ERR, "dev: 0x%x failed to lock.", src_pcieid);
> +
> + return ret;
> +}
[...]
> --- a/drivers/net/zxdh/zxdh_msg.h
> +++ b/drivers/net/zxdh/zxdh_msg.h
> @@ -13,6 +13,19 @@ extern "C" {
>
> #include
>
> +#define ZXDH_MSIX_INTR_MSG_VEC_BASE 1
> +
You should continue using the prefix ZXDH_
These definitions below have a high risk of namespace conflict in future.
Using a namespace prefix is a good practice.
> +#define BAR_MSG_POLLING_SPAN 100
> +#define BAR_MSG_POLL_CNT_PER_MS (1 * 1000 / BAR_MSG_POLLING_SPAN)
> +#define BAR_MSG_POLL_CNT_PER_S (1 * 1000 * 1000 / BAR_MSG_POLLING_SPAN)
> +#define BAR_MSG_TIMEOUT_TH (10 * 1000 * 1000 / BAR_MSG_POLLING_SPAN)
> +
> +#define BAR_CHAN_MSG_SYNC 0
> +
> +#define BAR_MSG_ADDR_CHAN_INTERVAL (2 * 1024) /* channel size */
> +#define BAR_MSG_PLAYLOAD_OFFSET (sizeof(struct bar_msg_header))
> +#define BAR_MSG_PAYLOAD_MAX_LEN (BAR_MSG_ADDR_CHAN_INTERVAL -
> sizeof(struct bar_msg_header)) +
>
> enum DRIVER_TYPE {
>
> MSG_CHAN_END_MPF = 0,
> MSG_CHAN_END_PF,
>
> @@ -20,6 +33,13 @@ enum DRIVER_TYPE {
>
> MSG_CHAN_END_RISC,
>
> };
>
> +enum MSG_VEC {
> +MSIX_FROM_PFVF = ZXDH_MSIX_INTR_MSG_VEC_BASE,
> +MSIX_FROM_MPF,
> +MSIX_FROM_RISCV,
> +MSG_VEC_NUM,
> +};
> +
>
> enum BAR_MSG_RTN {
>
> BAR_MSG_OK = 0,
> BAR_MSG_ERR_MSGID,
>
> @@ -54,10 +74,117 @@ enum BAR_MSG_RTN {
>
> BAR_MSG_ERR_SOCKET, /* netlink sockte err */
>
> };
>
> +enum bar_module_id {
> +BAR_MODULE_DBG = 0, /* 0: debug */
> +BAR_MODULE_TBL, /* 1: resource table */
> +BAR_MODULE_MISX,/* 2: config msix */
> +BAR_MODULE_SDA, /* 3: */
> +BAR_MODULE_RDMA,/* 4: */
> +BAR_MODULE_DEMO,/* 5: channel test */
> +BAR_MODULE_SMMU,/* 6: */
> +BAR_MODULE_MAC, /* 7: mac rx/tx stats */
> +BAR_MODULE_VDPA,/* 8: vdpa live migration */
> +BAR_MODULE_VQM, /* 9: vqm live migration */
> +BAR_MODULE_NP, /* 10: vf msg callback np */
> +BAR_MODULE_VPORT, /* 11: get vport */
> +BAR_MODULE_BDF, /* 12: get bdf */
> +BAR_MODULE_RISC_READY, /* 13: */
> +BAR_MODULE_REVERSE,/* 14: byte stream reverse */
> +BAR_MDOULE_NVME, /* 15: */
> +BAR_MDOULE_NPSDK, /* 16: */
> +BAR_MODULE_NP_TODO,/* 17: */
> +MODULE_BAR_MSG_TO_PF, /* 18: */
> +MODULE_BAR_MSG_TO_VF, /* 19: */
> +
> +MODULE_FLASH = 32,
> +BAR_MODULE_OFFSET_GET = 33,
> +BAR_EVENT_OVS_WITH_VCB = 36,
> +
> +BAR_MSG_MODULE_NUM = 100,
> +};
> +
> +struct msix_para {
> +uint16_t pcie_id;
> +uint16_t vector_risc;
> +uint16_t vector_pfvf;
> +uint16_t vector_mpf;
> +uint64_t virt_addr;
> +
[PATCH v6 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
RE: [PATCH v2] app/dma-perf: per device config support
Hi Thomas, Gentle ping. Could you please consider merging this patch. Thanks, Amit Shukla > -Original Message- > From: Amit Prakash Shukla > Sent: Thursday, September 26, 2024 5:43 PM > To: Cheng Jiang ; Chengwen Feng > > Cc: dev@dpdk.org; Jerin Jacob ; Vamsi Krishna > Attunuru ; Anoob Joseph ; > Gowrishankar Muthukrishnan ; Amit Prakash > Shukla > Subject: [PATCH v2] app/dma-perf: per device config support > > Add support to configure device specific config parameters for a testcase. > Example: > > lcore_dma0=lcore=11,dev=:00:04.1,dir=mem2dev,raddr=0x3, > coreid=1,pfid=2,vfid=3 > lcore_dma1=lcore=12,dev=:00:04.2,dir=dev2mem,raddr=0x2, > coreid=3,pfid=2,vfid=1 > > Signed-off-by: Amit Prakash Shukla > Acked-by: Chengwen Feng > --- > v2: > - Resolved review comments. > > app/test-dma-perf/benchmark.c | 318 +- > app/test-dma-perf/config.ini | 30 ++-- > app/test-dma-perf/main.c | 199 ++--- > app/test-dma-perf/main.h | 20 ++- > doc/guides/tools/dmaperf.rst | 107 +--- > 5 files changed, 360 insertions(+), 314 deletions(-) >
Re: [PATCH v6 6/9] net/zxdh: add zxdh get device backend infos
16/10/2024 10:18, Junlong Wang: > --- a/drivers/net/zxdh/zxdh_msg.c > +++ b/drivers/net/zxdh/zxdh_msg.c > @@ -18,8 +18,6 @@ > #define REPS_INFO_FLAG_USABLE 0x00 > #define BAR_SEQID_NUM_MAX 256 > > -#define ZXDH_BAR0_INDEX 0 > - > #define PCIEID_IS_PF_MASK (0x0800) > #define PCIEID_PF_IDX_MASK (0x0700) > #define PCIEID_VF_IDX_MASK (0x00ff) > @@ -43,7 +41,6 @@ > #define FW_SHRD_OFFSET (0x5000) > #define FW_SHRD_INNER_HW_LABEL_PAT (0x800) > #define HW_LABEL_OFFSET(FW_SHRD_OFFSET + > FW_SHRD_INNER_HW_LABEL_PAT) > -#define ZXDH_CTRLCH_OFFSET (0x2000) > #define CHAN_RISC_SPINLOCK_OFFSET(BAR0_SPINLOCK_OFFSET - > BAR0_CHAN_RISC_OFFSET) > #define CHAN_PFVF_SPINLOCK_OFFSET(BAR0_SPINLOCK_OFFSET - > BAR0_CHAN_PFVF_OFFSET) > #define CHAN_RISC_LABEL_OFFSET (HW_LABEL_OFFSET - > BAR0_CHAN_RISC_OFFSET) Removing code is strange here. Maybe it should have been placed somewhere else initially?
Re: [PATCH v6 8/9] net/zxdh: add zxdh dev infos get ops
16/10/2024 10:18, Junlong Wang:
> +static uint32_t zxdh_dev_speed_capa_get(uint32_t speed)
> +{
> + switch (speed) {
> + case RTE_ETH_SPEED_NUM_10G: return RTE_ETH_LINK_SPEED_10G;
> + case RTE_ETH_SPEED_NUM_20G: return RTE_ETH_LINK_SPEED_20G;
> + case RTE_ETH_SPEED_NUM_25G: return RTE_ETH_LINK_SPEED_25G;
> + case RTE_ETH_SPEED_NUM_40G: return RTE_ETH_LINK_SPEED_40G;
> + case RTE_ETH_SPEED_NUM_50G: return RTE_ETH_LINK_SPEED_50G;
> + case RTE_ETH_SPEED_NUM_56G: return RTE_ETH_LINK_SPEED_56G;
> + case RTE_ETH_SPEED_NUM_100G: return RTE_ETH_LINK_SPEED_100G;
> + case RTE_ETH_SPEED_NUM_200G: return RTE_ETH_LINK_SPEED_200G;
> + default: return 0;
> + }
> +}
You could use rte_eth_speed_bitflag() instead.
Re: [v12,12/12] crypto/zsda: add zsda crypto PMD
Hi maintainers: Do we need to solve the error and warning? We haven't found the detailed reason for the error and warning in the output log. And we don't modified code about eal_flags_misc_autotes, cryptodev_sw_zuc_autotest or cryptodev_sw_snow3g_autotest, which can be ensured in https://patches.dpdk.org/project/dpdk/cover/20241019110428.1970056-1-li.hanx...@zte.com.cn/. The error info: | Fedora 38 (Clang) | FAIL | 34/113 DPDK:fast-tests / eal_flags_misc_autotest FAIL 1.93 s (killed by signal 11 SIGSEGV) The warnging info: No testlog script to copy Thanks.
[PATCH 10/10] eventdev: remove single event enqueue and dequeue
Remove the single event enqueue and dequeue, since they did not
provide any noticeable performance benefits.
This is a change of the ABI, previously announced as a deprecation
notice. These functions were not directly invoked by the application,
so the API remains unaffected.
Signed-off-by: Mattias Rönnblom
--
RFC v3:
* Update release notes. (Jerin Jacob)
* Remove single-event enqueue and dequeue function typedefs.
(Pavan Nikhilesh)
---
doc/guides/rel_notes/deprecation.rst | 6 +-
doc/guides/rel_notes/release_24_11.rst | 3 +++
lib/eventdev/eventdev_pmd.h| 4
lib/eventdev/eventdev_private.c| 22 --
lib/eventdev/rte_eventdev.h| 21 -
lib/eventdev/rte_eventdev_core.h | 11 ---
6 files changed, 8 insertions(+), 59 deletions(-)
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 17b7332007..a90b54fc77 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -131,11 +131,7 @@ Deprecation Notices
* eventdev: The single-event (non-burst) enqueue and dequeue operations,
used by static inline burst enqueue and dequeue functions in
``rte_eventdev.h``,
- will be removed in DPDK 23.11.
- This simplification includes changing the layout and potentially also
- the size of the public ``rte_event_fp_ops`` struct, breaking the ABI.
- Since these functions are not called directly by the application,
- the API remains unaffected.
+ are removed in DPDK 24.11.
* pipeline: The pipeline library legacy API (functions rte_pipeline_*)
will be deprecated and subsequently removed in DPDK 24.11 release.
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index fa4822d928..5461798970 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -401,6 +401,9 @@ ABI Changes
* eventdev: Added ``preschedule_type`` field to ``rte_event_dev_config``
structure.
+* eventdev: The PMD single-event enqueue and dequeue function pointers are
removed
+ from ``rte_event_fp_fps``.
+
* graph: To accommodate node specific xstats counters, added ``xstat_cntrs``,
``xstat_desc`` and ``xstat_count`` to ``rte_graph_cluster_node_stats``,
added new structure ``rte_node_xstats`` to ``rte_node_register`` and
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index af855e3467..36148f8d86 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -158,16 +158,12 @@ struct __rte_cache_aligned rte_eventdev {
uint8_t attached : 1;
/**< Flag indicating the device is attached */
- event_enqueue_t enqueue;
- /**< Pointer to PMD enqueue function. */
event_enqueue_burst_t enqueue_burst;
/**< Pointer to PMD enqueue burst function. */
event_enqueue_burst_t enqueue_new_burst;
/**< Pointer to PMD enqueue burst function(op new variant) */
event_enqueue_burst_t enqueue_forward_burst;
/**< Pointer to PMD enqueue burst function(op forward variant) */
- event_dequeue_t dequeue;
- /**< Pointer to PMD dequeue function. */
event_dequeue_burst_t dequeue_burst;
/**< Pointer to PMD dequeue burst function. */
event_maintain_t maintain;
diff --git a/lib/eventdev/eventdev_private.c b/lib/eventdev/eventdev_private.c
index b628f4a69e..6df129fc2d 100644
--- a/lib/eventdev/eventdev_private.c
+++ b/lib/eventdev/eventdev_private.c
@@ -5,15 +5,6 @@
#include "eventdev_pmd.h"
#include "rte_eventdev.h"
-static uint16_t
-dummy_event_enqueue(__rte_unused void *port,
- __rte_unused const struct rte_event *ev)
-{
- RTE_EDEV_LOG_ERR(
- "event enqueue requested for unconfigured event device");
- return 0;
-}
-
static uint16_t
dummy_event_enqueue_burst(__rte_unused void *port,
__rte_unused const struct rte_event ev[],
@@ -24,15 +15,6 @@ dummy_event_enqueue_burst(__rte_unused void *port,
return 0;
}
-static uint16_t
-dummy_event_dequeue(__rte_unused void *port, __rte_unused struct rte_event *ev,
- __rte_unused uint64_t timeout_ticks)
-{
- RTE_EDEV_LOG_ERR(
- "event dequeue requested for unconfigured event device");
- return 0;
-}
-
static uint16_t
dummy_event_dequeue_burst(__rte_unused void *port,
__rte_unused struct rte_event ev[],
@@ -129,11 +111,9 @@ event_dev_fp_ops_reset(struct rte_event_fp_ops *fp_op)
{
static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
static const struct rte_event_fp_ops dummy = {
- .enqueue = dummy_event_enqueue,
.enqueue_burst = dummy_event_enqueue_burst,
.enqueue_new_burst = dummy_event_enqueue_burst,
.enqueue_forward_burst = dummy_event_enqueue_burst,
- .dequeue = dummy_event_de
[PATCH 07/10] event/opdl: remove single event enqueue and dequeue
Provide only burst enqueue and dequeue. Signed-off-by: Mattias Rönnblom --- drivers/event/opdl/opdl_evdev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c index 25853166bf..ffa65ef930 100644 --- a/drivers/event/opdl/opdl_evdev.c +++ b/drivers/event/opdl/opdl_evdev.c @@ -718,11 +718,9 @@ opdl_probe(struct rte_vdev_device *vdev) dev->dev_ops = &evdev_opdl_ops; - dev->enqueue = opdl_event_enqueue; dev->enqueue_burst = opdl_event_enqueue_burst; dev->enqueue_new_burst = opdl_event_enqueue_burst; dev->enqueue_forward_burst = opdl_event_enqueue_burst; - dev->dequeue = opdl_event_dequeue; dev->dequeue_burst = opdl_event_dequeue_burst; if (rte_eal_process_type() != RTE_PROC_PRIMARY) -- 2.43.0
[PATCH 03/10] event/octeontx: remove single event enqueue and dequeue
Provide only burst enqueue and dequeue.
Signed-off-by: Mattias Rönnblom
---
drivers/event/octeontx/ssovf_evdev.h | 1 -
drivers/event/octeontx/ssovf_worker.c | 40 +++
2 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/drivers/event/octeontx/ssovf_evdev.h
b/drivers/event/octeontx/ssovf_evdev.h
index 1997626438..0f81115a37 100644
--- a/drivers/event/octeontx/ssovf_evdev.h
+++ b/drivers/event/octeontx/ssovf_evdev.h
@@ -172,7 +172,6 @@ ssovf_pmd_priv(const struct rte_eventdev *eventdev)
extern int otx_logtype_ssovf;
#define RTE_LOGTYPE_OTX_SSOVF otx_logtype_ssovf
-uint16_t ssows_enq(void *port, const struct rte_event *ev);
uint16_t ssows_enq_burst(void *port,
const struct rte_event ev[], uint16_t nb_events);
uint16_t ssows_enq_new_burst(void *port,
diff --git a/drivers/event/octeontx/ssovf_worker.c
b/drivers/event/octeontx/ssovf_worker.c
index 36454939ea..89b5dc056c 100644
--- a/drivers/event/octeontx/ssovf_worker.c
+++ b/drivers/event/octeontx/ssovf_worker.c
@@ -148,12 +148,14 @@ ssows_deq_timeout_burst_ ##name(void *port, struct
rte_event ev[], \
SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
#undef R
-__rte_always_inline uint16_t __rte_hot
-ssows_enq(void *port, const struct rte_event *ev)
+uint16_t __rte_hot
+ssows_enq_burst(void *port, const struct rte_event ev[], uint16_t nb_events)
{
struct ssows *ws = port;
uint16_t ret = 1;
+ RTE_SET_USED(nb_events);
+
switch (ev->op) {
case RTE_EVENT_OP_NEW:
rte_smp_wmb();
@@ -171,13 +173,6 @@ ssows_enq(void *port, const struct rte_event *ev)
return ret;
}
-uint16_t __rte_hot
-ssows_enq_burst(void *port, const struct rte_event ev[], uint16_t nb_events)
-{
- RTE_SET_USED(nb_events);
- return ssows_enq(port, ev);
-}
-
uint16_t __rte_hot
ssows_enq_new_burst(void *port, const struct rte_event ev[], uint16_t
nb_events)
{
@@ -336,7 +331,6 @@ ssovf_fastpath_fns_set(struct rte_eventdev *dev)
{
struct ssovf_evdev *edev = ssovf_pmd_priv(dev);
- dev->enqueue = ssows_enq;
dev->enqueue_burst = ssows_enq_burst;
dev->enqueue_new_burst = ssows_enq_new_burst;
dev->enqueue_forward_burst = ssows_enq_fwd_burst;
@@ -360,19 +354,6 @@ ssovf_fastpath_fns_set(struct rte_eventdev *dev)
dev->txa_enqueue_same_dest = dev->txa_enqueue;
/* Assigning dequeue func pointers */
- const event_dequeue_t ssow_deq[2][2][2] = {
-#define R(name, f2, f1, f0, flags) \
- [f2][f1][f0] = ssows_deq_ ##name,
-
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
- };
-
- dev->dequeue = ssow_deq
- [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)]
- [!!(edev->rx_offload_flags & OCCTX_RX_OFFLOAD_CSUM_F)]
- [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)];
-
const event_dequeue_burst_t ssow_deq_burst[2][2][2] = {
#define R(name, f2, f1, f0, flags) \
[f2][f1][f0] = ssows_deq_burst_ ##name,
@@ -387,19 +368,6 @@ SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
[!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)];
if (edev->is_timeout_deq) {
- const event_dequeue_t ssow_deq_timeout[2][2][2] = {
-#define R(name, f2, f1, f0, flags) \
- [f2][f1][f0] = ssows_deq_timeout_ ##name,
-
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
- };
-
- dev->dequeue = ssow_deq_timeout
- [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)]
- [!!(edev->rx_offload_flags & OCCTX_RX_OFFLOAD_CSUM_F)]
- [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)];
-
const event_dequeue_burst_t ssow_deq_timeout_burst[2][2][2] = {
#define R(name, f2, f1, f0, flags) \
[f2][f1][f0] = ssows_deq_timeout_burst_ ##name,
--
2.43.0
