On Wed, Apr 18, 2018 at 11:18:23AM +0800, Youquan Song wrote: > From: Jim Mattson <jmattson@xxxxxxxxxx> > > (cherry picked from commit de3a0021a60635de96aa92713c1a31a96747d72c) > > The potential performance advantages of a vmcs02 pool have never been > realized. To simplify the code, eliminate the pool. Instead, a single > vmcs02 is allocated per VCPU when the VCPU enters VMX operation. > > Cc: stable@xxxxxxxxxxxxxxx # prereq for Spectre mitigation > Signed-off-by: Jim Mattson <jmattson@xxxxxxxxxx> > Signed-off-by: Mark Kanda <mark.kanda@xxxxxxxxxx> > Reviewed-by: Ameya More <ameya.more@xxxxxxxxxx> > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> > Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Signed-off-by: Radim Krčmář <rkrcmar@xxxxxxxxxx> > Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx> > Signed-off-by: Yi Sun <yi.y.sun@xxxxxxxxxxxxxxx> [v4.4 backport] > > Conflicts: > arch/x86/kvm/vmx.c What are these two lines doing here? That implies this isn't a "clean" backport :( Please fix up... thanks, greg k-h