From patchwork Tue May 5 09:13:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsOpbXkgRmFuZ3XDqGRl?= X-Patchwork-Id: 467973 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5E4AF140789 for ; Tue, 5 May 2015 19:18:10 +1000 (AEST) Received: from localhost ([::1]:37779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpYzQ-0006XK-CY for incoming@patchwork.ozlabs.org; Tue, 05 May 2015 05:18:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpYve-0001ju-6k for qemu-devel@nongnu.org; Tue, 05 May 2015 05:14:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpYvZ-0007Uk-3J for qemu-devel@nongnu.org; Tue, 05 May 2015 05:14:14 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:36933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpYvY-0007Uc-Th for qemu-devel@nongnu.org; Tue, 05 May 2015 05:14:09 -0400 Received: by widdi4 with SMTP id di4so138106452wid.0 for ; Tue, 05 May 2015 02:14:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=BF6NcIQ1uF/KLoPC45zrInHuGBWXUiFIGuHuu0aAaP4=; b=m9K/N2nop5LbaidFE3J/E10vT2+bxxpwETmANIZKD3RRSIBiGtP3uDTsv/Ij5bGU8R UdxRhjsrc94E/u64NY/pQsYVsD3AdugZHezMVLSTpdJiGrYBmvVFf0PVP6n9EuAs386U QeYmjkzA1qHT6AXJLvW5uyPPyg4zk1/ZiLS9+g9eOfBUcbVO9iB9mTFJTTzm+izfqZtu ikJ9rzhXDZJ6Ppm4g3KfTJ5cOeIupSH6PokZmnfq9r8y+sH6apFxtiDpxqExkUZshSzN lCxvqNYQA80eVe4LmUYuPTk0qf4gn19h7ssnrNZ7TWrfaKCF/5jzS48Cjy95IxJr9XoX hFAQ== X-Gm-Message-State: ALoCoQmrjPuHwyU+SohxLWYQx0Hr8idPz514GE3CVMYhguvvnX/xjmKVwnfl3zO8R+2A+F39h9+d X-Received: by 10.194.63.80 with SMTP id e16mr3644017wjs.56.1430817248444; Tue, 05 May 2015 02:14:08 -0700 (PDT) Received: from jeremy-UX32VD.home (LPuteaux-656-1-278-113.w80-15.abo.wanadoo.fr. [80.15.154.113]) by mx.google.com with ESMTPSA id ex5sm15144014wib.2.2015.05.05.02.14.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 May 2015 02:14:07 -0700 (PDT) From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Fangu=C3=A8de?= To: qemu-devel@nongnu.org Date: Tue, 5 May 2015 11:13:47 +0200 Message-Id: <1430817227-6278-5-git-send-email-j.fanguede@virtualopensystems.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430817227-6278-1-git-send-email-j.fanguede@virtualopensystems.com> References: <1430817227-6278-1-git-send-email-j.fanguede@virtualopensystems.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.177 Cc: Paolo Bonzini , =?UTF-8?q?J=C3=A9r=C3=A9my=20Fangu=C3=A8de?= , tech@virtualopensystems.com, kvmarm@lists.cs.columbia.edu Subject: [Qemu-devel] [RFC 4/4] exec: Flush data cache when needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org Flush the data cache when accesses occur in the guest ram memory. Signed-off-by: Jérémy Fanguède --- exec.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/exec.c b/exec.c index ae37b98..0f859a3 100644 --- a/exec.c +++ b/exec.c @@ -2372,6 +2372,9 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, ptr = qemu_get_ram_ptr(addr1); memcpy(ptr, buf, l); invalidate_and_set_dirty(addr1, l); + if (kvm_enabled()) { + kvm_arch_cache_flush_needed(addr, l, is_write); + } } } else { if (!memory_access_is_direct(mr, is_write)) { @@ -2408,6 +2411,9 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, } else { /* RAM case */ ptr = qemu_get_ram_ptr(mr->ram_addr + addr1); + if (kvm_enabled()) { + kvm_arch_cache_flush_needed(addr, l, is_write); + } memcpy(buf, ptr, l); } } @@ -2646,6 +2652,14 @@ void *address_space_map(AddressSpace *as, return bounce.buffer; } + /* Need to be flushed only if we are reading */ + if (!is_write) { + /* Don't flush if it's a cpu_physical_memory_map call */ + if (kvm_enabled() && as != &address_space_memory) { + kvm_arch_cache_flush_needed(addr, l, is_write); + } + } + base = xlat; raddr = memory_region_get_ram_addr(mr); @@ -2679,6 +2693,7 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, if (buffer != bounce.buffer) { MemoryRegion *mr; ram_addr_t addr1; + hwaddr base; mr = qemu_ram_addr_from_host(buffer, &addr1); assert(mr != NULL); @@ -2688,6 +2703,10 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, if (xen_enabled()) { xen_invalidate_map_cache_entry(buffer); } + if (kvm_enabled() && as != &address_space_memory) { + base = object_property_get_int(OBJECT(mr), "addr", NULL); + kvm_arch_cache_flush_needed(addr1 + base, access_len, is_write); + } memory_region_unref(mr); return; }