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

Commit a4cc3889 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM guest: prevent tracing recursion with kvmclock
  Revert "KVM: PPC: Add support for explicit HIOR setting"
  KVM: VMX: Check for automatic switch msr table overflow
  KVM: VMX: Add support for guest/host-only profiling
  KVM: VMX: add support for switching of PERF_GLOBAL_CTRL
  KVM: s390: announce SYNC_MMU
  KVM: s390: Fix tprot locking
  KVM: s390: handle SIGP sense running intercepts
  KVM: s390: Fix RUNNING flag misinterpretation
parents bb893d15 95ef1e52

arch/powerpc/include/asm/kvm.h

+0 −8
Original line number Diff line number Diff line
@@ -148,12 +148,6 @@ struct kvm_regs { 
#define KVM_SREGS_E_UPDATE_DEC		(1 << 2)

#define KVM_SREGS_E_UPDATE_DBSR		(1 << 3)



/*

 * Book3S special bits to indicate contents in the struct by maintaining

 * backwards compatibility with older structs. If adding a new field,

 * please make sure to add a flag for that new field */

#define KVM_SREGS_S_HIOR		(1 << 0)



/*

 * In KVM_SET_SREGS, reserved/pad fields must be left untouched from a

 * previous KVM_GET_REGS.
@@ -179,8 +173,6 @@ struct kvm_sregs { 
				__u64 ibat[8]; 

				__u64 dbat[8]; 

			} ppc32;

			__u64 flags; /* KVM_SREGS_S_ */

			__u64 hior;

		} s;

		struct {

			union {

arch/powerpc/include/asm/kvm_book3s.h

+0 −2
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ struct kvmppc_vcpu_book3s { 
#endif

	int context_id[SID_CONTEXTS];



	bool hior_sregs;		/* HIOR is set by SREGS, not PVR */



	struct hlist_head hpte_hash_pte[HPTEG_HASH_NUM_PTE];

	struct hlist_head hpte_hash_pte_long[HPTEG_HASH_NUM_PTE_LONG];

	struct hlist_head hpte_hash_vpte[HPTEG_HASH_NUM_VPTE];

arch/powerpc/kvm/book3s_pr.c

+2 −12
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ void kvmppc_set_pvr(struct kvm_vcpu *vcpu, u32 pvr) 
#ifdef CONFIG_PPC_BOOK3S_64

	if ((pvr >= 0x330000) && (pvr < 0x70330000)) {

		kvmppc_mmu_book3s_64_init(vcpu);

		if (!to_book3s(vcpu)->hior_sregs)

		to_book3s(vcpu)->hior = 0xfff00000;

		to_book3s(vcpu)->msr_mask = 0xffffffffffffffffULL;

		vcpu->arch.cpu_type = KVM_CPU_3S_64;
@@ -159,7 +158,6 @@ void kvmppc_set_pvr(struct kvm_vcpu *vcpu, u32 pvr) 
#endif

	{

		kvmppc_mmu_book3s_32_init(vcpu);

		if (!to_book3s(vcpu)->hior_sregs)

		to_book3s(vcpu)->hior = 0;

		to_book3s(vcpu)->msr_mask = 0xffffffffULL;

		vcpu->arch.cpu_type = KVM_CPU_3S_32;
@@ -797,9 +795,6 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
		}

	}



	if (sregs->u.s.flags & KVM_SREGS_S_HIOR)

		sregs->u.s.hior = to_book3s(vcpu)->hior;



	return 0;

}
@@ -836,11 +831,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);



	if (sregs->u.s.flags & KVM_SREGS_S_HIOR) {

		to_book3s(vcpu)->hior_sregs = true;

		to_book3s(vcpu)->hior = sregs->u.s.hior;

	}



	return 0;

}

arch/powerpc/kvm/powerpc.c

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_PPC_BOOKE_SREGS:

#else

	case KVM_CAP_PPC_SEGSTATE:

	case KVM_CAP_PPC_HIOR:

	case KVM_CAP_PPC_PAPR:

#endif

	case KVM_CAP_PPC_UNSET_IRQ:

arch/s390/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct sca_block { 
#define KVM_HPAGE_MASK(x)	(~(KVM_HPAGE_SIZE(x) - 1))

#define KVM_PAGES_PER_HPAGE(x)	(KVM_HPAGE_SIZE(x) / PAGE_SIZE)



#define CPUSTAT_HOST       0x80000000

#define CPUSTAT_STOPPED    0x80000000

#define CPUSTAT_WAIT       0x10000000

#define CPUSTAT_ECALL_PEND 0x08000000

#define CPUSTAT_STOP_INT   0x04000000
@@ -139,6 +139,7 @@ struct kvm_vcpu_stat { 
	u32 instruction_stfl;

	u32 instruction_tprot;

	u32 instruction_sigp_sense;

	u32 instruction_sigp_sense_running;

	u32 instruction_sigp_external_call;

	u32 instruction_sigp_emergency;

	u32 instruction_sigp_stop;