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 CE26FA04DD for ; Wed, 28 Oct 2020 11:56:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C46A3CAE0; Wed, 28 Oct 2020 11:56:26 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by dpdk.org (Postfix) with ESMTP id 77D6BCAE0 for ; Wed, 28 Oct 2020 11:56:24 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id t3so1876392wmi.3 for ; Wed, 28 Oct 2020 03:56:24 -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=VaLByEs82Ao1KNCMkrUl62SEqEPZtHJi7YM0u2Ze4p4=; b=vA6sQyV7/N42IPXH9Dh409NUAfwIrjnNqlpyxAjTqDu+xNq84MnMVNAmF6/JFKjNTM 1lUJdiyQDTWWsdxU7LsQH7UZVe7EkIoHSe5KBj2lDmWUC6VILhQ8tLklR/bh6TgSgW1x R47OfHxoyliq4UBhQ1xQndkW6PuxQeOnyWoIAvJq74W0erw+FfxwAE9Ltfh2Y+gPh4f2 T0bJZ99AJqGHRgag/qYhi+Z8GDvDfjkKr6mDndTNihUhGCqRfy/VKXLt4/XB5Zp/ow/o R3dVLujlvSQuAClb0ATMzHQelyA6U3OaEhBsqSCcfsqnrCrl60fD8WgrR8JXmUJEvrfm /usQ== 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=VaLByEs82Ao1KNCMkrUl62SEqEPZtHJi7YM0u2Ze4p4=; b=X/c8lwb+i8S2lSmA/G8Xy74crkVW3cX854nqvUOgRO9aPtKn3SBqFifo55gOywq0ei y8f7axUJYC7OOR/KT5JBnwwAwtMzhWPHusknH0NcPazL2HtI6kFTzssr7XktupsKlvsl KUOCAm8QPP2m36tgYtJXRpNhydpq2DPElct/+TSVZk4VRiDe+dcMnrA1e/2ikTF/dW+2 McyxTzodbyWfyD/hkdvUV0m2RU5uCkkOwEkm9mKsIgFdUg1BaAcQQs6IxWZ+pkJGXUnt 1UEQB2+/JbxmpW1a3pOd+q4pHLuBHb26nedwsgBBC9zqVA0nGFVRvLsmdcxnYC4w3iZD ANBw== X-Gm-Message-State: AOAM530teBYZ/u+f10bhuItsTo5zAp666fHYV16ims7xmB5/ivYYniIW r38eU546FglLhHIum+0BuUDAwE9m9aq2d8Oc X-Google-Smtp-Source: ABdhPJyx4EkFsqRYd4E8nog2pehTtgdDRaKTaXxJr1Bj4zIJfuTKoxxv7kYbCwxaRYNRoZJtSwwrMw== X-Received: by 2002:a1c:3986:: with SMTP id g128mr6331340wma.160.1603882583227; Wed, 28 Oct 2020 03:56:23 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e13sm6496918wrt.57.2020.10.28.03.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:56:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Lukasz Wojciechowski Cc: David Hunt , dpdk stable Date: Wed, 28 Oct 2020 10:45:52 +0000 Message-Id: <20201028104606.3504127-193-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 scalar matching' 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 66839753bb9c0fc3400b56b1381d566326fa4f2e Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Sat, 17 Oct 2020 05:06:56 +0200 Subject: [PATCH] distributor: fix scalar matching [ upstream commit 626ceefbf4e1786ded4fed6a4987e3f1d370e9c0 ] Fix improper indexes while comparing tags. In the find_match_scalar() function: * j iterates over flow tags of following packets; * w iterates over backlog or in flight tags positions. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") Signed-off-by: Lukasz Wojciechowski Acked-by: David Hunt --- lib/librte_distributor/rte_distributor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 6e3eae58f8..9fea3f69ab 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -259,13 +259,13 @@ find_match_scalar(struct rte_distributor *d, for (j = 0; j < RTE_DIST_BURST_SIZE ; j++) for (w = 0; w < RTE_DIST_BURST_SIZE; w++) - if (d->in_flight_tags[i][j] == data_ptr[w]) { + if (d->in_flight_tags[i][w] == data_ptr[j]) { output_ptr[j] = i+1; break; } for (j = 0; j < RTE_DIST_BURST_SIZE; j++) for (w = 0; w < RTE_DIST_BURST_SIZE; w++) - if (bl->tags[j] == data_ptr[w]) { + if (bl->tags[w] == data_ptr[j]) { output_ptr[j] = i+1; break; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.683206866 +0000 +++ 0193-distributor-fix-scalar-matching.patch 2020-10-28 10:35:11.800834381 +0000 @@ -1,15 +1,16 @@ -From 626ceefbf4e1786ded4fed6a4987e3f1d370e9c0 Mon Sep 17 00:00:00 2001 +From 66839753bb9c0fc3400b56b1381d566326fa4f2e Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Sat, 17 Oct 2020 05:06:56 +0200 Subject: [PATCH] distributor: fix scalar matching +[ upstream commit 626ceefbf4e1786ded4fed6a4987e3f1d370e9c0 ] + Fix improper indexes while comparing tags. In the find_match_scalar() function: * j iterates over flow tags of following packets; * w iterates over backlog or in flight tags positions. Fixes: 775003ad2f96 ("distributor: add new burst-capable library") -Cc: stable@dpdk.org Signed-off-by: Lukasz Wojciechowski Acked-by: David Hunt