linux-next: manual merge of the kvm tree with the kvm-fixes tree

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1728 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got conflicts in:

  arch/x86/kernel/kvm.c

between commit:

  17a1079d9c63 ("KVM: x86: Fix pv tlb flush dependencies")

from the kvm-fixes tree and commit:

  6beacf74c257 ("KVM: X86: Don't use PV TLB flush with dedicated physical CPUs")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kernel/kvm.c
index fae86e36e399,4ccbff63cb86..000000000000
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@@ -546,7 -546,8 +546,8 @@@ static void __init kvm_guest_init(void
  	}
  
  	if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&
+ 	    !kvm_para_has_hint(KVM_HINTS_DEDICATED) &&
 -	    !kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))
 +	    kvm_para_has_feature(KVM_FEATURE_STEAL_TIME))
  		pv_mmu_ops.flush_tlb_others = kvm_flush_tlb_others;
  
  	if (kvm_para_has_feature(KVM_FEATURE_PV_EOI))
@@@ -635,7 -641,8 +641,8 @@@ static __init int kvm_setup_pv_tlb_flus
  	int cpu;
  
  	if (kvm_para_has_feature(KVM_FEATURE_PV_TLB_FLUSH) &&
+ 	    !kvm_para_has_hint(KVM_HINTS_DEDICATED) &&
 -	    !kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
 +	    kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) {
  		for_each_possible_cpu(cpu) {
  			zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu),
  				GFP_KERNEL, cpu_to_node(cpu));

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/x86.c

between commit:

  1b870fa5573e ("kvm: stats: tell userspace which values are boolean")

from the kvm-fixes tree and commit:

  2f4073e08f4c ("KVM: VMX: Enable Notify VM exit")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/x86.c
index af0c5b5fc28f,031678eff28e..000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -298,7 -286,8 +286,8 @@@ const struct _kvm_stats_desc kvm_vcpu_s
  	STATS_DESC_COUNTER(VCPU, directed_yield_successful),
  	STATS_DESC_COUNTER(VCPU, preemption_reported),
  	STATS_DESC_COUNTER(VCPU, preemption_other),
- 	STATS_DESC_IBOOLEAN(VCPU, guest_mode)
 -	STATS_DESC_ICOUNTER(VCPU, guest_mode),
