From patchwork Fri Aug 26 16:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Faria X-Patchwork-Id: 1670932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=K7/bsXzh; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MDlNK3P5Mz1ygw for ; Sat, 27 Aug 2022 02:17:19 +1000 (AEST) Received: from localhost ([::1]:34140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRc1D-00054s-DE for incoming@patchwork.ozlabs.org; Fri, 26 Aug 2022 12:17:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRbtq-0006F1-7Q for qemu-devel@nongnu.org; Fri, 26 Aug 2022 12:09:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRbtn-0006K2-4H for qemu-devel@nongnu.org; Fri, 26 Aug 2022 12:09:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661530172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LQ6XpvHQNUKBfbm9nqsdH5xFWwXs/utW2YgFeagOHxo=; b=K7/bsXzhJi0fn/juvEvRUKOGOXIZ8/INZ0O9lJj9RJVXXNGsJRTgS02gl6lEW/DKDD0dxs +k8qsswoSyNrcP1S1A5hJLrcLmToePYRPn22lc6aUDom0NhEHAeVCqdvUDvBmBgAf9+UJy S92KYgGQsfs9wu5rCQtWPOIhCSnnrsM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652-k4HFnt0RMPKFBO6xOe-yvQ-1; Fri, 26 Aug 2022 12:09:31 -0400 X-MC-Unique: k4HFnt0RMPKFBO6xOe-yvQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCCF7101AA52; Fri, 26 Aug 2022 16:09:30 +0000 (UTC) Received: from DESKTOP-E7ACR7D.lan (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69E2440CF916; Fri, 26 Aug 2022 16:09:29 +0000 (UTC) From: Alberto Faria To: qemu-devel@nongnu.org Cc: David Hildenbrand , Peter Xu , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alberto Faria , Stefan Hajnoczi Subject: [PATCH] softmmu/physmem: Fix address of FlatView access in address_space_(read|write)_cached_slow() Date: Fri, 26 Aug 2022 17:09:27 +0100 Message-Id: <20220826160927.322797-1-afaria@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=afaria@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Apply cache->xlat to addr before passing it to flatview_(read|write)_continue(), to convert it from the MemoryRegionCache's address space to the FlatView's. Fixes: 48564041a7 ("exec: reintroduce MemoryRegion caching") Co-Developed-by: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi Signed-off-by: Alberto Faria --- softmmu/physmem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index dc3c3e5f2e..95d4c77cc3 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3450,9 +3450,9 @@ address_space_read_cached_slow(MemoryRegionCache *cache, hwaddr addr, l = len; mr = address_space_translate_cached(cache, addr, &addr1, &l, false, MEMTXATTRS_UNSPECIFIED); - return flatview_read_continue(cache->fv, - addr, MEMTXATTRS_UNSPECIFIED, buf, len, - addr1, l, mr); + return flatview_read_continue(cache->fv, cache->xlat + addr, + MEMTXATTRS_UNSPECIFIED, buf, len, addr1, l, + mr); } /* Called from RCU critical section. address_space_write_cached uses this @@ -3468,9 +3468,9 @@ address_space_write_cached_slow(MemoryRegionCache *cache, hwaddr addr, l = len; mr = address_space_translate_cached(cache, addr, &addr1, &l, true, MEMTXATTRS_UNSPECIFIED); - return flatview_write_continue(cache->fv, - addr, MEMTXATTRS_UNSPECIFIED, buf, len, - addr1, l, mr); + return flatview_write_continue(cache->fv, cache->xlat + addr, + MEMTXATTRS_UNSPECIFIED, buf, len, addr1, l, + mr); } #define ARG1_DECL MemoryRegionCache *cache