[dpdk-dev] [PATCH] net/iavf: fix small probabilistic probe failure
In the embedded RTOS environment, the x722 controller Ethernet card of
the d2146nt chip, the vfio user mode driver takes over 8 vf ports in
turn, but iavf_check_vf_reset_done will probably fail.
This issue has been discussed with intel&dpdk experts for 3 rounds
before, and the version matching is no problem, and there is no
substantial progress.
1) Learning from the implementation of the i40evf kernel driver
locally, after modifying the polling time from 1 second to 5s,
2) In the same way, by checking and checking, it is found that
the probability of vf sending a command to the interrupt thread
receiving the message will occur for more than 12s, and there is
no failure, so the time is adjusted to 15s.
the repeated restart process took over the start port test, and it
was found that this probability was reduced to an order of magnitude
acceptable to the user.
The patch cannot fundamentally solve the failure problem, but it greatly
slows down the probability of the problem. The modification is based on the
i40evf kernel driver.
Fixes: 22b123a36d07 ("net/avf: initialize PMD")
Cc: sta...@dpdk.org
Signed-off-by: Qiming Chen
---
drivers/net/iavf/iavf.h | 2 +-
drivers/net/iavf/iavf_vchnl.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index b3bd078111..b3732d1185 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -16,7 +16,7 @@
#define IAVF_AQ_LEN 32
#define IAVF_AQ_BUF_SZ4096
-#define IAVF_RESET_WAIT_CNT 50
+#define IAVF_RESET_WAIT_CNT 250
#define IAVF_BUF_SIZE_MIN 1024
#define IAVF_FRAME_SIZE_MAX 9728
#define IAVF_QUEUE_BASE_ADDR_UNIT 128
diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 2f39c2077c..25066419b0 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -23,7 +23,7 @@
#include "iavf.h"
#include "iavf_rxtx.h"
-#define MAX_TRY_TIMES 200
+#define MAX_TRY_TIMES 1500
#define ASQ_DELAY_MS 10
static uint32_t
--
2.30.1.windows.1
Re: [dpdk-dev] [PATCH v2 1/6] bbdev: add capability for CRC16 check
On 9/1/21 8:00 AM, Chautru, Nicolas wrote:
-Original Message-
From: Tom Rix
Sent: Wednesday, September 1, 2021 6:37 AM
To: Chautru, Nicolas ; dev@dpdk.org;
gak...@marvell.com
Cc: tho...@monjalon.net; hemant.agra...@nxp.com; Zhang, Mingshan
; Joshi, Arun
Subject: Re: [PATCH v2 1/6] bbdev: add capability for CRC16 check
On 8/19/21 2:10 PM, Nicolas Chautru wrote:
Adding a missing operation when CRC16
is being used for TB CRC check.
Signed-off-by: Nicolas Chautru
---
app/test-bbdev/test_bbdev_vector.c | 2 ++
doc/guides/prog_guide/bbdev.rst| 3 +++
doc/guides/rel_notes/release_21_11.rst | 1 +
lib/bbdev/rte_bbdev_op.h | 34 ++--
--
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_vector.c
b/app/test-bbdev/test_bbdev_vector.c
index 614dbd1..8d796b1 100644
--- a/app/test-bbdev/test_bbdev_vector.c
+++ b/app/test-bbdev/test_bbdev_vector.c
@@ -167,6 +167,8 @@
*op_flag_value = RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK;
else if (!strcmp(token, "RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP"))
*op_flag_value = RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP;
+ else if (!strcmp(token, "RTE_BBDEV_LDPC_CRC_TYPE_16_CHECK"))
+ *op_flag_value = RTE_BBDEV_LDPC_CRC_TYPE_16_CHECK;
else if (!strcmp(token,
"RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS"))
*op_flag_value =
RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS;
else if (!strcmp(token,
"RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE"))
diff --git a/doc/guides/prog_guide/bbdev.rst
b/doc/guides/prog_guide/bbdev.rst index 9619280..8bd7cba 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -891,6 +891,9 @@ given below.
|RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP|
| Set to drop the last CRC bits decoding output |
++
+|RTE_BBDEV_LDPC_CRC_TYPE_16_CHECK|
+| Set for code block CRC-16 checking |
+++
|RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS |
| Set for bit-level de-interleaver bypass on input stream|
++
diff --git a/doc/guides/rel_notes/release_21_11.rst
b/doc/guides/rel_notes/release_21_11.rst
index d707a55..69dd518 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -84,6 +84,7 @@ API Changes
Also, make sure to start the actual text at the margin.
===
+* bbdev: Added capability related to more comprehensive CRC options.
ABI Changes
---
diff --git a/lib/bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h index
f946842..7c44ddd 100644
--- a/lib/bbdev/rte_bbdev_op.h
+++ b/lib/bbdev/rte_bbdev_op.h
@@ -142,51 +142,53 @@ enum rte_bbdev_op_ldpcdec_flag_bitmasks {
RTE_BBDEV_LDPC_CRC_TYPE_24B_CHECK = (1ULL << 1),
/** Set to drop the last CRC bits decoding output */
RTE_BBDEV_LDPC_CRC_TYPE_24B_DROP = (1ULL << 2),
+ /** Set for transport block CRC-16 checking */
+ RTE_BBDEV_LDPC_CRC_TYPE_16_CHECK = (1ULL << 3),
Changing these enums will break the abi backwards.
Why not add the new one at the end ?
To keep all the CRC related flags next to each other for better readability and
logical clarity. The ABI is still marked as experimental.
Ok
Tom
/** Set for bit-level de-interleaver bypass on Rx stream. */
- RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS = (1ULL << 3),
+ RTE_BBDEV_LDPC_DEINTERLEAVER_BYPASS = (1ULL << 4),
/** Set for HARQ combined input stream enable. */
- RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE = (1ULL << 4),
+ RTE_BBDEV_LDPC_HQ_COMBINE_IN_ENABLE = (1ULL << 5),
/** Set for HARQ combined output stream enable. */
- RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE = (1ULL << 5),
+ RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE = (1ULL << 6),
/** Set for LDPC decoder bypass.
* RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE must be set.
*/
- RTE_BBDEV_LDPC_DECODE_BYPASS = (1ULL << 6),
+ RTE_BBDEV_LDPC_DECODE_BYPASS = (1ULL << 7),
/** Set for soft-output stream enable */
- RTE_BBDEV_LDPC_SOFT_OUT_ENABLE = (1ULL << 7),
+ RTE_BBDEV_LDPC_SOFT_OUT_ENABLE = (1ULL << 8),
/** Set for Rate-Matching bypass on soft-out stream. */
- RTE_BBDEV_LDPC_SOFT_OUT_RM_BYPASS = (1ULL << 8),
+ RTE_BBDEV_LDPC_SOFT_OUT_RM_BYPASS = (1ULL << 9),
/** Set for bit-level de-interleaver bypass on soft-output stream. */
- RTE_BBDEV_LDPC_SOFT_OUT_DEINTERLEAVER_BYPASS = (1ULL <<
9),
+ RTE_BBDEV_LDPC_SOFT_OUT_DEINTERLEAVER_BYPASS = (1ULL <<
10),
/** Set for iteration stop
Re: [dpdk-dev] [PATCH v2 4/6] baseband/acc100: add support for 4G CRC drop
On 9/7/21 6:04 PM, Chautru, Nicolas wrote:
-Original Message-
From: Tom Rix
Sent: Wednesday, September 1, 2021 7:20 AM
To: Chautru, Nicolas ; dev@dpdk.org;
gak...@marvell.com
Cc: tho...@monjalon.net; hemant.agra...@nxp.com; Zhang, Mingshan
; Joshi, Arun
Subject: Re: [PATCH v2 4/6] baseband/acc100: add support for 4G CRC drop
On 8/19/21 2:10 PM, Nicolas Chautru wrote:
This implements in PMD the option to drop the CB CRC after 4G decoding
to help transport block concatenation.
Signed-off-by: Nicolas Chautru
---
doc/guides/bbdevs/acc100.rst | 1 +
doc/guides/rel_notes/release_21_11.rst | 4
drivers/baseband/acc100/rte_acc100_pmd.c | 12 +---
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/doc/guides/bbdevs/acc100.rst
b/doc/guides/bbdevs/acc100.rst index ff0fa4b..9fff6ab 100644
--- a/doc/guides/bbdevs/acc100.rst
+++ b/doc/guides/bbdevs/acc100.rst
@@ -58,6 +58,7 @@ ACC100 5G/4G FEC PMD supports the following BBDEV
capabilities:
- ``RTE_BBDEV_TURBO_NEG_LLR_1_BIT_IN`` : set if negative LLR
encoder i/p is supported
- ``RTE_BBDEV_TURBO_POS_LLR_1_BIT_IN`` : set if positive LLR encoder
i/p is supported
- ``RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP`` : keep CRC24B bits
appended while decoding
+ - ``RTE_BBDEV_TURBO_DEC_CRC_24B_DROP`` : option to drop the code
+ block CRC after decoding
- ``RTE_BBDEV_TURBO_EARLY_TERMINATION`` : set early termination
feature
- ``RTE_BBDEV_TURBO_DEC_SCATTER_GATHER`` : supports scatter-
gather for input/output data
- ``RTE_BBDEV_TURBO_HALF_ITERATION_EVEN`` : set half iteration
granularity diff --git a/doc/guides/rel_notes/release_21_11.rst
b/doc/guides/rel_notes/release_21_11.rst
index 8ca59b7..f7843bc 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -59,6 +59,10 @@ New Features
Added support for more comprehensive CRC options.
+* **Updated the ACC100 bbdev PMD.**
+
+ Added support for more comprehensive CRC options.
+
Removed Items
-
diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c
b/drivers/baseband/acc100/rte_acc100_pmd.c
index 68ba523..891be81 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.c
+++ b/drivers/baseband/acc100/rte_acc100_pmd.c
@@ -980,6 +980,7 @@
RTE_BBDEV_TURBO_NEG_LLR_1_BIT_IN |
RTE_BBDEV_TURBO_MAP_DEC |
RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP |
+
RTE_BBDEV_TURBO_DEC_CRC_24B_DROP |
RTE_BBDEV_TURBO_DEC_SCATTER_GATHER,
.max_llr_modulus = INT8_MAX,
.num_buffers_src =
@@ -1708,8 +1709,12 @@
}
if ((op->turbo_dec.code_block_mode ==
RTE_BBDEV_TRANSPORT_BLOCK)
- && !check_bit(op->turbo_dec.op_flags,
- RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP))
+ && !check_bit(op->turbo_dec.op_flags,
+ RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP))
+ crc24_overlap = 24;
+ if ((op->turbo_dec.code_block_mode == RTE_BBDEV_CODE_BLOCK)
These two if-statements can be combined.
They could but really when I tried that became arguably unreadable, I thought
it was still better this way.
Ok
Tom
+ && check_bit(op->turbo_dec.op_flags,
+ RTE_BBDEV_TURBO_DEC_CRC_24B_DROP))
crc24_overlap = 24;
/* Calculates circular buffer size.
@@ -1744,7 +1749,8 @@
next_triplet = acc100_dma_fill_blk_type_out(
desc, h_output, *h_out_offset,
- k >> 3, next_triplet,
ACC100_DMA_BLKID_OUT_HARD);
+ (k - crc24_overlap) >> 3, next_triplet,
crc24_overlap had been set before this patch in the above if-statement for
crc_24b_keep.
so this looks like a bug.
If it is a bug, it should be separated out as its own patch.
Ok fair enough, will do. Thanks
Tom
+ ACC100_DMA_BLKID_OUT_HARD);
if (unlikely(next_triplet < 0)) {
rte_bbdev_log(ERR,
"Mismatch between data to process and
mbuf data length in
bbdev_op: %p",
Re: [dpdk-dev] [PATCH v1] baseband/acc100: fix 4GUL outbound size when CRC is dropped
On 9/7/21 6:39 PM, Nicolas Chautru wrote:
This patch fixes the issue by adjusting the outbound size after
turbodecoding when the appended CRC is meant to be dropped.
Fixes: f404dfe35cc3 ("baseband/acc100: support 4G processing")
Cc: sta...@dpdk.org
Signed-off-by: Nicolas Chautru
---
drivers/baseband/acc100/rte_acc100_pmd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c
b/drivers/baseband/acc100/rte_acc100_pmd.c
index 68ba523..b0485e7 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.c
+++ b/drivers/baseband/acc100/rte_acc100_pmd.c
@@ -1744,7 +1744,8 @@
next_triplet = acc100_dma_fill_blk_type_out(
desc, h_output, *h_out_offset,
- k >> 3, next_triplet, ACC100_DMA_BLKID_OUT_HARD);
+ (k - crc24_overlap) >> 3, next_triplet,
+ ACC100_DMA_BLKID_OUT_HARD);
if (unlikely(next_triplet < 0)) {
rte_bbdev_log(ERR,
"Mismatch between data to process and mbuf data
length in bbdev_op: %p",
Thanks for this change, looks good.
Reviewed-by: Tom Rix
[dpdk-dev] [PATCH v3 02/13] net/bnxt: enable dpool allocator
From: Peter Spreadborough
Enable dynamic entry allocator for EM SRAM entries.
Deprecate static entry allocator code.
Signed-off-by: Peter Spreadborough
Reviewed-by: Randy Schacher
---
drivers/net/bnxt/tf_core/tf_device_p58.c | 4 -
drivers/net/bnxt/tf_core/tf_em.h | 10 -
.../net/bnxt/tf_core/tf_em_hash_internal.c| 34
drivers/net/bnxt/tf_core/tf_em_internal.c | 180 +-
4 files changed, 1 insertion(+), 227 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_device_p58.c
b/drivers/net/bnxt/tf_core/tf_device_p58.c
index ce4d8c661f..808dcb1f77 100644
--- a/drivers/net/bnxt/tf_core/tf_device_p58.c
+++ b/drivers/net/bnxt/tf_core/tf_device_p58.c
@@ -348,11 +348,7 @@ const struct tf_dev_ops tf_dev_ops_p58 = {
.tf_dev_get_tcam_resc_info = tf_tcam_get_resc_info,
.tf_dev_insert_int_em_entry = tf_em_hash_insert_int_entry,
.tf_dev_delete_int_em_entry = tf_em_hash_delete_int_entry,
-#if (TF_EM_ALLOC == 1)
.tf_dev_move_int_em_entry = tf_em_move_int_entry,
-#else
- .tf_dev_move_int_em_entry = NULL,
-#endif
.tf_dev_insert_ext_em_entry = NULL,
.tf_dev_delete_ext_em_entry = NULL,
.tf_dev_get_em_resc_info = tf_em_get_resc_info,
diff --git a/drivers/net/bnxt/tf_core/tf_em.h b/drivers/net/bnxt/tf_core/tf_em.h
index 568071ad8c..074c128651 100644
--- a/drivers/net/bnxt/tf_core/tf_em.h
+++ b/drivers/net/bnxt/tf_core/tf_em.h
@@ -13,16 +13,6 @@
#include "hcapi_cfa_defs.h"
-/**
- * TF_EM_ALLOC
- *
- * 0: Use stack allocator with fixed sized entries
- *(default).
- * 1: Use dpool allocator with variable size
- *entries.
- */
-#define TF_EM_ALLOC 0
-
#define TF_EM_MIN_ENTRIES (1 << 15) /* 32K */
#define TF_EM_MAX_ENTRIES (1 << 27) /* 128M */
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 098e8af07e..60273a798c 100644
--- a/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
+++ b/drivers/net/bnxt/tf_core/tf_em_hash_internal.c
@@ -22,9 +22,7 @@
/**
* EM Pool
*/
-#if (TF_EM_ALLOC == 1)
#include "dpool.h"
-#endif
/**
* Insert EM internal entry API
@@ -41,11 +39,7 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
uint16_t rptr_index = 0;
uint8_t rptr_entry = 0;
uint8_t num_of_entries = 0;
-#if (TF_EM_ALLOC == 1)
struct dpool *pool;
-#else
- struct stack *pool;
-#endif
uint32_t index;
uint32_t key0_hash;
uint32_t key1_hash;
@@ -62,7 +56,6 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
rc = tf_session_get_device(tfs, &dev);
if (rc)
return rc;
-#if (TF_EM_ALLOC == 1)
pool = (struct dpool *)tfs->em_pool[parms->dir];
index = dpool_alloc(pool,
parms->em_record_sz_in_bits / 128,
@@ -74,16 +67,6 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
tf_dir_2_str(parms->dir));
return -1;
}
-#else
- pool = (struct stack *)tfs->em_pool[parms->dir];
- rc = stack_pop(pool, &index);
- if (rc) {
- PMD_DRV_LOG(ERR,
- "%s, EM entry index allocation failed\n",
- tf_dir_2_str(parms->dir));
- return rc;
- }
-#endif
if (dev->ops->tf_dev_cfa_key_hash == NULL)
return -EINVAL;
@@ -103,11 +86,7 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
&num_of_entries);
if (rc) {
/* Free the allocated index before returning */
-#if (TF_EM_ALLOC == 1)
dpool_free(pool, index);
-#else
- stack_push(pool, index);
-#endif
return -1;
}
@@ -128,9 +107,7 @@ tf_em_hash_insert_int_entry(struct tf *tfp,
rptr_index,
rptr_entry,
0);
-#if (TF_EM_ALLOC == 1)
dpool_set_entry_data(pool, index, parms->flow_handle);
-#endif
return 0;
}
@@ -146,11 +123,7 @@ tf_em_hash_delete_int_entry(struct tf *tfp,
{
int rc = 0;
struct tf_session *tfs;
-#if (TF_EM_ALLOC == 1)
struct dpool *pool;
-#else
- struct stack *pool;
-#endif
/* Retrieve the session information */
rc = tf_session_get_session(tfp, &tfs);
if (rc) {
@@ -165,19 +138,13 @@ tf_em_hash_delete_int_entry(struct tf *tfp,
/* Return resource to pool */
if (rc == 0) {
-#if (TF_EM_ALLOC == 1)
pool = (struct dpool *)tfs->em_pool[parms->dir];
dpool_free(pool, parms->index);
-#else
- pool = (struct stack *)tfs->em_pool[parms->dir];
- stack_push(pool, parms->index);
-#endif
}
return rc;
}
-#if (TF_EM_ALLOC == 1)
/** Move EM internal entry API
*
* returns:
@@ -212,4 +179,3 @@ tf_em_move_int_entry(struct tf *tfp,
r
[dpdk-dev] [PATCH v3 00/13] enhancements to host based flow table management
This patch set adds support for new offload features/enhancments for Thor adapters like VF representor support, new flow matches/actions & dynamic SRAM manager support. v2 ==> v3 = * Fixed compilation issue. Farah Smith (4): net/bnxt: tf core index table updates net/bnxt: add Thor SRAM mgr model net/bnxt: tf core SRAM Manager net/bnxt: sram manager shared session Jay Ding (1): net/bnxt: add flow meter drop counter support Kishore Padmanabha (6): net/bnxt: add flow templates support for Thor net/bnxt: add support for tunnel offloads net/bnxt: add support for dynamic encap action net/bnxt: add wild card TCAM byte order for Thor net/bnxt: add flow templates for Thor net/bnxt: add enhancements to TF ULP Peter Spreadborough (1): net/bnxt: enable dpool allocator Randy Schacher (1): net/bnxt: dynamically allocate space for EM defrag function drivers/net/bnxt/tf_core/cfa_resource_types.h | 5 +- drivers/net/bnxt/tf_core/dpool.c |38 +- drivers/net/bnxt/tf_core/ll.c | 3 + drivers/net/bnxt/tf_core/ll.h |50 +- drivers/net/bnxt/tf_core/meson.build | 2 + drivers/net/bnxt/tf_core/tf_core.c| 169 +- drivers/net/bnxt/tf_core/tf_core.h| 159 +- drivers/net/bnxt/tf_core/tf_device.c |40 +- drivers/net/bnxt/tf_core/tf_device.h | 137 +- drivers/net/bnxt/tf_core/tf_device_p4.c |77 +- drivers/net/bnxt/tf_core/tf_device_p4.h |50 +- drivers/net/bnxt/tf_core/tf_device_p58.c | 112 +- drivers/net/bnxt/tf_core/tf_device_p58.h |70 +- drivers/net/bnxt/tf_core/tf_em.h |10 - drivers/net/bnxt/tf_core/tf_em_common.c | 4 + .../net/bnxt/tf_core/tf_em_hash_internal.c|34 - drivers/net/bnxt/tf_core/tf_em_internal.c | 185 +- drivers/net/bnxt/tf_core/tf_msg.c | 2 +- drivers/net/bnxt/tf_core/tf_rm.c | 180 +- drivers/net/bnxt/tf_core/tf_rm.h |62 +- drivers/net/bnxt/tf_core/tf_session.c |56 + drivers/net/bnxt/tf_core/tf_session.h |58 +- drivers/net/bnxt/tf_core/tf_sram_mgr.c| 971 + drivers/net/bnxt/tf_core/tf_sram_mgr.h| 317 + drivers/net/bnxt/tf_core/tf_tbl.c | 259 +- drivers/net/bnxt/tf_core/tf_tbl.h |87 +- drivers/net/bnxt/tf_core/tf_tbl_sram.c| 747 + drivers/net/bnxt/tf_core/tf_tbl_sram.h| 154 + drivers/net/bnxt/tf_core/tf_tcam.c|16 +- drivers/net/bnxt/tf_core/tf_tcam.h| 7 + drivers/net/bnxt/tf_core/tf_tcam_shared.c |28 +- drivers/net/bnxt/tf_core/tf_util.c|12 + drivers/net/bnxt/tf_ulp/bnxt_tf_common.h |10 +- drivers/net/bnxt/tf_ulp/bnxt_ulp.c|52 +- drivers/net/bnxt/tf_ulp/bnxt_ulp.h|20 +- drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 226 +- .../bnxt/tf_ulp/generic_templates/meson.build |17 +- .../generic_templates/ulp_template_db_act.c | 2 +- .../generic_templates/ulp_template_db_class.c | 12109 +++- .../generic_templates/ulp_template_db_enum.h | 618 +- .../generic_templates/ulp_template_db_field.h | 767 +- .../generic_templates/ulp_template_db_tbl.c | 2757 +- .../ulp_template_db_thor_act.c| 5079 +- .../ulp_template_db_thor_class.c | 45573 ++-- .../ulp_template_db_wh_plus_act.c | 1700 +- .../ulp_template_db_wh_plus_class.c | 8329 ++- drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c |48 +- drivers/net/bnxt/tf_ulp/ulp_fc_mgr.h | 8 +- drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 678 +- drivers/net/bnxt/tf_ulp/ulp_flow_db.h |68 +- drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c | 9 +- drivers/net/bnxt/tf_ulp/ulp_mapper.c | 448 +- drivers/net/bnxt/tf_ulp/ulp_mapper.h |10 +- drivers/net/bnxt/tf_ulp/ulp_matcher.c |13 + drivers/net/bnxt/tf_ulp/ulp_port_db.c |15 +- drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c |31 + drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 663 +- drivers/net/bnxt/tf_ulp/ulp_rte_parser.h |12 +- drivers/net/bnxt/tf_ulp/ulp_template_struct.h |32 +- drivers/net/bnxt/tf_ulp/ulp_tun.c | 521 +- drivers/net/bnxt/tf_ulp/ulp_tun.h |89 +- drivers/net/bnxt/tf_ulp/ulp_utils.c |71 +- drivers/net/bnxt/tf_ulp/ulp_utils.h |27 +- meson_options.txt | 2 + 64 files changed, 71149 insertions(+), 12956 deletions(-) create mode 100644 drivers/net/bnxt/tf_core/tf_sram_mgr.c create mode 100644 drivers/net/bnxt/tf_core/tf_sram_mgr.h create mode 100644 drivers/net/bnxt/tf_core/tf_tbl_sram.c create mode 100644 drivers/net/bnxt/tf_core/tf_tbl_sram.h -- 2.17.1
[dpdk-dev] [PATCH v3 03/13] net/bnxt: add flow meter drop counter support
From: Jay Ding
- Add flow meter drop counter support for Thor.
Signed-off-by: Jay Ding
Reviewed-by: Farah Smith
Reviewed-by: Ajit Khaparde
---
drivers/net/bnxt/tf_core/cfa_resource_types.h | 5 +-
drivers/net/bnxt/tf_core/tf_core.h| 8 +-
drivers/net/bnxt/tf_core/tf_device_p58.c | 1 +
drivers/net/bnxt/tf_core/tf_device_p58.h | 14
drivers/net/bnxt/tf_core/tf_tbl.c | 74 +++
drivers/net/bnxt/tf_core/tf_util.c| 2 +
6 files changed, 68 insertions(+), 36 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/cfa_resource_types.h
b/drivers/net/bnxt/tf_core/cfa_resource_types.h
index cbab0d0078..36a55d4e17 100644
--- a/drivers/net/bnxt/tf_core/cfa_resource_types.h
+++ b/drivers/net/bnxt/tf_core/cfa_resource_types.h
@@ -104,10 +104,11 @@
#define CFA_RESOURCE_TYPE_P58_WC_FKB 0x12UL
/* VEB TCAM */
#define CFA_RESOURCE_TYPE_P58_VEB_TCAM 0x13UL
+/* Metadata */
+#define CFA_RESOURCE_TYPE_P58_METADATA 0x14UL
/* Meter drop counter */
#define CFA_RESOURCE_TYPE_P58_METER_DROP_CNT 0x15UL
-#define CFA_RESOURCE_TYPE_P58_LAST
CFA_RESOURCE_TYPE_P58_METER_DROP_CNT
-
+#define CFA_RESOURCE_TYPE_P58_LAST
CFA_RESOURCE_TYPE_P58_METER_DROP_CNT
/* Multicast Group */
#define CFA_RESOURCE_TYPE_P45_MCG 0x0UL
diff --git a/drivers/net/bnxt/tf_core/tf_core.h
b/drivers/net/bnxt/tf_core/tf_core.h
index 7e0cdf7e0d..af8d13bd7e 100644
--- a/drivers/net/bnxt/tf_core/tf_core.h
+++ b/drivers/net/bnxt/tf_core/tf_core.h
@@ -283,9 +283,9 @@ enum tf_tbl_type {
TF_TBL_TYPE_ACT_MODIFY_32B,
/** TH 64B Modify Record */
TF_TBL_TYPE_ACT_MODIFY_64B,
- /** (Future) Meter Profiles */
+ /** Meter Profiles */
TF_TBL_TYPE_METER_PROF,
- /** (Future) Meter Instance */
+ /** Meter Instance */
TF_TBL_TYPE_METER_INST,
/** Wh+/SR/Th Mirror Config */
TF_TBL_TYPE_MIRROR_CONFIG,
@@ -301,6 +301,8 @@ enum tf_tbl_type {
TF_TBL_TYPE_EM_FKB,
/** TH WC Flexible Key builder */
TF_TBL_TYPE_WC_FKB,
+ /** Meter Drop Counter */
+ TF_TBL_TYPE_METER_DROP_CNT,
/* External */
@@ -2194,6 +2196,8 @@ enum tf_global_config_type {
TF_TUNNEL_ENCAP, /**< Tunnel Encap Config(TECT) */
TF_ACTION_BLOCK, /**< Action Block Config(ABCR) */
TF_COUNTER_CFG, /**< Counter Configuration (CNTRS_CTRL) */
+ TF_METER_CFG, /**< Meter Config(ACTP4_FMTCR) */
+ TF_METER_INTERVAL_CFG, /**< Meter Interval Config(FMTCR_INTERVAL) */
TF_GLOBAL_CFG_TYPE_MAX
};
diff --git a/drivers/net/bnxt/tf_core/tf_device_p58.c
b/drivers/net/bnxt/tf_core/tf_device_p58.c
index 808dcb1f77..a492c62bff 100644
--- a/drivers/net/bnxt/tf_core/tf_device_p58.c
+++ b/drivers/net/bnxt/tf_core/tf_device_p58.c
@@ -43,6 +43,7 @@ const char *tf_resource_str_p58[CFA_RESOURCE_TYPE_P58_LAST +
1] = {
[CFA_RESOURCE_TYPE_P58_EM_FKB] = "em_fkb ",
[CFA_RESOURCE_TYPE_P58_WC_FKB] = "wc_fkb ",
[CFA_RESOURCE_TYPE_P58_VEB_TCAM] = "veb ",
+ [CFA_RESOURCE_TYPE_P58_METADATA] = "metadata",
};
/**
diff --git a/drivers/net/bnxt/tf_core/tf_device_p58.h
b/drivers/net/bnxt/tf_core/tf_device_p58.h
index 66b0f4e983..8c2e07aa34 100644
--- a/drivers/net/bnxt/tf_core/tf_device_p58.h
+++ b/drivers/net/bnxt/tf_core/tf_device_p58.h
@@ -75,10 +75,18 @@ struct tf_rm_element_cfg tf_tbl_p58[TF_TBL_TYPE_MAX] = {
TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P58_METER,
0, 0, 0
},
+ [TF_TBL_TYPE_METER_DROP_CNT] = {
+ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P58_METER_DROP_CNT,
+ 0, 0, 0
+ },
[TF_TBL_TYPE_MIRROR_CONFIG] = {
TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P58_MIRROR,
0, 0, 0
},
+ [TF_TBL_TYPE_METADATA] = {
+ TF_RM_ELEM_CFG_HCAPI_BA, CFA_RESOURCE_TYPE_P58_METADATA,
+ 0, 0, 0
+ },
/* Policy - ARs in bank 1 */
[TF_TBL_TYPE_FULL_ACT_RECORD] = {
.cfg_type= TF_RM_ELEM_CFG_HCAPI_BA_PARENT,
@@ -194,5 +202,11 @@ struct tf_global_cfg_cfg
tf_global_cfg_p58[TF_GLOBAL_CFG_TYPE_MAX] = {
[TF_COUNTER_CFG] = {
TF_GLOBAL_CFG_CFG_HCAPI, TF_COUNTER_CFG
},
+ [TF_METER_CFG] = {
+ TF_GLOBAL_CFG_CFG_HCAPI, TF_METER_CFG
+ },
+ [TF_METER_INTERVAL_CFG] = {
+ TF_GLOBAL_CFG_CFG_HCAPI, TF_METER_INTERVAL_CFG
+ },
};
#endif /* _TF_DEVICE_P58_H_ */
diff --git a/drivers/net/bnxt/tf_core/tf_tbl.c
b/drivers/net/bnxt/tf_core/tf_tbl.c
index e77399c6bd..7011edcd78 100644
--- a/drivers/net/bnxt/tf_core/tf_tbl.c
+++ b/drivers/net/bnxt/tf_core/tf_tbl.c
@@ -374,23 +374,28 @@ tf_tbl_set(struct tf *tfp,
}
}
- /* Verify that the entry has been previously allocated */
-
[dpdk-dev] [PATCH v3 04/13] net/bnxt: add Thor SRAM mgr model
From: Farah Smith
Add dynamic SRAM manager allocation support.
Signed-off-by: Farah Smith
Reviewed-by: Shahaji Bhosle
Reviewed-by: Peter Spreadborough
---
drivers/net/bnxt/tf_core/ll.c | 3 +
drivers/net/bnxt/tf_core/ll.h | 50 +-
drivers/net/bnxt/tf_core/meson.build | 2 +
drivers/net/bnxt/tf_core/tf_core.c| 104 ++-
drivers/net/bnxt/tf_core/tf_core.h| 48 +-
drivers/net/bnxt/tf_core/tf_device.c | 40 +-
drivers/net/bnxt/tf_core/tf_device.h | 133 ++-
drivers/net/bnxt/tf_core/tf_device_p4.c | 75 +-
drivers/net/bnxt/tf_core/tf_device_p4.h | 50 +-
drivers/net/bnxt/tf_core/tf_device_p58.c | 105 ++-
drivers/net/bnxt/tf_core/tf_device_p58.h | 60 +-
drivers/net/bnxt/tf_core/tf_msg.c | 2 +-
drivers/net/bnxt/tf_core/tf_rm.c | 46 +-
drivers/net/bnxt/tf_core/tf_rm.h | 62 +-
drivers/net/bnxt/tf_core/tf_session.c | 56 ++
drivers/net/bnxt/tf_core/tf_session.h | 58 +-
drivers/net/bnxt/tf_core/tf_sram_mgr.c| 971 ++
drivers/net/bnxt/tf_core/tf_sram_mgr.h| 317 +++
drivers/net/bnxt/tf_core/tf_tbl.c | 186 +
drivers/net/bnxt/tf_core/tf_tbl.h | 15 +-
drivers/net/bnxt/tf_core/tf_tbl_sram.c| 713
drivers/net/bnxt/tf_core/tf_tbl_sram.h| 154
drivers/net/bnxt/tf_core/tf_tcam.c| 10 +-
drivers/net/bnxt/tf_core/tf_tcam.h| 7 +
drivers/net/bnxt/tf_core/tf_tcam_shared.c | 28 +-
drivers/net/bnxt/tf_core/tf_util.c| 10 +
drivers/net/bnxt/tf_ulp/bnxt_ulp.c| 23 +
meson_options.txt | 2 +
28 files changed, 2978 insertions(+), 352 deletions(-)
create mode 100644 drivers/net/bnxt/tf_core/tf_sram_mgr.c
create mode 100644 drivers/net/bnxt/tf_core/tf_sram_mgr.h
create mode 100644 drivers/net/bnxt/tf_core/tf_tbl_sram.c
create mode 100644 drivers/net/bnxt/tf_core/tf_tbl_sram.h
diff --git a/drivers/net/bnxt/tf_core/ll.c b/drivers/net/bnxt/tf_core/ll.c
index cd168a7970..f2bdff6b9e 100644
--- a/drivers/net/bnxt/tf_core/ll.c
+++ b/drivers/net/bnxt/tf_core/ll.c
@@ -13,6 +13,7 @@ void ll_init(struct ll *ll)
{
ll->head = NULL;
ll->tail = NULL;
+ ll->cnt = 0;
}
/* insert entry in linked list */
@@ -30,6 +31,7 @@ void ll_insert(struct ll *ll,
entry->next->prev = entry;
ll->head = entry->next->prev;
}
+ ll->cnt++;
}
/* delete entry from linked list */
@@ -49,4 +51,5 @@ void ll_delete(struct ll *ll,
entry->prev->next = entry->next;
entry->next->prev = entry->prev;
}
+ ll->cnt--;
}
diff --git a/drivers/net/bnxt/tf_core/ll.h b/drivers/net/bnxt/tf_core/ll.h
index 239478b4f8..9cf8f64ec2 100644
--- a/drivers/net/bnxt/tf_core/ll.h
+++ b/drivers/net/bnxt/tf_core/ll.h
@@ -8,6 +8,8 @@
#ifndef _LL_H_
#define _LL_H_
+#include
+
/* linked list entry */
struct ll_entry {
struct ll_entry *prev;
@@ -18,6 +20,7 @@ struct ll_entry {
struct ll {
struct ll_entry *head;
struct ll_entry *tail;
+ uint32_t cnt;
};
/**
@@ -28,7 +31,7 @@ struct ll {
void ll_init(struct ll *ll);
/**
- * Linked list insert
+ * Linked list insert head
*
* [in] ll, linked list where element is inserted
* [in] entry, entry to be added
@@ -43,4 +46,49 @@ void ll_insert(struct ll *ll, struct ll_entry *entry);
*/
void ll_delete(struct ll *ll, struct ll_entry *entry);
+/**
+ * Linked list return next entry without deleting it
+ *
+ * Useful in performing search
+ *
+ * [in] Entry in the list
+ */
+static inline struct ll_entry *ll_next(struct ll_entry *entry)
+{
+ return entry->next;
+}
+
+/**
+ * Linked list return the head of the list without removing it
+ *
+ * Useful in performing search
+ *
+ * [in] ll, linked list
+ */
+static inline struct ll_entry *ll_head(struct ll *ll)
+{
+ return ll->head;
+}
+
+/**
+ * Linked list return the tail of the list without removing it
+ *
+ * Useful in performing search
+ *
+ * [in] ll, linked list
+ */
+static inline struct ll_entry *ll_tail(struct ll *ll)
+{
+ return ll->tail;
+}
+
+/**
+ * Linked list return the number of entries in the list
+ *
+ * [in] ll, linked list
+ */
+static inline uint32_t ll_cnt(struct ll *ll)
+{
+ return ll->cnt;
+}
#endif /* _LL_H_ */
diff --git a/drivers/net/bnxt/tf_core/meson.build
b/drivers/net/bnxt/tf_core/meson.build
index f28e77ec2e..b7333a431b 100644
--- a/drivers/net/bnxt/tf_core/meson.build
+++ b/drivers/net/bnxt/tf_core/meson.build
@@ -16,6 +16,8 @@ sources += files(
'stack.c',
'tf_rm.c',
'tf_tbl.c',
+ 'tf_tbl_sram.c',
+ 'tf_sram_mgr.c',
'tf_em_common.c',
'tf_em_host.c',
'tf_em_internal.c',
diff --git a/drivers/net/bnxt/tf_core/tf_core.c
b/drivers/net/bnxt/tf_core/tf_core.c
index 5458f76e2d..936102c804 100644
--- a/drivers/net/bnxt/tf_core/tf_core.c
+++ b/drivers/net/bnxt/tf_cor
[dpdk-dev] [PATCH v3 05/13] net/bnxt: add flow templates support for Thor
From: Kishore Padmanabha
Template adds non-VFR based support for testpmd with:
matches to include
- DMAC, SIP, DIP, Proto, Sport, Dport
- SIP, DIP, Proto, Sport, Dport
actions:
- count, drop
Signed-off-by: Kishore Padmanabha
Signed-off-by: Venkat Duvvuru
Reviewed-by: Mike Baucom
---
drivers/net/bnxt/tf_ulp/bnxt_tf_common.h | 6 +
drivers/net/bnxt/tf_ulp/bnxt_ulp.c| 36 +++---
drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 12 ++
.../bnxt/tf_ulp/generic_templates/meson.build | 17 ++-
.../ulp_template_db_thor_class.c | 1 -
drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 2 +-
drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 122 +-
drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 26 +++-
drivers/net/bnxt/tf_ulp/ulp_gen_tbl.c | 5 +
drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c | 2 +-
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 111 +++-
drivers/net/bnxt/tf_ulp/ulp_matcher.c | 13 ++
drivers/net/bnxt/tf_ulp/ulp_port_db.c | 15 ++-
drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 9 +-
drivers/net/bnxt/tf_ulp/ulp_tun.c | 20 +++
drivers/net/bnxt/tf_ulp/ulp_utils.c | 8 +-
16 files changed, 356 insertions(+), 49 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
b/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
index f59da41e54..e0ebed3fed 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_tf_common.h
@@ -13,6 +13,12 @@
#define BNXT_TF_DBG(lvl, fmt, args...) PMD_DRV_LOG(lvl, fmt, ## args)
+#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
+#define BNXT_TF_INF(fmt, args...) PMD_DRV_LOG(INFO, fmt, ## args)
+#else
+#define BNXT_TF_INF(fmt, args...)
+#endif
+
#define BNXT_ULP_EM_FLOWS 8192
#define BNXT_ULP_1M_FLOWS 100
#define BNXT_EEM_RX_GLOBAL_ID_MASK (BNXT_ULP_1M_FLOWS - 1)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index 183bae66c5..475c7a6cdf 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -698,6 +698,11 @@ ulp_eem_tbl_scope_init(struct bnxt *bp)
rc);
return rc;
}
+#ifdef RTE_LIBRTE_BNXT_TRUFLOW_DEBUG
+ BNXT_TF_DBG(DEBUG, "TableScope=0x%0x %d\n",
+ params.tbl_scope_id,
+ params.tbl_scope_id);
+#endif
rc = bnxt_ulp_cntxt_tbl_scope_id_set(bp->ulp_ctx, params.tbl_scope_id);
if (rc) {
BNXT_TF_DBG(ERR, "Unable to set table scope id\n");
@@ -825,6 +830,8 @@ ulp_ctx_init(struct bnxt *bp,
goto error_deinit;
}
+ /* TODO: For now we are overriding to APP:1 on this branch*/
+ bp->app_id = 1;
rc = bnxt_ulp_cntxt_app_id_set(bp->ulp_ctx, bp->app_id);
if (rc) {
BNXT_TF_DBG(ERR, "Unable to set app_id for ULP init.\n");
@@ -838,11 +845,6 @@ ulp_ctx_init(struct bnxt *bp,
goto error_deinit;
}
- if (devid == BNXT_ULP_DEVICE_ID_THOR) {
- ulp_data->ulp_flags &= ~BNXT_ULP_VF_REP_ENABLED;
- BNXT_TF_DBG(ERR, "Enabled non-VFR mode\n");
- }
-
/*
* Shared session must be created before first regular session but after
* the ulp_ctx is valid.
@@ -902,7 +904,7 @@ ulp_dparms_init(struct bnxt *bp, struct bnxt_ulp_context
*ulp_ctx)
dparms->ext_flow_db_num_entries = bp->max_num_kflows * 1024;
/* GFID = 2 * num_flows */
dparms->mark_db_gfid_entries = dparms->ext_flow_db_num_entries * 2;
- BNXT_TF_DBG(DEBUG, "Set the number of flows = %"PRIu64"\n",
+ BNXT_TF_DBG(DEBUG, "Set the number of flows = %" PRIu64 "\n",
dparms->ext_flow_db_num_entries);
return 0;
@@ -1393,17 +1395,13 @@ bnxt_ulp_port_init(struct bnxt *bp)
uint32_t ulp_flags;
int32_t rc = 0;
+ if (!bp || !BNXT_TRUFLOW_EN(bp))
+ return rc;
+
if (!BNXT_PF(bp) && !BNXT_VF_IS_TRUSTED(bp)) {
BNXT_TF_DBG(ERR,
"Skip ulp init for port: %d, not a TVF or PF\n",
- bp->eth_dev->data->port_id);
- return rc;
- }
-
- if (!BNXT_TRUFLOW_EN(bp)) {
- BNXT_TF_DBG(DEBUG,
- "Skip ulp init for port: %d, truflow is not
enabled\n",
- bp->eth_dev->data->port_id);
+ bp->eth_dev->data->port_id);
return rc;
}
@@ -1524,6 +1522,9 @@ bnxt_ulp_port_deinit(struct bnxt *bp)
struct rte_pci_device *pci_dev;
struct rte_pci_addr *pci_addr;
+ if (!BNXT_TRUFLOW_EN(bp))
+ return;
+
if (!BNXT_PF(bp) && !BNXT_VF_IS_TRUSTED(bp)) {
BNXT_TF_DBG(ERR,
"Skip ULP deinit port:%d, not a TVF or PF\n",
@@ -1531,13 +1532,6 @@ bnx
[dpdk-dev] [PATCH v3 01/13] net/bnxt: tf core index table updates
From: Farah Smith
Remove unused shadow table functionality.
Signed-off-by: Farah Smith
Reviewed-by: Peter Spreadborough
---
drivers/net/bnxt/tf_core/tf_core.c | 65 --
drivers/net/bnxt/tf_core/tf_core.h | 103 +--
drivers/net/bnxt/tf_core/tf_device.h | 22 -
drivers/net/bnxt/tf_core/tf_device_p4.c | 2 -
drivers/net/bnxt/tf_core/tf_device_p58.c | 2 -
drivers/net/bnxt/tf_core/tf_em_common.c | 4 +
drivers/net/bnxt/tf_core/tf_tbl.c| 21 -
drivers/net/bnxt/tf_core/tf_tbl.h| 72
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 3 +-
9 files changed, 7 insertions(+), 287 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_core.c
b/drivers/net/bnxt/tf_core/tf_core.c
index 97e6165e92..5458f76e2d 100644
--- a/drivers/net/bnxt/tf_core/tf_core.c
+++ b/drivers/net/bnxt/tf_core/tf_core.c
@@ -1105,71 +1105,6 @@ tf_alloc_tbl_entry(struct tf *tfp,
return 0;
}
-int
-tf_search_tbl_entry(struct tf *tfp,
- struct tf_search_tbl_entry_parms *parms)
-{
- int rc;
- struct tf_session *tfs;
- struct tf_dev_info *dev;
- struct tf_tbl_alloc_search_parms sparms;
-
- TF_CHECK_PARMS2(tfp, parms);
-
- /* Retrieve the session information */
- rc = tf_session_get_session(tfp, &tfs);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s: Failed to lookup session, rc:%s\n",
- tf_dir_2_str(parms->dir),
- strerror(-rc));
- return rc;
- }
-
- /* Retrieve the device information */
- rc = tf_session_get_device(tfs, &dev);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s: Failed to lookup device, rc:%s\n",
- tf_dir_2_str(parms->dir),
- strerror(-rc));
- return rc;
- }
-
- if (dev->ops->tf_dev_alloc_search_tbl == NULL) {
- rc = -EOPNOTSUPP;
- TFP_DRV_LOG(ERR,
- "%s: Operation not supported, rc:%s\n",
- tf_dir_2_str(parms->dir),
- strerror(-rc));
- return rc;
- }
-
- memset(&sparms, 0, sizeof(struct tf_tbl_alloc_search_parms));
- sparms.dir = parms->dir;
- sparms.type = parms->type;
- sparms.result = parms->result;
- sparms.result_sz_in_bytes = parms->result_sz_in_bytes;
- sparms.alloc = parms->alloc;
- sparms.tbl_scope_id = parms->tbl_scope_id;
- rc = dev->ops->tf_dev_alloc_search_tbl(tfp, &sparms);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s: TBL allocation failed, rc:%s\n",
- tf_dir_2_str(parms->dir),
- strerror(-rc));
- return rc;
- }
-
- /* Return the outputs from the search */
- parms->hit = sparms.hit;
- parms->search_status = sparms.search_status;
- parms->ref_cnt = sparms.ref_cnt;
- parms->idx = sparms.idx;
-
- return 0;
-}
-
int
tf_free_tbl_entry(struct tf *tfp,
struct tf_free_tbl_entry_parms *parms)
diff --git a/drivers/net/bnxt/tf_core/tf_core.h
b/drivers/net/bnxt/tf_core/tf_core.h
index 84b234f0e3..7e0cdf7e0d 100644
--- a/drivers/net/bnxt/tf_core/tf_core.h
+++ b/drivers/net/bnxt/tf_core/tf_core.h
@@ -1622,79 +1622,6 @@ int tf_clear_tcam_shared_entries(struct tf *tfp,
* @ref tf_get_shared_tbl_increment
*/
-/**
- * tf_alloc_tbl_entry parameter definition
- */
-struct tf_search_tbl_entry_parms {
- /**
-* [in] Receive or transmit direction
-*/
- enum tf_dir dir;
- /**
-* [in] Type of the allocation
-*/
- enum tf_tbl_type type;
- /**
-* [in] Table scope identifier (ignored unless TF_TBL_TYPE_EXT)
-*/
- uint32_t tbl_scope_id;
- /**
-* [in] Result data to search for
-*/
- uint8_t *result;
- /**
-* [in] Result data size in bytes
-*/
- uint16_t result_sz_in_bytes;
- /**
-* [in] Allocate on miss.
-*/
- uint8_t alloc;
- /**
-* [out] Set if matching entry found
-*/
- uint8_t hit;
- /**
-* [out] Search result status (hit, miss, reject)
-*/
- enum tf_search_status search_status;
- /**
-* [out] Current ref count after allocation
-*/
- uint16_t ref_cnt;
- /**
-* [out] Idx of allocated entry or found entry
-*/
- uint32_t idx;
-};
-
-/**
- * search Table Entry (experimental)
- *
- * This function searches the shadow copy of an index table for a matching
- * entry. The result data must match for hit to be set. Only TruFlow core
- * data is accessed. If shadow_copy is not enabled, an error is returned.
- *
- * Implementation:
- *
- * A hash
[dpdk-dev] [PATCH v3 08/13] net/bnxt: add wild card TCAM byte order for Thor
From: Kishore Padmanabha
The wild card tcam for Thor platform is different from the profile tcam
byte order.
Signed-off-by: Kishore Padmanabha
Signed-off-by: Venkat Duvvuru
Reviewed-by: Shuanglin Wang
Reviewed-by: Michael Baucom
Reviewed-by: Ajit Khaparde
---
.../generic_templates/ulp_template_db_tbl.c | 2 ++
drivers/net/bnxt/tf_ulp/ulp_mapper.c | 25 +--
drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 1 +
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
index b5bce6f4c7..68f1b5fd00 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
@@ -201,6 +201,7 @@ struct bnxt_ulp_device_params
ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
.key_byte_order = BNXT_ULP_BYTE_ORDER_LE,
.result_byte_order = BNXT_ULP_BYTE_ORDER_LE,
.encap_byte_order= BNXT_ULP_BYTE_ORDER_BE,
+ .wc_key_byte_order = BNXT_ULP_BYTE_ORDER_BE,
.encap_byte_swap = 1,
.int_flow_db_num_entries = 16384,
.ext_flow_db_num_entries = 32768,
@@ -223,6 +224,7 @@ struct bnxt_ulp_device_params
ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {
.key_byte_order = BNXT_ULP_BYTE_ORDER_LE,
.result_byte_order = BNXT_ULP_BYTE_ORDER_LE,
.encap_byte_order= BNXT_ULP_BYTE_ORDER_BE,
+ .wc_key_byte_order = BNXT_ULP_BYTE_ORDER_BE,
.encap_byte_swap = 1,
.int_flow_db_num_entries = 16384,
.ext_flow_db_num_entries = 32768,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 2687a545f3..bcc089b3e1 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -1953,6 +1953,15 @@ static void ulp_mapper_wc_tcam_tbl_post_process(struct
ulp_blob *blob)
#endif
}
+static int32_t ulp_mapper_tcam_is_wc_tcam(struct bnxt_ulp_mapper_tbl_info *tbl)
+{
+ if (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM ||
+ tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM_HIGH ||
+ tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM_LOW)
+ return 1;
+ return 0;
+}
+
static int32_t
ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,
struct bnxt_ulp_mapper_tbl_info *tbl)
@@ -1972,6 +1981,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms
*parms,
uint32_t hit = 0;
uint16_t tmplen = 0;
uint16_t idx;
+ enum bnxt_ulp_byte_order key_byte_order;
/* Set the key and mask to the original key and mask. */
key = &okey;
@@ -2003,10 +2013,13 @@ ulp_mapper_tcam_tbl_process(struct
bnxt_ulp_mapper_parms *parms,
return -EINVAL;
}
- if (!ulp_blob_init(key, tbl->blob_key_bit_size,
- dparms->key_byte_order) ||
- !ulp_blob_init(mask, tbl->blob_key_bit_size,
- dparms->key_byte_order) ||
+ if (ulp_mapper_tcam_is_wc_tcam(tbl))
+ key_byte_order = dparms->wc_key_byte_order;
+ else
+ key_byte_order = dparms->key_byte_order;
+
+ if (!ulp_blob_init(key, tbl->blob_key_bit_size, key_byte_order) ||
+ !ulp_blob_init(mask, tbl->blob_key_bit_size, key_byte_order) ||
!ulp_blob_init(&data, tbl->result_bit_size,
dparms->result_byte_order) ||
!ulp_blob_init(&update_data, tbl->result_bit_size,
@@ -2043,9 +2056,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms
*parms,
}
/* For wild card tcam perform the post process to swap the blob */
- if (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM ||
- tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM_HIGH ||
- tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM_LOW) {
+ if (ulp_mapper_tcam_is_wc_tcam(tbl)) {
if (dparms->dynamic_pad_en) {
/* Sets up the slices for writing to the WC TCAM */
rc = ulp_mapper_wc_tcam_tbl_dyn_post_process(dparms,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
index 904763f27d..e2a4b81cec 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
@@ -212,6 +212,7 @@ struct bnxt_ulp_device_params {
enum bnxt_ulp_byte_orderkey_byte_order;
enum bnxt_ulp_byte_orderresult_byte_order;
enum bnxt_ulp_byte_orderencap_byte_order;
+ enum bnxt_ulp_byte_orderwc_key_byte_order;
uint8_t encap_byte_swap;
uint8_t num_phy_ports;
uint32_tmark_db_lfi
[dpdk-dev] [PATCH v3 10/13] net/bnxt: tf core SRAM Manager
From: Farah Smith Adjust info message to debug level to prevent excessive logging. Signed-off-by: Farah Smith Reviewed-by: Michael Baucom --- drivers/net/bnxt/tf_core/tf_tbl_sram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/tf_core/tf_tbl_sram.c b/drivers/net/bnxt/tf_core/tf_tbl_sram.c index ea10afecb6..d7727f7a11 100644 --- a/drivers/net/bnxt/tf_core/tf_tbl_sram.c +++ b/drivers/net/bnxt/tf_core/tf_tbl_sram.c @@ -130,7 +130,7 @@ static int tf_tbl_sram_get_info(struct tf_tbl_sram_get_info_parms *parms) if (slices) parms->slice_size = tf_tbl_sram_slices_2_size[slices]; - TFP_DRV_LOG(INFO, + TFP_DRV_LOG(DEBUG, "(%s) bank(%s) slice_size(%s)\n", tf_tbl_type_2_str(parms->tbl_type), tf_sram_bank_2_str(parms->bank_id), -- 2.17.1
[dpdk-dev] [PATCH v3 11/13] net/bnxt: dynamically allocate space for EM defrag function
From: Randy Schacher
Alter defrag function to dynamically allocate and delete
free_list and adj_list buffers.
Signed-off-by: Randy Schacher
Reviewed-by: Peter Spreadborough
---
drivers/net/bnxt/tf_core/dpool.c | 38 +---
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/dpool.c b/drivers/net/bnxt/tf_core/dpool.c
index 145efa486f..5c03f775a5 100644
--- a/drivers/net/bnxt/tf_core/dpool.c
+++ b/drivers/net/bnxt/tf_core/dpool.c
@@ -7,9 +7,6 @@
#include
#include
#include
-
-#include
-
#include "tfp.h"
#include "dpool.h"
@@ -84,13 +81,13 @@ static int dpool_move(struct dpool *dpool,
return 0;
}
-
int dpool_defrag(struct dpool *dpool,
uint32_t entry_size,
uint8_t defrag)
{
struct dpool_free_list *free_list;
struct dpool_adj_list *adj_list;
+ struct tfp_calloc_parms parms;
uint32_t count;
uint32_t index;
uint32_t used;
@@ -103,15 +100,31 @@ int dpool_defrag(struct dpool *dpool,
uint32_t max_size = 0;
int rc;
- free_list = rte_zmalloc("dpool_free_list",
- sizeof(struct dpool_free_list), 0);
+ parms.nitems = 1;
+ parms.size = sizeof(struct dpool_free_list);
+ parms.alignment = 0;
+
+ rc = tfp_calloc(&parms);
+
+ if (rc)
+ return rc;
+
+ free_list = (struct dpool_free_list *)parms.mem_va;
if (free_list == NULL) {
TFP_DRV_LOG(ERR, "dpool free list allocation failed\n");
return -ENOMEM;
}
- adj_list = rte_zmalloc("dpool_adjacent_list",
- sizeof(struct dpool_adj_list), 0);
+ parms.nitems = 1;
+ parms.size = sizeof(struct dpool_adj_list);
+ parms.alignment = 0;
+
+ rc = tfp_calloc(&parms);
+
+ if (rc)
+ return rc;
+
+ adj_list = (struct dpool_adj_list *)parms.mem_va;
if (adj_list == NULL) {
TFP_DRV_LOG(ERR, "dpool adjacent list allocation failed\n");
return -ENOMEM;
@@ -239,8 +252,8 @@ int dpool_defrag(struct dpool *dpool,
free_list->entry[largest_free_index].index,
max_index);
if (rc) {
- rte_free(free_list);
- rte_free(adj_list);
+ tfp_free(free_list);
+ tfp_free(adj_list);
return rc;
}
} else {
@@ -249,12 +262,11 @@ int dpool_defrag(struct dpool *dpool,
}
done:
- rte_free(free_list);
- rte_free(adj_list);
+ tfp_free(free_list);
+ tfp_free(adj_list);
return largest_free_size;
}
-
uint32_t dpool_alloc(struct dpool *dpool,
uint32_t size,
uint8_t defrag)
--
2.17.1
[dpdk-dev] [PATCH v3 12/13] net/bnxt: sram manager shared session
From: Farah Smith
Fix shared session support issues due to SRAM manager
additions. Shared session does not support slices within
RM blocks. Calculate resources required without slices
and determine base addresses using old methods for the
shared session.
Signed-off-by: Farah Smith
Reviewed-by: Kishore Padmanabha
Reviewed-by: Shahaji Bhosle
---
drivers/net/bnxt/tf_core/tf_em_internal.c | 5 +-
drivers/net/bnxt/tf_core/tf_rm.c | 134 +++---
drivers/net/bnxt/tf_core/tf_tbl_sram.c| 73 +---
3 files changed, 176 insertions(+), 36 deletions(-)
diff --git a/drivers/net/bnxt/tf_core/tf_em_internal.c
b/drivers/net/bnxt/tf_core/tf_em_internal.c
index 2d57595f17..67ba011eae 100644
--- a/drivers/net/bnxt/tf_core/tf_em_internal.c
+++ b/drivers/net/bnxt/tf_core/tf_em_internal.c
@@ -326,8 +326,11 @@ tf_em_int_unbind(struct tf *tfp)
return rc;
if (!tf_session_is_shared_session(tfs)) {
- for (i = 0; i < TF_DIR_MAX; i++)
+ for (i = 0; i < TF_DIR_MAX; i++) {
+ if (tfs->em_pool[i] == NULL)
+ continue;
dpool_free_all(tfs->em_pool[i]);
+ }
}
rc = tf_session_get_db(tfp, TF_MODULE_TYPE_EM, &em_db_ptr);
diff --git a/drivers/net/bnxt/tf_core/tf_rm.c b/drivers/net/bnxt/tf_core/tf_rm.c
index 03c958a7d6..dd537aaece 100644
--- a/drivers/net/bnxt/tf_core/tf_rm.c
+++ b/drivers/net/bnxt/tf_core/tf_rm.c
@@ -18,6 +18,9 @@
#include "tfp.h"
#include "tf_msg.h"
+/* Logging defines */
+#define TF_RM_DEBUG 0
+
/**
* Generic RM Element data type that an RM DB is build upon.
*/
@@ -207,6 +210,45 @@ tf_rm_adjust_index(struct tf_rm_element *db,
return rc;
}
+/**
+ * Logs an array of found residual entries to the console.
+ *
+ * [in] dir
+ * Receive or transmit direction
+ *
+ * [in] module
+ * Type of Device Module
+ *
+ * [in] count
+ * Number of entries in the residual array
+ *
+ * [in] residuals
+ * Pointer to an array of residual entries. Array is index same as
+ * the DB in which this function is used. Each entry holds residual
+ * value for that entry.
+ */
+#if (TF_RM_DEBUG == 1)
+static void
+tf_rm_log_residuals(enum tf_dir dir,
+ enum tf_module_type module,
+ uint16_t count,
+ uint16_t *residuals)
+{
+ int i;
+
+ /* Walk the residual array and log the types that wasn't
+* cleaned up to the console.
+*/
+ for (i = 0; i < count; i++) {
+ if (residuals[i] != 0)
+ TFP_DRV_LOG(INFO,
+ "%s, %s was not cleaned up, %d outstanding\n",
+ tf_dir_2_str(dir),
+ tf_module_subtype_2_str(module, i),
+ residuals[i]);
+ }
+}
+#endif /* TF_RM_DEBUG == 1 */
/**
* Performs a check of the passed in DB for any lingering elements. If
* a resource type was found to not have been cleaned up by the caller
@@ -322,6 +364,12 @@ tf_rm_check_residuals(struct tf_rm_new_db *rm_db,
*resv_size = found;
}
+#if (TF_RM_DEBUG == 1)
+ tf_rm_log_residuals(rm_db->dir,
+ rm_db->module,
+ rm_db->num_entries,
+ residuals);
+#endif
tfp_free((void *)residuals);
*resv = local_resv;
@@ -367,7 +415,8 @@ tf_rm_update_parent_reservations(struct tf *tfp,
struct tf_rm_element_cfg *cfg,
uint16_t *alloc_cnt,
uint16_t num_elements,
-uint16_t *req_cnt)
+uint16_t *req_cnt,
+bool shared_session)
{
int parent, child;
const char *type_str;
@@ -378,18 +427,28 @@ tf_rm_update_parent_reservations(struct tf *tfp,
/* If I am a parent */
if (cfg[parent].cfg_type == TF_RM_ELEM_CFG_HCAPI_BA_PARENT) {
- /* start with my own count */
- RTE_ASSERT(cfg[parent].slices);
- combined_cnt =
- alloc_cnt[parent] / cfg[parent].slices;
+ uint8_t p_slices = 1;
+
+ /* Shared session doesn't support slices */
+ if (!shared_session)
+ p_slices = cfg[parent].slices;
+
+ RTE_ASSERT(p_slices);
- if (alloc_cnt[parent] % cfg[parent].slices)
+ combined_cnt = alloc_cnt[parent] / p_slices;
+
+ if (alloc_cnt[parent] % p_slices)
combined_cnt++;
if (alloc_cnt[parent]) {
dev->ops->tf_dev_get_resource_str(tfp,
[dpdk-dev] Arm roadmap for 21.11
(Bcc: Arm internal stake holders) Hello, Following are the work items planned for 21.11: 1) New rte_wait_until_xxx APIs and their use in various libraries 2) Meson build changes to pick Arm architecture features based on compiler support availability. 3) C11 atomic built-ins in app/test and examples. 4) Simplify implementation of rte_ctrl_thread_create. 5) Ensure EAL remote launch and EAL wait for lcore APIs provide the correct memory ordering guarantees. 6) Fix i40e PMD Rx descriptor read ordering issues. Please let me know if there are any questions. Thank you, Honnappa
Re: [dpdk-dev] [PATCH v2 1/6] eal: reset lcore function pointer and argument
> > On Fri, Sep 10, 2021 at 9:49 AM Bruce Richardson > wrote: > > > > On Thu, Sep 09, 2021 at 06:13:07PM -0500, Honnappa Nagarahalli wrote: > > > In the rte_eal_remote_launch function, the lcore function pointer is > > > checked for NULL. However, the pointer is never reset to NULL. Reset > > > the lcore function pointer and argument after the worker has > > > completed executing the lcore function. > > > > > No problems with this patch, but just in general observation. It > > would be good if we had test cases to cover these sorts of problems. > > If a test were added to the autotests for this issue we could observe > > the issue reproduced and easily verify it were fixed by this patch, > > giving us a high degree of confidence in the fix. > > +1 Thanks for the comments. Currently, the eal_thread_loop function calls rte_panic if the function pointer is set to NULL. This needs to be changed to return an error code. However, we need to distinguish between the error codes from EAL and the error codes from the function the lcore would run. Currently, there is no mechanism to return the error codes from EAL. We could add a new member to " struct lcore_config" to capture the error codes from EAL. We need to add a new API to return the EAL error code to the application. With this we should be able to add a new test case. > > > -- > David Marchand
