[PULL 0/3] ppc queue

[PULL 0/3] ppc queue

[Cédric Le Goater]

The following changes since commit bc6ec396d471d9e4aae7e2ff8b72e11da9a97665:

  Merge tag 'pull-request-2022-04-01' of https://gitlab.com/thuth/qemu into staging (2022-04-02 09:36:07 +0100)

are available in the Git repository at:

  https://github.com/legoater/qemu/ tags/pull-ppc-20220404

for you to fetch changes up to 0798da8df9fd917515c957ae918d6d979cf5f3fb:

  linux-user/ppc: Narrow type of ccr in save_user_regs (2022-04-04 08:49:06 +0200)

----------------------------------------------------------------
ppc-7.0 queue:

* Coverity fixes
* Fix for a memory leak issue

----------------------------------------------------------------
Daniel Henrique Barboza (1):
      hw/ppc: free env->tb_env in spapr_unrealize_vcpu()

Frederic Barrat (1):
      ppc/pnv: Fix number of registers in the PCIe controller on POWER9

Richard Henderson (1):
      linux-user/ppc: Narrow type of ccr in save_user_regs

 include/hw/pci-host/pnv_phb4.h | 2 +-
 include/hw/ppc/ppc.h           | 1 +
 hw/ppc/ppc.c                   | 7 +++++++
 hw/ppc/spapr_cpu_core.c        | 3 +++
 linux-user/ppc/signal.c        | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

[PULL 1/3] hw/ppc: free env->tb_env in spapr_unrealize_vcpu()

[Cédric Le Goater]

From: Daniel Henrique Barboza <danielhb413@gmail.com>

The timebase is allocated during spapr_realize_vcpu() and it's not
freed. This results in memory leaks when doing vcpu unplugs:

==636935==
==636935== 144 (96 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 6
,461 of 8,135
==636935==    at 0x4897468: calloc (vg_replace_malloc.c:760)
==636935==    by 0x5077213: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6400.4)
==636935==    by 0x507757F: g_malloc0_n (in /usr/lib64/libglib-2.0.so.0.6400.4)
==636935==    by 0x93C3FB: cpu_ppc_tb_init (ppc.c:1066)
==636935==    by 0x97BC2B: spapr_realize_vcpu (spapr_cpu_core.c:268)
==636935==    by 0x97C01F: spapr_cpu_core_realize (spapr_cpu_core.c:337)
==636935==    by 0xD4626F: device_set_realized (qdev.c:531)
==636935==    by 0xD55273: property_set_bool (object.c:2273)
==636935==    by 0xD523DF: object_property_set (object.c:1408)
==636935==    by 0xD588B7: object_property_set_qobject (qom-qobject.c:28)
==636935==    by 0xD52897: object_property_set_bool (object.c:1477)
==636935==    by 0xD4579B: qdev_realize (qdev.c:333)
==636935==

This patch adds a cpu_ppc_tb_free() helper in hw/ppc/ppc.c to allow us
to free the timebase. This leak is then solved by calling
cpu_ppc_tb_free() in spapr_unrealize_vcpu().

Fixes: 6f4b5c3ec590 ("spapr: CPU hot unplug support")
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20220329124545.529145-2-danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 include/hw/ppc/ppc.h    | 1 +
 hw/ppc/ppc.c            | 7 +++++++
 hw/ppc/spapr_cpu_core.c | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
index b0ba4bd6b978..364f165b4b56 100644
--- a/include/hw/ppc/ppc.h
+++ b/include/hw/ppc/ppc.h
@@ -54,6 +54,7 @@ struct ppc_tb_t {
 
 uint64_t cpu_ppc_get_tb(ppc_tb_t *tb_env, uint64_t vmclk, int64_t tb_offset);
 clk_setup_cb cpu_ppc_tb_init (CPUPPCState *env, uint32_t freq);
+void cpu_ppc_tb_free(CPUPPCState *env);
 void cpu_ppc_hdecr_init(CPUPPCState *env);
 void cpu_ppc_hdecr_exit(CPUPPCState *env);
 
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index faa02d6710c9..fea70df45e69 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -1083,6 +1083,13 @@ clk_setup_cb cpu_ppc_tb_init (CPUPPCState *env, uint32_t freq)
     return &cpu_ppc_set_tb_clk;
 }
 
