Commit c88c67e5 authored May 16, 2016 by Sergey Fedorov Committed by Peter Maydell May 26, 2016

cpu-exec: Fix direct jump to TB spanning page



It is not safe to make a direct jump to a TB spanning two pages in
system emulation because the mapping for the second page can get changed
but we don't take care of direct jumps in this case.

However in user mode emulation, this is not the case because there's
only static address translation and TBs are always invalidated properly.

Fixes: 5b053a4a ("tcg: Clean up direct block chaining safety checks")

Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com>
Signed-off-by: Sergey Fedorov <sergey.fedorov@linaro.org>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Message-id: 1463404380-29302-1-git-send-email-sergey.fedorov@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parent 0533d3de

cpu-exec.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -345,6 +345,15 @@ static inline TranslationBlock tb_find_fast(CPUState cpu,
		*last_tb = NULL;
		cpu->tb_flushed = false;
		}
		#ifndef CONFIG_USER_ONLY
		/* We don't take care of direct jumps when address mapping changes in
		* system emulation. So it's not safe to make a direct jump to a TB
		* spanning two pages because the mapping for the second page can change.
		*/
		if (tb->page_addr[1] != -1) {
		*last_tb = NULL;
		}
		#endif
		/* See if we can patch the calling TB. */
		if (*last_tb && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {
		tb_add_jump(*last_tb, tb_exit, tb);