On 12/19/18 12:32 PM, Paolo Bonzini wrote: > On 19/12/18 05:12, Stephen Rothwell wrote: >> 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. I should have called this out in the changelog, but I removed *all* the support because I assumed that guests don't need MPX because no other OS supported it that I know of. > 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. We could do this in two phases: remove the APIs now, and then remove the XSAVE enabling later (4.22 or whenever). But, on the other hand, if we want to remove XSAVE support for MPX, we'll have to break live migration at _some_ point, so why not just do it now? > 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. That's fine with me as well.
