From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 95298A0C4C for ; Mon, 12 Jul 2021 15:16:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CA0840685; Mon, 12 Jul 2021 15:16:17 +0200 (CEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 0BF7740685 for ; Mon, 12 Jul 2021 15:16:16 +0200 (CEST) Received: by mail-wm1-f49.google.com with SMTP id g8-20020a1c9d080000b02901f13dd1672aso9774406wme.0 for ; Mon, 12 Jul 2021 06:16:16 -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=rytxuH9jRSp8bctEOtDveOYIzn6eXdHDaQMfBPuz1+Q=; b=uvU77M4byTSku+6gZWZwcf5tNKwGMFFXcg30xh5aAPhPY//4N7Fm8iXtdqSK1rttnk k7PVKe8d5rhhUR+8Y1Cw9a9kytTVrFU3MvNrS4tjiPOQunX3E4s9tG7/Q7P7bWroZje6 JHO2ZCXC7rk8HvfBHnvbgvqxWaJEFKLGkNQaS3/Qwi7suNLE6tLIp3bbdgrfF7FjDgak YZ1F9dhlikx7DJRvmP9rq34SSBLwJwUwE2L6y3psRc9fC5dbqog+Am6P3XN+SPokWK0R /BMUrWRENWoqqwm6QtxymHsrodlFdlHXdsTHKHS0pbioVm1muhlbBL0EDb9kFoGpSDel SZRw== 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=rytxuH9jRSp8bctEOtDveOYIzn6eXdHDaQMfBPuz1+Q=; b=U36YDkTJaXI4z+g6EZ0yMu+3sxvM4BSxlJo1+U0VYNg9mfY80u7aRxOkyElied2tRe O1yyLwT22jPgLHo1X2MurkN7dLK3knwu8aQXa26g17p6VOUhn7AIYXgnf6XOM3zV7XEf LZWYaBdATYVnK3JX630Mo9ytMEi0lbWqKbqURaUsC2kmwS8P4HjG4y9B7ZR59Oo3CqyA UTkxTPKDMqh2OukPiB9ZShBe3TN6ufg1ql0o6Y/7ZVMSkkiSe82PX5e0uqI0XBtAeDT5 axHfHkYDRcPYnhyqY9PZdxo8Yec3JWOHmY0VkdTWoh3nDSJhA0dUbA27kv2KQuo49ECF dspA== X-Gm-Message-State: AOAM531SoZoEO8c1oDFjXoYF0SYyhwECjkAPYwoUAjmUu8N5sBVEmhNb ZbIRFJWvkbbr+zu8I7oa4V8= X-Google-Smtp-Source: ABdhPJzGZV70rBwC7pNTZTSmbvffiluZNw2tlvZ+TylYUvDx+KQBs2PQ8rYfCzfXDfVkUGixvNmfXQ== X-Received: by 2002:a05:600c:1d1f:: with SMTP id l31mr2791714wms.26.1626095775777; Mon, 12 Jul 2021 06:16:15 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id b187sm7651689wmd.40.2021.07.12.06.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:16:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Thierry Herbelot Cc: Cristian Dumitrescu , dpdk stable Date: Mon, 12 Jul 2021 14:05:51 +0100 Message-Id: <20210712130551.2462159-116-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'table: fix bucket empty check' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ff85ab73c14ce6409ef53530f45ad6747d26d132 Thanks. Luca Boccassi --- >From ff85ab73c14ce6409ef53530f45ad6747d26d132 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Wed, 7 Jul 2021 13:19:05 +0200 Subject: [PATCH] table: fix bucket empty check [ upstream commit 3fc2ddffde95478b65d8b58df5210293e63c00ee ] Due to a typo, only 3 out of 4 keys in the bucket of the exact match table were considered, which can result in valid keys being incorrectly dropped from the table. Fixes: d0a00966618ba ("table: add exact match SWX table") Signed-off-by: Thierry Herbelot Acked-by: Cristian Dumitrescu --- lib/librte_table/rte_swx_table_em.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/librte_table/rte_swx_table_em.c index 788e25f6b9..03b28c4c9d 100644 --- a/lib/librte_table/rte_swx_table_em.c +++ b/lib/librte_table/rte_swx_table_em.c @@ -280,7 +280,7 @@ table_key_data(struct table *t, uint32_t key_id) static inline int bkt_is_empty(struct bucket_extension *bkt) { - return (!bkt->sig[0] && !bkt->sig[1] && !bkt->sig[2] && !bkt->sig[2]) ? + return (!bkt->sig[0] && !bkt->sig[1] && !bkt->sig[2] && !bkt->sig[3]) ? 1 : 0; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:42.604946488 +0100 +++ 0116-table-fix-bucket-empty-check.patch 2021-07-12 13:41:36.934131859 +0100 @@ -1 +1 @@ -From 3fc2ddffde95478b65d8b58df5210293e63c00ee Mon Sep 17 00:00:00 2001 +From ff85ab73c14ce6409ef53530f45ad6747d26d132 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3fc2ddffde95478b65d8b58df5210293e63c00ee ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/table/rte_swx_table_em.c | 2 +- + lib/librte_table/rte_swx_table_em.c | 2 +- @@ -19 +20 @@ -diff --git a/lib/table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c +diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/librte_table/rte_swx_table_em.c @@ -21,2 +22,2 @@ ---- a/lib/table/rte_swx_table_em.c -+++ b/lib/table/rte_swx_table_em.c +--- a/lib/librte_table/rte_swx_table_em.c ++++ b/lib/librte_table/rte_swx_table_em.c