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 C36CB45DB9 for ; Wed, 27 Nov 2024 18:22:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA43340698; Wed, 27 Nov 2024 18:22:33 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 87B1C402DE for ; Wed, 27 Nov 2024 18:22:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728152; 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=SxfBybS7b4lDTDVM0tAnxhaPYnLph4pCGttZZe96rtQ=; b=W+t+7VZXZvfOWaTphIsa+aae7waExZITF3JMXLz7VysRx/WRJ8rvKqTelIBSRDxgk6MzSH NvXPf267VUucXaLhR94Oz5vn7uLIiAaLxRDrv3fAbmxhySMiXM2J5NdBUIT50P09YY6cLQ xJA4OyY3npYleDPYzhldR6NHDu4/F1A= 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-508-Xt3oTKFvM326Abg3M-8VTA-1; Wed, 27 Nov 2024 12:22:30 -0500 X-MC-Unique: Xt3oTKFvM326Abg3M-8VTA-1 X-Mimecast-MFC-AGG-ID: Xt3oTKFvM326Abg3M-8VTA 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 8DAF41955EE7; Wed, 27 Nov 2024 17:22:29 +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 037D3300019E; Wed, 27 Nov 2024 17:22:27 +0000 (UTC) From: Kevin Traynor To: Roger Melton Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'net/vmxnet3: fix crash after configuration failure' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:32 +0000 Message-ID: <20241127171916.690404-85-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: PMuMR5MlfUEkJDi1QF1Sqb0eQeXO8Orf-0_uTybWVbw_1732728149 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 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/3a8ff580f5f6107af56b593c77f0e0d128dae47d Thanks. Kevin --- >From 3a8ff580f5f6107af56b593c77f0e0d128dae47d Mon Sep 17 00:00:00 2001 From: Roger Melton Date: Sat, 26 Oct 2024 10:33:36 -0400 Subject: [PATCH] net/vmxnet3: fix crash after configuration failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 439847c154ccf05e1a8bbb955c552921514d31e2 ] Problem: If vxmnet3_dev_configure() fails, applications may call vmxnet3_dev_close(). If the failure occurs before the vmxnet3 hw->shared structure is allocated the close will lead to a segv. Root Cause: This crash is due to incorrect adapter_stopped state in the vmxnet3 dev_private structure. When dev_private is allocated, adapter_stopped will be 0 (FALSE). eth_vmxnet3_dev_init() does not set it to TRUE, so it will remain FALSE until a successful vmxnet3_dev_start() followed by a vmxnet3_dev_stop(). When vmxnet3_dev_close() is called, it will invoke vmxnet3_dev_stop(). vmxnet3_dev_stop() will check the adapter_stopped state in the vmxnet3 shared data, find it is FALSE and will proceed to stop the device, calling vmxnet3_disable_all_intrs(). vmxnet3_disable_all_intrs() attempts to access the vmxnet3 shared data resulting in the segv. Solution: Set adapter_stopped to TRUE in eth_vmxnet3_dev_init(), to prevent stop processing. Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation") Signed-off-by: Roger Melton Acked-by: Morten Brørup --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 32d1036c4f..8b3d4184d1 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -310,4 +310,5 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id; + hw->adapter_stopped = TRUE; hw->hw_addr0 = (void *)pci_dev->mem_resource[0].addr; hw->hw_addr1 = (void *)pci_dev->mem_resource[1].addr; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.940961156 +0000 +++ 0085-net-vmxnet3-fix-crash-after-configuration-failure.patch 2024-11-27 17:17:38.286269689 +0000 @@ -1 +1 @@ -From 439847c154ccf05e1a8bbb955c552921514d31e2 Mon Sep 17 00:00:00 2001 +From 3a8ff580f5f6107af56b593c77f0e0d128dae47d Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 439847c154ccf05e1a8bbb955c552921514d31e2 ] + @@ -35 +36,0 @@ -Cc: stable@dpdk.org @@ -44 +45 @@ -index 78fac63ab6..79ab167421 100644 +index 32d1036c4f..8b3d4184d1 100644 @@ -47 +48 @@ -@@ -404,4 +404,5 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) +@@ -310,4 +310,5 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)