[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 02/17] xen: let xen_ram_addr_from_mapcache() return -1 in case
From: |
Edgar E. Iglesias |
Subject: |
[PATCH v4 02/17] xen: let xen_ram_addr_from_mapcache() return -1 in case of not found entry |
Date: |
Tue, 30 Apr 2024 18:49:24 +0200 |
From: Juergen Gross <jgross@suse.com>
Today xen_ram_addr_from_mapcache() will either abort() or return 0 in
case it can't find a matching entry for a pointer value. Both cases
are bad, so change that to return an invalid address instead.
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
---
hw/xen/xen-mapcache.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
index 7f59080ba7..b7cefb78f7 100644
--- a/hw/xen/xen-mapcache.c
+++ b/hw/xen/xen-mapcache.c
@@ -394,13 +394,8 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
}
}
if (!found) {
- trace_xen_ram_addr_from_mapcache_not_found(ptr);
- QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
- trace_xen_ram_addr_from_mapcache_found(reventry->paddr_index,
- reventry->vaddr_req);
- }
- abort();
- return 0;
+ mapcache_unlock();
+ return RAM_ADDR_INVALID;
}
entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
@@ -409,7 +404,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
}
if (!entry) {
trace_xen_ram_addr_from_mapcache_not_in_cache(ptr);
- raddr = 0;
+ raddr = RAM_ADDR_INVALID;
} else {
raddr = (reventry->paddr_index << MCACHE_BUCKET_SHIFT) +
((unsigned long) ptr - (unsigned long) entry->vaddr_base);
--
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 <=
- [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, 2024/04/30
- [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