From nobody Wed Dec 17 16:08:08 2025 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 4DB1A20370D; Wed, 12 Feb 2025 21:34:38 +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=1739396081; cv=none; b=dNuIrxukDtpAktr7EAM6HcU1viT3oKDcWlpR4n0QgoFVsWJXP2SgYp5DTdfyfFRUBcesvKugW2shrKUlAbdneuXf0ZURWEXwJ4jwdDtvzs2V6ZnC6hWOsPRySO0+52q1lX6I1j8VQUNpJj9uiFOkhnLvfHweNV9eQpiTUyIuU2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739396081; c=relaxed/simple; bh=pPA/FPCALLtCi1P09AFQdrA3b92adSUYx4G0GA5Nh5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aAJszZChe1m08taZ3hfbWHkIPSttyCFlwc81f0MAmc4I4erIW811ZJLqio/WKa/Vt1wjt2l0p0TsH96f/mSB/6p58I5ZKnCMsPELacjGIeQ2iAH0JD/9LVaRguvbexpAB4oy2p2H7s+7ynFnkX1UUM5I9p5PN3MMioJ+8cWxy/g= 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=lLkCW9/P; 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="lLkCW9/P" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51CKGA03015253; Wed, 12 Feb 2025 21:34:27 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=1o0mWr+AP905Ri1hg xKnneXc4cju+1S36WBaT8aqkn0=; b=lLkCW9/PB9g12Qh+AreOuglRFPJZMmLeY PQOHw51v1DA+KNqaBH7f4d9qPVQnFjh4Ts5W1tFRzrSHIuaITzRy+9ztI/NNPPSM lrANS3UOJreOctv+c59I8aJANEKqyBr9EkjpdRv52cddYZxR+WN6SpXDrgCQscWE sMT+huAmu4fduhdNBwNvwe4ArQzb4ovFnKi7oTlTncH7Ld48t1jE5vWLbGXw+QMh VOQrZL08ppxTeGptSItT8PoMnD5wy5maLfQ3RvV2UmzkixS4eY5EvgrDZ7uTuLcv lNlcT7goKpaPHmCvQAhHzpNzi6kNRi6lF7b4e9xS0dvszUgrgctkw== 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 44rxfu1qg4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Feb 2025 21:34:26 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51CIEXA3021665; Wed, 12 Feb 2025 21:34:26 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 44phksu5tu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Feb 2025 21:34:26 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51CLYNfp57606482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Feb 2025 21:34:23 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 20DC658060; Wed, 12 Feb 2025 21:34:24 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F21BC58068; Wed, 12 Feb 2025 21:34:22 +0000 (GMT) Received: from li-2311da4c-2e09-11b2-a85c-c003041e9174.ibm.com.com (unknown [9.61.186.234]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 12 Feb 2025 21:34:22 +0000 (GMT) From: Matthew Rosato To: joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, gerald.schaefer@linux.ibm.com, schnelle@linux.ibm.com Cc: hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, borntraeger@linux.ibm.com, farman@linux.ibm.com, clegoate@redhat.com, jgg@nvidia.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH v5 3/4] iommu/s390: handle IOAT registration based on domain Date: Wed, 12 Feb 2025 16:34:17 -0500 Message-ID: <20250212213418.182902-4-mjrosato@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250212213418.182902-1-mjrosato@linux.ibm.com> References: <20250212213418.182902-1-mjrosato@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: uTe1SCDQ96HjuHZSpAlr_Wn87CvPZHVu X-Proofpoint-GUID: uTe1SCDQ96HjuHZSpAlr_Wn87CvPZHVu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-12_06,2025-02-11_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 adultscore=0 mlxlogscore=922 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502120152 Content-Type: text/plain; charset="utf-8" At this point, the dma_table is really a property of the s390-iommu domain. Rather than checking its contents elsewhere in the codebase, move the code that registers the table with firmware into s390-iommu and make a decision what to register with firmware based upon the type of domain in use for the device in question. Tested-by: Niklas Schnelle Reviewed-by: Niklas Schnelle Signed-off-by: Matthew Rosato --- arch/s390/include/asm/pci.h | 2 ++ arch/s390/kvm/pci.c | 17 ++------------- arch/s390/pci/pci.c | 35 +++++++++++++++++------------- arch/s390/pci/pci_sysfs.c | 11 +--------- drivers/iommu/s390-iommu.c | 43 +++++++++++++++++++++++++++++++++++-- 5 files changed, 66 insertions(+), 42 deletions(-) diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 8fe4c7a72c0b..7cc6a7cc66e7 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -217,6 +217,7 @@ extern struct airq_iv *zpci_aif_sbv; struct zpci_dev *zpci_create_device(u32 fid, u32 fh, enum zpci_state state= ); int zpci_add_device(struct zpci_dev *zdev); int zpci_enable_device(struct zpci_dev *); +int zpci_reenable_device(struct zpci_dev *zdev); int zpci_disable_device(struct zpci_dev *); int zpci_scan_configured_device(struct zpci_dev *zdev, u32 fh); int zpci_deconfigure_device(struct zpci_dev *zdev); @@ -245,6 +246,7 @@ void update_uid_checking(bool new); /* IOMMU Interface */ int zpci_init_iommu(struct zpci_dev *zdev); void zpci_destroy_iommu(struct zpci_dev *zdev); +int zpci_iommu_register_ioat(struct zpci_dev *zdev, u8 *status); =20 #ifdef CONFIG_PCI static inline bool zpci_use_mio(struct zpci_dev *zdev) diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c index 9b9e7fdd5380..8c40154ff50f 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -433,7 +433,6 @@ static void kvm_s390_pci_dev_release(struct zpci_dev *z= dev) static int kvm_s390_pci_register_kvm(void *opaque, struct kvm *kvm) { struct zpci_dev *zdev =3D opaque; - u8 status; int rc; =20 if (!zdev) @@ -480,13 +479,7 @@ static int kvm_s390_pci_register_kvm(void *opaque, str= uct kvm *kvm) */ zdev->gisa =3D (u32)virt_to_phys(&kvm->arch.sie_page2->gisa); =20 - rc =3D zpci_enable_device(zdev); - if (rc) - goto clear_gisa; - - /* Re-register the IOMMU that was already created */ - rc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, - virt_to_phys(zdev->dma_table), &status); + rc =3D zpci_reenable_device(zdev); if (rc) goto clear_gisa; =20 @@ -516,7 +509,6 @@ static void kvm_s390_pci_unregister_kvm(void *opaque) { struct zpci_dev *zdev =3D opaque; struct kvm *kvm; - u8 status; =20 if (!zdev) return; @@ -550,12 +542,7 @@ static void kvm_s390_pci_unregister_kvm(void *opaque) goto out; } =20 - if (zpci_enable_device(zdev)) - goto out; - - /* Re-register the IOMMU that was already created */ - zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, - virt_to_phys(zdev->dma_table), &status); + zpci_reenable_device(zdev); =20 out: spin_lock(&kvm->arch.kzdev_list_lock); diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 88f72745fa59..fa879351efb5 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -124,14 +124,13 @@ int zpci_register_ioat(struct zpci_dev *zdev, u8 dmaa= s, struct zpci_fib fib =3D {0}; u8 cc; =20 - WARN_ON_ONCE(iota & 0x3fff); fib.pba =3D base; /* Work around off by one in ISM virt device */ if (zdev->pft =3D=3D PCI_FUNC_TYPE_ISM && limit > base) fib.pal =3D limit + (1 << 12); else fib.pal =3D limit; - fib.iota =3D iota | ZPCI_IOTA_RTTO_FLAG; + fib.iota =3D iota; fib.gd =3D zdev->gisa; cc =3D zpci_mod_fc(req, &fib, status); if (cc) @@ -690,6 +689,23 @@ int zpci_enable_device(struct zpci_dev *zdev) } EXPORT_SYMBOL_GPL(zpci_enable_device); =20 +int zpci_reenable_device(struct zpci_dev *zdev) +{ + u8 status; + int rc; + + rc =3D zpci_enable_device(zdev); + if (rc) + return rc; + + rc =3D zpci_iommu_register_ioat(zdev, &status); + if (rc) + zpci_disable_device(zdev); + + return rc; +} +EXPORT_SYMBOL_GPL(zpci_reenable_device); + int zpci_disable_device(struct zpci_dev *zdev) { u32 fh =3D zdev->fh; @@ -739,7 +755,6 @@ EXPORT_SYMBOL_GPL(zpci_disable_device); */ int zpci_hot_reset_device(struct zpci_dev *zdev) { - u8 status; int rc; =20 lockdep_assert_held(&zdev->state_lock); @@ -758,19 +773,9 @@ int zpci_hot_reset_device(struct zpci_dev *zdev) return rc; } =20 - rc =3D zpci_enable_device(zdev); - if (rc) - return rc; - - if (zdev->dma_table) - rc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, - virt_to_phys(zdev->dma_table), &status); - if (rc) { - zpci_disable_device(zdev); - return rc; - } + rc =3D zpci_reenable_device(zdev); =20 - return 0; + return rc; } =20 /** diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c index 2de1ea6c3a8c..0ecad08e1b1e 100644 --- a/arch/s390/pci/pci_sysfs.c +++ b/arch/s390/pci/pci_sysfs.c @@ -52,7 +52,6 @@ static DEVICE_ATTR_RO(mio_enabled); =20 static int _do_recover(struct pci_dev *pdev, struct zpci_dev *zdev) { - u8 status; int ret; =20 pci_stop_and_remove_bus_device(pdev); @@ -70,16 +69,8 @@ static int _do_recover(struct pci_dev *pdev, struct zpci= _dev *zdev) return ret; } =20 - ret =3D zpci_enable_device(zdev); - if (ret) - return ret; + ret =3D zpci_reenable_device(zdev); =20 - if (zdev->dma_table) { - ret =3D zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, - virt_to_phys(zdev->dma_table), &status); - if (ret) - zpci_disable_device(zdev); - } return ret; } =20 diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index fbdeded3d48b..007ccfdad495 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c @@ -381,6 +381,46 @@ static void zdev_s390_domain_update(struct zpci_dev *z= dev, spin_unlock_irqrestore(&zdev->dom_lock, flags); } =20 +static int s390_iommu_domain_reg_ioat(struct zpci_dev *zdev, + struct iommu_domain *domain, u8 *status) +{ + struct s390_domain *s390_domain; + int rc =3D 0; + u64 iota; + + switch (domain->type) { + case IOMMU_DOMAIN_IDENTITY: + rc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, + zdev->end_dma, 0, status); + break; + case IOMMU_DOMAIN_BLOCKED: + /* Nothing to do in this case */ + break; + default: + s390_domain =3D to_s390_domain(domain); + iota =3D virt_to_phys(s390_domain->dma_table) | + ZPCI_IOTA_RTTO_FLAG; + rc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, + zdev->end_dma, iota, status); + } + + return rc; +} + +int zpci_iommu_register_ioat(struct zpci_dev *zdev, u8 *status) +{ + unsigned long flags; + int rc; + + spin_lock_irqsave(&zdev->dom_lock, flags); + + rc =3D s390_iommu_domain_reg_ioat(zdev, zdev->s390_domain, status); + + spin_unlock_irqrestore(&zdev->dom_lock, flags); + + return rc; +} + static int blocking_domain_attach_device(struct iommu_domain *domain, struct device *dev) { @@ -422,8 +462,7 @@ static int s390_iommu_attach_device(struct iommu_domain= *domain, blocking_domain_attach_device(&blocking_domain, dev); =20 /* If we fail now DMA remains blocked via blocking domain */ - cc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, - virt_to_phys(s390_domain->dma_table), &status); + cc =3D s390_iommu_domain_reg_ioat(zdev, domain, &status); if (cc && status !=3D ZPCI_PCI_ST_FUNC_NOT_AVAIL) return -EIO; zdev->dma_table =3D s390_domain->dma_table; --=20 2.48.1