[v5,04/10] baseband/turbo_sw: support large size code block
diff mbox series

Message ID 1585193268-74468-5-git-send-email-nicolas.chautru@intel.com
State Accepted
Delegated to: akhil goyal
Headers show
Series
  • bbdev new features
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Chautru, Nicolas March 26, 2020, 3:27 a.m. UTC
From: Nic Chautru <nicolas.chautru@intel.com>

This is to support cases when the input data for
decoding a code block is larger than 64kB and would
not fit as a contiguous block of data into one
mbuf. In that case the length from the operation
supersedes the mbuf default structure.

Signed-off-by: Nic Chautru <nicolas.chautru@intel.com>
---
 app/test-bbdev/test_bbdev_perf.c                 | 34 ++++++++++++++++++------
 doc/guides/rel_notes/release_20_05.rst           |  5 ++++
 drivers/baseband/turbo_sw/bbdev_turbo_software.c | 13 +++++----
 lib/librte_bbdev/rte_bbdev_op.h                  |  3 ++-
 4 files changed, 41 insertions(+), 14 deletions(-)

Comments

Dave Burley March 27, 2020, 11:45 a.m. UTC | #1
Acked-by: Dave Burley <dave.burley@accelercomm.com>

On 26/03/2020 03:27, Nicolas Chautru wrote:
> From: Nic Chautru <nicolas.chautru@intel.com>
>
> This is to support cases when the input data for
> decoding a code block is larger than 64kB and would
> not fit as a contiguous block of data into one
> mbuf. In that case the length from the operation
> supersedes the mbuf default structure.
>
> Signed-off-by: Nic Chautru <nicolas.chautru@intel.com>
> ---
>   app/test-bbdev/test_bbdev_perf.c                 | 34 ++++++++++++++++++------
>   doc/guides/rel_notes/release_20_05.rst           |  5 ++++
>   drivers/baseband/turbo_sw/bbdev_turbo_software.c | 13 +++++----
>   lib/librte_bbdev/rte_bbdev_op.h                  |  3 ++-
>   4 files changed, 41 insertions(+), 14 deletions(-)
>
> diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
> index d8db58e..e998d0b 100644
> --- a/app/test-bbdev/test_bbdev_perf.c
> +++ b/app/test-bbdev/test_bbdev_perf.c
> @@ -764,6 +764,7 @@ typedef int (test_case_function)(struct active_device *ad,
>   {
>   	int ret;
>   	unsigned int i, j;
> +	bool large_input = false;
>   
>   	for (i = 0; i < n; ++i) {
>   		char *data;
> @@ -774,24 +775,41 @@ typedef int (test_case_function)(struct active_device *ad,
>   				op_type, n * ref_entries->nb_segments,
>   				mbuf_pool->size);
>   
> -		TEST_ASSERT_SUCCESS(((seg->length + RTE_PKTMBUF_HEADROOM) >
> -				(uint32_t)UINT16_MAX),
> -				"Given data is bigger than allowed mbuf segment size");
> -
> +		if (seg->length > RTE_BBDEV_LDPC_E_MAX_MBUF) {
> +			/*
> +			 * Special case when DPDK mbuf cannot handle
> +			 * the required input size
> +			 */
> +			printf("Warning: Larger input size than DPDK mbuf %d\n",
> +					seg->length);
> +			large_input = true;
> +		}
>   		bufs[i].data = m_head;
>   		bufs[i].offset = 0;
>   		bufs[i].length = 0;
>   
>   		if ((op_type == DATA_INPUT) || (op_type == DATA_HARQ_INPUT)) {
> -			data = rte_pktmbuf_append(m_head, seg->length);
> -			TEST_ASSERT_NOT_NULL(data,
> +			if ((op_type == DATA_INPUT) && large_input) {
> +				/* Allocate a fake overused mbuf */
> +				data = rte_malloc(NULL, seg->length, 0);
> +				memcpy(data, seg->addr, seg->length);
> +				m_head->buf_addr = data;
> +				m_head->buf_iova = rte_malloc_virt2iova(data);
> +				m_head->data_off = 0;
> +				m_head->data_len = seg->length;
> +			} else {
> +				data = rte_pktmbuf_append(m_head, seg->length);
> +				TEST_ASSERT_NOT_NULL(data,
>   					"Couldn't append %u bytes to mbuf from %d data type mbuf pool",
>   					seg->length, op_type);
>   
> -			TEST_ASSERT(data == RTE_PTR_ALIGN(data, min_alignment),
> +				TEST_ASSERT(data == RTE_PTR_ALIGN(
> +						data, min_alignment),
>   					"Data addr in mbuf (%p) is not aligned to device min alignment (%u)",
>   					data, min_alignment);
> -			rte_memcpy(data, seg->addr, seg->length);
> +				rte_memcpy(data, seg->addr, seg->length);
> +			}
> +
>   			bufs[i].length += seg->length;
>   
>   			for (j = 1; j < ref_entries->nb_segments; ++j) {
> diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst
> index 2190eaf..8dc87fc 100644
> --- a/doc/guides/rel_notes/release_20_05.rst
> +++ b/doc/guides/rel_notes/release_20_05.rst
> @@ -56,6 +56,11 @@ New Features
>        Also, make sure to start the actual text at the margin.
>        =========================================================
>   
> +* **Updated the TURBO_SW bbdev PMD.**
> +
> +  Updated the ``turbo_sw`` bbdev driver with changes including:
> +
> +  * Support for large size code block not fitting in one mbuf segment.
>   
>   Removed Items
>   -------------
> diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> index 5ca8ca1..bb62276 100644
> --- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> +++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
> @@ -1335,7 +1335,7 @@ struct turbo_sw_queue {
>   
>   static inline void
>   process_ldpc_dec_cb(struct turbo_sw_queue *q, struct rte_bbdev_dec_op *op,
> -		uint8_t c, uint16_t out_length, uint16_t e,
> +		uint8_t c, uint16_t out_length, uint32_t e,
>   		struct rte_mbuf *m_in,
>   		struct rte_mbuf *m_out_head, struct rte_mbuf *m_out,
>   		struct rte_mbuf *m_harq_in,
> @@ -1617,8 +1617,8 @@ struct turbo_sw_queue {
>   		struct rte_bbdev_stats *queue_stats)
>   {
>   	uint8_t c, r = 0;
> -	uint16_t e, out_length;
> -	uint16_t crc24_overlap = 0;
> +	uint32_t e;
> +	uint16_t out_length, crc24_overlap = 0;
>   	struct rte_bbdev_op_ldpc_dec *dec = &op->ldpc_dec;
>   	struct rte_mbuf *m_in = dec->input.data;
>   	struct rte_mbuf *m_harq_in = dec->harq_combined_input.data;
> @@ -1660,8 +1660,11 @@ struct turbo_sw_queue {
>   		if (dec->code_block_mode == 0)
>   			e = (r < dec->tb_params.cab) ?
>   				dec->tb_params.ea : dec->tb_params.eb;
> -
> -		seg_total_left = rte_pktmbuf_data_len(m_in) - in_offset;
> +		/* Special case handling when overusing mbuf */
> +		if (e < RTE_BBDEV_LDPC_E_MAX_MBUF)
> +			seg_total_left = rte_pktmbuf_data_len(m_in) - in_offset;
> +		else
> +			seg_total_left = e;
>   
>   		process_ldpc_dec_cb(q, op, c, out_length, e,
>   				m_in, m_out_head, m_out,
> diff --git a/lib/librte_bbdev/rte_bbdev_op.h b/lib/librte_bbdev/rte_bbdev_op.h
> index 80f3934..9c66721 100644
> --- a/lib/librte_bbdev/rte_bbdev_op.h
> +++ b/lib/librte_bbdev/rte_bbdev_op.h
> @@ -35,7 +35,8 @@
>   #define RTE_BBDEV_LDPC_MAX_CB_SIZE (8448)
>   /* Minimum size of Code Block */
>   #define RTE_BBDEV_LDPC_MIN_CB_SIZE (40)
> -
> +/* Maximum E size we can manage with default mbuf */
> +#define RTE_BBDEV_LDPC_E_MAX_MBUF (64000)
>   /* Minimum size of Code Block (36.212, Table 5.1.3-3) */
>   #define RTE_BBDEV_TURBO_MIN_CB_SIZE (40)
>   /* Maximum size of circular buffer */

Patch
diff mbox series

diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index d8db58e..e998d0b 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -764,6 +764,7 @@  typedef int (test_case_function)(struct active_device *ad,
 {
 	int ret;
 	unsigned int i, j;
+	bool large_input = false;
 
 	for (i = 0; i < n; ++i) {
 		char *data;
@@ -774,24 +775,41 @@  typedef int (test_case_function)(struct active_device *ad,
 				op_type, n * ref_entries->nb_segments,
 				mbuf_pool->size);
 
-		TEST_ASSERT_SUCCESS(((seg->length + RTE_PKTMBUF_HEADROOM) >
-				(uint32_t)UINT16_MAX),
-				"Given data is bigger than allowed mbuf segment size");
-
+		if (seg->length > RTE_BBDEV_LDPC_E_MAX_MBUF) {
+			/*
+			 * Special case when DPDK mbuf cannot handle
+			 * the required input size
+			 */
+			printf("Warning: Larger input size than DPDK mbuf %d\n",
+					seg->length);
+			large_input = true;
+		}
 		bufs[i].data = m_head;
 		bufs[i].offset = 0;
 		bufs[i].length = 0;
 
 		if ((op_type == DATA_INPUT) || (op_type == DATA_HARQ_INPUT)) {
-			data = rte_pktmbuf_append(m_head, seg->length);
-			TEST_ASSERT_NOT_NULL(data,
+			if ((op_type == DATA_INPUT) && large_input) {
+				/* Allocate a fake overused mbuf */
+				data = rte_malloc(NULL, seg->length, 0);
+				memcpy(data, seg->addr, seg->length);
+				m_head->buf_addr = data;
+				m_head->buf_iova = rte_malloc_virt2iova(data);
+				m_head->data_off = 0;
+				m_head->data_len = seg->length;
+			} else {
+				data = rte_pktmbuf_append(m_head, seg->length);
+				TEST_ASSERT_NOT_NULL(data,
 					"Couldn't append %u bytes to mbuf from %d data type mbuf pool",
 					seg->length, op_type);
 
-			TEST_ASSERT(data == RTE_PTR_ALIGN(data, min_alignment),
+				TEST_ASSERT(data == RTE_PTR_ALIGN(
+						data, min_alignment),
 					"Data addr in mbuf (%p) is not aligned to device min alignment (%u)",
 					data, min_alignment);
-			rte_memcpy(data, seg->addr, seg->length);
+				rte_memcpy(data, seg->addr, seg->length);
+			}
+
 			bufs[i].length += seg->length;
 
 			for (j = 1; j < ref_entries->nb_segments; ++j) {
diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst
index 2190eaf..8dc87fc 100644
--- a/doc/guides/rel_notes/release_20_05.rst
+++ b/doc/guides/rel_notes/release_20_05.rst
@@ -56,6 +56,11 @@  New Features
      Also, make sure to start the actual text at the margin.
      =========================================================
 
+* **Updated the TURBO_SW bbdev PMD.**
+
+  Updated the ``turbo_sw`` bbdev driver with changes including:
+
+  * Support for large size code block not fitting in one mbuf segment.
 
 Removed Items
 -------------
diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
index 5ca8ca1..bb62276 100644
--- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c
+++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c
@@ -1335,7 +1335,7 @@  struct turbo_sw_queue {
 
 static inline void
 process_ldpc_dec_cb(struct turbo_sw_queue *q, struct rte_bbdev_dec_op *op,
-		uint8_t c, uint16_t out_length, uint16_t e,
+		uint8_t c, uint16_t out_length, uint32_t e,
 		struct rte_mbuf *m_in,
 		struct rte_mbuf *m_out_head, struct rte_mbuf *m_out,
 		struct rte_mbuf *m_harq_in,
@@ -1617,8 +1617,8 @@  struct turbo_sw_queue {
 		struct rte_bbdev_stats *queue_stats)
 {
 	uint8_t c, r = 0;
-	uint16_t e, out_length;
-	uint16_t crc24_overlap = 0;
+	uint32_t e;
+	uint16_t out_length, crc24_overlap = 0;
 	struct rte_bbdev_op_ldpc_dec *dec = &op->ldpc_dec;
 	struct rte_mbuf *m_in = dec->input.data;
 	struct rte_mbuf *m_harq_in = dec->harq_combined_input.data;
@@ -1660,8 +1660,11 @@  struct turbo_sw_queue {
 		if (dec->code_block_mode == 0)
 			e = (r < dec->tb_params.cab) ?
 				dec->tb_params.ea : dec->tb_params.eb;
-
-		seg_total_left = rte_pktmbuf_data_len(m_in) - in_offset;
+		/* Special case handling when overusing mbuf */
+		if (e < RTE_BBDEV_LDPC_E_MAX_MBUF)
+			seg_total_left = rte_pktmbuf_data_len(m_in) - in_offset;
+		else
+			seg_total_left = e;
 
 		process_ldpc_dec_cb(q, op, c, out_length, e,
 				m_in, m_out_head, m_out,
diff --git a/lib/librte_bbdev/rte_bbdev_op.h b/lib/librte_bbdev/rte_bbdev_op.h
index 80f3934..9c66721 100644
--- a/lib/librte_bbdev/rte_bbdev_op.h
+++ b/lib/librte_bbdev/rte_bbdev_op.h
@@ -35,7 +35,8 @@ 
 #define RTE_BBDEV_LDPC_MAX_CB_SIZE (8448)
 /* Minimum size of Code Block */
 #define RTE_BBDEV_LDPC_MIN_CB_SIZE (40)
-
+/* Maximum E size we can manage with default mbuf */
+#define RTE_BBDEV_LDPC_E_MAX_MBUF (64000)
 /* Minimum size of Code Block (36.212, Table 5.1.3-3) */
 #define RTE_BBDEV_TURBO_MIN_CB_SIZE (40)
 /* Maximum size of circular buffer */