From nobody Sat Nov 15 03:14:59 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1755786452; cv=none; d=zohomail.com; s=zohoarc; b=Xn86AUs57li/6PImJkWdbzWa8H2Bqdpec7SUej1VebraWOkwT6LL/pa7o5crPvZXufa2ri0s+rFjD6/vQqOBgMFd86oHnSMypg8kYYpfZIte6YnEzq84XAItX83zxEv+Bb5n08tnqthcIcDuPyTrS+nlVGBLRoOvYtJ8fYwA+ow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755786452; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BfO97+SjLNV5yIjbTFiraK/a36I/HSbfhmgM+yH4jec=; b=EeTWpsbUA7ruXXVq00zds19gDfKqmiSjYCOQfZxJN4m9AIcmYN7frQF2a6RiKoXOU8T+RSBMsilDP1MMkgT858U6gm1wFa4Hh04zxwIbCP7RM1pfGFVWq3flp13ivQikKBOz74oGmOtCrI2dlv1Jp+NMwrORPbGhTy8UfouJq8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755786452322366.6743049016486; Thu, 21 Aug 2025 07:27:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1up6Fx-0004TS-Nx; Thu, 21 Aug 2025 10:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1up6Fm-0004Rm-Rr for qemu-devel@nongnu.org; Thu, 21 Aug 2025 10:27:00 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1up6Fk-0006bf-0R for qemu-devel@nongnu.org; Thu, 21 Aug 2025 10:26:58 -0400 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57LEBt0W019360; Thu, 21 Aug 2025 14:26:44 GMT Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 48n0tr3jwp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Aug 2025 14:26:43 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 57LCn22m026402; Thu, 21 Aug 2025 14:26:43 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 48n3sxm979-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Aug 2025 14:26:42 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 57LEPuvK037230; Thu, 21 Aug 2025 14:26:42 GMT Received: from jonah-amd-ol9-bm.osdevelopmeniad.oraclevcn.com (jonah-amd-ol9-bm.allregionaliads.osdevelopmeniad.oraclevcn.com [100.100.252.67]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 48n3sxm96t-1; Thu, 21 Aug 2025 14:26:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=corp-2025-04-25; bh=BfO97+SjLNV5yIjbTFiraK/a36I/H SbfhmgM+yH4jec=; b=XnlzwB1qWT2VloAyMauRB0hEFnSnRfMJH+xL4RemzgQJu LgNsPkX/CtBZp9cFR5wFrPer7bQbah81BXArXB5ozH/nMEEkDUE88OtwlUV0s3t2 NQzmT+ZI5lSpuwAWl97hZjPZXnPlkne71EGqsuaoNmOfOe7bHW3ywKwVXjIH/opJ VF+yNjwi/lA/mDO8HW2XWsGZW/zshc/6kkZYJhk6TJjfJfBExJFRdCv8tK6Biscz rch8E6lCQi8Yx/HZzyHTj0KAq966lhKGlwophGZT6JqJ+JezM/FkJlVsxJLU5y71 yvUO7gw27KTbry0tZFZYfLumCf6g8Q5L67RZEiHLg== From: Jonah Palmer To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, eperezma@redhat.com, leiyang@redhat.com, dwmw2@infradead.org, jonah.palmer@oracle.com Subject: [PATCH] net/hub: make net_hub_port_cleanup idempotent Date: Thu, 21 Aug 2025 14:26:41 +0000 Message-ID: <20250821142641.359132-1-jonah.palmer@oracle.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-21_03,2025-08-20_03,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2508110000 definitions=main-2508210116 X-Proofpoint-GUID: i4V5HvB6KQAq6RCHgVhlDRdIMCnZi69t X-Authority-Analysis: v=2.4 cv=FY1uBJ+6 c=1 sm=1 tr=0 ts=68a72ca4 cx=c_pps a=OOZaFjgC48PWsiFpTAqLcw==:117 a=OOZaFjgC48PWsiFpTAqLcw==:17 a=2OwXVqhp2XgA:10 a=JfrnYn6hAAAA:8 a=yPCof4ZbAAAA:8 a=E34_ZZ7pgZ2hWXAKS8kA:9 a=1CNFftbPRP8L7MoqJWF3:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-ORIG-GUID: i4V5HvB6KQAq6RCHgVhlDRdIMCnZi69t X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODE5MDE5NyBTYWx0ZWRfXzEzTd+l3m4A0 Ha/Lph7Kgp11IEJzll0EYW/2IzylkXfrO3uvc5wpEl9JPTqqSM4jodXd4mMaWgg/3vInP5w7CZc Rzh/lPjGl1UBw7sMIIgR5NIVasVjjljW3atpkFMad2H6tlgm4lofcFjFQp8436pRd0kTfOd73X9 MVP/uPiTlH1jxD73MHuRUN22sJ/cj/b+SPqkD4IYW33nVxdTWsaw1XsZ70Pu8WfPKiT1nKW8klE wcF58UZ7MRGltmI8E8xuQx0oIcnRTjLmzc+XFrUjj0E5xBOyth2kLxWFqN8y4gEPhcjA/LqZd7x TP/m2zSR6o69OlPB7+Z2U9mBALrw2cuMJVteOeCWgPMXIakK0lOxqRkCrd6hSEOFAfouveH0xqm xspsxM9qXXTgQSwv9+Uzd58ADLhAww== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.177.32; envelope-from=jonah.palmer@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @oracle.com) X-ZM-MESSAGEID: 1755786454366116600 Content-Type: text/plain; charset="utf-8" Makes the net_hub_port_cleanup function idempotent to avoid double removals by guarding its QLIST_REMOVE with a flag. When using a Xen networking device with hubport backends, e.g.: -accel kvm,xen-version=3D0x40011 -netdev hubport,... -device xen-net-device,... the shutdown order starts with net_cleanup, which walks the list and deletes netdevs (including hubports). Then Xen's xen_device_unrealize is called, which eventually leads to a second net_hub_port_cleanup call, resulting in a segfault. Fixes: e7891c57 ("net: move backend cleanup to NIC cleanup") Reported-by: David Woodhouse Signed-off-by: Jonah Palmer Tested-by: David Woodhouse --- net/hub.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/hub.c b/net/hub.c index e3b58b1c4f8e..ee5881f6d5cb 100644 --- a/net/hub.c +++ b/net/hub.c @@ -34,6 +34,7 @@ typedef struct NetHubPort { QLIST_ENTRY(NetHubPort) next; NetHub *hub; int id; + bool listed; } NetHubPort; =20 struct NetHub { @@ -129,7 +130,10 @@ static void net_hub_port_cleanup(NetClientState *nc) { NetHubPort *port =3D DO_UPCAST(NetHubPort, nc, nc); =20 - QLIST_REMOVE(port, next); + if (port->listed) { + QLIST_REMOVE(port, next); + port->listed =3D false; + } } =20 static NetClientInfo net_hub_port_info =3D { @@ -159,8 +163,10 @@ static NetHubPort *net_hub_port_new(NetHub *hub, const= char *name, port =3D DO_UPCAST(NetHubPort, nc, nc); port->id =3D id; port->hub =3D hub; + port->listed =3D false; =20 QLIST_INSERT_HEAD(&hub->ports, port, next); + port->listed =3D true; =20 return port; } --=20 2.47.3