{"id":2225789,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2225789/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/patch/20260421150644.3543733-1-kbusch@meta.com/","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/1.1/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260421150644.3543733-1-kbusch@meta.com>","date":"2026-04-21T15:06:44","name":"pci: don't fallback to bus reset after failed slot reset","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"06449952f8c9b110b349f75b874dced99e212e21","submitter":{"id":84963,"url":"http://patchwork.ozlabs.org/api/1.1/people/84963/?format=json","name":"Keith Busch","email":"kbusch@meta.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/20260421150644.3543733-1-kbusch@meta.com/mbox/","series":[{"id":500837,"url":"http://patchwork.ozlabs.org/api/1.1/series/500837/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/list/?series=500837","date":"2026-04-21T15:06:44","name":"pci: don't fallback to bus reset after failed slot reset","version":1,"mbox":"http://patchwork.ozlabs.org/series/500837/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225789/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225789/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-pci@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=meta.com header.i=@meta.com header.a=rsa-sha256\n header.s=s2048-2025-q2 header.b=DSKFuqQQ;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=linux-pci+bounces-52850-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com\n header.b=\"DSKFuqQQ\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=67.231.153.30","smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=meta.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=meta.com"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0QqD6f7xz1yCv\n\tfor ; Wed, 22 Apr 2026 01:13:44 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id A43BC301111B\n\tfor ; Tue, 21 Apr 2026 15:07:02 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 25B8A288C08;\n\tTue, 21 Apr 2026 15:07:02 +0000 (UTC)","from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com\n [67.231.153.30])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id A57461F151C\n\tfor ; Tue, 21 Apr 2026 15:07:00 +0000 (UTC)","from pps.filterd (m0148460.ppops.net [127.0.0.1])\n\tby mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 63KNHf8F3578630\n\tfor ; Tue, 21 Apr 2026 08:06:59 -0700","from maileast.thefacebook.com ([163.114.135.16])\n\tby mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4dm7fb0p9f-2\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT)\n\tfor ; Tue, 21 Apr 2026 08:06:59 -0700 (PDT)","from twshared22734.32.frc3.facebook.com (2620:10d:c0a8:1b::30) by\n mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.2.2562.37; Tue, 21 Apr 2026 15:06:58 +0000","by devbig197.nha3.facebook.com (Postfix, from userid 544533)\n\tid 4966612B01994; Tue, 21 Apr 2026 08:06:45 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776784022; cv=none;\n b=tFbpm6NylDqAcT5YCl7sdxl6xYCM2uSB98BPSuQuROLV4TZft/Frlt/TLefnC7QnWgGCIYHuNs9GYXM8DPixYGxIni8rmkj8G1wSmL4JfX3v0yO46SYCm/6jc6xJAgbuPbUSNeY+zew/b5rToJslMvi2hhpMwqDWNHb4D844AUw=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776784022; c=relaxed/simple;\n\tbh=Mrqz7m6HpU9WRPFXdfRfHEnd/B/hJ3bdwROvofyVG08=;\n\th=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type;\n b=QtvDQbdoS9GVvhFAidbFr3pD7i/rbyMaquU+bUuXhRhKm/FeDapjeg716NrR93e1ktzsD9gggZmWLoHlLO7868Hz3H4KL2mfdr03v7uLp3CfVXSczRfwV1r2CK9+9VP68oFDtyToO0/YoWPxtEyKOq/paAGAH5qq3Wyyw+dYtZ8=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=meta.com;\n spf=pass smtp.mailfrom=meta.com;\n dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com\n header.b=DSKFuqQQ; arc=none smtp.client-ip=67.231.153.30","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc\n\t:content-transfer-encoding:content-type:date:from:message-id\n\t:mime-version:subject:to; s=s2048-2025-q2; bh=fGbXtufI6dAfRa73Au\n\tT+VnwGEzi3Mz3C6hkyTHXXSlw=; b=DSKFuqQQuAfcJBxSUTgiJTJv4U10gl8KrW\n\tmz2Kk5AGiUgW109K85kw/pGInS08iR/z4WF1EjbR0CJ7G3hF1jHIInh1hPqN/m3n\n\tznfkMavyLwRQXDABNnGNZ/cyUwTiyOzVaEgDVstak9VWPkMhu/yaDWQaA8L4RV8z\n\tO4VkWU3H6hR3n0Tj3ko6v4tywZE+JsVEKEgS2V3P89nhtxQk3iEUTkQ4BZiHqimL\n\tPvPQjxpr7FCpPit1om7DGtXPQF3u6FIv6mQ2BgNkr1MtjIhZ0auBDoY3GficE8gO\n\t+xBZmO7KF2bO239gH4rd9tYe+L5V2vgAPvLFBNvXTcS4au4ArswQ==","From":"Keith Busch ","To":", ","CC":"Keith Busch ","Subject":"[PATCH] pci: don't fallback to bus reset after failed slot reset","Date":"Tue, 21 Apr 2026 08:06:44 -0700","Message-ID":"<20260421150644.3543733-1-kbusch@meta.com>","X-Mailer":"git-send-email 2.52.0","Precedence":"bulk","X-Mailing-List":"linux-pci@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","X-FB-Internal":"Safe","Content-Type":"text/plain","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDIxMDE1MSBTYWx0ZWRfX9RCNQFrx+pgL\n aeKMWW/cO4P2H0jrMTwNlcldP+rN6IcVVqFRk2q+v+CDCpyGk6workBEaHsXHghVaDpaMF4hjxT\n 50a1wGNz8UZBbDh+FagFF6ubA/TKNItTPSJRmZ9QnYxqNF4ys//kMSe6j2JibDJXO729ucRc57U\n jrsmIL4gpKN+mTeWf93rI+06qjlH9ua7x1Wj+xpwKmEs+7LjQpECzjJlVaF5GLr/Q3s7otY0psC\n m3qY4+RY1r1LMwMNquD8/r10dd/MDn4Jd1VNWy3ryXanmfcHw3VtKqsWALKMs+/ku6XXLuyGZlF\n Ewch//vgWgzpkszIJVC8Zay8LP0vowu0ZEH1YV6MVMtA3CvdFjjsUUGLoquKKnK7cmvuwQoOs9S\n LAdTMKvOGEA1f2mNi7YWqj3KnTxpSzjI0vnSBr2t/7AnWNVQEH8C6ZZkOEYTWNVCGZizzx3Y47n\n pXDNc0uaziiPcJ/Mz4A==","X-Proofpoint-ORIG-GUID":"Pki7irbW3f4vn3khCIchefv4YTOsqEYI","X-Authority-Analysis":"v=2.4 cv=VevH+lp9 c=1 sm=1 tr=0 ts=69e79293 cx=c_pps\n a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7x6HtfJdh03M6CCDgxCd:22\n a=JnKecZnUtZousrUlYMGU:22 a=VwQbUJbxAAAA:8 a=XL7pVx86RMmQbKPDkIYA:9","X-Proofpoint-GUID":"Pki7irbW3f4vn3khCIchefv4YTOsqEYI","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-21_03,2026-04-21_02,2025-10-01_01"},"content":"From: Keith Busch \n\nIf a bus has hotplug slots that implement the slot's reset_slot\ncallback, it is not safe to do the non-slot specific bus reset, so don't\nfallback to it. If a slot reset does fail, the subsequent bus reset will\nattempt a 2nd link reset on top of previous and fail to handle the\nhotplug events.\n\nFixes: 8238cb69c01fe (\"PCI: Make reset_subordinate hotplug safe\")\nSigned-off-by: Keith Busch \n---\n drivers/pci/pci.c | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c\nindex 8f7cfcc000901..d34266651ad09 100644\n--- a/drivers/pci/pci.c\n+++ b/drivers/pci/pci.c\n@@ -5607,13 +5607,14 @@ static int pci_try_reset_bus(struct pci_bus *bus)\n * reset for affected devices\n *\n * This function will first try to reset the slots on this bus if the method is\n- * available. If slot reset fails or is not available, this will fall back to a\n+ * available. If slot reset is not available, this will fall back to a\n * secondary bus reset.\n */\n static int pci_reset_bridge(struct pci_dev *bridge, bool restore)\n {\n \tstruct pci_bus *bus = bridge->subordinate;\n \tstruct pci_slot *slot;\n+\tint ret = 0;\n \n \tif (!bus)\n \t\treturn -ENOTTY;\n@@ -5627,19 +5628,17 @@ static int pci_reset_bridge(struct pci_dev *bridge, bool restore)\n \t\t\tgoto bus_reset;\n \n \tlist_for_each_entry(slot, &bus->slots, list) {\n-\t\tint ret;\n-\n \t\tif (restore)\n \t\t\tret = pci_try_reset_slot(slot);\n \t\telse\n \t\t\tret = pci_slot_reset(slot, PCI_RESET_DO_RESET);\n \n \t\tif (ret)\n-\t\t\tgoto bus_reset;\n+\t\t\tbreak;\n \t}\n \n \tmutex_unlock(&pci_slot_mutex);\n-\treturn 0;\n+\treturn ret;\n bus_reset:\n \tmutex_unlock(&pci_slot_mutex);\n \n","prefixes":[]}