Skip to content

fix live migration #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix live migration #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 49 additions & 0 deletions kvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@
#include <asm/cpu.h>
#include <sys/id_space.h>
#include <sys/hma.h>
#include <sys/time.h>

#include "kvm_bitops.h"
#include "kvm_vmx.h"
Expand Down Expand Up @@ -2536,6 +2537,11 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
break;
}

if (copyin(argp, &chip, sizeof (chip)) != 0) {
rval = EFAULT;
break;
}

rval = kvm_vm_ioctl_get_irqchip(kvmp, &chip);

if (rval == 0 && copyout(&chip, argp, sz) != 0) {
Expand Down Expand Up @@ -2587,6 +2593,49 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
rval = kvm_vm_ioctl_get_dirty_log(kvmp, &log);
break;
}
case KVM_SET_CLOCK: {
struct kvm *kvmp;
struct kvm_clock_data user_ns;
hrtime_t now_ns;

rval = 0;
if (copyin(argp, &user_ns, sizeof (user_ns)) != 0) {
rval = EFAULT;
break;
}
if ((kvmp = ksp->kds_kvmp) == NULL) {
rval = EINVAL;
break;
}
if (user_ns.clock > INT64_MAX) {
/* refuse value that cannot be converted to hrtime_t */
rval = EINVAL;
break;
}

now_ns = gethrtime();
kvmp->arch.boot_hrtime = now_ns - (hrtime_t)user_ns.clock;
break;
}
case KVM_GET_CLOCK: {
struct kvm *kvmp;
struct kvm_clock_data user_ns;
hrtime_t now_ns;

if ((kvmp = ksp->kds_kvmp) == NULL) {
rval = EINVAL;
break;
}

now_ns = gethrtime();
user_ns.clock = (uint64_t)(now_ns - kvmp->arch.boot_hrtime);
user_ns.flags = 0;

rval = 0;
if (copyout(&user_ns, argp, sizeof (user_ns)) != 0)
rval = EFAULT;
break;
}
case KVM_NMI: {

if (ksp->kds_kvmp == NULL) {
Expand Down
4 changes: 2 additions & 2 deletions kvm_emulate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3030,9 +3030,9 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
c->dst.val = (c->d & ByteOp) ? (int8_t) c->src.val :
(int16_t) c->src.val;
break;
case 0xc0 ... 0xc1: /* xadd */
case 0xc0 ... 0xc1: /* xadd */
kvm_ringbuf_record(&ctxt->vcpu->kvcpu_ringbuf,
KVM_RINGBUF_TAG_EMUXADD, (uint64_t)c->dst.ptr);
KVM_RINGBUF_TAG_EMUXADD, (uint64_t)c->dst.ptr);
emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags);
/* Write back the register source. */
c->src.val = c->dst.orig_val;
Expand Down
3 changes: 3 additions & 0 deletions kvm_x86.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,8 @@ kvm_write_guest_time(struct kvm_vcpu *v)

membar_producer();

DTRACE_PROBE1(kvm_write_pvclock, struct pvclock_vcpu_time_info *, pvclock);

/* indicate update finished */
pvclock->version = version + 1;
vcpu->time_update = hrt;
Expand Down Expand Up @@ -4786,6 +4788,7 @@ kvm_arch_create_vm(void)

/* Record time at boot (creation) */
gethrestime(&kvm->arch.boot_wallclock);
kvm->arch.boot_hrtime = gethrtime();

return (kvm);
}
Expand Down
2 changes: 1 addition & 1 deletion kvm_x86host.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ struct pvclock_vcpu_time_info {
typedef struct pvclock_vcpu_time_info pvclock_vcpu_time_info_t;

/* Values for pvclock_vcpu_time_info_t`flags: */
#define PVCLOCK_TSC_STABLE_BIT (1 << 0)
#define PVCLOCK_TSC_STABLE_BIT (1 << 0)

typedef struct msi_msg {
uint32_t address_lo; /* low 32 bits of msi msg. address */
Expand Down