On Tue, 30 Apr 2024, Edgar E. Iglesias wrote:
> From: "Edgar E. Iglesias" <edgar.igles...@amd.com>
>
> Break out xen_invalidate_map_cache_single().
>
> No functional changes.
>
> Signed-off-by: Edgar E. Iglesias <edgar.igles...@amd.com>
Reviewed-by: Stefano Stabellini <sstabell...@kernel.org>
> ---
> hw/xen/xen-mapcache.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
> index 34454da2f6..dd08cd296b 100644
> --- a/hw/xen/xen-mapcache.c
> +++ b/hw/xen/xen-mapcache.c
> @@ -512,17 +512,14 @@ void coroutine_mixed_fn
> xen_invalidate_map_cache_entry(uint8_t *buffer)
> }
> }
>
> -void xen_invalidate_map_cache(void)
> +static void xen_invalidate_map_cache_single(MapCache *mc)
> {
> unsigned long i;
> MapCacheRev *reventry;
>
> - /* Flush pending AIO before destroying the mapcache */
> - bdrv_drain_all();
> -
> - mapcache_lock(mapcache);
> + mapcache_lock(mc);
>
> - QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
> + QTAILQ_FOREACH(reventry, &mc->locked_entries, next) {
> if (!reventry->dma) {
> continue;
> }
> @@ -530,8 +527,8 @@ void xen_invalidate_map_cache(void)
> reventry->vaddr_req);
> }
>
> - for (i = 0; i < mapcache->nr_buckets; i++) {
> - MapCacheEntry *entry = &mapcache->entry[i];
> + for (i = 0; i < mc->nr_buckets; i++) {
> + MapCacheEntry *entry = &mc->entry[i];
>
> if (entry->vaddr_base == NULL) {
> continue;
> @@ -552,9 +549,17 @@ void xen_invalidate_map_cache(void)
> entry->valid_mapping = NULL;
> }
>
> - mapcache->last_entry = NULL;
> + mc->last_entry = NULL;
>
> - mapcache_unlock(mapcache);
> + mapcache_unlock(mc);
> +}
> +
> +void xen_invalidate_map_cache(void)
> +{
> + /* Flush pending AIO before destroying the mapcache */
> + bdrv_drain_all();
> +
> + xen_invalidate_map_cache_single(mapcache);
> }
>
> static uint8_t *xen_replace_cache_entry_unlocked(MapCache *mc,
> --
> 2.40.1
>
