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 28EEFA04F0 for ; Thu, 19 Dec 2019 15:42:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 19EDA1BDFD; Thu, 19 Dec 2019 15:42:10 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 06CB01C069 for ; Thu, 19 Dec 2019 15:42:09 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id g17so6244489wro.2 for ; Thu, 19 Dec 2019 06:42:09 -0800 (PST) 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=XewabrnlIb492tro/+BXKwKsMQ0zJ21JXBZ0tBzSIq4=; b=GM54r5XY9CsToc2op69Q9fBDFSZNDgxG7sQSyBdpSAIX59V13Dt3yFGiTwoBzWoZIl tvw34zTPszpyCT8kGbMpxLOOAMUWI13VCicCW09A598ErNA11Jw8SxB9j9IXePzny16t apkV0J0wuuVGS2lVn8ns82Xm6MiQ15M4ihCmV2OmqYMEX0LKBdcFMGbT8DNEAKNVCO0a 0W837RZly0Qpn3EpFAvbujiK5ktJCKYeeRbvujcAN222cL8R3JZAREzF+OtrcLgvVD+/ QvwT4MJIj+ZEfvAzvYXzxDr26/D16eklkC2+pr2cu4RD9CEahTLFwMIu5uxGejF9YQyd re3Q== 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=XewabrnlIb492tro/+BXKwKsMQ0zJ21JXBZ0tBzSIq4=; b=JNvB3cJTUvT6sGe/C3VkDhOfrjN662B38eFauG3anO49zW9kl02avaBt8hnLU3xOG5 wEliBGxChwDKm/BPpOmhOOk82l9ZUZ2uSsi5exjnenodohwpPmD2J9imSWgBdBLtPrfZ /91TjM78nv8lvL3n+Yw4eDC1aFUnZrySuzlqUEXciWsVigY6LuJrwFpYDe4XEX0YfBX3 P0k3qb/EaFi+GFnf3tPNHFNESZw8R5S8aZcSvn2SHbyTTp3sDMffV0zaoIi+aI+8FlXM INPRyquRSdo5LnHIi8AViEambRUc0z2ndtK6ZLskTP1YX9F7jvKTw+WCpRN8ZYJO0tPC +g+A== X-Gm-Message-State: APjAAAUFMH5UxHJ1OZoqKY27ehblTIrNWFdHOIs023zzRR0UffWty+GB /DXt+dg9oNjLtllCrXGiH4hawvuhrz0= X-Google-Smtp-Source: APXvYqxIjyMW3UxnXXfNKqsdRIQh0tmN/kfKuyaq5Zh+esKHhi9yGDTYwgE+n9DReGJEn7pXvwj56Q== X-Received: by 2002:adf:fac1:: with SMTP id a1mr9508998wrs.376.1576766528744; Thu, 19 Dec 2019 06:42:08 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m126sm6410819wmf.7.2019.12.19.06.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:42:08 -0800 (PST) From: luca.boccassi@gmail.com To: Harry van Haaren Cc: Aaron Conole , David Marchand , dpdk stable Date: Thu, 19 Dec 2019 14:34:46 +0000 Message-Id: <20191219143447.21506-139-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/service: fix wait for service core' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 f8ca5223b48f46f9647574df08d84cb065482298 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Wed, 27 Nov 2019 13:20:27 +0000 Subject: [PATCH] test/service: fix wait for service core [ upstream commit 505a2b0c64a7f1e087f5a8aaa6940da78c11c81b ] This commit fixes a sporadic failure of the service_autotest unit test, as seen in the DPDK CI. The failure occurs as the main test thread did not wait on the service-thread to return, and allowing it to read a flag before the service was able to write to it. The fix changes the wait API call to specific the service-core ID, and this waits for cores with both ROLE_RTE and ROLE_SERVICE. The rte_eal_mp_wait_lcore() call does not (and should not) wait for service cores, so must not be used to wait on service-cores. Fixes: f038a81e1c56 ("service: add unit tests") Reported-by: Aaron Conole Signed-off-by: Harry van Haaren Acked-by: David Marchand --- test/test/test_service_cores.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c index ebff8b0a95..09360919a4 100644 --- a/test/test/test_service_cores.c +++ b/test/test/test_service_cores.c @@ -352,7 +352,7 @@ service_lcore_en_dis_able(void) int ret = rte_eal_remote_launch(service_remote_launch_func, NULL, slcore_id); TEST_ASSERT_EQUAL(0, ret, "Ex-service core remote launch failed."); - rte_eal_mp_wait_lcore(); + rte_eal_wait_lcore(slcore_id); TEST_ASSERT_EQUAL(1, service_remote_launch_flag, "Ex-service core function call had no effect."); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:31.848360579 +0000 +++ 0139-test-service-fix-wait-for-service-core.patch 2019-12-19 14:32:26.365302981 +0000 @@ -1,8 +1,10 @@ -From 505a2b0c64a7f1e087f5a8aaa6940da78c11c81b Mon Sep 17 00:00:00 2001 +From f8ca5223b48f46f9647574df08d84cb065482298 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Wed, 27 Nov 2019 13:20:27 +0000 Subject: [PATCH] test/service: fix wait for service core +[ upstream commit 505a2b0c64a7f1e087f5a8aaa6940da78c11c81b ] + This commit fixes a sporadic failure of the service_autotest unit test, as seen in the DPDK CI. The failure occurs as the main test thread did not wait on the service-thread to return, and allowing it @@ -15,20 +17,19 @@ for service cores, so must not be used to wait on service-cores. Fixes: f038a81e1c56 ("service: add unit tests") -Cc: stable@dpdk.org Reported-by: Aaron Conole Signed-off-by: Harry van Haaren Acked-by: David Marchand --- - app/test/test_service_cores.c | 2 +- + test/test/test_service_cores.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c -index 9fe38f5e08..a922c7ddcc 100644 ---- a/app/test/test_service_cores.c -+++ b/app/test/test_service_cores.c -@@ -483,7 +483,7 @@ service_lcore_en_dis_able(void) +diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c +index ebff8b0a95..09360919a4 100644 +--- a/test/test/test_service_cores.c ++++ b/test/test/test_service_cores.c +@@ -352,7 +352,7 @@ service_lcore_en_dis_able(void) int ret = rte_eal_remote_launch(service_remote_launch_func, NULL, slcore_id); TEST_ASSERT_EQUAL(0, ret, "Ex-service core remote launch failed.");