Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2122ff5e authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: move vcpu locking to dispatcher for generic vcpu ioctls 



All vcpu ioctls need to be locked, so instead of locking each one specifically
we lock at the generic dispatcher.

This patch only updates generic ioctls and leaves arch specific ioctls alone.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1683b241

arch/ia64/kvm/kvm-ia64.c

+0 −11
Original line number Diff line number Diff line
@@ -725,8 +725,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	int r;

	sigset_t sigsaved;



	vcpu_load(vcpu);



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
@@ -748,7 +746,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);



	vcpu_put(vcpu);

	return r;

}
@@ -883,8 +880,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd);

	int i;



	vcpu_load(vcpu);



	for (i = 0; i < 16; i++) {

		vpd->vgr[i] = regs->vpd.vgr[i];

		vpd->vbgr[i] = regs->vpd.vbgr[i];
@@ -931,8 +926,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	vcpu->arch.itc_offset = regs->saved_itc - kvm_get_itc(vcpu);

	set_bit(KVM_REQ_RESUME, &vcpu->requests);



	vcpu_put(vcpu);



	return 0;

}
@@ -1967,9 +1960,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) 
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	vcpu_load(vcpu);

	mp_state->mp_state = vcpu->arch.mp_state;

	vcpu_put(vcpu);

	return 0;

}
@@ -2000,10 +1991,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, 
{

	int r = 0;



	vcpu_load(vcpu);

	vcpu->arch.mp_state = mp_state->mp_state;

	if (vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)

		r = vcpu_reset(vcpu);

	vcpu_put(vcpu);

	return r;

}

arch/powerpc/kvm/book3s.c

+0 −16
Original line number Diff line number Diff line
@@ -1047,8 +1047,6 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



	regs->pc = kvmppc_get_pc(vcpu);

	regs->cr = kvmppc_get_cr(vcpu);

	regs->ctr = kvmppc_get_ctr(vcpu);
@@ -1069,8 +1067,6 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		regs->gpr[i] = kvmppc_get_gpr(vcpu, i);



	vcpu_put(vcpu);



	return 0;

}
@@ -1078,8 +1074,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



	kvmppc_set_pc(vcpu, regs->pc);

	kvmppc_set_cr(vcpu, regs->cr);

	kvmppc_set_ctr(vcpu, regs->ctr);
@@ -1099,8 +1093,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		kvmppc_set_gpr(vcpu, i, regs->gpr[i]);



	vcpu_put(vcpu);



	return 0;

}
@@ -1110,8 +1102,6 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
	struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);

	int i;



	vcpu_load(vcpu);



	sregs->pvr = vcpu->arch.pvr;



	sregs->u.s.sdr1 = to_book3s(vcpu)->sdr1;
@@ -1131,8 +1121,6 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
		}

	}



	vcpu_put(vcpu);



	return 0;

}
@@ -1142,8 +1130,6 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	struct kvmppc_vcpu_book3s *vcpu3s = to_book3s(vcpu);

	int i;



	vcpu_load(vcpu);



	kvmppc_set_pvr(vcpu, sregs->pvr);



	vcpu3s->sdr1 = sregs->u.s.sdr1;
@@ -1171,8 +1157,6 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	/* Flush the MMU after messing with the segments */

	kvmppc_mmu_pte_flush(vcpu, 0, 0);



	vcpu_put(vcpu);



	return 0;

}

arch/powerpc/kvm/booke.c

+0 −10
Original line number Diff line number Diff line
@@ -485,8 +485,6 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



	regs->pc = vcpu->arch.pc;

	regs->cr = kvmppc_get_cr(vcpu);

	regs->ctr = vcpu->arch.ctr;
@@ -507,8 +505,6 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		regs->gpr[i] = kvmppc_get_gpr(vcpu, i);



	vcpu_put(vcpu);



	return 0;

}
@@ -516,8 +512,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
{

	int i;



	vcpu_load(vcpu);



	vcpu->arch.pc = regs->pc;

	kvmppc_set_cr(vcpu, regs->cr);

	vcpu->arch.ctr = regs->ctr;
@@ -537,8 +531,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)

		kvmppc_set_gpr(vcpu, i, regs->gpr[i]);



	vcpu_put(vcpu);



	return 0;

}
@@ -569,9 +561,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
{

	int r;



	vcpu_load(vcpu);

	r = kvmppc_core_vcpu_translate(vcpu, tr);

	vcpu_put(vcpu);

	return r;

}

arch/powerpc/kvm/powerpc.c

+0 −4
Original line number Diff line number Diff line
@@ -423,8 +423,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	int r;

	sigset_t sigsaved;



	vcpu_load(vcpu);



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
@@ -456,8 +454,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);



	vcpu_put(vcpu);



	return r;

}

arch/s390/kvm/kvm-s390.c

+0 −16
Original line number Diff line number Diff line
@@ -371,55 +371,43 @@ static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 


int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

{

	vcpu_load(vcpu);

	memcpy(&vcpu->arch.guest_gprs, &regs->gprs, sizeof(regs->gprs));

	vcpu_put(vcpu);

	return 0;

}



int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

{

	vcpu_load(vcpu);

	memcpy(&regs->gprs, &vcpu->arch.guest_gprs, sizeof(regs->gprs));

	vcpu_put(vcpu);

	return 0;

}



int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,

				  struct kvm_sregs *sregs)

{

	vcpu_load(vcpu);

	memcpy(&vcpu->arch.guest_acrs, &sregs->acrs, sizeof(sregs->acrs));

	memcpy(&vcpu->arch.sie_block->gcr, &sregs->crs, sizeof(sregs->crs));

	vcpu_put(vcpu);

	return 0;

}



int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,

				  struct kvm_sregs *sregs)

{

	vcpu_load(vcpu);

	memcpy(&sregs->acrs, &vcpu->arch.guest_acrs, sizeof(sregs->acrs));

	memcpy(&sregs->crs, &vcpu->arch.sie_block->gcr, sizeof(sregs->crs));

	vcpu_put(vcpu);

	return 0;

}



int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	vcpu_load(vcpu);

	memcpy(&vcpu->arch.guest_fpregs.fprs, &fpu->fprs, sizeof(fpu->fprs));

	vcpu->arch.guest_fpregs.fpc = fpu->fpc;

	vcpu_put(vcpu);

	return 0;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	vcpu_load(vcpu);

	memcpy(&fpu->fprs, &vcpu->arch.guest_fpregs.fprs, sizeof(fpu->fprs));

	fpu->fpc = vcpu->arch.guest_fpregs.fpc;

	vcpu_put(vcpu);

	return 0;

}
@@ -498,8 +486,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	int rc;

	sigset_t sigsaved;



	vcpu_load(vcpu);



rerun_vcpu:

	if (vcpu->requests)

		if (test_and_clear_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests))
@@ -568,8 +554,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);



	vcpu_put(vcpu);



	vcpu->stat.exit_userspace++;

	return rc;

}