7b74d99404
- kvm-arm-virt-Register-highmem-and-gic-version-as-class-p.patch [bz#1952449] - kvm-hw-arm-virt-Add-8.5-and-9.0-machine-types-and-remove.patch [bz#1952449] - kvm-aarch64-rh-devices-add-CONFIG_PVPANIC_PCI.patch [bz#1747467] - kvm-spec-Do-not-build-qemu-kvm-block-gluster.patch [bz#1964795] - kvm-spec-Do-not-link-pcnet-and-ne2k_pci-roms.patch [bz#1965961] - kvm-redhat-s390x-add-rhel-8.5.0-compat-machine.patch [bz#1957194] - kvm-redhat-add-missing-entries-in-hw_compat_rhel_8_4.patch [bz#1957194] - kvm-redhat-Define-pseries-rhel8.5.0-machine-type.patch [bz#1957194] - kvm-virtio-net-failover-add-missing-remove_migration_sta.patch [bz#1957194] - kvm-hw-arm-virt-Disable-PL011-clock-migration-through-hw.patch [bz#1957194] - kvm-virtio-blk-Fix-rollback-path-in-virtio_blk_data_plan.patch [bz#1957194] - kvm-virtio-blk-Configure-all-host-notifiers-in-a-single-.patch [bz#1957194] - kvm-virtio-scsi-Set-host-notifiers-and-callbacks-separat.patch [bz#1957194] - kvm-virtio-scsi-Configure-all-host-notifiers-in-a-single.patch [bz#1957194] - kvm-hw-arm-smmuv3-Another-range-invalidation-fix.patch [bz#1957194] - Resolves: bz#1952449 ([aarch64] define RHEL9 machine types) - Resolves: bz#1747467 ([aarch64] [qemu] PVPANIC support) - Resolves: bz#1964795 (Remove qemu-kvm-block-gluster package) - Resolves: bz#1965961 (Remove links to not build roms) - Resolves: bz#1957194 (Synchronize RHEL-AV 8.5.0 changes to RHEL 9.0.0 Beta)
112 lines
4.1 KiB
Diff
112 lines
4.1 KiB
Diff
From e9abef24fae799febf81cd4ac02efe8987a698e8 Mon Sep 17 00:00:00 2001
|
|
From: Auger Eric <eric.auger@redhat.com>
|
|
Date: Wed, 26 May 2021 16:07:40 -0400
|
|
Subject: [PATCH 15/15] hw/arm/smmuv3: Another range invalidation fix
|
|
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-MergeRequest: 5: Synchronize RHEL-AV 8.5 release 18 to RHEL 9 Beta
|
|
RH-Commit: [12/12] dc064684e5f3f11d955565b05d37b0f2d9f79b91 (mrezanin/centos-src-qemu-kvm)
|
|
RH-Bugzilla: 1957194
|
|
RH-Acked-by: Danilo Cesar Lemes de Paula <ddepaula@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
|
6d9cd115b9 ("hw/arm/smmuv3: Enforce invalidation on a power of two range")
|
|
failed to completely fix misalignment issues with range
|
|
invalidation. For instance invalidations patterns like "invalidate 32
|
|
4kB pages starting from 0xff395000 are not correctly handled" due
|
|
to the fact the previous fix only made sure the number of invalidated
|
|
pages were a power of 2 but did not properly handle the start
|
|
address was not aligned with the range. This can be noticed when
|
|
boothing a fedora 33 with protected virtio-blk-pci.
|
|
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
Fixes: 6d9cd115b9 ("hw/arm/smmuv3: Enforce invalidation on a power of two range")
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
(cherry picked from commit 219729cfbf9e979020bffedac6a790144173ec62)
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
hw/arm/smmuv3.c | 50 +++++++++++++++++++++++++------------------------
|
|
1 file changed, 26 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
|
|
index 8705612535..e1979282e4 100644
|
|
--- a/hw/arm/smmuv3.c
|
|
+++ b/hw/arm/smmuv3.c
|
|
@@ -856,43 +856,45 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, dma_addr_t iova,
|
|
|
|
static void smmuv3_s1_range_inval(SMMUState *s, Cmd *cmd)
|
|
{
|
|
- uint8_t scale = 0, num = 0, ttl = 0;
|
|
- dma_addr_t addr = CMD_ADDR(cmd);
|
|
+ dma_addr_t end, addr = CMD_ADDR(cmd);
|
|
uint8_t type = CMD_TYPE(cmd);
|
|
uint16_t vmid = CMD_VMID(cmd);
|
|
+ uint8_t scale = CMD_SCALE(cmd);
|
|
+ uint8_t num = CMD_NUM(cmd);
|
|
+ uint8_t ttl = CMD_TTL(cmd);
|
|
bool leaf = CMD_LEAF(cmd);
|
|
uint8_t tg = CMD_TG(cmd);
|
|
- uint64_t first_page = 0, last_page;
|
|
- uint64_t num_pages = 1;
|
|
+ uint64_t num_pages;
|
|
+ uint8_t granule;
|
|
int asid = -1;
|
|
|
|
- if (tg) {
|
|
- scale = CMD_SCALE(cmd);
|
|
- num = CMD_NUM(cmd);
|
|
- ttl = CMD_TTL(cmd);
|
|
- num_pages = (num + 1) * BIT_ULL(scale);
|
|
- }
|
|
-
|
|
if (type == SMMU_CMD_TLBI_NH_VA) {
|
|
asid = CMD_ASID(cmd);
|
|
}
|
|
|
|
- /* Split invalidations into ^2 range invalidations */
|
|
- last_page = num_pages - 1;
|
|
- while (num_pages) {
|
|
- uint8_t granule = tg * 2 + 10;
|
|
- uint64_t mask, count;
|
|
+ if (!tg) {
|
|
+ trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, 1, ttl, leaf);
|
|
+ smmuv3_inv_notifiers_iova(s, asid, addr, tg, 1);
|
|
+ smmu_iotlb_inv_iova(s, asid, addr, tg, 1, ttl);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* RIL in use */
|
|
|
|
- mask = dma_aligned_pow2_mask(first_page, last_page, 64 - granule);
|
|
- count = mask + 1;
|
|
+ num_pages = (num + 1) * BIT_ULL(scale);
|
|
+ granule = tg * 2 + 10;
|
|
+
|
|
+ /* Split invalidations into ^2 range invalidations */
|
|
+ end = addr + (num_pages << granule) - 1;
|
|
|
|
- trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, count, ttl, leaf);
|
|
- smmuv3_inv_notifiers_iova(s, asid, addr, tg, count);
|
|
- smmu_iotlb_inv_iova(s, asid, addr, tg, count, ttl);
|
|
+ while (addr != end + 1) {
|
|
+ uint64_t mask = dma_aligned_pow2_mask(addr, end, 64);
|
|
|
|
- num_pages -= count;
|
|
- first_page += count;
|
|
- addr += count * BIT_ULL(granule);
|
|
+ num_pages = (mask + 1) >> granule;
|
|
+ trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, num_pages, ttl, leaf);
|
|
+ smmuv3_inv_notifiers_iova(s, asid, addr, tg, num_pages);
|
|
+ smmu_iotlb_inv_iova(s, asid, addr, tg, num_pages, ttl);
|
|
+ addr += mask + 1;
|
|
}
|
|
}
|
|
|
|
--
|
|
2.27.0
|
|
|