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 64F1F45DB9 for ; Wed, 27 Nov 2024 18:22:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5EA69406B8; Wed, 27 Nov 2024 18:22:55 +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 2A0F54066C for ; Wed, 27 Nov 2024 18:22:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728173; 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=PbVvLKL47s1bgQX/GihnwrQbz74XImFbk+rGso6QkYw=; b=JeOzN11mWJI8YGSQlNL6toNWtK7ZgY5tkcFLQr3tGLD9A/Q0El84nzwn13xQyAv7cYXyRA w5H5iTCBUJ8i+B6ApN+UlbjNo6SrEbOeA91g4aWvMAhayckhUtpLH4rOzHCnZ6rs5z9NJl bt01libZw6oJybBYyOYqGPxHVMVSZCE= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-fG-hcBduO8GmvrL0PQZwYw-1; Wed, 27 Nov 2024 12:22:48 -0500 X-MC-Unique: fG-hcBduO8GmvrL0PQZwYw-1 X-Mimecast-MFC-AGG-ID: fG-hcBduO8GmvrL0PQZwYw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0EFCA1955EE9; Wed, 27 Nov 2024 17:22:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2FE20300019E; Wed, 27 Nov 2024 17:22:43 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Jie Hai , Stephen Hemminger , dpdk stable Subject: patch 'net/hns3: fix error code for repeatedly create counter' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:41 +0000 Message-ID: <20241127171916.690404-94-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hDXLScjJP06w9nHm6Y6XeAUfRS0lPmjLDVGSzuFNrDc_1732728166 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/fb85e0d80aabb18dd6e4bb4096d9e669a4988673 Thanks. Kevin --- >From fb85e0d80aabb18dd6e4bb4096d9e669a4988673 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Thu, 7 Nov 2024 19:56:44 +0800 Subject: [PATCH] net/hns3: fix error code for repeatedly create counter [ upstream commit 585f1f68f18c7acbc4f920053cbf4ba888e0c271 ] Return EINVAL instead of ENOSPC when the same counter ID is used for multiple times to create a counter. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai Acked-by: Stephen Hemminger --- drivers/net/hns3/hns3_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 4d0d17f991..067319e69f 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -284,5 +284,5 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id, if (cnt) { if (!cnt->shared || cnt->shared != shared) - return rte_flow_error_set(error, ENOTSUP, + return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, cnt, -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.218818905 +0000 +++ 0094-net-hns3-fix-error-code-for-repeatedly-create-counte.patch 2024-11-27 17:17:38.303269777 +0000 @@ -1 +1 @@ -From 585f1f68f18c7acbc4f920053cbf4ba888e0c271 Mon Sep 17 00:00:00 2001 +From fb85e0d80aabb18dd6e4bb4096d9e669a4988673 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 585f1f68f18c7acbc4f920053cbf4ba888e0c271 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 192ffc015e..266934b45b 100644 +index 4d0d17f991..067319e69f 100644 @@ -23 +24 @@ -@@ -287,5 +287,5 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id, +@@ -284,5 +284,5 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id, @@ -25 +26 @@ - if (!cnt->indirect || cnt->indirect != indirect) + if (!cnt->shared || cnt->shared != shared)