++	STATS_DESC_IBOOLEAN(VCPU, guest_mode),
+ 	STATS_DESC_COUNTER(VCPU, notify_window_exits),
  };
  
  const struct kvm_stats_header kvm_vcpu_stats_header = {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  tools/testing/selftests/kvm/lib/aarch64/ucall.c

between commit:

  9e2f6498efbb ("selftests: KVM: Handle compiler optimizations in ucall")

from the kvm-fixes tree and commit:

  5d9cd8b55cdc ("selftests: kvm: replace ternary operator with min()")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/kvm/lib/aarch64/ucall.c
index be1d9728c4ce,0b949ee06b5e..000000000000
--- a/tools/testing/selftests/kvm/lib/aarch64/ucall.c
+++ b/tools/testing/selftests/kvm/lib/aarch64/ucall.c
@@@ -77,20 -78,19 +76,20 @@@ void ucall(uint64_t cmd, int nargs, ...
  	va_list va;
  	int i;
  
 +	WRITE_ONCE(uc.cmd, cmd);
- 	nargs = nargs <= UCALL_MAX_ARGS ? nargs : UCALL_MAX_ARGS;
+ 	nargs = min(nargs, UCALL_MAX_ARGS);
  
  	va_start(va, nargs);
  	for (i = 0; i < nargs; ++i)
 -		uc.args[i] = va_arg(va, uint64_t);
 +		WRITE_ONCE(uc.args[i], va_arg(va, uint64_t));
  	va_end(va);
  
 -	*ucall_exit_mmio_addr = (vm_vaddr_t)&uc;
 +	WRITE_ONCE(*ucall_exit_mmio_addr, (vm_vaddr_t)&uc);
  }
  
- uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc)
+ uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc)
  {
- 	struct kvm_run *run = vcpu_state(vm, vcpu_id);
+ 	struct kvm_run *run = vcpu->run;
  	struct ucall ucall = {};
  
  	if (uc)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1978 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/x86.c

between commit:

  42dcbe7d8bac ("KVM: x86: hyper-v: Avoid writing to TSC page without an active vCPU")

from the kvm-fixes tree and commits:

  916d3608df82 ("KVM: x86: Use gfn_to_pfn_cache for pv_time")
  7caf9571563e ("KVM: x86/xen: Use gfn_to_pfn_cache for vcpu_info")
  69d413cfcf77 ("KVM: x86/xen: Use gfn_to_pfn_cache for vcpu_time_info")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/x86.c
index 547ba00ef64f,7a066cf92692..000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -3106,14 -3101,15 +3101,14 @@@ static int kvm_guest_time_update(struc
  
  	vcpu->hv_clock.flags = pvclock_flags;
  
- 	if (vcpu->pv_time_enabled)
- 		kvm_setup_pvclock_page(v, &vcpu->pv_time, 0);
- 	if (vcpu->xen.vcpu_info_set)
- 		kvm_setup_pvclock_page(v, &vcpu->xen.vcpu_info_cache,
- 				       offsetof(struct compat_vcpu_info, time));
- 	if (vcpu->xen.vcpu_time_info_set)
- 		kvm_setup_pvclock_page(v, &vcpu->xen.vcpu_time_info_cache, 0);
+ 	if (vcpu->pv_time.active)
+ 		kvm_setup_guest_pvclock(v, &vcpu->pv_time, 0);
+ 	if (vcpu->xen.vcpu_info_cache.active)
+ 		kvm_setup_guest_pvclock(v, &vcpu->xen.vcpu_info_cache,
+ 					offsetof(struct compat_vcpu_info, time));
+ 	if (vcpu->xen.vcpu_time_info_cache.active)
+ 		kvm_setup_guest_pvclock(v, &vcpu->xen.vcpu_time_info_cache, 0);
 -	if (!v->vcpu_idx)
 -		kvm_hv_setup_tsc_page(v->kvm, &vcpu->hv_clock);
 +	kvm_hv_setup_tsc_page(v->kvm, &vcpu->hv_clock);
  	return 0;
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[broonie]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the kvm tree got a conflict in:

  include/uapi/linux/kvm.h

between commit:

  93b71801a8274 ("KVM: PPC: reserve capability 210 for KVM_CAP_PPC_AIL_MODE_3")

from the kvm-fixes tree and commit:

  d004079edc166 ("KVM: s390: Add capability for storage key extension of MEM_OP IOCTL")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc include/uapi/linux/kvm.h
index 507ee1f2aa96b,dbc550bbd9fa3..0000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1134,7 -1140,7 +1140,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_VM_GPA_BITS 207
  #define KVM_CAP_XSAVE2 208
  #define KVM_CAP_SYS_ATTRIBUTES 209
 -#define KVM_CAP_S390_MEM_OP_EXTENSION 210
 +#define KVM_CAP_PPC_AIL_MODE_3 210
++#define KVM_CAP_S390_MEM_OP_EXTENSION 211
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[broonie]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/x86.c

between commit:

  127770ac0d043 ("KVM: x86: Add KVM_CAP_ENABLE_CAP to x86")

from the kvm-fixes tree and commit:

  8a2897853c53f ("KVM: x86: return 1 unconditionally for availability of KVM_CAP_VAPIC")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/x86/kvm/x86.c
index 8a66d10c7a8dc,16d29d41908fa..0000000000000
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -4245,7 -4235,7 +4247,8 @@@ int kvm_vm_ioctl_check_extension(struc
  	case KVM_CAP_EXIT_ON_EMULATION_FAILURE:
  	case KVM_CAP_VCPU_ATTRIBUTES:
  	case KVM_CAP_SYS_ATTRIBUTES:
 +	case KVM_CAP_ENABLE_CAP:
+ 	case KVM_CAP_VAPIC:
  		r = 1;
  		break;
  	case KVM_CAP_EXIT_HYPERCALL:

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 849 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got conflicts in:

  arch/x86/kvm/vmx/vmx.c
  arch/x86/kvm/vmx/vmx.h

between commit:

  c112b5f50232 ("KVM: x86: Recompute PID.ON when clearing PID.SN")

from the kvm-fixes tree and commit:

  abd2fb15a57e ("KVM: x86: Sync the pending Posted-Interrupts")

from the kvm tree.

These 2 commits are very similar so I just used the latter version of
the comflicting bits.

I fixed it up (see above) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1675 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/vmx.c

between commit:

  9d1887ef3252 ("KVM: nVMX: sync vmcs02 segment regs prior to vmx_set_cr0")

from the kvm-fixes tree and commit:

  2bb8cafea80b ("KVM: vVMX: signal failure for nested VMEntry if emulation_required")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/vmx.c
index 92496b9b5f2b,9bc05f5349c8..000000000000
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@@ -10952,6 -11081,21 +11092,16 @@@ static int prepare_vmcs02(struct kvm_vc
  	/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */
  	vmx_set_efer(vcpu, vcpu->arch.efer);
  
 -	if (vmx->nested.dirty_vmcs12) {
 -		prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);
 -		vmx->nested.dirty_vmcs12 = false;
 -	}
 -
+ 	/*
+ 	 * Guest state is invalid and unrestricted guest is disabled,
+ 	 * which means L1 attempted VMEntry to L2 with invalid state.
+ 	 * Fail the VMEntry.
+ 	 */
+ 	if (vmx->emulation_required) {
+ 		*entry_failure_code = ENTRY_FAIL_DEFAULT;
+ 		return 1;
+ 	}
+ 
  	/* Shadow page tables on either EPT or shadow page tables. */
  	if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_cpu_has_ept(vmcs12),
  				entry_failure_code))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the kvm tree with the kvm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/vmx.c

between commit:

  9d1887ef3252 ("KVM: nVMX: sync vmcs02 segment regs prior to vmx_set_cr0")

from the kvm-fixes tree and commit:

  2bb8cafea80b ("KVM: vVMX: signal failure for nested VMEntry if emulation_required")

from the kvm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/kvm/vmx.c
index 92496b9b5f2b,b4d8da6c62c8..000000000000
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@@ -10952,6 -11010,19 +11021,14 @@@ static int prepare_vmcs02(struct kvm_vc
  	/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */
  	vmx_set_efer(vcpu, vcpu->arch.efer);
  
 -	if (vmx->nested.dirty_vmcs12) {
 -		prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);
 -		vmx->nested.dirty_vmcs12 = false;
 -	}
 -
+ 	/*
+ 	 * Guest state is invalid and unrestricted guest is disabled,
+ 	 * which means L1 attempted VMEntry to L2 with invalid state.
+ 	 * Fail the VMEntry.
+ 	 */
+ 	if (vmx->emulation_required)
+ 		return 1;
+ 
  	/* Shadow page tables on either EPT or shadow page tables. */
  	if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_cpu_has_ept(vmcs12),
  				entry_failure_code))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]