From nobody Sat May 4 09:44:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495003062228707.9809034540608; Tue, 16 May 2017 23:37:42 -0700 (PDT) Received: from localhost ([::1]:45706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAsaZ-0006d1-Pd for importer@patchew.org; Wed, 17 May 2017 02:37:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAsYz-0005PY-Vu for qemu-devel@nongnu.org; Wed, 17 May 2017 02:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAsYw-0005Ai-3c for qemu-devel@nongnu.org; Wed, 17 May 2017 02:36:02 -0400 Received: from ozlabs.org ([103.22.144.67]:54933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dAsYv-000595-Jl; Wed, 17 May 2017 02:35:58 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wSPhk6bhQz9s82; Wed, 17 May 2017 16:35:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495002950; bh=wcz9HxbQa3YudH7bmFtWyATHOGC6fAOLBXKiBHScdEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8ROGiZSe4GKLiAYfpa/JcXeEV93jJSYYq/oRy7dh9ktOZKNxv2lFbMBFYSdYf2CF /SIlGq6/LS2xQCumpTDEzj0gy7YJ9HHuFKIyjOGMTZ4ztGsHOpWZUBEZ2yXISbXpFr f65rnPuyhaRjEnZ1dahK3JEqzGmtLLKBXN/ngI+o= From: David Gibson To: abologna@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Wed, 17 May 2017 16:35:46 +1000 Message-Id: <20170517063547.23876-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170517063547.23876-1-david@gibson.dropbear.id.au> References: <20170517063547.23876-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [RFC 1/2] pseries: Split CAS PVR negotiation out into a separate function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Guests of the qemu machine type go through a feature negotiation process known as "client architecture support" (CAS) during early boot. This does a number of things, one of which is finding a CPU compatibility mode which can be supported by both guest and host. In fact the CPU negotiation is probably the single most complex part of the CAS process, so this splits it out into a helper function. We've recently made some mistakes in maintaining backward compatibility for old machine types here. Splitting this out will also make it easier to fix this. This also adds a possibly useful error message if the negotiation fails (i.e. if there is CPU mode that's suitable for both guest and host). Signed-off-by: David Gibson Tested-by: Andrea Bolognani --- hw/ppc/spapr_hcall.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0d608d6..007ae8d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1047,19 +1047,13 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *= cpu, } } =20 -static target_ulong h_client_architecture_support(PowerPCCPU *cpu, - sPAPRMachineState *spapr, - target_ulong opcode, - target_ulong *args) +static uint32_t cas_check_pvr(PowerPCCPU *cpu, target_ulong list, + Error **errp) { - target_ulong list =3D ppc64_phys_to_real(args[0]); - target_ulong ov_table; bool explicit_match =3D false; /* Matched the CPU's real PVR */ uint32_t max_compat =3D cpu->max_compat; uint32_t best_compat =3D 0; int i; - sPAPROptionVector *ov1_guest, *ov5_guest, *ov5_cas_old, *ov5_updates; - bool guest_radix; =20 /* * We scan the supplied table of PVRs looking for two things @@ -1090,26 +1084,43 @@ static target_ulong h_client_architecture_support(P= owerPCCPU *cpu, /* 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 */ - return H_HARDWARE; + error_setg(errp, "Couldn't negotiate a suitable PVR during CAS"); + return 0; } =20 /* Parsing finished */ trace_spapr_cas_pvr(cpu->compat_pvr, explicit_match, best_compat); =20 - /* Update CPUs */ - if (cpu->compat_pvr !=3D best_compat) { - Error *local_err =3D NULL; + return best_compat; +} + +static target_ulong h_client_architecture_support(PowerPCCPU *cpu, + sPAPRMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + /* @ov_table points to the first option vector */ + target_ulong ov_table =3D ppc64_phys_to_real(args[0]); + uint32_t cas_pvr; + sPAPROptionVector *ov1_guest, *ov5_guest, *ov5_cas_old, *ov5_updates; + bool guest_radix; + Error *local_err =3D NULL; =20 - ppc_set_compat_all(best_compat, &local_err); + cas_pvr =3D cas_check_pvr(cpu, ov_table, &local_err); + if (local_err) { + error_report_err(local_err); + return H_HARDWARE; + } + + /* Update CPUs */ + if (cpu->compat_pvr !=3D cas_pvr) { + ppc_set_compat_all(cas_pvr, &local_err); if (local_err) { error_report_err(local_err); return H_HARDWARE; } } =20 - /* For the future use: here @ov_table points to the first option vecto= r */ - ov_table =3D list; - ov1_guest =3D spapr_ovec_parse_vector(ov_table, 1); ov5_guest =3D spapr_ovec_parse_vector(ov_table, 5); if (spapr_ovec_test(ov5_guest, OV5_MMU_BOTH)) { --=20 2.9.4 From nobody Sat May 4 09:44:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495003065765328.3136856584299; Tue, 16 May 2017 23:37:45 -0700 (PDT) Received: from localhost ([::1]:45707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAsae-0006gn-4U for importer@patchew.org; Wed, 17 May 2017 02:37:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAsYz-0005PZ-Vt for qemu-devel@nongnu.org; Wed, 17 May 2017 02:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAsYw-0005AZ-2k for qemu-devel@nongnu.org; Wed, 17 May 2017 02:36:02 -0400 Received: from ozlabs.org ([103.22.144.67]:41799) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dAsYv-000596-Hi; Wed, 17 May 2017 02:35:57 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wSPhl0RKpz9s85; Wed, 17 May 2017 16:35:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495002951; bh=mpVVIqURYqRJQ7qYoyLPWCeeX7r1Nb5E27dcYkY5s/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DRER5fmdXzVCi2y0+xFk7PX243DuxWJpTk8DZI4bhYGpL/6x1syOG1+1hZtbk75/U g+64gewJYXg29zSkYMqwMUxbRYmZalsG+eU7x5NUfXehwIm98wyLvUK5GOWpxVfizd elW9S6m1SoD79OCJrvm1whnrn/9bos7IU82asplA= From: David Gibson To: abologna@redhat.com, thuth@redhat.com, lvivier@redhat.com Date: Wed, 17 May 2017 16:35:47 +1000 Message-Id: <20170517063547.23876-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170517063547.23876-1-david@gibson.dropbear.id.au> References: <20170517063547.23876-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [RFC 2/2] pseries: Restore PVR negotiation logic for pre-2.9 machine types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" "pseries" guests go through a hypervisor<->guest feature negotiation during early boot. Part of this is finding a CPU compatibility mode which works for both. In 152ef80 "pseries: Rewrite CAS PVR compatibility logic" this logic was changed to strongly prefer architecture defined CPU compatibility modes, rather than CPU "raw" modes. However, this change was made universally, which introduces a guest visible change for the previously existing machine types (pseries-2.8 and earlier). That's never supposed to happen. This corrects the behaviour, reverting to the old PVR negotiation logic for machine types prior to pseries-2.9. Fixes: 152ef803ceb1959e2380a1da7736b935b109222e Reported-by: Andrea Bolognani Signed-off-by: David Gibson Reviewed-by: Laurent Vivier Tested-by: Andrea Bolognani --- hw/ppc/spapr.c | 3 ++ hw/ppc/spapr_hcall.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++= +++- include/hw/ppc/spapr.h | 1 + 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a9471b9..913355f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3308,9 +3308,12 @@ static void spapr_machine_2_8_instance_options(Machi= neState *machine) =20 static void spapr_machine_2_8_class_options(MachineClass *mc) { + sPAPRMachineClass *smc =3D SPAPR_MACHINE_CLASS(mc); + spapr_machine_2_9_class_options(mc); SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8); mc->numa_mem_align_shift =3D 23; + smc->pre_2_9_cas_pvr =3D true; } =20 DEFINE_SPAPR_MACHINE(2_8, "2.8", false); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 007ae8d..4937019 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1047,6 +1047,89 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *c= pu, } } =20 +/* + * Old logic for PVR negotiation, used old <2.9 machine types for + * compatibility with old qemu versions + */ +#define get_compat_level(cpuver) ( \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_05) ? 2050 : \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_06) ? 2060 : \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_06_PLUS) ? 2061 : \ + ((cpuver) =3D=3D CPU_POWERPC_LOGICAL_2_07) ? 2070 : 0) + +static void cas_handle_compat_cpu(PowerPCCPUClass *pcc, uint32_t pvr, + unsigned max_lvl, unsigned *compat_lvl, + unsigned *compat_pvr) +{ + unsigned lvl =3D get_compat_level(pvr); + bool is205, is206, is207; + + if (!lvl) { + return; + } + + /* If it is a logical PVR, try to determine the highest level */ + is205 =3D (pcc->pcr_supported & PCR_COMPAT_2_05) && + (lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_05)); + is206 =3D (pcc->pcr_supported & PCR_COMPAT_2_06) && + ((lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_06)) || + (lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_06_PLUS))); + is207 =3D (pcc->pcr_supported & PCR_COMPAT_2_07) && + (lvl =3D=3D get_compat_level(CPU_POWERPC_LOGICAL_2_07)); + + if (is205 || is206 || is207) { + if (!max_lvl) { + /* User did not set the level, choose the highest */ + if (*compat_lvl <=3D lvl) { + *compat_lvl =3D lvl; + *compat_pvr =3D pvr; + } + } else if (max_lvl >=3D lvl) { + /* User chose the level, don't set higher than this */ + *compat_lvl =3D lvl; + *compat_pvr =3D pvr; + } + } +} + +static uint32_t cas_check_pvr_pre_2_9(PowerPCCPU *cpu, target_ulong list, + Error **errp) +{ + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + int counter; + unsigned max_lvl =3D get_compat_level(cpu->max_compat); + bool cpu_match =3D false; + unsigned compat_lvl =3D 0, compat_pvr =3D 0; + + for (counter =3D 0; counter < 512; ++counter) { + uint32_t pvr, pvr_mask; + + pvr_mask =3D ldl_be_phys(&address_space_memory, list); + pvr =3D ldl_be_phys(&address_space_memory, list + 4); + list +=3D 8; + + if (~pvr_mask & pvr) { + break; /* Terminator record */ + } + + trace_spapr_cas_pvr_try(pvr); + if (!max_lvl && + ((cpu->env.spr[SPR_PVR] & pvr_mask) =3D=3D (pvr & pvr_mask))) { + cpu_match =3D true; + compat_pvr =3D 0; + } else if (pvr =3D=3D cpu->compat_pvr) { + cpu_match =3D true; + compat_pvr =3D cpu->compat_pvr; + } else if (!cpu_match) { + cas_handle_compat_cpu(pcc, pvr, max_lvl, &compat_lvl, &compat_= pvr); + } + } + + trace_spapr_cas_pvr(cpu->compat_pvr, cpu_match, compat_pvr); + + return compat_pvr; +} + static uint32_t cas_check_pvr(PowerPCCPU *cpu, target_ulong list, Error **errp) { @@ -1099,6 +1182,7 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, target_ulong opcode, target_ulong *args) { + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); /* @ov_table points to the first option vector */ target_ulong ov_table =3D ppc64_phys_to_real(args[0]); uint32_t cas_pvr; @@ -1106,7 +1190,11 @@ static target_ulong h_client_architecture_support(Po= werPCCPU *cpu, bool guest_radix; Error *local_err =3D NULL; =20 - cas_pvr =3D cas_check_pvr(cpu, ov_table, &local_err); + if (smc->pre_2_9_cas_pvr) { + cas_pvr =3D cas_check_pvr_pre_2_9(cpu, ov_table, &local_err); + } else { + cas_pvr =3D cas_check_pvr(cpu, ov_table, &local_err); + } if (local_err) { error_report_err(local_err); return H_HARDWARE; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5802f88..0863a41 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -52,6 +52,7 @@ struct sPAPRMachineClass { /*< public >*/ bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMBs = */ bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ + bool pre_2_9_cas_pvr; /* Use old logic for PVR compat negotiation= */ const char *tcg_default_cpu; /* which (TCG) CPU to simulate by default= */ void (*phb_placement)(sPAPRMachineState *spapr, uint32_t index, uint64_t *buid, hwaddr *pio,=20 --=20 2.9.4