[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-8.1.3 57/59] s390x/pci: only limit DMA aperture if vfio DMA limi
From: |
Michael Tokarev |
Subject: |
[Stable-8.1.3 57/59] s390x/pci: only limit DMA aperture if vfio DMA limit reported |
Date: |
Sun, 19 Nov 2023 21:19:53 +0300 |
From: Matthew Rosato <mjrosato@linux.ibm.com>
If the host kernel lacks vfio DMA limit reporting, do not attempt
to shrink the guest DMA aperture.
Fixes: df202e3ff3 ("s390x/pci: shrink DMA aperture to be bound by vfio DMA
limit")
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-ID: <20231110175108.465851-3-mjrosato@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit 8011b508cf0ddbdbda03820f4fa6cd484a6d9aed)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
index 59a2e03873..4f6f61f02e 100644
--- a/hw/s390x/s390-pci-vfio.c
+++ b/hw/s390x/s390-pci-vfio.c
@@ -132,7 +132,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev,
* to the guest based upon the vfio DMA limit.
*/
vfio_size = pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS;
- if (vfio_size < (cap->end_dma - cap->start_dma + 1)) {
+ if (vfio_size > 0 && vfio_size < cap->end_dma - cap->start_dma + 1) {
pbdev->zpci_fn.edma = cap->start_dma + vfio_size - 1;
}
}
--
2.39.2
- [Stable-8.1.3 v2 00/59] Patch Round-up for stable 8.1.3, frozen on 2023-11-19, Michael Tokarev, 2023/11/19
- [Stable-8.1.3 54/59] tracetool: avoid invalid escape in Python string, Michael Tokarev, 2023/11/19
- [Stable-8.1.3 55/59] target/riscv/kvm: improve 'init_multiext_cfg' error msg, Michael Tokarev, 2023/11/19
- [Stable-8.1.3 57/59] s390x/pci: only limit DMA aperture if vfio DMA limit reported,
Michael Tokarev <=
- [Stable-8.1.3 56/59] target/riscv/kvm: support KVM_GET_REG_LIST, Michael Tokarev, 2023/11/19
- [Stable-8.1.3 59/59] hw/mips: LOONGSON3V depends on UNIMP device, Michael Tokarev, 2023/11/19
- [Stable-8.1.3 58/59] target/arm: HVC at EL3 should go to EL3, not EL2, Michael Tokarev, 2023/11/19
- Re: [Stable-8.1.3 v2 00/59] Patch Round-up for stable 8.1.3, frozen on 2023-11-19, Thomas Huth, 2023/11/20