From nobody Fri Oct 2 03:37:01 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 950DC471CEB; Wed, 5 Aug 2026 13:36:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785936994; cv=none; b=TQTTh5LualjN6OkcRFMVAwJnP+UiWCNeVARoMl38IwJQFMEqFHHOpyBCoIyd7AS1rHwEY893FUV0idgb8xAN06DozmIJrXJ3F5rVL6+Hf9cz6vlOjqY6dIpBBUh/BJ1N0OCERvX8H9QQY67mbqd/0T7IUtDBIh/jcOvb8FBA3SI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785936994; c=relaxed/simple; bh=BZJUX9NcvJVgbaeeKfWxsCaWGpij24OSNPviaUfRR5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lS2hVE/5q+9qv+JHyQDyWjcY8tvQ1BX7wUy5iTnunqPrj7klaoUfI4VckKW7r62rShR1Q7XPWpgADX2h/x0NZnI+gky/De+pt27Cbmegzv9C/XMUkStrvchHIBH/vEX0HbmORKrr8U5kwXFLx3GdleCaKKbF+u3aruZ0kYWxqRo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=FJcnxIyY; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="FJcnxIyY" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 675CIaKs3826729; Wed, 5 Aug 2026 13:36:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=/0KJQFDJg5HOJ2UGT vrf/5xhQNSDj9isc/PJWdQWSm0=; b=FJcnxIyYfcpfrEpMJpPr2yNbMiKu20JuQ uzB6napsEltGQ8x0s2B6ibazh9rob6xhfeLeiH8p6f4v5A3QN7Z5JAh7xRB17jJM OD1hz514U6vs/3KhoaNuApc+wY1TGAhUegk6rRs0idFpJvQYh9AajOvOs9Vq+bBt Aam24y6i8hgZbxtltFXrjOtBQqMihZjdlzMC2iYtNnGkzm3UF6IkaEE1t3axx/Hh vOVdqs1rzeURyRM3tqjHfMmbonT08+OE+Osov7aoiKr3LskZetTbee+bKVXEfKdz AzzxTVAd3+pOc7K/5V+Rv1dtknl6pHMUYDX01s/HoelZub6wHn7Yg== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs8h539a7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Aug 2026 13:36:32 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 675DQFJ6011100; Wed, 5 Aug 2026 13:36:31 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fswtypgqr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Aug 2026 13:36:31 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 675DaSQ549545722 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 Aug 2026 13:36:28 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0E47D20040; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D607B2004E; Wed, 5 Aug 2026 13:36:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 5 Aug 2026 13:36:27 +0000 (GMT) From: Heiko Carstens To: Alexander Gordeev , Sven Schnelle , Vasily Gorbik , Christian Borntraeger , Niklas Schnelle , Gerd Bayer Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] s390/pci: Rework __zpci_event_error() to remove conditional locking Date: Wed, 5 Aug 2026 15:36:25 +0200 Message-ID: <20260805133627.1216607-2-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260805133627.1216607-1-hca@linux.ibm.com> References: <20260805133627.1216607-1-hca@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwODA1MDEwNyBTYWx0ZWRfX/EEDngJtZxab eagSwkeeqaeY/h6wOmJ6I3QJxQPb/ferwtpGr1iF/f+vnAPqryQSBXbAJxvNgQF+1WslIchAf47 OazeMd0f458M1f/1DX3hdi9RFJoP2Og= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA1MDEwNyBTYWx0ZWRfX4Vu9amLbwZKU 4u9tIVIRvWeGHJCHYEFsKA1RvD4n7eQX0m8IqI2Sw1TBWIaYqo6qIYO9DSU86dODkcvR0kOKlwW PIzt7Pu0w2sOrQEugWAwNqC6u1K1u2la0GG3BINCT6Hr/3zj9oC45GFroq4ARCtoEToMX/5SKha 4ceQNUXmyI8G5lOhRx+R47TzxQlxGlBC3Q9BI+tUY1y4VKzqjQwImHQJtKWGmJEJm8HDZltSJGn wuERIJPWanN9yBkE0mOm2kns1Cn1hH1K++6i6PhawG1Vbt4+tF7u8eEEhfswgNRAVCvQ1rfAnNP KWwBSPDt+LDa5TuQ1RdnONHSE+GX3C2Hdv+PcREzNDkMlhzm54Bm6xxnE+vaBaev6gMXuFFpd3S Y7IcTrw7P4t7YT9KCuA9lsov+ms41doeTOC2+Pw3W6K9p+5Yi6XNF/bnyBjVVZ1uKGdDsy4MRRj pCfbIyW4Y4HYzugvNbA== X-Authority-Analysis: v=2.4 cv=SI1ykuvH c=1 sm=1 tr=0 ts=6a733c60 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=m4_1mmLPwvc7V99NFaoA:9 X-Proofpoint-ORIG-GUID: DDw7hS_eEUxvq7YJwH8zBX1Lid_vvX0o X-Proofpoint-GUID: DDw7hS_eEUxvq7YJwH8zBX1Lid_vvX0o X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-05_04,2026-08-04_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 suspectscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608050107 Content-Type: text/plain; charset="utf-8" Clang's compiler based static context analysis does not work with locks that are conditionally taken like in __zpci_event_error(): arch/s390/pci/pci_event.c:320:2: warning: mutex 'get_zdev_by_fid(ccdf->fid)= .state_lock' is not held on every path through here [-Wthread-safety-analysis] Given that code which takes locks conditionally can be considered suboptimal rework __zpci_event_error() to get rid of this. Reviewed-by: Niklas Schnelle Signed-off-by: Heiko Carstens --- arch/s390/pci/pci_event.c | 43 ++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index 839bd91c056e..bead4ed5d4ab 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -288,6 +288,12 @@ static void zpci_event_io_failure(struct pci_dev *pdev= , pci_channel_state_t es) pci_dev_unlock(pdev); } =20 +static void __zpci_event_print_error(struct pci_dev *pdev, struct zpci_ccd= f_err *ccdf) +{ + pr_err("%s: Event 0x%x reports an error for PCI function 0x%x\n", + pdev ? pci_name(pdev) : "n/a", ccdf->pec, ccdf->fid); +} + static void __zpci_event_error(struct zpci_ccdf_err *ccdf) { struct zpci_dev *zdev =3D get_zdev_by_fid(ccdf->fid); @@ -301,24 +307,24 @@ static void __zpci_event_error(struct zpci_ccdf_err *= ccdf) zpci_err("error CCDF:\n"); zpci_err_hex(ccdf, sizeof(*ccdf)); =20 - if (zdev) { - mutex_lock(&zdev->state_lock); - rc =3D clp_refresh_fh(zdev->fid, &fh); - if (rc) - goto no_pdev; - if (!fh || ccdf->fh !=3D fh) { - /* Ignore events with stale handles */ - zpci_dbg(3, "err fid:%x, fh:%x (stale %x)\n", - ccdf->fid, fh, ccdf->fh); - goto no_pdev; - } - zpci_update_fh(zdev, ccdf->fh); - if (zdev->zbus->bus) - pdev =3D pci_get_slot(zdev->zbus->bus, zdev->devfn); - } + if (!zdev) + return __zpci_event_print_error(NULL, ccdf); =20 - pr_err("%s: Event 0x%x reports an error for PCI function 0x%x\n", - pdev ? pci_name(pdev) : "n/a", ccdf->pec, ccdf->fid); + mutex_lock(&zdev->state_lock); + rc =3D clp_refresh_fh(zdev->fid, &fh); + if (rc) + goto no_pdev; + if (!fh || ccdf->fh !=3D fh) { + /* Ignore events with stale handles */ + zpci_dbg(3, "err fid:%x, fh:%x (stale %x)\n", + ccdf->fid, fh, ccdf->fh); + goto no_pdev; + } + zpci_update_fh(zdev, ccdf->fh); + if (zdev->zbus->bus) + pdev =3D pci_get_slot(zdev->zbus->bus, zdev->devfn); + + __zpci_event_print_error(pdev, ccdf); =20 if (!pdev) goto no_pdev; @@ -340,8 +346,7 @@ static void __zpci_event_error(struct zpci_ccdf_err *cc= df) } pci_dev_put(pdev); no_pdev: - if (zdev) - mutex_unlock(&zdev->state_lock); + mutex_unlock(&zdev->state_lock); zpci_zdev_put(zdev); } =20 --=20 2.53.0 From nobody Fri Oct 2 03:37:01 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86A5B471D04; Wed, 5 Aug 2026 13:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785936996; cv=none; b=ibhhrW8cXxEplXsUpdJOIqHVGePXtkRTHpKcCmdYADuZATa7FFosbynSqUas3e8pAqm2d8L1xomndn03o/65o+NL5q9i7UoGinwzmWSIxTPPL0xGhgDA7uW4Ln20Mk0/jccZTUy5eLIuAqpEWPd7s4TcAf2CBoK6vegIzOgnEWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785936996; c=relaxed/simple; bh=MD2p9uu7/dJLT8xpJEoUQvqM/2MsFEs/OulayiYTwmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JxZBR2esyhGmueqoLAoGGdS5dMhFYuiVXq8U5wwXLDkGiZoYeGNOYlh+DSUHvZ7vApQPxXyCerOSgdKZL0wuJgugOHxbzjc795acAiJTwFAwpTo4NQ1PDpdiz3wSHsHpb/ISbUiVxS2/h8g70PLRqt0Vw7nyNURPjwwDyJoOjds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=aGfpKlIB; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="aGfpKlIB" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 675CHnFM3724695; Wed, 5 Aug 2026 13:36:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=IrgL8RqSglKkOyj5L roGQLh/JY/zuzIzE45hgk8qe04=; b=aGfpKlIB/MEMpBi3hzOmTaR5+F07GXAPI nsAGgmSiL+3ekCRnJqSE1LquZ8By6BRI+2OufEAqk4QhCHN/254ZsGDkocNllw2h ga5NqmEE7TOA7WTz6qeWIp19xQEdJ6A92kH5lXXBvCTZwJgJTV9ct8SdJVfhoIUE /0MeWwq7Ze+oAG7K8b8VgBAj9QukYyX82LSai6k4ofgG0PfE2HLae8akTQcWh08F 75cFdg7mvwiYeFEgy60ioNF3Wlswji3HbTJibjDHUGh5zA0oUXFIbNQ9vWxw3lQR Ip26XKjvalN7GLsfhg4TcHAp7XzyTjbABhE30FMNeAw2MFQ6BDTDQ== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs77gavr2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Aug 2026 13:36:33 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 675DQHHt027135; Wed, 5 Aug 2026 13:36:32 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsvmhenv1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Aug 2026 13:36:32 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 675DaSgb49545724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 Aug 2026 13:36:28 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3EC6720040; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 161B92004B; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) From: Heiko Carstens To: Alexander Gordeev , Sven Schnelle , Vasily Gorbik , Christian Borntraeger , Niklas Schnelle , Gerd Bayer Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] s390/pci: Rework __zpci_event_availability() to remove conditional locking Date: Wed, 5 Aug 2026 15:36:26 +0200 Message-ID: <20260805133627.1216607-3-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260805133627.1216607-1-hca@linux.ibm.com> References: <20260805133627.1216607-1-hca@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA1MDEwNyBTYWx0ZWRfX9cMr9i9CvTzt BxuD9zzxf1O8zgX6AdO6NOuMTNOUT2r8hb15YPmo5YiDonC95LJ197Vf3Hh0P3mDRaL4hVlUfzO LYfEPmUDZk62HFqJM1ZiQMK5B2LZp5pRApdwET9UGhdxb1nSzu7+p23VV+7DBWLKcoRAPsEVO3d 898s74tl3lZvQCepWpKjmYDDlJWiz7OWADgWN8rtqim8hgNxFClS3l06UkGeNoV66/UYZHZFmg9 LqW4Ww+y1Djvu1gXoEv6HusM19+gev22506i+9aK5Q/v0M5oVZKPn88C0aj+T8/JEXITquvaksI JRGCI551nOwlLS6xlRVIxs+twWgXLowX9IG5M6N8UC/y2LeqDPKhaEc8dyvw9c6qkb+fKt4aY6K 1RPFdT18sJ7kdvrb9tK0QEdKbu4ewBGjK1YLQ2UQnZ9aAM6m0u0wHXHd3WDl4x7d69GgP2xgC2a iHCQ+j/eNmJRHc972Ow== X-Authority-Analysis: v=2.4 cv=WIFPmHsR c=1 sm=1 tr=0 ts=6a733c61 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=poQ7gJ9nSTMEjbrCJsEA:9 X-Proofpoint-GUID: uofeoXWfKrGKwuur-sd8Q6UBlYHCBy82 X-Proofpoint-ORIG-GUID: uofeoXWfKrGKwuur-sd8Q6UBlYHCBy82 X-Proofpoint-Spam-Info: AW1haW4tMjYwODA1MDEwNyBTYWx0ZWRfX2JOBVx6V/mlm P1a0RwRGT/94fDpDEPR8AciyEMelYsRz1qaOW64KHcdtc1/8o4kdgxgO6oV6nd528dU707glNPt rzj4NvMBocz58CeopQ7DWOCcJFXrzrU= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-05_04,2026-08-04_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 malwarescore=0 suspectscore=0 clxscore=1015 impostorscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608050107 Content-Type: text/plain; charset="utf-8" Clang's compiler based static context analysis does not work with locks that are conditionally taken like in __zpci_event_availability(): arch/s390/pci/pci_event.c:402:10: warning: mutex 'get_zdev_by_fid(ccdf->fid= ).state_lock' is not held on every path through here [-Wthread-safety-analysis] Given that code which takes locks conditionally can be considered suboptimal rework __zpci_event_availability() to get rid of this. Signed-off-by: Heiko Carstens Reviewed-by: Niklas Schnelle --- arch/s390/pci/pci_event.c | 162 ++++++++++++++++++++------------------ 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index bead4ed5d4ab..0a9eecb62bd1 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -387,98 +387,106 @@ static void zpci_event_reappear(struct zpci_dev *zde= v) zpci_dbg(1, "rea fid:%x, fh:%x\n", zdev->fid, zdev->fh); } =20 -static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) +static bool zpci_event_avail_any_device(struct zpci_ccdf_avail *ccdf) { - struct zpci_dev *zdev =3D get_zdev_by_fid(ccdf->fid); - bool existing_zdev =3D !!zdev; - enum zpci_state state; + /* 0x0306 - No handle or fid stored */ + if (ccdf->pec !=3D 0x0306) + return false; + /* 0x308 or 0x302 for multiple devices */ + zpci_remove_reserved_devices(); + zpci_scan_devices(); + return true; +} =20 - zpci_dbg(3, "avl fid:%x, fh:%x, pec:%x\n", - ccdf->fid, ccdf->fh, ccdf->pec); - - if (existing_zdev) - mutex_lock(&zdev->state_lock); +static void zpci_event_avail_new_device(struct zpci_ccdf_avail *ccdf) +{ + struct zpci_dev *zdev; =20 switch (ccdf->pec) { case 0x0301: /* Reserved|Standby -> Configured */ - if (!zdev) { - zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_CONFIGUR= ED); - if (IS_ERR(zdev)) - break; - if (zpci_add_device(zdev)) { - kfree(zdev); - break; - } - } else { - if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) - zpci_event_reappear(zdev); - /* the configuration request may be stale */ - else if (zdev->state !=3D ZPCI_FN_STATE_STANDBY) - break; - zdev->state =3D ZPCI_FN_STATE_CONFIGURED; + zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_CONFIGURE= D); + if (IS_ERR(zdev)) + break; + if (zpci_add_device(zdev)) { + kfree(zdev); + break; } zpci_scan_configured_device(zdev, ccdf->fh); break; case 0x0302: /* Reserved -> Standby */ - if (!zdev) { - zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_STANDBY); - if (IS_ERR(zdev)) - break; - if (zpci_add_device(zdev)) { - kfree(zdev); - break; - } - } else { - if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) - zpci_event_reappear(zdev); - zpci_update_fh(zdev, ccdf->fh); - } - break; - case 0x0303: /* Deconfiguration requested */ - if (zdev) { - /* The event may have been queued before we configured - * the device. - */ - if (zdev->state !=3D ZPCI_FN_STATE_CONFIGURED) - break; - zpci_update_fh(zdev, ccdf->fh); - zpci_deconfigure_device(zdev); - } - break; - case 0x0304: /* Configured -> Standby|Reserved */ - if (zdev) { - /* The event may have been queued before we configured - * the device.: - */ - if (zdev->state =3D=3D ZPCI_FN_STATE_CONFIGURED) - zpci_event_hard_deconfigured(zdev, ccdf->fh); - /* The 0x0304 event may immediately reserve the device */ - if (!clp_get_state(zdev->fid, &state) && - state =3D=3D ZPCI_FN_STATE_RESERVED) { - zpci_device_reserved(zdev); - } - } - break; - case 0x0306: /* 0x308 or 0x302 for multiple devices */ - zpci_remove_reserved_devices(); - zpci_scan_devices(); - break; - case 0x0308: /* Standby -> Reserved */ - if (!zdev) + zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_STANDBY); + if (IS_ERR(zdev)) break; - zpci_device_reserved(zdev); - break; - default: + if (zpci_add_device(zdev)) { + kfree(zdev); + break; + } break; } - if (existing_zdev) { - mutex_unlock(&zdev->state_lock); - zpci_zdev_put(zdev); +} + +static void zpci_event_avail_existing_device(struct zpci_dev *zdev, struct= zpci_ccdf_avail *ccdf) +{ + enum zpci_state state; + + switch (ccdf->pec) { + case 0x0301: /* Reserved|Standby -> Configured */ + if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) + zpci_event_reappear(zdev); + /* the configuration request may be stale */ + else if (zdev->state !=3D ZPCI_FN_STATE_STANDBY) + break; + zdev->state =3D ZPCI_FN_STATE_CONFIGURED; + zpci_scan_configured_device(zdev, ccdf->fh); + break; + case 0x0302: /* Reserved -> Standby */ + if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) + zpci_event_reappear(zdev); + zpci_update_fh(zdev, ccdf->fh); + break; + case 0x0303: /* Deconfiguration requested */ + /* The event may have been queued before we configured + * the device. + */ + if (zdev->state !=3D ZPCI_FN_STATE_CONFIGURED) + break; + zpci_update_fh(zdev, ccdf->fh); + zpci_deconfigure_device(zdev); + break; + case 0x0304: /* Configured -> Standby|Reserved */ + /* The event may have been queued before we configured + * the device.: + */ + if (zdev->state =3D=3D ZPCI_FN_STATE_CONFIGURED) + zpci_event_hard_deconfigured(zdev, ccdf->fh); + /* The 0x0304 event may immediately reserve the device */ + if (!clp_get_state(zdev->fid, &state) && + state =3D=3D ZPCI_FN_STATE_RESERVED) { + zpci_device_reserved(zdev); + } + break; + case 0x0308: /* Standby -> Reserved */ + zpci_device_reserved(zdev); + break; } } =20 void zpci_event_availability(void *data) { - if (zpci_is_enabled()) - __zpci_event_availability(data); + struct zpci_ccdf_avail *ccdf =3D data; + struct zpci_dev *zdev; + + if (!zpci_is_enabled()) + return; + zpci_dbg(3, "avl fid:%x, fh:%x, pec:%x\n", + ccdf->fid, ccdf->fh, ccdf->pec); + if (zpci_event_avail_any_device(ccdf)) + return; + zdev =3D get_zdev_by_fid(ccdf->fid); + if (!zdev) + return zpci_event_avail_new_device(ccdf); + mutex_lock(&zdev->state_lock); + zpci_event_avail_existing_device(zdev, ccdf); + mutex_unlock(&zdev->state_lock); + zpci_zdev_put(zdev); } --=20 2.53.0 From nobody Fri Oct 2 03:37:01 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99DFB471CF0; Wed, 5 Aug 2026 13:36:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785936996; cv=none; b=nm4/lV8I1UhXl5hBu+r8StaUNSbAoGnvBqlgAIT7IlexhdV6psFIxUlo4x/VSU6PNv2Fx47RNmOCUBrDtRlJ8wNCuJ/8mgvCo8QDp8wpZncTikRczhbRPNSTZx3v51Z52jilheO7f3kyO1rh5CcTgHHhFe72mGvmDgF0T7IkItw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785936996; c=relaxed/simple; bh=Nd1kCbjS6DjyiQUeEp5JQBA3E+JbcJvq6eSHAW27iqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pWIQ+trX/ls4OfMWQ22aSdtGftE4dCeAD5H/IOJL8wl4+Pog2re237nINhRJYJotyWvS6KSTQb81lYIwLz4R1zh1kqMyynB1AsDsk86S8CE2laRxbvyAo4G/pIkB2Tzo8afs1Ep+oe+TMQMJCgUWFSJ+CvizBnG5FWqWkOgqE+s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=S+0WJjrJ; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="S+0WJjrJ" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 675CHcYx3825244; Wed, 5 Aug 2026 13:36:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=d/rKO0V/9Je4Vlvfu P4mGZc9y9/FOzVINEuDVu8jQWw=; b=S+0WJjrJfioTl16cYj2tPSvF8jvIRrZMF 5oqinJfJjvEsPzIvZrgx6cou3s7h+NtMfg/cJt1iCLLuAYYzG2ZRGAYiElYOl2BP w7EqOw9ATuOlaWTd039a5dnwEA2Y+Un8cSQA5OXPA37m21yw3voZr2dPOafiEzfy tj5akFsY02iPyUgc9PlUVIESVXuc+KGh7DLFJZ4uSGSX2DGuJMLOtvab8Az1J5j0 9L1TGHyABBbKMg/no5UqE/V+lxHwYgCp+KIi+pGVFIsf397Uyzubn9TNx4Qiz7Zd xqSbk2dLYoZBJXoslpU0/aaSlK4cfbZSfcSb0pIqACeQqutXzgrYg== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs8h539aa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Aug 2026 13:36:32 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 675DQHnn004402; Wed, 5 Aug 2026 13:36:32 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fsu4qpvjr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Aug 2026 13:36:32 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 675DaSX149545726 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 5 Aug 2026 13:36:28 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7A24C20040; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 44CC52004D; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 5 Aug 2026 13:36:28 +0000 (GMT) From: Heiko Carstens To: Alexander Gordeev , Sven Schnelle , Vasily Gorbik , Christian Borntraeger , Niklas Schnelle , Gerd Bayer Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] s390/pci: Enable CONTEXT_ANALYSIS Date: Wed, 5 Aug 2026 15:36:27 +0200 Message-ID: <20260805133627.1216607-4-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260805133627.1216607-1-hca@linux.ibm.com> References: <20260805133627.1216607-1-hca@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwODA1MDEwNyBTYWx0ZWRfX83rtpIwTZqDx YnAJEu7VwwUoXrazvXVZG7l5xCyUp4uo2aR8w07V3LRGzGRg442TVURz5gDszZ0H3whfUGtfHAw GrqjQITn77H7A0To22oouNxDC49sZ40= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA1MDEwNyBTYWx0ZWRfXwHHKhomF0O6S GnqbtYa0+6yB5QsxQ97hlRvM1AcMi7V6Hi+/xYfxiOFp5pr9eF44jIiwvBXwgNyDFv9nBJS0PqK YVR4OHvOWnjUQyg6uMl7dpktT10jlTwr6Qk+U68ncKTzGzOqQZJ0Zc3cruZ1WUEQBasaWZfoE6W BhZpkH4rJ4Xp3eZ70d0dwafeVRod+wrlF+Ry1sr5X1UlxV1c5NZpi5sNar1icj1H3hjCbx6RN+0 uZ3wba270whmVuZ0xy9NExevHaRLMUBPxvyDCnE4mMlw7t6oHn9b/i29t7KwrtF4gUe/IKQ0/0W cAablTM7mu48luBysBs84UyxXLcdovQ3/doPMywwUC/PkgIV8aPPHFTwl/6MQ/UxmLJBj7BsGlH WPxqHUbJSoROBsaT0/25G+dTucnrsphJtBw/2wCsjyC7XjJ1SCxyw7NhYBxuypJ/0lb/wNBgDK4 ALU4MdvAd+XANr1zBxw== X-Authority-Analysis: v=2.4 cv=SI1ykuvH c=1 sm=1 tr=0 ts=6a733c61 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=BVUoiYlOf69TRVgg-NoA:9 X-Proofpoint-ORIG-GUID: 6_chB8N_bDvffaQjInKEPvgGmQdh7gLr X-Proofpoint-GUID: 6_chB8N_bDvffaQjInKEPvgGmQdh7gLr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-05_04,2026-08-04_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 suspectscore=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608050107 Content-Type: text/plain; charset="utf-8" Enable CONTEXT_ANALYSIS since s390's pci code compiles now without warnings. Reviewed-by: Niklas Schnelle Signed-off-by: Heiko Carstens --- arch/s390/pci/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/pci/Makefile b/arch/s390/pci/Makefile index 1810e0944a4e..b8be1316491b 100644 --- a/arch/s390/pci/Makefile +++ b/arch/s390/pci/Makefile @@ -3,6 +3,8 @@ # Makefile for the s390 PCI subsystem. # =20 +CONTEXT_ANALYSIS :=3D y + obj-$(CONFIG_PCI) +=3D pci.o pci_irq.o pci_clp.o \ pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ pci_bus.o pci_kvm_hook.o pci_report.o pci_fixup.o --=20 2.53.0