From mboxrd@z Thu Jan 1 00:00:00 1970 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 9E4CC3859EC; Wed, 3 Jun 2026 18:24:30 +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=1780511071; cv=none; b=d/3+pLvbLok8LUnkrCja7mLXg3AqembdrRMTEagX5GSv/sKC1/IWHxb9/mFwdXPhoQum+LLo+2a4Fw4AnvNuYjQ3KFDOOSdvI5JdyPEsHWBYz3ZETKrgMVRtmJHw3K6HHt0TYAnMrYvRLkfDsY4VOU8aTKxMip1SRfPwRtBChfs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780511071; c=relaxed/simple; bh=Q49eZSf2vr8VwDmj/kMzowyUpNcywD0X7zghuEPtmnM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XUNMjKqWE/xCQwsD4KtlSabTMBC6volwS90tPBc0QTMR2w5E5i9965pTwS0OVhM6A3pKvvlW5S5EbYP+cBjP9YgaYNj0u5/iXa9UgQ7trUIjaSc3adKDoay+0ZWMEXYF9UPn9LLm6pCZ5/JRWVnDZDGQOk24aFRmmCtL3LprbqU= 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=kZpwfmbb; 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="kZpwfmbb" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6538VeYf1773281; Wed, 3 Jun 2026 18:24:26 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=MKCsaNqwmGnMeVjkj BHNF9wk50yw3yiA3EhZNBhzZkw=; b=kZpwfmbbYNSPYaOXkdJBkloOudsP26pkZ fpthrI8N+/Ucd/GL1GM62s6K++XHwJiiK+7zuayl3jTyMegZBWLCTTRWw76yTxoE 3qlLtcPzqoauLfH75IWz2Q8Djqk08rbKyZZ5oq2SEwil1egCVT4ApWXDk1jZg5/G A4tb5YSpm6vqhwZpPTxQUM54tB65Hp6qiwp2ZOndykmd8KDX16R/N6heAkn2VhmA 3QbMAQBzrtp7cw8PBUG4N69S+AF0FXrL10YSOy97qduhIDee62b1Ac9twV9nc2gv FduzggoFqQC6FChmvuWwnhtKrG0xmrs02ljcWySdFqHLzw0w+YnNQ== 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 4efqd4cfr7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 03 Jun 2026 18:24:26 +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 653IO99o021477; Wed, 3 Jun 2026 18:24:25 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4egakw1n2j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 03 Jun 2026 18:24:25 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 653INrTP24642274 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 3 Jun 2026 18:23:53 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 155AB5805C; Wed, 3 Jun 2026 18:24:24 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F2BE15805A; Wed, 3 Jun 2026 18:24:22 +0000 (GMT) Received: from IBM-D32RQW3.ibm.com (unknown [9.61.254.14]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 3 Jun 2026 18:24:22 +0000 (GMT) From: Farhan Ali To: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, alex@shazbot.org Cc: helgaas@kernel.org, alifm@linux.ibm.com, schnelle@linux.ibm.com, mjrosato@linux.ibm.com, Julian Ruess Subject: [PATCH v18 4/4] vfio/pci: Remove the pcie check for VFIO_PCI_ERR_IRQ_INDEX Date: Wed, 3 Jun 2026 11:24:15 -0700 Message-ID: <20260603182415.2324-5-alifm@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260603182415.2324-1-alifm@linux.ibm.com> References: <20260603182415.2324-1-alifm@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjAzMDE3NSBTYWx0ZWRfX5Eqg9ImcWdtU VZNrMgHgY0wd3vTEp+uqWHDFalfQ7AJn/LLxUd+VsMJPwi4csBL3AHqGqLYDMX5bfMgGhpAFc2H yjLWI4sCMu7wSxagX4Ab5EgHdouIExyaE6KHLm+BcOmVSCY61+PFGjI239NSD+4lMgPMiUqoKog UPs0dUTVSl1FXxLWFJwBuFfcbbK4hu4iF2pRbNfRF2IA/ACRzWc7Y1lT8o0VsLFqrUJfxJl6XD9 orNgRf9RpAVrH7Gi0XtI/Q0NLdTsh1idr+YpYPVVBcbeVuy+VrWxEqT2Waz0lf68ADFXcYWHzEv GXdlK2mYw/ag6ZnkVPDRclVATCaOpIOsCjprRggZ+dlNZtEkVUlf/WWAsKvFO+Et3sYGo4YxYkl lnO+1BAHizmVS+i34A1eQM9q2UYqITEI1YCv89GhZddgfvZaql0g/FIdWn5cnW7pL0YxblPXZGw MEcVhLoJmNj/YRONiJg== X-Proofpoint-GUID: eioIjI_pQt5iU-LSiMAbP967BMZkrDj4 X-Proofpoint-ORIG-GUID: eioIjI_pQt5iU-LSiMAbP967BMZkrDj4 X-Authority-Analysis: v=2.4 cv=DZknbPtW c=1 sm=1 tr=0 ts=6a20715a cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=r1p2_3pzAAAA:8 a=bf5i11FZjm5gBOpVircA:9 a=r_pkcD-q9-ctt7trBg_g:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-03_05,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 suspectscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 priorityscore=1501 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606030175 The error signaling is configured for the vast majority of devices and it's extremely rare that it fires anyway. Removing the pcie check will allow userspace to be notified on errors for legacy PCI devices. The Internal Shared Memory (ISM) device on s390 is one such device. For PCI devices on IBM s390 error recovery involves platform firmware and notification to operating system is done by architecture specific way. So the ISM device can still be recovered when notified of an error. Reviewed-by: Julian Ruess Reviewed-by: Niklas Schnelle Reviewed-by: Alex Williamson Signed-off-by: Farhan Ali --- drivers/vfio/pci/vfio_pci_core.c | 8 ++------ drivers/vfio/pci/vfio_pci_intrs.c | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index 95af3e827ee0..e41669fa045f 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -821,8 +821,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_core_device *vdev, int irq_typ return (flags & PCI_MSIX_FLAGS_QSIZE) + 1; } } else if (irq_type == VFIO_PCI_ERR_IRQ_INDEX) { - if (pci_is_pcie(vdev->pdev)) - return 1; + return 1; } else if (irq_type == VFIO_PCI_REQ_IRQ_INDEX) { return 1; } @@ -1198,11 +1197,8 @@ static int vfio_pci_ioctl_get_irq_info(struct vfio_pci_core_device *vdev, switch (info.index) { case VFIO_PCI_INTX_IRQ_INDEX ... VFIO_PCI_MSIX_IRQ_INDEX: case VFIO_PCI_REQ_IRQ_INDEX: - break; case VFIO_PCI_ERR_IRQ_INDEX: - if (pci_is_pcie(vdev->pdev)) - break; - fallthrough; + break; default: return -EINVAL; } diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index 33944d4d9dc4..64f80f64ff57 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -859,8 +859,7 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_core_device *vdev, uint32_t flags, case VFIO_PCI_ERR_IRQ_INDEX: switch (flags & VFIO_IRQ_SET_ACTION_TYPE_MASK) { case VFIO_IRQ_SET_ACTION_TRIGGER: - if (pci_is_pcie(vdev->pdev)) - func = vfio_pci_set_err_trigger; + func = vfio_pci_set_err_trigger; break; } break; -- 2.43.0