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 E0101A0518 for ; Fri, 24 Jul 2020 14:09:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D87531C039; Fri, 24 Jul 2020 14:09:55 +0200 (CEST) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by dpdk.org (Postfix) with ESMTP id 057271C039 for ; Fri, 24 Jul 2020 14:09:54 +0200 (CEST) Received: by mail-wm1-f44.google.com with SMTP id x5so7193645wmi.2 for ; Fri, 24 Jul 2020 05:09:54 -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=5dI1MyyfdfVyO2ieeoUJBLRAw5XJ3VLJhg1KC5QgmSE=; b=ExRKN5N7gmYXXgSkyjGYeEWpXe257Z6AinckXRlgRDuc9v5QmhiZSH6U5ebUbttPbt hB7cEyyhWLVMVkwW5Pa79ZSebIPD013kCQdikMqVH3Q6fLwAw6JswBZbY/pGX5NcwTde vq7jIHam5QkK0E+qmX0lAuAxztQJY4Yezx0yIZf3vJfI1hOwcse/TQJq8DwhI/N/8JIA krWewfh8Gmdm+h+LcWj9bNkR+h8cmHsTKNKFGIpx3z8fJcKDfy0RGxmWdzmfCIphMduV NDtnfc/IEk2uiNwjALdgMsS5PmEt57etnG/QX8lwsKmD5fEDZumhQsFma6vpf5f4W3eT f6Pw== 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=5dI1MyyfdfVyO2ieeoUJBLRAw5XJ3VLJhg1KC5QgmSE=; b=KFzh8MDY3l0vPEEEcLMYQXY9vCOoIGxMDsZqEbv3Jg5yD+QCCJF46kAoryAKF4JjXP QQ/uELTp45EakL4XM+pCTqGiGl4YbgrHCWXa3q8LrNOERwTzvyT9IXJfiTQChJ2iymZO WqwMnDFpfO0pWlxgi1hureRNOP+jOC1GrKys8Q7QJSr1y2eBxOV/vT+RHZBxTuCSqeFh iLZTMYx0QKCRJsDUCdvKPWHOZeKfJ6yAtLcZo/AGu5W1ezdNDA1zPFlvHt0w1dPik+LM tE8Lw+cR1Z83PBr2o669nzng2FaS8T9BOET9X2S4/aFtYjQWUkvcBf2j2OpZh9cX7TV0 3KCg== X-Gm-Message-State: AOAM532meJgHMKFLUhkwa8n/IABi5wpzQLn7GaFPppBIJu6FzPgquWlp Xh1ui3q2W7O8pwVrHxnkI34= X-Google-Smtp-Source: ABdhPJyKob4n2nqMRVXBh4YZmwADbuzp6TVX/Te40X+ids63r5LAiYor0FDiwhgFjdTusVod7ZUX7A== X-Received: by 2002:a05:600c:2058:: with SMTP id p24mr8476880wmg.74.1595592594732; Fri, 24 Jul 2020 05:09:54 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m128sm6849346wmf.37.2020.07.24.05.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Heinrich Kuhn Cc: Simon Horman , dpdk stable Date: Fri, 24 Jul 2020 12:59:39 +0100 Message-Id: <20200724120030.1863487-141-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' 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 07/26/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 74b620c90cb5b57e4b504a22f1f91c26f2c0eda2 Mon Sep 17 00:00:00 2001 From: Heinrich Kuhn Date: Fri, 10 Jul 2020 16:28:46 +0200 Subject: [PATCH] net/nfp: fix RSS hash configuration reporting [ upstream commit 198e745083b960d167bd769e2f81818c835f68b8 ] Prior to this fix the NFP PMD implementation of the .rss_hash_conf_get callback did not propagate the current hardware state of rss_hf back up to the caller. Users of the hash_conf_get callback would receive an incorrect representation of what the RSS configuration currently is in hardware. Fixes: 934e4c60fbff ("nfp: add RSS") Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/nfp_net.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index a670be949..082aa4682 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2621,6 +2621,9 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev, if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6) rss_hf |= ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_NONFRAG_IPV6_UDP; + /* Propagate current RSS hash functions to caller */ + rss_conf->rss_hf = rss_hf; + /* Reading the key size */ rss_conf->rss_key_len = nn_cfg_readl(hw, NFP_NET_CFG_RSS_KEY_SZ); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.998056889 +0100 +++ 0141-net-nfp-fix-RSS-hash-configuration-reporting.patch 2020-07-24 12:53:48.479010037 +0100 @@ -1,8 +1,10 @@ -From 198e745083b960d167bd769e2f81818c835f68b8 Mon Sep 17 00:00:00 2001 +From 74b620c90cb5b57e4b504a22f1f91c26f2c0eda2 Mon Sep 17 00:00:00 2001 From: Heinrich Kuhn Date: Fri, 10 Jul 2020 16:28:46 +0200 Subject: [PATCH] net/nfp: fix RSS hash configuration reporting +[ upstream commit 198e745083b960d167bd769e2f81818c835f68b8 ] + Prior to this fix the NFP PMD implementation of the .rss_hash_conf_get callback did not propagate the current hardware state of rss_hf back up to the caller. Users of the hash_conf_get callback would receive an @@ -10,7 +12,6 @@ hardware. Fixes: 934e4c60fbff ("nfp: add RSS") -Cc: stable@dpdk.org Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman @@ -19,7 +20,7 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c -index 474719b79..99946279d 100644 +index a670be949..082aa4682 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2621,6 +2621,9 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,