Re: [PATCH 5/9] target/ppc: make vhyp get_pate method take lpid and return success

[Cédric Le Goater]

On 2/15/22 04:16, Nicholas Piggin wrote:
> In prepartion for implementing a full partition table option for
> vhyp, update the get_pate method to take an lpid and return a
> success/fail indicator.
>
> The spapr implementation currently just asserts lpid is always 0
> and always return success.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.



> ---
>   hw/ppc/spapr.c           | 7 ++++++-
>   target/ppc/cpu.h         | 3 ++-
>   target/ppc/mmu-radix64.c | 7 ++++++-
>   3 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 15a02d3e78..1892a29e2d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1309,13 +1309,18 @@ void spapr_set_all_lpcrs(target_ulong value, 
> target_ulong mask)
>       }
>   }
>   
> -static void spapr_get_pate(PPCVirtualHypervisor *vhyp, ppc_v3_pate_t *entry)
> +static bool spapr_get_pate(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu,
> +                           target_ulong lpid, ppc_v3_pate_t *entry)
>   {
>       SpaprMachineState *spapr = SPAPR_MACHINE(vhyp);
>   
> +    assert(lpid == 0);
> +
>       /* Copy PATE1:GR into PATE0:HR */
>       entry->dw0 = spapr->patb_entry & PATE0_HR;
>       entry->dw1 = spapr->patb_entry;
> +
> +    return true;
>   }
>   
>   #define HPTE(_table, _i)   (void *)(((uint64_t *)(_table)) + ((_i) * 2))
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 555c6b9245..c79ae74f10 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1320,7 +1320,8 @@ struct PPCVirtualHypervisorClass {
>                           hwaddr ptex, int n);
>       void (*hpte_set_c)(PPCVirtualHypervisor *vhyp, hwaddr ptex, uint64_t 
> pte1);
>       void (*hpte_set_r)(PPCVirtualHypervisor *vhyp, hwaddr ptex, uint64_t 
> pte1);
> -    void (*get_pate)(PPCVirtualHypervisor *vhyp, ppc_v3_pate_t *entry);
> +    bool (*get_pate)(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu,
> +                     target_ulong lpid, ppc_v3_pate_t *entry);
>       target_ulong (*encode_hpt_for_kvm_pr)(PPCVirtualHypervisor *vhyp);
>       void (*cpu_exec_enter)(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu);
>       void (*cpu_exec_exit)(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu);
> diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c
> index 5535f0fe20..3b6d75a292 100644
> --- a/target/ppc/mmu-radix64.c
> +++ b/target/ppc/mmu-radix64.c
> @@ -563,7 +563,12 @@ static bool ppc_radix64_xlate_impl(PowerPCCPU *cpu, vaddr 
> eaddr,
>       if (cpu->vhyp) {
>           PPCVirtualHypervisorClass *vhc;
>           vhc = PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp);
> -        vhc->get_pate(cpu->vhyp, &pate);
> +        if (!vhc->get_pate(cpu->vhyp, cpu, lpid, &pate)) {
> +            if (guest_visible) {
> +                ppc_radix64_raise_hsi(cpu, access_type, eaddr, eaddr, 
> DSISR_R_BADCONFIG);
> +            }
> +            return false;
> +        }
>       } else {
>           if (!ppc64_v3_get_pate(cpu, lpid, &pate)) {
>               if (guest_visible) {