x86/svm: Fix handling of EFLAGS.RF on task switch

VT-x updates RF before vmexit, so eflags written into the outgoing TSS happens
to be correct.  SVM does not update RF before vmexit, and instead provides it
via a bit in exitinfo2.

In practice, needing RF set in the outgoing state occurs when a task gate is
used to handle faults.

Extend hvm_task_switch() with an extra_eflags parameter which gets fed into
the outgoing TSS, and fill it in suitably from the SVM vmexit information.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Andrew Cooper committed 2019-12-05 13:19:28 +00:00
1 parent efff60f8be
commit a57e0b3980
4 files changed
+7 -5

No files matched your search

+2 -2
View File
@@ -2913,7 +2913,7 @@ void hvm_prepare_vm86_tss(struct vcpu *v, uint32_t base, uint32_t limit)
void hvm_task_switch(
uint16_t tss_sel, enum hvm_task_switch_reason taskswitch_reason,
int32_t errcode, unsigned int insn_len)
int32_t errcode, unsigned int insn_len, unsigned int extra_eflags)
{
struct vcpu *v = current;
struct cpu_user_regs *regs = guest_cpu_user_regs();
@@ -2988,7 +2988,7 @@ void hvm_task_switch(
eflags &= ~X86_EFLAGS_NT;
tss.eip = regs->eip + insn_len;
tss.eflags = eflags;
tss.eflags = eflags | extra_eflags;
tss.eax = regs->eax;
tss.ecx = regs->ecx;
tss.edx = regs->edx;
+2 -1
View File
@@ -2812,7 +2812,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs)
if ( (vmcb->exitinfo2 >> 44) & 1 )
errcode = (uint32_t)vmcb->exitinfo2;
hvm_task_switch(vmcb->exitinfo1, reason, errcode, insn_len);
hvm_task_switch(vmcb->exitinfo1, reason, errcode, insn_len,
(vmcb->exitinfo2 & (1ul << 48)) ? X86_EFLAGS_RF : 0);
break;
}
+2 -1
View File
@@ -3963,7 +3963,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs)
else
ecode = -1;
hvm_task_switch(exit_qualification, reasons[source], ecode, inst_len);
hvm_task_switch(exit_qualification, reasons[source], ecode, inst_len,
0 /* EFLAGS.RF already updated. */);
break;
}
case EXIT_REASON_CPUID:
+1 -1
View File
@@ -296,7 +296,7 @@ void hvm_set_rdtsc_exiting(struct domain *d, bool_t enable);
enum hvm_task_switch_reason { TSW_jmp, TSW_iret, TSW_call_or_int };
void hvm_task_switch(
uint16_t tss_sel, enum hvm_task_switch_reason taskswitch_reason,
int32_t errcode, unsigned int insn_len);
int32_t errcode, unsigned int insn_len, unsigned int extra_eflags);
enum hvm_access_type {
hvm_access_insn_fetch,
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.