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 5C63A41D4F for ; Thu, 23 Feb 2023 10:39:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54C9243179; Thu, 23 Feb 2023 10:39:18 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 0DEB643196 for ; Thu, 23 Feb 2023 10:39:17 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id l25so9737431wrb.3 for ; Thu, 23 Feb 2023 01:39:17 -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=b5v37UuhyPwG4eZoJapHaB0Hl1ZlSNH7e5jXVuM0668=; b=hTic8h4O1n1gFqlF5ae/6fVQ6VVAuMnCVbWG48jL98kdF9VwhanyZqFR17q1OAHqAw qjRIoBZJeLLHr+cmnS7+LLUc25Pi1DtxxF9WjUCz9Mnx0TYcdcWAlR9UV2d8rdFL+tyh 3tMKnNVFpF0zex7bZ+e9sdKx2VKG2XZlZOozQOM7BUmeJb38OCynDFmnLDdZNifHP8J8 pb70UV/QUwro/w+8PDT8XhsuX88V5NdbcBW2QD4o4KNtqvqw7BgkIzTIWgfq+GkHnAdS QT68mGiIfdL4tstZ/qYR+buu4sKh7teD+l1RogthYA4NdymnNxdVhFBis+6kh8hRZ8a2 Ju3g== 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=b5v37UuhyPwG4eZoJapHaB0Hl1ZlSNH7e5jXVuM0668=; b=vRNJorzKMWyCXiB4yoAOw6RUcd3TYpd63XSA1zn1fDBvTEDtOwVYMbdUOMFYcrCB3d yT/0B2Woj5qh05HB8PuBhS7JI4n6xqX3xwnqwI7qSyUzZRZNjyZnIWOlnouhZOMmGlXv kxn78BeUT3NMJxHu7YIaBvD7WDUIYOA/1rx9tktZL0bWQlm9eR+9AWmP6RWI+SHm3iZW E8vESVuShivH7bTCsmYEk1RzBOV8GeyQT3g0BV0Q9UH/zlwj4Yg0gSik60vpBA9Y9IGW kAG2I+7HLcZFe5agiQmqzNMO10nrlOzJaJOAjRdLWSQ286ooPmZdeZlbUvjf3MrJ96/5 ZrOg== X-Gm-Message-State: AO0yUKV0p72iG2UqmvWg4ua7+VP80czfuh2pjTRzEs5Q2Ak5rJVzUrKp M7YxbyjZt+dYbu4sbhJtT5cwivutrtsKrA== X-Google-Smtp-Source: AK7set+4zkeDmYhkYU6mTer8UxUmXDxMNImC5BxsrIjdx+GlQ7X08v/Sn+Z2Zw+hWuE7ppq2q4hb0Q== X-Received: by 2002:adf:ef47:0:b0:2c6:5a4e:ea23 with SMTP id c7-20020adfef47000000b002c65a4eea23mr10470413wrp.61.1677145156760; Thu, 23 Feb 2023 01:39:16 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id l3-20020a1ced03000000b003dd1bd66e0dsm8171197wmh.3.2023.02.23.01.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:39:16 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix log about indirection table size' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:43 +0000 Message-Id: <20230223093715.3926893-39-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/5d42c551fc2010c7cb55ef9cbcc27ab474647289 Thanks. Luca Boccassi --- >From 5d42c551fc2010c7cb55ef9cbcc27ab474647289 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 31 Jan 2023 21:02:51 +0800 Subject: [PATCH] net/hns3: fix log about indirection table size [ upstream commit b55516a94246364f272db802f5dfb9aeb8d3a2f2 ] The error log about indirection table size during initialization phase of PF and VF is unreasonable. In addition, VF driver should use error level to print this log. Fixes: 0fce2c46dc16 ("net/hns3: fix RSS indirection table size") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 5 ++--- drivers/net/hns3/hns3_ethdev_vf.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 08422474a5..4956290488 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -3040,9 +3040,8 @@ hns3_check_dev_specifications(struct hns3_hw *hw) { if (hw->rss_ind_tbl_size == 0 || hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) { - hns3_err(hw, "the size of hash lookup table configured (%u)" - " exceeds the maximum(%u)", hw->rss_ind_tbl_size, - HNS3_RSS_IND_TBL_SIZE_MAX); + hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)", + hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); return -EINVAL; } diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index f5bf5d1a29..8e6fe9bd54 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1163,9 +1163,8 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw) { if (hw->rss_ind_tbl_size == 0 || hw->rss_ind_tbl_size > HNS3_RSS_IND_TBL_SIZE_MAX) { - hns3_warn(hw, "the size of hash lookup table configured (%u)" - " exceeds the maximum(%u)", hw->rss_ind_tbl_size, - HNS3_RSS_IND_TBL_SIZE_MAX); + hns3_err(hw, "the indirection table size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)", + hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); return -EINVAL; } -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:29.800696934 +0000 +++ 0039-net-hns3-fix-log-about-indirection-table-size.patch 2023-02-23 09:36:28.258170529 +0000 @@ -1 +1 @@ -From b55516a94246364f272db802f5dfb9aeb8d3a2f2 Mon Sep 17 00:00:00 2001 +From 5d42c551fc2010c7cb55ef9cbcc27ab474647289 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b55516a94246364f272db802f5dfb9aeb8d3a2f2 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,3 +18,3 @@ - drivers/net/hns3/hns3_ethdev.c | 2 +- - drivers/net/hns3/hns3_ethdev_vf.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + drivers/net/hns3/hns3_ethdev.c | 5 ++--- + drivers/net/hns3/hns3_ethdev_vf.c | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) @@ -22 +23 @@ -index d326f70129..eb809cd8c9 100644 +index 08422474a5..4956290488 100644 @@ -25 +26 @@ -@@ -2679,7 +2679,7 @@ hns3_check_dev_specifications(struct hns3_hw *hw) +@@ -3040,9 +3040,8 @@ hns3_check_dev_specifications(struct hns3_hw *hw) @@ -29 +30,3 @@ -- hns3_err(hw, "the size of hash lookup table configured (%u) exceeds the maximum(%u)", +- hns3_err(hw, "the size of hash lookup table configured (%u)" +- " exceeds the maximum(%u)", hw->rss_ind_tbl_size, +- HNS3_RSS_IND_TBL_SIZE_MAX); @@ -31 +34 @@ - hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); ++ hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); @@ -33,0 +37 @@ + @@ -35 +39 @@ -index d220522c43..e43815607a 100644 +index f5bf5d1a29..8e6fe9bd54 100644 @@ -38 +42 @@ -@@ -718,8 +718,8 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw) +@@ -1163,9 +1163,8 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw) @@ -42,2 +46,3 @@ -- hns3_warn(hw, "the size of hash lookup table configured (%u) exceeds the maximum(%u)", -- hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); +- hns3_warn(hw, "the size of hash lookup table configured (%u)" +- " exceeds the maximum(%u)", hw->rss_ind_tbl_size, +- HNS3_RSS_IND_TBL_SIZE_MAX);