| Message ID | 20200914123505.612812-6-groug@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | spapr: Error handling fixes and cleanups (round 2) | expand |
14.09.2020 15:34, Greg Kurz wrote: > The cas_check_pvr() function has two purposes: > - finding the "best" logical PVR, ie. the most recent one supported by > the guest for this CPU type > - checking if the guest supports the real PVR of this CPU type, which > is just an optional extra information to workaround the lack of > support for "compat" mode in PR KVM > > This logic doesn't need error reporting, really. If we don't find a > suitable logical PVR, we return the special value 0 which is definitely > not a valid PVR. Let the caller decide on whether it should error out > or not. maybe then rename it s/cas_check_pvr/cas_find_compat_pvr/ or something like this? > > This doesn't change the behavior. > > Signed-off-by: Greg Kurz <groug@kaod.org> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> -- Best regards, Vladimir
On Tue, 15 Sep 2020 13:03:13 +0300 Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > 14.09.2020 15:34, Greg Kurz wrote: > > The cas_check_pvr() function has two purposes: > > - finding the "best" logical PVR, ie. the most recent one supported by > > the guest for this CPU type > > - checking if the guest supports the real PVR of this CPU type, which > > is just an optional extra information to workaround the lack of > > support for "compat" mode in PR KVM > > > > This logic doesn't need error reporting, really. If we don't find a > > suitable logical PVR, we return the special value 0 which is definitely > > not a valid PVR. Let the caller decide on whether it should error out > > or not. > > maybe then rename it s/cas_check_pvr/cas_find_compat_pvr/ or something like this? > Ah yes, since this function doesn't do an actual check anymore, it may be worth changing its name. > > > > This doesn't change the behavior. > > > > Signed-off-by: Greg Kurz <groug@kaod.org> > > Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > > >
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index c2776b6a7de2..885ea60778ba 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1590,12 +1590,11 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *cpu, } } -static uint32_t cas_check_pvr(SpaprMachineState *spapr, PowerPCCPU *cpu, - target_ulong *addr, bool *raw_mode_supported, - Error **errp) +/* Returns either a logical PVR or zero if none was found */ +static uint32_t cas_check_pvr(PowerPCCPU *cpu, uint32_t max_compat, + target_ulong *addr, bool *raw_mode_supported) { bool explicit_match = false; /* Matched the CPU's real PVR */ - uint32_t max_compat = spapr->max_compat_pvr; uint32_t best_compat = 0; int i; @@ -1624,14 +1623,6 @@ static uint32_t cas_check_pvr(SpaprMachineState *spapr, PowerPCCPU *cpu, } } - if ((best_compat == 0) && (!explicit_match || max_compat)) { - /* We couldn't find a suitable compatibility mode, and either - * the guest doesn't support "raw" mode for this CPU, or raw - * mode is disabled because a maximum compat mode is set */ - error_setg(errp, "Couldn't negotiate a suitable PVR during CAS"); - return 0; - } - *raw_mode_supported = explicit_match; /* Parsing finished */ @@ -1680,6 +1671,7 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu, bool guest_xive; CPUState *cs; void *fdt; + uint32_t max_compat = spapr->max_compat_pvr; /* CAS is supposed to be called early when only the boot vCPU is active. */ CPU_FOREACH(cs) { @@ -1692,9 +1684,14 @@ target_ulong do_client_architecture_support(PowerPCCPU *cpu, } } - cas_pvr = cas_check_pvr(spapr, cpu, &vec, &raw_mode_supported, &local_err); - if (local_err) { - error_report_err(local_err); + cas_pvr = cas_check_pvr(cpu, max_compat, &vec, &raw_mode_supported); + if (!cas_pvr && (!raw_mode_supported || max_compat)) { + /* + * We couldn't find a suitable compatibility mode, and either + * the guest doesn't support "raw" mode for this CPU, or "raw" + * mode is disabled because a maximum compat mode is set. + */ + error_report("Couldn't negotiate a suitable PVR during CAS"); return H_HARDWARE; }
The cas_check_pvr() function has two purposes: - finding the "best" logical PVR, ie. the most recent one supported by the guest for this CPU type - checking if the guest supports the real PVR of this CPU type, which is just an optional extra information to workaround the lack of support for "compat" mode in PR KVM This logic doesn't need error reporting, really. If we don't find a suitable logical PVR, we return the special value 0 which is definitely not a valid PVR. Let the caller decide on whether it should error out or not. This doesn't change the behavior. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/ppc/spapr_hcall.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)