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 51CF2A0351 for ; Thu, 6 Aug 2020 11:58:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4B11D1C125; Thu, 6 Aug 2020 11:58:52 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id AD0911C115 for ; Thu, 6 Aug 2020 11:58:50 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id 88so43356983wrh.3 for ; Thu, 06 Aug 2020 02:58:50 -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=9Lyq8nhJTA+2X2q6nKRDytWYm7Yzinnjd/CS3VH6rEY=; b=H683BuYO37sYrESEMOdby/OgcX0hRA8PpMUa1bPXt9HKKzZDwP45N4H423vEKCkGcA hoAC1j45oPZy4d+gZTMGs9lrLn5mlG0uNwsLJIvK6EDTuqbcUir5GqC5nCWGedRQ4nvl 17HRZGwAwJIyjdKIgQLv62G+uecdXVZra5Ai2yqp6mihwPlcyQcur5XhAUm5OoCBBbXj XgI/OauqK8DQY4xcGTInhAN36pNBLNAZHmZBAJawKU+rEdyxeK7qgDD8GZlnt0QLmRRB pZO6TAaqw1n334MVVV0SG1S8F6s9poKF6hnZOsA8q9f5rJmp/aqUXTfJMoWzlCUR17mp RpIA== 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=9Lyq8nhJTA+2X2q6nKRDytWYm7Yzinnjd/CS3VH6rEY=; b=sA77K58gdMw/4gCihGmY2q+TXLu0/uiq11rUGy19ovyMwVwz1vug+wu0f/fGu17j8s wOp76ra0li+2HjKnxZgoxTnW2whtfRoWEYzh0nYmnO/Rjd5pvVg23bugPlmzYYyE0BwQ rlbsSulEt9f/Wis4Ume776KSRtjzjWrpFd751oG3ltAtD7063Dm1hqxlCtSDdpPk2TUW 8UhVK97ccW8rhf3JhFh0rVS6gvQGu4NG8aAAZEYvEU82oD0Pl8+0CcbYZiNEzTJnpln9 RnjYVVAuou6q6fhBOErff0FwMmWEuCTF4l+J0ilsR20Soy78v5/hQcAtBo5i23YQK2vY /Kug== X-Gm-Message-State: AOAM531q8li6Fr5uElrANT76OA6c7WhOj7WY9dUh5b5Tn/ZS6PFtUwoe c+uMaa7hz6h6qpA7HvKL+bg= X-Google-Smtp-Source: ABdhPJzmQocn+/ZIQI4NE6aB7wx6urIiOK1C2i+MgSoPAR6mhdmERjYH4FVlCe7fek8Ib8/0v64gAA== X-Received: by 2002:a05:6000:11c1:: with SMTP id i1mr7004927wrx.277.1596707930441; Thu, 06 Aug 2020 02:58:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l18sm6005217wrm.52.2020.08.06.02.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Nannan Lu , Jeff Guo , dpdk stable Date: Thu, 6 Aug 2020 10:53:53 +0100 Message-Id: <20200806095411.774624-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix RSS interference' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/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 3e9a631e2fbb65ff274e26e3c50acd4fad49003b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Sat, 25 Jul 2020 20:14:24 +0800 Subject: [PATCH] net/ice/base: fix RSS interference [ upstream commit 58f58cfe709cf167f9684e814cdbc8ab7535a798 ] A new symmetric RSS rule may force another asymmetric rule to be symmetric, vice versa. The reason is due to the flow engine will try to reuse the existing profile if the input set matches with the new rule. The fix is to disable this optimization for RSS since we are not at the situation as profile shortage. Fixes: ddae0440353f ("net/ice/base: enable symmetric hash for RSS") Signed-off-by: Qi Zhang Tested-by: Nannan Lu Acked-by: Jeff Guo --- drivers/net/ice/base/ice_flex_pipe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index 47adfd07a..bf5a25d15 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -2683,6 +2683,12 @@ ice_find_prof_id_with_mask(struct ice_hw *hw, enum ice_block blk, struct ice_es *es = &hw->blk[blk].es; u16 i; + /* For FD and RSS, we don't want to re-use an existed profile with the + * same field vector and mask. This will cause rule interference. + */ + if (blk == ICE_BLK_FD || blk == ICE_BLK_RSS) + return ICE_ERR_DOES_NOT_EXIST; + for (i = 0; i < es->count; i++) { u16 off = i * es->fvw; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.787685188 +0100 +++ 0025-net-ice-base-fix-RSS-interference.patch 2020-08-06 10:53:15.812597639 +0100 @@ -1,8 +1,10 @@ -From 58f58cfe709cf167f9684e814cdbc8ab7535a798 Mon Sep 17 00:00:00 2001 +From 3e9a631e2fbb65ff274e26e3c50acd4fad49003b Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Sat, 25 Jul 2020 20:14:24 +0800 Subject: [PATCH] net/ice/base: fix RSS interference +[ upstream commit 58f58cfe709cf167f9684e814cdbc8ab7535a798 ] + A new symmetric RSS rule may force another asymmetric rule to be symmetric, vice versa. The reason is due to the flow engine will try to reuse the existing profile if the input set matches with the @@ -10,33 +12,31 @@ are not at the situation as profile shortage. Fixes: ddae0440353f ("net/ice/base: enable symmetric hash for RSS") -Cc: stable@dpdk.org Signed-off-by: Qi Zhang Tested-by: Nannan Lu Acked-by: Jeff Guo --- - drivers/net/ice/base/ice_flex_pipe.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + drivers/net/ice/base/ice_flex_pipe.c | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c -index 284569464..999ad6be3 100644 +index 47adfd07a..bf5a25d15 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c -@@ -2808,10 +2808,10 @@ ice_find_prof_id_with_mask(struct ice_hw *hw, enum ice_block blk, +@@ -2683,6 +2683,12 @@ ice_find_prof_id_with_mask(struct ice_hw *hw, enum ice_block blk, struct ice_es *es = &hw->blk[blk].es; - u8 i; + u16 i; -- /* For FD, we don't want to re-use an existed profile with the same -- * field vector and mask. This will cause rule interference. + /* For FD and RSS, we don't want to re-use an existed profile with the + * same field vector and mask. This will cause rule interference. - */ -- if (blk == ICE_BLK_FD) ++ */ + if (blk == ICE_BLK_FD || blk == ICE_BLK_RSS) - return ICE_ERR_DOES_NOT_EXIST; ++ return ICE_ERR_DOES_NOT_EXIST; ++ + for (i = 0; i < es->count; i++) { + u16 off = i * es->fvw; - for (i = 0; i < (u8)es->count; i++) { -- 2.20.1