+void cpu_ppc_tb_free(CPUPPCState *env)
+{
+    timer_free(env->tb_env->decr_timer);
+    timer_free(env->tb_env->hdecr_timer);
+    g_free(env->tb_env);
+}
+
 /* cpu_ppc_hdecr_init may be used if the timer is not used by HDEC emulation */
 void cpu_ppc_hdecr_init(CPUPPCState *env)
 {
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index ed847139602f..8a4861f45a2a 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -189,10 +189,13 @@ static const VMStateDescription vmstate_spapr_cpu_state = {
 
 static void spapr_unrealize_vcpu(PowerPCCPU *cpu, SpaprCpuCore *sc)
 {
+    CPUPPCState *env = &cpu->env;
+
     if (!sc->pre_3_0_migration) {
         vmstate_unregister(NULL, &vmstate_spapr_cpu_state, cpu->machine_data);
     }
     spapr_irq_cpu_intc_destroy(SPAPR_MACHINE(qdev_get_machine()), cpu);
+    cpu_ppc_tb_free(env);
     qdev_unrealize(DEVICE(cpu));
 }
 
-- 
2.34.1

[PULL 2/3] ppc/pnv: Fix number of registers in the PCIe controller on POWER9

[Cédric Le Goater]

From: Frederic Barrat <fbarrat@linux.ibm.com>

The spec defines 3 registers, even though only index 0 and 2 are valid
on POWER9. The same model is used on POWER10. Register 1 is defined
there but we currently don't use it in skiboot. So we can keep
reporting an error on write.

Reported by Coverity (CID 1487176).

Fixes: 4f9924c4d4cf ("ppc/pnv: Add models for POWER9 PHB4 PCIe Host bridge")
Suggested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220401091925.770803-1-fbarrat@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 include/hw/pci-host/pnv_phb4.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index b02ecdceaa4c..19dcbd6f8727 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -180,7 +180,7 @@ struct PnvPhb4PecState {
     MemoryRegion nest_regs_mr;
 
     /* PCI registers, excluding per-stack */
-#define PHB4_PEC_PCI_REGS_COUNT     0x2
+#define PHB4_PEC_PCI_REGS_COUNT     0x3
     uint64_t pci_regs[PHB4_PEC_PCI_REGS_COUNT];
     MemoryRegion pci_regs_mr;
 
-- 
2.34.1

[PULL 3/3] linux-user/ppc: Narrow type of ccr in save_user_regs

[Cédric Le Goater]

From: Richard Henderson <richard.henderson@linaro.org>

Coverity warns that we shift a 32-bit value by N, and then
accumulate it into a 64-bit type (target_ulong on ppc64).

The ccr is always 8 * 4-bit fields, and thus is always a
32-bit quantity; narrow the type to avoid the warning.

Fixes: Coverity CID 1487223
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220401191643.330393-1-richard.henderson@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 linux-user/ppc/signal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index ec0b9c0df3da..ce5a4682cdfd 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -229,7 +229,7 @@ static void save_user_regs(CPUPPCState *env, struct target_mcontext *frame)
 {
     target_ulong msr = env->msr;
     int i;
-    target_ulong ccr = 0;
+    uint32_t ccr = 0;
 
     /* In general, the kernel attempts to be intelligent about what it
        needs to save for Altivec/FP/SPE registers.  We don't care that
-- 
2.34.1

Re: [PULL 0/3] ppc queue

[Peter Maydell]

On Mon, 4 Apr 2022 at 15:38, Cédric Le Goater <clg@kaod.org> wrote:
>
> The following changes since commit bc6ec396d471d9e4aae7e2ff8b72e11da9a97665:
>
>   Merge tag 'pull-request-2022-04-01' of https://gitlab.com/thuth/qemu into staging (2022-04-02 09:36:07 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/legoater/qemu/ tags/pull-ppc-20220404
>
> for you to fetch changes up to 0798da8df9fd917515c957ae918d6d979cf5f3fb:
>
>   linux-user/ppc: Narrow type of ccr in save_user_regs (2022-04-04 08:49:06 +0200)
>
> ----------------------------------------------------------------
> ppc-7.0 queue:
>
> * Coverity fixes
> * Fix for a memory leak issue
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.

-- PMM

[PULL 0/3] ppc queue

[Daniel Henrique Barboza]

The following changes since commit 005ad32358f12fe9313a4a01918a55e60d4f39e5:

  Merge tag 'pull-tpm-2023-09-12-3' of https://github.com/stefanberger/qemu-tpm into staging (2023-09-13 13:41:57 -0400)

are available in the Git repository at:

  https://gitlab.com/danielhb/qemu.git tags/pull-ppc-20230918

for you to fetch changes up to 44fa20c92811a9b88b41b4882a7e948c2fe6bd08:

  spapr: Remove support for NVIDIA V100 GPU with NVLink2 (2023-09-18 07:25:28 -0300)

----------------------------------------------------------------
ppc patch queue for 2023-09-18:

In this short queue we're making two important changes:

- Nicholas Piggin is now the qemu-ppc maintainer. Cédric Le Goater and
Daniel Barboza will act as backup during Nick's transition to this new
role.

- Support for NVIDIA V100 GPU with NVLink2 is dropped from qemu-ppc.
Linux removed the same support back in 5.13, we're following suit now.

A xive Coverity fix is also included.

----------------------------------------------------------------
Cédric Le Goater (2):
      ppc/xive: Fix uint32_t overflow
      spapr: Remove support for NVIDIA V100 GPU with NVLink2

Daniel Henrique Barboza (1):
      MAINTAINERS: Nick Piggin PPC maintainer, other PPC changes

 MAINTAINERS                 |  20 +-
 hw/intc/pnv_xive.c          |   2 +-
 hw/ppc/meson.build          |   1 -
 hw/ppc/spapr.c              |  22 +--
 hw/ppc/spapr_numa.c         |  49 +----
 hw/ppc/spapr_pci.c          |  19 --
 hw/ppc/spapr_pci_nvlink2.c  | 442 --------------------------------------------
 hw/vfio/pci-quirks.c        | 115 ------------
 hw/vfio/pci.c               |  14 --
 hw/vfio/pci.h               |   2 -
 hw/vfio/trace-events        |   4 -
 include/hw/pci-host/spapr.h |  45 -----
 include/hw/ppc/spapr.h      |   9 +-
 13 files changed, 22 insertions(+), 722 deletions(-)
 delete mode 100644 hw/ppc/spapr_pci_nvlink2.c

Re: [PULL 0/3] ppc queue

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/3] ppc queue

[Daniel Henrique Barboza]

The following changes since commit 3e4abe2c92964aadd35344a635b0f32cb487fd5c:

  Merge tag 'pull-block-2022-07-27' of https://gitlab.com/vsementsov/qemu into staging (2022-07-27 20:10:15 -0700)

are available in the Git repository at:

  https://gitlab.com/danielhb/qemu.git pull-ppc-20220728

for you to fetch changes up to 0c9717ff35d2fe46fa9cb91566fe2afbed9f4f2a:

  target/ppc: Implement new wait variants (2022-07-28 13:30:41 -0300)

----------------------------------------------------------------
ppc patch queue for 2022-07-28:

Short queue with 2 Coverity fixes and one fix of the
'wait' insns that is causing hangs if the guest kernel uses
the most up to date wait opcode.

- target/ppc:
  - implement new wait variants to fix guest hang when using the new opcode
- ppc440_uc: initialize length passed to cpu_physical_memory_map()
- spapr_nvdimm: check if spapr_drc_index() returns NULL

----------------------------------------------------------------
Daniel Henrique Barboza (1):
      hw/ppc: check if spapr_drc_index() returns NULL in spapr_nvdimm.c

Nicholas Piggin (1):
      target/ppc: Implement new wait variants

Peter Maydell (1):
      hw/ppc/ppc440_uc: Initialize length passed to cpu_physical_memory_map()

 hw/ppc/ppc440_uc.c     |  5 ++-
 hw/ppc/spapr_nvdimm.c  | 18 +++++++---
 target/ppc/internal.h  |  3 ++
 target/ppc/translate.c | 96 +++++++++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 109 insertions(+), 13 deletions(-)

Re: [PULL 0/3] ppc queue

[Richard Henderson]

On 7/28/22 09:55, Daniel Henrique Barboza wrote:
>    https://gitlab.com/danielhb/qemu.git  pull-ppc-20220728

fatal: couldn't find remote ref pull-ppc-20220728


Did you forget to push the tag to gitlab?


r~

Re: [PULL 0/3] ppc queue

[Daniel Henrique Barboza]

On 7/28/22 17:18, Richard Henderson wrote:
> On 7/28/22 09:55, Daniel Henrique Barboza wrote:
>>    https://gitlab.com/danielhb/qemu.git  pull-ppc-20220728
> 
> fatal: couldn't find remote ref pull-ppc-20220728
> 
> 
> Did you forget to push the tag to gitlab?

I guess I mistyped the credentials when running make-pullreq.sh and the
tag wasn't pushed. Can you try again? It is pushed now:

https://gitlab.com/danielhb/qemu/-/commits/pull-ppc-20220728


Thanks,


Daniel

> 
> 
> r~

Re: [PULL 0/3] ppc queue

[Richard Henderson]

On 7/28/22 09:55, Daniel Henrique Barboza wrote:
> The following changes since commit 3e4abe2c92964aadd35344a635b0f32cb487fd5c:
> 
>    Merge tag 'pull-block-2022-07-27' of https://gitlab.com/vsementsov/qemu into staging (2022-07-27 20:10:15 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/danielhb/qemu.git pull-ppc-20220728
> 
> for you to fetch changes up to 0c9717ff35d2fe46fa9cb91566fe2afbed9f4f2a:
> 
>    target/ppc: Implement new wait variants (2022-07-28 13:30:41 -0300)
> 
> ----------------------------------------------------------------
> ppc patch queue for 2022-07-28:
> 
> Short queue with 2 Coverity fixes and one fix of the
> 'wait' insns that is causing hangs if the guest kernel uses
> the most up to date wait opcode.
> 
> - target/ppc:
>    - implement new wait variants to fix guest hang when using the new opcode
> - ppc440_uc: initialize length passed to cpu_physical_memory_map()
> - spapr_nvdimm: check if spapr_drc_index() returns NULL

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.


r~


> 
> ----------------------------------------------------------------
> Daniel Henrique Barboza (1):
>        hw/ppc: check if spapr_drc_index() returns NULL in spapr_nvdimm.c
> 
> Nicholas Piggin (1):
>        target/ppc: Implement new wait variants
> 
> Peter Maydell (1):
>        hw/ppc/ppc440_uc: Initialize length passed to cpu_physical_memory_map()
> 
>   hw/ppc/ppc440_uc.c     |  5 ++-
>   hw/ppc/spapr_nvdimm.c  | 18 +++++++---
>   target/ppc/internal.h  |  3 ++
>   target/ppc/translate.c | 96 +++++++++++++++++++++++++++++++++++++++++++++-----
>   4 files changed, 109 insertions(+), 13 deletions(-)

[PULL 0/3] ppc queue

[Cédric Le Goater]

The following changes since commit 2058fdbe81e2985c226a026851dd26b146d3395c:

  Merge tag 'fixes-20220318-pull-request' of git://git.kraxel.org/qemu into staging (2022-03-19 11:28:54 +0000)

are available in the Git repository at:

  https://github.com/legoater/qemu/ tags/pull-ppc-20220321

for you to fetch changes up to 3515553bf625ad48aa90210379c4f387c2596093:

  target/ppc: Replicate Double->Single-Precision result (2022-03-20 23:35:27 +0100)

----------------------------------------------------------------
ppc-7.0 queue :

* ISA v3.1 vector instruction fixes
* Compilation fix regarding 'struct pt_regs' definition

----------------------------------------------------------------
Khem Raj (1):
      ppc64: Avoid pt_regs struct definition

Lucas Coutinho (1):
      target/ppc: Replicate Double->Single-Precision result

Richard Henderson (1):
      target/ppc: Replicate double->int32 result for some vector insns

 linux-user/include/host/ppc/host-signal.h   | 38 ------------
 linux-user/include/host/ppc64/host-signal.h | 42 ++++++++++++-
 target/ppc/fpu_helper.c                     | 93 +++++++++++++++++++++++++----
 3 files changed, 124 insertions(+), 49 deletions(-)
 delete mode 100644 linux-user/include/host/ppc/host-signal.h

Re: [PULL 0/3] ppc queue

[Peter Maydell]

On Mon, 21 Mar 2022 at 06:45, Cédric Le Goater <clg@kaod.org> wrote:
>
> The following changes since commit 2058fdbe81e2985c226a026851dd26b146d3395c:
>
>   Merge tag 'fixes-20220318-pull-request' of git://git.kraxel.org/qemu into staging (2022-03-19 11:28:54 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/legoater/qemu/ tags/pull-ppc-20220321
>
> for you to fetch changes up to 3515553bf625ad48aa90210379c4f387c2596093:
>
>   target/ppc: Replicate Double->Single-Precision result (2022-03-20 23:35:27 +0100)
>
> ----------------------------------------------------------------
> ppc-7.0 queue :
>
> * ISA v3.1 vector instruction fixes
> * Compilation fix regarding 'struct pt_regs' definition
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.

-- PMM