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 E8F4D41D4F for ; Thu, 23 Feb 2023 10:39:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4DE443152; Thu, 23 Feb 2023 10:39:34 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 96551427E9 for ; Thu, 23 Feb 2023 10:39:33 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id az11-20020a05600c600b00b003dc4fd6e61dso9501823wmb.5 for ; Thu, 23 Feb 2023 01:39:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vo1umsNvE3R+YZeBNZyCLoWsrtuVBNkb8sbh7fVSLcw=; b=A4aSFx7x6KuWtp3yQO7/V11KXR6jhKRqvlFdXqZtPPfL0mNmbHAcrseU4WnijlL4/x uMokwb/RKR36Hecltt8gRL9QGja95kKhvTPaivU/01j51mS4tFmQHBAvJ+LMnXDHvJHP uyTQgJikOQO2Q6+yeegh2e3zDN5fkQvSm/dnp/q8NUUAuDQmfpnp7cBnETnjSRgoWtDr XlKyWCccYmokAyAMYBnxpsLR4wy4cjgaGyiEH961s4LhzKOtNya2ikhZcvySBbxwHwC5 vXRIBR5pjx5MKFCU150zcySvVEfNQi1YxOprSPP7f6E4G12wNMuz5Nn/5OokqIQpltw/ E8lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vo1umsNvE3R+YZeBNZyCLoWsrtuVBNkb8sbh7fVSLcw=; b=7ncPlyBOhG/EL75xjzUixsOIYPhvITKrm8l8t/48vffVH3BgpZ3Ki2E3GXmP7o+hY4 3QG9oXwKfBhkTvuyB1hpnh5i4a3cCuPIqQbmJ7moXDegl8SkFCsbVBpypcUILPYnPkI2 M3Rpec6OLL4CzbvyqjzMSlDwV1t9ixz7ML69V5ZybYwDCUqcg7F3i2BuekhTGzKXAgEn yA3ksz9ueusK8IZ+h+ogVIreX7oJpJjzKhScbwFGaej9bB58zlp5YoTlWTCxNDow3pxD 7+L9l8rWwr5Zy6Er1L13T0KAKyklt7HILn09bxYPVhnTx73ax5BoXozlT4ATaEvqzlDU ckpg== X-Gm-Message-State: AO0yUKU4Q75VULTsC9OddSZ5E6gpzqG33ucNdwHAIeNna9g26+Ols1de nuFUdf81Y1ed9mBpyR8YBar3Rq9FGLcMjg== X-Google-Smtp-Source: AK7set8G0w3YTxVNqPSEqIUQe/AdbZP0VzfNyuA8VuxZTFIlBSuDQRm5VRGrRhazEsjEeCHb1bKieA== X-Received: by 2002:a05:600c:130f:b0:3df:57aa:db52 with SMTP id j15-20020a05600c130f00b003df57aadb52mr8565561wmf.4.1677145173359; Thu, 23 Feb 2023 01:39:33 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id h13-20020a05600c314d00b003e2059c7978sm10912021wmo.36.2023.02.23.01.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:39:33 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix warning on flush or destroy rule' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:49 +0000 Message-Id: <20230223093715.3926893-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. 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/08e0d5d703e00d9e0205f14a04dc91a94cb06f3d Thanks. Luca Boccassi --- >From 08e0d5d703e00d9e0205f14a04dc91a94cb06f3d Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 31 Jan 2023 21:02:58 +0800 Subject: [PATCH] net/hns3: fix warning on flush or destroy rule [ upstream commit a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd ] Although flow rules will no longer be used when user flush all rules or destroy a rule a warning is generated like: "modified RSS types based on hardware support, requested:0x137f83fffc configured:0x3ffc". Prevent warning for flush or destroy rule case. Fixes: ec674cb742e5 ("net/hns3: fix flushing RSS rule") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index f6de004fbc..0b4add5e80 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1505,17 +1505,6 @@ hns3_config_rss_filter(struct hns3_hw *hw, .queue = conf->conf.queue, }; - /* Filter the unsupported flow types */ - flow_types = conf->conf.types ? - rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT : - hw->rss_info.conf.types; - if (flow_types != rss_flow_conf.types) - hns3_warn(hw, "modified RSS types based on hardware support, " - "requested:0x%" PRIx64 " configured:0x%" PRIx64, - rss_flow_conf.types, flow_types); - /* Update the useful flow types */ - rss_flow_conf.types = flow_types; - if (!add) { if (!conf->valid) return 0; @@ -1541,6 +1530,17 @@ hns3_config_rss_filter(struct hns3_hw *hw, return ret; } + /* Filter the unsupported flow types */ + flow_types = conf->conf.types ? + rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT : + hw->rss_info.conf.types; + if (flow_types != rss_flow_conf.types) + hns3_warn(hw, "modified RSS types based on hardware support," + " requested:0x%" PRIx64 " configured:0x%" PRIx64, + rss_flow_conf.types, flow_types); + /* Update the useful flow types */ + rss_flow_conf.types = flow_types; + /* Set hash algorithm and flow types by the user's config */ return hns3_hw_rss_hash_set(hw, &rss_flow_conf); } -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:30.031260796 +0000 +++ 0045-net-hns3-fix-warning-on-flush-or-destroy-rule.patch 2023-02-23 09:36:28.274170824 +0000 @@ -1 +1 @@ -From a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd Mon Sep 17 00:00:00 2001 +From 08e0d5d703e00d9e0205f14a04dc91a94cb06f3d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a7bf2789168c8d49ca4dec5bb7bb0b3f765fc1bd ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3809fcc2d7..632247b846 100644 +index f6de004fbc..0b4add5e80 100644 @@ -26 +27 @@ -@@ -1537,17 +1537,6 @@ hns3_config_rss_filter(struct hns3_hw *hw, +@@ -1505,17 +1505,6 @@ hns3_config_rss_filter(struct hns3_hw *hw, @@ -44 +45 @@ -@@ -1573,6 +1562,17 @@ hns3_config_rss_filter(struct hns3_hw *hw, +@@ -1541,6 +1530,17 @@ hns3_config_rss_filter(struct hns3_hw *hw,