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 3750846364 for ; Fri, 7 Mar 2025 13:48:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2ABD140E30; Fri, 7 Mar 2025 13:48:14 +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 101A140E30 for ; Fri, 7 Mar 2025 13:48:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351690; 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=2sJEdXYyXUrzXUY8Gbljf/VN9p+ooGKKWzKr8CJuhT8=; b=PAn+3DYXltr8gonAkI1AHopGzXDhGd/+F1INW6O/2LrP+g9SoEtPaC582UDFiGLPIZIwG1 XSZr2vYjJdfUjj/r7+X2zkx5ai1G9izBmh7iM/PS1+mLWJGLJtL4B+Y6eKStULbGwIzTXv jo7VSAJDiZJaxhjRvPxucUJX+VuWlbU= 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-587-UuejKPJoMBmlGMRMpoc84Q-1; Fri, 07 Mar 2025 07:48:09 -0500 X-MC-Unique: UuejKPJoMBmlGMRMpoc84Q-1 X-Mimecast-MFC-AGG-ID: UuejKPJoMBmlGMRMpoc84Q_1741351688 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 1FA9719560B7; Fri, 7 Mar 2025 12:48:08 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6AFFF1956095; Fri, 7 Mar 2025 12:48:06 +0000 (UTC) From: Kevin Traynor To: Chaoyong He Cc: Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix init failure handling' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:49 +0000 Message-ID: <20250307124726.475001-16-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ze9_aqrbDH_rw10WoyS6g4A1BSdxWk1NUSTFNvuOG7o_1741351688 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/12/25. 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/fb93f6ea0b259314ad6b3ed147688a03fd977f43 Thanks. Kevin --- >From fb93f6ea0b259314ad6b3ed147688a03fd977f43 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 26 Feb 2025 11:06:05 +0800 Subject: [PATCH] net/nfp: fix init failure handling [ upstream commit 1992e3ffac00c61e41ba13d8c4808ced48c9e8da ] Fix two bugs of error process logic. Fixes: 19bd7cce5705 ("net/nfp: support different configuration BAR size") Fixes: 636e133ec891 ("net/nfp: update Tx and Rx for multiple PF") Signed-off-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index b3d7bc301b..0c59ef82e8 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -2548,5 +2548,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev) if (ret != 0) { PMD_INIT_LOG(ERR, "Failed to init VF config."); - goto vf_cfg_tbl_cleanup; + goto mac_stats_cleanup; } @@ -2556,5 +2556,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev) PMD_INIT_LOG(ERR, "PF register meta check function failed."); ret = -EIO; - goto hw_priv_free; + goto vf_cfg_tbl_cleanup; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:57.494481480 +0000 +++ 0016-net-nfp-fix-init-failure-handling.patch 2025-03-07 11:02:56.855335634 +0000 @@ -1 +1 @@ -From 1992e3ffac00c61e41ba13d8c4808ced48c9e8da Mon Sep 17 00:00:00 2001 +From fb93f6ea0b259314ad6b3ed147688a03fd977f43 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1992e3ffac00c61e41ba13d8c4808ced48c9e8da ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index b9cb9fc652..cbd1deffb4 100644 +index b3d7bc301b..0c59ef82e8 100644 @@ -22 +23 @@ -@@ -2550,5 +2550,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -2548,5 +2548,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev) @@ -29 +30 @@ -@@ -2558,5 +2558,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -2556,5 +2556,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)