From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A76D3A0093 for ; Tue, 19 May 2020 15:00:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9EE2F1D5DE; Tue, 19 May 2020 15:00:00 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by dpdk.org (Postfix) with ESMTP id AFEE21D5DE for ; Tue, 19 May 2020 14:59:58 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id m185so3442629wme.3 for ; Tue, 19 May 2020 05:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d/pqm0qwLaQIYRpewKeFIjV73cXpk+jxCe8dVqTCjtQ=; b=InAjCO18hoB6wD2adSOjC28I2mtEc+WpTTCn3OBjgE/bmw2p1t6wFZdyVpJ/opIy82 pezXrEBeXMW0j+56QltqVHEYVPW+FbsC9ug3U1yNJ/V7i3PeWe2iRmg2w/kreZdFIUF7 Ue5SOoVgdieYC2tq1UyfCUyNvqUqAhIQQ4gZ587UVXjY1lsAZIRFP1lk5WRk51PuFiM1 l9M8rbigYKzFTVub5DkYBYE11OMQeaSHrOanSCphYW+NEHFQrKHW9lgw+Pw9w142e8nZ cP8+AxSYw5NuJfGTxIHDfbJBPh3W1xE0Pzq037nf4n/NHzFP0HCBEhz1WVDLAHCDSJ12 xYZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d/pqm0qwLaQIYRpewKeFIjV73cXpk+jxCe8dVqTCjtQ=; b=FUSY6qemT03oJb11fDC2widDz75/xV6N7vUlRtjWqTd0dReioKQKmj6UcfH4+pqw7C JQGuaYB1CrBKsSQaCxAHGP5sOoKGpvLl5jiKlwTDgjBl3a6ddD8sCX2+q0BmM2SaaEkl JUohUYELB3WypxPIy27T/VVzq4AHKdxk/tKPbh9bSXksmfLDfXnsHl6qvIIsoxifWLW3 iROjkWcb+NDg6Ix+wjystR8XDkakwXb6KlVhNsBaxQSK5k1KzyngZR62hz0Cszf6UpqS seirhrb9n0VHfVOpuwOPRL+Drk/ze98/a6ht1ktQEsTn8scTlvkPljYiSMgaChjxwZFb qafQ== X-Gm-Message-State: AOAM530ckIHwliU3nInqJEIto3ih+LLjPRvnOrZrtCE7Gyon5HKZyw3k flpeV3VnhWA4gHH/vLUU4GM= X-Google-Smtp-Source: ABdhPJzz85Y0GyWosVBFvmiaYDkYs2kxNe6UeuY6T7xAa3lH6xOGWyPqsvSsHcBf0P9ls4hsqF+05A== X-Received: by 2002:a1c:2702:: with SMTP id n2mr5521273wmn.107.1589893198452; Tue, 19 May 2020 05:59:58 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o7sm3634143wmc.43.2020.05.19.05.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:57 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: Gavin Hu , Aaron Conole , Yipeng Wang , dpdk stable Date: Tue, 19 May 2020 13:54:01 +0100 Message-Id: <20200519125804.104349-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test: skip some subtests in no-huge mode' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Reviewed-by: Gavin Hu Acked-by: Aaron Conole Acked-by: Yipeng Wang --- 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(¶m, &acl_param, sizeof(param)); - param.socket_id = RTE_MAX_NUMA_NODES + 1; + if (rte_eal_has_hugepages()) { + /* invalid NUMA node */ + memcpy(¶m, &acl_param, sizeof(param)); + param.socket_id = RTE_MAX_NUMA_NODES + 1; - acx = rte_acl_create(¶m); - 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(¶m); + 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 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@dpdk.org Signed-off-by: Ruifeng Wang Reviewed-by: Gavin Hu @@ -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");