* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2015-09-05 7:45 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2015-09-05 7:45 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Paolo,
Please pull the commits listed below into your tree. I would like
them to go in for 4.3 as they are all small bug fixes not new
features, and they all can only affect HV-mode KVM on IBM server
machines (in fact one has no effect on code at all since it is a typo
fix for a comment).
Please let me know if you want me to re-post all the patches.
Thanks,
Paul.
The following changes since commit e3dbc572fe11a5231568e106fa3dcedd1d1bec0f:
Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue (2015-08-22 14:57:59 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 4e33d1f0a145d48e8cf287954bbf791af8387cfb:
KVM: PPC: Book3S: Fix typo in top comment about locking (2015-09-04 07:28:05 +1000)
----------------------------------------------------------------
Gautham R. Shenoy (2):
KVM: PPC: Book3S HV: Fix race in starting secondary threads
KVM: PPC: Book3S HV: Exit on H_DOORBELL if HOST_IPI is set
Greg Kurz (1):
KVM: PPC: Book3S: Fix typo in top comment about locking
Thomas Huth (1):
KVM: PPC: Book3S: Fix size of the PSPB register
arch/powerpc/include/asm/kvm_host.h | 2 +-
arch/powerpc/kvm/book3s_hv.c | 10 +++++++++-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +++++++++
arch/powerpc/kvm/book3s_xics.c | 2 +-
4 files changed, 20 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2015-09-05 7:45 ` Paul Mackerras
@ 2015-09-07 8:29 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2015-09-07 8:29 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Alexander Graf, kvm-ppc
On 05/09/2015 09:45, Paul Mackerras wrote:
> Paolo,
>
> Please pull the commits listed below into your tree. I would like
> them to go in for 4.3 as they are all small bug fixes not new
> features, and they all can only affect HV-mode KVM on IBM server
> machines (in fact one has no effect on code at all since it is a typo
> fix for a comment).
>
> Please let me know if you want me to re-post all the patches.
>
> Thanks,
> Paul.
>
> The following changes since commit e3dbc572fe11a5231568e106fa3dcedd1d1bec0f:
>
> Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue (2015-08-22 14:57:59 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
>
> for you to fetch changes up to 4e33d1f0a145d48e8cf287954bbf791af8387cfb:
>
> KVM: PPC: Book3S: Fix typo in top comment about locking (2015-09-04 07:28:05 +1000)
>
> ----------------------------------------------------------------
> Gautham R. Shenoy (2):
> KVM: PPC: Book3S HV: Fix race in starting secondary threads
> KVM: PPC: Book3S HV: Exit on H_DOORBELL if HOST_IPI is set
>
> Greg Kurz (1):
> KVM: PPC: Book3S: Fix typo in top comment about locking
>
> Thomas Huth (1):
> KVM: PPC: Book3S: Fix size of the PSPB register
>
> arch/powerpc/include/asm/kvm_host.h | 2 +-
> arch/powerpc/kvm/book3s_hv.c | 10 +++++++++-
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +++++++++
> arch/powerpc/kvm/book3s_xics.c | 2 +-
> 4 files changed, 20 insertions(+), 3 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2015-09-07 8:29 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2015-09-07 8:29 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Alexander Graf, kvm-ppc
On 05/09/2015 09:45, Paul Mackerras wrote:
> Paolo,
>
> Please pull the commits listed below into your tree. I would like
> them to go in for 4.3 as they are all small bug fixes not new
> features, and they all can only affect HV-mode KVM on IBM server
> machines (in fact one has no effect on code at all since it is a typo
> fix for a comment).
>
> Please let me know if you want me to re-post all the patches.
>
> Thanks,
> Paul.
>
> The following changes since commit e3dbc572fe11a5231568e106fa3dcedd1d1bec0f:
>
> Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue (2015-08-22 14:57:59 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
>
> for you to fetch changes up to 4e33d1f0a145d48e8cf287954bbf791af8387cfb:
>
> KVM: PPC: Book3S: Fix typo in top comment about locking (2015-09-04 07:28:05 +1000)
>
> ----------------------------------------------------------------
> Gautham R. Shenoy (2):
> KVM: PPC: Book3S HV: Fix race in starting secondary threads
> KVM: PPC: Book3S HV: Exit on H_DOORBELL if HOST_IPI is set
>
> Greg Kurz (1):
> KVM: PPC: Book3S: Fix typo in top comment about locking
>
> Thomas Huth (1):
> KVM: PPC: Book3S: Fix size of the PSPB register
>
> arch/powerpc/include/asm/kvm_host.h | 2 +-
> arch/powerpc/kvm/book3s_hv.c | 10 +++++++++-
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +++++++++
> arch/powerpc/kvm/book3s_xics.c | 2 +-
> 4 files changed, 20 insertions(+), 3 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2015-10-26 4:17 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2015-10-26 4:17 UTC (permalink / raw)
To: Paolo Bonzini, Alexander Graf, kvm-ppc, kvm
Paolo,
Here is my current patch queue for KVM on PPC. There's nothing much
in the way of new features this time; it's mostly bug fixes, plus
Nikunj has implemented support for KVM_CAP_NR_MEMSLOTS. These are
intended for the "next" branch of the KVM tree. Please pull.
Thanks,
Paul.
The following changes since commit 9ffecb10283508260936b96022d4ee43a7798b4c:
Linux 4.3-rc3 (2015-09-27 07:50:08 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 70aa3961a196ac32baf54032b2051bac9a941118:
KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path (2015-10-21 16:31:52 +1100)
----------------------------------------------------------------
Andrzej Hajda (1):
KVM: PPC: e500: fix handling local_sid_lookup result
Gautham R. Shenoy (1):
KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path
Mahesh Salgaonkar (1):
KVM: PPC: Book3S HV: Deliver machine check with MSR(RI=0) to guest as MCE
Nikunj A Dadhania (1):
KVM: PPC: Implement extension to report number of memslots
Paul Mackerras (2):
KVM: PPC: Book3S HV: Don't fall back to smaller HPT size in allocation ioctl
KVM: PPC: Book3S HV: Make H_REMOVE return correct HPTE value for absent HPTEs
Tudor Laurentiu (3):
powerpc/e6500: add TMCFG0 register definition
KVM: PPC: e500: Emulate TMCFG0 TMRN register
KVM: PPC: e500: fix couple of shift operations on 64 bits
arch/powerpc/include/asm/disassemble.h | 5 +++++
arch/powerpc/include/asm/reg_booke.h | 6 ++++++
arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 ++-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 ++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 29 ++++++++++++++++++++++-------
arch/powerpc/kvm/e500.c | 3 ++-
arch/powerpc/kvm/e500_emulate.c | 19 +++++++++++++++++++
arch/powerpc/kvm/e500_mmu_host.c | 4 ++--
arch/powerpc/kvm/powerpc.c | 3 +++
9 files changed, 63 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2015-10-26 4:17 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2015-10-26 4:17 UTC (permalink / raw)
To: Paolo Bonzini, Alexander Graf, kvm-ppc, kvm
Paolo,
Here is my current patch queue for KVM on PPC. There's nothing much
in the way of new features this time; it's mostly bug fixes, plus
Nikunj has implemented support for KVM_CAP_NR_MEMSLOTS. These are
intended for the "next" branch of the KVM tree. Please pull.
Thanks,
Paul.
The following changes since commit 9ffecb10283508260936b96022d4ee43a7798b4c:
Linux 4.3-rc3 (2015-09-27 07:50:08 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 70aa3961a196ac32baf54032b2051bac9a941118:
KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path (2015-10-21 16:31:52 +1100)
----------------------------------------------------------------
Andrzej Hajda (1):
KVM: PPC: e500: fix handling local_sid_lookup result
Gautham R. Shenoy (1):
KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path
Mahesh Salgaonkar (1):
KVM: PPC: Book3S HV: Deliver machine check with MSR(RI=0) to guest as MCE
Nikunj A Dadhania (1):
KVM: PPC: Implement extension to report number of memslots
Paul Mackerras (2):
KVM: PPC: Book3S HV: Don't fall back to smaller HPT size in allocation ioctl
KVM: PPC: Book3S HV: Make H_REMOVE return correct HPTE value for absent HPTEs
Tudor Laurentiu (3):
powerpc/e6500: add TMCFG0 register definition
KVM: PPC: e500: Emulate TMCFG0 TMRN register
KVM: PPC: e500: fix couple of shift operations on 64 bits
arch/powerpc/include/asm/disassemble.h | 5 +++++
arch/powerpc/include/asm/reg_booke.h | 6 ++++++
arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 ++-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 ++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 29 ++++++++++++++++++++++-------
arch/powerpc/kvm/e500.c | 3 ++-
arch/powerpc/kvm/e500_emulate.c | 19 +++++++++++++++++++
arch/powerpc/kvm/e500_mmu_host.c | 4 ++--
arch/powerpc/kvm/powerpc.c | 3 +++
9 files changed, 63 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2015-10-26 4:17 ` Paul Mackerras
@ 2015-11-02 12:53 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2015-11-02 12:53 UTC (permalink / raw)
To: Paul Mackerras, Alexander Graf, kvm-ppc, kvm
On 26/10/2015 05:17, Paul Mackerras wrote:
> Paolo,
>
> Here is my current patch queue for KVM on PPC. There's nothing much
> in the way of new features this time; it's mostly bug fixes, plus
> Nikunj has implemented support for KVM_CAP_NR_MEMSLOTS. These are
> intended for the "next" branch of the KVM tree. Please pull.
>
> Thanks,
> Paul.
Pulled, thanks.
Paolo
> The following changes since commit 9ffecb10283508260936b96022d4ee43a7798b4c:
>
> Linux 4.3-rc3 (2015-09-27 07:50:08 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
>
> for you to fetch changes up to 70aa3961a196ac32baf54032b2051bac9a941118:
>
> KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path (2015-10-21 16:31:52 +1100)
>
> ----------------------------------------------------------------
> Andrzej Hajda (1):
> KVM: PPC: e500: fix handling local_sid_lookup result
>
> Gautham R. Shenoy (1):
> KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path
>
> Mahesh Salgaonkar (1):
> KVM: PPC: Book3S HV: Deliver machine check with MSR(RI=0) to guest as MCE
>
> Nikunj A Dadhania (1):
> KVM: PPC: Implement extension to report number of memslots
>
> Paul Mackerras (2):
> KVM: PPC: Book3S HV: Don't fall back to smaller HPT size in allocation ioctl
> KVM: PPC: Book3S HV: Make H_REMOVE return correct HPTE value for absent HPTEs
>
> Tudor Laurentiu (3):
> powerpc/e6500: add TMCFG0 register definition
> KVM: PPC: e500: Emulate TMCFG0 TMRN register
> KVM: PPC: e500: fix couple of shift operations on 64 bits
>
> arch/powerpc/include/asm/disassemble.h | 5 +++++
> arch/powerpc/include/asm/reg_booke.h | 6 ++++++
> arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 ++-
> arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 ++
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 29 ++++++++++++++++++++++-------
> arch/powerpc/kvm/e500.c | 3 ++-
> arch/powerpc/kvm/e500_emulate.c | 19 +++++++++++++++++++
> arch/powerpc/kvm/e500_mmu_host.c | 4 ++--
> arch/powerpc/kvm/powerpc.c | 3 +++
> 9 files changed, 63 insertions(+), 11 deletions(-)
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2015-11-02 12:53 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2015-11-02 12:53 UTC (permalink / raw)
To: Paul Mackerras, Alexander Graf, kvm-ppc, kvm
On 26/10/2015 05:17, Paul Mackerras wrote:
> Paolo,
>
> Here is my current patch queue for KVM on PPC. There's nothing much
> in the way of new features this time; it's mostly bug fixes, plus
> Nikunj has implemented support for KVM_CAP_NR_MEMSLOTS. These are
> intended for the "next" branch of the KVM tree. Please pull.
>
> Thanks,
> Paul.
Pulled, thanks.
Paolo
> The following changes since commit 9ffecb10283508260936b96022d4ee43a7798b4c:
>
> Linux 4.3-rc3 (2015-09-27 07:50:08 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
>
> for you to fetch changes up to 70aa3961a196ac32baf54032b2051bac9a941118:
>
> KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path (2015-10-21 16:31:52 +1100)
>
> ----------------------------------------------------------------
> Andrzej Hajda (1):
> KVM: PPC: e500: fix handling local_sid_lookup result
>
> Gautham R. Shenoy (1):
> KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path
>
> Mahesh Salgaonkar (1):
> KVM: PPC: Book3S HV: Deliver machine check with MSR(RI=0) to guest as MCE
>
> Nikunj A Dadhania (1):
> KVM: PPC: Implement extension to report number of memslots
>
> Paul Mackerras (2):
> KVM: PPC: Book3S HV: Don't fall back to smaller HPT size in allocation ioctl
> KVM: PPC: Book3S HV: Make H_REMOVE return correct HPTE value for absent HPTEs
>
> Tudor Laurentiu (3):
> powerpc/e6500: add TMCFG0 register definition
> KVM: PPC: e500: Emulate TMCFG0 TMRN register
> KVM: PPC: e500: fix couple of shift operations on 64 bits
>
> arch/powerpc/include/asm/disassemble.h | 5 +++++
> arch/powerpc/include/asm/reg_booke.h | 6 ++++++
> arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 ++-
> arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 ++
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 29 ++++++++++++++++++++++-------
> arch/powerpc/kvm/e500.c | 3 ++-
> arch/powerpc/kvm/e500_emulate.c | 19 +++++++++++++++++++
> arch/powerpc/kvm/e500_mmu_host.c | 4 ++--
> arch/powerpc/kvm/powerpc.c | 3 +++
> 9 files changed, 63 insertions(+), 11 deletions(-)
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-01-15 10:35 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-01-15 10:35 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Hi Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
v4.5. All of these commits have been in linux-next for weeks except
for the get/set_one_reg fix for Altivec from Greg Kurz, which was in
linux-next today and is a really simple and obvious fix.
Thanks,
Paul.
The following changes since commit 460146348518a1c4e810d01baf81847f8c6a1c73:
Merge tag 'kvm-s390-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2015-12-02 13:50:04 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to b4d7f161feb3015d6306e1d35b565c888ff70c9d:
KVM: PPC: Fix ONE_REG AltiVec support (2016-01-14 14:43:35 +1100)
----------------------------------------------------------------
Geyslan G. Bem (1):
KVM: PPC: Book3S PR: Remove unused variable 'vcpu_book3s'
Greg Kurz (1):
KVM: PPC: Fix ONE_REG AltiVec support
Paul Mackerras (1):
KVM: PPC: Book3S HV: Handle unexpected traps in guest entry/exit code better
Thomas Huth (2):
KVM: PPC: Fix emulation of H_SET_DABR/X on POWER8
KVM: PPC: Increase memslots to 512
arch/powerpc/include/asm/kvm_host.h | 3 +--
arch/powerpc/kvm/book3s_64_mmu.c | 3 ---
arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++++++++++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +++-
arch/powerpc/kvm/powerpc.c | 20 ++++++++++----------
5 files changed, 32 insertions(+), 16 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-01-15 10:35 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-01-15 10:35 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Hi Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
v4.5. All of these commits have been in linux-next for weeks except
for the get/set_one_reg fix for Altivec from Greg Kurz, which was in
linux-next today and is a really simple and obvious fix.
Thanks,
Paul.
The following changes since commit 460146348518a1c4e810d01baf81847f8c6a1c73:
Merge tag 'kvm-s390-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2015-12-02 13:50:04 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to b4d7f161feb3015d6306e1d35b565c888ff70c9d:
KVM: PPC: Fix ONE_REG AltiVec support (2016-01-14 14:43:35 +1100)
----------------------------------------------------------------
Geyslan G. Bem (1):
KVM: PPC: Book3S PR: Remove unused variable 'vcpu_book3s'
Greg Kurz (1):
KVM: PPC: Fix ONE_REG AltiVec support
Paul Mackerras (1):
KVM: PPC: Book3S HV: Handle unexpected traps in guest entry/exit code better
Thomas Huth (2):
KVM: PPC: Fix emulation of H_SET_DABR/X on POWER8
KVM: PPC: Increase memslots to 512
arch/powerpc/include/asm/kvm_host.h | 3 +--
arch/powerpc/kvm/book3s_64_mmu.c | 3 ---
arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++++++++++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +++-
arch/powerpc/kvm/powerpc.c | 20 ++++++++++----------
5 files changed, 32 insertions(+), 16 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-01-15 10:35 ` Paul Mackerras
@ 2016-01-15 16:49 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-01-15 16:49 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Alexander Graf, kvm-ppc
On 15/01/2016 11:35, Paul Mackerras wrote:
> Hi Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC update for
> v4.5. All of these commits have been in linux-next for weeks except
> for the get/set_one_reg fix for Altivec from Greg Kurz, which was in
> linux-next today and is a really simple and obvious fix.
>
> Thanks,
> Paul.
>
> The following changes since commit 460146348518a1c4e810d01baf81847f8c6a1c73:
>
> Merge tag 'kvm-s390-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2015-12-02 13:50:04 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
>
> for you to fetch changes up to b4d7f161feb3015d6306e1d35b565c888ff70c9d:
>
> KVM: PPC: Fix ONE_REG AltiVec support (2016-01-14 14:43:35 +1100)
>
> ----------------------------------------------------------------
> Geyslan G. Bem (1):
> KVM: PPC: Book3S PR: Remove unused variable 'vcpu_book3s'
>
> Greg Kurz (1):
> KVM: PPC: Fix ONE_REG AltiVec support
>
> Paul Mackerras (1):
> KVM: PPC: Book3S HV: Handle unexpected traps in guest entry/exit code better
>
> Thomas Huth (2):
> KVM: PPC: Fix emulation of H_SET_DABR/X on POWER8
> KVM: PPC: Increase memslots to 512
>
> arch/powerpc/include/asm/kvm_host.h | 3 +--
> arch/powerpc/kvm/book3s_64_mmu.c | 3 ---
> arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++++++++++
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +++-
> arch/powerpc/kvm/powerpc.c | 20 ++++++++++----------
> 5 files changed, 32 insertions(+), 16 deletions(-)
>
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-01-15 16:49 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-01-15 16:49 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Alexander Graf, kvm-ppc
On 15/01/2016 11:35, Paul Mackerras wrote:
> Hi Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC update for
> v4.5. All of these commits have been in linux-next for weeks except
> for the get/set_one_reg fix for Altivec from Greg Kurz, which was in
> linux-next today and is a really simple and obvious fix.
>
> Thanks,
> Paul.
>
> The following changes since commit 460146348518a1c4e810d01baf81847f8c6a1c73:
>
> Merge tag 'kvm-s390-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2015-12-02 13:50:04 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
>
> for you to fetch changes up to b4d7f161feb3015d6306e1d35b565c888ff70c9d:
>
> KVM: PPC: Fix ONE_REG AltiVec support (2016-01-14 14:43:35 +1100)
>
> ----------------------------------------------------------------
> Geyslan G. Bem (1):
> KVM: PPC: Book3S PR: Remove unused variable 'vcpu_book3s'
>
> Greg Kurz (1):
> KVM: PPC: Fix ONE_REG AltiVec support
>
> Paul Mackerras (1):
> KVM: PPC: Book3S HV: Handle unexpected traps in guest entry/exit code better
>
> Thomas Huth (2):
> KVM: PPC: Fix emulation of H_SET_DABR/X on POWER8
> KVM: PPC: Increase memslots to 512
>
> arch/powerpc/include/asm/kvm_host.h | 3 +--
> arch/powerpc/kvm/book3s_64_mmu.c | 3 ---
> arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++++++++++
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +++-
> arch/powerpc/kvm/powerpc.c | 20 ++++++++++----------
> 5 files changed, 32 insertions(+), 16 deletions(-)
>
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-03-03 2:38 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-03-03 2:38 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc, Alexander Graf, Alexey Kardashevskiy
Paolo,
Here is my current queue of patches for the v4.6 merge window. They
have all been in linux-next for at least a couple of days, and in most
cases weeks.
The highlights are:
* Enable VFIO device on PowerPC, from David Gibson
* Optimizations to speed up IPIs between vcpus in HV KVM,
from Suresh Warrier (who is also Suresh E. Warrier)
* In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
windows (DDW), from Alexey Kardashevskiy.
There is one merge conflict with some commits from the kvm-arm tree,
as noted by Stephen Rothwell:
"Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
808e738142e7 ("arm64: KVM: Add a new feature bit for PMUv3")
f577f6c2a6a5 ("arm64: KVM: Introduce per-vcpu kvm device controls")
from the kvm-arm tree and commit:
01d01d69192e ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number")
from the kvm-ppc-paulus tree."
Stephen fixed it up like this:
diff --cc include/uapi/linux/kvm.h
index ba098d8ae5fc,b06208b2669c..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -862,8 -850,7 +862,9 @@@ struct kvm_ppc_smmu_info
#define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
#define KVM_CAP_HYPERV_SYNIC 123
#define KVM_CAP_S390_RI 124
-#define KVM_CAP_SPAPR_TCE_64 125
+#define KVM_CAP_ARM_PMU_V3 125
+#define KVM_CAP_VCPU_ATTRIBUTES 126
++#define KVM_CAP_SPAPR_TCE_64 127
#ifdef KVM_CAP_IRQ_ROUTING
Please pull.
Thanks,
Paul.
The following changes since commit 765bdb406de4b6132e349c5d4e077866536a9cc0:
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2016-02-08 10:32:30 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 58ded4201ff028b15f6b317228faa5f154a0663f:
KVM: PPC: Add support for 64bit TCE windows (2016-03-02 09:56:50 +1100)
----------------------------------------------------------------
Alexey Kardashevskiy (11):
powerpc: Make vmalloc_to_phys() public
KVM: PPC: Rework H_PUT_TCE/H_GET_TCE handlers
KVM: PPC: Use RCU for arch.spapr_tce_tables
KVM: PPC: Account TCE-containing pages in locked_vm
KVM: PPC: Replace SPAPR_TCE_SHIFT with IOMMU_PAGE_SHIFT_4K
KVM: PPC: Move reusable bits of H_PUT_TCE handler to helpers
KVM: PPC: Add support for multiple-TCE hcalls
KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number
KVM: PPC: Add @page_shift to kvmppc_spapr_tce_table
KVM: PPC: Add @offset to kvmppc_spapr_tce_table
KVM: PPC: Add support for 64bit TCE windows
David Gibson (1):
vfio: Enable VFIO device for powerpc
Suresh E. Warrier (2):
KVM: PPC: Book3S HV: Send IPI to host core to wake VCPU
KVM: PPC: Book3S HV: Add tunable to control H_IPI redirection
Suresh Warrier (7):
powerpc/smp: Support more IPI messages
powerpc/smp: Add smp_muxed_ipi_set_message
powerpc/xics: Add icp_native_cause_ipi_rm
KVM: PPC: Book3S HV: Host-side RM data structures
KVM: PPC: Book3S HV: Manage core host state
KVM: PPC: Book3S HV: kvmppc_host_rm_ops - handle offlining CPUs
KVM: PPC: Book3S HV: Host side kick VCPU when poked by real-mode KVM
Documentation/virtual/kvm/api.txt | 57 ++++++
arch/powerpc/include/asm/kvm_book3s_64.h | 2 -
arch/powerpc/include/asm/kvm_host.h | 5 +-
arch/powerpc/include/asm/kvm_ppc.h | 51 ++++-
arch/powerpc/include/asm/pgtable.h | 3 +
arch/powerpc/include/asm/smp.h | 4 +
arch/powerpc/include/asm/xics.h | 1 +
arch/powerpc/include/uapi/asm/kvm.h | 9 +
arch/powerpc/kernel/smp.c | 28 ++-
arch/powerpc/kvm/Makefile | 2 +-
arch/powerpc/kvm/book3s.c | 2 +-
arch/powerpc/kvm/book3s_64_vio.c | 156 +++++++++++++--
arch/powerpc/kvm/book3s_64_vio_hv.c | 330 +++++++++++++++++++++++++++----
arch/powerpc/kvm/book3s_hv.c | 192 +++++++++++++++++-
arch/powerpc/kvm/book3s_hv_builtin.c | 3 +
arch/powerpc/kvm/book3s_hv_rm_xics.c | 131 +++++++++++-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +-
arch/powerpc/kvm/book3s_pr_papr.c | 35 ++++
arch/powerpc/kvm/powerpc.c | 38 +++-
arch/powerpc/mm/pgtable.c | 8 +
arch/powerpc/perf/hv-24x7.c | 8 -
arch/powerpc/sysdev/xics/icp-native.c | 21 ++
include/uapi/linux/kvm.h | 3 +
23 files changed, 1005 insertions(+), 88 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-03-03 2:38 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-03-03 2:38 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc, Alexander Graf, Alexey Kardashevskiy
Paolo,
Here is my current queue of patches for the v4.6 merge window. They
have all been in linux-next for at least a couple of days, and in most
cases weeks.
The highlights are:
* Enable VFIO device on PowerPC, from David Gibson
* Optimizations to speed up IPIs between vcpus in HV KVM,
from Suresh Warrier (who is also Suresh E. Warrier)
* In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
windows (DDW), from Alexey Kardashevskiy.
There is one merge conflict with some commits from the kvm-arm tree,
as noted by Stephen Rothwell:
"Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
808e738142e7 ("arm64: KVM: Add a new feature bit for PMUv3")
f577f6c2a6a5 ("arm64: KVM: Introduce per-vcpu kvm device controls")
from the kvm-arm tree and commit:
01d01d69192e ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number")
from the kvm-ppc-paulus tree."
Stephen fixed it up like this:
diff --cc include/uapi/linux/kvm.h
index ba098d8ae5fc,b06208b2669c..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -862,8 -850,7 +862,9 @@@ struct kvm_ppc_smmu_info
#define KVM_CAP_IOEVENTFD_ANY_LENGTH 122
#define KVM_CAP_HYPERV_SYNIC 123
#define KVM_CAP_S390_RI 124
-#define KVM_CAP_SPAPR_TCE_64 125
+#define KVM_CAP_ARM_PMU_V3 125
+#define KVM_CAP_VCPU_ATTRIBUTES 126
++#define KVM_CAP_SPAPR_TCE_64 127
#ifdef KVM_CAP_IRQ_ROUTING
Please pull.
Thanks,
Paul.
The following changes since commit 765bdb406de4b6132e349c5d4e077866536a9cc0:
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2016-02-08 10:32:30 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 58ded4201ff028b15f6b317228faa5f154a0663f:
KVM: PPC: Add support for 64bit TCE windows (2016-03-02 09:56:50 +1100)
----------------------------------------------------------------
Alexey Kardashevskiy (11):
powerpc: Make vmalloc_to_phys() public
KVM: PPC: Rework H_PUT_TCE/H_GET_TCE handlers
KVM: PPC: Use RCU for arch.spapr_tce_tables
KVM: PPC: Account TCE-containing pages in locked_vm
KVM: PPC: Replace SPAPR_TCE_SHIFT with IOMMU_PAGE_SHIFT_4K
KVM: PPC: Move reusable bits of H_PUT_TCE handler to helpers
KVM: PPC: Add support for multiple-TCE hcalls
KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_64 capability number
KVM: PPC: Add @page_shift to kvmppc_spapr_tce_table
KVM: PPC: Add @offset to kvmppc_spapr_tce_table
KVM: PPC: Add support for 64bit TCE windows
David Gibson (1):
vfio: Enable VFIO device for powerpc
Suresh E. Warrier (2):
KVM: PPC: Book3S HV: Send IPI to host core to wake VCPU
KVM: PPC: Book3S HV: Add tunable to control H_IPI redirection
Suresh Warrier (7):
powerpc/smp: Support more IPI messages
powerpc/smp: Add smp_muxed_ipi_set_message
powerpc/xics: Add icp_native_cause_ipi_rm
KVM: PPC: Book3S HV: Host-side RM data structures
KVM: PPC: Book3S HV: Manage core host state
KVM: PPC: Book3S HV: kvmppc_host_rm_ops - handle offlining CPUs
KVM: PPC: Book3S HV: Host side kick VCPU when poked by real-mode KVM
Documentation/virtual/kvm/api.txt | 57 ++++++
arch/powerpc/include/asm/kvm_book3s_64.h | 2 -
arch/powerpc/include/asm/kvm_host.h | 5 +-
arch/powerpc/include/asm/kvm_ppc.h | 51 ++++-
arch/powerpc/include/asm/pgtable.h | 3 +
arch/powerpc/include/asm/smp.h | 4 +
arch/powerpc/include/asm/xics.h | 1 +
arch/powerpc/include/uapi/asm/kvm.h | 9 +
arch/powerpc/kernel/smp.c | 28 ++-
arch/powerpc/kvm/Makefile | 2 +-
arch/powerpc/kvm/book3s.c | 2 +-
arch/powerpc/kvm/book3s_64_vio.c | 156 +++++++++++++--
arch/powerpc/kvm/book3s_64_vio_hv.c | 330 +++++++++++++++++++++++++++----
arch/powerpc/kvm/book3s_hv.c | 192 +++++++++++++++++-
arch/powerpc/kvm/book3s_hv_builtin.c | 3 +
arch/powerpc/kvm/book3s_hv_rm_xics.c | 131 +++++++++++-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +-
arch/powerpc/kvm/book3s_pr_papr.c | 35 ++++
arch/powerpc/kvm/powerpc.c | 38 +++-
arch/powerpc/mm/pgtable.c | 8 +
arch/powerpc/perf/hv-24x7.c | 8 -
arch/powerpc/sysdev/xics/icp-native.c | 21 ++
include/uapi/linux/kvm.h | 3 +
23 files changed, 1005 insertions(+), 88 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-03-03 2:38 ` Paul Mackerras
@ 2016-03-03 13:46 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-03-03 13:46 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc, Alexander Graf, Alexey Kardashevskiy
On 03/03/2016 03:38, Paul Mackerras wrote:
> Paolo,
>
> Here is my current queue of patches for the v4.6 merge window. They
> have all been in linux-next for at least a couple of days, and in most
> cases weeks.
>
> The highlights are:
>
> * Enable VFIO device on PowerPC, from David Gibson
> * Optimizations to speed up IPIs between vcpus in HV KVM,
> from Suresh Warrier (who is also Suresh E. Warrier)
> * In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
> windows (DDW), from Alexey Kardashevskiy.
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-03-03 13:46 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-03-03 13:46 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc, Alexander Graf, Alexey Kardashevskiy
On 03/03/2016 03:38, Paul Mackerras wrote:
> Paolo,
>
> Here is my current queue of patches for the v4.6 merge window. They
> have all been in linux-next for at least a couple of days, and in most
> cases weeks.
>
> The highlights are:
>
> * Enable VFIO device on PowerPC, from David Gibson
> * Optimizations to speed up IPIs between vcpus in HV KVM,
> from Suresh Warrier (who is also Suresh E. Warrier)
> * In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
> windows (DDW), from Alexey Kardashevskiy.
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-05-13 5:23 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-05-13 5:23 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Hi Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.6. All of these commits were in linux-next for the last 2 days
except for the XICS fast-path one, which was in linux-next today.
I know this is a bit late, life has been busy lately, but hopefully
these can still get into 4.6.
Thanks,
Paul.
The following changes since commit 05b1159e641fa45e885aec8bf8e515117c8977d9:
Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next (2016-04-20 15:28:51 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to b1a4286b8f3393857a205ec89607683161b75f90:
KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts (2016-05-12 16:40:55 +1000)
----------------------------------------------------------------
Alexey Kardashevskiy (1):
KVM: PPC: Fix debug macros
Gavin Shan (1):
KVM: PPC: Book3S HV: Fix build error in book3s_hv.c
Laurent Vivier (1):
KVM: PPC: Book3S PR: Manage single-step mode
Paul Mackerras (2):
KVM: PPC: Fix emulated MMIO sign-extension
KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts
arch/powerpc/kvm/book3s_hv.c | 1 +
arch/powerpc/kvm/book3s_pr.c | 32 +++++++++++++++++++++++++++++++-
arch/powerpc/kvm/book3s_xics.c | 29 +++++++++++++++++------------
arch/powerpc/kvm/book3s_xics.h | 1 +
arch/powerpc/kvm/powerpc.c | 22 ++++++++++++----------
5 files changed, 62 insertions(+), 23 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-05-13 5:23 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-05-13 5:23 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Hi Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.6. All of these commits were in linux-next for the last 2 days
except for the XICS fast-path one, which was in linux-next today.
I know this is a bit late, life has been busy lately, but hopefully
these can still get into 4.6.
Thanks,
Paul.
The following changes since commit 05b1159e641fa45e885aec8bf8e515117c8977d9:
Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next (2016-04-20 15:28:51 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to b1a4286b8f3393857a205ec89607683161b75f90:
KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts (2016-05-12 16:40:55 +1000)
----------------------------------------------------------------
Alexey Kardashevskiy (1):
KVM: PPC: Fix debug macros
Gavin Shan (1):
KVM: PPC: Book3S HV: Fix build error in book3s_hv.c
Laurent Vivier (1):
KVM: PPC: Book3S PR: Manage single-step mode
Paul Mackerras (2):
KVM: PPC: Fix emulated MMIO sign-extension
KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts
arch/powerpc/kvm/book3s_hv.c | 1 +
arch/powerpc/kvm/book3s_pr.c | 32 +++++++++++++++++++++++++++++++-
arch/powerpc/kvm/book3s_xics.c | 29 +++++++++++++++++------------
arch/powerpc/kvm/book3s_xics.h | 1 +
arch/powerpc/kvm/powerpc.c | 22 ++++++++++++----------
5 files changed, 62 insertions(+), 23 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-05-13 5:23 ` Paul Mackerras
@ 2016-05-13 7:44 ` Christian Borntraeger
-1 siblings, 0 replies; 100+ messages in thread
From: Christian Borntraeger @ 2016-05-13 7:44 UTC (permalink / raw)
To: Paul Mackerras, Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
On 05/13/2016 07:23 AM, Paul Mackerras wrote:
> Hi Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC update for
> 4.6. All of these commits were in linux-next for the last 2 days
> except for the XICS fast-path one, which was in linux-next today.
> I know this is a bit late, life has been busy lately, but hopefully
> these can still get into 4.6.
>
> Thanks,
> Paul.
>
> The following changes since commit 05b1159e641fa45e885aec8bf8e515117c8977d9:
>
> Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next (2016-04-20 15:28:51 +0200)
This is based on kvm/next but targetting kvm/master?
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-05-13 7:44 ` Christian Borntraeger
0 siblings, 0 replies; 100+ messages in thread
From: Christian Borntraeger @ 2016-05-13 7:44 UTC (permalink / raw)
To: Paul Mackerras, Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
On 05/13/2016 07:23 AM, Paul Mackerras wrote:
> Hi Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC update for
> 4.6. All of these commits were in linux-next for the last 2 days
> except for the XICS fast-path one, which was in linux-next today.
> I know this is a bit late, life has been busy lately, but hopefully
> these can still get into 4.6.
>
> Thanks,
> Paul.
>
> The following changes since commit 05b1159e641fa45e885aec8bf8e515117c8977d9:
>
> Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next (2016-04-20 15:28:51 +0200)
This is based on kvm/next but targetting kvm/master?
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-05-13 7:44 ` Christian Borntraeger
@ 2016-05-13 8:24 ` Paul Mackerras
-1 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-05-13 8:24 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Paolo Bonzini, kvm, Alexander Graf, kvm-ppc
On Fri, May 13, 2016 at 09:44:36AM +0200, Christian Borntraeger wrote:
> On 05/13/2016 07:23 AM, Paul Mackerras wrote:
> > Hi Paolo,
> >
> > Please do a pull from my kvm-ppc-next branch to get a PPC update for
> > 4.6. All of these commits were in linux-next for the last 2 days
> > except for the XICS fast-path one, which was in linux-next today.
> > I know this is a bit late, life has been busy lately, but hopefully
> > these can still get into 4.6.
> >
> > Thanks,
> > Paul.
> >
> > The following changes since commit 05b1159e641fa45e885aec8bf8e515117c8977d9:
> >
> > Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next (2016-04-20 15:28:51 +0200)
>
> This is based on kvm/next but targetting kvm/master?
Oops, I meant that I want these commits to get into 4.7, i.e. the next
merge window. Sorry for the confusion.
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-05-13 8:24 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-05-13 8:24 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Paolo Bonzini, kvm, Alexander Graf, kvm-ppc
On Fri, May 13, 2016 at 09:44:36AM +0200, Christian Borntraeger wrote:
> On 05/13/2016 07:23 AM, Paul Mackerras wrote:
> > Hi Paolo,
> >
> > Please do a pull from my kvm-ppc-next branch to get a PPC update for
> > 4.6. All of these commits were in linux-next for the last 2 days
> > except for the XICS fast-path one, which was in linux-next today.
> > I know this is a bit late, life has been busy lately, but hopefully
> > these can still get into 4.6.
> >
> > Thanks,
> > Paul.
> >
> > The following changes since commit 05b1159e641fa45e885aec8bf8e515117c8977d9:
> >
> > Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next (2016-04-20 15:28:51 +0200)
>
> This is based on kvm/next but targetting kvm/master?
Oops, I meant that I want these commits to get into 4.7, i.e. the next
merge window. Sorry for the confusion.
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-07-11 15:46 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-07-11 15:46 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch. These commits have all
been in linux-next for a few weeks, and I would like them to go into
Linus' tree in the next merge window for v4.8. Stephen Rothwell noted
a trivial merge conflict in linux-next with the fsl tree where we had
both added a #include line to asm/paca.h. This may show up when Linus
merges this stuff into his tree, but it's trivially easy to fix (just
take both additions).
I haven't taken Suraj's latest series at this point since we're almost
up to the merge window, and I am on vacation and can't easily test his
series.
Thanks,
Paul.
The following changes since commit 64672c95ea4c2f7096e519e826076867e8ef0938:
kvm: vmx: hook preemption timer support (2016-06-16 10:07:50 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to fd7bacbca47a86a6f418440d8a5d7b7edbb2f8f9:
KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt (2016-06-20 14:11:25 +1000)
----------------------------------------------------------------
Mahesh Salgaonkar (2):
powerpc/powernv: Remove the usage of PACAR1 from opal wrappers
KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt
Thomas Huth (2):
KVM: PPC: Book3S PR: Fix illegal opcode emulation
KVM: PPC: Book3S PR: Fix contents of SRR1 when injecting a program exception
arch/powerpc/include/asm/hmi.h | 45 +++++++
arch/powerpc/include/asm/paca.h | 6 +
arch/powerpc/kernel/Makefile | 2 +-
arch/powerpc/kernel/exceptions-64s.S | 4 +-
arch/powerpc/kernel/hmi.c | 56 ++++++++
arch/powerpc/kernel/idle_power7.S | 5 +-
arch/powerpc/kernel/traps.c | 5 +
arch/powerpc/kvm/book3s_hv.c | 37 ++++++
arch/powerpc/kvm/book3s_hv_ras.c | 176 +++++++++++++++++++++++++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 65 ++++++++-
arch/powerpc/kvm/book3s_pr.c | 12 +-
arch/powerpc/kvm/emulate.c | 1 -
arch/powerpc/platforms/powernv/opal-wrappers.S | 2 -
13 files changed, 407 insertions(+), 9 deletions(-)
create mode 100644 arch/powerpc/include/asm/hmi.h
create mode 100644 arch/powerpc/kernel/hmi.c
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-07-11 15:46 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-07-11 15:46 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Alexander Graf, kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch. These commits have all
been in linux-next for a few weeks, and I would like them to go into
Linus' tree in the next merge window for v4.8. Stephen Rothwell noted
a trivial merge conflict in linux-next with the fsl tree where we had
both added a #include line to asm/paca.h. This may show up when Linus
merges this stuff into his tree, but it's trivially easy to fix (just
take both additions).
I haven't taken Suraj's latest series at this point since we're almost
up to the merge window, and I am on vacation and can't easily test his
series.
Thanks,
Paul.
The following changes since commit 64672c95ea4c2f7096e519e826076867e8ef0938:
kvm: vmx: hook preemption timer support (2016-06-16 10:07:50 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to fd7bacbca47a86a6f418440d8a5d7b7edbb2f8f9:
KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt (2016-06-20 14:11:25 +1000)
----------------------------------------------------------------
Mahesh Salgaonkar (2):
powerpc/powernv: Remove the usage of PACAR1 from opal wrappers
KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt
Thomas Huth (2):
KVM: PPC: Book3S PR: Fix illegal opcode emulation
KVM: PPC: Book3S PR: Fix contents of SRR1 when injecting a program exception
arch/powerpc/include/asm/hmi.h | 45 +++++++
arch/powerpc/include/asm/paca.h | 6 +
arch/powerpc/kernel/Makefile | 2 +-
arch/powerpc/kernel/exceptions-64s.S | 4 +-
arch/powerpc/kernel/hmi.c | 56 ++++++++
arch/powerpc/kernel/idle_power7.S | 5 +-
arch/powerpc/kernel/traps.c | 5 +
arch/powerpc/kvm/book3s_hv.c | 37 ++++++
arch/powerpc/kvm/book3s_hv_ras.c | 176 +++++++++++++++++++++++++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 65 ++++++++-
arch/powerpc/kvm/book3s_pr.c | 12 +-
arch/powerpc/kvm/emulate.c | 1 -
arch/powerpc/platforms/powernv/opal-wrappers.S | 2 -
13 files changed, 407 insertions(+), 9 deletions(-)
create mode 100644 arch/powerpc/include/asm/hmi.h
create mode 100644 arch/powerpc/kernel/hmi.c
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-07-11 15:46 ` Paul Mackerras
@ 2016-07-11 16:11 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-07-11 16:11 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Alexander Graf, kvm-ppc
On 11/07/2016 17:46, Paul Mackerras wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
Pulled to kvm/queue, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-13 4:58 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-09-13 4:58 UTC (permalink / raw)
To: Paolo Bonzini, kvm, kvm-ppc, Michael Ellerman
Paolo,
Please do a pull from my kvm-ppc-next branch to get PPC KVM updates
for v4.9. The highlights are:
* Reduced latency for interrupts from PCI pass-through devices, from
Suresh Warrier and me.
* Halt-polling implementation from Suraj Jitindar Singh.
* 64-bit VCPU statistics, also from Suraj.
* Various other minor fixes and improvements.
This includes the patches on my kvm-ppc-infrastructure branch, which
is also available for Michael Ellerman to pull into the powerpc tree.
Unfortunately I put in Paolo's patch to move hmi.c, not realizing that
Ben had already sent it to Linus. However, since the patch is
identical, git merges it without complaint, so I have left it in,
because otherwise I would have to rebase my kvm-ppc-next branch, which
I try very hard not to do. Paolo, if you prefer me to rebase my
kvm-ppc-{next,infrastructure} branches to remove the patch, let me
know.
Paul.
The following changes since commit 694d0d0bb2030d2e36df73e2d23d5770511dbc8d:
Linux 4.8-rc2 (2016-08-14 19:11:36 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to aad9e5ba243336d2b133e7fa9aace1a51d6fdae6:
KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init() (2016-09-13 14:32:47 +1000)
----------------------------------------------------------------
Markus Elfring (6):
KVM: PPC: e500: Use kmalloc_array() in kvm_vcpu_ioctl_config_tlb()
KVM: PPC: e500: Less function calls in kvm_vcpu_ioctl_config_tlb() after error detection
KVM: PPC: e500: Delete an unnecessary initialisation in kvm_vcpu_ioctl_config_tlb()
KVM: PPC: e500: Replace kzalloc() calls by kcalloc() in two functions
KVM: PPC: e500: Use kmalloc_array() in kvmppc_e500_tlb_init()
KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init()
Paolo Bonzini (1):
powerpc: move hmi.c to arch/powerpc/kvm/
Paul Mackerras (6):
KVM: PPC: Book3S: Don't crash if irqfd used with no in-kernel XICS emulation
KVM: PPC: Implement kvm_arch_intc_initialized() for PPC
KVM: PPC: Always select KVM_VFIO, plus Makefile cleanup
powerpc/mm: Speed up computation of base and actual page size for a HPTE
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
KVM: PPC: Book3S HV: Set server for passed-through interrupts
Suraj Jitindar Singh (5):
KVM: PPC: Book3S HV: Move struct kvmppc_vcore from kvm_host.h to kvm_book3s.h
KVM: PPC: Book3S HV: Change vcore element runnable_threads from linked-list to array
KVM: PPC: Book3S HV: Implement halt polling
KVM: Add provisioning for ulong vm stats and u64 vcpu stats
KVM: PPC: Implement existing and add new halt polling vcpu stats
Suresh Warrier (12):
powerpc: Add simple cache inhibited MMIO accessors
powerpc/powernv: Provide facilities for EOI, usable from real mode
KVM: PPC: Book3S HV: Convert kvmppc_read_intr to a C function
KVM: PPC: select IRQ_BYPASS_MANAGER
KVM: PPC: Book3S HV: Introduce kvmppc_passthru_irqmap
KVM: PPC: Book3S HV: Enable IRQ bypass
KVM: PPC: Book3S HV: Handle passthrough interrupts in guest
KVM: PPC: Book3S HV: Complete passthrough interrupt in host
KVM: PPC: Book3S HV: Dump irqmap in debugfs
KVM: PPC: Book3S HV: Tunable to disable KVM IRQ bypass
KVM: PPC: Book3S HV: Update irq stats for IRQs handled in real mode
KVM: PPC: Book3S HV: Counters for passthrough IRQ stats
arch/arm/include/asm/kvm_host.h | 12 +-
arch/arm64/include/asm/kvm_host.h | 12 +-
arch/mips/include/asm/kvm_host.h | 46 +--
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 37 ++
arch/powerpc/include/asm/hmi.h | 2 +-
arch/powerpc/include/asm/io.h | 29 ++
arch/powerpc/include/asm/kvm_asm.h | 10 +
arch/powerpc/include/asm/kvm_book3s.h | 37 ++
arch/powerpc/include/asm/kvm_book3s_64.h | 87 +----
arch/powerpc/include/asm/kvm_host.h | 123 +++----
arch/powerpc/include/asm/kvm_ppc.h | 28 ++
arch/powerpc/include/asm/mmu.h | 1 +
arch/powerpc/include/asm/opal.h | 1 +
arch/powerpc/include/asm/paca.h | 12 +-
arch/powerpc/include/asm/pnv-pci.h | 3 +
arch/powerpc/kernel/Makefile | 2 +-
arch/powerpc/kvm/Kconfig | 3 +
arch/powerpc/kvm/Makefile | 20 +-
arch/powerpc/kvm/book3s.c | 7 +
arch/powerpc/kvm/book3s_hv.c | 401 +++++++++++++++++++--
arch/powerpc/kvm/book3s_hv_builtin.c | 156 ++++++++
arch/powerpc/{kernel/hmi.c => kvm/book3s_hv_hmi.c} | 0
arch/powerpc/kvm/book3s_hv_rm_xics.c | 120 ++++++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 183 +++++-----
arch/powerpc/kvm/book3s_xics.c | 57 ++-
arch/powerpc/kvm/book3s_xics.h | 2 +
arch/powerpc/kvm/e500_mmu.c | 73 ++--
arch/powerpc/kvm/powerpc.c | 51 +++
arch/powerpc/kvm/trace_hv.h | 22 ++
arch/powerpc/mm/hash_native_64.c | 42 +--
arch/powerpc/mm/hash_utils_64.c | 55 +++
arch/powerpc/platforms/powernv/opal-wrappers.S | 1 +
arch/powerpc/platforms/powernv/pci-ioda.c | 24 +-
arch/s390/include/asm/kvm_host.h | 134 +++----
arch/x86/include/asm/kvm_host.h | 72 ++--
virt/kvm/kvm_main.c | 4 +-
36 files changed, 1366 insertions(+), 503 deletions(-)
rename arch/powerpc/{kernel/hmi.c => kvm/book3s_hv_hmi.c} (100%)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-13 4:58 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-09-13 4:58 UTC (permalink / raw)
To: Paolo Bonzini, kvm, kvm-ppc, Michael Ellerman
Paolo,
Please do a pull from my kvm-ppc-next branch to get PPC KVM updates
for v4.9. The highlights are:
* Reduced latency for interrupts from PCI pass-through devices, from
Suresh Warrier and me.
* Halt-polling implementation from Suraj Jitindar Singh.
* 64-bit VCPU statistics, also from Suraj.
* Various other minor fixes and improvements.
This includes the patches on my kvm-ppc-infrastructure branch, which
is also available for Michael Ellerman to pull into the powerpc tree.
Unfortunately I put in Paolo's patch to move hmi.c, not realizing that
Ben had already sent it to Linus. However, since the patch is
identical, git merges it without complaint, so I have left it in,
because otherwise I would have to rebase my kvm-ppc-next branch, which
I try very hard not to do. Paolo, if you prefer me to rebase my
kvm-ppc-{next,infrastructure} branches to remove the patch, let me
know.
Paul.
The following changes since commit 694d0d0bb2030d2e36df73e2d23d5770511dbc8d:
Linux 4.8-rc2 (2016-08-14 19:11:36 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to aad9e5ba243336d2b133e7fa9aace1a51d6fdae6:
KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init() (2016-09-13 14:32:47 +1000)
----------------------------------------------------------------
Markus Elfring (6):
KVM: PPC: e500: Use kmalloc_array() in kvm_vcpu_ioctl_config_tlb()
KVM: PPC: e500: Less function calls in kvm_vcpu_ioctl_config_tlb() after error detection
KVM: PPC: e500: Delete an unnecessary initialisation in kvm_vcpu_ioctl_config_tlb()
KVM: PPC: e500: Replace kzalloc() calls by kcalloc() in two functions
KVM: PPC: e500: Use kmalloc_array() in kvmppc_e500_tlb_init()
KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init()
Paolo Bonzini (1):
powerpc: move hmi.c to arch/powerpc/kvm/
Paul Mackerras (6):
KVM: PPC: Book3S: Don't crash if irqfd used with no in-kernel XICS emulation
KVM: PPC: Implement kvm_arch_intc_initialized() for PPC
KVM: PPC: Always select KVM_VFIO, plus Makefile cleanup
powerpc/mm: Speed up computation of base and actual page size for a HPTE
Merge branch 'kvm-ppc-infrastructure' into kvm-ppc-next
KVM: PPC: Book3S HV: Set server for passed-through interrupts
Suraj Jitindar Singh (5):
KVM: PPC: Book3S HV: Move struct kvmppc_vcore from kvm_host.h to kvm_book3s.h
KVM: PPC: Book3S HV: Change vcore element runnable_threads from linked-list to array
KVM: PPC: Book3S HV: Implement halt polling
KVM: Add provisioning for ulong vm stats and u64 vcpu stats
KVM: PPC: Implement existing and add new halt polling vcpu stats
Suresh Warrier (12):
powerpc: Add simple cache inhibited MMIO accessors
powerpc/powernv: Provide facilities for EOI, usable from real mode
KVM: PPC: Book3S HV: Convert kvmppc_read_intr to a C function
KVM: PPC: select IRQ_BYPASS_MANAGER
KVM: PPC: Book3S HV: Introduce kvmppc_passthru_irqmap
KVM: PPC: Book3S HV: Enable IRQ bypass
KVM: PPC: Book3S HV: Handle passthrough interrupts in guest
KVM: PPC: Book3S HV: Complete passthrough interrupt in host
KVM: PPC: Book3S HV: Dump irqmap in debugfs
KVM: PPC: Book3S HV: Tunable to disable KVM IRQ bypass
KVM: PPC: Book3S HV: Update irq stats for IRQs handled in real mode
KVM: PPC: Book3S HV: Counters for passthrough IRQ stats
arch/arm/include/asm/kvm_host.h | 12 +-
arch/arm64/include/asm/kvm_host.h | 12 +-
arch/mips/include/asm/kvm_host.h | 46 +--
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 37 ++
arch/powerpc/include/asm/hmi.h | 2 +-
arch/powerpc/include/asm/io.h | 29 ++
arch/powerpc/include/asm/kvm_asm.h | 10 +
arch/powerpc/include/asm/kvm_book3s.h | 37 ++
arch/powerpc/include/asm/kvm_book3s_64.h | 87 +----
arch/powerpc/include/asm/kvm_host.h | 123 +++----
arch/powerpc/include/asm/kvm_ppc.h | 28 ++
arch/powerpc/include/asm/mmu.h | 1 +
arch/powerpc/include/asm/opal.h | 1 +
arch/powerpc/include/asm/paca.h | 12 +-
arch/powerpc/include/asm/pnv-pci.h | 3 +
arch/powerpc/kernel/Makefile | 2 +-
arch/powerpc/kvm/Kconfig | 3 +
arch/powerpc/kvm/Makefile | 20 +-
arch/powerpc/kvm/book3s.c | 7 +
arch/powerpc/kvm/book3s_hv.c | 401 +++++++++++++++++++--
arch/powerpc/kvm/book3s_hv_builtin.c | 156 ++++++++
arch/powerpc/{kernel/hmi.c => kvm/book3s_hv_hmi.c} | 0
arch/powerpc/kvm/book3s_hv_rm_xics.c | 120 ++++++
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 183 +++++-----
arch/powerpc/kvm/book3s_xics.c | 57 ++-
arch/powerpc/kvm/book3s_xics.h | 2 +
arch/powerpc/kvm/e500_mmu.c | 73 ++--
arch/powerpc/kvm/powerpc.c | 51 +++
arch/powerpc/kvm/trace_hv.h | 22 ++
arch/powerpc/mm/hash_native_64.c | 42 +--
arch/powerpc/mm/hash_utils_64.c | 55 +++
arch/powerpc/platforms/powernv/opal-wrappers.S | 1 +
arch/powerpc/platforms/powernv/pci-ioda.c | 24 +-
arch/s390/include/asm/kvm_host.h | 134 +++----
arch/x86/include/asm/kvm_host.h | 72 ++--
virt/kvm/kvm_main.c | 4 +-
36 files changed, 1366 insertions(+), 503 deletions(-)
rename arch/powerpc/{kernel/hmi.c => kvm/book3s_hv_hmi.c} (100%)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-09-13 4:58 ` Paul Mackerras
@ 2016-09-13 13:10 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-09-13 13:10 UTC (permalink / raw)
To: Paul Mackerras, kvm, kvm-ppc, Michael Ellerman
On 13/09/2016 06:58, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get PPC KVM updates
> for v4.9. The highlights are:
>
> * Reduced latency for interrupts from PCI pass-through devices, from
> Suresh Warrier and me.
> * Halt-polling implementation from Suraj Jitindar Singh.
> * 64-bit VCPU statistics, also from Suraj.
> * Various other minor fixes and improvements.
>
> This includes the patches on my kvm-ppc-infrastructure branch, which
> is also available for Michael Ellerman to pull into the powerpc tree.
> Unfortunately I put in Paolo's patch to move hmi.c, not realizing that
> Ben had already sent it to Linus. However, since the patch is
> identical, git merges it without complaint, so I have left it in,
> because otherwise I would have to rebase my kvm-ppc-next branch, which
> I try very hard not to do. Paolo, if you prefer me to rebase my
> kvm-ppc-{next,infrastructure} branches to remove the patch, let me
> know.
No problem! This should be fine. I don't expect conflicts because
book3s_hv_hmi.c is unlikely to see changes between now and my 4.9 pull
request.
Branch pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-13 13:10 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2016-09-13 13:10 UTC (permalink / raw)
To: Paul Mackerras, kvm, kvm-ppc, Michael Ellerman
On 13/09/2016 06:58, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get PPC KVM updates
> for v4.9. The highlights are:
>
> * Reduced latency for interrupts from PCI pass-through devices, from
> Suresh Warrier and me.
> * Halt-polling implementation from Suraj Jitindar Singh.
> * 64-bit VCPU statistics, also from Suraj.
> * Various other minor fixes and improvements.
>
> This includes the patches on my kvm-ppc-infrastructure branch, which
> is also available for Michael Ellerman to pull into the powerpc tree.
> Unfortunately I put in Paolo's patch to move hmi.c, not realizing that
> Ben had already sent it to Linus. However, since the patch is
> identical, git merges it without complaint, so I have left it in,
> because otherwise I would have to rebase my kvm-ppc-next branch, which
> I try very hard not to do. Paolo, if you prefer me to rebase my
> kvm-ppc-{next,infrastructure} branches to remove the patch, let me
> know.
No problem! This should be fine. I don't expect conflicts because
book3s_hv_hmi.c is unlikely to see changes between now and my 4.9 pull
request.
Branch pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-28 4:46 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-09-28 4:46 UTC (permalink / raw)
To: Paolo Bonzini, kvm, kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get some further PPC
KVM updates for 4.9. This includes the fix for the bug that Thomas
Huth found which caused guests to falsely report soft lockups, other
minor fixes from Thomas Huth and Dan Carpenter, and a small
optimization from Balbir Singh.
Thanks,
Paul.
The following changes since commit adad0d02a7d3c958121a4eb9d126015a2353db94:
kvm: svm: fix unsigned compare less than zero comparison (2016-09-20 09:26:30 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e:
KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register (2016-09-27 15:14:29 +1000)
----------------------------------------------------------------
Balbir Singh (1):
KVM: PPC: Book3S: Remove duplicate setting of the B field in tlbie
Dan Carpenter (1):
KVM: PPC: BookE: Fix a sanity check
Paul Mackerras (2):
KVM: PPC: Book3S: Treat VTB as a per-subcore register, not per-thread
KVM: PPC: Book3S HV: Take out virtual core piggybacking code
Thomas Huth (2):
KVM: PPC: Book3S PR: Support 64kB page size on POWER8E and POWER8NVL
KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register
arch/powerpc/include/asm/kvm_book3s.h | 2 +
arch/powerpc/include/asm/kvm_book3s_64.h | 3 +-
arch/powerpc/include/asm/kvm_host.h | 1 -
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/kernel/asm-offsets.c | 2 +-
arch/powerpc/kvm/book3s.c | 6 --
arch/powerpc/kvm/book3s_emulate.c | 4 +-
arch/powerpc/kvm/book3s_hv.c | 132 +++----------------------------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 14 ++--
arch/powerpc/kvm/book3s_pr.c | 10 ++-
arch/powerpc/kvm/booke.c | 2 +-
11 files changed, 34 insertions(+), 143 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-28 4:46 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-09-28 4:46 UTC (permalink / raw)
To: Paolo Bonzini, kvm, kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get some further PPC
KVM updates for 4.9. This includes the fix for the bug that Thomas
Huth found which caused guests to falsely report soft lockups, other
minor fixes from Thomas Huth and Dan Carpenter, and a small
optimization from Balbir Singh.
Thanks,
Paul.
The following changes since commit adad0d02a7d3c958121a4eb9d126015a2353db94:
kvm: svm: fix unsigned compare less than zero comparison (2016-09-20 09:26:30 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e:
KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register (2016-09-27 15:14:29 +1000)
----------------------------------------------------------------
Balbir Singh (1):
KVM: PPC: Book3S: Remove duplicate setting of the B field in tlbie
Dan Carpenter (1):
KVM: PPC: BookE: Fix a sanity check
Paul Mackerras (2):
KVM: PPC: Book3S: Treat VTB as a per-subcore register, not per-thread
KVM: PPC: Book3S HV: Take out virtual core piggybacking code
Thomas Huth (2):
KVM: PPC: Book3S PR: Support 64kB page size on POWER8E and POWER8NVL
KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register
arch/powerpc/include/asm/kvm_book3s.h | 2 +
arch/powerpc/include/asm/kvm_book3s_64.h | 3 +-
arch/powerpc/include/asm/kvm_host.h | 1 -
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/kernel/asm-offsets.c | 2 +-
arch/powerpc/kvm/book3s.c | 6 --
arch/powerpc/kvm/book3s_emulate.c | 4 +-
arch/powerpc/kvm/book3s_hv.c | 132 +++----------------------------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 14 ++--
arch/powerpc/kvm/book3s_pr.c | 10 ++-
arch/powerpc/kvm/booke.c | 2 +-
11 files changed, 34 insertions(+), 143 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-09-28 4:46 ` Paul Mackerras
@ 2016-09-29 14:46 ` Radim Krčmář
-1 siblings, 0 replies; 100+ messages in thread
From: Radim Krčmář @ 2016-09-29 14:46 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Paolo Bonzini, kvm, kvm-ppc
2016-09-28 14:46+1000, Paul Mackerras:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get some further PPC
> KVM updates for 4.9. This includes the fix for the bug that Thomas
> Huth found which caused guests to falsely report soft lockups, other
> minor fixes from Thomas Huth and Dan Carpenter, and a small
> optimization from Balbir Singh.
Pulled to kvm/next, thanks.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-29 14:46 ` Radim Krčmář
0 siblings, 0 replies; 100+ messages in thread
From: Radim Krčmář @ 2016-09-29 14:46 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Paolo Bonzini, kvm, kvm-ppc
2016-09-28 14:46+1000, Paul Mackerras:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get some further PPC
> KVM updates for 4.9. This includes the fix for the bug that Thomas
> Huth found which caused guests to falsely report soft lockups, other
> minor fixes from Thomas Huth and Dan Carpenter, and a small
> optimization from Balbir Singh.
Pulled to kvm/next, thanks.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-09-28 4:46 ` Paul Mackerras
@ 2016-09-29 20:00 ` Thomas Huth
-1 siblings, 0 replies; 100+ messages in thread
From: Thomas Huth @ 2016-09-29 20:00 UTC (permalink / raw)
To: Paul Mackerras, kvm, kvm-ppc
On 28.09.2016 06:46, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get some further PPC
> KVM updates for 4.9. This includes the fix for the bug that Thomas
> Huth found which caused guests to falsely report soft lockups [...]
Just a small remark: I was just the one who reported the bug - credits
for finding the bug go to Jan Stancek.
Anyway, thanks again for the patches that fix this issue!
Cheers,
Thomas
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-09-29 20:00 ` Thomas Huth
0 siblings, 0 replies; 100+ messages in thread
From: Thomas Huth @ 2016-09-29 20:00 UTC (permalink / raw)
To: Paul Mackerras, kvm, kvm-ppc
On 28.09.2016 06:46, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get some further PPC
> KVM updates for 4.9. This includes the fix for the bug that Thomas
> Huth found which caused guests to falsely report soft lockups [...]
Just a small remark: I was just the one who reported the bug - credits
for finding the bug go to Jan Stancek.
Anyway, thanks again for the patches that fix this issue!
Cheers,
Thomas
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-11-28 22:53 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-11-28 22:53 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Radim Krčmář, kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
for 4.10. This includes some changes to arch/powerpc which Michael
Ellerman put into a topic branch in his powerpc tree (topic/ppc-kvm)
which I have pulled into my kvm-ppc-next branch and which Michael will
pull into his next branch.
The changes this time are:
* Support for KVM guests on POWER9 using the hashed page table MMU.
* Updates and improvements to the halt-polling support on PPC, from
Suraj Jitindar Singh.
* An optimization to speed up emulated MMIO, from Yongji Xie.
* Various other minor cleanups.
Suraj's patch set includes some changes to core KVM code which were
posted back in October and didn't attract much comment, so I put them
in. They add some documentation for halt polling and export the
module parameters used to control halt polling.
Full disclosure: after I had pushed out some of the patches for POWER9
support, I discovered that they broke compilation with some uncommon
configurations (those with HV KVM enabled but in-kernel XICS interrupt
controller emulation disabled, or with SMP disabled). Since my
kvm-ppc-next branch is a non-rebasing branch, I pushed a patch on top
to fix the breakage. So bisection is broken over a span of about 6
commits for these unusual configurations. If you want me to rebase my
kvm-ppc-next branch to avoid the breakage, let me know and I will do
that.
Thanks,
Paul.
The following changes since commit 813ae37e6aed72cc457094b6066aa38efd66c9e9:
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into kvm/next (2016-11-16 22:07:36 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 6ccad8cea5bcb0660f56677a5fdc52265f8ddf76:
KVM: Add halt polling documentation (2016-11-28 11:48:47 +1100)
----------------------------------------------------------------
Daniel Axtens (2):
KVM: PPC: Book3S HV: Fix sparse static warning
KVM: PPC: Book3S HV: sparse: prototypes for functions called from assembler
David Gibson (2):
KVM: PPC: Move KVM_PPC_PVINFO_FLAGS_EV_IDLE definition next to its structure
KVM: PPC: Correctly report KVM_CAP_PPC_ALLOC_HTAB
Geliang Tang (1):
KVM: PPC: Book3S HV: Drop duplicate header asm/iommu.h
Michael Ellerman (1):
powerpc/reg: Add definition for LPCR_PECE_HVEE
Michael Neuling (1):
powerpc/powernv: Define and set POWER9 HFSCR doorbell bit
Paul Mackerras (18):
powerpc/64: Simplify adaptation to new ISA v3.00 HPTE format
KVM: PPC: Book3S HV: Save/restore XER in checkpointed register state
KVM: PPC: Book3S HV: Don't lose hardware R/C bit updates in H_PROTECT
powerpc/64: Add some more SPRs and SPR bits for POWER9
powerpc/64: Provide functions for accessing POWER9 partition table
powerpc/powernv: Define real-mode versions of OPAL XICS accessors
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
KVM: PPC: Book3S HV: Adapt to new HPTE format on POWER9
KVM: PPC: Book3S HV: Set partition table rather than SDR1 on POWER9
KVM: PPC: Book3S HV: Adjust host/guest context switch for POWER9
KVM: PPC: Book3S HV: Add new POWER9 guest-accessible SPRs
KVM: PPC: Book3S HV: Adapt TLB invalidations to work on POWER9
KVM: PPC: Book3S HV: Use msgsnd for IPIs to other cores on POWER9
KVM: PPC: Book3S HV: Use OPAL XICS emulation on POWER9
KVM: PPC: Book3S HV: Use stop instruction rather than nap on POWER9
KVM: PPC: Book3S HV: Enable hypervisor virtualization interrupts while in guest
KVM: PPC: Book3S HV: Treat POWER9 CPU threads as independent subcores
KVM: PPC: Book3S HV: Fix compilation with unusual configurations
Suraj Jitindar Singh (8):
powerpc/64: Define new ISA v3.00 logical PVR value and PCR register value
KVM: PPC: Book3S HV: Update kvmppc_set_arch_compat() for ISA v3.00
KVM: Export kvm module parameter variables
KVM: PPC: Book3S HV: Use generic kvm module parameters
KVM: PPC: Book3S HV: Add check for module parameter halt_poll_ns
KVM: PPC: Decrease the powerpc default halt poll max value
KVM: PPC: Book3S HV: Comment style and print format fixups
KVM: Add halt polling documentation
Wei Yongjun (1):
KVM: PPC: Book3S HV: Use list_move_tail instead of list_del/list_add_tail
Yongji Xie (2):
KVM: PPC: Book3S HV: Clear the key field of HPTE when the page is paged out
KVM: PPC: Book3S HV: Add a per vcpu cache for recently page faulted MMIO entries
Documentation/virtual/kvm/00-INDEX | 2 +
Documentation/virtual/kvm/api.txt | 3 +
Documentation/virtual/kvm/halt-polling.txt | 127 +++++++++++++
arch/powerpc/include/asm/asm-prototypes.h | 44 +++++
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 47 ++++-
arch/powerpc/include/asm/kvm_asm.h | 1 +
arch/powerpc/include/asm/kvm_host.h | 27 ++-
arch/powerpc/include/asm/kvm_ppc.h | 7 +-
arch/powerpc/include/asm/mmu.h | 5 +
arch/powerpc/include/asm/opal.h | 3 +
arch/powerpc/include/asm/reg.h | 15 ++
arch/powerpc/include/uapi/asm/kvm.h | 5 +
arch/powerpc/kernel/asm-offsets.c | 4 +
arch/powerpc/kernel/cpu_setup_power.S | 2 +-
arch/powerpc/kvm/book3s_64_mmu_hv.c | 63 ++++--
arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +-
arch/powerpc/kvm/book3s_hv.c | 254 ++++++++++++++++++-------
arch/powerpc/kvm/book3s_hv_builtin.c | 73 +++++--
arch/powerpc/kvm/book3s_hv_ras.c | 1 +
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 224 +++++++++++++++++-----
arch/powerpc/kvm/book3s_hv_rm_xics.c | 24 ++-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 140 ++++++++++----
arch/powerpc/kvm/powerpc.c | 16 +-
arch/powerpc/kvm/trace_hv.h | 2 +-
arch/powerpc/mm/hash_native_64.c | 30 ++-
arch/powerpc/mm/hash_utils_64.c | 28 +--
arch/powerpc/mm/pgtable-radix.c | 18 +-
arch/powerpc/mm/pgtable_64.c | 34 ++++
arch/powerpc/platforms/powernv/opal-wrappers.S | 3 +
arch/powerpc/platforms/powernv/opal.c | 2 +
arch/powerpc/platforms/ps3/htab.c | 2 +-
arch/powerpc/platforms/pseries/lpar.c | 2 +-
include/linux/kvm_host.h | 4 +
include/uapi/linux/kvm.h | 5 +-
virt/kvm/kvm_main.c | 9 +-
35 files changed, 977 insertions(+), 251 deletions(-)
create mode 100644 Documentation/virtual/kvm/halt-polling.txt
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-11-28 22:53 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-11-28 22:53 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Radim Krčmář, kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
for 4.10. This includes some changes to arch/powerpc which Michael
Ellerman put into a topic branch in his powerpc tree (topic/ppc-kvm)
which I have pulled into my kvm-ppc-next branch and which Michael will
pull into his next branch.
The changes this time are:
* Support for KVM guests on POWER9 using the hashed page table MMU.
* Updates and improvements to the halt-polling support on PPC, from
Suraj Jitindar Singh.
* An optimization to speed up emulated MMIO, from Yongji Xie.
* Various other minor cleanups.
Suraj's patch set includes some changes to core KVM code which were
posted back in October and didn't attract much comment, so I put them
in. They add some documentation for halt polling and export the
module parameters used to control halt polling.
Full disclosure: after I had pushed out some of the patches for POWER9
support, I discovered that they broke compilation with some uncommon
configurations (those with HV KVM enabled but in-kernel XICS interrupt
controller emulation disabled, or with SMP disabled). Since my
kvm-ppc-next branch is a non-rebasing branch, I pushed a patch on top
to fix the breakage. So bisection is broken over a span of about 6
commits for these unusual configurations. If you want me to rebase my
kvm-ppc-next branch to avoid the breakage, let me know and I will do
that.
Thanks,
Paul.
The following changes since commit 813ae37e6aed72cc457094b6066aa38efd66c9e9:
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into kvm/next (2016-11-16 22:07:36 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to 6ccad8cea5bcb0660f56677a5fdc52265f8ddf76:
KVM: Add halt polling documentation (2016-11-28 11:48:47 +1100)
----------------------------------------------------------------
Daniel Axtens (2):
KVM: PPC: Book3S HV: Fix sparse static warning
KVM: PPC: Book3S HV: sparse: prototypes for functions called from assembler
David Gibson (2):
KVM: PPC: Move KVM_PPC_PVINFO_FLAGS_EV_IDLE definition next to its structure
KVM: PPC: Correctly report KVM_CAP_PPC_ALLOC_HTAB
Geliang Tang (1):
KVM: PPC: Book3S HV: Drop duplicate header asm/iommu.h
Michael Ellerman (1):
powerpc/reg: Add definition for LPCR_PECE_HVEE
Michael Neuling (1):
powerpc/powernv: Define and set POWER9 HFSCR doorbell bit
Paul Mackerras (18):
powerpc/64: Simplify adaptation to new ISA v3.00 HPTE format
KVM: PPC: Book3S HV: Save/restore XER in checkpointed register state
KVM: PPC: Book3S HV: Don't lose hardware R/C bit updates in H_PROTECT
powerpc/64: Add some more SPRs and SPR bits for POWER9
powerpc/64: Provide functions for accessing POWER9 partition table
powerpc/powernv: Define real-mode versions of OPAL XICS accessors
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
KVM: PPC: Book3S HV: Adapt to new HPTE format on POWER9
KVM: PPC: Book3S HV: Set partition table rather than SDR1 on POWER9
KVM: PPC: Book3S HV: Adjust host/guest context switch for POWER9
KVM: PPC: Book3S HV: Add new POWER9 guest-accessible SPRs
KVM: PPC: Book3S HV: Adapt TLB invalidations to work on POWER9
KVM: PPC: Book3S HV: Use msgsnd for IPIs to other cores on POWER9
KVM: PPC: Book3S HV: Use OPAL XICS emulation on POWER9
KVM: PPC: Book3S HV: Use stop instruction rather than nap on POWER9
KVM: PPC: Book3S HV: Enable hypervisor virtualization interrupts while in guest
KVM: PPC: Book3S HV: Treat POWER9 CPU threads as independent subcores
KVM: PPC: Book3S HV: Fix compilation with unusual configurations
Suraj Jitindar Singh (8):
powerpc/64: Define new ISA v3.00 logical PVR value and PCR register value
KVM: PPC: Book3S HV: Update kvmppc_set_arch_compat() for ISA v3.00
KVM: Export kvm module parameter variables
KVM: PPC: Book3S HV: Use generic kvm module parameters
KVM: PPC: Book3S HV: Add check for module parameter halt_poll_ns
KVM: PPC: Decrease the powerpc default halt poll max value
KVM: PPC: Book3S HV: Comment style and print format fixups
KVM: Add halt polling documentation
Wei Yongjun (1):
KVM: PPC: Book3S HV: Use list_move_tail instead of list_del/list_add_tail
Yongji Xie (2):
KVM: PPC: Book3S HV: Clear the key field of HPTE when the page is paged out
KVM: PPC: Book3S HV: Add a per vcpu cache for recently page faulted MMIO entries
Documentation/virtual/kvm/00-INDEX | 2 +
Documentation/virtual/kvm/api.txt | 3 +
Documentation/virtual/kvm/halt-polling.txt | 127 +++++++++++++
arch/powerpc/include/asm/asm-prototypes.h | 44 +++++
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 47 ++++-
arch/powerpc/include/asm/kvm_asm.h | 1 +
arch/powerpc/include/asm/kvm_host.h | 27 ++-
arch/powerpc/include/asm/kvm_ppc.h | 7 +-
arch/powerpc/include/asm/mmu.h | 5 +
arch/powerpc/include/asm/opal.h | 3 +
arch/powerpc/include/asm/reg.h | 15 ++
arch/powerpc/include/uapi/asm/kvm.h | 5 +
arch/powerpc/kernel/asm-offsets.c | 4 +
arch/powerpc/kernel/cpu_setup_power.S | 2 +-
arch/powerpc/kvm/book3s_64_mmu_hv.c | 63 ++++--
arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +-
arch/powerpc/kvm/book3s_hv.c | 254 ++++++++++++++++++-------
arch/powerpc/kvm/book3s_hv_builtin.c | 73 +++++--
arch/powerpc/kvm/book3s_hv_ras.c | 1 +
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 224 +++++++++++++++++-----
arch/powerpc/kvm/book3s_hv_rm_xics.c | 24 ++-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 140 ++++++++++----
arch/powerpc/kvm/powerpc.c | 16 +-
arch/powerpc/kvm/trace_hv.h | 2 +-
arch/powerpc/mm/hash_native_64.c | 30 ++-
arch/powerpc/mm/hash_utils_64.c | 28 +--
arch/powerpc/mm/pgtable-radix.c | 18 +-
arch/powerpc/mm/pgtable_64.c | 34 ++++
arch/powerpc/platforms/powernv/opal-wrappers.S | 3 +
arch/powerpc/platforms/powernv/opal.c | 2 +
arch/powerpc/platforms/ps3/htab.c | 2 +-
arch/powerpc/platforms/pseries/lpar.c | 2 +-
include/linux/kvm_host.h | 4 +
include/uapi/linux/kvm.h | 5 +-
virt/kvm/kvm_main.c | 9 +-
35 files changed, 977 insertions(+), 251 deletions(-)
create mode 100644 Documentation/virtual/kvm/halt-polling.txt
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-11-28 22:53 ` Paul Mackerras
@ 2016-11-30 17:25 ` Radim Krčmář
-1 siblings, 0 replies; 100+ messages in thread
From: Radim Krčmář @ 2016-11-30 17:25 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Paolo Bonzini, kvm, kvm-ppc
2016-11-29 09:53+1100, Paul Mackerras:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> for 4.10. This includes some changes to arch/powerpc which Michael
> Ellerman put into a topic branch in his powerpc tree (topic/ppc-kvm)
> which I have pulled into my kvm-ppc-next branch and which Michael will
> pull into his next branch.
>
> The changes this time are:
>
> * Support for KVM guests on POWER9 using the hashed page table MMU.
> * Updates and improvements to the halt-polling support on PPC, from
> Suraj Jitindar Singh.
> * An optimization to speed up emulated MMIO, from Yongji Xie.
> * Various other minor cleanups.
>
> Suraj's patch set includes some changes to core KVM code which were
> posted back in October and didn't attract much comment, so I put them
> in. They add some documentation for halt polling and export the
> module parameters used to control halt polling.
Yes, they look fine, just forgotten.
> Full disclosure: after I had pushed out some of the patches for POWER9
> support, I discovered that they broke compilation with some uncommon
> configurations (those with HV KVM enabled but in-kernel XICS interrupt
> controller emulation disabled, or with SMP disabled). Since my
> kvm-ppc-next branch is a non-rebasing branch, I pushed a patch on top
> to fix the breakage. So bisection is broken over a span of about 6
> commits for these unusual configurations. If you want me to rebase my
> kvm-ppc-next branch to avoid the breakage, let me know and I will do
> that.
I trust your judgement on severity of the problem.
Pulled, thanks.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-11-30 17:25 ` Radim Krčmář
0 siblings, 0 replies; 100+ messages in thread
From: Radim Krčmář @ 2016-11-30 17:25 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Paolo Bonzini, kvm, kvm-ppc
2016-11-29 09:53+1100, Paul Mackerras:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> for 4.10. This includes some changes to arch/powerpc which Michael
> Ellerman put into a topic branch in his powerpc tree (topic/ppc-kvm)
> which I have pulled into my kvm-ppc-next branch and which Michael will
> pull into his next branch.
>
> The changes this time are:
>
> * Support for KVM guests on POWER9 using the hashed page table MMU.
> * Updates and improvements to the halt-polling support on PPC, from
> Suraj Jitindar Singh.
> * An optimization to speed up emulated MMIO, from Yongji Xie.
> * Various other minor cleanups.
>
> Suraj's patch set includes some changes to core KVM code which were
> posted back in October and didn't attract much comment, so I put them
> in. They add some documentation for halt polling and export the
> module parameters used to control halt polling.
Yes, they look fine, just forgotten.
> Full disclosure: after I had pushed out some of the patches for POWER9
> support, I discovered that they broke compilation with some uncommon
> configurations (those with HV KVM enabled but in-kernel XICS interrupt
> controller emulation disabled, or with SMP disabled). Since my
> kvm-ppc-next branch is a non-rebasing branch, I pushed a patch on top
> to fix the breakage. So bisection is broken over a span of about 6
> commits for these unusual configurations. If you want me to rebase my
> kvm-ppc-next branch to avoid the breakage, let me know and I will do
> that.
I trust your judgement on severity of the problem.
Pulled, thanks.
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-12-06 9:35 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-12-06 9:35 UTC (permalink / raw)
To: Paolo Bonzini, Radim Krčmář, kvm, kvm-ppc
Hi Paolo or Radim,
Please do another pull from my kvm-ppc-next branch, to get one more
commit for 4.10. This should eliminate a merge conflict with
upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream
which conflicts with commit ebe4535fbe7a in my tree, which has already
gone into kvm/next. The conflict is just lines added in the same
place, but it would be better to have the prototypes added by
ebe4535fbe7a in KVM-related headers anyway, since they are for KVM
functions. The new commit moves the prototypes to asm/kvm_ppc.h.
This has been in linux-next for a couple of days.
Thanks,
Paul.
The following changes since commit ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f:
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (2016-11-29 14:26:55 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to e34af7849014f1d80899b811cf9021588cb8dd88:
KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h (2016-12-01 14:03:46 +1100)
----------------------------------------------------------------
Paul Mackerras (1):
KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h
arch/powerpc/include/asm/asm-prototypes.h | 44 -------------------------------
arch/powerpc/include/asm/kvm_ppc.h | 42 +++++++++++++++++++++++++++++
arch/powerpc/kvm/book3s_64_vio_hv.c | 1 -
arch/powerpc/kvm/book3s_hv_builtin.c | 1 -
arch/powerpc/kvm/book3s_hv_ras.c | 2 +-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 1 -
arch/powerpc/kvm/book3s_hv_rm_xics.c | 1 -
7 files changed, 43 insertions(+), 49 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-12-06 9:35 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2016-12-06 9:35 UTC (permalink / raw)
To: Paolo Bonzini, Radim Krčmář, kvm, kvm-ppc
Hi Paolo or Radim,
Please do another pull from my kvm-ppc-next branch, to get one more
commit for 4.10. This should eliminate a merge conflict with
upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream
which conflicts with commit ebe4535fbe7a in my tree, which has already
gone into kvm/next. The conflict is just lines added in the same
place, but it would be better to have the prototypes added by
ebe4535fbe7a in KVM-related headers anyway, since they are for KVM
functions. The new commit moves the prototypes to asm/kvm_ppc.h.
This has been in linux-next for a couple of days.
Thanks,
Paul.
The following changes since commit ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f:
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (2016-11-29 14:26:55 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git kvm-ppc-next
for you to fetch changes up to e34af7849014f1d80899b811cf9021588cb8dd88:
KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h (2016-12-01 14:03:46 +1100)
----------------------------------------------------------------
Paul Mackerras (1):
KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h
arch/powerpc/include/asm/asm-prototypes.h | 44 -------------------------------
arch/powerpc/include/asm/kvm_ppc.h | 42 +++++++++++++++++++++++++++++
arch/powerpc/kvm/book3s_64_vio_hv.c | 1 -
arch/powerpc/kvm/book3s_hv_builtin.c | 1 -
arch/powerpc/kvm/book3s_hv_ras.c | 2 +-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 1 -
arch/powerpc/kvm/book3s_hv_rm_xics.c | 1 -
7 files changed, 43 insertions(+), 49 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2016-12-06 9:35 ` Paul Mackerras
@ 2016-12-06 13:50 ` Radim Krčmář
-1 siblings, 0 replies; 100+ messages in thread
From: Radim Krčmář @ 2016-12-06 13:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Paolo Bonzini, kvm, kvm-ppc
2016-12-06 20:35+1100, Paul Mackerras:
> Hi Paolo or Radim,
>
> Please do another pull from my kvm-ppc-next branch, to get one more
> commit for 4.10. This should eliminate a merge conflict with
> upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream
> which conflicts with commit ebe4535fbe7a in my tree, which has already
> gone into kvm/next. The conflict is just lines added in the same
> place, but it would be better to have the prototypes added by
> ebe4535fbe7a in KVM-related headers anyway, since they are for KVM
> functions. The new commit moves the prototypes to asm/kvm_ppc.h.
> This has been in linux-next for a couple of days.
Pulled, thanks.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2016-12-06 13:50 ` Radim Krčmář
0 siblings, 0 replies; 100+ messages in thread
From: Radim Krčmář @ 2016-12-06 13:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Paolo Bonzini, kvm, kvm-ppc
2016-12-06 20:35+1100, Paul Mackerras:
> Hi Paolo or Radim,
>
> Please do another pull from my kvm-ppc-next branch, to get one more
> commit for 4.10. This should eliminate a merge conflict with
> upstream. Since 4.9-rc5, a commit (9e5f68842276) has gone upstream
> which conflicts with commit ebe4535fbe7a in my tree, which has already
> gone into kvm/next. The conflict is just lines added in the same
> place, but it would be better to have the prototypes added by
> ebe4535fbe7a in KVM-related headers anyway, since they are for KVM
> functions. The new commit moves the prototypes to asm/kvm_ppc.h.
> This has been in linux-next for a couple of days.
Pulled, thanks.
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-02-01 9:24 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-02-01 9:24 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Radim Krčmář, kvm-ppc
Paolo (or Radim),
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
for 4.11.
The big feature this time is support for POWER9 using the radix-tree
MMU for host and guest. This required some changes to arch/powerpc
code, so I talked with Michael Ellerman and he created a topic branch
with this patchset, which I merged into kvm-ppc-next and which Michael
will pull into his tree. Michael also put in some patches from Nick
Piggin which fix bugs in the interrupt vector code in relocatable
kernels when coming from a KVM guest.
Other notable changes include:
* Add the ability to change the size of the hashed page table,
from David Gibson.
* XICS (interrupt controller) emulation fixes and improvements,
from Li Zhong.
* Bug fixes from myself and Thomas Huth.
These patches define some new KVM capabilities and ioctls, but there
should be no conflicts with anything else currently upstream, as far
as I am aware.
Thanks,
Paul.
The following changes since commit a17f32270af1e1054bbc8858b0f27226a2c859ba:
kvm: x86: Expose Intel VPOPCNTDQ feature to guest (2017-01-17 17:55:18 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 050f23390f6bdbfa7dd2800884d32490489851b7:
KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV (2017-01-31 22:00:07 +1100)
----------------------------------------------------------------
David Gibson (11):
Documentation: Correct duplicate section number in kvm/api.txt
KVM: PPC: Book3S HV: HPT resizing documentation and reserved numbers
KVM: PPC: Book3S HV: Rename kvm_alloc_hpt() for clarity
KVM: PPC: Book3S HV: Gather HPT related variables into sub-structure
KVM: PPC: Book3S HV: Don't store values derivable from HPT order
KVM: PPC: Book3S HV: Split HPT allocation from activation
KVM: PPC: Book3S HV: Allow KVM_PPC_ALLOCATE_HTAB ioctl() to change HPT size
KVM: PPC: Book3S HV: Create kvmppc_unmap_hpte_helper()
KVM: PPC: Book3S HV: Outline of KVM-HV HPT resizing implementation
KVM: PPC: Book3S HV: KVM-HV HPT resizing implementation
KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV
Li Zhong (5):
KVM: PPC: Book 3S: XICS cleanup: remove XICS_RM_REJECT
KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
KVM: PPC: Book 3S: XICS: Fix potential issue with duplicate IRQ resends
KVM: PPC: Book 3S: XICS: Implement ICS P/Q states
KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend
Nicholas Piggin (3):
KVM: PPC: Book3S: Change interrupt call to reduce scratch space use on HV
KVM: PPC: Book3S: Move 64-bit KVM interrupt handler out from alt section
KVM: PPC: Book3S: 64-bit CONFIG_RELOCATABLE support for interrupts
Paul Mackerras (23):
KVM: PPC: Book3S HV: Don't try to signal cpu -1
KVM: PPC: Book3S HV: Fix H_PROD to actually wake the target vcpu
powerpc/64: Don't try to use radix MMU under a hypervisor
powerpc/pseries: Fixes for the "ibm,architecture-vec-5" options
powerpc/64: Enable use of radix MMU under hypervisor on POWER9
powerpc/64: More definitions for POWER9
powerpc/64: Export pgtable_cache and pgtable_cache_add for KVM
powerpc/64: Make type of partition table flush depend on partition type
powerpc/64: Allow for relocation-on interrupts from guest to host
KVM: PPC: Book3S HV: Add userspace interfaces for POWER9 MMU
KVM: PPC: Book3S HV: Set process table for HPT guests on POWER9
KVM: PPC: Book3S HV: Use ASDR for HPT guests on POWER9
KVM: PPC: Book3S HV: Add basic infrastructure for radix guests
KVM: PPC: Book3S HV: Modify guest entry/exit paths to handle radix guests
KVM: PPC: Book3S HV: Page table construction and page faults for radix guests
KVM: PPC: Book3S HV: MMU notifier callbacks for radix guests
KVM: PPC: Book3S HV: Implement dirty page logging for radix guests
KVM: PPC: Book3S HV: Make HPT-specific hypercalls return error in radix mode
KVM: PPC: Book3S HV: Invalidate TLB on radix guest vcpu movement
KVM: PPC: Book3S HV: Allow guest exit path to have MMU on
KVM: PPC: Book3S HV: Invalidate ERAT on guest entry/exit for POWER9 DD1
KVM: PPC: Book3S HV: Enable radix guest support
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
Thomas Huth (1):
KVM: PPC: Book3S PR: Refactor program interrupt related code into separate function
Documentation/virtual/kvm/api.txt | 194 +++++++-
arch/powerpc/include/asm/book3s/64/mmu.h | 18 +-
arch/powerpc/include/asm/exception-64s.h | 75 ++-
arch/powerpc/include/asm/head-64.h | 2 +-
arch/powerpc/include/asm/hvcall.h | 11 +
arch/powerpc/include/asm/kvm_book3s.h | 26 +-
arch/powerpc/include/asm/kvm_book3s_64.h | 22 +
arch/powerpc/include/asm/kvm_host.h | 27 +-
arch/powerpc/include/asm/kvm_ppc.h | 17 +-
arch/powerpc/include/asm/prom.h | 17 +-
arch/powerpc/include/asm/reg.h | 4 +
arch/powerpc/include/uapi/asm/kvm.h | 22 +
arch/powerpc/kernel/asm-offsets.c | 2 +
arch/powerpc/kernel/exceptions-64s.S | 61 +--
arch/powerpc/kernel/prom_init.c | 18 +-
arch/powerpc/kvm/Makefile | 3 +-
arch/powerpc/kvm/book3s.c | 1 +
arch/powerpc/kvm/book3s_64_mmu_hv.c | 734 +++++++++++++++++++++++-------
arch/powerpc/kvm/book3s_64_mmu_radix.c | 716 +++++++++++++++++++++++++++++
arch/powerpc/kvm/book3s_hv.c | 268 +++++++++--
arch/powerpc/kvm/book3s_hv_builtin.c | 46 +-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 87 ++--
arch/powerpc/kvm/book3s_hv_rm_xics.c | 146 +++---
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 154 +++++--
arch/powerpc/kvm/book3s_pr.c | 130 +++---
arch/powerpc/kvm/book3s_segment.S | 32 +-
arch/powerpc/kvm/book3s_xics.c | 192 ++++----
arch/powerpc/kvm/book3s_xics.h | 7 +-
arch/powerpc/kvm/powerpc.c | 35 ++
arch/powerpc/mm/init-common.c | 3 +-
arch/powerpc/mm/init_64.c | 35 ++
arch/powerpc/mm/pgtable-radix.c | 2 +
arch/powerpc/mm/pgtable_64.c | 16 +-
arch/powerpc/platforms/pseries/firmware.c | 2 +-
arch/powerpc/platforms/pseries/lpar.c | 29 ++
include/uapi/linux/kvm.h | 17 +
36 files changed, 2608 insertions(+), 563 deletions(-)
create mode 100644 arch/powerpc/kvm/book3s_64_mmu_radix.c
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-02-01 9:24 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-02-01 9:24 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: Radim Krčmář, kvm-ppc
Paolo (or Radim),
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
for 4.11.
The big feature this time is support for POWER9 using the radix-tree
MMU for host and guest. This required some changes to arch/powerpc
code, so I talked with Michael Ellerman and he created a topic branch
with this patchset, which I merged into kvm-ppc-next and which Michael
will pull into his tree. Michael also put in some patches from Nick
Piggin which fix bugs in the interrupt vector code in relocatable
kernels when coming from a KVM guest.
Other notable changes include:
* Add the ability to change the size of the hashed page table,
from David Gibson.
* XICS (interrupt controller) emulation fixes and improvements,
from Li Zhong.
* Bug fixes from myself and Thomas Huth.
These patches define some new KVM capabilities and ioctls, but there
should be no conflicts with anything else currently upstream, as far
as I am aware.
Thanks,
Paul.
The following changes since commit a17f32270af1e1054bbc8858b0f27226a2c859ba:
kvm: x86: Expose Intel VPOPCNTDQ feature to guest (2017-01-17 17:55:18 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 050f23390f6bdbfa7dd2800884d32490489851b7:
KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV (2017-01-31 22:00:07 +1100)
----------------------------------------------------------------
David Gibson (11):
Documentation: Correct duplicate section number in kvm/api.txt
KVM: PPC: Book3S HV: HPT resizing documentation and reserved numbers
KVM: PPC: Book3S HV: Rename kvm_alloc_hpt() for clarity
KVM: PPC: Book3S HV: Gather HPT related variables into sub-structure
KVM: PPC: Book3S HV: Don't store values derivable from HPT order
KVM: PPC: Book3S HV: Split HPT allocation from activation
KVM: PPC: Book3S HV: Allow KVM_PPC_ALLOCATE_HTAB ioctl() to change HPT size
KVM: PPC: Book3S HV: Create kvmppc_unmap_hpte_helper()
KVM: PPC: Book3S HV: Outline of KVM-HV HPT resizing implementation
KVM: PPC: Book3S HV: KVM-HV HPT resizing implementation
KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV
Li Zhong (5):
KVM: PPC: Book 3S: XICS cleanup: remove XICS_RM_REJECT
KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
KVM: PPC: Book 3S: XICS: Fix potential issue with duplicate IRQ resends
KVM: PPC: Book 3S: XICS: Implement ICS P/Q states
KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend
Nicholas Piggin (3):
KVM: PPC: Book3S: Change interrupt call to reduce scratch space use on HV
KVM: PPC: Book3S: Move 64-bit KVM interrupt handler out from alt section
KVM: PPC: Book3S: 64-bit CONFIG_RELOCATABLE support for interrupts
Paul Mackerras (23):
KVM: PPC: Book3S HV: Don't try to signal cpu -1
KVM: PPC: Book3S HV: Fix H_PROD to actually wake the target vcpu
powerpc/64: Don't try to use radix MMU under a hypervisor
powerpc/pseries: Fixes for the "ibm,architecture-vec-5" options
powerpc/64: Enable use of radix MMU under hypervisor on POWER9
powerpc/64: More definitions for POWER9
powerpc/64: Export pgtable_cache and pgtable_cache_add for KVM
powerpc/64: Make type of partition table flush depend on partition type
powerpc/64: Allow for relocation-on interrupts from guest to host
KVM: PPC: Book3S HV: Add userspace interfaces for POWER9 MMU
KVM: PPC: Book3S HV: Set process table for HPT guests on POWER9
KVM: PPC: Book3S HV: Use ASDR for HPT guests on POWER9
KVM: PPC: Book3S HV: Add basic infrastructure for radix guests
KVM: PPC: Book3S HV: Modify guest entry/exit paths to handle radix guests
KVM: PPC: Book3S HV: Page table construction and page faults for radix guests
KVM: PPC: Book3S HV: MMU notifier callbacks for radix guests
KVM: PPC: Book3S HV: Implement dirty page logging for radix guests
KVM: PPC: Book3S HV: Make HPT-specific hypercalls return error in radix mode
KVM: PPC: Book3S HV: Invalidate TLB on radix guest vcpu movement
KVM: PPC: Book3S HV: Allow guest exit path to have MMU on
KVM: PPC: Book3S HV: Invalidate ERAT on guest entry/exit for POWER9 DD1
KVM: PPC: Book3S HV: Enable radix guest support
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
Thomas Huth (1):
KVM: PPC: Book3S PR: Refactor program interrupt related code into separate function
Documentation/virtual/kvm/api.txt | 194 +++++++-
arch/powerpc/include/asm/book3s/64/mmu.h | 18 +-
arch/powerpc/include/asm/exception-64s.h | 75 ++-
arch/powerpc/include/asm/head-64.h | 2 +-
arch/powerpc/include/asm/hvcall.h | 11 +
arch/powerpc/include/asm/kvm_book3s.h | 26 +-
arch/powerpc/include/asm/kvm_book3s_64.h | 22 +
arch/powerpc/include/asm/kvm_host.h | 27 +-
arch/powerpc/include/asm/kvm_ppc.h | 17 +-
arch/powerpc/include/asm/prom.h | 17 +-
arch/powerpc/include/asm/reg.h | 4 +
arch/powerpc/include/uapi/asm/kvm.h | 22 +
arch/powerpc/kernel/asm-offsets.c | 2 +
arch/powerpc/kernel/exceptions-64s.S | 61 +--
arch/powerpc/kernel/prom_init.c | 18 +-
arch/powerpc/kvm/Makefile | 3 +-
arch/powerpc/kvm/book3s.c | 1 +
arch/powerpc/kvm/book3s_64_mmu_hv.c | 734 +++++++++++++++++++++++-------
arch/powerpc/kvm/book3s_64_mmu_radix.c | 716 +++++++++++++++++++++++++++++
arch/powerpc/kvm/book3s_hv.c | 268 +++++++++--
arch/powerpc/kvm/book3s_hv_builtin.c | 46 +-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 87 ++--
arch/powerpc/kvm/book3s_hv_rm_xics.c | 146 +++---
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 154 +++++--
arch/powerpc/kvm/book3s_pr.c | 130 +++---
arch/powerpc/kvm/book3s_segment.S | 32 +-
arch/powerpc/kvm/book3s_xics.c | 192 ++++----
arch/powerpc/kvm/book3s_xics.h | 7 +-
arch/powerpc/kvm/powerpc.c | 35 ++
arch/powerpc/mm/init-common.c | 3 +-
arch/powerpc/mm/init_64.c | 35 ++
arch/powerpc/mm/pgtable-radix.c | 2 +
arch/powerpc/mm/pgtable_64.c | 16 +-
arch/powerpc/platforms/pseries/firmware.c | 2 +-
arch/powerpc/platforms/pseries/lpar.c | 29 ++
include/uapi/linux/kvm.h | 17 +
36 files changed, 2608 insertions(+), 563 deletions(-)
create mode 100644 arch/powerpc/kvm/book3s_64_mmu_radix.c
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2017-02-01 9:24 ` Paul Mackerras
@ 2017-02-07 17:17 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-02-07 17:17 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Radim Krčmář, kvm-ppc
On 01/02/2017 10:24, Paul Mackerras wrote:
> Paolo (or Radim),
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> for 4.11.
>
> The big feature this time is support for POWER9 using the radix-tree
> MMU for host and guest. This required some changes to arch/powerpc
> code, so I talked with Michael Ellerman and he created a topic branch
> with this patchset, which I merged into kvm-ppc-next and which Michael
> will pull into his tree. Michael also put in some patches from Nick
> Piggin which fix bugs in the interrupt vector code in relocatable
> kernels when coming from a KVM guest.
>
> Other notable changes include:
>
> * Add the ability to change the size of the hashed page table,
> from David Gibson.
>
> * XICS (interrupt controller) emulation fixes and improvements,
> from Li Zhong.
>
> * Bug fixes from myself and Thomas Huth.
>
> These patches define some new KVM capabilities and ioctls, but there
> should be no conflicts with anything else currently upstream, as far
> as I am aware.
>
> Thanks,
> Paul.
>
> The following changes since commit a17f32270af1e1054bbc8858b0f27226a2c859ba:
>
> kvm: x86: Expose Intel VPOPCNTDQ feature to guest (2017-01-17 17:55:18 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
>
> for you to fetch changes up to 050f23390f6bdbfa7dd2800884d32490489851b7:
>
> KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV (2017-01-31 22:00:07 +1100)
>
> ----------------------------------------------------------------
> David Gibson (11):
> Documentation: Correct duplicate section number in kvm/api.txt
> KVM: PPC: Book3S HV: HPT resizing documentation and reserved numbers
> KVM: PPC: Book3S HV: Rename kvm_alloc_hpt() for clarity
> KVM: PPC: Book3S HV: Gather HPT related variables into sub-structure
> KVM: PPC: Book3S HV: Don't store values derivable from HPT order
> KVM: PPC: Book3S HV: Split HPT allocation from activation
> KVM: PPC: Book3S HV: Allow KVM_PPC_ALLOCATE_HTAB ioctl() to change HPT size
> KVM: PPC: Book3S HV: Create kvmppc_unmap_hpte_helper()
> KVM: PPC: Book3S HV: Outline of KVM-HV HPT resizing implementation
> KVM: PPC: Book3S HV: KVM-HV HPT resizing implementation
> KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV
>
> Li Zhong (5):
> KVM: PPC: Book 3S: XICS cleanup: remove XICS_RM_REJECT
> KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
> KVM: PPC: Book 3S: XICS: Fix potential issue with duplicate IRQ resends
> KVM: PPC: Book 3S: XICS: Implement ICS P/Q states
> KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend
>
> Nicholas Piggin (3):
> KVM: PPC: Book3S: Change interrupt call to reduce scratch space use on HV
> KVM: PPC: Book3S: Move 64-bit KVM interrupt handler out from alt section
> KVM: PPC: Book3S: 64-bit CONFIG_RELOCATABLE support for interrupts
>
> Paul Mackerras (23):
> KVM: PPC: Book3S HV: Don't try to signal cpu -1
> KVM: PPC: Book3S HV: Fix H_PROD to actually wake the target vcpu
> powerpc/64: Don't try to use radix MMU under a hypervisor
> powerpc/pseries: Fixes for the "ibm,architecture-vec-5" options
> powerpc/64: Enable use of radix MMU under hypervisor on POWER9
> powerpc/64: More definitions for POWER9
> powerpc/64: Export pgtable_cache and pgtable_cache_add for KVM
> powerpc/64: Make type of partition table flush depend on partition type
> powerpc/64: Allow for relocation-on interrupts from guest to host
> KVM: PPC: Book3S HV: Add userspace interfaces for POWER9 MMU
> KVM: PPC: Book3S HV: Set process table for HPT guests on POWER9
> KVM: PPC: Book3S HV: Use ASDR for HPT guests on POWER9
> KVM: PPC: Book3S HV: Add basic infrastructure for radix guests
> KVM: PPC: Book3S HV: Modify guest entry/exit paths to handle radix guests
> KVM: PPC: Book3S HV: Page table construction and page faults for radix guests
> KVM: PPC: Book3S HV: MMU notifier callbacks for radix guests
> KVM: PPC: Book3S HV: Implement dirty page logging for radix guests
> KVM: PPC: Book3S HV: Make HPT-specific hypercalls return error in radix mode
> KVM: PPC: Book3S HV: Invalidate TLB on radix guest vcpu movement
> KVM: PPC: Book3S HV: Allow guest exit path to have MMU on
> KVM: PPC: Book3S HV: Invalidate ERAT on guest entry/exit for POWER9 DD1
> KVM: PPC: Book3S HV: Enable radix guest support
> Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
>
> Thomas Huth (1):
> KVM: PPC: Book3S PR: Refactor program interrupt related code into separate function
>
> Documentation/virtual/kvm/api.txt | 194 +++++++-
> arch/powerpc/include/asm/book3s/64/mmu.h | 18 +-
> arch/powerpc/include/asm/exception-64s.h | 75 ++-
> arch/powerpc/include/asm/head-64.h | 2 +-
> arch/powerpc/include/asm/hvcall.h | 11 +
> arch/powerpc/include/asm/kvm_book3s.h | 26 +-
> arch/powerpc/include/asm/kvm_book3s_64.h | 22 +
> arch/powerpc/include/asm/kvm_host.h | 27 +-
> arch/powerpc/include/asm/kvm_ppc.h | 17 +-
> arch/powerpc/include/asm/prom.h | 17 +-
> arch/powerpc/include/asm/reg.h | 4 +
> arch/powerpc/include/uapi/asm/kvm.h | 22 +
> arch/powerpc/kernel/asm-offsets.c | 2 +
> arch/powerpc/kernel/exceptions-64s.S | 61 +--
> arch/powerpc/kernel/prom_init.c | 18 +-
> arch/powerpc/kvm/Makefile | 3 +-
> arch/powerpc/kvm/book3s.c | 1 +
> arch/powerpc/kvm/book3s_64_mmu_hv.c | 734 +++++++++++++++++++++++-------
> arch/powerpc/kvm/book3s_64_mmu_radix.c | 716 +++++++++++++++++++++++++++++
> arch/powerpc/kvm/book3s_hv.c | 268 +++++++++--
> arch/powerpc/kvm/book3s_hv_builtin.c | 46 +-
> arch/powerpc/kvm/book3s_hv_rm_mmu.c | 87 ++--
> arch/powerpc/kvm/book3s_hv_rm_xics.c | 146 +++---
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 154 +++++--
> arch/powerpc/kvm/book3s_pr.c | 130 +++---
> arch/powerpc/kvm/book3s_segment.S | 32 +-
> arch/powerpc/kvm/book3s_xics.c | 192 ++++----
> arch/powerpc/kvm/book3s_xics.h | 7 +-
> arch/powerpc/kvm/powerpc.c | 35 ++
> arch/powerpc/mm/init-common.c | 3 +-
> arch/powerpc/mm/init_64.c | 35 ++
> arch/powerpc/mm/pgtable-radix.c | 2 +
> arch/powerpc/mm/pgtable_64.c | 16 +-
> arch/powerpc/platforms/pseries/firmware.c | 2 +-
> arch/powerpc/platforms/pseries/lpar.c | 29 ++
> include/uapi/linux/kvm.h | 17 +
> 36 files changed, 2608 insertions(+), 563 deletions(-)
> create mode 100644 arch/powerpc/kvm/book3s_64_mmu_radix.c
>
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-02-07 17:17 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-02-07 17:17 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: Radim Krčmář, kvm-ppc
On 01/02/2017 10:24, Paul Mackerras wrote:
> Paolo (or Radim),
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> for 4.11.
>
> The big feature this time is support for POWER9 using the radix-tree
> MMU for host and guest. This required some changes to arch/powerpc
> code, so I talked with Michael Ellerman and he created a topic branch
> with this patchset, which I merged into kvm-ppc-next and which Michael
> will pull into his tree. Michael also put in some patches from Nick
> Piggin which fix bugs in the interrupt vector code in relocatable
> kernels when coming from a KVM guest.
>
> Other notable changes include:
>
> * Add the ability to change the size of the hashed page table,
> from David Gibson.
>
> * XICS (interrupt controller) emulation fixes and improvements,
> from Li Zhong.
>
> * Bug fixes from myself and Thomas Huth.
>
> These patches define some new KVM capabilities and ioctls, but there
> should be no conflicts with anything else currently upstream, as far
> as I am aware.
>
> Thanks,
> Paul.
>
> The following changes since commit a17f32270af1e1054bbc8858b0f27226a2c859ba:
>
> kvm: x86: Expose Intel VPOPCNTDQ feature to guest (2017-01-17 17:55:18 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
>
> for you to fetch changes up to 050f23390f6bdbfa7dd2800884d32490489851b7:
>
> KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV (2017-01-31 22:00:07 +1100)
>
> ----------------------------------------------------------------
> David Gibson (11):
> Documentation: Correct duplicate section number in kvm/api.txt
> KVM: PPC: Book3S HV: HPT resizing documentation and reserved numbers
> KVM: PPC: Book3S HV: Rename kvm_alloc_hpt() for clarity
> KVM: PPC: Book3S HV: Gather HPT related variables into sub-structure
> KVM: PPC: Book3S HV: Don't store values derivable from HPT order
> KVM: PPC: Book3S HV: Split HPT allocation from activation
> KVM: PPC: Book3S HV: Allow KVM_PPC_ALLOCATE_HTAB ioctl() to change HPT size
> KVM: PPC: Book3S HV: Create kvmppc_unmap_hpte_helper()
> KVM: PPC: Book3S HV: Outline of KVM-HV HPT resizing implementation
> KVM: PPC: Book3S HV: KVM-HV HPT resizing implementation
> KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV
>
> Li Zhong (5):
> KVM: PPC: Book 3S: XICS cleanup: remove XICS_RM_REJECT
> KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
> KVM: PPC: Book 3S: XICS: Fix potential issue with duplicate IRQ resends
> KVM: PPC: Book 3S: XICS: Implement ICS P/Q states
> KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend
>
> Nicholas Piggin (3):
> KVM: PPC: Book3S: Change interrupt call to reduce scratch space use on HV
> KVM: PPC: Book3S: Move 64-bit KVM interrupt handler out from alt section
> KVM: PPC: Book3S: 64-bit CONFIG_RELOCATABLE support for interrupts
>
> Paul Mackerras (23):
> KVM: PPC: Book3S HV: Don't try to signal cpu -1
> KVM: PPC: Book3S HV: Fix H_PROD to actually wake the target vcpu
> powerpc/64: Don't try to use radix MMU under a hypervisor
> powerpc/pseries: Fixes for the "ibm,architecture-vec-5" options
> powerpc/64: Enable use of radix MMU under hypervisor on POWER9
> powerpc/64: More definitions for POWER9
> powerpc/64: Export pgtable_cache and pgtable_cache_add for KVM
> powerpc/64: Make type of partition table flush depend on partition type
> powerpc/64: Allow for relocation-on interrupts from guest to host
> KVM: PPC: Book3S HV: Add userspace interfaces for POWER9 MMU
> KVM: PPC: Book3S HV: Set process table for HPT guests on POWER9
> KVM: PPC: Book3S HV: Use ASDR for HPT guests on POWER9
> KVM: PPC: Book3S HV: Add basic infrastructure for radix guests
> KVM: PPC: Book3S HV: Modify guest entry/exit paths to handle radix guests
> KVM: PPC: Book3S HV: Page table construction and page faults for radix guests
> KVM: PPC: Book3S HV: MMU notifier callbacks for radix guests
> KVM: PPC: Book3S HV: Implement dirty page logging for radix guests
> KVM: PPC: Book3S HV: Make HPT-specific hypercalls return error in radix mode
> KVM: PPC: Book3S HV: Invalidate TLB on radix guest vcpu movement
> KVM: PPC: Book3S HV: Allow guest exit path to have MMU on
> KVM: PPC: Book3S HV: Invalidate ERAT on guest entry/exit for POWER9 DD1
> KVM: PPC: Book3S HV: Enable radix guest support
> Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
>
> Thomas Huth (1):
> KVM: PPC: Book3S PR: Refactor program interrupt related code into separate function
>
> Documentation/virtual/kvm/api.txt | 194 +++++++-
> arch/powerpc/include/asm/book3s/64/mmu.h | 18 +-
> arch/powerpc/include/asm/exception-64s.h | 75 ++-
> arch/powerpc/include/asm/head-64.h | 2 +-
> arch/powerpc/include/asm/hvcall.h | 11 +
> arch/powerpc/include/asm/kvm_book3s.h | 26 +-
> arch/powerpc/include/asm/kvm_book3s_64.h | 22 +
> arch/powerpc/include/asm/kvm_host.h | 27 +-
> arch/powerpc/include/asm/kvm_ppc.h | 17 +-
> arch/powerpc/include/asm/prom.h | 17 +-
> arch/powerpc/include/asm/reg.h | 4 +
> arch/powerpc/include/uapi/asm/kvm.h | 22 +
> arch/powerpc/kernel/asm-offsets.c | 2 +
> arch/powerpc/kernel/exceptions-64s.S | 61 +--
> arch/powerpc/kernel/prom_init.c | 18 +-
> arch/powerpc/kvm/Makefile | 3 +-
> arch/powerpc/kvm/book3s.c | 1 +
> arch/powerpc/kvm/book3s_64_mmu_hv.c | 734 +++++++++++++++++++++++-------
> arch/powerpc/kvm/book3s_64_mmu_radix.c | 716 +++++++++++++++++++++++++++++
> arch/powerpc/kvm/book3s_hv.c | 268 +++++++++--
> arch/powerpc/kvm/book3s_hv_builtin.c | 46 +-
> arch/powerpc/kvm/book3s_hv_rm_mmu.c | 87 ++--
> arch/powerpc/kvm/book3s_hv_rm_xics.c | 146 +++---
> arch/powerpc/kvm/book3s_hv_rmhandlers.S | 154 +++++--
> arch/powerpc/kvm/book3s_pr.c | 130 +++---
> arch/powerpc/kvm/book3s_segment.S | 32 +-
> arch/powerpc/kvm/book3s_xics.c | 192 ++++----
> arch/powerpc/kvm/book3s_xics.h | 7 +-
> arch/powerpc/kvm/powerpc.c | 35 ++
> arch/powerpc/mm/init-common.c | 3 +-
> arch/powerpc/mm/init_64.c | 35 ++
> arch/powerpc/mm/pgtable-radix.c | 2 +
> arch/powerpc/mm/pgtable_64.c | 16 +-
> arch/powerpc/platforms/pseries/firmware.c | 2 +-
> arch/powerpc/platforms/pseries/lpar.c | 29 ++
> include/uapi/linux/kvm.h | 17 +
> 36 files changed, 2608 insertions(+), 563 deletions(-)
> create mode 100644 arch/powerpc/kvm/book3s_64_mmu_radix.c
>
Pulled, thanks.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-19 11:01 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-19 11:01 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
to go into 4.12. The highlights are:
* In-kernel acceleration for IOMMU update hypercalls, from Alexey
Kardashevskiy.
* Extend the set of load/store instructions which can be used to
access emulated MMIO locations to include floating-point and
vector-scalar instructions, from Bin Lu and myself.
* Some fixes to allow PCI pass-through to work in nested guests using
PR KVM, from Alexey Kardashevskiy.
There will be a conflict in include/uapi/linux/kvm.h when you do the
merge, which can easily be fixed by assigning the next available
number for KVM_CAP_SPAPR_TCE_VFIO.
Note that some of the commits here came from Michael Ellerman's
topic/ppc-kvm branch and will also go upstream via his tree.
Thanks,
Paul.
The following changes since commit e55fe3ccccc1efb8f20c99728c8863424ae9ee4a:
tools/kvm_stat: add '%Total' column (2017-03-29 12:01:33 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 538eaa212a8cbc1775a64aa7a45943cb28ef0689:
KVM: PPC: Book3S PR: Fix build when PR KVM is built in (2017-04-12 09:17:06 +1000)
----------------------------------------------------------------
Alexey Kardashevskiy (14):
powerpc/mmu: Add real mode support for IOMMU preregistered memory
powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
powerpc/vfio_spapr_tce: Add reference counting to iommu_table
KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
KVM: PPC: Book3S PR: Get rid of unused local variable
KVM: PPC: Book3S PR: Exit KVM on failed mapping
KVM: PPC: Book3S PR: Preserve storage control bits
KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
KVM: PPC: Pass kvm* to kvmppc_find_table()
KVM: PPC: Use preregistered memory API to access TCE list
KVM: PPC: iommu: Unify TCE checking
KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
Bin Lu (1):
KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
Markus Elfring (2):
KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
Paul Mackerras (5):
KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
KVM: PPC: Emulation for more integer loads and stores
KVM: PPC: Add MMIO emulation for remaining floating-point instructions
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
KVM: PPC: Book3S PR: Fix build when PR KVM is built in
Thomas Huth (1):
KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
Documentation/virtual/kvm/devices/vfio.txt | 18 +-
arch/powerpc/include/asm/disassemble.h | 5 +
arch/powerpc/include/asm/iommu.h | 32 +-
arch/powerpc/include/asm/kvm_host.h | 32 ++
arch/powerpc/include/asm/kvm_ppc.h | 22 +-
arch/powerpc/include/asm/mmu_context.h | 4 +
arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
arch/powerpc/kernel/iommu.c | 91 ++++--
arch/powerpc/kvm/Kconfig | 1 +
arch/powerpc/kvm/Makefile | 1 -
arch/powerpc/kvm/book3s.c | 18 ++
arch/powerpc/kvm/book3s_64_mmu.c | 1 +
arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
arch/powerpc/kvm/book3s_64_vio.c | 313 ++++++++++++++++++-
arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
arch/powerpc/kvm/book3s_emulate.c | 34 ++-
arch/powerpc/kvm/book3s_hv.c | 8 +-
arch/powerpc/kvm/book3s_pr.c | 12 +-
arch/powerpc/kvm/booke.c | 5 +
arch/powerpc/kvm/e500_mmu_host.c | 5 +-
arch/powerpc/kvm/emulate.c | 8 +
arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
arch/powerpc/mm/mmu_context_iommu.c | 39 +++
arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
arch/powerpc/platforms/powernv/pci.c | 1 +
arch/powerpc/platforms/pseries/iommu.c | 3 +-
arch/powerpc/platforms/pseries/vio.c | 2 +-
drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
include/uapi/linux/kvm.h | 7 +
virt/kvm/vfio.c | 105 +++++++
31 files changed, 1798 insertions(+), 177 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-19 11:01 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-19 11:01 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
to go into 4.12. The highlights are:
* In-kernel acceleration for IOMMU update hypercalls, from Alexey
Kardashevskiy.
* Extend the set of load/store instructions which can be used to
access emulated MMIO locations to include floating-point and
vector-scalar instructions, from Bin Lu and myself.
* Some fixes to allow PCI pass-through to work in nested guests using
PR KVM, from Alexey Kardashevskiy.
There will be a conflict in include/uapi/linux/kvm.h when you do the
merge, which can easily be fixed by assigning the next available
number for KVM_CAP_SPAPR_TCE_VFIO.
Note that some of the commits here came from Michael Ellerman's
topic/ppc-kvm branch and will also go upstream via his tree.
Thanks,
Paul.
The following changes since commit e55fe3ccccc1efb8f20c99728c8863424ae9ee4a:
tools/kvm_stat: add '%Total' column (2017-03-29 12:01:33 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 538eaa212a8cbc1775a64aa7a45943cb28ef0689:
KVM: PPC: Book3S PR: Fix build when PR KVM is built in (2017-04-12 09:17:06 +1000)
----------------------------------------------------------------
Alexey Kardashevskiy (14):
powerpc/mmu: Add real mode support for IOMMU preregistered memory
powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
powerpc/vfio_spapr_tce: Add reference counting to iommu_table
KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
KVM: PPC: Book3S PR: Get rid of unused local variable
KVM: PPC: Book3S PR: Exit KVM on failed mapping
KVM: PPC: Book3S PR: Preserve storage control bits
KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
KVM: PPC: Pass kvm* to kvmppc_find_table()
KVM: PPC: Use preregistered memory API to access TCE list
KVM: PPC: iommu: Unify TCE checking
KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
Bin Lu (1):
KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
Markus Elfring (2):
KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
Paul Mackerras (5):
KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
KVM: PPC: Emulation for more integer loads and stores
KVM: PPC: Add MMIO emulation for remaining floating-point instructions
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
KVM: PPC: Book3S PR: Fix build when PR KVM is built in
Thomas Huth (1):
KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
Documentation/virtual/kvm/devices/vfio.txt | 18 +-
arch/powerpc/include/asm/disassemble.h | 5 +
arch/powerpc/include/asm/iommu.h | 32 +-
arch/powerpc/include/asm/kvm_host.h | 32 ++
arch/powerpc/include/asm/kvm_ppc.h | 22 +-
arch/powerpc/include/asm/mmu_context.h | 4 +
arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
arch/powerpc/kernel/iommu.c | 91 ++++--
arch/powerpc/kvm/Kconfig | 1 +
arch/powerpc/kvm/Makefile | 1 -
arch/powerpc/kvm/book3s.c | 18 ++
arch/powerpc/kvm/book3s_64_mmu.c | 1 +
arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
arch/powerpc/kvm/book3s_64_vio.c | 313 ++++++++++++++++++-
arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
arch/powerpc/kvm/book3s_emulate.c | 34 ++-
arch/powerpc/kvm/book3s_hv.c | 8 +-
arch/powerpc/kvm/book3s_pr.c | 12 +-
arch/powerpc/kvm/booke.c | 5 +
arch/powerpc/kvm/e500_mmu_host.c | 5 +-
arch/powerpc/kvm/emulate.c | 8 +
arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
arch/powerpc/mm/mmu_context_iommu.c | 39 +++
arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
arch/powerpc/platforms/powernv/pci.c | 1 +
arch/powerpc/platforms/pseries/iommu.c | 3 +-
arch/powerpc/platforms/pseries/vio.c | 2 +-
drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
include/uapi/linux/kvm.h | 7 +
virt/kvm/vfio.c | 105 +++++++
31 files changed, 1798 insertions(+), 177 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2017-04-19 11:01 ` Paul Mackerras
@ 2017-04-19 12:32 ` Alexey Kardashevskiy
-1 siblings, 0 replies; 100+ messages in thread
From: Alexey Kardashevskiy @ 2017-04-19 12:32 UTC (permalink / raw)
To: Paul Mackerras, Paolo Bonzini, kvm; +Cc: kvm-ppc
On 19/04/17 21:01, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> to go into 4.12. The highlights are:
>
> * In-kernel acceleration for IOMMU update hypercalls, from Alexey
> Kardashevskiy.
[PATCH kernel] KVM: PPC: Align the table size to system page size
would be nice to have before all "KVM:PPC:" patches...
>
> * Extend the set of load/store instructions which can be used to
> access emulated MMIO locations to include floating-point and
> vector-scalar instructions, from Bin Lu and myself.
>
> * Some fixes to allow PCI pass-through to work in nested guests using
> PR KVM, from Alexey Kardashevskiy.
>
> There will be a conflict in include/uapi/linux/kvm.h when you do the
> merge, which can easily be fixed by assigning the next available
> number for KVM_CAP_SPAPR_TCE_VFIO.
>
> Note that some of the commits here came from Michael Ellerman's
> topic/ppc-kvm branch and will also go upstream via his tree.
>
> Thanks,
> Paul.
>
> The following changes since commit e55fe3ccccc1efb8f20c99728c8863424ae9ee4a:
>
> tools/kvm_stat: add '%Total' column (2017-03-29 12:01:33 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
>
> for you to fetch changes up to 538eaa212a8cbc1775a64aa7a45943cb28ef0689:
>
> KVM: PPC: Book3S PR: Fix build when PR KVM is built in (2017-04-12 09:17:06 +1000)
>
> ----------------------------------------------------------------
> Alexey Kardashevskiy (14):
> powerpc/mmu: Add real mode support for IOMMU preregistered memory
> powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
> powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
> powerpc/vfio_spapr_tce: Add reference counting to iommu_table
> KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
> KVM: PPC: Book3S PR: Get rid of unused local variable
> KVM: PPC: Book3S PR: Exit KVM on failed mapping
> KVM: PPC: Book3S PR: Preserve storage control bits
> KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
> KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
> KVM: PPC: Pass kvm* to kvmppc_find_table()
> KVM: PPC: Use preregistered memory API to access TCE list
> KVM: PPC: iommu: Unify TCE checking
> KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
>
> Bin Lu (1):
> KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
>
> Markus Elfring (2):
> KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
> KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
>
> Paul Mackerras (5):
> KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
> KVM: PPC: Emulation for more integer loads and stores
> KVM: PPC: Add MMIO emulation for remaining floating-point instructions
> Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
> KVM: PPC: Book3S PR: Fix build when PR KVM is built in
>
> Thomas Huth (1):
> KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
>
> Documentation/virtual/kvm/devices/vfio.txt | 18 +-
> arch/powerpc/include/asm/disassemble.h | 5 +
> arch/powerpc/include/asm/iommu.h | 32 +-
> arch/powerpc/include/asm/kvm_host.h | 32 ++
> arch/powerpc/include/asm/kvm_ppc.h | 22 +-
> arch/powerpc/include/asm/mmu_context.h | 4 +
> arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
> arch/powerpc/kernel/iommu.c | 91 ++++--
> arch/powerpc/kvm/Kconfig | 1 +
> arch/powerpc/kvm/Makefile | 1 -
> arch/powerpc/kvm/book3s.c | 18 ++
> arch/powerpc/kvm/book3s_64_mmu.c | 1 +
> arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
> arch/powerpc/kvm/book3s_64_vio.c | 313 ++++++++++++++++++-
> arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
> arch/powerpc/kvm/book3s_emulate.c | 34 ++-
> arch/powerpc/kvm/book3s_hv.c | 8 +-
> arch/powerpc/kvm/book3s_pr.c | 12 +-
> arch/powerpc/kvm/booke.c | 5 +
> arch/powerpc/kvm/e500_mmu_host.c | 5 +-
> arch/powerpc/kvm/emulate.c | 8 +
> arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
> arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
> arch/powerpc/mm/mmu_context_iommu.c | 39 +++
> arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
> arch/powerpc/platforms/powernv/pci.c | 1 +
> arch/powerpc/platforms/pseries/iommu.c | 3 +-
> arch/powerpc/platforms/pseries/vio.c | 2 +-
> drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
> include/uapi/linux/kvm.h | 7 +
> virt/kvm/vfio.c | 105 +++++++
> 31 files changed, 1798 insertions(+), 177 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
>
--
Alexey
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-19 12:32 ` Alexey Kardashevskiy
0 siblings, 0 replies; 100+ messages in thread
From: Alexey Kardashevskiy @ 2017-04-19 12:32 UTC (permalink / raw)
To: Paul Mackerras, Paolo Bonzini, kvm; +Cc: kvm-ppc
On 19/04/17 21:01, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> to go into 4.12. The highlights are:
>
> * In-kernel acceleration for IOMMU update hypercalls, from Alexey
> Kardashevskiy.
[PATCH kernel] KVM: PPC: Align the table size to system page size
would be nice to have before all "KVM:PPC:" patches...
>
> * Extend the set of load/store instructions which can be used to
> access emulated MMIO locations to include floating-point and
> vector-scalar instructions, from Bin Lu and myself.
>
> * Some fixes to allow PCI pass-through to work in nested guests using
> PR KVM, from Alexey Kardashevskiy.
>
> There will be a conflict in include/uapi/linux/kvm.h when you do the
> merge, which can easily be fixed by assigning the next available
> number for KVM_CAP_SPAPR_TCE_VFIO.
>
> Note that some of the commits here came from Michael Ellerman's
> topic/ppc-kvm branch and will also go upstream via his tree.
>
> Thanks,
> Paul.
>
> The following changes since commit e55fe3ccccc1efb8f20c99728c8863424ae9ee4a:
>
> tools/kvm_stat: add '%Total' column (2017-03-29 12:01:33 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
>
> for you to fetch changes up to 538eaa212a8cbc1775a64aa7a45943cb28ef0689:
>
> KVM: PPC: Book3S PR: Fix build when PR KVM is built in (2017-04-12 09:17:06 +1000)
>
> ----------------------------------------------------------------
> Alexey Kardashevskiy (14):
> powerpc/mmu: Add real mode support for IOMMU preregistered memory
> powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
> powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
> powerpc/vfio_spapr_tce: Add reference counting to iommu_table
> KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
> KVM: PPC: Book3S PR: Get rid of unused local variable
> KVM: PPC: Book3S PR: Exit KVM on failed mapping
> KVM: PPC: Book3S PR: Preserve storage control bits
> KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
> KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
> KVM: PPC: Pass kvm* to kvmppc_find_table()
> KVM: PPC: Use preregistered memory API to access TCE list
> KVM: PPC: iommu: Unify TCE checking
> KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
>
> Bin Lu (1):
> KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
>
> Markus Elfring (2):
> KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
> KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
>
> Paul Mackerras (5):
> KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
> KVM: PPC: Emulation for more integer loads and stores
> KVM: PPC: Add MMIO emulation for remaining floating-point instructions
> Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
> KVM: PPC: Book3S PR: Fix build when PR KVM is built in
>
> Thomas Huth (1):
> KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
>
> Documentation/virtual/kvm/devices/vfio.txt | 18 +-
> arch/powerpc/include/asm/disassemble.h | 5 +
> arch/powerpc/include/asm/iommu.h | 32 +-
> arch/powerpc/include/asm/kvm_host.h | 32 ++
> arch/powerpc/include/asm/kvm_ppc.h | 22 +-
> arch/powerpc/include/asm/mmu_context.h | 4 +
> arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
> arch/powerpc/kernel/iommu.c | 91 ++++--
> arch/powerpc/kvm/Kconfig | 1 +
> arch/powerpc/kvm/Makefile | 1 -
> arch/powerpc/kvm/book3s.c | 18 ++
> arch/powerpc/kvm/book3s_64_mmu.c | 1 +
> arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
> arch/powerpc/kvm/book3s_64_vio.c | 313 ++++++++++++++++++-
> arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
> arch/powerpc/kvm/book3s_emulate.c | 34 ++-
> arch/powerpc/kvm/book3s_hv.c | 8 +-
> arch/powerpc/kvm/book3s_pr.c | 12 +-
> arch/powerpc/kvm/booke.c | 5 +
> arch/powerpc/kvm/e500_mmu_host.c | 5 +-
> arch/powerpc/kvm/emulate.c | 8 +
> arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
> arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
> arch/powerpc/mm/mmu_context_iommu.c | 39 +++
> arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
> arch/powerpc/platforms/powernv/pci.c | 1 +
> arch/powerpc/platforms/pseries/iommu.c | 3 +-
> arch/powerpc/platforms/pseries/vio.c | 2 +-
> drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
> include/uapi/linux/kvm.h | 7 +
> virt/kvm/vfio.c | 105 +++++++
> 31 files changed, 1798 insertions(+), 177 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
>
--
Alexey
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2017-04-19 12:32 ` Alexey Kardashevskiy
@ 2017-04-20 1:28 ` Paul Mackerras
-1 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-20 1:28 UTC (permalink / raw)
To: Alexey Kardashevskiy; +Cc: Paolo Bonzini, kvm, kvm-ppc
On Wed, Apr 19, 2017 at 10:32:36PM +1000, Alexey Kardashevskiy wrote:
> On 19/04/17 21:01, Paul Mackerras wrote:
> > Paolo,
> >
> > Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> > to go into 4.12. The highlights are:
> >
> > * In-kernel acceleration for IOMMU update hypercalls, from Alexey
> > Kardashevskiy.
>
>
> [PATCH kernel] KVM: PPC: Align the table size to system page size
>
> would be nice to have before all "KVM:PPC:" patches...
OK, since it affects bisectability, I'll rebase my kvm-ppc-next
branch.
Paolo, assuming you haven't already done the pull, please hold off and
I'll send another pull request. If you have done the pull by the time
you see this, then we'll just live with the bisect breakage.
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-20 1:28 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-20 1:28 UTC (permalink / raw)
To: Alexey Kardashevskiy; +Cc: Paolo Bonzini, kvm, kvm-ppc
On Wed, Apr 19, 2017 at 10:32:36PM +1000, Alexey Kardashevskiy wrote:
> On 19/04/17 21:01, Paul Mackerras wrote:
> > Paolo,
> >
> > Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> > to go into 4.12. The highlights are:
> >
> > * In-kernel acceleration for IOMMU update hypercalls, from Alexey
> > Kardashevskiy.
>
>
> [PATCH kernel] KVM: PPC: Align the table size to system page size
>
> would be nice to have before all "KVM:PPC:" patches...
OK, since it affects bisectability, I'll rebase my kvm-ppc-next
branch.
Paolo, assuming you haven't already done the pull, please hold off and
I'll send another pull request. If you have done the pull by the time
you see this, then we'll just live with the bisect breakage.
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-21 7:52 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-21 7:52 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
to go into 4.12. I have re-done the branch to avoid the bisection
breakage that Alexey noted.
The highlights are:
* In-kernel acceleration for IOMMU update hypercalls, from Alexey
Kardashevskiy.
* Extend the set of load/store instructions which can be used to
access emulated MMIO locations to include floating-point and
vector-scalar instructions, from Bin Lu and myself.
* Some fixes to allow PCI pass-through to work in nested guests using
PR KVM, from Alexey Kardashevskiy.
There will be a conflict in include/uapi/linux/kvm.h when you do the
merge, which can easily be fixed by assigning the next available
number for KVM_CAP_SPAPR_TCE_VFIO.
Note that some of the commits here came from Michael Ellerman's
topic/ppc-kvm branch and will also go upstream via his tree.
Thanks,
Paul.
The following changes since commit f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04:
Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux (2017-04-11 20:54:40 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to feafd13c96d6e2998d3da81bb55db379fcf02499:
KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs (2017-04-20 11:39:32 +1000)
----------------------------------------------------------------
Alexey Kardashevskiy (15):
powerpc/mmu: Add real mode support for IOMMU preregistered memory
powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
powerpc/vfio_spapr_tce: Add reference counting to iommu_table
KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
KVM: PPC: Book3S PR: Get rid of unused local variable
KVM: PPC: Book3S PR: Exit KVM on failed mapping
KVM: PPC: Book3S PR: Preserve storage control bits
KVM: PPC: Align the table size to system page size
KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
KVM: PPC: Pass kvm* to kvmppc_find_table()
KVM: PPC: Use preregistered memory API to access TCE list
KVM: PPC: iommu: Unify TCE checking
KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
Bin Lu (1):
KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
Markus Elfring (2):
KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
Paul Mackerras (4):
KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
KVM: PPC: Emulation for more integer loads and stores
KVM: PPC: Add MMIO emulation for remaining floating-point instructions
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
Thomas Huth (1):
KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
Documentation/virtual/kvm/devices/vfio.txt | 18 +-
arch/powerpc/include/asm/disassemble.h | 5 +
arch/powerpc/include/asm/iommu.h | 32 +-
arch/powerpc/include/asm/kvm_host.h | 32 ++
arch/powerpc/include/asm/kvm_ppc.h | 22 +-
arch/powerpc/include/asm/mmu_context.h | 4 +
arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
arch/powerpc/kernel/iommu.c | 91 ++++--
arch/powerpc/kvm/Kconfig | 1 +
arch/powerpc/kvm/book3s.c | 18 ++
arch/powerpc/kvm/book3s_64_mmu.c | 1 +
arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
arch/powerpc/kvm/book3s_64_vio.c | 315 ++++++++++++++++++-
arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
arch/powerpc/kvm/book3s_emulate.c | 34 ++-
arch/powerpc/kvm/book3s_hv.c | 8 +-
arch/powerpc/kvm/book3s_pr.c | 12 +-
arch/powerpc/kvm/booke.c | 5 +
arch/powerpc/kvm/e500_mmu_host.c | 5 +-
arch/powerpc/kvm/emulate.c | 8 +
arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
arch/powerpc/mm/mmu_context_iommu.c | 39 +++
arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
arch/powerpc/platforms/powernv/pci.c | 1 +
arch/powerpc/platforms/pseries/iommu.c | 3 +-
arch/powerpc/platforms/pseries/vio.c | 2 +-
drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
include/uapi/linux/kvm.h | 7 +
virt/kvm/vfio.c | 105 +++++++
30 files changed, 1799 insertions(+), 177 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-21 7:52 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-21 7:52 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
to go into 4.12. I have re-done the branch to avoid the bisection
breakage that Alexey noted.
The highlights are:
* In-kernel acceleration for IOMMU update hypercalls, from Alexey
Kardashevskiy.
* Extend the set of load/store instructions which can be used to
access emulated MMIO locations to include floating-point and
vector-scalar instructions, from Bin Lu and myself.
* Some fixes to allow PCI pass-through to work in nested guests using
PR KVM, from Alexey Kardashevskiy.
There will be a conflict in include/uapi/linux/kvm.h when you do the
merge, which can easily be fixed by assigning the next available
number for KVM_CAP_SPAPR_TCE_VFIO.
Note that some of the commits here came from Michael Ellerman's
topic/ppc-kvm branch and will also go upstream via his tree.
Thanks,
Paul.
The following changes since commit f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04:
Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux (2017-04-11 20:54:40 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to feafd13c96d6e2998d3da81bb55db379fcf02499:
KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs (2017-04-20 11:39:32 +1000)
----------------------------------------------------------------
Alexey Kardashevskiy (15):
powerpc/mmu: Add real mode support for IOMMU preregistered memory
powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
powerpc/vfio_spapr_tce: Add reference counting to iommu_table
KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
KVM: PPC: Book3S PR: Get rid of unused local variable
KVM: PPC: Book3S PR: Exit KVM on failed mapping
KVM: PPC: Book3S PR: Preserve storage control bits
KVM: PPC: Align the table size to system page size
KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
KVM: PPC: Pass kvm* to kvmppc_find_table()
KVM: PPC: Use preregistered memory API to access TCE list
KVM: PPC: iommu: Unify TCE checking
KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
Bin Lu (1):
KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
Markus Elfring (2):
KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
Paul Mackerras (4):
KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
KVM: PPC: Emulation for more integer loads and stores
KVM: PPC: Add MMIO emulation for remaining floating-point instructions
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
Thomas Huth (1):
KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
Documentation/virtual/kvm/devices/vfio.txt | 18 +-
arch/powerpc/include/asm/disassemble.h | 5 +
arch/powerpc/include/asm/iommu.h | 32 +-
arch/powerpc/include/asm/kvm_host.h | 32 ++
arch/powerpc/include/asm/kvm_ppc.h | 22 +-
arch/powerpc/include/asm/mmu_context.h | 4 +
arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
arch/powerpc/kernel/iommu.c | 91 ++++--
arch/powerpc/kvm/Kconfig | 1 +
arch/powerpc/kvm/book3s.c | 18 ++
arch/powerpc/kvm/book3s_64_mmu.c | 1 +
arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
arch/powerpc/kvm/book3s_64_vio.c | 315 ++++++++++++++++++-
arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
arch/powerpc/kvm/book3s_emulate.c | 34 ++-
arch/powerpc/kvm/book3s_hv.c | 8 +-
arch/powerpc/kvm/book3s_pr.c | 12 +-
arch/powerpc/kvm/booke.c | 5 +
arch/powerpc/kvm/e500_mmu_host.c | 5 +-
arch/powerpc/kvm/emulate.c | 8 +
arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
arch/powerpc/mm/mmu_context_iommu.c | 39 +++
arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
arch/powerpc/platforms/powernv/pci.c | 1 +
arch/powerpc/platforms/pseries/iommu.c | 3 +-
arch/powerpc/platforms/pseries/vio.c | 2 +-
drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
include/uapi/linux/kvm.h | 7 +
virt/kvm/vfio.c | 105 +++++++
30 files changed, 1799 insertions(+), 177 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2017-04-21 7:52 ` Paul Mackerras
@ 2017-04-21 10:28 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-04-21 10:28 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc
On 21/04/2017 09:52, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> to go into 4.12. I have re-done the branch to avoid the bisection
> breakage that Alexey noted.
>
> The highlights are:
>
> * In-kernel acceleration for IOMMU update hypercalls, from Alexey
> Kardashevskiy.
>
> * Extend the set of load/store instructions which can be used to
> access emulated MMIO locations to include floating-point and
> vector-scalar instructions, from Bin Lu and myself.
>
> * Some fixes to allow PCI pass-through to work in nested guests using
> PR KVM, from Alexey Kardashevskiy.
>
> There will be a conflict in include/uapi/linux/kvm.h when you do the
> merge, which can easily be fixed by assigning the next available
> number for KVM_CAP_SPAPR_TCE_VFIO.
Pulled, thanks. No conflict, the cap kept 142 as its numeric value.
Paolo
> Note that some of the commits here came from Michael Ellerman's
> topic/ppc-kvm branch and will also go upstream via his tree.
>
> Thanks,
> Paul.
>
> The following changes since commit f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04:
>
> Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux (2017-04-11 20:54:40 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
>
> for you to fetch changes up to feafd13c96d6e2998d3da81bb55db379fcf02499:
>
> KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs (2017-04-20 11:39:32 +1000)
>
> ----------------------------------------------------------------
> Alexey Kardashevskiy (15):
> powerpc/mmu: Add real mode support for IOMMU preregistered memory
> powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
> powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
> powerpc/vfio_spapr_tce: Add reference counting to iommu_table
> KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
> KVM: PPC: Book3S PR: Get rid of unused local variable
> KVM: PPC: Book3S PR: Exit KVM on failed mapping
> KVM: PPC: Book3S PR: Preserve storage control bits
> KVM: PPC: Align the table size to system page size
> KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
> KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
> KVM: PPC: Pass kvm* to kvmppc_find_table()
> KVM: PPC: Use preregistered memory API to access TCE list
> KVM: PPC: iommu: Unify TCE checking
> KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
>
> Bin Lu (1):
> KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
>
> Markus Elfring (2):
> KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
> KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
>
> Paul Mackerras (4):
> KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
> KVM: PPC: Emulation for more integer loads and stores
> KVM: PPC: Add MMIO emulation for remaining floating-point instructions
> Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
>
> Thomas Huth (1):
> KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
>
> Documentation/virtual/kvm/devices/vfio.txt | 18 +-
> arch/powerpc/include/asm/disassemble.h | 5 +
> arch/powerpc/include/asm/iommu.h | 32 +-
> arch/powerpc/include/asm/kvm_host.h | 32 ++
> arch/powerpc/include/asm/kvm_ppc.h | 22 +-
> arch/powerpc/include/asm/mmu_context.h | 4 +
> arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
> arch/powerpc/kernel/iommu.c | 91 ++++--
> arch/powerpc/kvm/Kconfig | 1 +
> arch/powerpc/kvm/book3s.c | 18 ++
> arch/powerpc/kvm/book3s_64_mmu.c | 1 +
> arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
> arch/powerpc/kvm/book3s_64_vio.c | 315 ++++++++++++++++++-
> arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
> arch/powerpc/kvm/book3s_emulate.c | 34 ++-
> arch/powerpc/kvm/book3s_hv.c | 8 +-
> arch/powerpc/kvm/book3s_pr.c | 12 +-
> arch/powerpc/kvm/booke.c | 5 +
> arch/powerpc/kvm/e500_mmu_host.c | 5 +-
> arch/powerpc/kvm/emulate.c | 8 +
> arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
> arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
> arch/powerpc/mm/mmu_context_iommu.c | 39 +++
> arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
> arch/powerpc/platforms/powernv/pci.c | 1 +
> arch/powerpc/platforms/pseries/iommu.c | 3 +-
> arch/powerpc/platforms/pseries/vio.c | 2 +-
> drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
> include/uapi/linux/kvm.h | 7 +
> virt/kvm/vfio.c | 105 +++++++
> 30 files changed, 1799 insertions(+), 177 deletions(-)
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-04-21 10:28 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-04-21 10:28 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc
On 21/04/2017 09:52, Paul Mackerras wrote:
> Paolo,
>
> Please do a pull from my kvm-ppc-next branch to get a PPC KVM update
> to go into 4.12. I have re-done the branch to avoid the bisection
> breakage that Alexey noted.
>
> The highlights are:
>
> * In-kernel acceleration for IOMMU update hypercalls, from Alexey
> Kardashevskiy.
>
> * Extend the set of load/store instructions which can be used to
> access emulated MMIO locations to include floating-point and
> vector-scalar instructions, from Bin Lu and myself.
>
> * Some fixes to allow PCI pass-through to work in nested guests using
> PR KVM, from Alexey Kardashevskiy.
>
> There will be a conflict in include/uapi/linux/kvm.h when you do the
> merge, which can easily be fixed by assigning the next available
> number for KVM_CAP_SPAPR_TCE_VFIO.
Pulled, thanks. No conflict, the cap kept 142 as its numeric value.
Paolo
> Note that some of the commits here came from Michael Ellerman's
> topic/ppc-kvm branch and will also go upstream via his tree.
>
> Thanks,
> Paul.
>
> The following changes since commit f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04:
>
> Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux (2017-04-11 20:54:40 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
>
> for you to fetch changes up to feafd13c96d6e2998d3da81bb55db379fcf02499:
>
> KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs (2017-04-20 11:39:32 +1000)
>
> ----------------------------------------------------------------
> Alexey Kardashevskiy (15):
> powerpc/mmu: Add real mode support for IOMMU preregistered memory
> powerpc/powernv/iommu: Add real mode version of iommu_table_ops::exchange()
> powerpc/iommu/vfio_spapr_tce: Cleanup iommu_table disposal
> powerpc/vfio_spapr_tce: Add reference counting to iommu_table
> KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)
> KVM: PPC: Book3S PR: Get rid of unused local variable
> KVM: PPC: Book3S PR: Exit KVM on failed mapping
> KVM: PPC: Book3S PR: Preserve storage control bits
> KVM: PPC: Align the table size to system page size
> KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number
> KVM: PPC: Enable IOMMU_API for KVM_BOOK3S_64 permanently
> KVM: PPC: Pass kvm* to kvmppc_find_table()
> KVM: PPC: Use preregistered memory API to access TCE list
> KVM: PPC: iommu: Unify TCE checking
> KVM: PPC: VFIO: Add in-kernel acceleration for VFIO
>
> Bin Lu (1):
> KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions
>
> Markus Elfring (2):
> KVM: PPC: Book3S HV: Use common error handling code in kvmppc_clr_passthru_irq()
> KVM: PPC: e500: Use kcalloc() in e500_mmu_host_init()
>
> Paul Mackerras (4):
> KVM: PPC: Provide functions for queueing up FP/VEC/VSX unavailable interrupts
> KVM: PPC: Emulation for more integer loads and stores
> KVM: PPC: Add MMIO emulation for remaining floating-point instructions
> Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
>
> Thomas Huth (1):
> KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs
>
> Documentation/virtual/kvm/devices/vfio.txt | 18 +-
> arch/powerpc/include/asm/disassemble.h | 5 +
> arch/powerpc/include/asm/iommu.h | 32 +-
> arch/powerpc/include/asm/kvm_host.h | 32 ++
> arch/powerpc/include/asm/kvm_ppc.h | 22 +-
> arch/powerpc/include/asm/mmu_context.h | 4 +
> arch/powerpc/include/asm/ppc-opcode.h | 58 ++++
> arch/powerpc/kernel/iommu.c | 91 ++++--
> arch/powerpc/kvm/Kconfig | 1 +
> arch/powerpc/kvm/book3s.c | 18 ++
> arch/powerpc/kvm/book3s_64_mmu.c | 1 +
> arch/powerpc/kvm/book3s_64_mmu_host.c | 7 +-
> arch/powerpc/kvm/book3s_64_vio.c | 315 ++++++++++++++++++-
> arch/powerpc/kvm/book3s_64_vio_hv.c | 303 +++++++++++++++---
> arch/powerpc/kvm/book3s_emulate.c | 34 ++-
> arch/powerpc/kvm/book3s_hv.c | 8 +-
> arch/powerpc/kvm/book3s_pr.c | 12 +-
> arch/powerpc/kvm/booke.c | 5 +
> arch/powerpc/kvm/e500_mmu_host.c | 5 +-
> arch/powerpc/kvm/emulate.c | 8 +
> arch/powerpc/kvm/emulate_loadstore.c | 472 ++++++++++++++++++++++++++---
> arch/powerpc/kvm/powerpc.c | 320 ++++++++++++++++++-
> arch/powerpc/mm/mmu_context_iommu.c | 39 +++
> arch/powerpc/platforms/powernv/pci-ioda.c | 46 ++-
> arch/powerpc/platforms/powernv/pci.c | 1 +
> arch/powerpc/platforms/pseries/iommu.c | 3 +-
> arch/powerpc/platforms/pseries/vio.c | 2 +-
> drivers/vfio/vfio_iommu_spapr_tce.c | 2 +-
> include/uapi/linux/kvm.h | 7 +
> virt/kvm/vfio.c | 105 +++++++
> 30 files changed, 1799 insertions(+), 177 deletions(-)
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-04-29 0:25 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-29 0:25 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc, Benjamin Herrenschmidt
Paolo,
Please do a second pull from my kvm-ppc-next branch. The main thing
here is a new implementation of the in-kernel XICS interrupt
controller emulation for POWER9 machines, from Ben Herrenschmidt.
POWER9 has a new interrupt controller called XIVE (eXternal Interrupt
Virtualization Engine) which is able to deliver interrupts directly to
guest virtual CPUs in hardware without hypervisor intervention. With
this new code, the guest still sees the old XICS interface but
performance is better because the XICS emulation in the host uses the
XIVE directly rather than going through a XICS emulation in firmware.
The series that implements this was committed to the topic/xive branch
in the powerpc tree by Michael Ellerman, and I have merged that into
my kvm-ppc-next branch.
I would like this to go into 4.12. I know this pull request is
somewhat late, but that is mostly because I had 3 weeks vacation this
month. I have tested this on POWER9 and also tested that it doesn't
break other platforms such as POWER8.
The only other thing apart from that is a trivial warning fix.
Thanks,
Paul.
The following changes since commit bd17117bb2af60d4bc44e0f9c859e800a3d99722:
Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2017-04-21 12:47:47 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to fb7dcf723dd2cb1d5d8f2f49c3023130938848e3:
Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next (2017-04-28 08:23:16 +1000)
----------------------------------------------------------------
Benjamin Herrenschmidt (11):
powerpc/powernv: Add XIVE related definitions to opal-api.h
powerpc: Add more PPC bit conversion macros
powerpc: Add optional smp_ops->prepare_cpu SMP callback
powerpc/smp: Remove migrate_irq() custom implementation
powerpc/xive: Native exploitation of the XIVE interrupt controller
powerpc/kvm: Massage order of #include
powerpc/kvm: Make kvmppc_xics_create_icp static
powerpc/kvm: Remove obsolete kvm_vm_ioctl_xics_irq declaration
powerpc: Consolidate variants of real-mode MMIOs
powerpc: Fixup LPCR:PECE and HEIC setting on POWER9
KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller
Denis Kirjanov (1):
KVM: PPC: Book3S HV: Avoid preemptibility warning in module initialization
Nicholas Piggin (1):
powerpc/64s: Revert setting of LPCR[LPES] on POWER9
Paul Mackerras (1):
Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next
arch/powerpc/include/asm/bitops.h | 8 +
arch/powerpc/include/asm/io.h | 98 +-
arch/powerpc/include/asm/kvm_book3s_asm.h | 4 +-
arch/powerpc/include/asm/kvm_host.h | 28 +-
arch/powerpc/include/asm/kvm_ppc.h | 84 +-
arch/powerpc/include/asm/opal-api.h | 74 +-
arch/powerpc/include/asm/opal.h | 36 +
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/include/asm/smp.h | 2 +-
arch/powerpc/include/asm/xive-regs.h | 97 ++
arch/powerpc/include/asm/xive.h | 162 ++
arch/powerpc/include/asm/xmon.h | 2 +
arch/powerpc/kernel/asm-offsets.c | 10 +
arch/powerpc/kernel/cpu_setup_power.S | 15 +-
arch/powerpc/kernel/irq.c | 40 -
arch/powerpc/kernel/smp.c | 19 +-
arch/powerpc/kvm/Kconfig | 5 +
arch/powerpc/kvm/Makefile | 4 +-
arch/powerpc/kvm/book3s.c | 83 +-
arch/powerpc/kvm/book3s_hv.c | 69 +-
arch/powerpc/kvm/book3s_hv_builtin.c | 132 +-
arch/powerpc/kvm/book3s_hv_rm_xics.c | 14 +-
arch/powerpc/kvm/book3s_hv_rm_xive.c | 47 +
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 62 +-
arch/powerpc/kvm/book3s_rtas.c | 21 +-
arch/powerpc/kvm/book3s_xics.c | 37 +-
arch/powerpc/kvm/book3s_xics.h | 7 +
arch/powerpc/kvm/book3s_xive.c | 1893 ++++++++++++++++++++++++
arch/powerpc/kvm/book3s_xive.h | 256 ++++
arch/powerpc/kvm/book3s_xive_template.c | 503 +++++++
arch/powerpc/kvm/irq.h | 1 +
arch/powerpc/kvm/powerpc.c | 17 +-
arch/powerpc/platforms/Kconfig.cputype | 1 +
arch/powerpc/platforms/powernv/Kconfig | 1 +
arch/powerpc/platforms/powernv/opal-wrappers.S | 15 +
arch/powerpc/platforms/powernv/opal.c | 1 +
arch/powerpc/platforms/powernv/rng.c | 2 +-
arch/powerpc/platforms/powernv/setup.c | 15 +-
arch/powerpc/platforms/powernv/smp.c | 39 +-
arch/powerpc/sysdev/Kconfig | 1 +
arch/powerpc/sysdev/Makefile | 1 +
arch/powerpc/sysdev/xics/icp-native.c | 8 +-
arch/powerpc/sysdev/xive/Kconfig | 11 +
arch/powerpc/sysdev/xive/Makefile | 4 +
arch/powerpc/sysdev/xive/common.c | 1432 ++++++++++++++++++
arch/powerpc/sysdev/xive/native.c | 715 +++++++++
arch/powerpc/sysdev/xive/xive-internal.h | 62 +
arch/powerpc/xmon/xmon.c | 94 +-
include/linux/kvm_host.h | 1 -
virt/kvm/kvm_main.c | 4 -
50 files changed, 6014 insertions(+), 224 deletions(-)
create mode 100644 arch/powerpc/include/asm/xive-regs.h
create mode 100644 arch/powerpc/include/asm/xive.h
create mode 100644 arch/powerpc/kvm/book3s_hv_rm_xive.c
create mode 100644 arch/powerpc/kvm/book3s_xive.c
create mode 100644 arch/powerpc/kvm/book3s_xive.h
create mode 100644 arch/powerpc/kvm/book3s_xive_template.c
create mode 100644 arch/powerpc/sysdev/xive/Kconfig
create mode 100644 arch/powerpc/sysdev/xive/Makefile
create mode 100644 arch/powerpc/sysdev/xive/common.c
create mode 100644 arch/powerpc/sysdev/xive/native.c
create mode 100644 arch/powerpc/sysdev/xive/xive-internal.h
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-04-29 0:25 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-04-29 0:25 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc, Benjamin Herrenschmidt
Paolo,
Please do a second pull from my kvm-ppc-next branch. The main thing
here is a new implementation of the in-kernel XICS interrupt
controller emulation for POWER9 machines, from Ben Herrenschmidt.
POWER9 has a new interrupt controller called XIVE (eXternal Interrupt
Virtualization Engine) which is able to deliver interrupts directly to
guest virtual CPUs in hardware without hypervisor intervention. With
this new code, the guest still sees the old XICS interface but
performance is better because the XICS emulation in the host uses the
XIVE directly rather than going through a XICS emulation in firmware.
The series that implements this was committed to the topic/xive branch
in the powerpc tree by Michael Ellerman, and I have merged that into
my kvm-ppc-next branch.
I would like this to go into 4.12. I know this pull request is
somewhat late, but that is mostly because I had 3 weeks vacation this
month. I have tested this on POWER9 and also tested that it doesn't
break other platforms such as POWER8.
The only other thing apart from that is a trivial warning fix.
Thanks,
Paul.
The following changes since commit bd17117bb2af60d4bc44e0f9c859e800a3d99722:
Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD (2017-04-21 12:47:47 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to fb7dcf723dd2cb1d5d8f2f49c3023130938848e3:
Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next (2017-04-28 08:23:16 +1000)
----------------------------------------------------------------
Benjamin Herrenschmidt (11):
powerpc/powernv: Add XIVE related definitions to opal-api.h
powerpc: Add more PPC bit conversion macros
powerpc: Add optional smp_ops->prepare_cpu SMP callback
powerpc/smp: Remove migrate_irq() custom implementation
powerpc/xive: Native exploitation of the XIVE interrupt controller
powerpc/kvm: Massage order of #include
powerpc/kvm: Make kvmppc_xics_create_icp static
powerpc/kvm: Remove obsolete kvm_vm_ioctl_xics_irq declaration
powerpc: Consolidate variants of real-mode MMIOs
powerpc: Fixup LPCR:PECE and HEIC setting on POWER9
KVM: PPC: Book3S HV: Native usage of the XIVE interrupt controller
Denis Kirjanov (1):
KVM: PPC: Book3S HV: Avoid preemptibility warning in module initialization
Nicholas Piggin (1):
powerpc/64s: Revert setting of LPCR[LPES] on POWER9
Paul Mackerras (1):
Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next
arch/powerpc/include/asm/bitops.h | 8 +
arch/powerpc/include/asm/io.h | 98 +-
arch/powerpc/include/asm/kvm_book3s_asm.h | 4 +-
arch/powerpc/include/asm/kvm_host.h | 28 +-
arch/powerpc/include/asm/kvm_ppc.h | 84 +-
arch/powerpc/include/asm/opal-api.h | 74 +-
arch/powerpc/include/asm/opal.h | 36 +
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/include/asm/smp.h | 2 +-
arch/powerpc/include/asm/xive-regs.h | 97 ++
arch/powerpc/include/asm/xive.h | 162 ++
arch/powerpc/include/asm/xmon.h | 2 +
arch/powerpc/kernel/asm-offsets.c | 10 +
arch/powerpc/kernel/cpu_setup_power.S | 15 +-
arch/powerpc/kernel/irq.c | 40 -
arch/powerpc/kernel/smp.c | 19 +-
arch/powerpc/kvm/Kconfig | 5 +
arch/powerpc/kvm/Makefile | 4 +-
arch/powerpc/kvm/book3s.c | 83 +-
arch/powerpc/kvm/book3s_hv.c | 69 +-
arch/powerpc/kvm/book3s_hv_builtin.c | 132 +-
arch/powerpc/kvm/book3s_hv_rm_xics.c | 14 +-
arch/powerpc/kvm/book3s_hv_rm_xive.c | 47 +
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 62 +-
arch/powerpc/kvm/book3s_rtas.c | 21 +-
arch/powerpc/kvm/book3s_xics.c | 37 +-
arch/powerpc/kvm/book3s_xics.h | 7 +
arch/powerpc/kvm/book3s_xive.c | 1893 ++++++++++++++++++++++++
arch/powerpc/kvm/book3s_xive.h | 256 ++++
arch/powerpc/kvm/book3s_xive_template.c | 503 +++++++
arch/powerpc/kvm/irq.h | 1 +
arch/powerpc/kvm/powerpc.c | 17 +-
arch/powerpc/platforms/Kconfig.cputype | 1 +
arch/powerpc/platforms/powernv/Kconfig | 1 +
arch/powerpc/platforms/powernv/opal-wrappers.S | 15 +
arch/powerpc/platforms/powernv/opal.c | 1 +
arch/powerpc/platforms/powernv/rng.c | 2 +-
arch/powerpc/platforms/powernv/setup.c | 15 +-
arch/powerpc/platforms/powernv/smp.c | 39 +-
arch/powerpc/sysdev/Kconfig | 1 +
arch/powerpc/sysdev/Makefile | 1 +
arch/powerpc/sysdev/xics/icp-native.c | 8 +-
arch/powerpc/sysdev/xive/Kconfig | 11 +
arch/powerpc/sysdev/xive/Makefile | 4 +
arch/powerpc/sysdev/xive/common.c | 1432 ++++++++++++++++++
arch/powerpc/sysdev/xive/native.c | 715 +++++++++
arch/powerpc/sysdev/xive/xive-internal.h | 62 +
arch/powerpc/xmon/xmon.c | 94 +-
include/linux/kvm_host.h | 1 -
virt/kvm/kvm_main.c | 4 -
50 files changed, 6014 insertions(+), 224 deletions(-)
create mode 100644 arch/powerpc/include/asm/xive-regs.h
create mode 100644 arch/powerpc/include/asm/xive.h
create mode 100644 arch/powerpc/kvm/book3s_hv_rm_xive.c
create mode 100644 arch/powerpc/kvm/book3s_xive.c
create mode 100644 arch/powerpc/kvm/book3s_xive.h
create mode 100644 arch/powerpc/kvm/book3s_xive_template.c
create mode 100644 arch/powerpc/sysdev/xive/Kconfig
create mode 100644 arch/powerpc/sysdev/xive/Makefile
create mode 100644 arch/powerpc/sysdev/xive/common.c
create mode 100644 arch/powerpc/sysdev/xive/native.c
create mode 100644 arch/powerpc/sysdev/xive/xive-internal.h
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-04-29 0:25 ` Paul Mackerras
@ 2017-04-29 12:39 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-04-29 12:39 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc, Benjamin Herrenschmidt
On 29/04/2017 02:25, Paul Mackerras wrote:
>
> I would like this to go into 4.12. I know this pull request is
> somewhat late, but that is mostly because I had 3 weeks vacation this
> month. I have tested this on POWER9 and also tested that it doesn't
> break other platforms such as POWER8.
No problem, I'm a bit late too and this is linux-next anyway. I'll pull
it next Tuesday because I have a public holiday.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-04-29 12:39 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-04-29 12:39 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc, Benjamin Herrenschmidt
On 29/04/2017 02:25, Paul Mackerras wrote:
>
> I would like this to go into 4.12. I know this pull request is
> somewhat late, but that is mostly because I had 3 weeks vacation this
> month. I have tested this on POWER9 and also tested that it doesn't
> break other platforms such as POWER8.
No problem, I'm a bit late too and this is linux-next anyway. I'll pull
it next Tuesday because I have a public holiday.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-04-29 12:39 ` Paolo Bonzini
@ 2017-05-06 10:02 ` Paul Mackerras
-1 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-06 10:02 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>
>
> On 29/04/2017 02:25, Paul Mackerras wrote:
> >
> > I would like this to go into 4.12. I know this pull request is
> > somewhat late, but that is mostly because I had 3 weeks vacation this
> > month. I have tested this on POWER9 and also tested that it doesn't
> > break other platforms such as POWER8.
>
> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
> it next Tuesday because I have a public holiday.
I haven't seen it go into kvm/next yet. Is there a problem with it,
or have you just not got up to it yet, or did you do it and I missed
it?
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-06 10:02 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-06 10:02 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>
>
> On 29/04/2017 02:25, Paul Mackerras wrote:
> >
> > I would like this to go into 4.12. I know this pull request is
> > somewhat late, but that is mostly because I had 3 weeks vacation this
> > month. I have tested this on POWER9 and also tested that it doesn't
> > break other platforms such as POWER8.
>
> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
> it next Tuesday because I have a public holiday.
I haven't seen it go into kvm/next yet. Is there a problem with it,
or have you just not got up to it yet, or did you do it and I missed
it?
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-06 10:02 ` Paul Mackerras
@ 2017-05-06 15:22 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-06 15:22 UTC (permalink / raw)
To: Paul Mackerras; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On 06/05/2017 12:02, Paul Mackerras wrote:
> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>
>>
>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>
>>> I would like this to go into 4.12. I know this pull request is
>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>> month. I have tested this on POWER9 and also tested that it doesn't
>>> break other platforms such as POWER8.
>>
>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>> it next Tuesday because I have a public holiday.
>
> I haven't seen it go into kvm/next yet. Is there a problem with it,
> or have you just not got up to it yet, or did you do it and I missed
> it?
It was in kvm/queue only, now it's there.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-06 15:22 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-06 15:22 UTC (permalink / raw)
To: Paul Mackerras; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On 06/05/2017 12:02, Paul Mackerras wrote:
> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>
>>
>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>
>>> I would like this to go into 4.12. I know this pull request is
>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>> month. I have tested this on POWER9 and also tested that it doesn't
>>> break other platforms such as POWER8.
>>
>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>> it next Tuesday because I have a public holiday.
>
> I haven't seen it go into kvm/next yet. Is there a problem with it,
> or have you just not got up to it yet, or did you do it and I missed
> it?
It was in kvm/queue only, now it's there.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-06 15:22 ` Paolo Bonzini
@ 2017-05-08 3:31 ` Paul Mackerras
-1 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-08 3:31 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>
>
> On 06/05/2017 12:02, Paul Mackerras wrote:
> > On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
> >>
> >>
> >> On 29/04/2017 02:25, Paul Mackerras wrote:
> >>>
> >>> I would like this to go into 4.12. I know this pull request is
> >>> somewhat late, but that is mostly because I had 3 weeks vacation this
> >>> month. I have tested this on POWER9 and also tested that it doesn't
> >>> break other platforms such as POWER8.
> >>
> >> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
> >> it next Tuesday because I have a public holiday.
> >
> > I haven't seen it go into kvm/next yet. Is there a problem with it,
> > or have you just not got up to it yet, or did you do it and I missed
> > it?
>
> It was in kvm/queue only, now it's there.
I'm still not seeing it. Did you forget to push it out or something?
I don't know if you saw the email exchange between Michael Ellerman
and Linus. Michael put into his tree a commit that moves the
declaration of powerpc_debugfs_root from asm/debug.h to asm/debugfs.h,
and that commit is now in Linus' tree. Since my tree adds a use of
powerpc_debugfs_root, it is necessary when merging my tree into Linus'
to add #include <asm/debugfs.h> to arch/powerpc/kvm/book3s_xive.c. I
can't do that in my tree because asm/debugfs.h doesn't exist there.
Thanks,
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-08 3:31 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-08 3:31 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>
>
> On 06/05/2017 12:02, Paul Mackerras wrote:
> > On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
> >>
> >>
> >> On 29/04/2017 02:25, Paul Mackerras wrote:
> >>>
> >>> I would like this to go into 4.12. I know this pull request is
> >>> somewhat late, but that is mostly because I had 3 weeks vacation this
> >>> month. I have tested this on POWER9 and also tested that it doesn't
> >>> break other platforms such as POWER8.
> >>
> >> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
> >> it next Tuesday because I have a public holiday.
> >
> > I haven't seen it go into kvm/next yet. Is there a problem with it,
> > or have you just not got up to it yet, or did you do it and I missed
> > it?
>
> It was in kvm/queue only, now it's there.
I'm still not seeing it. Did you forget to push it out or something?
I don't know if you saw the email exchange between Michael Ellerman
and Linus. Michael put into his tree a commit that moves the
declaration of powerpc_debugfs_root from asm/debug.h to asm/debugfs.h,
and that commit is now in Linus' tree. Since my tree adds a use of
powerpc_debugfs_root, it is necessary when merging my tree into Linus'
to add #include <asm/debugfs.h> to arch/powerpc/kvm/book3s_xive.c. I
can't do that in my tree because asm/debugfs.h doesn't exist there.
Thanks,
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-08 3:31 ` Paul Mackerras
@ 2017-05-08 7:28 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-08 7:28 UTC (permalink / raw)
To: Paul Mackerras; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On 08/05/2017 05:31, Paul Mackerras wrote:
> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>
>>
>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>
>>>>
>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>
>>>>> I would like this to go into 4.12. I know this pull request is
>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>> break other platforms such as POWER8.
>>>>
>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>> it next Tuesday because I have a public holiday.
>>>
>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>> or have you just not got up to it yet, or did you do it and I missed
>>> it?
>>
>> It was in kvm/queue only, now it's there.
>
> I'm still not seeing it. Did you forget to push it out or something?
Ok, connected my brain and pulled now. Sorry for the inconvenience.
> I don't know if you saw the email exchange between Michael Ellerman
> and Linus. Michael put into his tree a commit that moves the
> declaration of powerpc_debugfs_root from asm/debug.h to asm/debugfs.h,
> and that commit is now in Linus' tree. Since my tree adds a use of
> powerpc_debugfs_root, it is necessary when merging my tree into Linus'
> to add #include <asm/debugfs.h> to arch/powerpc/kvm/book3s_xive.c. I
> can't do that in my tree because asm/debugfs.h doesn't exist there.
Yes, I noted that and will remind Linus today when sending the pull request.
Paolo
> Thanks,
> Paul.
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-08 7:28 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-08 7:28 UTC (permalink / raw)
To: Paul Mackerras; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
On 08/05/2017 05:31, Paul Mackerras wrote:
> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>
>>
>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>
>>>>
>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>
>>>>> I would like this to go into 4.12. I know this pull request is
>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>> break other platforms such as POWER8.
>>>>
>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>> it next Tuesday because I have a public holiday.
>>>
>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>> or have you just not got up to it yet, or did you do it and I missed
>>> it?
>>
>> It was in kvm/queue only, now it's there.
>
> I'm still not seeing it. Did you forget to push it out or something?
Ok, connected my brain and pulled now. Sorry for the inconvenience.
> I don't know if you saw the email exchange between Michael Ellerman
> and Linus. Michael put into his tree a commit that moves the
> declaration of powerpc_debugfs_root from asm/debug.h to asm/debugfs.h,
> and that commit is now in Linus' tree. Since my tree adds a use of
> powerpc_debugfs_root, it is necessary when merging my tree into Linus'
> to add #include <asm/debugfs.h> to arch/powerpc/kvm/book3s_xive.c. I
> can't do that in my tree because asm/debugfs.h doesn't exist there.
Yes, I noted that and will remind Linus today when sending the pull request.
Paolo
> Thanks,
> Paul.
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-08 7:28 ` Paolo Bonzini
@ 2017-05-08 13:39 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-08 13:39 UTC (permalink / raw)
To: Paul Mackerras; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt, Michael Ellerman
On 08/05/2017 09:28, Paolo Bonzini wrote:
>
>
> On 08/05/2017 05:31, Paul Mackerras wrote:
>> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>>
>>>
>>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>>
>>>>>
>>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>>
>>>>>> I would like this to go into 4.12. I know this pull request is
>>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>>> break other platforms such as POWER8.
>>>>>
>>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>>> it next Tuesday because I have a public holiday.
>>>>
>>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>>> or have you just not got up to it yet, or did you do it and I missed
>>>> it?
>>>
>>> It was in kvm/queue only, now it's there.
>>
>> I'm still not seeing it. Did you forget to push it out or something?
>
> Ok, connected my brain and pulled now. Sorry for the inconvenience.
I'm un-pulling this, because it creates merge conflicts with Linus's
tree due to an unwanted rebase (?) by either you or Michael.
In particular this commit
commit 8bf8f2e8c786f37991bd27332c75edcc524d2232
Author: Nicholas Piggin <npiggin@gmail.com>
Date: Wed Apr 19 05:12:16 2017 +1000
powerpc/64s: Revert setting of LPCR[LPES] on POWER9
is already present in Linus's tree with a different hash:
commit 8d1b48ef580097e111c2644e6fc6041b9784d218
Author: Nicholas Piggin <npiggin@gmail.com>
Date: Wed Apr 19 05:12:16 2017 +1000
powerpc/64s: Revert setting of LPCR[LPES] on POWER9
and causes conflicts with this subsequent commit:
commit 700b7eadd5625d22b8235fb21259b3d7d564c000
Author: Nicholas Piggin <npiggin@gmail.com>
Date: Wed Apr 19 05:12:17 2017 +1000
powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it
I'll take care of sending a separate pull request to Linus, but please
avoid doing this kind of cherry-pick in the future.
Paolo
>> I don't know if you saw the email exchange between Michael Ellerman
>> and Linus. Michael put into his tree a commit that moves the
>> declaration of powerpc_debugfs_root from asm/debug.h to asm/debugfs.h,
>> and that commit is now in Linus' tree. Since my tree adds a use of
>> powerpc_debugfs_root, it is necessary when merging my tree into Linus'
>> to add #include <asm/debugfs.h> to arch/powerpc/kvm/book3s_xive.c. I
>> can't do that in my tree because asm/debugfs.h doesn't exist there.
>
> Yes, I noted that and will remind Linus today when sending the pull request.
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-08 13:39 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-08 13:39 UTC (permalink / raw)
To: Paul Mackerras; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt, Michael Ellerman
On 08/05/2017 09:28, Paolo Bonzini wrote:
>
>
> On 08/05/2017 05:31, Paul Mackerras wrote:
>> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>>
>>>
>>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>>
>>>>>
>>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>>
>>>>>> I would like this to go into 4.12. I know this pull request is
>>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>>> break other platforms such as POWER8.
>>>>>
>>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>>> it next Tuesday because I have a public holiday.
>>>>
>>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>>> or have you just not got up to it yet, or did you do it and I missed
>>>> it?
>>>
>>> It was in kvm/queue only, now it's there.
>>
>> I'm still not seeing it. Did you forget to push it out or something?
>
> Ok, connected my brain and pulled now. Sorry for the inconvenience.
I'm un-pulling this, because it creates merge conflicts with Linus's
tree due to an unwanted rebase (?) by either you or Michael.
In particular this commit
commit 8bf8f2e8c786f37991bd27332c75edcc524d2232
Author: Nicholas Piggin <npiggin@gmail.com>
Date: Wed Apr 19 05:12:16 2017 +1000
powerpc/64s: Revert setting of LPCR[LPES] on POWER9
is already present in Linus's tree with a different hash:
commit 8d1b48ef580097e111c2644e6fc6041b9784d218
Author: Nicholas Piggin <npiggin@gmail.com>
Date: Wed Apr 19 05:12:16 2017 +1000
powerpc/64s: Revert setting of LPCR[LPES] on POWER9
and causes conflicts with this subsequent commit:
commit 700b7eadd5625d22b8235fb21259b3d7d564c000
Author: Nicholas Piggin <npiggin@gmail.com>
Date: Wed Apr 19 05:12:17 2017 +1000
powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it
I'll take care of sending a separate pull request to Linus, but please
avoid doing this kind of cherry-pick in the future.
Paolo
>> I don't know if you saw the email exchange between Michael Ellerman
>> and Linus. Michael put into his tree a commit that moves the
>> declaration of powerpc_debugfs_root from asm/debug.h to asm/debugfs.h,
>> and that commit is now in Linus' tree. Since my tree adds a use of
>> powerpc_debugfs_root, it is necessary when merging my tree into Linus'
>> to add #include <asm/debugfs.h> to arch/powerpc/kvm/book3s_xive.c. I
>> can't do that in my tree because asm/debugfs.h doesn't exist there.
>
> Yes, I noted that and will remind Linus today when sending the pull request.
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-08 13:39 ` Paolo Bonzini
@ 2017-05-09 1:09 ` Paul Mackerras
-1 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-09 1:09 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt, Michael Ellerman
On Mon, May 08, 2017 at 03:39:26PM +0200, Paolo Bonzini wrote:
> > Ok, connected my brain and pulled now. Sorry for the inconvenience.
>
> I'm un-pulling this, because it creates merge conflicts with Linus's
> tree due to an unwanted rebase (?) by either you or Michael.
>
> In particular this commit
>
> commit 8bf8f2e8c786f37991bd27332c75edcc524d2232
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> is already present in Linus's tree with a different hash:
>
> commit 8d1b48ef580097e111c2644e6fc6041b9784d218
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> and causes conflicts with this subsequent commit:
>
> commit 700b7eadd5625d22b8235fb21259b3d7d564c000
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:17 2017 +1000
>
> powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it
>
>
> I'll take care of sending a separate pull request to Linus, but please
> avoid doing this kind of cherry-pick in the future.
OK, sorry about that. The resolution is just to take the version of
cpu_setup_power.S that is in Linus' tree. I think if you just send it
to Linus that Linus would be able to resolve it easily.
Let me know if you need me to do anything.
Thanks,
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 1:09 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-09 1:09 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kvm, kvm-ppc, Benjamin Herrenschmidt, Michael Ellerman
On Mon, May 08, 2017 at 03:39:26PM +0200, Paolo Bonzini wrote:
> > Ok, connected my brain and pulled now. Sorry for the inconvenience.
>
> I'm un-pulling this, because it creates merge conflicts with Linus's
> tree due to an unwanted rebase (?) by either you or Michael.
>
> In particular this commit
>
> commit 8bf8f2e8c786f37991bd27332c75edcc524d2232
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> is already present in Linus's tree with a different hash:
>
> commit 8d1b48ef580097e111c2644e6fc6041b9784d218
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> and causes conflicts with this subsequent commit:
>
> commit 700b7eadd5625d22b8235fb21259b3d7d564c000
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:17 2017 +1000
>
> powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it
>
>
> I'll take care of sending a separate pull request to Linus, but please
> avoid doing this kind of cherry-pick in the future.
OK, sorry about that. The resolution is just to take the version of
cpu_setup_power.S that is in Linus' tree. I think if you just send it
to Linus that Linus would be able to resolve it easily.
Let me know if you need me to do anything.
Thanks,
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-08 13:39 ` Paolo Bonzini
@ 2017-05-09 2:03 ` Michael Ellerman
-1 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-09 2:03 UTC (permalink / raw)
To: Paolo Bonzini, Paul Mackerras, Linus Torvalds
Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 08/05/2017 09:28, Paolo Bonzini wrote:
>> On 08/05/2017 05:31, Paul Mackerras wrote:
>>> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>>>
>>>>>>> I would like this to go into 4.12. I know this pull request is
>>>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>>>> break other platforms such as POWER8.
>>>>>>
>>>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>>>> it next Tuesday because I have a public holiday.
>>>>>
>>>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>>>> or have you just not got up to it yet, or did you do it and I missed
>>>>> it?
>>>>
>>>> It was in kvm/queue only, now it's there.
>>>
>>> I'm still not seeing it. Did you forget to push it out or something?
>>
>> Ok, connected my brain and pulled now. Sorry for the inconvenience.
>
> I'm un-pulling this, because it creates merge conflicts with Linus's
> tree due to an unwanted rebase (?) by either you or Michael.
That was a deliberate cherry-pick, I applied it to my branch and then
later realised it should also be on the topic branch.
> In particular this commit
>
> commit 8bf8f2e8c786f37991bd27332c75edcc524d2232
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> is already present in Linus's tree with a different hash:
>
> commit 8d1b48ef580097e111c2644e6fc6041b9784d218
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> and causes conflicts with this subsequent commit:
>
> commit 700b7eadd5625d22b8235fb21259b3d7d564c000
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:17 2017 +1000
>
> powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it
You mean this conflict, or was there more? Sure it's annoying, but it's
hardly the worst conflict ever. I really think Linus could have coped
with it.
diff --cc arch/powerpc/kernel/cpu_setup_power.S
index 10cb2896b2ae,1fce4ddd2e6c..000000000000
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@@ -108,7 -108,7 +108,11 @@@ _GLOBAL(__setup_cpu_power9
LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
andc r3, r3, r4
li r4,0 /* LPES = 0 */
++<<<<<<< HEAD
+ bl __init_LPCR_ISA300
++===+ bl __init_LPCR
++>>>>>>> fb7dcf723dd2cb1d5d8f2f49c3023130938848e3
bl __init_HFSCR
bl __init_tlb_power9
bl __init_PMU_HV
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 2:03 ` Michael Ellerman
0 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-09 2:03 UTC (permalink / raw)
To: Paolo Bonzini, Paul Mackerras, Linus Torvalds
Cc: kvm, kvm-ppc, Benjamin Herrenschmidt
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 08/05/2017 09:28, Paolo Bonzini wrote:
>> On 08/05/2017 05:31, Paul Mackerras wrote:
>>> On Sat, May 06, 2017 at 05:22:13PM +0200, Paolo Bonzini wrote:
>>>> On 06/05/2017 12:02, Paul Mackerras wrote:
>>>>> On Sat, Apr 29, 2017 at 02:39:11PM +0200, Paolo Bonzini wrote:
>>>>>> On 29/04/2017 02:25, Paul Mackerras wrote:
>>>>>>>
>>>>>>> I would like this to go into 4.12. I know this pull request is
>>>>>>> somewhat late, but that is mostly because I had 3 weeks vacation this
>>>>>>> month. I have tested this on POWER9 and also tested that it doesn't
>>>>>>> break other platforms such as POWER8.
>>>>>>
>>>>>> No problem, I'm a bit late too and this is linux-next anyway. I'll pull
>>>>>> it next Tuesday because I have a public holiday.
>>>>>
>>>>> I haven't seen it go into kvm/next yet. Is there a problem with it,
>>>>> or have you just not got up to it yet, or did you do it and I missed
>>>>> it?
>>>>
>>>> It was in kvm/queue only, now it's there.
>>>
>>> I'm still not seeing it. Did you forget to push it out or something?
>>
>> Ok, connected my brain and pulled now. Sorry for the inconvenience.
>
> I'm un-pulling this, because it creates merge conflicts with Linus's
> tree due to an unwanted rebase (?) by either you or Michael.
That was a deliberate cherry-pick, I applied it to my branch and then
later realised it should also be on the topic branch.
> In particular this commit
>
> commit 8bf8f2e8c786f37991bd27332c75edcc524d2232
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> is already present in Linus's tree with a different hash:
>
> commit 8d1b48ef580097e111c2644e6fc6041b9784d218
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:16 2017 +1000
>
> powerpc/64s: Revert setting of LPCR[LPES] on POWER9
>
> and causes conflicts with this subsequent commit:
>
> commit 700b7eadd5625d22b8235fb21259b3d7d564c000
> Author: Nicholas Piggin <npiggin@gmail.com>
> Date: Wed Apr 19 05:12:17 2017 +1000
>
> powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it
You mean this conflict, or was there more? Sure it's annoying, but it's
hardly the worst conflict ever. I really think Linus could have coped
with it.
diff --cc arch/powerpc/kernel/cpu_setup_power.S
index 10cb2896b2ae,1fce4ddd2e6c..000000000000
--- a/arch/powerpc/kernel/cpu_setup_power.S
+++ b/arch/powerpc/kernel/cpu_setup_power.S
@@@ -108,7 -108,7 +108,11 @@@ _GLOBAL(__setup_cpu_power9
LOAD_REG_IMMEDIATE(r4, LPCR_UPRT | LPCR_HR)
andc r3, r3, r4
li r4,0 /* LPES = 0 */
++<<<<<<< HEAD
+ bl __init_LPCR_ISA300
++=======
+ bl __init_LPCR
++>>>>>>> fb7dcf723dd2cb1d5d8f2f49c3023130938848e3
bl __init_HFSCR
bl __init_tlb_power9
bl __init_PMU_HV
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 2:03 ` Michael Ellerman
@ 2017-05-09 2:17 ` Linus Torvalds
-1 siblings, 0 replies; 100+ messages in thread
From: Linus Torvalds @ 2017-05-09 2:17 UTC (permalink / raw)
To: Michael Ellerman
Cc: Paolo Bonzini, Paul Mackerras, KVM list, kvm-ppc,
Benjamin Herrenschmidt
On Mon, May 8, 2017 at 7:03 PM, Michael Ellerman <mpe@ellerman.id.au> wrote:
> You mean this conflict, or was there more? Sure it's annoying, but it's
> hardly the worst conflict ever. I really think Linus could have coped
> with it.
Yeah, I do tens of conflicts a day during the merge window, no worries
about conflicts.
I do tend to want to be *notified* about the conflicts, though.
That's not because conflicts are bad per se, or because I'd find them
hard to resolve (most are trivial). It's mostly because I want to know
that both parties knew about the conflict and it was seen in -next,
which just makes me feel a lot better about the it.
Why? Exactly the same way I don't want submaintainers to silently fix
up conflicts for me, because I want to be aware of where conflicts
happened, I also want to know in turn that the submaintainers knew
about it too.
So to me, it's largely about *awareness*, not about "conflicts are
hard to handle". I want to be aware of the conflicts, but I also want
the people who caused them to be aware of them, and realize that
"oops, we're stepping on each others toes".
So conflicts aren't bad per se. Conflicts are really only bad if they
cause subtle problems because people weren't even aware of them, or if
they *keep*on* happening.
The occasional random conflict that people knew about just isn't a problem.
But if the same subsystem just keeps on generating conflicts with
others time and again, _that_ is indicative of a real problem. And
then the problem isn't the conflict per se, but the fact that two
submaintainers keep on stepping on each others toes, and we need to
figure out why, and how to solve it. So even then, the problem isn't
about resolving the conflict itself, but about resolving whatever
issue in our code flow that keeps causing that kind of annoying
friction.
The same is true of cherry-picking and even the occasional rebase. If
a cherry-pick happens once in a blue moon and we have a duplicate
commit, that's *fine*. It can cause conflicts too (perhaps the
cherry-pick was followed by new development of the same area on one of
the branches), but there are perfectly natural and valid reasons why
the same commit could show up on multiple branches.
It's only if it ends up being a "pattern" - some developer keeps on
duplicating the commits in one branch that I see in other branches too
- that it is a problem. That, again, indicates that there's something
wrong in the process.
Linus
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 2:17 ` Linus Torvalds
0 siblings, 0 replies; 100+ messages in thread
From: Linus Torvalds @ 2017-05-09 2:17 UTC (permalink / raw)
To: Michael Ellerman
Cc: Paolo Bonzini, Paul Mackerras, KVM list, kvm-ppc,
Benjamin Herrenschmidt
On Mon, May 8, 2017 at 7:03 PM, Michael Ellerman <mpe@ellerman.id.au> wrote:
> You mean this conflict, or was there more? Sure it's annoying, but it's
> hardly the worst conflict ever. I really think Linus could have coped
> with it.
Yeah, I do tens of conflicts a day during the merge window, no worries
about conflicts.
I do tend to want to be *notified* about the conflicts, though.
That's not because conflicts are bad per se, or because I'd find them
hard to resolve (most are trivial). It's mostly because I want to know
that both parties knew about the conflict and it was seen in -next,
which just makes me feel a lot better about the it.
Why? Exactly the same way I don't want submaintainers to silently fix
up conflicts for me, because I want to be aware of where conflicts
happened, I also want to know in turn that the submaintainers knew
about it too.
So to me, it's largely about *awareness*, not about "conflicts are
hard to handle". I want to be aware of the conflicts, but I also want
the people who caused them to be aware of them, and realize that
"oops, we're stepping on each others toes".
So conflicts aren't bad per se. Conflicts are really only bad if they
cause subtle problems because people weren't even aware of them, or if
they *keep*on* happening.
The occasional random conflict that people knew about just isn't a problem.
But if the same subsystem just keeps on generating conflicts with
others time and again, _that_ is indicative of a real problem. And
then the problem isn't the conflict per se, but the fact that two
submaintainers keep on stepping on each others toes, and we need to
figure out why, and how to solve it. So even then, the problem isn't
about resolving the conflict itself, but about resolving whatever
issue in our code flow that keeps causing that kind of annoying
friction.
The same is true of cherry-picking and even the occasional rebase. If
a cherry-pick happens once in a blue moon and we have a duplicate
commit, that's *fine*. It can cause conflicts too (perhaps the
cherry-pick was followed by new development of the same area on one of
the branches), but there are perfectly natural and valid reasons why
the same commit could show up on multiple branches.
It's only if it ends up being a "pattern" - some developer keeps on
duplicating the commits in one branch that I see in other branches too
- that it is a problem. That, again, indicates that there's something
wrong in the process.
Linus
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 2:17 ` Linus Torvalds
@ 2017-05-09 9:24 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-09 9:24 UTC (permalink / raw)
To: Linus Torvalds, Michael Ellerman
Cc: Paul Mackerras, KVM list, kvm-ppc, Benjamin Herrenschmidt
On 09/05/2017 04:17, Linus Torvalds wrote:
> I do tend to want to be *notified* about the conflicts, though.
>
> That's not because conflicts are bad per se, or because I'd find them
> hard to resolve (most are trivial). It's mostly because I want to know
> that both parties knew about the conflict and it was seen in -next,
> which just makes me feel a lot better about the it.
>
> Why? Exactly the same way I don't want submaintainers to silently fix
> up conflicts for me, because I want to be aware of where conflicts
> happened, I also want to know in turn that the submaintainers knew
> about it too.
>
> So to me, it's largely about *awareness*, not about "conflicts are
> hard to handle". I want to be aware of the conflicts, but I also want
> the people who caused them to be aware of them, and realize that
> "oops, we're stepping on each others toes".
Good, that was my understanding - and I wanted to single out this
conflict because
1) I wasn't even sure if Paul was aware of it, since the conflict
surprised me when doing my own trial merge. I'd like to be aware of
arch vs. KVM conflicts, just like Linus, so that I can relay the
information to him precisely;
2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
PPC seems to be more tightly integrated with non-KVM code than other
architectures. _But it's also the other way round_ which seems less
healthy to me. I'm not sure if that is really necessary, but if not,
please refactor things so that we don't step on each other's toes
unnecessarily. Perhaps real mode handlers should be in
arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
cares about virtualization? Maybe the whole napping and CPU thread
management should be done outside arch/powerpc/kvm/? Not sure if that
makes any sense, but to my eyes there are definitely too many KVM parts
in hardware enablement patches (and BTW it's just crazy that PPC has
about 4k lines of assembly).
Maybe PPC *is* the special snowflake where interaction should be
primarily with arch maintainers rather than myself. Then let's just
have topic branches for the occasional API patch (new KVM_CAP_*
constants would be the gist of it) and otherwise let Michael merge
KVM/PPC patches.
But in any case, to my eyes there _is_ a pattern, and a problem. It
doesn't matter that the canary is a cherry-pick conflict that Linus
could solve blinded and with one hand tied behind his back.
Paolo
> But if the same subsystem just keeps on generating conflicts with
> others time and again, _that_ is indicative of a real problem. And
> then the problem isn't the conflict per se, but the fact that two
> submaintainers keep on stepping on each others toes, and we need to
> figure out why, and how to solve it. So even then, the problem isn't
> about resolving the conflict itself, but about resolving whatever
> issue in our code flow that keeps causing that kind of annoying
> friction.
>
> The same is true of cherry-picking and even the occasional rebase. If
> a cherry-pick happens once in a blue moon and we have a duplicate
> commit, that's *fine*. It can cause conflicts too (perhaps the
> cherry-pick was followed by new development of the same area on one of
> the branches), but there are perfectly natural and valid reasons why
> the same commit could show up on multiple branches.
>
> It's only if it ends up being a "pattern" - some developer keeps on
> duplicating the commits in one branch that I see in other branches too
> - that it is a problem. That, again, indicates that there's something
> wrong in the process.
>
> Linus
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 9:24 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-09 9:24 UTC (permalink / raw)
To: Linus Torvalds, Michael Ellerman
Cc: Paul Mackerras, KVM list, kvm-ppc, Benjamin Herrenschmidt
On 09/05/2017 04:17, Linus Torvalds wrote:
> I do tend to want to be *notified* about the conflicts, though.
>
> That's not because conflicts are bad per se, or because I'd find them
> hard to resolve (most are trivial). It's mostly because I want to know
> that both parties knew about the conflict and it was seen in -next,
> which just makes me feel a lot better about the it.
>
> Why? Exactly the same way I don't want submaintainers to silently fix
> up conflicts for me, because I want to be aware of where conflicts
> happened, I also want to know in turn that the submaintainers knew
> about it too.
>
> So to me, it's largely about *awareness*, not about "conflicts are
> hard to handle". I want to be aware of the conflicts, but I also want
> the people who caused them to be aware of them, and realize that
> "oops, we're stepping on each others toes".
Good, that was my understanding - and I wanted to single out this
conflict because
1) I wasn't even sure if Paul was aware of it, since the conflict
surprised me when doing my own trial merge. I'd like to be aware of
arch vs. KVM conflicts, just like Linus, so that I can relay the
information to him precisely;
2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
PPC seems to be more tightly integrated with non-KVM code than other
architectures. _But it's also the other way round_ which seems less
healthy to me. I'm not sure if that is really necessary, but if not,
please refactor things so that we don't step on each other's toes
unnecessarily. Perhaps real mode handlers should be in
arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
cares about virtualization? Maybe the whole napping and CPU thread
management should be done outside arch/powerpc/kvm/? Not sure if that
makes any sense, but to my eyes there are definitely too many KVM parts
in hardware enablement patches (and BTW it's just crazy that PPC has
about 4k lines of assembly).
Maybe PPC *is* the special snowflake where interaction should be
primarily with arch maintainers rather than myself. Then let's just
have topic branches for the occasional API patch (new KVM_CAP_*
constants would be the gist of it) and otherwise let Michael merge
KVM/PPC patches.
But in any case, to my eyes there _is_ a pattern, and a problem. It
doesn't matter that the canary is a cherry-pick conflict that Linus
could solve blinded and with one hand tied behind his back.
Paolo
> But if the same subsystem just keeps on generating conflicts with
> others time and again, _that_ is indicative of a real problem. And
> then the problem isn't the conflict per se, but the fact that two
> submaintainers keep on stepping on each others toes, and we need to
> figure out why, and how to solve it. So even then, the problem isn't
> about resolving the conflict itself, but about resolving whatever
> issue in our code flow that keeps causing that kind of annoying
> friction.
>
> The same is true of cherry-picking and even the occasional rebase. If
> a cherry-pick happens once in a blue moon and we have a duplicate
> commit, that's *fine*. It can cause conflicts too (perhaps the
> cherry-pick was followed by new development of the same area on one of
> the branches), but there are perfectly natural and valid reasons why
> the same commit could show up on multiple branches.
>
> It's only if it ends up being a "pattern" - some developer keeps on
> duplicating the commits in one branch that I see in other branches too
> - that it is a problem. That, again, indicates that there's something
> wrong in the process.
>
> Linus
>
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 9:24 ` Paolo Bonzini
@ 2017-05-09 13:31 ` Benjamin Herrenschmidt
-1 siblings, 0 replies; 100+ messages in thread
From: Benjamin Herrenschmidt @ 2017-05-09 13:31 UTC (permalink / raw)
To: Paolo Bonzini, Linus Torvalds, Michael Ellerman
Cc: Paul Mackerras, KVM list, kvm-ppc
On Tue, 2017-05-09 at 11:24 +0200, Paolo Bonzini wrote:
> 2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
> PPC seems to be more tightly integrated with non-KVM code than other
> architectures. _But it's also the other way round_ which seems less
> healthy to me. I'm not sure if that is really necessary, but if not,
> please refactor things so that we don't step on each other's toes
> unnecessarily. Perhaps real mode handlers should be in
> arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
> cares about virtualization? Maybe the whole napping and CPU thread
> management should be done outside arch/powerpc/kvm/? Not sure if that
> makes any sense, but to my eyes there are definitely too many KVM parts
> in hardware enablement patches (and BTW it's just crazy that PPC has
> about 4k lines of assembly).
Heh, we've been improving that lately :-)
> Maybe PPC *is* the special snowflake where interaction should be
> primarily with arch maintainers rather than myself. Then let's just
> have topic branches for the occasional API patch (new KVM_CAP_*
> constants would be the gist of it) and otherwise let Michael merge
> KVM/PPC patches.
Sadly it *is* a bit of a special snowflake due to mostly two things,
which are the way the old hash MMU worked (the CPU wasn't designed for
a hypervisor operating with MMU on among other things, so we have this
whole business with doing things in "real mode"), and the way P8 forces
threads to be in the same partition.
We hope to be able to make a much simpler and much more classic
"backend" at some point with the new radix MMU for P9, though we'll
probably continue dragging some of that existing cruft as long as hash
still has to be supported among other things.
> But in any case, to my eyes there _is_ a pattern, and a problem. It
> doesn't matter that the canary is a cherry-pick conflict that Linus
> could solve blinded and with one hand tied behind his back.
There is but it's more or less inherent to the CPU architecture. All I
can say is we are trying to move away from a lot of that crap with the
new MMU, but that will take time.
On thing that will help too is that we have been working hard to get
full hypervisor level backward compatibility for P9 onward. So
hopefully, there will be less overlap between pure enablement and KVM
in the future for that reason too.
Cheers,
Ben.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 13:31 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 100+ messages in thread
From: Benjamin Herrenschmidt @ 2017-05-09 13:31 UTC (permalink / raw)
To: Paolo Bonzini, Linus Torvalds, Michael Ellerman
Cc: Paul Mackerras, KVM list, kvm-ppc
On Tue, 2017-05-09 at 11:24 +0200, Paolo Bonzini wrote:
> 2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
> PPC seems to be more tightly integrated with non-KVM code than other
> architectures. _But it's also the other way round_ which seems less
> healthy to me. I'm not sure if that is really necessary, but if not,
> please refactor things so that we don't step on each other's toes
> unnecessarily. Perhaps real mode handlers should be in
> arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
> cares about virtualization? Maybe the whole napping and CPU thread
> management should be done outside arch/powerpc/kvm/? Not sure if that
> makes any sense, but to my eyes there are definitely too many KVM parts
> in hardware enablement patches (and BTW it's just crazy that PPC has
> about 4k lines of assembly).
Heh, we've been improving that lately :-)
> Maybe PPC *is* the special snowflake where interaction should be
> primarily with arch maintainers rather than myself. Then let's just
> have topic branches for the occasional API patch (new KVM_CAP_*
> constants would be the gist of it) and otherwise let Michael merge
> KVM/PPC patches.
Sadly it *is* a bit of a special snowflake due to mostly two things,
which are the way the old hash MMU worked (the CPU wasn't designed for
a hypervisor operating with MMU on among other things, so we have this
whole business with doing things in "real mode"), and the way P8 forces
threads to be in the same partition.
We hope to be able to make a much simpler and much more classic
"backend" at some point with the new radix MMU for P9, though we'll
probably continue dragging some of that existing cruft as long as hash
still has to be supported among other things.
> But in any case, to my eyes there _is_ a pattern, and a problem. It
> doesn't matter that the canary is a cherry-pick conflict that Linus
> could solve blinded and with one hand tied behind his back.
There is but it's more or less inherent to the CPU architecture. All I
can say is we are trying to move away from a lot of that crap with the
new MMU, but that will take time.
On thing that will help too is that we have been working hard to get
full hypervisor level backward compatibility for P9 onward. So
hopefully, there will be less overlap between pure enablement and KVM
in the future for that reason too.
Cheers,
Ben.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 13:31 ` Benjamin Herrenschmidt
@ 2017-05-09 13:53 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-09 13:53 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Linus Torvalds, Michael Ellerman
Cc: Paul Mackerras, KVM list, kvm-ppc
On 09/05/2017 15:31, Benjamin Herrenschmidt wrote:
>> Maybe PPC *is* the special snowflake where interaction should be
>> primarily with arch maintainers rather than myself. Then let's just
>> have topic branches for the occasional API patch (new KVM_CAP_*
>> constants would be the gist of it) and otherwise let Michael merge
>> KVM/PPC patches.
>
> Sadly it *is* a bit of a special snowflake
Thanks for confirming! ;)
Anyhow, let's keep doing things like this for a few release cycles.
Michael and Paul can keep doing topic branches like they have done for
other recent releases; I'll communicate more with Paul, who however
shouldn't be worried if I don't pull timely from him or if I un-pull
after seeing unexpected conflicts. When this happens, it just means
that I prefer Michael to go first. Patches are in linux-next anyway,
and it's not rare at all that I send two KVM pull request per merge
window. And I'll keep reporting conflicts if they happen so that Linus
can keep an eye on what's going on.
If things don't improve, and I'd hope they do based on Ben's message, we
can have more work go through Michael, but that would be a last resort.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 13:53 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-05-09 13:53 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Linus Torvalds, Michael Ellerman
Cc: Paul Mackerras, KVM list, kvm-ppc
On 09/05/2017 15:31, Benjamin Herrenschmidt wrote:
>> Maybe PPC *is* the special snowflake where interaction should be
>> primarily with arch maintainers rather than myself. Then let's just
>> have topic branches for the occasional API patch (new KVM_CAP_*
>> constants would be the gist of it) and otherwise let Michael merge
>> KVM/PPC patches.
>
> Sadly it *is* a bit of a special snowflake
Thanks for confirming! ;)
Anyhow, let's keep doing things like this for a few release cycles.
Michael and Paul can keep doing topic branches like they have done for
other recent releases; I'll communicate more with Paul, who however
shouldn't be worried if I don't pull timely from him or if I un-pull
after seeing unexpected conflicts. When this happens, it just means
that I prefer Michael to go first. Patches are in linux-next anyway,
and it's not rare at all that I send two KVM pull request per merge
window. And I'll keep reporting conflicts if they happen so that Linus
can keep an eye on what's going on.
If things don't improve, and I'd hope they do based on Ben's message, we
can have more work go through Michael, but that would be a last resort.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 13:53 ` Paolo Bonzini
@ 2017-05-11 6:33 ` Michael Ellerman
-1 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-11 6:33 UTC (permalink / raw)
To: Paolo Bonzini, Benjamin Herrenschmidt, Linus Torvalds
Cc: Paul Mackerras, KVM list, kvm-ppc
Paolo Bonzini <pbonzini@redhat.com> writes:
>
> Anyhow, let's keep doing things like this for a few release cycles.
Sure. I think a lot of the churn for Power9 has already happened, so
things should settle down hopefully.
> Michael and Paul can keep doing topic branches like they have done for
> other recent releases; I'll communicate more with Paul, who however
> shouldn't be worried if I don't pull timely from him or if I un-pull
> after seeing unexpected conflicts. When this happens, it just means
> that I prefer Michael to go first.
OK. In the past I've actually been waiting for you to merge Paul's tree,
because I don't want to merge the shared code in case you Nak something
in his tree and we have to back things out.
But I'll stop doing that unless there's something in particular we are
worried about.
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-11 6:33 ` Michael Ellerman
0 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-11 6:33 UTC (permalink / raw)
To: Paolo Bonzini, Benjamin Herrenschmidt, Linus Torvalds
Cc: Paul Mackerras, KVM list, kvm-ppc
Paolo Bonzini <pbonzini@redhat.com> writes:
>
> Anyhow, let's keep doing things like this for a few release cycles.
Sure. I think a lot of the churn for Power9 has already happened, so
things should settle down hopefully.
> Michael and Paul can keep doing topic branches like they have done for
> other recent releases; I'll communicate more with Paul, who however
> shouldn't be worried if I don't pull timely from him or if I un-pull
> after seeing unexpected conflicts. When this happens, it just means
> that I prefer Michael to go first.
OK. In the past I've actually been waiting for you to merge Paul's tree,
because I don't want to merge the shared code in case you Nak something
in his tree and we have to back things out.
But I'll stop doing that unless there's something in particular we are
worried about.
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 9:24 ` Paolo Bonzini
@ 2017-05-09 23:31 ` Paul Mackerras
-1 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-09 23:31 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Linus Torvalds, Michael Ellerman, KVM list, kvm-ppc,
Benjamin Herrenschmidt
On Tue, May 09, 2017 at 11:24:49AM +0200, Paolo Bonzini wrote:
>
> Good, that was my understanding - and I wanted to single out this
> conflict because
>
> 1) I wasn't even sure if Paul was aware of it, since the conflict
> surprised me when doing my own trial merge. I'd like to be aware of
> arch vs. KVM conflicts, just like Linus, so that I can relay the
> information to him precisely;
Stephen did mention it to me, but I didn't have it in mind when I sent
the pull request. Sorry about that.
> 2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
> PPC seems to be more tightly integrated with non-KVM code than other
> architectures. _But it's also the other way round_ which seems less
> healthy to me. I'm not sure if that is really necessary, but if not,
> please refactor things so that we don't step on each other's toes
> unnecessarily. Perhaps real mode handlers should be in
> arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
> cares about virtualization? Maybe the whole napping and CPU thread
> management should be done outside arch/powerpc/kvm/? Not sure if that
> makes any sense, but to my eyes there are definitely too many KVM parts
> in hardware enablement patches (and BTW it's just crazy that PPC has
> about 4k lines of assembly).
The last two merge windows have seen a lot of changes in the PPC code,
both generally and for KVM, because of the POWER9 support coming in.
Compared to POWER8, POWER9 has a lot of very significant architecture
changes specifically designed to benefit Linux and KVM, which is
wonderful, but has also meant a lot of code changes.
We're working on moving the assembly code to C where possible, and as
Ben said, things are actually getting a lot simpler on POWER9 (though
of course we'll have to keep supporting POWER8 for a while yet).
> Maybe PPC *is* the special snowflake where interaction should be
> primarily with arch maintainers rather than myself. Then let's just
> have topic branches for the occasional API patch (new KVM_CAP_*
> constants would be the gist of it) and otherwise let Michael merge
> KVM/PPC patches.
There are certainly parts of the PPC KVM code that would naturally be
considered as part of low-level machine enablement, and I think it
does make sense for them to go via Michael.
> But in any case, to my eyes there _is_ a pattern, and a problem. It
> doesn't matter that the canary is a cherry-pick conflict that Linus
> could solve blinded and with one hand tied behind his back.
Point taken.
Cheers,
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-09 23:31 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-05-09 23:31 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Linus Torvalds, Michael Ellerman, KVM list, kvm-ppc,
Benjamin Herrenschmidt
On Tue, May 09, 2017 at 11:24:49AM +0200, Paolo Bonzini wrote:
>
> Good, that was my understanding - and I wanted to single out this
> conflict because
>
> 1) I wasn't even sure if Paul was aware of it, since the conflict
> surprised me when doing my own trial merge. I'd like to be aware of
> arch vs. KVM conflicts, just like Linus, so that I can relay the
> information to him precisely;
Stephen did mention it to me, but I didn't have it in mind when I sent
the pull request. Sorry about that.
> 2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
> PPC seems to be more tightly integrated with non-KVM code than other
> architectures. _But it's also the other way round_ which seems less
> healthy to me. I'm not sure if that is really necessary, but if not,
> please refactor things so that we don't step on each other's toes
> unnecessarily. Perhaps real mode handlers should be in
> arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
> cares about virtualization? Maybe the whole napping and CPU thread
> management should be done outside arch/powerpc/kvm/? Not sure if that
> makes any sense, but to my eyes there are definitely too many KVM parts
> in hardware enablement patches (and BTW it's just crazy that PPC has
> about 4k lines of assembly).
The last two merge windows have seen a lot of changes in the PPC code,
both generally and for KVM, because of the POWER9 support coming in.
Compared to POWER8, POWER9 has a lot of very significant architecture
changes specifically designed to benefit Linux and KVM, which is
wonderful, but has also meant a lot of code changes.
We're working on moving the assembly code to C where possible, and as
Ben said, things are actually getting a lot simpler on POWER9 (though
of course we'll have to keep supporting POWER8 for a while yet).
> Maybe PPC *is* the special snowflake where interaction should be
> primarily with arch maintainers rather than myself. Then let's just
> have topic branches for the occasional API patch (new KVM_CAP_*
> constants would be the gist of it) and otherwise let Michael merge
> KVM/PPC patches.
There are certainly parts of the PPC KVM code that would naturally be
considered as part of low-level machine enablement, and I think it
does make sense for them to go via Michael.
> But in any case, to my eyes there _is_ a pattern, and a problem. It
> doesn't matter that the canary is a cherry-pick conflict that Linus
> could solve blinded and with one hand tied behind his back.
Point taken.
Cheers,
Paul.
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 9:24 ` Paolo Bonzini
@ 2017-05-11 6:28 ` Michael Ellerman
-1 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-11 6:28 UTC (permalink / raw)
To: Paolo Bonzini, Linus Torvalds
Cc: Paul Mackerras, KVM list, kvm-ppc, Benjamin Herrenschmidt
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 09/05/2017 04:17, Linus Torvalds wrote:
>> I do tend to want to be *notified* about the conflicts, though.
>>
>> That's not because conflicts are bad per se, or because I'd find them
>> hard to resolve (most are trivial). It's mostly because I want to know
>> that both parties knew about the conflict and it was seen in -next,
>> which just makes me feel a lot better about the it.
>>
>> Why? Exactly the same way I don't want submaintainers to silently fix
>> up conflicts for me, because I want to be aware of where conflicts
>> happened, I also want to know in turn that the submaintainers knew
>> about it too.
>>
>> So to me, it's largely about *awareness*, not about "conflicts are
>> hard to handle". I want to be aware of the conflicts, but I also want
>> the people who caused them to be aware of them, and realize that
>> "oops, we're stepping on each others toes".
>
> Good, that was my understanding - and I wanted to single out this
> conflict because
>
> 1) I wasn't even sure if Paul was aware of it, since the conflict
> surprised me when doing my own trial merge. I'd like to be aware of
> arch vs. KVM conflicts, just like Linus, so that I can relay the
> information to him precisely;
Sure. In this case I think the conflict might have appeared after Paul
sent the original pull request to you, because it took a while before
you merged it.
There was also the issue with needing to add the include of debugfs.h
which was more subtle and I think distracted us from the simple conflict
in the asm.
> 2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
> PPC seems to be more tightly integrated with non-KVM code than other
> architectures. _But it's also the other way round_ which seems less
> healthy to me. I'm not sure if that is really necessary, but if not,
> please refactor things so that we don't step on each other's toes
> unnecessarily. Perhaps real mode handlers should be in
> arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
> cares about virtualization? Maybe the whole napping and CPU thread
> management should be done outside arch/powerpc/kvm/? Not sure if that
> makes any sense, but to my eyes there are definitely too many KVM parts
> in hardware enablement patches (and BTW it's just crazy that PPC has
> about 4k lines of assembly).
I can't really say if it's more tightly integrated, I haven't looked
that closely at other arches.
What has happened is we've added support to the arch code and KVM for a
new CPU version, which is not entirely backward compatible at the
hypervisor level, support for an entirely new MMU which has implications
for KVM, and for a new interrupt controller architecture.
There've been some conflicts in the process, but I don't think we've
done too badly.
I suspect if x86 added support for a hash table MMU there might be some
conflicts with KVM in the process ;)
> Maybe PPC *is* the special snowflake where interaction should be
> primarily with arch maintainers rather than myself. Then let's just
> have topic branches for the occasional API patch (new KVM_CAP_*
> constants would be the gist of it) and otherwise let Michael merge
> KVM/PPC patches.
In hindsight for the last couple of merge windows that probably would
have worked better. But it's a bit late now :)
I do wonder if at some point the relationship between the arch trees and
KVM should flip.
Something similar happened with perf, the hardware specific parts used
to be merged through the perf tree, but now they go via arch
maintainers.
I'm not saying KVM is ready for that, but it might be one day.
> But in any case, to my eyes there _is_ a pattern, and a problem. It
> doesn't matter that the canary is a cherry-pick conflict that Linus
> could solve blinded and with one hand tied behind his back.
I don't think that there's really a "problem". It's not that Paul and I
are oblivious to each other and "stepping on each other's toes", it's
just we're working on areas of the code that are interdependent and
sometimes there are conflicts.
We could avoid all conflicts by forcing Paul to merge all his arch code
one release before he merges the KVM code that needs it, but that would
be silly IMHO.
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-11 6:28 ` Michael Ellerman
0 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-11 6:28 UTC (permalink / raw)
To: Paolo Bonzini, Linus Torvalds
Cc: Paul Mackerras, KVM list, kvm-ppc, Benjamin Herrenschmidt
Paolo Bonzini <pbonzini@redhat.com> writes:
> On 09/05/2017 04:17, Linus Torvalds wrote:
>> I do tend to want to be *notified* about the conflicts, though.
>>
>> That's not because conflicts are bad per se, or because I'd find them
>> hard to resolve (most are trivial). It's mostly because I want to know
>> that both parties knew about the conflict and it was seen in -next,
>> which just makes me feel a lot better about the it.
>>
>> Why? Exactly the same way I don't want submaintainers to silently fix
>> up conflicts for me, because I want to be aware of where conflicts
>> happened, I also want to know in turn that the submaintainers knew
>> about it too.
>>
>> So to me, it's largely about *awareness*, not about "conflicts are
>> hard to handle". I want to be aware of the conflicts, but I also want
>> the people who caused them to be aware of them, and realize that
>> "oops, we're stepping on each others toes".
>
> Good, that was my understanding - and I wanted to single out this
> conflict because
>
> 1) I wasn't even sure if Paul was aware of it, since the conflict
> surprised me when doing my own trial merge. I'd like to be aware of
> arch vs. KVM conflicts, just like Linus, so that I can relay the
> information to him precisely;
Sure. In this case I think the conflict might have appeared after Paul
sent the original pull request to you, because it took a while before
you merged it.
There was also the issue with needing to add the include of debugfs.h
which was more subtle and I think distracted us from the simple conflict
in the asm.
> 2) I'm not sure about why PPC/KVM conflicts keep on happening. KVM on
> PPC seems to be more tightly integrated with non-KVM code than other
> architectures. _But it's also the other way round_ which seems less
> healthy to me. I'm not sure if that is really necessary, but if not,
> please refactor things so that we don't step on each other's toes
> unnecessarily. Perhaps real mode handlers should be in
> arch/powerpc/kernel/ and only arch/powerpc/kvm/, so that the latter only
> cares about virtualization? Maybe the whole napping and CPU thread
> management should be done outside arch/powerpc/kvm/? Not sure if that
> makes any sense, but to my eyes there are definitely too many KVM parts
> in hardware enablement patches (and BTW it's just crazy that PPC has
> about 4k lines of assembly).
I can't really say if it's more tightly integrated, I haven't looked
that closely at other arches.
What has happened is we've added support to the arch code and KVM for a
new CPU version, which is not entirely backward compatible at the
hypervisor level, support for an entirely new MMU which has implications
for KVM, and for a new interrupt controller architecture.
There've been some conflicts in the process, but I don't think we've
done too badly.
I suspect if x86 added support for a hash table MMU there might be some
conflicts with KVM in the process ;)
> Maybe PPC *is* the special snowflake where interaction should be
> primarily with arch maintainers rather than myself. Then let's just
> have topic branches for the occasional API patch (new KVM_CAP_*
> constants would be the gist of it) and otherwise let Michael merge
> KVM/PPC patches.
In hindsight for the last couple of merge windows that probably would
have worked better. But it's a bit late now :)
I do wonder if at some point the relationship between the arch trees and
KVM should flip.
Something similar happened with perf, the hardware specific parts used
to be merged through the perf tree, but now they go via arch
maintainers.
I'm not saying KVM is ready for that, but it might be one day.
> But in any case, to my eyes there _is_ a pattern, and a problem. It
> doesn't matter that the canary is a cherry-pick conflict that Linus
> could solve blinded and with one hand tied behind his back.
I don't think that there's really a "problem". It's not that Paul and I
are oblivious to each other and "stepping on each other's toes", it's
just we're working on areas of the code that are interdependent and
sometimes there are conflicts.
We could avoid all conflicts by forcing Paul to merge all his arch code
one release before he merges the KVM code that needs it, but that would
be silly IMHO.
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
2017-05-09 2:17 ` Linus Torvalds
@ 2017-05-11 6:37 ` Michael Ellerman
-1 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-11 6:37 UTC (permalink / raw)
To: Linus Torvalds
Cc: Paolo Bonzini, Paul Mackerras, KVM list, kvm-ppc,
Benjamin Herrenschmidt
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Mon, May 8, 2017 at 7:03 PM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>> You mean this conflict, or was there more? Sure it's annoying, but it's
>> hardly the worst conflict ever. I really think Linus could have coped
>> with it.
...
> The occasional random conflict that people knew about just isn't a problem.
>
> But if the same subsystem just keeps on generating conflicts with
> others time and again, _that_ is indicative of a real problem. And
> then the problem isn't the conflict per se, but the fact that two
> submaintainers keep on stepping on each others toes, and we need to
> figure out why, and how to solve it. So even then, the problem isn't
> about resolving the conflict itself, but about resolving whatever
> issue in our code flow that keeps causing that kind of annoying
> friction.
Thanks for the explanation.
We have had some small conflicts over the last few releases, but I don't
think it's really indicative of a problem. It's certainly not that Paul
and I are oblivious of each other - he pesters me endlessly - but just
that the code is intertwined.
Perhaps we can organise the code better to avoid problems in future, and
now that a lot of the changes for Power9 are in, things should hopefully
get better anyway.
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch again
@ 2017-05-11 6:37 ` Michael Ellerman
0 siblings, 0 replies; 100+ messages in thread
From: Michael Ellerman @ 2017-05-11 6:37 UTC (permalink / raw)
To: Linus Torvalds
Cc: Paolo Bonzini, Paul Mackerras, KVM list, kvm-ppc,
Benjamin Herrenschmidt
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Mon, May 8, 2017 at 7:03 PM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>> You mean this conflict, or was there more? Sure it's annoying, but it's
>> hardly the worst conflict ever. I really think Linus could have coped
>> with it.
...
> The occasional random conflict that people knew about just isn't a problem.
>
> But if the same subsystem just keeps on generating conflicts with
> others time and again, _that_ is indicative of a real problem. And
> then the problem isn't the conflict per se, but the fact that two
> submaintainers keep on stepping on each others toes, and we need to
> figure out why, and how to solve it. So even then, the problem isn't
> about resolving the conflict itself, but about resolving whatever
> issue in our code flow that keeps causing that kind of annoying
> friction.
Thanks for the explanation.
We have had some small conflicts over the last few releases, but I don't
think it's really indicative of a problem. It's certainly not that Paul
and I are oblivious of each other - he pesters me endlessly - but just
that the code is intertwined.
Perhaps we can organise the code better to avoid problems in future, and
now that a lot of the changes for Power9 are in, things should hopefully
get better anyway.
cheers
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-07-02 7:11 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-07-02 7:11 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.12. The main things this time are, in summary:
- Better machine check handling for HV KVM
- Ability to support guests with threads=2, 4 or 8 on POWER9
- Fix for a race that could cause delayed recognition of signals
- Fix for a bug where POWER9 guests could sleep with interrupts
pending.
There will be one merge conflict in include/uapi/linux/kvm.h where you
will need to adjust the capability number assignments that I chose.
There is a one-line addition to arch/powerpc/kernel/mce.c, adding an
EXPORT_SYMBOL_GPL, which was acked by Michael Ellerman. I do not
expect it to cause a conflict in the merge into Linus' tree.
Thanks,
Paul.
The following changes since commit 3d3efb68c19e539f0535c93a5258c1299270215f:
KVM: PPC: Book3S HV: Ignore timebase offset on POWER9 DD1 (2017-06-16 16:04:57 +1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 8b24e69fc47e43679bb29ddb481aa0e8dce2a3c5:
KVM: PPC: Book3S HV: Close race with testing for signals on guest entry (2017-07-01 18:59:38 +1000)
----------------------------------------------------------------
Aravinda Prasad (2):
KVM: PPC: Book3S HV: Add new capability to control MCE behaviour
KVM: PPC: Book3S HV: Exit guest upon MCE when FWNMI capability is enabled
Mahesh Salgaonkar (1):
powerpc/book3s: EXPORT_SYMBOL_GPL machine_check_print_event_info
Paul Mackerras (9):
KVM: PPC: Book3S HV: Enable guests to use large decrementer mode on POWER9
KVM: PPC: Book3S HV: Don't let VCPU sleep if it has a doorbell pending
KVM: PPC: Book3S HV: Context-switch HFSCR between host and guest on POWER9
KVM: PPC: Book3S HV: Allow userspace to set the desired SMT mode
KVM: PPC: Book3S HV: Virtualize doorbell facility on POWER9
KVM: PPC: Book3S HV: Don't sleep if XIVE interrupt pending on POWER9
KVM: PPC: Book3S HV: Add capability to report possible virtual SMT modes
KVM: PPC: Book3S HV: Simplify dynamic micro-threading code
KVM: PPC: Book3S HV: Close race with testing for signals on guest entry
Documentation/virtual/kvm/api.txt | 37 +++
arch/powerpc/include/asm/kvm_book3s.h | 1 -
arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +-
arch/powerpc/include/asm/kvm_host.h | 9 +-
arch/powerpc/include/asm/kvm_ppc.h | 2 +
arch/powerpc/include/asm/ppc-opcode.h | 2 +
arch/powerpc/include/uapi/asm/kvm.h | 6 +
arch/powerpc/kernel/asm-offsets.c | 3 +
arch/powerpc/kernel/mce.c | 1 +
arch/powerpc/kvm/book3s_hv.c | 511 +++++++++++++++++++++++-------
arch/powerpc/kvm/book3s_hv_builtin.c | 2 +-
arch/powerpc/kvm/book3s_hv_interrupts.S | 8 +-
arch/powerpc/kvm/book3s_hv_ras.c | 18 +-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 165 ++++++----
arch/powerpc/kvm/emulate.c | 4 +-
arch/powerpc/kvm/powerpc.c | 40 ++-
include/uapi/linux/kvm.h | 2 +
17 files changed, 620 insertions(+), 193 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-07-02 7:11 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-07-02 7:11 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.12. The main things this time are, in summary:
- Better machine check handling for HV KVM
- Ability to support guests with threads=2, 4 or 8 on POWER9
- Fix for a race that could cause delayed recognition of signals
- Fix for a bug where POWER9 guests could sleep with interrupts
pending.
There will be one merge conflict in include/uapi/linux/kvm.h where you
will need to adjust the capability number assignments that I chose.
There is a one-line addition to arch/powerpc/kernel/mce.c, adding an
EXPORT_SYMBOL_GPL, which was acked by Michael Ellerman. I do not
expect it to cause a conflict in the merge into Linus' tree.
Thanks,
Paul.
The following changes since commit 3d3efb68c19e539f0535c93a5258c1299270215f:
KVM: PPC: Book3S HV: Ignore timebase offset on POWER9 DD1 (2017-06-16 16:04:57 +1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 8b24e69fc47e43679bb29ddb481aa0e8dce2a3c5:
KVM: PPC: Book3S HV: Close race with testing for signals on guest entry (2017-07-01 18:59:38 +1000)
----------------------------------------------------------------
Aravinda Prasad (2):
KVM: PPC: Book3S HV: Add new capability to control MCE behaviour
KVM: PPC: Book3S HV: Exit guest upon MCE when FWNMI capability is enabled
Mahesh Salgaonkar (1):
powerpc/book3s: EXPORT_SYMBOL_GPL machine_check_print_event_info
Paul Mackerras (9):
KVM: PPC: Book3S HV: Enable guests to use large decrementer mode on POWER9
KVM: PPC: Book3S HV: Don't let VCPU sleep if it has a doorbell pending
KVM: PPC: Book3S HV: Context-switch HFSCR between host and guest on POWER9
KVM: PPC: Book3S HV: Allow userspace to set the desired SMT mode
KVM: PPC: Book3S HV: Virtualize doorbell facility on POWER9
KVM: PPC: Book3S HV: Don't sleep if XIVE interrupt pending on POWER9
KVM: PPC: Book3S HV: Add capability to report possible virtual SMT modes
KVM: PPC: Book3S HV: Simplify dynamic micro-threading code
KVM: PPC: Book3S HV: Close race with testing for signals on guest entry
Documentation/virtual/kvm/api.txt | 37 +++
arch/powerpc/include/asm/kvm_book3s.h | 1 -
arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +-
arch/powerpc/include/asm/kvm_host.h | 9 +-
arch/powerpc/include/asm/kvm_ppc.h | 2 +
arch/powerpc/include/asm/ppc-opcode.h | 2 +
arch/powerpc/include/uapi/asm/kvm.h | 6 +
arch/powerpc/kernel/asm-offsets.c | 3 +
arch/powerpc/kernel/mce.c | 1 +
arch/powerpc/kvm/book3s_hv.c | 511 +++++++++++++++++++++++-------
arch/powerpc/kvm/book3s_hv_builtin.c | 2 +-
arch/powerpc/kvm/book3s_hv_interrupts.S | 8 +-
arch/powerpc/kvm/book3s_hv_ras.c | 18 +-
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 165 ++++++----
arch/powerpc/kvm/emulate.c | 4 +-
arch/powerpc/kvm/powerpc.c | 40 ++-
include/uapi/linux/kvm.h | 2 +
17 files changed, 620 insertions(+), 193 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-09-01 6:36 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-09-01 6:36 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.14. There are various minor fixes and cleanups. The only new
feature is that we now export information about storage key support to
userspace, so it can advertise it to the guest.
I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
powerpc tree to get a couple of fixes that touch both KVM PPC code and
other PPC code. That's why there is some arch/powerpc stuff in the
diffstat that isn't arch/powerpc/kvm.
Thanks,
Paul.
The following changes since commit 712b12d72451411c40e39d25e2140fb8c7fd0e49:
kvm: nVMX: Validate the virtual-APIC address on nested VM-entry (2017-08-25 12:34:16 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 43f6b0cfb2e4dfd5aa452a1d44491e805e37b7da:
KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd (2017-09-01 10:17:58 +1000)
----------------------------------------------------------------
Andreas Schwab (1):
KVM: PPC: Book3S HV: Fix invalid use of register expression
Aneesh Kumar K.V (1):
powerpc/mm: Rename find_linux_pte_or_hugepte()
Dan Carpenter (2):
KVM: PPC: e500: Fix some NULL dereferences on error
KVM: PPC: e500mc: Fix a NULL dereference
Nicholas Piggin (2):
KVM: PPC: Book3S HV: POWER9 does not require secondary thread management
KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation
Paul Mackerras (3):
KVM: PPC: Book3S HV: Fix case where HDEC is treated as 32-bit on POWER9
KVM: PPC: Book3S HV: Report storage key support to userspace
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
Ram Pai (1):
KVM: PPC: Book3S HV: Fix setting of storage key in H_ENTER
nixiaoming (1):
KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 +
arch/powerpc/include/asm/kvm_book3s_asm.h | 4 +++
arch/powerpc/include/asm/pgtable.h | 10 +-------
arch/powerpc/include/asm/pte-walk.h | 35 +++++++++++++++++++++++++++
arch/powerpc/kernel/eeh.c | 4 +--
arch/powerpc/kernel/idle_book3s.S | 35 ++++++++++++++++++---------
arch/powerpc/kernel/io-workarounds.c | 5 ++--
arch/powerpc/kvm/book3s_64_mmu_hv.c | 6 +++--
arch/powerpc/kvm/book3s_64_mmu_radix.c | 28 ++++++++++-----------
arch/powerpc/kvm/book3s_64_vio_hv.c | 12 ++++++++-
arch/powerpc/kvm/book3s_hv.c | 29 ++++++++++++++++++++--
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 20 +++++++--------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 13 ++++++++--
arch/powerpc/kvm/e500.c | 8 ++++--
arch/powerpc/kvm/e500_mmu_host.c | 3 ++-
arch/powerpc/kvm/e500mc.c | 4 ++-
arch/powerpc/mm/hash_utils_64.c | 5 ++--
arch/powerpc/mm/hugetlbpage.c | 24 ++++++++++--------
arch/powerpc/mm/tlb_hash64.c | 6 +++--
arch/powerpc/perf/callchain.c | 3 ++-
include/uapi/linux/kvm.h | 3 ++-
21 files changed, 183 insertions(+), 75 deletions(-)
create mode 100644 arch/powerpc/include/asm/pte-walk.h
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-09-01 6:36 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-09-01 6:36 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.14. There are various minor fixes and cleanups. The only new
feature is that we now export information about storage key support to
userspace, so it can advertise it to the guest.
I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
powerpc tree to get a couple of fixes that touch both KVM PPC code and
other PPC code. That's why there is some arch/powerpc stuff in the
diffstat that isn't arch/powerpc/kvm.
Thanks,
Paul.
The following changes since commit 712b12d72451411c40e39d25e2140fb8c7fd0e49:
kvm: nVMX: Validate the virtual-APIC address on nested VM-entry (2017-08-25 12:34:16 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to 43f6b0cfb2e4dfd5aa452a1d44491e805e37b7da:
KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd (2017-09-01 10:17:58 +1000)
----------------------------------------------------------------
Andreas Schwab (1):
KVM: PPC: Book3S HV: Fix invalid use of register expression
Aneesh Kumar K.V (1):
powerpc/mm: Rename find_linux_pte_or_hugepte()
Dan Carpenter (2):
KVM: PPC: e500: Fix some NULL dereferences on error
KVM: PPC: e500mc: Fix a NULL dereference
Nicholas Piggin (2):
KVM: PPC: Book3S HV: POWER9 does not require secondary thread management
KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation
Paul Mackerras (3):
KVM: PPC: Book3S HV: Fix case where HDEC is treated as 32-bit on POWER9
KVM: PPC: Book3S HV: Report storage key support to userspace
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
Ram Pai (1):
KVM: PPC: Book3S HV: Fix setting of storage key in H_ENTER
nixiaoming (1):
KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 +
arch/powerpc/include/asm/kvm_book3s_asm.h | 4 +++
arch/powerpc/include/asm/pgtable.h | 10 +-------
arch/powerpc/include/asm/pte-walk.h | 35 +++++++++++++++++++++++++++
arch/powerpc/kernel/eeh.c | 4 +--
arch/powerpc/kernel/idle_book3s.S | 35 ++++++++++++++++++---------
arch/powerpc/kernel/io-workarounds.c | 5 ++--
arch/powerpc/kvm/book3s_64_mmu_hv.c | 6 +++--
arch/powerpc/kvm/book3s_64_mmu_radix.c | 28 ++++++++++-----------
arch/powerpc/kvm/book3s_64_vio_hv.c | 12 ++++++++-
arch/powerpc/kvm/book3s_hv.c | 29 ++++++++++++++++++++--
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 20 +++++++--------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 13 ++++++++--
arch/powerpc/kvm/e500.c | 8 ++++--
arch/powerpc/kvm/e500_mmu_host.c | 3 ++-
arch/powerpc/kvm/e500mc.c | 4 ++-
arch/powerpc/mm/hash_utils_64.c | 5 ++--
arch/powerpc/mm/hugetlbpage.c | 24 ++++++++++--------
arch/powerpc/mm/tlb_hash64.c | 6 +++--
arch/powerpc/perf/callchain.c | 3 ++-
include/uapi/linux/kvm.h | 3 ++-
21 files changed, 183 insertions(+), 75 deletions(-)
create mode 100644 arch/powerpc/include/asm/pte-walk.h
^ permalink raw reply [flat|nested] 100+ messages in thread
* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-11-02 6:54 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-11-02 6:54 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Hi Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.15.
I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
powerpc tree to get two commits that touch both KVM PPC code and other
PPC code.
Apart from various bugfixes and code cleanups, the major new feature
is the ability to run guests using the hashed page table (HPT) MMU
mode on a host that is using the radix MMU mode. Because of
limitations in the current POWER9 chip, this requires the host to be
configured in a particular way. I have included the text from the
cover letter of the patch series below in case you want to include it
in the merge commit.
Thanks,
Paul.
-------------------------------------------
[PATCH v2 0/6] KVM: PPC: Book3S HV: Run HPT guests on radix hosts
Currently, on POWER9 machines using HV KVM, the host kernel will use
one or other of the two MMU modes available, HPT (hashed page table)
or radix, and all KVM guests must use the same MMU mode. This is
inconvenient because it means that a guest on a radix host can't run a
legacy OS that doesn't know about POWER9. On the other hand, if the
host is booted in HPT mode so that legacy guest kernels can be run,
then neither the host nor any other guest can take advantage of the
radix MMU mode.
To further complicate matters, current POWER9 chips have the
restriction that all SMT threads in each core must use the same MMU
mode (HPT or radix), though they can be in different partitions.
This patch series adds the ability to run HPT guests on a host in
radix mode. In order to comply with the restriction of not mixing HPT
and radix threads on the same core, we take a similar approach to that
already used on POWER8, namely, run the host in single-threaded mode
(only thread 0 of each core online), and have KVM be able to wake up
the other threads when a KVM guest is to be run, and use the other
threads for running guest VCPUs.
So that KVM knows whether it should be managing individual threads on
POWER9 (as it does currently) or whole cores, we add a new module
parameter called "indep_threads_mode". This is normally Y on POWER9
but must be set to N before any HPT guests can be run on a radix
host. The value of indep_threads_mode is sampled at the time of
creation of each guest, and the value at the time of creation is what
applies to that guest for the whole of its lifetime. It is preferable
to change indep_threads_mode only when no guests are running, in
order to avoid confusion or unnecessarily reduced performance.
In order to allow HPT guests to run on a radix host, the following
commands (or their equivalents) are required first:
# echo N >/sys/module/kvm_hv/parameters/indep_threads_mode
# ppc64_cpu --smt=off
KVM will run up to four vcpus on each core using the existing dynamic
micro-threading code. This can be controlled using the
target_smt_mode module parameter.
-------------------------------------------
The following changes since commit 9b8ebbdb74b5ad76b9dfd8b101af17839174b126:
KVM: x86: extend usage of RET_MMIO_PF_* constants (2017-10-12 14:01:56 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to c01015091a77035de1939ef106bfbcaf9a21395f:
KVM: PPC: Book3S HV: Run HPT guests on POWER9 radix hosts (2017-11-01 15:36:41 +1100)
----------------------------------------------------------------
Alexey Kardashevskiy (1):
KVM: PPC: Book3S PR: Enable in-kernel TCE handlers for PR KVM
Greg Kurz (1):
KVM: PPC: Book3S PR: Only install valid SLBs during KVM_SET_SREGS
Markus Elfring (1):
KVM: PPC: Book3S HV: Delete an error message for a failed memory allocation in kvmppc_allocate_hpt()
Michael Ellerman (1):
KVM: PPC: Tie KVM_CAP_PPC_HTM to the user-visible TM feature
Nicholas Piggin (1):
KVM: PPC: Book3S: Fix gas warning due to using r0 as immediate 0
Paul Mackerras (11):
KVM: PPC: Book3S HV: Handle unexpected interrupts better
KVM: PPC: Book3S HV: Explicitly disable HPT operations on radix guests
Revert "KVM: PPC: Book3S HV: POWER9 does not require secondary thread management"
KVM: PPC: Book3S HV: Don't call real-mode XICS hypercall handlers if not enabled
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
KVM: PPC: Book3S HV: Don't rely on host's page size information
KVM: PPC: Book3S HV: Rename hpte_setup_done to mmu_ready
KVM: PPC: Book3S HV: Unify dirty page map between HPT and radix
KVM: PPC: Book3S HV: Add infrastructure for running HPT guests on radix host
KVM: PPC: Book3S HV: Allow for running POWER9 host in single-threaded mode
KVM: PPC: Book3S HV: Run HPT guests on POWER9 radix hosts
Thomas Meyer (2):
KVM: PPC: Book3S HV: Use ARRAY_SIZE macro
KVM: PPC: BookE: Use vma_pages function
arch/powerpc/include/asm/kvm_book3s.h | 3 +-
arch/powerpc/include/asm/kvm_book3s_64.h | 140 +++++++++++--
arch/powerpc/include/asm/kvm_book3s_asm.h | 17 +-
arch/powerpc/include/asm/kvm_host.h | 6 +-
arch/powerpc/include/asm/kvm_ppc.h | 3 +
arch/powerpc/kernel/asm-offsets.c | 3 +
arch/powerpc/kernel/idle_book3s.S | 35 +---
arch/powerpc/kvm/book3s_64_mmu_hv.c | 124 +++++------
arch/powerpc/kvm/book3s_64_mmu_radix.c | 51 +----
arch/powerpc/kvm/book3s_64_slb.S | 2 +-
arch/powerpc/kvm/book3s_hv.c | 337 ++++++++++++++++++------------
arch/powerpc/kvm/book3s_hv_builtin.c | 117 ++++++++++-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 65 +++---
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 205 ++++++++++++++++--
arch/powerpc/kvm/book3s_pr.c | 16 +-
arch/powerpc/kvm/book3s_pr_papr.c | 2 +
arch/powerpc/kvm/e500_mmu_host.c | 2 +-
arch/powerpc/kvm/powerpc.c | 7 +-
18 files changed, 797 insertions(+), 338 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-11-02 6:54 ` Paul Mackerras
0 siblings, 0 replies; 100+ messages in thread
From: Paul Mackerras @ 2017-11-02 6:54 UTC (permalink / raw)
To: Paolo Bonzini, kvm; +Cc: kvm-ppc
Hi Paolo,
Please do a pull from my kvm-ppc-next branch to get a PPC update for
4.15.
I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
powerpc tree to get two commits that touch both KVM PPC code and other
PPC code.
Apart from various bugfixes and code cleanups, the major new feature
is the ability to run guests using the hashed page table (HPT) MMU
mode on a host that is using the radix MMU mode. Because of
limitations in the current POWER9 chip, this requires the host to be
configured in a particular way. I have included the text from the
cover letter of the patch series below in case you want to include it
in the merge commit.
Thanks,
Paul.
-------------------------------------------
[PATCH v2 0/6] KVM: PPC: Book3S HV: Run HPT guests on radix hosts
Currently, on POWER9 machines using HV KVM, the host kernel will use
one or other of the two MMU modes available, HPT (hashed page table)
or radix, and all KVM guests must use the same MMU mode. This is
inconvenient because it means that a guest on a radix host can't run a
legacy OS that doesn't know about POWER9. On the other hand, if the
host is booted in HPT mode so that legacy guest kernels can be run,
then neither the host nor any other guest can take advantage of the
radix MMU mode.
To further complicate matters, current POWER9 chips have the
restriction that all SMT threads in each core must use the same MMU
mode (HPT or radix), though they can be in different partitions.
This patch series adds the ability to run HPT guests on a host in
radix mode. In order to comply with the restriction of not mixing HPT
and radix threads on the same core, we take a similar approach to that
already used on POWER8, namely, run the host in single-threaded mode
(only thread 0 of each core online), and have KVM be able to wake up
the other threads when a KVM guest is to be run, and use the other
threads for running guest VCPUs.
So that KVM knows whether it should be managing individual threads on
POWER9 (as it does currently) or whole cores, we add a new module
parameter called "indep_threads_mode". This is normally Y on POWER9
but must be set to N before any HPT guests can be run on a radix
host. The value of indep_threads_mode is sampled at the time of
creation of each guest, and the value at the time of creation is what
applies to that guest for the whole of its lifetime. It is preferable
to change indep_threads_mode only when no guests are running, in
order to avoid confusion or unnecessarily reduced performance.
In order to allow HPT guests to run on a radix host, the following
commands (or their equivalents) are required first:
# echo N >/sys/module/kvm_hv/parameters/indep_threads_mode
# ppc64_cpu --smt=off
KVM will run up to four vcpus on each core using the existing dynamic
micro-threading code. This can be controlled using the
target_smt_mode module parameter.
-------------------------------------------
The following changes since commit 9b8ebbdb74b5ad76b9dfd8b101af17839174b126:
KVM: x86: extend usage of RET_MMIO_PF_* constants (2017-10-12 14:01:56 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc kvm-ppc-next
for you to fetch changes up to c01015091a77035de1939ef106bfbcaf9a21395f:
KVM: PPC: Book3S HV: Run HPT guests on POWER9 radix hosts (2017-11-01 15:36:41 +1100)
----------------------------------------------------------------
Alexey Kardashevskiy (1):
KVM: PPC: Book3S PR: Enable in-kernel TCE handlers for PR KVM
Greg Kurz (1):
KVM: PPC: Book3S PR: Only install valid SLBs during KVM_SET_SREGS
Markus Elfring (1):
KVM: PPC: Book3S HV: Delete an error message for a failed memory allocation in kvmppc_allocate_hpt()
Michael Ellerman (1):
KVM: PPC: Tie KVM_CAP_PPC_HTM to the user-visible TM feature
Nicholas Piggin (1):
KVM: PPC: Book3S: Fix gas warning due to using r0 as immediate 0
Paul Mackerras (11):
KVM: PPC: Book3S HV: Handle unexpected interrupts better
KVM: PPC: Book3S HV: Explicitly disable HPT operations on radix guests
Revert "KVM: PPC: Book3S HV: POWER9 does not require secondary thread management"
KVM: PPC: Book3S HV: Don't call real-mode XICS hypercall handlers if not enabled
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
KVM: PPC: Book3S HV: Don't rely on host's page size information
KVM: PPC: Book3S HV: Rename hpte_setup_done to mmu_ready
KVM: PPC: Book3S HV: Unify dirty page map between HPT and radix
KVM: PPC: Book3S HV: Add infrastructure for running HPT guests on radix host
KVM: PPC: Book3S HV: Allow for running POWER9 host in single-threaded mode
KVM: PPC: Book3S HV: Run HPT guests on POWER9 radix hosts
Thomas Meyer (2):
KVM: PPC: Book3S HV: Use ARRAY_SIZE macro
KVM: PPC: BookE: Use vma_pages function
arch/powerpc/include/asm/kvm_book3s.h | 3 +-
arch/powerpc/include/asm/kvm_book3s_64.h | 140 +++++++++++--
arch/powerpc/include/asm/kvm_book3s_asm.h | 17 +-
arch/powerpc/include/asm/kvm_host.h | 6 +-
arch/powerpc/include/asm/kvm_ppc.h | 3 +
arch/powerpc/kernel/asm-offsets.c | 3 +
arch/powerpc/kernel/idle_book3s.S | 35 +---
arch/powerpc/kvm/book3s_64_mmu_hv.c | 124 +++++------
arch/powerpc/kvm/book3s_64_mmu_radix.c | 51 +----
arch/powerpc/kvm/book3s_64_slb.S | 2 +-
arch/powerpc/kvm/book3s_hv.c | 337 ++++++++++++++++++------------
arch/powerpc/kvm/book3s_hv_builtin.c | 117 ++++++++++-
arch/powerpc/kvm/book3s_hv_rm_mmu.c | 65 +++---
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 205 ++++++++++++++++--
arch/powerpc/kvm/book3s_pr.c | 16 +-
arch/powerpc/kvm/book3s_pr_papr.c | 2 +
arch/powerpc/kvm/e500_mmu_host.c | 2 +-
arch/powerpc/kvm/powerpc.c | 7 +-
18 files changed, 797 insertions(+), 338 deletions(-)
^ permalink raw reply [flat|nested] 100+ messages in thread* Re: [GIT PULL] Please pull my kvm-ppc-next branch
2017-11-02 6:54 ` Paul Mackerras
@ 2017-11-02 17:16 ` Paolo Bonzini
-1 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-11-02 17:16 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc
On 02/11/2017 07:54, Paul Mackerras wrote:
>
> Please do a pull from my kvm-ppc-next branch to get a PPC update for
> 4.15.
>
> I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
> powerpc tree to get two commits that touch both KVM PPC code and other
> PPC code.
>
> Apart from various bugfixes and code cleanups, the major new feature
> is the ability to run guests using the hashed page table (HPT) MMU
> mode on a host that is using the radix MMU mode. Because of
> limitations in the current POWER9 chip, this requires the host to be
> configured in a particular way. I have included the text from the
> cover letter of the patch series below in case you want to include it
> in the merge commit.
I will. However, note that using signed tags would have added the text
automatically.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread
* Re: [GIT PULL] Please pull my kvm-ppc-next branch
@ 2017-11-02 17:16 ` Paolo Bonzini
0 siblings, 0 replies; 100+ messages in thread
From: Paolo Bonzini @ 2017-11-02 17:16 UTC (permalink / raw)
To: Paul Mackerras, kvm; +Cc: kvm-ppc
On 02/11/2017 07:54, Paul Mackerras wrote:
>
> Please do a pull from my kvm-ppc-next branch to get a PPC update for
> 4.15.
>
> I have pulled in Michael Ellerman's topic/ppc-kvm branch from the
> powerpc tree to get two commits that touch both KVM PPC code and other
> PPC code.
>
> Apart from various bugfixes and code cleanups, the major new feature
> is the ability to run guests using the hashed page table (HPT) MMU
> mode on a host that is using the radix MMU mode. Because of
> limitations in the current POWER9 chip, this requires the host to be
> configured in a particular way. I have included the text from the
> cover letter of the patch series below in case you want to include it
> in the merge commit.
I will. However, note that using signed tags would have added the text
automatically.
Paolo
^ permalink raw reply [flat|nested] 100+ messages in thread