167 lines
5.3 KiB
Diff
167 lines
5.3 KiB
Diff
From 7833c0bf8321cb39614ee889cf3e3a64511c0aa5 Mon Sep 17 00:00:00 2001
|
|
From: eperezma <eperezma@redhat.com>
|
|
Date: Tue, 12 Jan 2021 14:36:28 -0500
|
|
Subject: [PATCH 04/17] hw/arm/smmu: Introduce smmu_get_iotlb_key()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: eperezma <eperezma@redhat.com>
|
|
Message-id: <20210112143638.374060-4-eperezma@redhat.com>
|
|
Patchwork-id: 100596
|
|
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH v2 03/13] hw/arm/smmu: Introduce smmu_get_iotlb_key()
|
|
Bugzilla: 1843852
|
|
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: Auger Eric <eric.auger@redhat.com>
|
|
|
|
From: Eric Auger <eric.auger@redhat.com>
|
|
|
|
Introduce the smmu_get_iotlb_key() helper and the
|
|
SMMU_IOTLB_ASID() macro. Also move smmu_get_iotlb_key and
|
|
smmu_iotlb_key_hash in the IOTLB related code section.
|
|
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Message-id: 20200728150815.11446-4-eric.auger@redhat.com
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
(cherry picked from commit 60a61f1b31fc03080aadb63c9b1006f8b1972adb)
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/arm/smmu-common.c | 66 ++++++++++++++++++++----------------
|
|
hw/arm/smmu-internal.h | 1 +
|
|
include/hw/arm/smmu-common.h | 1 +
|
|
3 files changed, 38 insertions(+), 30 deletions(-)
|
|
|
|
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
|
|
index 8e01505dbee..0b89c9fbbbc 100644
|
|
--- a/hw/arm/smmu-common.c
|
|
+++ b/hw/arm/smmu-common.c
|
|
@@ -32,10 +32,42 @@
|
|
|
|
/* IOTLB Management */
|
|
|
|
+static guint smmu_iotlb_key_hash(gconstpointer v)
|
|
+{
|
|
+ SMMUIOTLBKey *key = (SMMUIOTLBKey *)v;
|
|
+ uint32_t a, b, c;
|
|
+
|
|
+ /* Jenkins hash */
|
|
+ a = b = c = JHASH_INITVAL + sizeof(*key);
|
|
+ a += key->asid;
|
|
+ b += extract64(key->iova, 0, 32);
|
|
+ c += extract64(key->iova, 32, 32);
|
|
+
|
|
+ __jhash_mix(a, b, c);
|
|
+ __jhash_final(a, b, c);
|
|
+
|
|
+ return c;
|
|
+}
|
|
+
|
|
+static gboolean smmu_iotlb_key_equal(gconstpointer v1, gconstpointer v2)
|
|
+{
|
|
+ const SMMUIOTLBKey *k1 = v1;
|
|
+ const SMMUIOTLBKey *k2 = v2;
|
|
+
|
|
+ return (k1->asid == k2->asid) && (k1->iova == k2->iova);
|
|
+}
|
|
+
|
|
+SMMUIOTLBKey smmu_get_iotlb_key(uint16_t asid, uint64_t iova)
|
|
+{
|
|
+ SMMUIOTLBKey key = {.asid = asid, .iova = iova};
|
|
+
|
|
+ return key;
|
|
+}
|
|
+
|
|
IOMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg,
|
|
hwaddr iova)
|
|
{
|
|
- SMMUIOTLBKey key = {.asid = cfg->asid, .iova = iova};
|
|
+ SMMUIOTLBKey key = smmu_get_iotlb_key(cfg->asid, iova);
|
|
IOMMUTLBEntry *entry = g_hash_table_lookup(bs->iotlb, &key);
|
|
|
|
if (entry) {
|
|
@@ -62,8 +94,7 @@ void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, IOMMUTLBEntry *entry)
|
|
smmu_iotlb_inv_all(bs);
|
|
}
|
|
|
|
- key->asid = cfg->asid;
|
|
- key->iova = entry->iova;
|
|
+ *key = smmu_get_iotlb_key(cfg->asid, entry->iova);
|
|
trace_smmu_iotlb_insert(cfg->asid, entry->iova);
|
|
g_hash_table_insert(bs->iotlb, key, entry);
|
|
}
|
|
@@ -80,12 +111,12 @@ static gboolean smmu_hash_remove_by_asid(gpointer key, gpointer value,
|
|
uint16_t asid = *(uint16_t *)user_data;
|
|
SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key;
|
|
|
|
- return iotlb_key->asid == asid;
|
|
+ return SMMU_IOTLB_ASID(*iotlb_key) == asid;
|
|
}
|
|
|
|
inline void smmu_iotlb_inv_iova(SMMUState *s, uint16_t asid, dma_addr_t iova)
|
|
{
|
|
- SMMUIOTLBKey key = {.asid = asid, .iova = iova};
|
|
+ SMMUIOTLBKey key = smmu_get_iotlb_key(asid, iova);
|
|
|
|
trace_smmu_iotlb_inv_iova(asid, iova);
|
|
g_hash_table_remove(s->iotlb, &key);
|
|
@@ -382,31 +413,6 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid)
|
|
return NULL;
|
|
}
|
|
|
|
-static guint smmu_iotlb_key_hash(gconstpointer v)
|
|
-{
|
|
- SMMUIOTLBKey *key = (SMMUIOTLBKey *)v;
|
|
- uint32_t a, b, c;
|
|
-
|
|
- /* Jenkins hash */
|
|
- a = b = c = JHASH_INITVAL + sizeof(*key);
|
|
- a += key->asid;
|
|
- b += extract64(key->iova, 0, 32);
|
|
- c += extract64(key->iova, 32, 32);
|
|
-
|
|
- __jhash_mix(a, b, c);
|
|
- __jhash_final(a, b, c);
|
|
-
|
|
- return c;
|
|
-}
|
|
-
|
|
-static gboolean smmu_iotlb_key_equal(gconstpointer v1, gconstpointer v2)
|
|
-{
|
|
- const SMMUIOTLBKey *k1 = v1;
|
|
- const SMMUIOTLBKey *k2 = v2;
|
|
-
|
|
- return (k1->asid == k2->asid) && (k1->iova == k2->iova);
|
|
-}
|
|
-
|
|
/* Unmap the whole notifier's range */
|
|
static void smmu_unmap_notifier_range(IOMMUNotifier *n)
|
|
{
|
|
diff --git a/hw/arm/smmu-internal.h b/hw/arm/smmu-internal.h
|
|
index 7794d6d3947..3104f768cd2 100644
|
|
--- a/hw/arm/smmu-internal.h
|
|
+++ b/hw/arm/smmu-internal.h
|
|
@@ -96,4 +96,5 @@ uint64_t iova_level_offset(uint64_t iova, int inputsize,
|
|
MAKE_64BIT_MASK(0, gsz - 3);
|
|
}
|
|
|
|
+#define SMMU_IOTLB_ASID(key) ((key).asid)
|
|
#endif
|
|
diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h
|
|
index a28650c9350..bceba40885c 100644
|
|
--- a/include/hw/arm/smmu-common.h
|
|
+++ b/include/hw/arm/smmu-common.h
|
|
@@ -155,6 +155,7 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid);
|
|
|
|
IOMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, hwaddr iova);
|
|
void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, IOMMUTLBEntry *entry);
|
|
+SMMUIOTLBKey smmu_get_iotlb_key(uint16_t asid, uint64_t iova);
|
|
void smmu_iotlb_inv_all(SMMUState *s);
|
|
void smmu_iotlb_inv_asid(SMMUState *s, uint16_t asid);
|
|
void smmu_iotlb_inv_iova(SMMUState *s, uint16_t asid, dma_addr_t iova);
|
|
--
|
|
2.27.0
|
|
|