[v2,1/2] test/dma: update the sg test to verify wrap around case

Message ID 20240419090734.43613-1-vvelumuri@marvell.com (mailing list archive)
State New
Delegated to: Thomas Monjalon
Headers
Series [v2,1/2] test/dma: update the sg test to verify wrap around case |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Vidya Sagar Velumuri April 19, 2024, 9:07 a.m. UTC
Run the sg test in a loop to verify wrap around case.
Total number commands submitted to be more than the number descriptors
allocated to verify the scenario.

Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
  

Comments

Amit Prakash Shukla Oct. 4, 2024, 11:49 a.m. UTC | #1
> -----Original Message-----
> From: Vidya Sagar Velumuri <vvelumuri@marvell.com>
> Sent: Friday, April 19, 2024 2:38 PM
> To: fengchengwen@huawei.com; kevin.laatz@intel.com;
> bruce.richardson@intel.com
> Cc: Jerin Jacob <jerinj@marvell.com>; Anoob Joseph
> <anoobj@marvell.com>; Vidya Sagar Velumuri <vvelumuri@marvell.com>;
> Aakash Sasidharan <asasidharan@marvell.com>; Tejasree Kondoj
> <ktejasree@marvell.com>; Gowrishankar Muthukrishnan
> <gmuthukrishn@marvell.com>; dev@dpdk.org
> Subject: [EXTERNAL] [PATCH v2 1/2] test/dma: update the sg test to verify
> wrap around case
> 
> Prioritize security for external emails: Confirm sender and content safety
> before clicking links or opening attachments
> 
> ----------------------------------------------------------------------
> Run the sg test in a loop to verify wrap around case.
> Total number commands submitted to be more than the number descriptors
> allocated to verify the scenario.
> 
> Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com> diff --git
> a/app/test/test_dmadev.c b/app/test/test_dmadev.c index
> 143e1bcd68..7462e90831 100644
> --- a/app/test/test_dmadev.c
> +++ b/app/test/test_dmadev.c
> @@ -393,34 +393,26 @@ test_stop_start(int16_t dev_id, uint16_t vchan)  }
> 
>  static int
> -test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan)
> +test_enqueue_sg(int16_t dev_id, uint16_t vchan, unsigned int n_sge,
> +unsigned int test_len)
>  {
> -	unsigned int src_len, dst_len, n_sge, len, i, j, k;
>  	char orig_src[COPY_LEN], orig_dst[COPY_LEN];
> -	struct rte_dma_info info = { 0 };
> +	unsigned int src_len, dst_len, i, j, k;
>  	enum rte_dma_status_code status;
>  	uint16_t id, n_src, n_dst;
> 
> -	if (rte_dma_info_get(dev_id, &info) < 0)
> -		ERR_RETURN("Failed to get dev info");
> -
> -	if (info.max_sges < 2)
> -		ERR_RETURN("Test needs minimum 2 SG pointers");
> -
> -	n_sge = info.max_sges;
> -
>  	for (n_src = 1; n_src <= n_sge; n_src++) {
>  		for (n_dst = 1; n_dst <= n_sge; n_dst++) {
>  			/* Normalize SG buffer lengths */
> -			len = COPY_LEN;
> -			len -= (len % (n_src * n_dst));
> -			dst_len = len / n_dst;
> -			src_len = len / n_src;
> -
> +			unsigned int len = test_len - (test_len % (n_src *
> n_dst));
>  			struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge];
>  			struct rte_mbuf *src[n_sge], *dst[n_sge];
>  			char *src_data[n_sge], *dst_data[n_sge];
> 
> +			dst_len = len / n_dst;
> +			src_len = len / n_src;
> +			if (dst_len == 0 || src_len == 0)
> +				continue;
> +
>  			for (i = 0 ; i < len; i++)
>  				orig_src[i] = rte_rand() & 0xFF;
> 
> @@ -511,6 +503,27 @@ test_enqueue_sg_copies(int16_t dev_id, uint16_t
> vchan)
>  	return 0;
>  }
> 
> +static int
> +test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan) {
> +	struct rte_dma_info info = { 0 };
> +	unsigned int n_sge, len;
> +	int loop_count = 0;
> +
> +	if (rte_dma_info_get(dev_id, &info) < 0)
> +		ERR_RETURN("Failed to get dev info");
> +
> +	n_sge = RTE_MIN(info.max_sges, TEST_SG_MAX);
> +	len = COPY_LEN;
> +
> +	do {
> +		test_enqueue_sg(dev_id, vchan, n_sge, len);
> +		loop_count++;
> +	} while (loop_count * n_sge * n_sge < TEST_RINGSIZE * 3);
> +
> +	return 0;
> +}
> +
>  /* Failure handling test cases - global macros and variables for those tests*/
>  #define COMP_BURST_SZ	16
>  #define OPT_FENCE(idx) ((fence && idx == 8) ? RTE_DMA_OP_FLAG_FENCE :
> 0) diff --git a/app/test/test_dmadev_api.c b/app/test/test_dmadev_api.c
> index d40c05cfbf..6a07ed593b 100644
> --- a/app/test/test_dmadev_api.c
> +++ b/app/test/test_dmadev_api.c
> @@ -16,7 +16,6 @@ extern int test_dma_api(uint16_t dev_id);
> 
>  #define TEST_MEMCPY_SIZE	1024
>  #define TEST_WAIT_US_VAL	50000
> -#define TEST_SG_MAX		64
> 
>  static int16_t test_dev_id;
>  static int16_t invalid_dev_id;
> diff --git a/app/test/test_dmadev_api.h b/app/test/test_dmadev_api.h index
> 33fbc5bd41..a03f7acd4f 100644
> --- a/app/test/test_dmadev_api.h
> +++ b/app/test/test_dmadev_api.h
> @@ -2,4 +2,6 @@
>   * Copyright(c) 2021 HiSilicon Limited
>   */
> 
> +#define TEST_SG_MAX		64
> +
>  int test_dma_api(uint16_t dev_id);
> --
> 2.25.1

