From nobody Fri Oct 2 08:24:49 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 60EF92C21FF; Mon, 3 Aug 2026 14:29:14 +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=1785767355; cv=none; b=Wr6FffAW+aVP8mOgerlNBn26+gFt8inhf1yHb2CHOu0rODwzQAXvViSxCgznSpCWlvvMGlrV6D/LW/8n/fw+JwfxM+9du1TNHZYwRFqBM/41/RR3FfRiFawxchfHVEB8xywlddru2+6K8J2GpTPu1mbknSNC02Q7A7efa1OS40c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785767355; c=relaxed/simple; bh=l8VHo3beb+c1Ya5TU1gZOZ/9kYIgeg3YtqpughHy37Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JjP1ztIeMZDAm58MM1zrMQqxcmSCnIHvykWC//w+xf8HHWrbmpGPsCpUJk58r4BcqikCAhWMMd4KDckACejES+cFVnuxurbavi10XTkTTVIs1Qee5yjRkb4aN92F4sRVLvq1xahg4Gk6QF9W/P8/YZZ7lSV7W725ZSVvLyYEneM= 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=fJKiROfK; 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="fJKiROfK" 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 673EHv532206416; Mon, 3 Aug 2026 14:29:13 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=KAPt8yphSUrRziQzp GGyIEBbbgEz71A+Y8k1zEJtR2s=; b=fJKiROfKdk9H5I7hkaIqTduKVLYS3NvQx dW5QLFI3EWSctBHK7y9b4brbLmx5Rsk09/TsMa5Bnsh0lBo7LlCTuYm40lnCUSl2 Cuy/KbO5uFbuym00G+WiI87Gs6TMLKPALDRGxeEo9GE6vYDF+SazBi1LnQUemeY7 cS+vcC5Bd29vsKRJ/p3oSQVnxw6Vr+sEkcuRuLhOeeUJ9KBSWmMjsPMcdxWBGBzA XuoPTlc9fYh6C36SrvG3YH2KoH8chWZiIxNEMc4SlDIIT3pnQmj6WfcZ+EEriglW uq1KO1njvCWq2t+4Kvesv+D5yGu76MehnNnDeJURyL6pZphs2GOzw== 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 4fs77g13gw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 14:29:13 +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 673EQFVP012122; Mon, 3 Aug 2026 14:29:12 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fswtydhpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 14:29:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 673ET83714680514 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Aug 2026 14:29:08 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 713FD20040; Mon, 3 Aug 2026 14:29:08 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4CAE32004B; Mon, 3 Aug 2026 14:29:08 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 3 Aug 2026 14:29:08 +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 v2 1/3] s390/pci: Rework __zpci_event_error() to remove conditional locking Date: Mon, 3 Aug 2026 16:29:05 +0200 Message-ID: <20260803142907.1771509-2-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260803142907.1771509-1-hca@linux.ibm.com> References: <20260803142907.1771509-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: AW1haW4tMjYwODAzMDEyOCBTYWx0ZWRfX+G191qlPCXQ7 6FL49vu8HyfWqUus+JR900HE4bjlYNm9i4vVCATkDykVqCt+uNOR2Jnzq84l3v0wF5plhMLpjuu 7+/vp1vN8AaagUONZ6xl/gP6qIvaTX57bwj/DA3JHmDZ48f8sGas0jA1HGwHKmncz4vQlOWOGMq HKSXyiSS6SZx48zxbB229gnCoDTfLQ1QqzK12RI9b1/ekwSIaWQgsqtvT46C7YJHF9V60ZsCWcU 76lwa9rWepYhRbZmvR3Hp8TMQ5TGe4xmNB3ontwMDEkfeRQlxernUE7W3gPWzFNE8SAUqal/uqH ByzLJxLbMbnMU9O6Z2ZRw6PtGjJdVFZitnD4gKFvBPePpYULFLoVOMt+HSq/VbkLLatHwVM+e8+ QwlrSXBoMBjaZPvQc6OOaziBYbnHADrKF5fQXh3y+k/olMI6PdWrTmkqCyHMN1O3eZGkmwPNqEG xCr+ux+As1e4HXfo+hQ== X-Authority-Analysis: v=2.4 cv=WIFPmHsR c=1 sm=1 tr=0 ts=6a70a5b9 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=m4_1mmLPwvc7V99NFaoA:9 X-Proofpoint-GUID: Ff15MI4aK0exooL4EH2z8VZXB7Q_tAA2 X-Proofpoint-ORIG-GUID: Ff15MI4aK0exooL4EH2z8VZXB7Q_tAA2 X-Proofpoint-Spam-Info: AW1haW4tMjYwODAzMDEyOCBTYWx0ZWRfXwZYsou9p05wC VC92OR87YOLwVhvAS5AOZOhHn41Xiv8qOeELLb5ajh256F5aP+Qr078bZn7MVubZx1MXOEyilOt o5vTil6WO6V/k9O4/KRRYElsJPo5Al8= 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-03_03,2026-08-03_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-2608030128 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. Signed-off-by: Heiko Carstens Reviewed-by: Niklas Schnelle --- 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..48fa26dcbee1 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(pdev, 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 08:24:49 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 C62071F1537; Mon, 3 Aug 2026 14:29:14 +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=1785767357; cv=none; b=gtkg+ZnnjXRN3Og0q/7H88QKmvnIBZ4GqsRfnMVzgE+pytI2rEsy+ddrkTRFsaW7sRdCm+eOQw3GXmwYeZGS+LDSq27senWNVQlDRsdQeDJaKFK75aq+akaSZ6BXVGOg+sbE7Qoza3XajmR3Px/fxvysNwyIL+3+cV7nvw4XWu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785767357; c=relaxed/simple; bh=beUFEsrq0hzFEnjL/+rqERJNky4pwzxgF7zPSiF4qqE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DhTUOcNkD0UNVGfuGVHzqujdSyZT5oLfZaBdnJuTs8pwYKj2OVvXbxx/094veQs5++Op5A8x/4Pz42lCy1KDmeGzU1PReNe+Hu+fNUEqEfErTwW8ROLF3AURbHv2ihN3+wEXQLFzE9yYXknhUO4lWNfKq1YhRLcvK/tmfbhD03c= 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=FMmoLx6g; 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="FMmoLx6g" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 673EIQGZ2342295; Mon, 3 Aug 2026 14:29:13 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=9tXzDKhyISs/qElBn EJb4B/9nmHKL0PWuDli8MYqL38=; b=FMmoLx6gHkHIhkPi8hFrRWacBBW61xO0K m/ZFwDmHEG8ASYR7IEJ6w/ODOMkIFA1YovgWCn8CuExfjQuH/MCnMhFY5IvihxOd mMKnWUPE5LS/NrCd4sv6Kq2Cpa0xcT6KUBXNKHUsYFAU03IS/eObRHiVeCJxs+OJ D3paKgFbKqNhwF4MU5a9hvUAKRVqKuE6jbl387dmKpX1agy81hoDof1cCIpHAh7P ZthDDXmIdir05GcystQiXjqqI126s/makYbYEiRxQQTXdMrKJ0GWyUEnxTdxeuZu CCYAZwVjHolTCVm8uQccCAfrmFsPeSx+x8kmnKmT3miUDxWKjw8ug== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs8eugwjx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 14:29:13 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 673EDNTt029830; Mon, 3 Aug 2026 14:29:12 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsv4jwsr4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 14:29:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 673ET8AC25952798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Aug 2026 14:29:08 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9BEEC2004B; Mon, 3 Aug 2026 14:29:08 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 76FDF20043; Mon, 3 Aug 2026 14:29:08 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 3 Aug 2026 14:29:08 +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 v2 2/3] s390/pci: Rework__zpci_event_availability() to remove conditional locking Date: Mon, 3 Aug 2026 16:29:06 +0200 Message-ID: <20260803142907.1771509-3-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260803142907.1771509-1-hca@linux.ibm.com> References: <20260803142907.1771509-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-ORIG-GUID: 0-hs2zUGHg7ovT1toytK9XDfUnDs0gYi X-Proofpoint-Spam-Info: AW1haW4tMjYwODAzMDEyOCBTYWx0ZWRfX8Tol8I5oaNuC 8DCKi8SXr7PW/uM1VISAzkJpo2q8WBtUP8yVXuFp5Pk6tRTIZS59zwmWUZlvkYVefEHOiKL2fVh s4BR7B3scaK6AilVI0SsyeFC3QmY5pU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODAzMDEyOCBTYWx0ZWRfX6QmtUYw/UwiU qhmUiyhEDNpyumPXR+53mUWMQL/zCgVGUkvfgNkq8+X5aa7jvUuCF3rvtbgKFWQXM4eT11N27GG IuECAgBe8ON1LzInXdieaRZwQxeV9n4PsIZnDDgRHWFgj5WBTg2BL4d4FhOZV+sLpWLvpwbPrHd tsSZtUFYrWuZqomZjjuKuo5IjLKyEWJrd97ghrBaOXhv4h9doeHnvG+9GM6XvhzVl/gwDZV0QXO GRPwI3zWTO1KWDRxYGIqrtymuaj43U7Wzqdzf41r/Bgd8STLTVIquXGNZrcey7RhhFgC64VrN36 KrbEYoqfhE8mEpFooHOl56J30Wj2/YBnNA4EsC/CCAxE+z9mTN8unXUdtLj7g6zQEqp7dG+tqOM 5qOHfSefSPaxNf08xqba65bdReg6vMjGgGBwOqn4Dhlqca7F5kSTTKgiORzUcxu6O3sIlLhRrKg ateEU5RfYEagNBOx6bw== X-Proofpoint-GUID: 0-hs2zUGHg7ovT1toytK9XDfUnDs0gYi X-Authority-Analysis: v=2.4 cv=KfzidwYD c=1 sm=1 tr=0 ts=6a70a5b9 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=JSI3kJYzbkUK55s_vuQA:9 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-03_03,2026-08-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 clxscore=1015 priorityscore=1501 phishscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608030128 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 | 108 +++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index 48fa26dcbee1..f96ee87405f9 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -389,19 +389,25 @@ static void zpci_event_reappear(struct zpci_dev *zdev) =20 static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) { - struct zpci_dev *zdev =3D get_zdev_by_fid(ccdf->fid); - bool existing_zdev =3D !!zdev; + struct zpci_dev *zdev; enum zpci_state state; =20 zpci_dbg(3, "avl fid:%x, fh:%x, pec:%x\n", ccdf->fid, ccdf->fh, ccdf->pec); =20 - if (existing_zdev) - mutex_lock(&zdev->state_lock); + /* 0x0306 - No handle or fid stored */ + if (ccdf->pec =3D=3D 0x0306) { + /* 0x308 or 0x302 for multiple devices */ + zpci_remove_reserved_devices(); + zpci_scan_devices(); + return; + } =20 - switch (ccdf->pec) { - case 0x0301: /* Reserved|Standby -> Configured */ - if (!zdev) { + zdev =3D get_zdev_by_fid(ccdf->fid); + + if (!zdev) { + switch (ccdf->pec) { + case 0x0301: /* Reserved|Standby -> Configured */ zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_CONFIGUR= ED); if (IS_ERR(zdev)) break; @@ -409,18 +415,9 @@ static void __zpci_event_availability(struct zpci_ccdf= _avail *ccdf) 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; - } - zpci_scan_configured_device(zdev, ccdf->fh); - break; - case 0x0302: /* Reserved -> Standby */ - if (!zdev) { + zpci_scan_configured_device(zdev, ccdf->fh); + break; + case 0x0302: /* Reserved -> Standby */ zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_STANDBY); if (IS_ERR(zdev)) break; @@ -428,53 +425,54 @@ static void __zpci_event_availability(struct zpci_ccd= f_avail *ccdf) kfree(zdev); break; } - } else { - if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) - zpci_event_reappear(zdev); - zpci_update_fh(zdev, ccdf->fh); + break; } + return; + } + + mutex_lock(&zdev->state_lock); + 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 */ - 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); - } + /* 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); - } + /* 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) - break; zpci_device_reserved(zdev); break; - default: - break; - } - if (existing_zdev) { - mutex_unlock(&zdev->state_lock); - zpci_zdev_put(zdev); } + mutex_unlock(&zdev->state_lock); + zpci_zdev_put(zdev); } =20 void zpci_event_availability(void *data) --=20 2.53.0 From nobody Fri Oct 2 08:24:49 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 D893630BF67; Mon, 3 Aug 2026 14:29:14 +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=1785767356; cv=none; b=JyI9C3c9hZLIotWIVOy0SaUktVX7bYVQrlRP93RmmRNqjfSf3s/YwH2Nzdr5soCwZ3OsA/ZajIGCZpORHdrTnKF7fhw9g8Zs34uWijCNxY4wxw3DR0J4sP7XUkB/4ZooRNxioXr0Cawx/uLU7WnC+p5U7tOK2a+9SMBE1/eNbww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785767356; c=relaxed/simple; bh=mclsNwZP6adbRjVRyGhr3KqNodbTA1Ic/YqMpeR3I6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NxVmdx2XYrmTI0ixYXNYjSmZPBAd+3wiBrPe8pCU7y2uf+Ea5oV74Iy6Ghr9ozAU1Fiq0N5PCb9waZquczaIBxllBiYpuS14vVDVJE7bLW4h/qJn/t/27q2ywV/9fvjwk6m2Of+uP8X9uIFSD/LIr3JyLY5nX3+/wlYKdYgxQOo= 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=RIO1y2KC; 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="RIO1y2KC" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 673EHYY7413703; Mon, 3 Aug 2026 14:29:14 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=37EJygpbD7lUmddly IOgIJgMzApXhhDgvbSyl7VQjHg=; b=RIO1y2KCxrVVydi3O7FZyCelHCfYcTpKX T83hCc5Px676o01xXNlw4L2UMq7S/4CBBPBoBHy2kxITa5QIMnzWKGCBnb0RpzRU TA6hpQJ/DmTVc07f9Xu5gd0IbwuAcuml0HvT+bqTfXi2VEW1+7FTqJGK/QwerE80 /0JDup6YwBwYNNpmBczyTAam1iD7UV9r8+clEiac5JF9qIIL/6OEQt54NHaGm80i M4Nez9glrwaW8yoWsG/V9Twm0cHu8aeGnEQgunAz0Z537MDCPRyzW56iUhhjDslt i+aH8PWEg6KHjQEn9GRljpxj+j5wiAo2EELZHivWHW62iclvJweAg== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fs8fqh7xu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 14:29:13 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 673EQMpM019962; Mon, 3 Aug 2026 14:29:12 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsugvwvba-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 03 Aug 2026 14:29:12 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 673ET8c820120164 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Aug 2026 14:29:08 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D126E20043; Mon, 3 Aug 2026 14:29:08 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A1B3C20040; Mon, 3 Aug 2026 14:29:08 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 3 Aug 2026 14:29:08 +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 v2 3/3] s390/pci: Enable CONTEXT_ANALYSIS Date: Mon, 3 Aug 2026 16:29:07 +0200 Message-ID: <20260803142907.1771509-4-hca@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260803142907.1771509-1-hca@linux.ibm.com> References: <20260803142907.1771509-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-GUID: GkozQfUg8lWKibHwLATRa3sP-4ACOOGE X-Proofpoint-ORIG-GUID: GkozQfUg8lWKibHwLATRa3sP-4ACOOGE X-Proofpoint-Spam-Info: AW1haW4tMjYwODAzMDEyOCBTYWx0ZWRfXwvU06kuIyPNl w3+xwC2IG7Dx/PnIgOWz0qH1O6gsBdQy5bp+z0MXzcMIOHO7qQDDmoR9JcOM5wgdFbkiTosxkKU 0zO+51IkKYtRLbpwCe1ffU8EPZxqZl0= X-Authority-Analysis: v=2.4 cv=K8cS2SWI c=1 sm=1 tr=0 ts=6a70a5ba cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=BVUoiYlOf69TRVgg-NoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODAzMDEyOCBTYWx0ZWRfX2lv2Q0W+QZwh 2JjUj8geLLUj5Oy0FMtxmGmqs7FuC8anyx4VIBbGFFH5QF/P6K7zZ55n8trxTjU53EWfZHujpML /TJrkiBzwAwSHYGZv+pGVnfw6DAUf+khoWpmO/r1N7B0W8r+wQ/vuPuALUb/XewopnxezWhxBnr tYCmBm9eDcNYGMNOHzpR/QG34W7NZVPwV3Y+zoM545GsSti9yBeZjBnzCQqXQqgI52vqc2W8WMR vSThdf8i1MgYnE836rr9RbAgig5CSN6oEfarVWMy3RalFWQKseKom8HTXh6E6ZWzGeWF8C/Voec bZ8NPXCXxGLemf4VBMNPfPkYwZFZJKU4T0w9n56UAHZfP0MiTNFmUJJ/moSPoVYq8Q/jIfp6AqE mXssVSd0x/u2JrTQWAHDKraBFyhzQQzddvEHH9oiaohn137gl4mm4hXYDQimHympVAjSNYcmDWD 0Q4ojIbJ4W9XijJjTlQ== 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-03_03,2026-08-03_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 impostorscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 phishscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608030128 Content-Type: text/plain; charset="utf-8" Enable CONTEXT_ANALYSIS since s390's pci code compiles now without warnings. Signed-off-by: Heiko Carstens Reviewed-by: Niklas Schnelle --- 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