From nobody Fri Apr 3 05:33:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DABFC6FA89 for ; Thu, 15 Sep 2022 15:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230457AbiIOPUY (ORCPT ); Thu, 15 Sep 2022 11:20:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230182AbiIOPT4 (ORCPT ); Thu, 15 Sep 2022 11:19:56 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B5CA90C77; Thu, 15 Sep 2022 08:14:25 -0700 (PDT) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28FF2GHm018031; Thu, 15 Sep 2022 15:14:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=9g9fTZ+qsfNqdsQyxDmdlflS+F/f6ED2oz+Ff2v70a4=; b=DtoGrrkk92pe91uSlNikrdkjjOnGiwFEicd0leW0XjaUN2AbQCq4+VINdT4X/33KQArd xGH25xLwX5o8hCQP9cjT7iEBEfBnuxrdoJzkTTVmcXtfvB5aFwLC9NZX981qBQADcdwF LAusByI5UoKUWDx9aa2UMvjkLkK3/ZP6gzTU6nDvvwO8wJFpYhoupm5aN2I8WK5xGOUn qaRlu2XCiwPnw7t3nCQwiGRM+J19JF3R96J1iv9zPCf2YJWUdtCYBhe1PdETCm6TqE7G EBP639euDAZrBuUpYDVbbfleVGcz5ET8rn9NTiQDlqI1AAiKecRTY+6evkEw8Tq7IxHf og== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3jm6b9rjpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Sep 2022 15:14:08 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 28FF7JoM004731; Thu, 15 Sep 2022 15:14:06 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma03ams.nl.ibm.com with ESMTP id 3jjy95tk18-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Sep 2022 15:14:06 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 28FFE3cb39911928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Sep 2022 15:14:03 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3A03F52050; Thu, 15 Sep 2022 15:14:03 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id BD67452051; Thu, 15 Sep 2022 15:14:02 +0000 (GMT) From: Niklas Schnelle To: Matthew Rosato , Pierre Morel , iommu@lists.linux.dev Cc: linux-s390@vger.kernel.org, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, jgg@nvidia.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] iommu/s390: Fix duplicate domain attachments Date: Thu, 15 Sep 2022 17:14:00 +0200 Message-Id: <20220915151402.121032-2-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220915151402.121032-1-schnelle@linux.ibm.com> References: <20220915151402.121032-1-schnelle@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 13gusAirV4Hokwh3nn92iFuH2lqGk5bn X-Proofpoint-ORIG-GUID: 13gusAirV4Hokwh3nn92iFuH2lqGk5bn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-15_09,2022-09-14_04,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=980 clxscore=1011 spamscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000 definitions=main-2209150085 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since commit fa7e9ecc5e1c ("iommu/s390: Tolerate repeat attach_dev calls") we can end up with duplicates in the list of devices attached to a domain. This is inefficient and confusing since only one domain can actually be in control of the IOMMU translations for a device. Fix this by detaching the device from the previous domain, if any, on attach. This also makes the restore behavior analogous between IOMMU and DMA API control. Fixes: fa7e9ecc5e1c ("iommu/s390: Tolerate repeat attach_dev calls") Signed-off-by: Niklas Schnelle --- drivers/iommu/s390-iommu.c | 82 ++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index c898bcbbce11..de8f76775240 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c @@ -83,14 +83,41 @@ static void s390_domain_free(struct iommu_domain *domai= n) kfree(s390_domain); } =20 +static bool __s390_iommu_detach_device(struct s390_domain *s390_domain, + struct zpci_dev *zdev) +{ + struct s390_domain_device *domain_device, *tmp; + unsigned long flags; + bool found =3D false; + + spin_lock_irqsave(&s390_domain->list_lock, flags); + list_for_each_entry_safe(domain_device, tmp, &s390_domain->devices, + list) { + if (domain_device->zdev =3D=3D zdev) { + list_del(&domain_device->list); + kfree(domain_device); + found =3D true; + break; + } + } + spin_unlock_irqrestore(&s390_domain->list_lock, flags); + + if (found) { + zdev->s390_domain =3D NULL; + zpci_unregister_ioat(zdev, 0); + } + return found; +} + static int s390_iommu_attach_device(struct iommu_domain *domain, struct device *dev) { struct s390_domain *s390_domain =3D to_s390_domain(domain); struct zpci_dev *zdev =3D to_zpci_dev(dev); struct s390_domain_device *domain_device; + struct s390_domain *prev_domain =3D NULL; unsigned long flags; - int cc, rc; + int cc, rc =3D 0; =20 if (!zdev) return -ENODEV; @@ -99,16 +126,16 @@ static int s390_iommu_attach_device(struct iommu_domai= n *domain, if (!domain_device) return -ENOMEM; =20 - if (zdev->dma_table && !zdev->s390_domain) { - cc =3D zpci_dma_exit_device(zdev); - if (cc) { + if (zdev->s390_domain) { + prev_domain =3D zdev->s390_domain; + if (!__s390_iommu_detach_device(zdev->s390_domain, zdev)) + rc =3D -EIO; + } else if (zdev->dma_table) { + if (zpci_dma_exit_device(zdev)) rc =3D -EIO; - goto out_free; - } } - - if (zdev->s390_domain) - zpci_unregister_ioat(zdev, 0); + if (rc) + goto out_free; =20 zdev->dma_table =3D s390_domain->dma_table; cc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, @@ -129,7 +156,7 @@ static int s390_iommu_attach_device(struct iommu_domain= *domain, domain->geometry.aperture_end !=3D zdev->end_dma) { rc =3D -EINVAL; spin_unlock_irqrestore(&s390_domain->list_lock, flags); - goto out_restore; + goto out_unregister_restore; } domain_device->zdev =3D zdev; zdev->s390_domain =3D s390_domain; @@ -138,14 +165,15 @@ static int s390_iommu_attach_device(struct iommu_doma= in *domain, =20 return 0; =20 +out_unregister_restore: + zpci_unregister_ioat(zdev, 0); out_restore: - if (!zdev->s390_domain) { + zdev->dma_table =3D NULL; + if (prev_domain) + s390_iommu_attach_device(&prev_domain->domain, + dev); + else zpci_dma_init_device(zdev); - } else { - zdev->dma_table =3D zdev->s390_domain->dma_table; - zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, - virt_to_phys(zdev->dma_table)); - } out_free: kfree(domain_device); =20 @@ -157,30 +185,14 @@ static void s390_iommu_detach_device(struct iommu_dom= ain *domain, { struct s390_domain *s390_domain =3D to_s390_domain(domain); struct zpci_dev *zdev =3D to_zpci_dev(dev); - struct s390_domain_device *domain_device, *tmp; - unsigned long flags; - int found =3D 0; + bool detached; =20 if (!zdev) return; =20 - spin_lock_irqsave(&s390_domain->list_lock, flags); - list_for_each_entry_safe(domain_device, tmp, &s390_domain->devices, - list) { - if (domain_device->zdev =3D=3D zdev) { - list_del(&domain_device->list); - kfree(domain_device); - found =3D 1; - break; - } - } - spin_unlock_irqrestore(&s390_domain->list_lock, flags); - - if (found && (zdev->s390_domain =3D=3D s390_domain)) { - zdev->s390_domain =3D NULL; - zpci_unregister_ioat(zdev, 0); + detached =3D __s390_iommu_detach_device(s390_domain, zdev); + if (detached) zpci_dma_init_device(zdev); - } } =20 static struct iommu_device *s390_iommu_probe_device(struct device *dev) --=20 2.34.1 From nobody Fri Apr 3 05:33:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28E36C6FA89 for ; Thu, 15 Sep 2022 15:20:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231220AbiIOPUQ (ORCPT ); Thu, 15 Sep 2022 11:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbiIOPTz (ORCPT ); Thu, 15 Sep 2022 11:19:55 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18CE789806; Thu, 15 Sep 2022 08:14:20 -0700 (PDT) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28FEjBu1002201; Thu, 15 Sep 2022 15:14:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=QfMAECJGk1+vZHFu4ayTDGu/XjSKf/ezgEIrW9CCQiI=; b=iCgZstqYby6DtZ/GNWWf6IlNGUF2+WR8f3fi3vCflzwj0Iq5q+nISxvrk1b4kmkgTB3h KENqocTSlFyf4xDut11giSIKPLhs3NBgoaaefEPi1DO3a3PU0qDTx//dLSHqZo13UghO Fw2Ukw++97t4L4ZzpPNRKnYbI00k++4XFW1wks0q4taPo/OKkRFtBa4vTFk94Ozm22AX 3BSLFynebgYkQdOsh+PgYQlChb53zZ0UV+J1UvixMi+FwozEWKg36A8y+LT+JwkM2IqD lTL31qB38UwxQE7MdZ/gZIlP0CTLxhgQiJChG6HrNIHvMrBWDmpUOMpEnu7zqwlpEZmT 1A== Received: from ppma02fra.de.ibm.com (47.49.7a9f.ip4.static.sl-reverse.com [159.122.73.71]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3jm633187k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Sep 2022 15:14:09 +0000 Received: from pps.filterd (ppma02fra.de.ibm.com [127.0.0.1]) by ppma02fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 28FF8SDG022443; Thu, 15 Sep 2022 15:14:07 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma02fra.de.ibm.com with ESMTP id 3jjyk6sx81-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Sep 2022 15:14:06 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 28FFE3hM25362932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Sep 2022 15:14:03 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B5B1D52051; Thu, 15 Sep 2022 15:14:03 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3BDCE52052; Thu, 15 Sep 2022 15:14:03 +0000 (GMT) From: Niklas Schnelle To: Matthew Rosato , Pierre Morel , iommu@lists.linux.dev Cc: linux-s390@vger.kernel.org, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, jgg@nvidia.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] s390/pci: remove unused bus_next field from struct zpci_dev Date: Thu, 15 Sep 2022 17:14:01 +0200 Message-Id: <20220915151402.121032-3-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220915151402.121032-1-schnelle@linux.ibm.com> References: <20220915151402.121032-1-schnelle@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: K8kq3hYgb2njsNK_YDBtCalWzTCaC5X6 X-Proofpoint-GUID: K8kq3hYgb2njsNK_YDBtCalWzTCaC5X6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-15_09,2022-09-14_04,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 adultscore=0 malwarescore=0 bulkscore=0 mlxlogscore=944 spamscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000 definitions=main-2209150085 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This field was added in commit 44510d6fa0c0 ("s390/pci: Handling multifunctions") but is an unused remnant of an earlier version where the the devices on the virtual bus were connected in a linked list instead of a fixed 256 entry array of pointers. It is also not used for the list of busses as that is threaded through struct zpci_bus not through struct zpci_dev. Signed-off-by: Niklas Schnelle --- arch/s390/include/asm/pci.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 7b4cdadbc023..108e732d7b14 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -117,7 +117,6 @@ struct zpci_bus { struct zpci_dev { struct zpci_bus *zbus; struct list_head entry; /* list of all zpci_devices, needed for hotplug,= etc. */ - struct list_head bus_next; struct kref kref; struct hotplug_slot hotplug_slot; =20 --=20 2.34.1 From nobody Fri Apr 3 05:33:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D614BC6FA89 for ; Thu, 15 Sep 2022 15:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230455AbiIOPU3 (ORCPT ); Thu, 15 Sep 2022 11:20:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbiIOPT4 (ORCPT ); Thu, 15 Sep 2022 11:19:56 -0400 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F157C88DF9; Thu, 15 Sep 2022 08:14:24 -0700 (PDT) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28FF1EVj021307; Thu, 15 Sep 2022 15:14:09 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=VZ0Ricz+SwTaXgJe1mbPbeAQ0kuQSJcp+Y5jvBpMTJc=; b=GC5CvXDyJ6epIl3vwjbZTEH5naTIUWIf+unvkio0aIS8UnElXfRbn1umesd3sgIpVrnk h7KmRwEvtp5bcfUgBFgQZp2/Q9AIxpSdnsqcjo/dDYvvdychlznRwGRqzryq12H5omqQ x/JADNpNhCeQl2x80ojD8NRMrFKwQrvZdyXyEPrrucsFF5xyy5hAKV8/GfiwTAi4vODB S1HYO1m89Cj4uM8eYYV+NL65PgNGdHlFgoN45Jrxjq/7S5ZLOyqH8VdYtBrM7WFBDaBi aeRSJ4IOoG5VG1AakA5R7sDPg4hSif3YctVZvYCWz0IlJZVmZSZhlmKCeKSIP5xCM92u Lg== Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3jm6awgpju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Sep 2022 15:14:09 +0000 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 28FF7AMW032489; Thu, 15 Sep 2022 15:14:07 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma04fra.de.ibm.com with ESMTP id 3jjy2n1xtk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Sep 2022 15:14:07 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 28FFE4FS41156908 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 15 Sep 2022 15:14:04 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 325345204F; Thu, 15 Sep 2022 15:14:04 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id B804852050; Thu, 15 Sep 2022 15:14:03 +0000 (GMT) From: Niklas Schnelle To: Matthew Rosato , Pierre Morel , iommu@lists.linux.dev Cc: linux-s390@vger.kernel.org, borntraeger@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, jgg@nvidia.com, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] iommu/s390: Get rid of s390_domain_device Date: Thu, 15 Sep 2022 17:14:02 +0200 Message-Id: <20220915151402.121032-4-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220915151402.121032-1-schnelle@linux.ibm.com> References: <20220915151402.121032-1-schnelle@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: hRpjpbH9ipEVNmcfGyuU8BWRmU6HAwVS X-Proofpoint-ORIG-GUID: hRpjpbH9ipEVNmcfGyuU8BWRmU6HAwVS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-15_09,2022-09-14_04,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000 definitions=main-2209150085 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When an s390_domain is freed without previously detaching all devices the corresponding s390_domain_device is leaked. Instead of fixing this leak by freeing the s390_domain_devices in s390_domain_free() do one better and just get rid of s390_domain_device entirely by threading the domain's device list through struct zpci_dev. This also gets rid of a level of indirection during operations but also the allocation of the s390_domain_device during attach thus making it more reliable under memory pressure. Even though this naturally fixes the leak of s390_domain_device let's still invalidate the list heads of formally attached struct zpci_devs on s390_domain_free() to aid in debug. Signed-off-by: Niklas Schnelle --- arch/s390/include/asm/pci.h | 1 + drivers/iommu/s390-iommu.c | 42 ++++++++++++++++--------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h index 108e732d7b14..15f8714ca9b7 100644 --- a/arch/s390/include/asm/pci.h +++ b/arch/s390/include/asm/pci.h @@ -117,6 +117,7 @@ struct zpci_bus { struct zpci_dev { struct zpci_bus *zbus; struct list_head entry; /* list of all zpci_devices, needed for hotplug,= etc. */ + struct list_head iommu_list; struct kref kref; struct hotplug_slot hotplug_slot; =20 diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c index de8f76775240..2fec198823a8 100644 --- a/drivers/iommu/s390-iommu.c +++ b/drivers/iommu/s390-iommu.c @@ -29,11 +29,6 @@ struct s390_domain { spinlock_t list_lock; }; =20 -struct s390_domain_device { - struct list_head list; - struct zpci_dev *zdev; -}; - static struct s390_domain *to_s390_domain(struct iommu_domain *dom) { return container_of(dom, struct s390_domain, domain); @@ -78,7 +73,15 @@ static struct iommu_domain *s390_domain_alloc(unsigned d= omain_type) static void s390_domain_free(struct iommu_domain *domain) { struct s390_domain *s390_domain =3D to_s390_domain(domain); + struct zpci_dev *zdev, *tmp; + unsigned long flags; =20 + spin_lock_irqsave(&s390_domain->list_lock, flags); + list_for_each_entry_safe(zdev, tmp, + &s390_domain->devices, iommu_list) { + list_del(&zdev->iommu_list); + } + spin_unlock_irqrestore(&s390_domain->list_lock, flags); dma_cleanup_tables(s390_domain->dma_table); kfree(s390_domain); } @@ -86,16 +89,15 @@ static void s390_domain_free(struct iommu_domain *domai= n) static bool __s390_iommu_detach_device(struct s390_domain *s390_domain, struct zpci_dev *zdev) { - struct s390_domain_device *domain_device, *tmp; + struct zpci_dev *zdev_iter, *tmp; unsigned long flags; bool found =3D false; =20 spin_lock_irqsave(&s390_domain->list_lock, flags); - list_for_each_entry_safe(domain_device, tmp, &s390_domain->devices, - list) { - if (domain_device->zdev =3D=3D zdev) { - list_del(&domain_device->list); - kfree(domain_device); + list_for_each_entry_safe(zdev_iter, tmp, &s390_domain->devices, + iommu_list) { + if (zdev_iter =3D=3D zdev) { + list_del(&zdev->iommu_list); found =3D true; break; } @@ -114,7 +116,6 @@ static int s390_iommu_attach_device(struct iommu_domain= *domain, { struct s390_domain *s390_domain =3D to_s390_domain(domain); struct zpci_dev *zdev =3D to_zpci_dev(dev); - struct s390_domain_device *domain_device; struct s390_domain *prev_domain =3D NULL; unsigned long flags; int cc, rc =3D 0; @@ -122,10 +123,6 @@ static int s390_iommu_attach_device(struct iommu_domai= n *domain, if (!zdev) return -ENODEV; =20 - domain_device =3D kzalloc(sizeof(*domain_device), GFP_KERNEL); - if (!domain_device) - return -ENOMEM; - if (zdev->s390_domain) { prev_domain =3D zdev->s390_domain; if (!__s390_iommu_detach_device(zdev->s390_domain, zdev)) @@ -135,7 +132,7 @@ static int s390_iommu_attach_device(struct iommu_domain= *domain, rc =3D -EIO; } if (rc) - goto out_free; + return rc; =20 zdev->dma_table =3D s390_domain->dma_table; cc =3D zpci_register_ioat(zdev, 0, zdev->start_dma, zdev->end_dma, @@ -158,9 +155,8 @@ static int s390_iommu_attach_device(struct iommu_domain= *domain, spin_unlock_irqrestore(&s390_domain->list_lock, flags); goto out_unregister_restore; } - domain_device->zdev =3D zdev; zdev->s390_domain =3D s390_domain; - list_add(&domain_device->list, &s390_domain->devices); + list_add(&zdev->iommu_list, &s390_domain->devices); spin_unlock_irqrestore(&s390_domain->list_lock, flags); =20 return 0; @@ -174,8 +170,6 @@ static int s390_iommu_attach_device(struct iommu_domain= *domain, dev); else zpci_dma_init_device(zdev); -out_free: - kfree(domain_device); =20 return rc; } @@ -229,10 +223,10 @@ static int s390_iommu_update_trans(struct s390_domain= *s390_domain, phys_addr_t pa, dma_addr_t dma_addr, size_t size, int flags) { - struct s390_domain_device *domain_device; phys_addr_t page_addr =3D pa & PAGE_MASK; dma_addr_t start_dma_addr =3D dma_addr; unsigned long irq_flags, nr_pages, i; + struct zpci_dev *zdev; unsigned long *entry; int rc =3D 0; =20 @@ -257,8 +251,8 @@ static int s390_iommu_update_trans(struct s390_domain *= s390_domain, } =20 spin_lock(&s390_domain->list_lock); - list_for_each_entry(domain_device, &s390_domain->devices, list) { - rc =3D zpci_refresh_trans((u64) domain_device->zdev->fh << 32, + list_for_each_entry(zdev, &s390_domain->devices, iommu_list) { + rc =3D zpci_refresh_trans((u64)zdev->fh << 32, start_dma_addr, nr_pages * PAGE_SIZE); if (rc) break; --=20 2.34.1