]> git.proxmox.com Git - mirror_qemu.git/commit - cpu-exec.c
target-i386: correctly propagate retaddr into SVM helpers
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 16 Feb 2017 11:30:05 +0000 (12:30 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 16 Feb 2017 17:37:01 +0000 (18:37 +0100)
commit65c9d60a3ad3249784348824eca69acac455bc02
treeb0fb43c0c2841ae1f62b5342e376a4d46accc9e9
parentf47291b7a7ffa8854300283d4773ed17d5d581c1
target-i386: correctly propagate retaddr into SVM helpers

Commit 2afbdf8 ("target-i386: exception handling for memory helpers",
2015-09-15) changed tlb_fill's cpu_restore_state+raise_exception_err
to raise_exception_err_ra.  After this change, the cpu_restore_state
and raise_exception_err's cpu_loop_exit are merged into
raise_exception_err_ra's cpu_loop_exit_restore.

This actually fixed some bugs, but when SVM is enabled there is a
second path from raise_exception_err_ra to cpu_loop_exit.  This is
the VMEXIT path, and now cpu_vmexit is called without a
cpu_restore_state before.

The fix is to pass the retaddr to cpu_vmexit (via
cpu_svm_check_intercept_param).  All helpers can now use GETPC() to pass
the correct retaddr, too.

Cc: qemu-stable@nongnu.org
Fixes: 2afbdf84807d673eb682cb78158e11cdacbf4673
Reported-by: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Tested-by: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
cpu-exec.c
target/i386/cpu.h
target/i386/excp_helper.c
target/i386/helper.h
target/i386/misc_helper.c
target/i386/seg_helper.c
target/i386/svm_helper.c