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

Commit dd92d6f2 authored by Alexander Graf's avatar Alexander Graf
Browse files

Merge commit 'origin/next' into kvm-ppc-next

parents b9e3e208 b0da5bec

Documentation/virtual/kvm/api.txt

+6 −19
Original line number Diff line number Diff line
@@ -219,19 +219,6 @@ allocation of vcpu ids. For example, if userspace wants 
single-threaded guest vcpus, it should make all vcpu ids be a multiple

of the number of vcpus per vcore.



On powerpc using book3s_hv mode, the vcpus are mapped onto virtual

threads in one or more virtual CPU cores.  (This is because the

hardware requires all the hardware threads in a CPU core to be in the

same partition.)  The KVM_CAP_PPC_SMT capability indicates the number

of vcpus per virtual core (vcore).  The vcore id is obtained by

dividing the vcpu id by the number of vcpus per vcore.  The vcpus in a

given vcore will always be in the same physical core as each other

(though that might be a different physical core from time to time).

Userspace can control the threading (SMT) mode of the guest by its

allocation of vcpu ids.  For example, if userspace wants

single-threaded guest vcpus, it should make all vcpu ids be a multiple

of the number of vcpus per vcore.



For virtual cpus that have been created with S390 user controlled virtual

machines, the resulting vcpu fd can be memory mapped at page offset

KVM_S390_SIE_PAGE_OFFSET in order to obtain a memory map of the virtual
@@ -874,12 +861,12 @@ It is recommended that the lower 21 bits of guest_phys_addr and userspace_addr 
be identical.  This allows large pages in the guest to be backed by large

pages in the host.



The flags field supports two flag, KVM_MEM_LOG_DIRTY_PAGES, which instructs

kvm to keep track of writes to memory within the slot.  See KVM_GET_DIRTY_LOG

ioctl.  The KVM_CAP_READONLY_MEM capability indicates the availability of the

KVM_MEM_READONLY flag.  When this flag is set for a memory region, KVM only

allows read accesses.  Writes will be posted to userspace as KVM_EXIT_MMIO

exits.

The flags field supports two flags: KVM_MEM_LOG_DIRTY_PAGES and

KVM_MEM_READONLY.  The former can be set to instruct KVM to keep track of

writes to memory within the slot.  See KVM_GET_DIRTY_LOG ioctl to know how to

use it.  The latter can be set, if KVM_CAP_READONLY_MEM capability allows it,

to make a new slot read-only.  In this case, writes to this memory will be

posted to userspace as KVM_EXIT_MMIO exits.



When the KVM_CAP_SYNC_MMU capability is available, changes in the backing of

the memory region are automatically reflected into the guest.  For example, an

arch/ia64/kvm/lapic.h

+6 −0
Original line number Diff line number Diff line
@@ -27,4 +27,10 @@ int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq); 
#define kvm_apic_present(x) (true)

#define kvm_lapic_enabled(x) (true)



static inline bool kvm_apic_vid_enabled(void)

{

	/* IA64 has no apicv supporting, do nothing here */

	return false;

}



#endif

arch/s390/kvm/kvm-s390.c

+8 −0
Original line number Diff line number Diff line
@@ -770,6 +770,14 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) 
	} else

		prefix = 0;



	/*

	 * The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy

	 * copying in vcpu load/put. Lets update our copies before we save

	 * it into the save area

	 */

	save_fp_regs(&vcpu->arch.guest_fpregs);

	save_access_regs(vcpu->run->s.regs.acrs);



	if (__guestcopy(vcpu, addr + offsetof(struct save_area, fp_regs),

			vcpu->arch.guest_fpregs.fprs, 128, prefix))

		return -EFAULT;

arch/s390/kvm/kvm-s390.h

+14 −11
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ static inline void kvm_s390_set_prefix(struct kvm_vcpu *vcpu, u32 prefix) 


static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu)

{

	int base2 = vcpu->arch.sie_block->ipb >> 28;

	int disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);

	u32 base2 = vcpu->arch.sie_block->ipb >> 28;

	u32 disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);



	return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;

}
@@ -76,10 +76,10 @@ static inline u64 kvm_s390_get_base_disp_s(struct kvm_vcpu *vcpu) 
static inline void kvm_s390_get_base_disp_sse(struct kvm_vcpu *vcpu,

					      u64 *address1, u64 *address2)

{

	int base1 = (vcpu->arch.sie_block->ipb & 0xf0000000) >> 28;

	int disp1 = (vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16;

	int base2 = (vcpu->arch.sie_block->ipb & 0xf000) >> 12;

	int disp2 = vcpu->arch.sie_block->ipb & 0x0fff;

	u32 base1 = (vcpu->arch.sie_block->ipb & 0xf0000000) >> 28;

	u32 disp1 = (vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16;

	u32 base2 = (vcpu->arch.sie_block->ipb & 0xf000) >> 12;

	u32 disp2 = vcpu->arch.sie_block->ipb & 0x0fff;



	*address1 = (base1 ? vcpu->run->s.regs.gprs[base1] : 0) + disp1;

	*address2 = (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;
@@ -87,17 +87,20 @@ static inline void kvm_s390_get_base_disp_sse(struct kvm_vcpu *vcpu, 


static inline u64 kvm_s390_get_base_disp_rsy(struct kvm_vcpu *vcpu)

{

	int base2 = vcpu->arch.sie_block->ipb >> 28;

	int disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16) +

	u32 base2 = vcpu->arch.sie_block->ipb >> 28;

	u32 disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16) +

			((vcpu->arch.sie_block->ipb & 0xff00) << 4);

	/* The displacement is a 20bit _SIGNED_ value */

	if (disp2 & 0x80000)

		disp2+=0xfff00000;



	return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;

	return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + (long)(int)disp2;

}



static inline u64 kvm_s390_get_base_disp_rs(struct kvm_vcpu *vcpu)

{

	int base2 = vcpu->arch.sie_block->ipb >> 28;

	int disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);

	u32 base2 = vcpu->arch.sie_block->ipb >> 28;

	u32 disp2 = ((vcpu->arch.sie_block->ipb & 0x0fff0000) >> 16);



	return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;

}

arch/x86/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -699,6 +699,11 @@ struct kvm_x86_ops { 
	void (*enable_nmi_window)(struct kvm_vcpu *vcpu);

	void (*enable_irq_window)(struct kvm_vcpu *vcpu);

	void (*update_cr8_intercept)(struct kvm_vcpu *vcpu, int tpr, int irr);

	int (*vm_has_apicv)(struct kvm *kvm);

	void (*hwapic_irr_update)(struct kvm_vcpu *vcpu, int max_irr);

	void (*hwapic_isr_update)(struct kvm *kvm, int isr);

	void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap);

	void (*set_virtual_x2apic_mode)(struct kvm_vcpu *vcpu, bool set);

	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);

	int (*get_tdp_level)(void);

	u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio);
@@ -993,6 +998,7 @@ int kvm_age_hva(struct kvm *kvm, unsigned long hva); 
int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

int cpuid_maxphyaddr(struct kvm_vcpu *vcpu);

int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v);

int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);

int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);

int kvm_cpu_get_interrupt(struct kvm_vcpu *v);