Skip to content
This repository was archived by the owner on Jan 28, 2023. It is now read-only.

Exception interface for supervisor #199

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Exception interface for supervisor #199

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bf5fb55
Added fucntionality for BOPping needed for NTVDM
leecher1337 Mar 10, 2019
ccdf408
Let caller know about the shutdown reason. Is it VMX_EXIT_FAILED_VMEN…
leecher1337 Mar 10, 2019
06ab1fe
Fix for VMX_EXIT_FAILED_VMENTER_GS when entering VM after a STI on HA…
leecher1337 Mar 16, 2019
9dce9fc
Make generic interface to define custom Exception bitmaps that return…
leecher1337 Apr 18, 2019
608b113
Whitespace fixes
leecher1337 Apr 19, 2019
5e4113b
Bugfix for #234
leecher1337 Aug 15, 2019
792f407
Fix adapted to solution propsed by @wcwang, as there seem to be no de…
leecher1337 Aug 15, 2019
c2f9b77
Visual Studio copy&paste destroyed proper indentation, fixed.
leecher1337 Aug 15, 2019
a23145c
Hopefully the last indentation issue with tab instead of space :)
leecher1337 Aug 21, 2019
f97569d
Merge branch 'master' into master
leecher1337 Aug 28, 2019
a9cc5f9
Adapted patch to use new logging interface.
leecher1337 Aug 28, 2019
0304961
Merge branch 'master' into master
leecher1337 Aug 29, 2019
99614cd
Arrrrgh... Is there any way that VS2017 can be told that it has to us…
leecher1337 Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/cpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ bool vcpu_is_panic(struct vcpu_t *vcpu)
if (vcpu->panicked) {
hax_error("vcpu has panicked, id:%d\n", vcpu->vcpu_id);
hax_panic_log(vcpu);
htun->_exit_reason = vmx(vcpu, exit_reason).basic_reason;
Copy link

@VelocityRa VelocityRa Aug 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use spaces

Suggested change
htun->_exit_reason = vmx(vcpu, exit_reason).basic_reason;
htun->_exit_reason = vmx(vcpu, exit_reason).basic_reason;

Copy link
Contributor Author

@leecher1337 leecher1337 Aug 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, hopefully this was the last tab vs. space issue, I did a grep on \t now and didn't find any more areas

htun->_exit_status = HAX_EXIT_STATECHANGE;
return 1;
}
Expand Down
1 change: 1 addition & 0 deletions core/include/hax_core_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ struct vm_t * hax_create_vm(int *vm_id);
int hax_teardown_vm(struct vm_t *vm);
int vcpu_event_pending(struct vcpu_t *vcpu);
void vcpu_set_panic(struct vcpu_t *vcpu);
void vcpu_setexcbmp(struct vcpu_t *vcpu, uint32_t excbmp);

#ifdef __cplusplus
}
Expand Down
3 changes: 3 additions & 0 deletions core/include/vcpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ struct vcpu_t {
#ifdef CONFIG_HAX_EPT2
struct mmio_fetch_cache mmio_fetch;
#endif // CONFIG_HAX_EPT2

uint32_t user_excbmp;
};

#define vmx(v, field) v->vmx.field
Expand All @@ -264,6 +266,7 @@ int vcpu_put_fpu(struct vcpu_t *vcpu, struct fx_layout *fl);
int vcpu_get_msr(struct vcpu_t *vcpu, uint64_t entry, uint64_t *val);
int vcpu_put_msr(struct vcpu_t *vcpu, uint64_t entry, uint64_t val);
void vcpu_debug(struct vcpu_t *vcpu, struct hax_debug_t *debug);
void vcpu_setexcbmp(struct vcpu_t *vcpu, uint32_t excbmp);

/* The declaration for OS wrapper code */
int hax_vcpu_destroy_host(struct vcpu_t *cvcpu, void *vcpu_host);
Expand Down
3 changes: 2 additions & 1 deletion core/include/vm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ enum exit_status {
HAX_EXIT_PAUSED,
HAX_EXIT_FAST_MMIO,
HAX_EXIT_PAGEFAULT,
HAX_EXIT_DEBUG
HAX_EXIT_DEBUG,
HAX_EXIT_NMI
};

