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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220413123414.01119890@canb.auug.org.au>
Date:   Wed, 13 Apr 2022 12:34:14 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Paolo Bonzini <pbonzini@...hat.com>, KVM <kvm@...r.kernel.org>
Cc:     David Woodhouse <dwmw@...zon.co.uk>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Vitaly Kuznetsov <vkuznets@...hat.com>
Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree

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;
  }
  

Content of type "application/pgp-signature" skipped