Skip to content

Commit 9aeb9d8

Browse files
committed
KVM: x86: Plumb the emulator's starting RIP into nested intercept checks
When checking for intercept when emulating an instruction on behalf of L2, pass the emulator's view of the RIP of the instruction being emulated to vendor code. Unlike SVM, which communicates the next RIP on VM-Exit, VMX communicates the length of the instruction that generated the VM-Exit, i.e. requires the current and next RIPs. Note, unless userspace modifies RIP during a userspace exit that requires completion, kvm_rip_read() will contain the same information. Pass the emulator's view largely out of a paranoia, and because there is no meaningful cost in doing so. Link: https://lore.kernel.org/r/20250201015518.689704-8-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 407d03f commit 9aeb9d8

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/x86/kvm/emulate.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt,
480480
.src_type = ctxt->src.type,
481481
.dst_type = ctxt->dst.type,
482482
.ad_bytes = ctxt->ad_bytes,
483+
.rip = ctxt->eip,
483484
.next_rip = ctxt->_eip,
484485
};
485486

arch/x86/kvm/kvm_emulate.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ struct x86_instruction_info {
4747
u8 src_type; /* type of source operand */
4848
u8 dst_type; /* type of destination operand */
4949
u8 ad_bytes; /* size of src/dst address */
50+
u64 rip; /* rip of the instruction */
5051
u64 next_rip; /* rip following the instruction */
5152
};
5253

0 commit comments

Comments
 (0)