From: Paolo Bonzini <pbonzini@redhat.com>
To: "Stephen Rothwell" <sfr@canb.auug.org.au>,
"Radim Krčmář" <rkrcmar@redhat.com>, KVM <kvm@vger.kernel.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
"Peter Zijlstra" <peterz@infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dave Hansen <dave.hansen@intel.com>,
Marc Orr <marcorr@google.com>
Subject: "x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree)
Date: Wed, 19 Dec 2018 21:32:38 +0100 [thread overview]
Message-ID: <33146e35-3127-3ded-eb51-24a2a72f10fa@redhat.com> (raw)
In-Reply-To: <20181219151252.3e27a7f8@canb.auug.org.au>
On 19/12/18 05:12, 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:
>
> eb012ef3b4e3 ("x86: Remove Intel MPX")
>
> from the tip tree and commit:
>
> b666a4b69739 ("kvm: x86: Dynamically allocate guest_fpu")
>
> from the kvm tree.
>
> I fixed it up (the former removed some code updated by the latter, so I
> did that) 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.
Ouch, this resolution is wrong. KVM will lack support for MPX in guests
now, and that is bad because it breaks live migration. A simple fix
would be to leave the XSAVE state enabled in the kernel unconditionally
even if all the other gunk is removed; alternatively I can also try to
save/restore it only for the guest FPU.
If this patch can be bumped to 4.22, I would prefer that because it
would save me and Linus some merge window headaches. Considering that
the patch lacked my Cc or Ack, perhaps it's the right thing to do.
Paolo
next prev parent reply other threads:[~2018-12-19 20:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-19 4:12 linux-next: manual merge of the kvm tree with the tip tree Stephen Rothwell
2018-12-19 20:32 ` Paolo Bonzini [this message]
2018-12-19 20:54 ` "x86: Remove Intel MPX" is wrong (Re: linux-next: manual merge of the kvm tree with the tip tree) Dave Hansen
2018-12-19 21:00 ` Paolo Bonzini
2018-12-19 21:28 ` Dave Hansen
2018-12-19 21:40 ` Paolo Bonzini
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=33146e35-3127-3ded-eb51-24a2a72f10fa@redhat.com \
--to=pbonzini@redhat.com \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marcorr@google.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rkrcmar@redhat.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).