[dpdk-stable] patch 'test: skip some subtests in no-huge mode' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 7ad8cd364e69ed6a59a204c4875fc254a7f4fe19 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Mon, 23 Mar 2020 20:59:23 +0100
Subject: [PATCH] test: skip some subtests in no-huge mode

[ upstream commit 27fb5dd2850c60b46660b93c2fe14da6841b142c ]

When running with '--no-huge' flag, tests failed with messages as:
    ACL context creation with invalid NUMA should have failed!
    fbk hash creation should have failed
    test_table_pipeline: Check pipeline invalid params failed.

These cases test against invalid socket ID as input parameter, and
expect error return. But function calls return success because
invalid sock ID is overwritten to SOCKET_ID_ANY when in no-huge mode.

The tests against invalid socket ID are skipped in no-huge mode.

Fixes: 5640171c528a ("malloc: fix external heap allocation in no-huge mode")

Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Reviewed-by: Gavin Hu <gavin.hu at arm.com>
Acked-by: Aaron Conole <aconole at redhat.com>
Acked-by: Yipeng Wang <yipeng1.wang at intel.com>
---
 app/test/test_acl.c            | 20 +++++++++++---------
 app/test/test_hash.c           |  7 +++++--
 app/test/test_table_pipeline.c | 12 +++++++-----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 9cd9e37dbe..b78b67193a 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -1394,16 +1394,18 @@ test_invalid_parameters(void)
 	} else
 		rte_acl_free(acx);
 
-	/* invalid NUMA node */
-	memcpy(&param, &acl_param, sizeof(param));
-	param.socket_id = RTE_MAX_NUMA_NODES + 1;
+	if (rte_eal_has_hugepages()) {
+		/* invalid NUMA node */
+		memcpy(&param, &acl_param, sizeof(param));
+		param.socket_id = RTE_MAX_NUMA_NODES + 1;
 
-	acx = rte_acl_create(&param);
-	if (acx != NULL) {
-		printf("Line %i: ACL context creation with invalid NUMA "
-				"should have failed!\n", __LINE__);
-		rte_acl_free(acx);
-		return -1;
+		acx = rte_acl_create(&param);
+		if (acx != NULL) {
+			printf("Line %i: ACL context creation with invalid "
+					"NUMA should have failed!\n", __LINE__);
+			rte_acl_free(acx);
+			return -1;
+		}
 	}
 
 	/* NULL name */
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 0052dce2de..2ac298e21e 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -1142,8 +1142,11 @@ fbk_hash_unit_test(void)
 	handle = rte_fbk_hash_create(&invalid_params_7);
 	RETURN_IF_ERROR_FBK(handle != NULL, "fbk hash creation should have failed");
 
-	handle = rte_fbk_hash_create(&invalid_params_8);
-	RETURN_IF_ERROR_FBK(handle != NULL, "fbk hash creation should have failed");
+	if (rte_eal_has_hugepages()) {
+		handle = rte_fbk_hash_create(&invalid_params_8);
+		RETURN_IF_ERROR_FBK(handle != NULL,
+					"fbk hash creation should have failed");
+	}
 
 	handle = rte_fbk_hash_create(&invalid_params_same_name_1);
 	RETURN_IF_ERROR_FBK(handle == NULL, "fbk hash creation should have succeeded");
diff --git a/app/test/test_table_pipeline.c b/app/test/test_table_pipeline.c
index 441338ac01..bc412c3081 100644
--- a/app/test/test_table_pipeline.c
+++ b/app/test/test_table_pipeline.c
@@ -190,11 +190,13 @@ check_pipeline_invalid_params(void)
 		goto fail;
 	}
 
-	p = rte_pipeline_create(&pipeline_params_3);
-	if (p != NULL) {
-		RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with invalid "
-			"socket\n", __func__);
-		goto fail;
+	if (rte_eal_has_hugepages()) {
+		p = rte_pipeline_create(&pipeline_params_3);
+		if (p != NULL) {
+			RTE_LOG(INFO, PIPELINE, "%s: Configure pipeline with "
+				"invalid socket\n", __func__);
+			goto fail;
+		}
 	}
 
 	/* Check pipeline consistency */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:20.932443483 +0100
+++ 0051-test-skip-some-subtests-in-no-huge-mode.patch	2020-05-19 13:56:18.283502971 +0100
@@ -1,8 +1,10 @@
-From 27fb5dd2850c60b46660b93c2fe14da6841b142c Mon Sep 17 00:00:00 2001
+From 7ad8cd364e69ed6a59a204c4875fc254a7f4fe19 Mon Sep 17 00:00:00 2001
 From: Ruifeng Wang <ruifeng.wang at arm.com>
 Date: Mon, 23 Mar 2020 20:59:23 +0100
 Subject: [PATCH] test: skip some subtests in no-huge mode
 
+[ upstream commit 27fb5dd2850c60b46660b93c2fe14da6841b142c ]
+
 When running with '--no-huge' flag, tests failed with messages as:
     ACL context creation with invalid NUMA should have failed!
     fbk hash creation should have failed
@@ -15,7 +17,6 @@
 The tests against invalid socket ID are skipped in no-huge mode.
 
 Fixes: 5640171c528a ("malloc: fix external heap allocation in no-huge mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
 Reviewed-by: Gavin Hu <gavin.hu at arm.com>
@@ -28,10 +29,10 @@
  3 files changed, 23 insertions(+), 16 deletions(-)
 
 diff --git a/app/test/test_acl.c b/app/test/test_acl.c
-index 501de35da1..316bf4d065 100644
+index 9cd9e37dbe..b78b67193a 100644
 --- a/app/test/test_acl.c
 +++ b/app/test/test_acl.c
-@@ -1397,16 +1397,18 @@ test_invalid_parameters(void)
+@@ -1394,16 +1394,18 @@ test_invalid_parameters(void)
  	} else
  		rte_acl_free(acx);
  
@@ -60,10 +61,10 @@
  
  	/* NULL name */
 diff --git a/app/test/test_hash.c b/app/test/test_hash.c
-index fbd5725c68..ab978ea689 100644
+index 0052dce2de..2ac298e21e 100644
 --- a/app/test/test_hash.c
 +++ b/app/test/test_hash.c
-@@ -1136,8 +1136,11 @@ fbk_hash_unit_test(void)
+@@ -1142,8 +1142,11 @@ fbk_hash_unit_test(void)
  	handle = rte_fbk_hash_create(&invalid_params_7);
  	RETURN_IF_ERROR_FBK(handle != NULL, "fbk hash creation should have failed");