mbox series

[GIT,PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag

Message ID 20171108110328.GC9689@fergus.ozlabs.ibm.com
State Accepted
Headers show
Series [GIT,PULL] Please pull paulus/powerpc kvm-ppc-fixes-4.14-2 tag | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc tags/kvm-ppc-fixes-4.14-2

Message

Paul Mackerras Nov. 8, 2017, 11:03 a.m. UTC 
Hi Paolo,

Please do a pull from my paulus/powerpc tree to get a fix for a bug
that can cause the host to crash when a guest resizes its hashed page
table.  I would like this to go into 4.14 if that is still possible.

I have done a signed tag this time.  It is signed with a new signing
sub-key (2C63719F) that I made today, so you will need to fetch it if
you want to check the signature.  It is a sub-key on my key EC9DBB8C
which had expired, but I have set the expiry to "never" now, so you
will need to re-fetch that one too.

I am going to do an equivalent fix on my kvm-ppc-next branch also, but
it will look different because the fix touches the same code that my
recent HPT-on-radix patch series touches.

Thanks,
Paul.

The following changes since commit ad98dd1a75ac6a8b68cd2f7bf4676b65734f2a43:

  KVM: PPC: Book3S HV: Add more barriers in XIVE load/unload code (2017-10-16 08:46:46 +1100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc tags/kvm-ppc-fixes-4.14-2

for you to fetch changes up to 38c53af853069adf87181684370d7b8866d6387b:

  KVM: PPC: Book3S HV: Fix exclusion between HPT resizing and other HPT updates (2017-11-08 15:14:02 +1100)

----------------------------------------------------------------
PPC KVM fixes for 4.14

Just one fix here for a host crash that can occur with HV KVM
as a result of resizing the guest hashed page table (HPT).

----------------------------------------------------------------
Paul Mackerras (1):
      KVM: PPC: Book3S HV: Fix exclusion between HPT resizing and other HPT updates

 arch/powerpc/kvm/book3s_64_mmu_hv.c | 10 ++++++++++
 arch/powerpc/kvm/book3s_hv.c        | 29 +++++++++++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Paolo Bonzini Nov. 8, 2017, 1:17 p.m. UTC | #1 
On 08/11/2017 12:03, Paul Mackerras wrote:
> Hi Paolo,
> 
> Please do a pull from my paulus/powerpc tree to get a fix for a bug
> that can cause the host to crash when a guest resizes its hashed page
> table.  I would like this to go into 4.14 if that is still possible.
> 
> I have done a signed tag this time.  It is signed with a new signing
> sub-key (2C63719F) that I made today, so you will need to fetch it if
> you want to check the signature.  It is a sub-key on my key EC9DBB8C
> which had expired, but I have set the expiry to "never" now, so you
> will need to re-fetch that one too.
> 
> I am going to do an equivalent fix on my kvm-ppc-next branch also, but
> it will look different because the fix touches the same code that my
> recent HPT-on-radix patch series touches.

This would introduce conflicts that are a bit unnecessary.  Could you
redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then:

- I pull the fix from you for 4.14

- you pull the fix yourself into kvm-ppc-next, and fix the conflicts?

Thanks,

Paolo

> 
> Thanks,
> Paul.
> 
> The following changes since commit ad98dd1a75ac6a8b68cd2f7bf4676b65734f2a43:
> 
>   KVM: PPC: Book3S HV: Add more barriers in XIVE load/unload code (2017-10-16 08:46:46 +1100)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc tags/kvm-ppc-fixes-4.14-2
> 
> for you to fetch changes up to 38c53af853069adf87181684370d7b8866d6387b:
> 
>   KVM: PPC: Book3S HV: Fix exclusion between HPT resizing and other HPT updates (2017-11-08 15:14:02 +1100)
> 
> ----------------------------------------------------------------
> PPC KVM fixes for 4.14
> 
> Just one fix here for a host crash that can occur with HV KVM
> as a result of resizing the guest hashed page table (HPT).
> 
> ----------------------------------------------------------------
> Paul Mackerras (1):
>       KVM: PPC: Book3S HV: Fix exclusion between HPT resizing and other HPT updates
> 
>  arch/powerpc/kvm/book3s_64_mmu_hv.c | 10 ++++++++++
>  arch/powerpc/kvm/book3s_hv.c        | 29 +++++++++++++++++++----------
>  2 files changed, 29 insertions(+), 10 deletions(-)
> 

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Mackerras Nov. 9, 2017, 5:25 a.m. UTC | #2 
On Wed, Nov 08, 2017 at 02:17:34PM +0100, Paolo Bonzini wrote:
> On 08/11/2017 12:03, Paul Mackerras wrote:
> > Hi Paolo,
> > 
> > Please do a pull from my paulus/powerpc tree to get a fix for a bug
> > that can cause the host to crash when a guest resizes its hashed page
> > table.  I would like this to go into 4.14 if that is still possible.
> > 
> > I have done a signed tag this time.  It is signed with a new signing
> > sub-key (2C63719F) that I made today, so you will need to fetch it if
> > you want to check the signature.  It is a sub-key on my key EC9DBB8C
> > which had expired, but I have set the expiry to "never" now, so you
> > will need to re-fetch that one too.
> > 
> > I am going to do an equivalent fix on my kvm-ppc-next branch also, but
> > it will look different because the fix touches the same code that my
> > recent HPT-on-radix patch series touches.
> 
> This would introduce conflicts that are a bit unnecessary.  Could you
> redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then:
> 
> - I pull the fix from you for 4.14
> 
> - you pull the fix yourself into kvm-ppc-next, and fix the conflicts?

My kvm-ppc-fixes branch is based directly on 4.14-rc4, which is prior
to the changes in the kvm next branch and my kvm-ppc-next branch, so I
don't see that I need to redo the fix.

I have merged kvm-ppc-fixes into kvm-ppc-next, resolved the conflicts,
and then applied another cosmetic patch on top to make the result look
nicer (with no functional change in that patch).  Doing that merge
also resolved another conflict (in arch/powerpc/kvm/powerpc.c).

So please do the pull from the existing kvm-ppc-fixes-4.14-2 tag for
4.14, and I'll send you a pull request for kvm-ppc-next.

Thanks,
Paul.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paolo Bonzini Nov. 9, 2017, 9:46 a.m. UTC | #3 
On 09/11/2017 06:25, Paul Mackerras wrote:
>> Could you
>> redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then:
>>
>> - I pull the fix from you for 4.14
>>
>> - you pull the fix yourself into kvm-ppc-next, and fix the conflicts?
> My kvm-ppc-fixes branch is based directly on 4.14-rc4, which is prior
> to the changes in the kvm next branch and my kvm-ppc-next branch, so I
> don't see that I need to redo the fix.
> 
> I have merged kvm-ppc-fixes into kvm-ppc-next, resolved the conflicts,
> and then applied another cosmetic patch on top to make the result look
> nicer (with no functional change in that patch).  Doing that merge
> also resolved another conflict (in arch/powerpc/kvm/powerpc.c).
> 
> So please do the pull from the existing kvm-ppc-fixes-4.14-2 tag for
> 4.14, and I'll send you a pull request for kvm-ppc-next.

Sounds good.  Radim is probably going to do the pull.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Radim Krčmář Nov. 9, 2017, 6:01 p.m. UTC | #4 
2017-11-09 10:46+0100, Paolo Bonzini:
> On 09/11/2017 06:25, Paul Mackerras wrote:
> >> Could you
> >> redo the fix on top of an older tag (e.g. on top of 4.14-rc3), and then:
> >>
> >> - I pull the fix from you for 4.14
> >>
> >> - you pull the fix yourself into kvm-ppc-next, and fix the conflicts?
> > My kvm-ppc-fixes branch is based directly on 4.14-rc4, which is prior
> > to the changes in the kvm next branch and my kvm-ppc-next branch, so I
> > don't see that I need to redo the fix.
> > 
> > I have merged kvm-ppc-fixes into kvm-ppc-next, resolved the conflicts,
> > and then applied another cosmetic patch on top to make the result look
> > nicer (with no functional change in that patch).  Doing that merge
> > also resolved another conflict (in arch/powerpc/kvm/powerpc.c).
> > 
> > So please do the pull from the existing kvm-ppc-fixes-4.14-2 tag for
> > 4.14, and I'll send you a pull request for kvm-ppc-next.
> 
> Sounds good.  Radim is probably going to do the pull.

Pulled both and sending this one to Linus tomorrow, thanks.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html