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 61AE94326F for ; Thu, 2 Nov 2023 14:13:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BE4640A76; Thu, 2 Nov 2023 14:13:31 +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 2F7AD402D5 for ; Thu, 2 Nov 2023 14:13:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930808; 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=/YfShfBONNsuqRoeOOezxmgIofQjmFT3oHTfCuKlTYI=; b=VJJY22bpVgz2Ucpbr7iIjegYKGQiQLCPTecu55z6WvNPTwQt8Rnz8fBhu+T4Q5FMjD+XC5 lHYyhTJajAOsAgza79Cq9TsCZz+Kr9FaIcPRFqV9kyF7z9U9BDspRyUubJn27w+AUnNxd1 IFMjU+bK1l1K72SH9MYPYqhqBEyeLZY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453--9FQBI0qOcmEB1oIGVxvNw-1; Thu, 02 Nov 2023 09:13:25 -0400 X-MC-Unique: -9FQBI0qOcmEB1oIGVxvNw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3D2C388CDC0; Thu, 2 Nov 2023 13:13:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8299492BFA; Thu, 2 Nov 2023 13:13:23 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix VF default MAC modified when set failed' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:14 +0000 Message-ID: <20231102131254.315947-8-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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.6 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/08/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/e5a349762af673a5744b5fa9f0a80e02ce7f0ff4 Thanks. Kevin --- >From e5a349762af673a5744b5fa9f0a80e02ce7f0ff4 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Sat, 5 Aug 2023 16:36:23 +0800 Subject: [PATCH] net/hns3: fix VF default MAC modified when set failed [ upstream commit ed7faab2a717347077d9e657fba010bb145a2b54 ] When the VF fail to set the default MAC address, "hw->mac.mac_addr" should not be updated. Fixes: a5475d61fa34 ("net/hns3: support VF") Signed-off-by: Dengdui Huang Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev_vf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index ff1ee52dba..a125cfbeb9 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -251,4 +251,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev, mac_str, ret); } + rte_spinlock_unlock(&hw->lock); + return ret; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.100570476 +0000 +++ 0008-net-hns3-fix-VF-default-MAC-modified-when-set-failed.patch 2023-11-02 13:09:40.779163226 +0000 @@ -1 +1 @@ -From ed7faab2a717347077d9e657fba010bb145a2b54 Mon Sep 17 00:00:00 2001 +From e5a349762af673a5744b5fa9f0a80e02ce7f0ff4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ed7faab2a717347077d9e657fba010bb145a2b54 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 3729615159..007f5d619f 100644 +index ff1ee52dba..a125cfbeb9 100644 @@ -22 +23 @@ -@@ -170,4 +170,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev, +@@ -251,4 +251,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,