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 E7D5FA04DD for ; Wed, 28 Oct 2020 11:51:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DED9F4C90; Wed, 28 Oct 2020 11:51:04 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by dpdk.org (Postfix) with ESMTP id DD96D4C90 for ; Wed, 28 Oct 2020 11:51:02 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id e2so4302272wme.1 for ; Wed, 28 Oct 2020 03:51:02 -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=MhAaSMAEmCwFC72PCA28aVuR/aH1GaWfVjJvB42kr48=; b=ISlWH9o4fCVp1b+W5/T9VTGcqF6ZblerXkIq+JmsWO16rE/oDpZZKDXQN08asGaJa8 luW8T/2HvgMe20P6WsI3lFCmiMQKXQlJ7X2H8wlGfi9G1OfArVsyxr3+LFc7/MA+BAV3 RYDDfd/A+3GrkLxKyIlpxprcZUFa6NqSxYk6WdpY25Q5uYTItjnrK9EeUuDAOFfktuRI 3DR48u3yn6JzjLmkV+3gsBxStn0TpEsbNo+3GKAjg0kNsre5KDSFg6eWosH4pokPyp24 KW57/uEN+/4Eobe5qiMYYV67IOIckWHIBbzpqMaiZsPGwxsKvb7xPvWcXU8X5bFLVQn/ ZkOw== 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=MhAaSMAEmCwFC72PCA28aVuR/aH1GaWfVjJvB42kr48=; b=nnRbSrhf5mFcIvYbDEkL6i+py71QfIVgt5e+Wr8bTllg1hFsyBrlyuEo1ovm6+5Ac9 60V4y8TqrfJpEKhYaS36zDo6y24qORgNW1McInW83gVqfVbFxx/vSX7UH6l2bAdGuZVJ 5+nFhJl9HkSpNFdOsSOVJVbFPFcfxAA24yDT7+NbrFWv+GBm3gDm7a8Y1uwIOGdtK13M q+VsRcgSqrbqWhVhQhT+1ghQn0Ms4in6Vyn3q1Qsb8DyPusEHsSNYN9bpeIxDwSqu82g f4WvU1PZNP7oPP3DCgHUoA9tpGKA3MPRjxNyr1LBqtU9dJTX+xJ/pcZEUwozP0ThGnjM h0Rw== X-Gm-Message-State: AOAM531k01bDfPGql6U6RzP+/x8HUV0zf3lOaQoCkfua5W1uvX+bWui1 FXcaKDdpYgNPyj4zyFKm8bdVTmj8rdb6lA3Z X-Google-Smtp-Source: ABdhPJxfco2+SZXCbdl4bikKmBhxQS2E3qRU+jRfNJElhDNCC6ZxQjYjLnt1b9Lss7pXTHuhuQnaCg== X-Received: by 2002:a1c:9cd8:: with SMTP id f207mr7286552wme.76.1603882262689; Wed, 28 Oct 2020 03:51:02 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e2sm4540167wrr.85.2020.10.28.03.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 28 Oct 2020 10:44:11 +0000 Message-Id: <20201028104606.3504127-92-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 'net/sfc: fix RSS hash flag when offload is disabled' 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 157419673a8421a8999c4a561ce1bc57ed5a5264 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Thu, 24 Sep 2020 13:40:58 +0100 Subject: [PATCH] net/sfc: fix RSS hash flag when offload is disabled [ upstream commit dbf9910c1b13ebb7ced661447ab7dd9d0f5728ce ] Do not set RSS hash flag in the received mbufs when RSS hash offload is not enabled, which means that RSS hash value is invalid. Fixes: 5d308972954c ("ethdev: add mbuf RSS update as an offload") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 61736196cc..3ecd8da8c9 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1155,7 +1155,8 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index, info.batch_max = encp->enc_rx_batch_max; info.prefix_size = encp->enc_rx_prefix_size; - if (rss->hash_support == EFX_RX_HASH_AVAILABLE && rss->channels > 0) + if (rss->hash_support == EFX_RX_HASH_AVAILABLE && rss->channels > 0 && + (offloads & DEV_RX_OFFLOAD_RSS_HASH)) info.flags |= SFC_RXQ_FLAG_RSS_HASH; info.rxq_entries = rxq_info->entries; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.641521895 +0000 +++ 0092-net-sfc-fix-RSS-hash-flag-when-offload-is-disabled.patch 2020-10-28 10:35:11.636831967 +0000 @@ -1,13 +1,14 @@ -From dbf9910c1b13ebb7ced661447ab7dd9d0f5728ce Mon Sep 17 00:00:00 2001 +From 157419673a8421a8999c4a561ce1bc57ed5a5264 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Thu, 24 Sep 2020 13:40:58 +0100 Subject: [PATCH] net/sfc: fix RSS hash flag when offload is disabled +[ upstream commit dbf9910c1b13ebb7ced661447ab7dd9d0f5728ce ] + Do not set RSS hash flag in the received mbufs when RSS hash offload is not enabled, which means that RSS hash value is invalid. Fixes: 5d308972954c ("ethdev: add mbuf RSS update as an offload") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko @@ -16,7 +17,7 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c -index a62ce4a17d..dccafb163a 100644 +index 61736196cc..3ecd8da8c9 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1155,7 +1155,8 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,