From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6D41BA00C2; Thu, 6 Oct 2022 14:53:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E019A42C53; Thu, 6 Oct 2022 14:53:00 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 08ACA42C3C; Thu, 6 Oct 2022 14:52:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665060779; x=1696596779; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nL4H6OtGIcW1CQ5e7KP2WRAc1ENXskwse89ezTGrMNE=; b=FtoZL5YjjYB89JiW0gRlFcNMvi5oJ/ZnRwgo5MbsJUzFpkk3jh+2ABco /eXBhpiszAJXzA70Ei02Q+fhCTyjhwLRzyBPOdElcKet+8PhhllM+N3tY LUXKBm5krv+aRRYIp3OJdeZlrrH6gVFKGW6wT/snF8q6Cy1CFpcuVC4Jr zl2LqJhZUhsdSQyQuVNShOi+DmnvHKTa1IN6vIwbCuAscrKWUhxhwEzX4 WtwQmu1Rb5OP+wHKsHDuGdqJZz5uudobvZ/kPnlOq+QbZN4hOYXg6NZdY fYewkxolXaz2J+Pqx+RRvRqQUAfbJyFqQ7pLymlllr4PB6fuTrY7ag+/i A==; X-IronPort-AV: E=McAfee;i="6500,9779,10491"; a="290691131" X-IronPort-AV: E=Sophos;i="5.95,163,1661842800"; d="scan'208";a="290691131" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2022 05:52:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10491"; a="575811797" X-IronPort-AV: E=Sophos;i="5.95,163,1661842800"; d="scan'208";a="575811797" Received: from silpixa00401454.ir.intel.com ([10.55.128.131]) by orsmga003.jf.intel.com with ESMTP; 06 Oct 2022 05:52:55 -0700 From: Harry van Haaren To: dev@dpdk.org Cc: david.marchand@redhat.com, dpdklab@iol.unh.edu, ci@dpdk.org, Honnappa.Nagarahalli@arm.com, mb@smartsharesystems.com, mattias.ronnblom@ericsson.com, thomas@monjalon.net, Harry van Haaren Subject: [PATCH v3] test/service: fix spurious failures by extending timeout Date: Thu, 6 Oct 2022 12:52:47 +0000 Message-Id: <20221006125247.1018265-1-harry.van.haaren@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221006081729.578475-1-harry.van.haaren@intel.com> References: <20221006081729.578475-1-harry.van.haaren@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This commit extends the timeout for service_may_be_active() from 100ms to 1000ms. Local testing on a idle and loaded system (compiling DPDK with all cores) always completes after 1 ms. The wait time for a service-lcore to finish is also extended from 100ms to 1000ms. The same timeout waiting code was duplicated in two tests, and is now refactored to a standalone function avoiding duplication. Reported-by: David Marchand Suggested-by: Mattias Ronnblom Signed-off-by: Harry van Haaren --- v3: - Use #define for timeout, and delay(1) (Mattias) - Rework slcore-wait to use TIMEOUT_MS as well. v2: - v1 addressed only testcase 15 issue, v2 also addresses test case 5, which has an service-lcore wait code-path. --- app/test/test_service_cores.c | 49 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c index 359b6dcd8b..637fcd7cf9 100644 --- a/app/test/test_service_cores.c +++ b/app/test/test_service_cores.c @@ -22,6 +22,7 @@ static uint64_t service_tick; static uint32_t service_remote_launch_flag; #define SERVICE_DELAY 1 +#define TIMEOUT_MS 1000 #define DUMMY_SERVICE_NAME "dummy_service" #define MT_SAFE_SERVICE_NAME "mt_safe_service" @@ -123,15 +124,15 @@ unregister_all(void) return TEST_SUCCESS; } -/* Wait until service lcore not active, or for 100x SERVICE_DELAY */ +/* Wait until service lcore not active, or for TIMEOUT_MS */ static void wait_slcore_inactive(uint32_t slcore_id) { int i; for (i = 0; rte_service_lcore_may_be_active(slcore_id) == 1 && - i < 100; i++) - rte_delay_ms(SERVICE_DELAY); + i < TIMEOUT_MS; i++) + rte_delay_ms(1); } /* register a single dummy service */ @@ -921,12 +922,25 @@ service_lcore_start_stop(void) return unregister_all(); } +static int +service_ensure_stopped_with_timeout(uint32_t sid) +{ + /* give the service time to stop running */ + int i; + for (i = 0; i < TIMEOUT_MS; i++) { + if (!rte_service_may_be_active(sid)) + break; + rte_delay_ms(1); + } + + return rte_service_may_be_active(sid); +} + /* stop a service and wait for it to become inactive */ static int service_may_be_active(void) { const uint32_t sid = 0; - int i; /* expected failure cases */ TEST_ASSERT_EQUAL(-EINVAL, rte_service_may_be_active(10000), @@ -946,19 +960,11 @@ service_may_be_active(void) TEST_ASSERT_EQUAL(1, service_lcore_running_check(), "Service core expected to poll service but it didn't"); - /* stop the service */ + /* stop the service, and wait for not-active with timeout */ TEST_ASSERT_EQUAL(0, rte_service_runstate_set(sid, 0), "Error: Service stop returned non-zero"); - - /* give the service 100ms to stop running */ - for (i = 0; i < 100; i++) { - if (!rte_service_may_be_active(sid)) - break; - rte_delay_ms(SERVICE_DELAY); - } - - TEST_ASSERT_EQUAL(0, rte_service_may_be_active(sid), - "Error: Service not stopped after 100ms"); + TEST_ASSERT_EQUAL(0, service_ensure_stopped_with_timeout(sid), + "Error: Service not stopped after timeout period."); return unregister_all(); } @@ -972,7 +978,6 @@ service_active_two_cores(void) return TEST_SKIPPED; const uint32_t sid = 0; - int i; uint32_t lcore = rte_get_next_lcore(/* start core */ -1, /* skip main */ 1, @@ -1002,16 +1007,8 @@ service_active_two_cores(void) /* stop the service */ TEST_ASSERT_EQUAL(0, rte_service_runstate_set(sid, 0), "Error: Service stop returned non-zero"); - - /* give the service 100ms to stop running */ - for (i = 0; i < 100; i++) { - if (!rte_service_may_be_active(sid)) - break; - rte_delay_ms(SERVICE_DELAY); - } - - TEST_ASSERT_EQUAL(0, rte_service_may_be_active(sid), - "Error: Service not stopped after 100ms"); + TEST_ASSERT_EQUAL(0, service_ensure_stopped_with_timeout(sid), + "Error: Service not stopped after timeout period."); return unregister_all(); } -- 2.34.1