enum run_flag {
Expand Down
4 changes: 4 additions & 0 deletions core/memslot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,12 @@ static inline void memslot_delete(hax_memslot *dest)

static inline void memslot_move(hax_memslot *dest, hax_memslot *src)
{
hax_list_node entry;

ramblock_deref(dest->block);
entry = dest->entry;
memslot_init(dest, src);
dest->entry = entry;
Copy link
Contributor

@wcwang wcwang Aug 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks for @leecher1337 shooting the root cause! For performance reasons, it is recommended to get rid of memslot_init() invocation to avoid assigning dest->entry 3 times within this function. I drafted the commit message for your reference. The following code should be equivalent for your reference. Thanks again.

Fix a bug of memslot_move()

Invoking memslot_init() in memslot_move() will result in losing the
linked list information of the original memory slot node. Reimplement
memslot_move() to resolve some exceptional issues during mapping memory
slots.

static inline void memslot_move(hax_memslot *dest, hax_memslot *src)
{
ramblock_deref(dest->block);
src->entry = dest->entry;
*dest = *src;
ramblock_ref(dest->block);
}

}

static inline void memslot_union(hax_memslot *dest, hax_memslot *src)
Expand Down
24 changes: 24 additions & 0 deletions core/vcpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,11 @@ static void load_dirty_vmcs_fields(struct vcpu_t *vcpu)
vcpu->rflags_dirty = 1;
vcpu->debug_control_dirty = 0;
}
if ((vcpu->debug_control & HAX_DEBUG_STEP) &&
(vmx(vcpu, interruptibility_state).raw & 3u)) {
vmx(vcpu, interruptibility_state).raw &= ~3u;
vcpu->interruptibility_dirty = 1;
}
if (vcpu->rflags_dirty) {
vmwrite(vcpu, GUEST_RFLAGS, state->_rflags);
vcpu->rflags_dirty = 0;
Expand Down Expand Up @@ -1304,6 +1309,7 @@ static void vcpu_update_exception_bitmap(struct vcpu_t *vcpu)
if (vcpu->debug_control & HAX_DEBUG_USE_SW_BP) {
exc_bitmap |= (1u << VECTOR_BP);
}
exc_bitmap |= vcpu->user_excbmp;
vmwrite(vcpu, VMX_EXCEPTION_BITMAP, exc_bitmap);
}

Expand Down Expand Up @@ -2387,6 +2393,17 @@ static int exit_exc_nmi(struct vcpu_t *vcpu, struct hax_tunnel *htun)
htun->debug.dr7 = 0;
return HAX_EXIT;
}
default:
if (vcpu->user_excbmp & (1 << exit_intr_info.vector))
{
uint64_t va;

htun->_exit_status = HAX_EXIT_NMI;
htun->nmi.exit_intr_info = exit_intr_info.raw;
va = vcpu->state->_cs.long_mode == 1 ? vcpu->state->_rip : vcpu->state->_cs.base + vcpu->state->_rip;
vcpu_read_guest_virtual(vcpu, va, vcpu->io_buf, INSTR_MAX_LEN, INSTR_MAX_LEN, 0);
return HAX_EXIT;
}
}

if (exit_intr_info.vector == VECTOR_PF) {
Expand Down Expand Up @@ -4103,6 +4120,13 @@ void vcpu_debug(struct vcpu_t *vcpu, struct hax_debug_t *debug)
vcpu_update_exception_bitmap(vcpu);
};

void vcpu_setexcbmp(struct vcpu_t *vcpu, uint32_t excbmp)
{
vcpu->user_excbmp = excbmp;
hax_error("set user_excbmp = %08X", vcpu->user_excbmp);
vcpu_update_exception_bitmap(vcpu);
}

static void vcpu_dump(struct vcpu_t *vcpu, uint32_t mask, const char *caption)
{
vcpu_vmread_all(vcpu);
Expand Down
3 changes: 3 additions & 0 deletions include/hax_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ struct hax_tunnel {
uint64_t dr6;
uint64_t dr7;
} debug;
struct {
uint32_t exit_intr_info;
} nmi;
};
uint64_t apic_base;
} PACKED;
Expand Down
4 changes: 4 additions & 0 deletions platforms/windows/hax_entry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,10 @@ NTSTATUS HaxVcpuControl(PDEVICE_OBJECT DeviceObject,
vcpu_debug(cvcpu, (struct hax_debug_t*)inBuf);
break;
}
case HAX_VCPU_IOCTL_SET_EXCBMP: {
vcpu_setexcbmp(cvcpu, *(uint32_t*)inBuf);
break;
}
default:
hax_error("Unknow vcpu ioctl %lx\n",
irpSp->Parameters.DeviceIoControl.IoControlCode);
Expand Down
3 changes: 3 additions & 0 deletions platforms/windows/hax_entry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,7 @@ extern PDRIVER_OBJECT HaxDriverObject;
#define HAX_IOCTL_VCPU_DEBUG \
CTL_CODE(HAX_DEVICE_TYPE, 0x916, METHOD_BUFFERED, FILE_ANY_ACCESS)

#define HAX_VCPU_IOCTL_SET_EXCBMP \
CTL_CODE(HAX_DEVICE_TYPE, 0x919, METHOD_BUFFERED, FILE_ANY_ACCESS)

#endif // HAX_WINDOWS_HAX_ENTRY_H_