Commit b63c2eb1 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge remote-tracking branch 'origin/master' into drm-intel-fixes 



Direct backmerge to get commit 88b67edd ("dax: Fix compilation for
CONFIG_DAX && !CONFIG_FS_DAX") to fix CI build issues.

Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents ba4f184e 98477740

Documentation/virt/kvm/api.rst

+20 −0
Original line number Diff line number Diff line
@@ -6173,3 +6173,23 @@ specific interfaces must be consistent, i.e. if one says the feature 
is supported, than the other should as well and vice versa.  For arm64

see Documentation/virt/kvm/devices/vcpu.rst "KVM_ARM_VCPU_PVTIME_CTRL".

For x86 see Documentation/virt/kvm/msr.rst "MSR_KVM_STEAL_TIME".



8.25 KVM_CAP_S390_DIAG318

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



:Architectures: s390



This capability enables a guest to set information about its control program

(i.e. guest kernel type and version). The information is helpful during

system/firmware service events, providing additional data about the guest

environments running on the machine.



The information is associated with the DIAGNOSE 0x318 instruction, which sets

an 8-byte value consisting of a one-byte Control Program Name Code (CPNC) and

a 7-byte Control Program Version Code (CPVC). The CPNC determines what

environment the control program is running in (e.g. Linux, z/VM...), and the

CPVC is used for information specific to OS (e.g. Linux version, Linux

distribution...)



If this capability is available, then the CPNC and CPVC can be synchronized

between KVM and userspace via the sync regs mechanism (KVM_SYNC_DIAG318).

arch/arm64/include/asm/kvm_emulate.h

+11 −3
Original line number Diff line number Diff line
@@ -298,15 +298,15 @@ static __always_inline int kvm_vcpu_dabt_get_rd(const struct kvm_vcpu *vcpu) 
	return (kvm_vcpu_get_esr(vcpu) & ESR_ELx_SRT_MASK) >> ESR_ELx_SRT_SHIFT;

}



static __always_inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu)

static __always_inline bool kvm_vcpu_abt_iss1tw(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_S1PTW);

}



/* Always check for S1PTW *before* using this. */

static __always_inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR) ||

		kvm_vcpu_dabt_iss1tw(vcpu); /* AF/DBM update */

	return kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR;

}



static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)
@@ -335,6 +335,11 @@ static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu) 
	return kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_IABT_LOW;

}



static inline bool kvm_vcpu_trap_is_exec_fault(const struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_trap_is_iabt(vcpu) && !kvm_vcpu_abt_iss1tw(vcpu);

}



static __always_inline u8 kvm_vcpu_trap_get_fault(const struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC;
@@ -372,6 +377,9 @@ static __always_inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu) 


static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_abt_iss1tw(vcpu))

		return true;



	if (kvm_vcpu_trap_is_iabt(vcpu))

		return false;

arch/arm64/kvm/hyp/include/hyp/switch.h

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) 
			kvm_vcpu_trap_get_fault_type(vcpu) == FSC_FAULT &&

			kvm_vcpu_dabt_isvalid(vcpu) &&

			!kvm_vcpu_abt_issea(vcpu) &&

			!kvm_vcpu_dabt_iss1tw(vcpu);

			!kvm_vcpu_abt_iss1tw(vcpu);



		if (valid) {

			int ret = __vgic_v2_perform_cpuif_access(vcpu);

arch/arm64/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1849,7 +1849,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	struct kvm_s2_mmu *mmu = vcpu->arch.hw_mmu;



	write_fault = kvm_is_write_fault(vcpu);

	exec_fault = kvm_vcpu_trap_is_iabt(vcpu);

	exec_fault = kvm_vcpu_trap_is_exec_fault(vcpu);

	VM_BUG_ON(write_fault && exec_fault);



	if (fault_status == FSC_PERM && !write_fault && !exec_fault) {
@@ -2131,7 +2131,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) 
			goto out;

		}



		if (kvm_vcpu_dabt_iss1tw(vcpu)) {

		if (kvm_vcpu_abt_iss1tw(vcpu)) {

			kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));

			ret = 1;

			goto out_unlock;

arch/x86/kernel/kvm.c

+3 −19
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ static void __init kvm_guest_init(void) 
	}



	if (pv_tlb_flush_supported()) {

		pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;

		pv_ops.mmu.tlb_remove_table = tlb_remove_table;

		pr_info("KVM setup pv remote TLB flush\n");

	}
@@ -764,14 +765,6 @@ static __init int activate_jump_labels(void) 
}

arch_initcall(activate_jump_labels);



static void kvm_free_pv_cpu_mask(void)

{

	unsigned int cpu;



	for_each_possible_cpu(cpu)

		free_cpumask_var(per_cpu(__pv_cpu_mask, cpu));

}



static __init int kvm_alloc_cpumask(void)

{

	int cpu;
@@ -790,20 +783,11 @@ static __init int kvm_alloc_cpumask(void) 


	if (alloc)

		for_each_possible_cpu(cpu) {

			if (!zalloc_cpumask_var_node(

				per_cpu_ptr(&__pv_cpu_mask, cpu),

				GFP_KERNEL, cpu_to_node(cpu))) {

				goto zalloc_cpumask_fail;

			}

			zalloc_cpumask_var_node(per_cpu_ptr(&__pv_cpu_mask, cpu),

				GFP_KERNEL, cpu_to_node(cpu));

		}



	apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;

	pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;

	return 0;



zalloc_cpumask_fail:

	kvm_free_pv_cpu_mask();

	return -ENOMEM;

}

arch_initcall(kvm_alloc_cpumask);