From: Niklas Schnelle <schnelle@linux.ibm.com>
To: Matthew Rosato <mjrosato@linux.ibm.com>,
iommu@lists.linux.dev, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Jason Gunthorpe <jgg@nvidia.com>
Cc: Gerd Bayer <gbayer@linux.ibm.com>,
Pierre Morel <pmorel@linux.ibm.com>,
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, linux-kernel@vger.kernel.org,
Wenjia Zhang <wenjia@linux.ibm.com>,
Julian Ruess <julianr@linux.ibm.com>
Subject: [RFC 6/6] iommu/s390: flush queued IOVAs on RPCIT out of resource indication
Date: Wed, 19 Oct 2022 16:44:35 +0200 [thread overview]
Message-ID: <20221019144435.369902-7-schnelle@linux.ibm.com> (raw)
In-Reply-To: <20221019144435.369902-1-schnelle@linux.ibm.com>
When RPCIT indicates that the underlying hypervisor has run out of
resources it often means that its IOVA space is exhausted and IOVAs need
to be freed before new ones can be created. By triggering a flush of the
IOVA queue we can get the queued IOVAs freed and also get the new
mapping established during the global flush.
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
drivers/iommu/dma-iommu.c | 2 +-
drivers/iommu/dma-iommu.h | 1 +
drivers/iommu/s390-iommu.c | 12 ++++++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 427fb84f50c3..4853f98f3305 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -287,7 +287,7 @@ static void flush_percpu(struct iommu_dma_cookie *cookie)
}
}
-static void iommu_dma_flush_fq(struct iommu_dma_cookie *cookie)
+void iommu_dma_flush_fq(struct iommu_dma_cookie *cookie)
{
if (!cookie->fq_domain)
return;
diff --git a/drivers/iommu/dma-iommu.h b/drivers/iommu/dma-iommu.h
index 942790009292..cac06030aa26 100644
--- a/drivers/iommu/dma-iommu.h
+++ b/drivers/iommu/dma-iommu.h
@@ -13,6 +13,7 @@ int iommu_get_dma_cookie(struct iommu_domain *domain);
void iommu_put_dma_cookie(struct iommu_domain *domain);
int iommu_dma_init_fq(struct iommu_domain *domain);
+void iommu_dma_flush_fq(struct iommu_dma_cookie *cookie);
void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index 506f8b92931f..270662584f96 100644
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -502,6 +502,10 @@ static void s390_iommu_flush_iotlb_all(struct iommu_domain *domain)
atomic64_inc(&s390_domain->ctrs.global_rpcits);
rc = zpci_refresh_trans((u64)zdev->fh << 32, zdev->start_dma,
zdev->end_dma - zdev->start_dma + 1);
+ if (rc == -ENOMEM) {
+ iommu_dma_flush_fq(domain->iova_cookie);
+ rc = 0;
+ }
if (rc)
break;
}
@@ -525,6 +529,10 @@ static void s390_iommu_iotlb_sync(struct iommu_domain *domain,
atomic64_inc(&s390_domain->ctrs.sync_rpcits);
rc = zpci_refresh_trans((u64)zdev->fh << 32, gather->start,
size);
+ if (rc == -ENOMEM) {
+ iommu_dma_flush_fq(domain->iova_cookie);
+ rc = 0;
+ }
if (rc)
break;
}
@@ -545,6 +553,10 @@ static void s390_iommu_iotlb_sync_map(struct iommu_domain *domain,
atomic64_inc(&s390_domain->ctrs.sync_map_rpcits);
rc = zpci_refresh_trans((u64)zdev->fh << 32,
iova, size);
+ if (rc == -ENOMEM) {
+ iommu_dma_flush_fq(domain->iova_cookie);
+ rc = 0;
+ }
if (rc)
break;
}
--
2.34.1
prev parent reply other threads:[~2022-10-19 14:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 14:44 [RFC 0/6] iommu/dma: s390 DMA API conversion and optimized IOTLB flushing Niklas Schnelle
2022-10-19 14:44 ` [RFC 1/6] s390/ism: Set DMA coherent mask Niklas Schnelle
2022-10-20 8:07 ` Christoph Hellwig
2022-10-20 12:16 ` Niklas Schnelle
2022-10-19 14:44 ` [RFC 2/6] s390/pci: prepare is_passed_through() for dma-iommu Niklas Schnelle
2022-10-19 14:44 ` [RFC 3/6] s390/pci: Use dma-iommu layer Niklas Schnelle
2022-10-19 14:44 ` [RFC 4/6] iommu/dma: Prepare for multiple flush queue implementations Niklas Schnelle
2022-10-19 14:44 ` [RFC 5/6] iommu/dma: Add simple batching flush queue implementation Niklas Schnelle
2022-10-20 13:18 ` Robin Murphy
2022-10-20 15:36 ` Niklas Schnelle
2022-10-19 14:44 ` Niklas Schnelle [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221019144435.369902-7-schnelle@linux.ibm.com \
--to=schnelle@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=gbayer@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=julianr@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=robin.murphy@arm.com \
--cc=svens@linux.ibm.com \
--cc=wenjia@linux.ibm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox