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 019E1A04DD for ; Wed, 18 Nov 2020 17:37:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 128FCC91A; Wed, 18 Nov 2020 17:37:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 0F0133B5 for ; Wed, 18 Nov 2020 17:37:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8eizjXSR3mgA75snMbm1OYmdlXf5kcinFmsQD0lsBaI=; b=ZAe6/zZXKtwHzsYQSuf72zQc7debKmv2JBsrx0lCiNhd5c1/fhRfXyM+3ZXTgOIBIgXDTk 1fyMG2tmsYze2XZkCKUFy09gKbhFeGLvookrP4IKi0Z1jSF+uKYShNR4h1rxlJsKcCHUkI b3XD+L/m09fqU85FYepRHt1a4RLyopY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-579-hbwfFyJTOEyziHOlF2uI4g-1; Wed, 18 Nov 2020 11:37:19 -0500 X-MC-Unique: hbwfFyJTOEyziHOlF2uI4g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B0508A8F3C; Wed, 18 Nov 2020 16:36:56 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FBC65C1A3; Wed, 18 Nov 2020 16:36:55 +0000 (UTC) From: Kevin Traynor To: Lukasz Wojciechowski Cc: David Hunt , dpdk stable Date: Wed, 18 Nov 2020 16:35:09 +0000 Message-Id: <20201118163558.1101823-23-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'distributor: fix return pkt calls in single mode' has been queued to LTS release 18.11.11 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 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/5cf7042b21b9c2be3a839431ceb3856d4013217c Thanks. Kevin. --- >From 5cf7042b21b9c2be3a839431ceb3856d4013217c 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 2673aa2649..873ca290dd 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -182,4 +182,7 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d, return rte_distributor_return_pkt_v20(d->d_v20, worker_id, oldpkt[0]); + else if (num == 0) + return rte_distributor_return_pkt_v20(d->d_v20, + worker_id, NULL); else return -EINVAL; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.405291720 +0000 +++ 0023-distributor-fix-return-pkt-calls-in-single-mode.patch 2020-11-18 16:33:37.928215061 +0000 @@ -1 +1 @@ -From f25fe0d5e3e0dd1650845eca928f2263898f5a19 Mon Sep 17 00:00:00 2001 +From 5cf7042b21b9c2be3a839431ceb3856d4013217c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f25fe0d5e3e0dd1650845eca928f2263898f5a19 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 7aa079d53c..6e3eae58f8 100644 +index 2673aa2649..873ca290dd 100644 @@ -31,2 +32,2 @@ -@@ -168,4 +168,7 @@ rte_distributor_return_pkt(struct rte_distributor *d, - return rte_distributor_return_pkt_single(d->d_single, +@@ -182,4 +182,7 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d, + return rte_distributor_return_pkt_v20(d->d_v20, @@ -35 +36 @@ -+ return rte_distributor_return_pkt_single(d->d_single, ++ return rte_distributor_return_pkt_v20(d->d_v20,