From patchwork Mon Jan 15 06:32:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jitindar Singh X-Patchwork-Id: 10163169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54B84601C0 for ; Mon, 15 Jan 2018 06:39:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 301C6286AD for ; Mon, 15 Jan 2018 06:39:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20ED928922; Mon, 15 Jan 2018 06:39:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9066F286AD for ; Mon, 15 Jan 2018 06:39:53 +0000 (UTC) Received: from localhost ([::1]:41338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eayQx-00055j-Sf for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Jan 2018 01:39:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eayKZ-0007tP-9k for qemu-devel@nongnu.org; Mon, 15 Jan 2018 01:33:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eayKY-0006vV-9g for qemu-devel@nongnu.org; Mon, 15 Jan 2018 01:33:15 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:41677) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eayKV-0006tC-IU; Mon, 15 Jan 2018 01:33:11 -0500 Received: by mail-pf0-x243.google.com with SMTP id j3so7595403pfh.8; Sun, 14 Jan 2018 22:33:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NFGhpTW/z2P/NR9I2tUoR6Sj2CkQXtkOBAkEdAHtjx4=; b=FuSj6weyjrUQHh2XlFXfl2x0l6URsYHDzlYE33I6eCEAwl1no4dgiheZf3JztMUppt YiFyXzisCGXZEZjuq9qd1DEIHMUYW6BvgSQLhwDd2Utos7FvzKzbf+eRcLNiuGC9pEED UGlAd1VOgEZHOGNmfiq5dfOeSK8+wZ7QPH/TyUOX/BCe+anU4oKXjNtMuAMW8eIUN4SU e4k8jSYrNd5mgY23onu40Z8jfIWutp2bz/QABu822UyIAff+VFq/lxFVANAwg8t6excA iH67M2AY1RRRBehrT/inlfvcu4GqbvBElSkPuLC6rrFU8QYrwhKzpPzgXKJ/CI8Oy8HO Io9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NFGhpTW/z2P/NR9I2tUoR6Sj2CkQXtkOBAkEdAHtjx4=; b=DcBwYF0b6k2XxY4oumPRLBk56mZUbeDHaQRVCy2bvG/KD3mvXYLIatQ5glEz1xdiZy B2LlR/nj1Hp6H1cEnGyENjQs/dBxBpYJ2WY8q4QP8e6YKSR7TXv5kFO4kbSAvtRU3ybx 7RgFynIraY4F00/8RSTjieC9inkb+3ydReFrMyp52cS9k6rwwETTwaizGhaUs4h/JTMK 2h/9zGP84FzMBHwdmn/c0JuOUYS2XTj3NMMB2vMBrFrIt4vOGpAl+79tfGr3SKHAbZN0 J5MUZzjZU2hepBkgFO9tuX58B+KLOXnBVbDYBt1qTHHaWevCXYGBwmVYTUrwiAzIa7qv CyBA== X-Gm-Message-State: AKwxytfRLOZj+aGFoGAjqSZuv7+6Yx+bKd5OvWYItFGfSbxjBs1SEyeD 31oEagIzo2s+9zwlzEaUn5sexVM/ X-Google-Smtp-Source: ACJfBotucF+WhwI12bB4gYHBHIdmLQkcaIFucooek+44Y9LUqYgDULb5X37NOA98D8PKVTJw3QLx4A== X-Received: by 10.101.90.71 with SMTP id z7mr17146154pgs.15.1515997990509; Sun, 14 Jan 2018 22:33:10 -0800 (PST) Received: from surajjs1.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id 13sm62362864pfs.112.2018.01.14.22.33.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jan 2018 22:33:10 -0800 (PST) From: Suraj Jitindar Singh To: qemu-ppc@nongnu.org Date: Mon, 15 Jan 2018 17:32:34 +1100 Message-Id: <20180115063235.7518-6-sjitindarsingh@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180115063235.7518-1-sjitindarsingh@gmail.com> References: <20180115063235.7518-1-sjitindarsingh@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [QEMU-PPC] [PATCH V3 5/6] target/ppc/spapr_caps: Add new tristate cap safe_indirect_branch 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: paulus@ozlabs.org, qemu-devel@nongnu.org, sjitindarsingh@gmail.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add new tristate cap cap-ibs to represent the indirect branch serialisation capability. Signed-off-by: Suraj Jitindar Singh Reviewed-by: David Gibson --- hw/ppc/spapr.c | 2 ++ hw/ppc/spapr_caps.c | 39 +++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 5 ++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 02a0cb656b..269c1c7857 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1793,6 +1793,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_cap_dfp, &vmstate_spapr_cap_cfpc, &vmstate_spapr_cap_sbbc, + &vmstate_spapr_cap_ibs, NULL } }; @@ -3867,6 +3868,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_DFP] = SPAPR_CAP_ON; smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_BROKEN; smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_BROKEN; + smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_BROKEN; spapr_caps_add_properties(smc, &error_abort); } diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 518e019cf7..0b36333a85 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -202,6 +202,17 @@ static void cap_safe_bounds_check_apply(sPAPRMachineState *spapr, uint8_t val, } } +static void cap_safe_indirect_branch_apply(sPAPRMachineState *spapr, + uint8_t val, Error **errp) +{ + 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"); + } +} + #define VALUE_DESC_TRISTATE " (broken, workaround, fixed)" sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { @@ -250,6 +261,15 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = { .type = "string", .apply = cap_safe_bounds_check_apply, }, + [SPAPR_CAP_IBS] = { + .name = "ibs", + .description = "Indirect Branch Serialisation" VALUE_DESC_TRISTATE, + .index = SPAPR_CAP_IBS, + .get = spapr_cap_get_tristate, + .set = spapr_cap_set_tristate, + .type = "string", + .apply = cap_safe_indirect_branch_apply, + }, }; static sPAPRCapabilities default_caps_with_cpu(sPAPRMachineState *spapr, @@ -424,6 +444,25 @@ const VMStateDescription vmstate_spapr_cap_sbbc = { }, }; +static bool spapr_cap_ibs_needed(void *opaque) +{ + sPAPRMachineState *spapr = opaque; + + return spapr->cmd_line_caps[SPAPR_CAP_IBS] && + (spapr->eff.caps[SPAPR_CAP_IBS] != spapr->def.caps[SPAPR_CAP_IBS]); +} + +const VMStateDescription vmstate_spapr_cap_ibs = { + .name = "spapr/cap/ibs", + .version_id = 1, + .minimum_version_id = 1, + .needed = spapr_cap_ibs_needed, + .fields = (VMStateField[]) { + VMSTATE_UINT8(mig.caps[SPAPR_CAP_IBS], sPAPRMachineState), + VMSTATE_END_OF_LIST() + }, +}; + void spapr_caps_reset(sPAPRMachineState *spapr) { sPAPRCapabilities default_caps; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index c65be62e92..549d7a4134 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -64,8 +64,10 @@ typedef enum { #define SPAPR_CAP_CFPC 0x03 /* Speculation Barrier Bounds Checking */ #define SPAPR_CAP_SBBC 0x04 +/* Indirect Branch Serialisation */ +#define SPAPR_CAP_IBS 0x05 /* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_SBBC + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_IBS + 1) /* * Capability Values @@ -785,6 +787,7 @@ extern const VMStateDescription vmstate_spapr_cap_vsx; extern const VMStateDescription vmstate_spapr_cap_dfp; extern const VMStateDescription vmstate_spapr_cap_cfpc; extern const VMStateDescription vmstate_spapr_cap_sbbc; +extern const VMStateDescription vmstate_spapr_cap_ibs; static inline uint8_t spapr_get_cap(sPAPRMachineState *spapr, int cap) {