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

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

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull second batch of KVM changes from Paolo Bonzini:
 "This mostly includes the PPC changes for 4.1, which this time cover
  Book3S HV only (debugging aids, minor performance improvements and
  some cleanups).  But there are also bug fixes and small cleanups for
  ARM, x86 and s390.

  The task_migration_notifier revert and real fix is still pending
  review, but I'll send it as soon as possible after -rc1"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (29 commits)
  KVM: arm/arm64: check IRQ number on userland injection
  KVM: arm: irqfd: fix value returned by kvm_irq_map_gsi
  KVM: VMX: Preserve host CR4.MCE value while in guest mode.
  KVM: PPC: Book3S HV: Use msgsnd for signalling threads on POWER8
  KVM: PPC: Book3S HV: Translate kvmhv_commence_exit to C
  KVM: PPC: Book3S HV: Streamline guest entry and exit
  KVM: PPC: Book3S HV: Use bitmap of active threads rather than count
  KVM: PPC: Book3S HV: Use decrementer to wake napping threads
  KVM: PPC: Book3S HV: Don't wake thread with no vcpu on guest IPI
  KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken
  KVM: PPC: Book3S HV: Move vcore preemption point up into kvmppc_run_vcpu
  KVM: PPC: Book3S HV: Minor cleanups
  KVM: PPC: Book3S HV: Simplify handling of VCPUs that need a VPA update
  KVM: PPC: Book3S HV: Accumulate timing information for real-mode code
  KVM: PPC: Book3S HV: Create debugfs file for each guest's HPT
  KVM: PPC: Book3S HV: Add ICP real mode counters
  KVM: PPC: Book3S HV: Move virtual mode ICP functions to real-mode
  KVM: PPC: Book3S HV: Convert ICS mutex lock to spin lock
  KVM: PPC: Book3S HV: Add guest->host real mode completion counters
  KVM: PPC: Book3S HV: Add helpers for lock/unlock hpte
  ...
parents 4a655466 2fa462f8

Documentation/virtual/kvm/api.txt

+17 −0
Original line number Diff line number Diff line
@@ -3573,3 +3573,20 @@ struct { 
@ar   - access register number



KVM handlers should exit to userspace with rc = -EREMOTE.





8. Other capabilities.

----------------------



This section lists capabilities that give information about other

features of the KVM implementation.



8.1 KVM_CAP_PPC_HWRNG



Architectures: ppc



This capability, if KVM_CHECK_EXTENSION indicates that it is

available, means that that the kernel has an implementation of the

H_RANDOM hypercall backed by a hardware random-number generator.

If present, the kernel H_RANDOM handler can be enabled for guest use

with the KVM_CAP_PPC_ENABLE_HCALL capability.

arch/arm/include/uapi/asm/kvm.h

+7 −1
Original line number Diff line number Diff line
@@ -195,8 +195,14 @@ struct kvm_arch_memory_slot { 
#define KVM_ARM_IRQ_CPU_IRQ		0

#define KVM_ARM_IRQ_CPU_FIQ		1



/* Highest supported SPI, from VGIC_NR_IRQS */

/*

 * This used to hold the highest supported SPI, but it is now obsolete

 * and only here to provide source code level compatibility with older

 * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.

 */

#ifndef __KERNEL__

#define KVM_ARM_IRQ_GIC_MAX		127

#endif



/* One single KVM irqchip, ie. the VGIC */

#define KVM_NR_IRQCHIPS          1

arch/arm/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -671,8 +671,7 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, 
		if (!irqchip_in_kernel(kvm))

			return -ENXIO;



		if (irq_num < VGIC_NR_PRIVATE_IRQS ||

		    irq_num > KVM_ARM_IRQ_GIC_MAX)

		if (irq_num < VGIC_NR_PRIVATE_IRQS)

			return -EINVAL;



		return kvm_vgic_inject_irq(kvm, 0, irq_num, level);

arch/arm64/include/uapi/asm/kvm.h

+7 −1
Original line number Diff line number Diff line
@@ -188,8 +188,14 @@ struct kvm_arch_memory_slot { 
#define KVM_ARM_IRQ_CPU_IRQ		0

#define KVM_ARM_IRQ_CPU_FIQ		1



/* Highest supported SPI, from VGIC_NR_IRQS */

/*

 * This used to hold the highest supported SPI, but it is now obsolete

 * and only here to provide source code level compatibility with older

 * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.

 */

#ifndef __KERNEL__

#define KVM_ARM_IRQ_GIC_MAX		127

#endif



/* One single KVM irqchip, ie. the VGIC */

#define KVM_NR_IRQCHIPS          1

arch/powerpc/include/asm/archrandom.h

+9 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ static inline int arch_has_random(void) 
	return !!ppc_md.get_random_long;

}



int powernv_get_random_long(unsigned long *v);



static inline int arch_get_random_seed_long(unsigned long *v)

{

	return 0;
@@ -47,4 +45,13 @@ static inline int arch_has_random_seed(void) 


#endif /* CONFIG_ARCH_RANDOM */



#ifdef CONFIG_PPC_POWERNV

int powernv_hwrng_present(void);

int powernv_get_random_long(unsigned long *v);

int powernv_get_random_real_mode(unsigned long *v);

#else

static inline int powernv_hwrng_present(void) { return 0; }

static inline int powernv_get_random_real_mode(unsigned long *v) { return 0; }

#endif



#endif /* _ASM_POWERPC_ARCHRANDOM_H */