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 A6B0D41D52 for ; Thu, 23 Feb 2023 16:08:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7AD543291; Thu, 23 Feb 2023 16:08:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0132F4327B for ; Thu, 23 Feb 2023 16:08:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7ao6P2wwWpsPgzd/hd2TuQlYarvTxgWtsUFKtuF8gwU=; b=BZ2jZZBvj2hr3FKZToB7XGHXEz428Y9TQz4IdrZD8h8YukTetC0458MQiMfTxtEfI8xAYK o6LHcQ91K/DAw72RHkPQDgTHXaJf80I1pHxyG3zpH1/wNvhkej84kdYOdD7gG2tJJY/TEb bhkEUlxiAndcYz55+3nfo+pr+cEe4fQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-529-nKoC2bshOCytLnTa1emR6w-1; Thu, 23 Feb 2023 10:08:04 -0500 X-MC-Unique: nKoC2bshOCytLnTa1emR6w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A88E857AA2; Thu, 23 Feb 2023 15:07:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id A83902166B2C; Thu, 23 Feb 2023 15:07:55 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix log about indirection table size' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:47 +0000 Message-Id: <20230223150631.723699-56-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 02/28/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/81cb3c29c8b00b5275fc70a19b143acbcab4445e Thanks. Kevin --- >From 81cb3c29c8b00b5275fc70a19b143acbcab4445e 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 edeb83bbbc..ca59c42f4a 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2697,7 +2697,6 @@ 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 063633e5ed..87d094a6b4 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -719,7 +719,6 @@ 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 14:46:25.163665642 +0000 +++ 0056-net-hns3-fix-log-about-indirection-table-size.patch 2023-02-23 14:46:23.795236053 +0000 @@ -1 +1 @@ -From b55516a94246364f272db802f5dfb9aeb8d3a2f2 Mon Sep 17 00:00:00 2001 +From 81cb3c29c8b00b5275fc70a19b143acbcab4445e 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 edeb83bbbc..ca59c42f4a 100644 @@ -25 +26 @@ -@@ -2680,5 +2680,5 @@ hns3_check_dev_specifications(struct hns3_hw *hw) +@@ -2697,7 +2697,6 @@ hns3_check_dev_specifications(struct hns3_hw *hw) @@ -28 +29,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); @@ -30 +33 @@ - hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); ++ hw->rss_ind_tbl_size, HNS3_RSS_IND_TBL_SIZE_MAX); @@ -31,0 +35 @@ + } @@ -33 +37 @@ -index d220522c43..e43815607a 100644 +index 063633e5ed..87d094a6b4 100644 @@ -36 +40 @@ -@@ -719,6 +719,6 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw) +@@ -719,7 +719,6 @@ hns3vf_check_dev_specifications(struct hns3_hw *hw) @@ -39,2 +43,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);