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 F10094968F7; Tue, 5 May 2026 20:05:22 +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=1778011524; cv=none; b=fMFYjNvY8pdfp4SMWI7Otk/8w/lv5Raopp1XdoTapHP77V8BzgnaGECryS5mZOH9qkKzx8MJc0JjzPOPPtH9pvpCrJU4yMh6Zwn3cfbOwy7l02teSEhS0gnh/leN5tE6PWsqnN15DzmWddGQ4guYr8q1aBz5YygZcEkq+r9p3/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778011524; c=relaxed/simple; bh=3TYFc6itqVc3zvA3ORsy9QJMk5peLve+M+b/RlDFXR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LixYqwHf5ObtKwnUVATKIf5GvI14RWrzfsYIltNTAeJokw6JU4WnkKlTbLBTSc02h2hiWyx2vF9v+XDJe2c6G4iFzzEv+xyRRW6QZed/jlfqSb94HNAgty10akdyAB8aDy7tLnJe7isDZ/V8XbYBy9djtv6kJqPDKxl0wmL3wh8= 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=YpFLIFHZ; 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="YpFLIFHZ" 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 645Ik4Og3003512; Tue, 5 May 2026 20:05:19 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=2t4MJ6w9XSNqCnRGI TK3LALBDAsPD/NV/iok/YHO6WA=; b=YpFLIFHZiNsU/NAM4KuGa2tiF2Sl1LV7x goDtHNWUS9QahSwr5wXD1BLLobyw6dNVB5fV6Z3fNNxAxi1YrQcn9Mt99lBMXXAJ kXvjiQW8WyKqeL38mb75IOblXA0kc1wvZ3OTaH5TcvA5D+qu2LXYicriDrsHxZg2 bNRPB2qpYpK5/xwMocwohoXfywk6vllpZ0e0l6OmnybFmk32l0QgwwJsuu/yfIKe E5fbk3lNhnF8OI0GoElV0sV4WsYQS2MyiA2jz9rL9fm9CcWklhSosKJlRC/qylyA 2wL8WmArutenpkLtsnbuFiqKInmzJT+ZeK2LFPykmL54m2kP8lOvA== 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 4dw9v7dkv5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 20:05:18 +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 645JsW1Q031825; Tue, 5 May 2026 20:05:18 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dwx9yb0bx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 20:05:18 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 645K5HBl27788004 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 May 2026 20:05:17 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2CC5158055; Tue, 5 May 2026 20:05:17 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6F30758043; Tue, 5 May 2026 20:05:16 +0000 (GMT) Received: from IBM-D32RQW3.ibm.com (unknown [9.61.242.219]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 5 May 2026 20:05:16 +0000 (GMT) From: Farhan Ali To: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Cc: helgaas@kernel.org, alex@shazbot.org, alifm@linux.ibm.com, schnelle@linux.ibm.com, mjrosato@linux.ibm.com, Julian Ruess Subject: [PATCH v15 7/7] vfio/pci: Remove the pcie check for VFIO_PCI_ERR_IRQ_INDEX Date: Tue, 5 May 2026 13:05:10 -0700 Message-ID: <20260505200510.2954-8-alifm@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260505200510.2954-1-alifm@linux.ibm.com> References: <20260505200510.2954-1-alifm@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-s390@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: AW1haW4tMjYwNTA1MDE5MSBTYWx0ZWRfX2XRQLX0TPHU8 mQCFEFqhBgeVqkMGFjMXi+lt3xo9JZ3gjEuhBQyObqH+jQ2R+D7Ta/QVJc54cOY87MdX6aWFqVH jhNrsGmQuGkgpOhQA1OfpekDC0QhnHXRyiRoS755MkpsHjxSsfbrhj07BzFJvKWvZUNhEGOdBG/ 8K/HBcThaReiqinalowRWXSMSKPOwMLZSjKFXwbjclKesupYHwvHHMdNHo+VEts2hGL6lym06lu U9UDDUa2VBeD5q9X6zOGg/LBxdtxO9n0KrURiodsAazNeLGUK0pLbloFy8n4/GIVFNHlEbVf/+i zt+UYD9zXMsBhxr8f3dR65tR7PwFy3ZQoKp7xC/rssewE5gRGZRgZ49UWlt9uL+s3TBttccRxxo 1KPQIPTsQXvkqXxknm2pFGYs5EDn9UsiZdq6r7Guv5nWxt6DNnGFb4BHifcquQw5wFqmaimYWWy 892AKGpEMi/AF0UCr4Q== X-Proofpoint-GUID: MEF0f7QDnVG_OcqCANNG0VD9zgWmsNrW X-Proofpoint-ORIG-GUID: MEF0f7QDnVG_OcqCANNG0VD9zgWmsNrW X-Authority-Analysis: v=2.4 cv=eu/vCIpX c=1 sm=1 tr=0 ts=69fa4d7f cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=NGcC8JguVDcA: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.51,FMLib:17.12.100.49 definitions=2026-05-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050191 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 6358b59fab2b..cd9f31b28160 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -786,8 +786,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; } @@ -1163,11 +1162,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