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 AA9C4A04DE for ; Wed, 28 Oct 2020 11:56:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F59CCAF1; Wed, 28 Oct 2020 11:56:41 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 1D2FECAE0 for ; Wed, 28 Oct 2020 11:56:39 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id w23so4108420wmi.4 for ; Wed, 28 Oct 2020 03:56:39 -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=SjrWMT07Q6Eowja6Ixdpa0wNVisn5j1n+qe2Wi0tLKs=; b=WXapxbcM4bua/Ok1FIWzGZt9imKyrH6Z9CwhGSA5C0dXPZIkfirzQcFDB3sdjpzpeq /gubzw0MNivScrOZckGBUPgS9Luf7IPUzjfHz72GzF+bKEgVAzPIKfhD/DbTqsVE0aNr ehj0Bh8owW6y6LfQkakorrYXoHC6yfOgWHIEj11gKY7Yf5YfZ5Wizq+pXBevpF+YgL+p tlPsSdSPK8mSb0trZWwNQpXc5p3/fHrVfJGKlhVJ75xbiOflsokw+LBIcgZOaihFsDDf CN0OwcGpW8ieMWk4Y0LD0UhGwKKbDTMUG3J+5DXnlpYLqlb8+y9YG1C0Yx36cYxpoXYp 6Z4A== 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=SjrWMT07Q6Eowja6Ixdpa0wNVisn5j1n+qe2Wi0tLKs=; b=sVWzprscrVC/kiMierpzdW3tcdUhZisyjKg7/NCaSjIuO1qgszSZj9r9rXCIHea4/F ByXb8VcKTijLKbOCD5OmASKFr/Oxdk7Med2l1kFrcv6kYreDD+7Yvb0Uc58LqoIZrS+Q kjJNIzYKyg/rjtW9f1TSj0vYm7dV9QtuVfReVjpFxmA93mCbz4WR288eZ/IxLOQRqf/v WrnOMQRSfKwMCFoFIZLn8Svsp/6sZdoW7sPlDIznfl3NLu0MrrZHBsaAfYtoaXMI+86r xBo3bz8uioB9a8XRk4w+EuRz+VZSO4Y/RW2b0OI95wYeS187BEXsg1Aw/ONABczjIPtO hqYQ== X-Gm-Message-State: AOAM5311KiMDH3q85TMPSg/khumLd/0s1NsYonIAZQ2CJGbE1R8SjmCH C3JRXXqJdYYaaylAc8oz3FU= X-Google-Smtp-Source: ABdhPJxKXianz5prs1ORVrEA5Oj2BeVHHt+GK5/ifEWHAA4m2+XxYJ59G/MikAfpZlcbFmVHkJMXIw== X-Received: by 2002:a1c:6143:: with SMTP id v64mr7162149wmb.108.1603882597881; Wed, 28 Oct 2020 03:56:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z76sm5872986wmc.10.2020.10.28.03.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:56:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Lukasz Wojciechowski Cc: Honnappa Nagarahalli , dpdk stable Date: Wed, 28 Oct 2020 10:45:56 +0000 Message-Id: <20201028104606.3504127-197-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/distributor: fix quitting workers in burst mode' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 c2a92ce0d1bcda8472995a3577263f06cf30b73f Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Sat, 17 Oct 2020 05:07:01 +0200 Subject: [PATCH] test/distributor: fix quitting workers in burst mode [ upstream commit f72bff0ec2723b7d7bfc9c655419030b1c8fffad ] Sending number of packets equal to number of workers isn't enough to stop all workers in burst version of distributor as more than one packet can be matched and consumed by a single worker. This way some of workers might not be awaken from rte_distributor_get_pkt(). This patch fixes it by sending packets one by one. Each sent packet causes exactly one worker to quit. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") Signed-off-by: Lukasz Wojciechowski Reviewed-by: Honnappa Nagarahalli --- app/test/test_distributor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c index 199f88887d..281b015363 100644 --- a/app/test/test_distributor.c +++ b/app/test/test_distributor.c @@ -629,9 +629,10 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p) zero_quit = 0; quit = 1; - for (i = 0; i < num_workers; i++) + for (i = 0; i < num_workers; i++) { bufs[i]->hash.usr = i << 1; - rte_distributor_process(d, bufs, num_workers); + rte_distributor_process(d, &bufs[i], 1); + } rte_distributor_process(d, NULL, 0); rte_distributor_flush(d); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.798551373 +0000 +++ 0197-test-distributor-fix-quitting-workers-in-burst-mode.patch 2020-10-28 10:35:11.804834440 +0000 @@ -1,8 +1,10 @@ -From f72bff0ec2723b7d7bfc9c655419030b1c8fffad Mon Sep 17 00:00:00 2001 +From c2a92ce0d1bcda8472995a3577263f06cf30b73f Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Sat, 17 Oct 2020 05:07:01 +0200 Subject: [PATCH] test/distributor: fix quitting workers in burst mode +[ upstream commit f72bff0ec2723b7d7bfc9c655419030b1c8fffad ] + Sending number of packets equal to number of workers isn't enough to stop all workers in burst version of distributor as more than one packet can be matched and consumed by a single worker. This way @@ -12,7 +14,6 @@ causes exactly one worker to quit. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") -Cc: stable@dpdk.org Signed-off-by: Lukasz Wojciechowski Reviewed-by: Honnappa Nagarahalli @@ -21,10 +22,10 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c -index a4af0a39c6..e0cb698e1c 100644 +index 199f88887d..281b015363 100644 --- a/app/test/test_distributor.c +++ b/app/test/test_distributor.c -@@ -769,9 +769,10 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p) +@@ -629,9 +629,10 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p) zero_quit = 0; quit = 1;