Acked-by: Amit Prakash Shukla <amitprakashs@marvell.com>

Thanks
  

Patch

diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
index 143e1bcd68..7462e90831 100644
--- a/app/test/test_dmadev.c
+++ b/app/test/test_dmadev.c
@@ -393,34 +393,26 @@  test_stop_start(int16_t dev_id, uint16_t vchan)
 }
 
 static int
-test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan)
+test_enqueue_sg(int16_t dev_id, uint16_t vchan, unsigned int n_sge, unsigned int test_len)
 {
-	unsigned int src_len, dst_len, n_sge, len, i, j, k;
 	char orig_src[COPY_LEN], orig_dst[COPY_LEN];
-	struct rte_dma_info info = { 0 };
+	unsigned int src_len, dst_len, i, j, k;
 	enum rte_dma_status_code status;
 	uint16_t id, n_src, n_dst;
 
-	if (rte_dma_info_get(dev_id, &info) < 0)
-		ERR_RETURN("Failed to get dev info");
-
-	if (info.max_sges < 2)
-		ERR_RETURN("Test needs minimum 2 SG pointers");
-
-	n_sge = info.max_sges;
-
 	for (n_src = 1; n_src <= n_sge; n_src++) {
 		for (n_dst = 1; n_dst <= n_sge; n_dst++) {
 			/* Normalize SG buffer lengths */
-			len = COPY_LEN;
-			len -= (len % (n_src * n_dst));
-			dst_len = len / n_dst;
-			src_len = len / n_src;
-
+			unsigned int len = test_len - (test_len % (n_src * n_dst));
 			struct rte_dma_sge sg_src[n_sge], sg_dst[n_sge];
 			struct rte_mbuf *src[n_sge], *dst[n_sge];
 			char *src_data[n_sge], *dst_data[n_sge];
 
+			dst_len = len / n_dst;
+			src_len = len / n_src;
+			if (dst_len == 0 || src_len == 0)
+				continue;
+
 			for (i = 0 ; i < len; i++)
 				orig_src[i] = rte_rand() & 0xFF;
 
@@ -511,6 +503,27 @@  test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan)
 	return 0;
 }
 
+static int
+test_enqueue_sg_copies(int16_t dev_id, uint16_t vchan)
+{
+	struct rte_dma_info info = { 0 };
+	unsigned int n_sge, len;
+	int loop_count = 0;
+
+	if (rte_dma_info_get(dev_id, &info) < 0)
+		ERR_RETURN("Failed to get dev info");
+
+	n_sge = RTE_MIN(info.max_sges, TEST_SG_MAX);
+	len = COPY_LEN;
+
+	do {
+		test_enqueue_sg(dev_id, vchan, n_sge, len);
+		loop_count++;
+	} while (loop_count * n_sge * n_sge < TEST_RINGSIZE * 3);
+
+	return 0;
+}
+
 /* Failure handling test cases - global macros and variables for those tests*/
 #define COMP_BURST_SZ	16
 #define OPT_FENCE(idx) ((fence && idx == 8) ? RTE_DMA_OP_FLAG_FENCE : 0)
diff --git a/app/test/test_dmadev_api.c b/app/test/test_dmadev_api.c
index d40c05cfbf..6a07ed593b 100644
--- a/app/test/test_dmadev_api.c
+++ b/app/test/test_dmadev_api.c
@@ -16,7 +16,6 @@  extern int test_dma_api(uint16_t dev_id);
 
 #define TEST_MEMCPY_SIZE	1024
 #define TEST_WAIT_US_VAL	50000
-#define TEST_SG_MAX		64
 
 static int16_t test_dev_id;
 static int16_t invalid_dev_id;
diff --git a/app/test/test_dmadev_api.h b/app/test/test_dmadev_api.h
index 33fbc5bd41..a03f7acd4f 100644
--- a/app/test/test_dmadev_api.h
+++ b/app/test/test_dmadev_api.h
@@ -2,4 +2,6 @@ 
  * Copyright(c) 2021 HiSilicon Limited
  */
 
+#define TEST_SG_MAX		64
+
 int test_dma_api(uint16_t dev_id);