From: Avi Kivity <avi@redhat.com>
To: Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org
Subject: [PATCH v2 24/26] KVM: x86 emulator: make loading TR set the busy bit
Date: Wed, 27 Jun 2012 18:19:27 +0300 [thread overview]
Message-ID: <1340810369-25392-30-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1340810369-25392-1-git-send-email-avi@redhat.com>
Guest software doesn't actually depend on it, but vmx will refuse us
entry if we don't. Set the bit in both the cached segment and memory,
just to be nice.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/kvm/emulate.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 99e3df2..92a1add 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1335,7 +1335,7 @@ static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
u16 selector, int seg)
{
- struct desc_struct seg_desc;
+ struct desc_struct seg_desc, old_desc;
u8 dpl, rpl, cpl;
unsigned err_vec = GP_VECTOR;
u32 err_code = 0;
@@ -1422,6 +1422,12 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
case VCPU_SREG_TR:
if (seg_desc.s || (seg_desc.type != 1 && seg_desc.type != 9))
goto exception;
+ old_desc = seg_desc;
+ seg_desc.type |= 2; /* busy */
+ ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc,
+ sizeof(seg_desc), &ctxt->exception);
+ if (ret != X86EMUL_CONTINUE)
+ return ret;
break;
case VCPU_SREG_LDTR:
if (seg_desc.s || seg_desc.type != 2)
--
1.7.11
next prev parent reply other threads:[~2012-06-27 15:20 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-27 15:18 [PATCH v2 00/26] Big big real mode improvements Avi Kivity
2012-06-27 15:18 ` [PATCH v2 01/26] KVM: VMX: Return correct CPL during transition to protected mode Avi Kivity
2012-06-27 15:19 ` [PATCH 1/5] KVM: x86 emulator: emulate BSWAP Avi Kivity
2012-06-27 15:19 ` [PATCH v2 02/26] KVM: Split cpuid register access from computation Avi Kivity
2012-06-27 15:19 ` [PATCH 2/5] KVM: x86 emulator: emulate LLDT Avi Kivity
2012-06-27 15:19 ` [PATCH v2 03/26] KVM: x86 emulator: change ->get_cpuid() accessor to use the x86 semantics Avi Kivity
2012-06-27 15:19 ` [PATCH 3/5] KVM: x86 emulator: make read_segment_descriptor() return the address Avi Kivity
2012-06-27 15:19 ` [PATCH v2 04/26] KVM: x86 emulator: emulate cpuid Avi Kivity
2012-06-27 15:19 ` [PATCH 4/5] KVM: x86 emulator: make loading TR set the busy bit Avi Kivity
2012-06-27 15:19 ` [PATCH v2 05/26] KVM: x86 emulator: allow loading null SS in long mode Avi Kivity
2012-06-27 15:19 ` [PATCH 5/5] KVM: x86 emulator: implement LTR Avi Kivity
2012-06-27 15:19 ` [PATCH v2 06/26] KVM: x86 emulator: fix LIDT/LGDT in long mode Avi Kivity
2012-06-27 15:19 ` [PATCH v2 07/26] KVM: VMX: Relax check on unusable segment Avi Kivity
2012-06-27 15:19 ` [PATCH v2 08/26] KVM: VMX: Limit iterations with emulator_invalid_guest_state Avi Kivity
2012-06-27 15:19 ` [PATCH v2 09/26] KVM: x86 emulator: emulate LEAVE Avi Kivity
2012-06-27 15:19 ` [PATCH v2 10/26] KVM: x86 emulator: initialize memop Avi Kivity
2012-06-27 15:19 ` [PATCH v2 11/26] KVM: Fix SS default ESP/EBP based addressing Avi Kivity
2012-06-27 15:19 ` [PATCH v2 12/26] KVM: x86 emulator: emulate SGDT/SIDT Avi Kivity
2012-06-27 15:19 ` [PATCH v2 13/26] KVM: VMX: Fix interrupt exit condition during emulation Avi Kivity
2012-06-27 15:19 ` [PATCH v2 14/26] KVM: VMX: Continue emulating after batch exhausted Avi Kivity
2012-06-27 15:19 ` [PATCH v2 15/26] KVM: x86 emulator: emulate LAHF Avi Kivity
2012-06-27 15:19 ` [PATCH v2 16/26] KVM: x86 emulator: fix byte-sized MOVZX/MOVSX Avi Kivity
2012-06-27 15:19 ` [PATCH v2 17/26] KVM: x86 emulator: split push logic from push opcode emulation Avi Kivity
2012-06-27 15:19 ` [PATCH v2 18/26] KVM: x86 emulator: implement ENTER Avi Kivity
2012-06-27 15:19 ` [PATCH v2 19/26] KVM: VMX: Stop invalid guest state emulation on pending event Avi Kivity
2012-06-27 15:19 ` [PATCH v2 20/26] KVM: VMX: Improve error reporting during invalid guest state emulation Avi Kivity
2012-06-27 15:19 ` [PATCH v2 21/26] KVM: x86 emulator: emulate BSWAP Avi Kivity
2012-06-27 15:19 ` [PATCH v2 22/26] KVM: x86 emulator: emulate LLDT Avi Kivity
2012-06-27 15:19 ` [PATCH v2 23/26] KVM: x86 emulator: make read_segment_descriptor() return the address Avi Kivity
2012-06-27 15:19 ` Avi Kivity [this message]
2012-06-27 15:19 ` [PATCH v2 25/26] KVM: x86 emulator: implement LTR Avi Kivity
2012-06-27 15:19 ` [PATCH v2 26/26] KVM: VMX: Emulate invalid guest state by default Avi Kivity
2012-06-27 15:23 ` [PATCH v2 00/26] Big big real mode improvements Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340810369-25392-30-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox