[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 08/17] xen: mapcache: Refactor xen_invalidate_map_cache_entry_
From: |
Edgar E. Iglesias |
Subject: |
[PATCH v4 08/17] xen: mapcache: Refactor xen_invalidate_map_cache_entry_unlocked |
Date: |
Tue, 30 Apr 2024 18:49:30 +0200 |
From: "Edgar E. Iglesias" <edgar.iglesias@amd.com>
Add MapCache argument to xen_invalidate_map_cache_entry_unlocked.
This is in preparation for supporting multiple map caches.
No functional changes.
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
---
hw/xen/xen-mapcache.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
index 6e758eff94..34454da2f6 100644
--- a/hw/xen/xen-mapcache.c
+++ b/hw/xen/xen-mapcache.c
@@ -420,7 +420,8 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
return xen_ram_addr_from_mapcache_single(mapcache, ptr);
}
-static void xen_invalidate_map_cache_entry_unlocked(uint8_t *buffer)
+static void xen_invalidate_map_cache_entry_unlocked(MapCache *mc,
+ uint8_t *buffer)
{
MapCacheEntry *entry = NULL, *pentry = NULL;
MapCacheRev *reventry;
@@ -428,7 +429,7 @@ static void xen_invalidate_map_cache_entry_unlocked(uint8_t
*buffer)
hwaddr size;
int found = 0;
- QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
+ QTAILQ_FOREACH(reventry, &mc->locked_entries, next) {
if (reventry->vaddr_req == buffer) {
paddr_index = reventry->paddr_index;
size = reventry->size;
@@ -438,7 +439,7 @@ static void xen_invalidate_map_cache_entry_unlocked(uint8_t
*buffer)
}
if (!found) {
trace_xen_invalidate_map_cache_entry_unlocked_not_found(buffer);
- QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
+ QTAILQ_FOREACH(reventry, &mc->locked_entries, next) {
trace_xen_invalidate_map_cache_entry_unlocked_found(
reventry->paddr_index,
reventry->vaddr_req
@@ -446,15 +447,15 @@ static void
xen_invalidate_map_cache_entry_unlocked(uint8_t *buffer)
}
return;
}
- QTAILQ_REMOVE(&mapcache->locked_entries, reventry, next);
+ QTAILQ_REMOVE(&mc->locked_entries, reventry, next);
g_free(reventry);
- if (mapcache->last_entry != NULL &&
- mapcache->last_entry->paddr_index == paddr_index) {
- mapcache->last_entry = NULL;
+ if (mc->last_entry != NULL &&
+ mc->last_entry->paddr_index == paddr_index) {
+ mc->last_entry = NULL;
}
- entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
+ entry = &mc->entry[paddr_index % mc->nr_buckets];
while (entry && (entry->paddr_index != paddr_index || entry->size !=
size)) {
pentry = entry;
entry = entry->next;
@@ -488,7 +489,7 @@ static void xen_invalidate_map_cache_entry_bh(void *opaque)
XenMapCacheData *data = opaque;
mapcache_lock(mapcache);
- xen_invalidate_map_cache_entry_unlocked(data->buffer);
+ xen_invalidate_map_cache_entry_unlocked(mapcache, data->buffer);
mapcache_unlock(mapcache);
aio_co_wake(data->co);
@@ -506,7 +507,7 @@ void coroutine_mixed_fn
xen_invalidate_map_cache_entry(uint8_t *buffer)
qemu_coroutine_yield();
} else {
mapcache_lock(mapcache);
- xen_invalidate_map_cache_entry_unlocked(buffer);
+ xen_invalidate_map_cache_entry_unlocked(mapcache, buffer);
mapcache_unlock(mapcache);
}
}
--
2.40.1
- [PATCH v4 00/17] xen: Support grant mappings, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 03/17] xen: mapcache: Refactor lock functions for multi-instance, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 04/17] xen: mapcache: Refactor xen_map_cache for multi-instance, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 01/17] softmmu: let qemu_map_ram_ptr() use qemu_ram_ptr_length(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 02/17] xen: let xen_ram_addr_from_mapcache() return -1 in case of not found entry, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 12/17] xen: mapcache: Unmap first entries in buckets, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 09/17] xen: mapcache: Break out xen_invalidate_map_cache_single(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 13/17] softmmu: Pass RAM MemoryRegion and is_write xen_map_cache(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 08/17] xen: mapcache: Refactor xen_invalidate_map_cache_entry_unlocked,
Edgar E. Iglesias <=
- [PATCH v4 10/17] xen: mapcache: Break out xen_map_cache_init_single(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 05/17] xen: mapcache: Refactor xen_remap_bucket for multi-instance, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 07/17] xen: mapcache: Refactor xen_replace_cache_entry_unlocked, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 06/17] xen: mapcache: Break out xen_ram_addr_from_mapcache_single, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 11/17] xen: mapcache: Make MCACHE_BUCKET_SHIFT runtime configurable, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 15/17] xen: mapcache: Remove assumption of RAMBlock with 0 offset, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 14/17] xen: Add xen_mr_is_memory(), Edgar E. Iglesias, 2024/04/30
- [PATCH v4 17/17] hw/arm: xen: Enable use of grant mappings, Edgar E. Iglesias, 2024/04/30
- [PATCH v4 16/17] xen: mapcache: Add support for grant mappings, Edgar E. Iglesias, 2024/04/30