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 0D98BA04DD for ; Wed, 28 Oct 2020 11:56:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02A1DCACC; Wed, 28 Oct 2020 11:56:09 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id 3A23BCABF for ; Wed, 28 Oct 2020 11:56:07 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id c16so4322803wmd.2 for ; Wed, 28 Oct 2020 03:56:07 -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=jmbSpCU5nENubafClYSZSexhQI+af+AMftXuSZUt+Ck=; b=G3iDKJH2rNR3tunRYeK9vuh7gUeSV2P8A1BIyJOAPhVc0e7lqJ4f/n5I1Tny/uqtsO FAWSYdBwQmGhnCeHTYMqofqTDjyIFQ1TSu7tdAbTAFn4Sx9MHe2Wemef0DdD8lcU2cmw NVYWCP2JgyO1PjDziwZBiaZjjAYzgSBVkBmh5A+bTvukPXoYjwRm9qWSmK8sVFPbLoZj AUn8UjGE8IVYGlUDR0FDf1nH0UmSNkK26k98th47cv/SuzS6eW0pZiKHQ29Y8hXWkRcw n4z0BsZxF3wPr9W8KUlNJJe9IbHhh87F9zYylJS5ZZjhn73vLjrRLo/jQn7TLveiTc4p mNFQ== 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=jmbSpCU5nENubafClYSZSexhQI+af+AMftXuSZUt+Ck=; b=GGJI0CVgje0A0UglAINts1EsGoBRS0Xh720kE89NUWJC+FhiI19BWci9V/bfnb4BJt zgNvNjBYlJl7BqHPsI16vNRLo0wUWPr7YENhBXSyV2w4SdYwxjuaLiGyYT2mun5aMLsD NV1H++esuAXiMNnzdOimO5rv2GDp/1HtikVBUJ///I1SALUaduxecYNuAOTfYiMM2GrW fevMvY72j7/a874mTnM7CmH+q5PkfQChjXIthOvnmUf3vp+0VYx9lgSDvndbqZ0e0z3Z rrXco+x7JDNpIfmUwhYvLM9O+FxfEr/SO5oQjhnfafW4LDsa++9YzTDQbYFe9lsaiJHf iZAQ== X-Gm-Message-State: AOAM530SfRsdsRCnGvuQYJfFoTxgJZPZh5HaQ8MNUbYH7FNnuv9BYy2o tSE6beQ7nE9zKldXQtWkkSw= X-Google-Smtp-Source: ABdhPJwDj9VW4YIlBjJp7Gr/nV1k6WrMPMjwENQUtRyDoidzaBHYGw4/pW7kteGq1CKIvsAHXhfnfA== X-Received: by 2002:a1c:4887:: with SMTP id v129mr7907415wma.13.1603882566006; Wed, 28 Oct 2020 03:56:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z6sm4422370wmi.1.2020.10.28.03.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:56:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Lukasz Wojciechowski Cc: David Hunt , dpdk stable Date: Wed, 28 Oct 2020 10:45:46 +0000 Message-Id: <20201028104606.3504127-187-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 'distributor: fix return pkt calls in single 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 fc18db55809fda46f982d7da75c6848089553094 Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Sat, 17 Oct 2020 05:06:50 +0200 Subject: [PATCH] distributor: fix return pkt calls in single mode [ upstream commit f25fe0d5e3e0dd1650845eca928f2263898f5a19 ] In the single legacy version of the distributor synchronization requires continues exchange of buffers between distributor and workers. Empty buffers are sent if only handshake synchronization is required. However calls to the rte_distributor_return_pkt() with 0 buffers in single mode were ignored and not passed to the legacy algorithm implementation causing lack of synchronization. This patch fixes this issue by passing NULL as buffer which is a valid way of sending just synchronization handshakes in single mode. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") Signed-off-by: Lukasz Wojciechowski Acked-by: David Hunt --- lib/librte_distributor/rte_distributor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 7aa079d53c..6e3eae58f8 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -167,6 +167,9 @@ rte_distributor_return_pkt(struct rte_distributor *d, if (num == 1) return rte_distributor_return_pkt_single(d->d_single, worker_id, oldpkt[0]); + else if (num == 0) + return rte_distributor_return_pkt_single(d->d_single, + worker_id, NULL); else return -EINVAL; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.510725875 +0000 +++ 0187-distributor-fix-return-pkt-calls-in-single-mode.patch 2020-10-28 10:35:11.800834381 +0000 @@ -1,8 +1,10 @@ -From f25fe0d5e3e0dd1650845eca928f2263898f5a19 Mon Sep 17 00:00:00 2001 +From fc18db55809fda46f982d7da75c6848089553094 Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Sat, 17 Oct 2020 05:06:50 +0200 Subject: [PATCH] distributor: fix return pkt calls in single mode +[ upstream commit f25fe0d5e3e0dd1650845eca928f2263898f5a19 ] + In the single legacy version of the distributor synchronization requires continues exchange of buffers between distributor and workers. Empty buffers are sent if only handshake @@ -16,7 +18,6 @@ in single mode. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") -Cc: stable@dpdk.org Signed-off-by: Lukasz Wojciechowski Acked-by: David Hunt