From: Borislav Petkov <bp@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sean Christopherson <seanjc@google.com>
Subject: Re: linux-next: manual merge of the kvm tree with the tip tree
Date: Thu, 21 Oct 2021 17:32:01 +0200 [thread overview]
Message-ID: <YXGH8Y/flJWCCrbt@zn.tnic> (raw)
In-Reply-To: <20211021133931.1a0e096b@canb.auug.org.au>
On Thu, Oct 21, 2021 at 01:39:31PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/kvm/x86.c
>
> between commit:
>
> 126fe0401883 ("x86/fpu: Cleanup xstate xcomp_bv initialization")
>
> from the tip tree and commits:
>
> 5ebbc470d7f3 ("KVM: x86: Remove defunct setting of CR0.ET for guests during vCPU create")
> e8f65b9bb483 ("KVM: x86: Remove defunct setting of XCR0 for guest during vCPU create")
> 583d369b36a9 ("KVM: x86: Fold fx_init() into kvm_arch_vcpu_create()")
>
> 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 04350680b649,3ea4f6ef2474..000000000000
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@@ -10615,10 -10687,10 +10590,9 @@@ int kvm_arch_vcpu_create(struct kvm_vcp
> pr_err("kvm: failed to allocate vcpu's fpu\n");
> goto free_user_fpu;
> }
> - fpstate_init(&vcpu->arch.guest_fpu->state);
> - if (boot_cpu_has(X86_FEATURE_XSAVES))
> - vcpu->arch.guest_fpu->state.xsave.header.xcomp_bv =
> - host_xcr0 | XSTATE_COMPACTION_ENABLED;
> +
> + fpu_init_fpstate_user(vcpu->arch.user_fpu);
> + fpu_init_fpstate_user(vcpu->arch.guest_fpu);
> - fx_init(vcpu);
>
> vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
> vcpu->arch.reserved_gpa_bits = kvm_vcpu_reserved_gpa_bits_raw(vcpu);
LGTM too, thx Stephen!
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
next prev parent reply other threads:[~2021-10-21 15:32 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 2:39 linux-next: manual merge of the kvm tree with the tip tree Stephen Rothwell
2021-10-21 15:32 ` Borislav Petkov [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-18 0:32 Stephen Rothwell
2022-12-01 0:18 Stephen Rothwell
2022-12-01 0:14 Stephen Rothwell
2022-12-15 23:26 ` Stephen Rothwell
2022-01-10 2:16 Stephen Rothwell
2022-01-10 2:28 ` Like Xu
2021-12-13 17:46 broonie
2021-12-13 18:14 ` Paolo Bonzini
2021-12-13 18:23 ` Mark Brown
2021-10-25 5:11 Stephen Rothwell
2021-04-22 4:30 Stephen Rothwell
2021-04-22 4:45 ` Nadav Amit
2021-04-22 4:58 ` Stephen Rothwell
2021-04-22 6:29 ` Paolo Bonzini
2020-07-29 6:47 Stephen Rothwell
2020-07-17 5:25 Stephen Rothwell
2020-06-02 4:53 Stephen Rothwell
2020-06-04 3:09 ` Stephen Rothwell
2020-01-16 2:48 Stephen Rothwell
2018-12-19 4:12 Stephen Rothwell
2018-12-17 5:22 Stephen Rothwell
2018-10-19 3:25 Stephen Rothwell
2018-08-08 3:54 Stephen Rothwell
2018-08-15 4:27 ` Stephen Rothwell
2018-08-06 5:12 Stephen Rothwell
2018-08-06 6:27 ` Tianyu Lan
2018-02-02 0:51 Stephen Rothwell
2018-01-15 2:39 Stephen Rothwell
2017-08-28 4:52 Stephen Rothwell
2017-09-04 6:09 ` Stephen Rothwell
2017-08-25 4:39 Stephen Rothwell
2017-08-25 6:39 ` Paolo Bonzini
2017-08-25 13:57 ` Tom Lendacky
2017-08-25 16:53 ` Brijesh Singh
2017-08-25 20:05 ` Paolo Bonzini
2017-08-25 20:41 ` Brijesh Singh
2017-08-25 20:42 ` Paolo Bonzini
2017-08-26 7:24 ` Ingo Molnar
2016-11-28 3:56 Stephen Rothwell
2016-11-17 3:50 Stephen Rothwell
2016-11-17 7:07 ` Thomas Gleixner
2016-11-17 21:31 ` Stephen Rothwell
2016-05-12 2:54 Stephen Rothwell
2015-06-19 4:59 Michael Ellerman
2015-05-26 4:45 Stephen Rothwell
2012-11-30 4:26 Stephen Rothwell
2012-05-16 7:14 Stephen Rothwell
2012-05-16 7:53 ` Gleb Natapov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YXGH8Y/flJWCCrbt@zn.tnic \
--to=bp@suse.de \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=seanjc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).