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 DFEC54319F for ; Thu, 19 Oct 2023 01:59:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA2214069F; Thu, 19 Oct 2023 01:59:43 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 02903406BC for ; Thu, 19 Oct 2023 01:59:43 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4083ac51d8aso11827415e9.2 for ; Wed, 18 Oct 2023 16:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673582; x=1698278382; 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=tYklBGz2LTMCijZqE4DV5WCJhkYlqhgpvKxbxdIv8qw=; b=Hcei8Qk3MGV2WjGWxxiKcIafEo2AEnADmCBdI5KAdUjuHpoloFg09TUKtTxv3fAp89 8D/XluqNEBFiGlnZeoFMQwESD/vT6tBms33ZPSVCo7J8V334j5VlehE3VrGHpuQ49W8O 0YTtJaSUsYWlAXSEHkapYjeepavWe2/9Gk0DuEP4R6Vtibo/sJ8b2dcDHdhCiyZc8HnO L2BHEsK0YZEomVHwsn/Y/m/q/r6KC2Fi+RcVZdDLV9U/uYTTFfvVkiSmUk+KYdAFmzey B0mMTc+MDS8+PfXPL+gLEyjz/ADpp24ANL7xL+hdbVAPGkbh6iJRqqd2z5lv3ivAt8ta N06w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673582; x=1698278382; 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=tYklBGz2LTMCijZqE4DV5WCJhkYlqhgpvKxbxdIv8qw=; b=lMtgW5mcUVfSy2nC5uTijYkKDW1fpmOtDc34tnOrlo+1CJe/SDg5jfHn99ARTU9oIH sb7OhXiqh1t+74A+R21E+qomKieqPKAD0t+NxYklStHvljgjh0LMQan7RtqtNe9gEKZJ Hs2zLbzNB9vs2UygPgZ1X90qyNpIuFGMvEk5zhY4s/aRNeoHmgUI1qdS/K6YR8ISXN6g wYFmiQTQSR883UAgHs7TupFUXe4YxXZqRVbWaVfFJkUe2BEfTZ6mpnlx7fgYDUytZREu rV/8eEN9He+rhXfYslsGP5RbyM1Gw/sO+JGjL5OkRxdrDFA2VA5WSqefMu74JJvnne6g UXwg== X-Gm-Message-State: AOJu0YyJ1xbwVjB1uKv5DrA4PqtFPVTb4ImKEG87ZCgXFQO/vkWZQcBS E+cU6f5nYr/Y8sFvTJtRMFFOTdZOLRBbxQ== X-Google-Smtp-Source: AGHT+IFDLkP5IgG3f6PClhGS9hHmlzgSoCEH49thLo81PNyLVkBVyYhPecCp7xreE6ghvohIAoS+HQ== X-Received: by 2002:a05:6000:b87:b0:32d:9e13:1bca with SMTP id dl7-20020a0560000b8700b0032d9e131bcamr359086wrb.27.1697673582341; Wed, 18 Oct 2023 16:59:42 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id z12-20020a5d4c8c000000b0032d2489a399sm3157973wrs.49.2023.10.18.16.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 16:59:41 -0700 (PDT) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix error code for multicast resource' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:58:54 +0100 Message-Id: <20231018235930.3144-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/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/25895ade7f495039479a8f04c707fd7d8b0633af Thanks. Luca Boccassi --- >From 25895ade7f495039479a8f04c707fd7d8b0633af Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Sat, 5 Aug 2023 16:36:24 +0800 Subject: [PATCH] net/hns3: fix error code for multicast resource [ upstream commit c8cd885352d58bcfcc514770cb6068dd689d0dc3 ] Return ENOSPC instead of EINVAL when the hardware has not enough multicast filtering resources. Fixes: 7d7f9f80bbfb ("net/hns3: support MAC address related operations") Signed-off-by: Dengdui Huang Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 2da2f1e9ec..08e2ae53db 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -1913,7 +1913,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw, hns3_err(hw, "failed to set mc mac addr, nb_mc_addr(%u) " "invalid. valid range: 0~%d", nb_mc_addr, HNS3_MC_MACADDR_NUM); - return -EINVAL; + return -ENOSPC; } /* Check if input mac addresses are valid */ diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 9d30dea8a8..8937e73305 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -437,7 +437,7 @@ hns3vf_set_mc_addr_chk_param(struct hns3_hw *hw, hns3_err(hw, "failed to set mc mac addr, nb_mc_addr(%u) " "invalid. valid range: 0~%d", nb_mc_addr, HNS3_MC_MACADDR_NUM); - return -EINVAL; + return -ENOSPC; } /* Check if input mac addresses are valid */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:56.514938023 +0100 +++ 0005-net-hns3-fix-error-code-for-multicast-resource.patch 2023-10-19 00:28:56.185803675 +0100 @@ -1 +1 @@ -From c8cd885352d58bcfcc514770cb6068dd689d0dc3 Mon Sep 17 00:00:00 2001 +From 25895ade7f495039479a8f04c707fd7d8b0633af Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c8cd885352d58bcfcc514770cb6068dd689d0dc3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,3 @@ - drivers/net/hns3/hns3_common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + drivers/net/hns3/hns3_ethdev.c | 2 +- + drivers/net/hns3/hns3_ethdev_vf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) @@ -18,5 +20,18 @@ -diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c -index a11ea686fd..043c7673b4 100644 ---- a/drivers/net/hns3/hns3_common.c -+++ b/drivers/net/hns3/hns3_common.c -@@ -386,7 +386,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw, +diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c +index 2da2f1e9ec..08e2ae53db 100644 +--- a/drivers/net/hns3/hns3_ethdev.c ++++ b/drivers/net/hns3/hns3_ethdev.c +@@ -1913,7 +1913,7 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw, + hns3_err(hw, "failed to set mc mac addr, nb_mc_addr(%u) " + "invalid. valid range: 0~%d", + nb_mc_addr, HNS3_MC_MACADDR_NUM); +- return -EINVAL; ++ return -ENOSPC; + } + + /* Check if input mac addresses are valid */ +diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c +index 9d30dea8a8..8937e73305 100644 +--- a/drivers/net/hns3/hns3_ethdev_vf.c ++++ b/drivers/net/hns3/hns3_ethdev_vf.c +@@ -437,7 +437,7 @@ hns3vf_set_mc_addr_chk_param(struct hns3_hw *hw,