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 D7D2045C9B for ; Tue, 12 Nov 2024 23:10:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D34654064C; Tue, 12 Nov 2024 23:10:01 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 026F140B9D for ; Tue, 12 Nov 2024 23:10:00 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-37d473c4bb6so5706970f8f.3 for ; Tue, 12 Nov 2024 14:10:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449399; x=1732054199; darn=dpdk.org; 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=7z1TPYM6IznmhQsNi6gDy7CLQ4QMdINTv/EppsDCqdI=; b=KvHi8rTJU1WBo4C1B7rh4ZKULmTlqq1df2KpC1+2VEg3YaTXDtBJw95j1MYpRvt811 LZPrdh1a9OpFsGOp/sg9fxle1uKRUBCPX2hEwXope+zqANTQ1vOkM8OrLiKxgNKEw7jk hj3c1zvbAUTVH77QnZpl//Bq8wEjxVfezhVA8Uh+cSsBGLlJTsOly2B4wg8Dg6U2GY1r 3lKtlMU47YZFDMF4RG1eFlisROUbbk4W9hraE2MhWanBE5ebJuwjfqdK5WuVrldwKBgg qhjbBpW8TbBWL7XNM/XXHsZiSHKnwUVHmEi4qdHAJZd3bP18Thedxunf9bh6FxINNuFw KdGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449399; x=1732054199; 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=7z1TPYM6IznmhQsNi6gDy7CLQ4QMdINTv/EppsDCqdI=; b=m5U+ok7GCEDU84pFKemiiIovmmJWIKGLp6nC9vuG/6xDRXCOvpXPKWu7IDzawM2BBs +rQqYs0gF1wGIsLbMkmjF1vbTubX88Op9WgJ0Ic7n6IJ5tGbFpKPdC0QXsL2bcLSVnPW Eri75tun4TyT7n3ZXfcgVYk2ICfaaUKVNGPMN2EDpLWXNR8VByq0Rvcxvt5tLkajC8uM xKhqtfKiGDgdyEohbtlzz4vzhGuIJRCiQu4pbsEZe03WBozIwc+q6t2EHmmNcXOEkGiG MLc/XzLHFS/tbNmcuWds0rruMKKKaIR0vE8Uke9G44d7VT65Z+AeNN5cP6bVTeXja2M1 SLcA== X-Forwarded-Encrypted: i=1; AJvYcCWfSJiTSMwB0mhimUcK+u3ddi0eqHCfcLnn7htGR901yS2g4q9xuih1MEORBjzkeh16WGLlLOU=@dpdk.org X-Gm-Message-State: AOJu0YweG+vppicTBX4q0PzoVyoxquYD2DUNdnLilv2ad/E7n96LeMwm xF2YNe+t0oH+Dp1rU8+0CUvdRtf40J3PntggorGQDcInGmGfRMzt X-Google-Smtp-Source: AGHT+IHok4yV1mjyeMy9DM61TcO5JXTCR9fBFBZHXe9H9e4r6KleG2wjqE1ZfartPYnj/uEc92fBxg== X-Received: by 2002:a5d:5886:0:b0:37d:5130:b380 with SMTP id ffacd0b85a97d-381f186cbbemr16461869f8f.23.1731449399554; Tue, 12 Nov 2024 14:09:59 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381eda051c6sm16266114f8f.99.2024.11.12.14.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:09:59 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.7 Date: Tue, 12 Nov 2024 22:07:44 +0000 Message-ID: <20241112220754.666489-34-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0ea0a51821fea3f95782dd3ade82aafa7aeb86cf Thanks. Luca Boccassi --- >From 0ea0a51821fea3f95782dd3ade82aafa7aeb86cf 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 ec2000064c..9fbdf1dbe9 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -283,7 +283,7 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id, cnt = hns3_counter_lookup(dev, id); if (cnt) { if (!cnt->indirect || cnt->indirect != indirect) - return rte_flow_error_set(error, ENOTSUP, + return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, cnt, "Counter id is used, indirect flag not match"); -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:59.760224739 +0000 +++ 0034-net-hns3-fix-error-code-for-repeatedly-create-counte.patch 2024-11-12 22:06:58.687307516 +0000 @@ -1 +1 @@ -From 585f1f68f18c7acbc4f920053cbf4ba888e0c271 Mon Sep 17 00:00:00 2001 +From 0ea0a51821fea3f95782dd3ade82aafa7aeb86cf 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 ec2000064c..9fbdf1dbe9 100644 @@ -23 +24 @@ -@@ -286,7 +286,7 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id, +@@ -283,7 +283,7 @@ hns3_counter_new(struct rte_eth_dev *dev, uint32_t indirect, uint32_t id,