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 04577A0093 for ; Tue, 19 May 2020 15:15:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EF4B21D702; Tue, 19 May 2020 15:15:43 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 080811D702 for ; Tue, 19 May 2020 15:15:42 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id l18so15874078wrn.6 for ; Tue, 19 May 2020 06:15:42 -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=fzBTTBsYb+Xgx9g/FlYXMrOBLhhhFYH6v+N98UrYHxI=; b=BiOI5xuPj8StCQD260t8HbsITL6eKJRsQL3IPXnhN14GR3JRPczdbtXgdF42C8JuDq +j/uXk+Nd6ePp+Y8V6o1uOEWilFFn3TKbRkXN8ZSasCXNxJcyEwBMjpf9b6vMzBvvsqs Ds/W3lmyOWpc5NRkHmtwpioLP9RlwctfoVk3Da459LP3HZhiZfSH2LFjVlslPRXSW1mZ PP53MIcocddnFYioYFgWBgYKn21scWlFBuOf61uRnQ91RTHVBTRJM/zJam13Jk1XA+bx NUK1bvyv3QCIFJO6jPjGysPsmqWqojLAo+fRVx0/L/ctqZE9Q6FzCiu4/xCnwflPd+nl Ke8A== 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=fzBTTBsYb+Xgx9g/FlYXMrOBLhhhFYH6v+N98UrYHxI=; b=axEEDzeptTcMnBQh2hQHKhiQXcmXFDpcVBHVlrmFfxhFjEnvdZ2wtGkqc5d0jqcAkt Lz/7diwoAZVSITSzvO7B4xStmx7N6ccZo5+VuQW1ozZyV4zWiypILNXvvtWYuAJvnU/+ lJDNDbFHFev6/0EsnIBJ60m+NXbEKXg+lwqLe6sBb52T6T7jxaxsBSOGHeBahmV/6CUX ZM6cew1nGZqbmk7ilxNjk2BDcYdnH+a24axcEb1MEaEk5Wnnbgmp5qejapnahA16soiN AiPzJSKkKTQPPMPmcmX+V5vh7JiJjux6hs/GFVe95ErNsChDM7J8tcMsYvmVAW7Zq/wb AGGw== X-Gm-Message-State: AOAM532J7dw4BMt1oxGFJPRCJ/yZxWeDUZ+f3NFSgN6awU2Hux/tpGTZ Ndy6BB7YVhUngAaurZpMEo4= X-Google-Smtp-Source: ABdhPJy/1L7STnNOO3IByLx73b2Nq4dZjSmuJX8A0jt7PzrN+sJAWDY3IczBhetUl64API4fVDxsDQ== X-Received: by 2002:a5d:5642:: with SMTP id j2mr25551789wrw.52.1589894141764; Tue, 19 May 2020 06:15:41 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u16sm20415350wrq.17.2020.05.19.06.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Date: Tue, 19 May 2020 14:05:21 +0100 Message-Id: <20200519130549.112823-186-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: do not configure RSS if disabled' has been queued to stable release 19.11.3 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.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 05/21/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 1a476dbabdb73561a338fad7b508b2ad825f886a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 30 Apr 2020 12:08:53 -0700 Subject: [PATCH] net/netvsc: do not configure RSS if disabled [ upstream commit c6611b77d0613b6dddc0c207f19e6f5574e13d8e ] This fixes the problem where driver would not start if only have a single Rx queue and multiple Txq. In that case, RSS should stay disabled. Fixes: 92d23a57cafe ("net/netvsc: support configuring RSS parameters") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_ethdev.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 15a085c849..6950682a94 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -376,14 +376,15 @@ static int hn_rss_hash_update(struct rte_eth_dev *dev, hn_rss_hash_init(hv, rss_conf); - err = hn_rndis_conf_rss(hv, 0); - if (err) { - PMD_DRV_LOG(NOTICE, - "rss reconfig failed (RSS disabled)"); - return err; + if (rss_conf->rss_hf != 0) { + err = hn_rndis_conf_rss(hv, 0); + if (err) { + PMD_DRV_LOG(NOTICE, + "rss reconfig failed (RSS disabled)"); + return err; + } } - return hn_vf_rss_hash_update(dev, rss_conf); } @@ -595,11 +596,13 @@ static int hn_dev_configure(struct rte_eth_dev *dev) return err; } - err = hn_rndis_conf_rss(hv, 0); - if (err) { - PMD_DRV_LOG(NOTICE, - "initial RSS config failed"); - return err; + if (rss_conf->rss_hf != 0) { + err = hn_rndis_conf_rss(hv, 0); + if (err) { + PMD_DRV_LOG(NOTICE, + "initial RSS config failed"); + return err; + } } } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.140828329 +0100 +++ 0186-net-netvsc-do-not-configure-RSS-if-disabled.patch 2020-05-19 14:04:44.536654173 +0100 @@ -1,14 +1,15 @@ -From c6611b77d0613b6dddc0c207f19e6f5574e13d8e Mon Sep 17 00:00:00 2001 +From 1a476dbabdb73561a338fad7b508b2ad825f886a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 30 Apr 2020 12:08:53 -0700 Subject: [PATCH] net/netvsc: do not configure RSS if disabled +[ upstream commit c6611b77d0613b6dddc0c207f19e6f5574e13d8e ] + This fixes the problem where driver would not start if only have a single Rx queue and multiple Txq. In that case, RSS should stay disabled. Fixes: 92d23a57cafe ("net/netvsc: support configuring RSS parameters") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- @@ -16,7 +17,7 @@ 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c -index 60102362e1..55b8a63804 100644 +index 15a085c849..6950682a94 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -376,14 +376,15 @@ static int hn_rss_hash_update(struct rte_eth_dev *dev,