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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  arch/x86/kvm/vmx/vmx.c

between commits:

  c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'")
  78255eb23973 ("x86/msr: Rename 'wrmsrl()' to 'wrmsrq()'")

from the tip tree and commit:

  7172c753c26a ("KVM: VMX: Move common fields of struct vcpu_{vmx,tdx} to a struct")

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/vmx.c
index cd0d6c1fcf9c,ef2d7208dd20..000000000000
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@@ -1335,10 -1337,10 +1337,10 @@@ void vmx_prepare_switch_to_guest(struc
  		savesegment(fs, fs_sel);
  		savesegment(gs, gs_sel);
  		fs_base = read_msr(MSR_FS_BASE);
- 		vmx->msr_host_kernel_gs_base = read_msr(MSR_KERNEL_GS_BASE);
+ 		vt->msr_host_kernel_gs_base = read_msr(MSR_KERNEL_GS_BASE);
  	}
  
 -	wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
 +	wrmsrq(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
  #else
  	savesegment(fs, fs_sel);
  	savesegment(gs, gs_sel);
@@@ -1382,10 -1384,10 +1384,10 @@@ static void vmx_prepare_switch_to_host(
  #endif
  	invalidate_tss_limit();
  #ifdef CONFIG_X86_64
- 	wrmsrq(MSR_KERNEL_GS_BASE, vmx->msr_host_kernel_gs_base);
 -	wrmsrl(MSR_KERNEL_GS_BASE, vmx->vt.msr_host_kernel_gs_base);
++	wrmsrq(MSR_KERNEL_GS_BASE, vmx->vt.msr_host_kernel_gs_base);
  #endif
  	load_fixmap_gdt(raw_smp_processor_id());
- 	vmx->guest_state_loaded = false;
+ 	vmx->vt.guest_state_loaded = false;
  	vmx->guest_uret_msrs_loaded = false;
  }
  
@@@ -1393,8 -1395,8 +1395,8 @@@
  static u64 vmx_read_guest_kernel_gs_base(struct vcpu_vmx *vmx)
  {
  	preempt_disable();
- 	if (vmx->guest_state_loaded)
+ 	if (vmx->vt.guest_state_loaded)
 -		rdmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
 +		rdmsrq(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
  	preempt_enable();
  	return vmx->msr_guest_kernel_gs_base;
  }
@@@ -1402,8 -1404,8 +1404,8 @@@
  static void vmx_write_guest_kernel_gs_base(struct vcpu_vmx *vmx, u64 data)
  {
  	preempt_disable();
- 	if (vmx->guest_state_loaded)
+ 	if (vmx->vt.guest_state_loaded)
 -		wrmsrl(MSR_KERNEL_GS_BASE, data);
 +		wrmsrq(MSR_KERNEL_GS_BASE, data);
  	preempt_enable();
  	vmx->msr_guest_kernel_gs_base = data;
  }

Attachment: pgpGF7ZB8iV9_.pgp
Description: OpenPGP digital signature