From nobody Mon Feb 9 23:18:17 2026 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.zohomail.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 1519971683363264.65215809561016; Thu, 1 Mar 2018 22:21:23 -0800 (PST) Received: from localhost ([::1]:32838 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ere4I-0006CG-Ba for importer@patchew.org; Fri, 02 Mar 2018 01:21:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erdng-0000mN-Gk for qemu-devel@nongnu.org; Fri, 02 Mar 2018 01:04:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erdnc-0004A4-PM for qemu-devel@nongnu.org; Fri, 02 Mar 2018 01:04:12 -0500 Received: from ozlabs.org ([103.22.144.67]:56771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erdnb-00044V-VP; Fri, 02 Mar 2018 01:04:08 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zszJZ4HCsz9sX5; Fri, 2 Mar 2018 17:03:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1519970638; bh=MzwtUvhryxDWXExEqILigi4iQRClFxHyQSt5rFchHYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfPR03+1/i2qnYC32g94jo0OWWG/ADgdr6jBm0YSxGnbpT4DnPCjh4UEDIIH8MtfP pnPGx3A4yJioYgTBISekNXmwNI7eMM+lC1JCDCbMvUpVIMjQJhYeDOdUCI+jqW9jFm KGgYQTndQ/rbL8l3AtdOUTTZnLLvKCTwM57mL9CA= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 2 Mar 2018 17:03:48 +1100 Message-Id: <20180302060350.24330-23-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180302060350.24330-1-david@gibson.dropbear.id.au> References: <20180302060350.24330-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] [PULL 22/24] ppc/spapr-caps: Convert cap-ibs to custom spapr-cap 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: surajjs@au1.ibm.com, mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, Suraj Jitindar Singh , 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" From: Suraj Jitindar Singh Convert cap-ibs (indirect branch speculation) to a custom spapr-cap type. All tristate caps have now been converted to custom spapr-caps, so remove the remaining support for them. Signed-off-by: Suraj Jitindar Singh [dwg: Don't explicitly list "?"/help option, trust convention] [dwg: Fold tristate removal into here, to not break bisect] Signed-off-by: David Gibson --- hw/ppc/spapr_caps.c | 81 ++++++++++------------------------------------= ---- hw/ppc/spapr_hcall.c | 5 +++- include/hw/ppc/spapr.h | 5 +++- target/ppc/kvm.c | 6 ++-- 4 files changed, 28 insertions(+), 69 deletions(-) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index f75d6ff211..c09febcf12 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -89,65 +89,6 @@ static void spapr_cap_set_bool(Object *obj, Visitor *v, = const char *name, spapr->eff.caps[cap->index] =3D value ? SPAPR_CAP_ON : SPAPR_CAP_OFF; } =20 -static void spapr_cap_get_tristate(Object *obj, Visitor *v, const char *na= me, - void *opaque, Error **errp) -{ - sPAPRCapabilityInfo *cap =3D opaque; - sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); - char *val =3D NULL; - uint8_t value =3D spapr_get_cap(spapr, cap->index); - - switch (value) { - case SPAPR_CAP_BROKEN: - val =3D g_strdup("broken"); - break; - case SPAPR_CAP_WORKAROUND: - val =3D g_strdup("workaround"); - break; - case SPAPR_CAP_FIXED: - val =3D g_strdup("fixed"); - break; - default: - error_setg(errp, "Invalid value (%d) for cap-%s", value, cap->name= ); - return; - } - - visit_type_str(v, name, &val, errp); - g_free(val); -} - -static void spapr_cap_set_tristate(Object *obj, Visitor *v, const char *na= me, - void *opaque, Error **errp) -{ - sPAPRCapabilityInfo *cap =3D opaque; - sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); - char *val; - Error *local_err =3D NULL; - uint8_t value; - - visit_type_str(v, name, &val, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - - if (!strcasecmp(val, "broken")) { - value =3D SPAPR_CAP_BROKEN; - } else if (!strcasecmp(val, "workaround")) { - value =3D SPAPR_CAP_WORKAROUND; - } else if (!strcasecmp(val, "fixed")) { - value =3D SPAPR_CAP_FIXED; - } else { - error_setg(errp, "Invalid capability mode \"%s\" for cap-%s", val, - cap->name); - goto out; - } - - spapr->cmd_line_caps[cap->index] =3D true; - spapr->eff.caps[cap->index] =3D value; -out: - g_free(val); -} =20 static void spapr_cap_get_string(Object *obj, Visitor *v, const char *nam= e, void *opaque, Error **errp) @@ -286,16 +227,25 @@ static void cap_safe_bounds_check_apply(sPAPRMachineS= tate *spapr, uint8_t val, } } =20 +sPAPRCapPossible cap_ibs_possible =3D { + .num =3D 4, + /* Note workaround only maintained for compatibility */ + .vals =3D {"broken", "workaround", "fixed-ibs", "fixed-ccd"}, + .help =3D "broken - no protection, fixed-ibs - indirect branch seriali= sation, fixed-ccd - cache count disabled", +}; + static void cap_safe_indirect_branch_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp) { + uint8_t kvm_val =3D kvmppc_get_cap_safe_indirect_branch(); + if (val =3D=3D SPAPR_CAP_WORKAROUND) { /* Can only be Broken or Fixed = */ - error_setg(errp, "Requested safe indirect branch capability level = \"workaround\" not valid, try cap-ibs=3Dfixed"); + error_setg(errp, "Requested safe indirect branch capability level = \"workaround\" not valid, try cap-ibs=3D%s", cap_ibs_possible.vals[kvm_val]= ); } else if (tcg_enabled() && val) { /* TODO - for now only allow broken for TCG */ error_setg(errp, "Requested safe indirect branch capability level = not supported by tcg, try a different value for cap-ibs"); - } else if (kvm_enabled() && (val > kvmppc_get_cap_safe_indirect_branch= ())) { - error_setg(errp, "Requested safe indirect branch capability level = not supported by kvm, try a different value for cap-ibs"); + } else if (kvm_enabled() && val && (val !=3D kvm_val)) { + error_setg(errp, "Requested safe indirect branch capability level = not supported by kvm, try cap-ibs=3D%s", cap_ibs_possible.vals[kvm_val]); } } =20 @@ -351,11 +301,12 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = =3D { }, [SPAPR_CAP_IBS] =3D { .name =3D "ibs", - .description =3D "Indirect Branch Serialisation (broken, fixed)", + .description =3D "Indirect Branch Speculation (broken, fixed-ibs, = fixed-ccd)", .index =3D SPAPR_CAP_IBS, - .get =3D spapr_cap_get_tristate, - .set =3D spapr_cap_set_tristate, + .get =3D spapr_cap_get_string, + .set =3D spapr_cap_set_string, .type =3D "string", + .possible =3D &cap_ibs_possible, .apply =3D cap_safe_indirect_branch_apply, }, }; diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 1986560480..16bccdd5c0 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1705,7 +1705,10 @@ static target_ulong h_get_cpu_characteristics(PowerP= CCPU *cpu, } =20 switch (safe_indirect_branch) { - case SPAPR_CAP_FIXED: + case SPAPR_CAP_FIXED_CCD: + characteristics |=3D H_CPU_CHAR_CACHE_COUNT_DIS; + break; + case SPAPR_CAP_FIXED_IBS: characteristics |=3D H_CPU_CHAR_BCCTRL_SERIALISED; break; default: /* broken */ diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 36942b378d..d60b7c6d7a 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -75,10 +75,12 @@ typedef enum { /* Bool Caps */ #define SPAPR_CAP_OFF 0x00 #define SPAPR_CAP_ON 0x01 -/* Broken | Workaround | Fixed Caps */ +/* Custom Caps */ #define SPAPR_CAP_BROKEN 0x00 #define SPAPR_CAP_WORKAROUND 0x01 #define SPAPR_CAP_FIXED 0x02 +#define SPAPR_CAP_FIXED_IBS 0x02 +#define SPAPR_CAP_FIXED_CCD 0x03 =20 typedef struct sPAPRCapabilities sPAPRCapabilities; struct sPAPRCapabilities { @@ -313,6 +315,7 @@ struct sPAPRMachineState { #define H_CPU_CHAR_L1D_THREAD_PRIV PPC_BIT(4) #define H_CPU_CHAR_HON_BRANCH_HINTS PPC_BIT(5) #define H_CPU_CHAR_THR_RECONF_TRIG PPC_BIT(6) +#define H_CPU_CHAR_CACHE_COUNT_DIS PPC_BIT(7) #define H_CPU_BEHAV_FAVOUR_SECURITY PPC_BIT(0) #define H_CPU_BEHAV_L1D_FLUSH_PR PPC_BIT(1) #define H_CPU_BEHAV_BNDS_CHK_SPEC_BAR PPC_BIT(2) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 2c183f61e2..79a436a384 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2494,8 +2494,10 @@ static void kvmppc_get_cpu_characteristics(KVMState = *s) cap_ppc_safe_bounds_check =3D 1; } /* Parse and set cap_ppc_safe_indirect_branch */ - if (c.character & c.character_mask & H_CPU_CHAR_BCCTRL_SERIALISED) { - cap_ppc_safe_indirect_branch =3D 2; + if (c.character & c.character_mask & H_CPU_CHAR_CACHE_COUNT_DIS) { + cap_ppc_safe_indirect_branch =3D SPAPR_CAP_FIXED_CCD; + } else if (c.character & c.character_mask & H_CPU_CHAR_BCCTRL_SERIALIS= ED) { + cap_ppc_safe_indirect_branch =3D SPAPR_CAP_FIXED_IBS; } } =20 --=20 2.14.3