Commit de7906c3 authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Convert SRR0 and SRR1 to shared page 



The SRR0 and SRR1 registers contain cached values of the PC and MSR
respectively. They get written to by the hypervisor when an interrupt
occurs or directly by the kernel. They are also used to tell the rfi(d)
instruction where to jump to.

Because it only gets touched on defined events that, it's very simple to
share with the guest. Hypervisor and guest both have full r/w access.

This patch converts all users of the current field to the shared page.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 5e030186

arch/powerpc/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ struct kvm_vcpu_arch { 
	ulong sprg5;

	ulong sprg6;

	ulong sprg7;

	ulong srr0;

	ulong srr1;

	ulong csrr0;

	ulong csrr1;

	ulong dsrr0;

arch/powerpc/include/asm/kvm_para.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <linux/types.h>



struct kvm_vcpu_arch_shared {

	__u64 srr0;

	__u64 srr1;

	__u64 dar;

	__u64 msr;

	__u32 dsisr;

arch/powerpc/kvm/book3s.c

+6 −6
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr) 


void kvmppc_inject_interrupt(struct kvm_vcpu *vcpu, int vec, u64 flags)

{

	vcpu->arch.srr0 = kvmppc_get_pc(vcpu);

	vcpu->arch.srr1 = vcpu->arch.shared->msr | flags;

	vcpu->arch.shared->srr0 = kvmppc_get_pc(vcpu);

	vcpu->arch.shared->srr1 = vcpu->arch.shared->msr | flags;

	kvmppc_set_pc(vcpu, to_book3s(vcpu)->hior + vec);

	vcpu->arch.mmu.reset_msr(vcpu);

}
@@ -1059,8 +1059,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	regs->lr = kvmppc_get_lr(vcpu);

	regs->xer = kvmppc_get_xer(vcpu);

	regs->msr = vcpu->arch.shared->msr;

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

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

	regs->srr0 = vcpu->arch.shared->srr0;

	regs->srr1 = vcpu->arch.shared->srr1;

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

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

	regs->sprg1 = vcpu->arch.sprg1;
@@ -1086,8 +1086,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	kvmppc_set_lr(vcpu, regs->lr);

	kvmppc_set_xer(vcpu, regs->xer);

	kvmppc_set_msr(vcpu, regs->msr);

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

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

	vcpu->arch.shared->srr0 = regs->srr0;

	vcpu->arch.shared->srr1 = regs->srr1;

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

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

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

arch/powerpc/kvm/book3s_emulate.c

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu, 
		switch (get_xop(inst)) {

		case OP_19_XOP_RFID:

		case OP_19_XOP_RFI:

			kvmppc_set_pc(vcpu, vcpu->arch.srr0);

			kvmppc_set_msr(vcpu, vcpu->arch.srr1);

			kvmppc_set_pc(vcpu, vcpu->arch.shared->srr0);

			kvmppc_set_msr(vcpu, vcpu->arch.shared->srr1);

			*advance = 0;

			break;

arch/powerpc/kvm/booke.c

+8 −7
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ void kvmppc_dump_vcpu(struct kvm_vcpu *vcpu) 


	printk("pc:   %08lx msr:  %08llx\n", vcpu->arch.pc, vcpu->arch.shared->msr);

	printk("lr:   %08lx ctr:  %08lx\n", vcpu->arch.lr, vcpu->arch.ctr);

	printk("srr0: %08lx srr1: %08lx\n", vcpu->arch.srr0, vcpu->arch.srr1);

	printk("srr0: %08llx srr1: %08llx\n", vcpu->arch.shared->srr0,

					    vcpu->arch.shared->srr1);



	printk("exceptions: %08lx\n", vcpu->arch.pending_exceptions);
@@ -189,8 +190,8 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, 
	}



	if (allowed) {

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

		vcpu->arch.srr1 = vcpu->arch.shared->msr;

		vcpu->arch.shared->srr0 = vcpu->arch.pc;

		vcpu->arch.shared->srr1 = vcpu->arch.shared->msr;

		vcpu->arch.pc = vcpu->arch.ivpr | vcpu->arch.ivor[priority];

		if (update_esr == true)

			vcpu->arch.esr = vcpu->arch.queued_esr;
@@ -491,8 +492,8 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	regs->lr = vcpu->arch.lr;

	regs->xer = kvmppc_get_xer(vcpu);

	regs->msr = vcpu->arch.shared->msr;

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

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

	regs->srr0 = vcpu->arch.shared->srr0;

	regs->srr1 = vcpu->arch.shared->srr1;

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

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

	regs->sprg1 = vcpu->arch.sprg1;
@@ -518,8 +519,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	vcpu->arch.lr = regs->lr;

	kvmppc_set_xer(vcpu, regs->xer);

	kvmppc_set_msr(vcpu, regs->msr);

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

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

	vcpu->arch.shared->srr0 = regs->srr0;

	vcpu->arch.shared->srr1 = regs->srr1;

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

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE