From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAtlm-0004ii-5w for qemu-devel@nongnu.org; Sun, 09 Sep 2012 22:30:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAtlj-0002gx-I0 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 22:30:38 -0400 Received: from ozlabs.org ([203.10.76.45]:56992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAtlj-0002cH-6G for qemu-devel@nongnu.org; Sun, 09 Sep 2012 22:30:35 -0400 From: David Gibson Date: Mon, 10 Sep 2012 12:30:57 +1000 Message-Id: <1347244257-15586-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1347244257-15586-1-git-send-email-david@gibson.dropbear.id.au> References: <1347244257-15586-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 2/2] cpu_physical_memory_write_rom() needs to do TB invalidates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org, David Gibson cpu_physical_memory_write_rom(), despite the name, can also be used to write images into RAM - and will often be used that way if the machine uses load_image_targphys() into RAM addresses. However, cpu_physical_memory_write_rom(), unlike cpu_physical_memory_rw() does invalidate any cached TBs which might be affected by the region written. This was breaking reset (under full emu) on the pseries machine - we loaded our firmware image into RAM, and while executing it rewrite the code at the entry point (correctly causing a TB invalidate/refresh). When we reset the firmware image was reloaded, but the TB from the rewrite was still active and caused us to get an illegal instruction trap. This patch fixes the bug by duplicating the tb invalidate code from cpu_physical_memory_rw() in cpu_physical_memory_write_rom(). Signed-off-by: David Gibson --- exec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/exec.c b/exec.c index 5834766..eff40d7 100644 --- a/exec.c +++ b/exec.c @@ -3523,6 +3523,13 @@ void cpu_physical_memory_write_rom(target_phys_addr_t addr, /* ROM/RAM case */ ptr = qemu_get_ram_ptr(addr1); memcpy(ptr, buf, l); + if (!cpu_physical_memory_is_dirty(addr1)) { + /* invalidate code */ + tb_invalidate_phys_page_range(addr1, addr1 + l, 0); + /* set dirty bit */ + cpu_physical_memory_set_dirty_flags( + addr1, (0xff & ~CODE_DIRTY_FLAG)); + } qemu_put_ram_ptr(ptr); } len -= l; -- 1.7.10.4