|
 |
c7c90d |
From e9c565a32315df050f7181931e545270de1641d0 Mon Sep 17 00:00:00 2001
|
|
|
c7c90d |
From: Suraj Jitindar Singh <sursingh@redhat.com>
|
|
|
c7c90d |
Date: Tue, 13 Mar 2018 05:21:33 +0100
|
|
|
c7c90d |
Subject: [PATCH 11/17] ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap
|
|
|
c7c90d |
|
|
|
c7c90d |
RH-Author: Suraj Jitindar Singh <sursingh@redhat.com>
|
|
|
c7c90d |
Message-id: <1520918499-27663-6-git-send-email-sursingh@redhat.com>
|
|
|
c7c90d |
Patchwork-id: 79251
|
|
|
c7c90d |
O-Subject: [RHEL7.5 qemu-kvm-rhev PATCH 05/11] ppc/spapr-caps: Convert cap-cfpc to custom spapr-cap
|
|
|
c7c90d |
Bugzilla: 1554957
|
|
|
c7c90d |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
c7c90d |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
c7c90d |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
c7c90d |
|
|
|
c7c90d |
From: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
|
|
|
c7c90d |
|
|
|
c7c90d |
Convert cap-cfpc (cache flush on privilege change) to a custom spapr-cap
|
|
|
c7c90d |
type.
|
|
|
c7c90d |
|
|
|
c7c90d |
Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
|
|
|
c7c90d |
[dwg: Don't explicitly list "?"/help option, trusting convention]
|
|
|
c7c90d |
[dwg: Strip no-longer-necessary ATTRIBUTE_UNUSED back off]
|
|
|
c7c90d |
[dwg: Fix some minor style problems]
|
|
|
c7c90d |
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
c7c90d |
|
|
|
c7c90d |
(cherry picked from commit f27aa81e72b5a5e184a0f3aa3e77061f4fcfb265)
|
|
|
c7c90d |
|
|
|
c7c90d |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1548919
|
|
|
c7c90d |
|
|
|
c7c90d |
Signed-off-by: Suraj Jitindar Singh <sursingh@redhat.com>
|
|
|
c7c90d |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
c7c90d |
---
|
|
|
c7c90d |
hw/ppc/spapr_caps.c | 33 ++++++++++++++++++++++-----------
|
|
|
c7c90d |
1 file changed, 22 insertions(+), 11 deletions(-)
|
|
|
c7c90d |
|
|
|
c7c90d |
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
|
|
|
c7c90d |
index 3d8b796..b5a991f 100644
|
|
|
c7c90d |
--- a/hw/ppc/spapr_caps.c
|
|
|
c7c90d |
+++ b/hw/ppc/spapr_caps.c
|
|
|
c7c90d |
@@ -149,9 +149,8 @@ out:
|
|
|
c7c90d |
g_free(val);
|
|
|
c7c90d |
}
|
|
|
c7c90d |
|
|
|
c7c90d |
-static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v,
|
|
|
c7c90d |
- const char *name,
|
|
|
c7c90d |
- void *opaque, Error **errp)
|
|
|
c7c90d |
+static void spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
|
|
|
c7c90d |
+ void *opaque, Error **errp)
|
|
|
c7c90d |
{
|
|
|
c7c90d |
sPAPRCapabilityInfo *cap = opaque;
|
|
|
c7c90d |
sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
|
|
|
c7c90d |
@@ -169,9 +168,8 @@ static void ATTRIBUTE_UNUSED spapr_cap_get_string(Object *obj, Visitor *v,
|
|
|
c7c90d |
g_free(val);
|
|
|
c7c90d |
}
|
|
|
c7c90d |
|
|
|
c7c90d |
-static void ATTRIBUTE_UNUSED spapr_cap_set_string(Object *obj, Visitor *v,
|
|
|
c7c90d |
- const char *name,
|
|
|
c7c90d |
- void *opaque, Error **errp)
|
|
|
c7c90d |
+static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name,
|
|
|
c7c90d |
+ void *opaque, Error **errp)
|
|
|
c7c90d |
{
|
|
|
c7c90d |
sPAPRCapabilityInfo *cap = opaque;
|
|
|
c7c90d |
sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
|
|
|
c7c90d |
@@ -250,14 +248,26 @@ static void cap_dfp_apply(sPAPRMachineState *spapr, uint8_t val, Error **errp)
|
|
|
c7c90d |
}
|
|
|
c7c90d |
}
|
|
|
c7c90d |
|
|
|
c7c90d |
+sPAPRCapPossible cap_cfpc_possible = {
|
|
|
c7c90d |
+ .num = 3,
|
|
|
c7c90d |
+ .vals = {"broken", "workaround", "fixed"},
|
|
|
c7c90d |
+ .help = "broken - no protection, workaround - workaround available,"
|
|
|
c7c90d |
+ " fixed - fixed in hardware",
|
|
|
c7c90d |
+};
|
|
|
c7c90d |
+
|
|
|
c7c90d |
static void cap_safe_cache_apply(sPAPRMachineState *spapr, uint8_t val,
|
|
|
c7c90d |
Error **errp)
|
|
|
c7c90d |
{
|
|
|
c7c90d |
+ uint8_t kvm_val = kvmppc_get_cap_safe_cache();
|
|
|
c7c90d |
+
|
|
|
c7c90d |
if (tcg_enabled() && val) {
|
|
|
c7c90d |
/* TODO - for now only allow broken for TCG */
|
|
|
c7c90d |
- error_setg(errp, "Requested safe cache capability level not supported by tcg, try a different value for cap-cfpc");
|
|
|
c7c90d |
- } else if (kvm_enabled() && (val > kvmppc_get_cap_safe_cache())) {
|
|
|
c7c90d |
- error_setg(errp, "Requested safe cache capability level not supported by kvm, try a different value for cap-cfpc");
|
|
|
c7c90d |
+ error_setg(errp,
|
|
|
c7c90d |
+"Requested safe cache capability level not supported by tcg, try a different value for cap-cfpc");
|
|
|
c7c90d |
+ } else if (kvm_enabled() && (val > kvm_val)) {
|
|
|
c7c90d |
+ error_setg(errp,
|
|
|
c7c90d |
+"Requested safe cache capability level not supported by kvm, try cap-cfpc=%s",
|
|
|
c7c90d |
+ cap_cfpc_possible.vals[kvm_val]);
|
|
|
c7c90d |
}
|
|
|
c7c90d |
}
|
|
|
c7c90d |
|
|
|
c7c90d |
@@ -319,9 +329,10 @@ sPAPRCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
|
|
|
c7c90d |
.name = "cfpc",
|
|
|
c7c90d |
.description = "Cache Flush on Privilege Change" VALUE_DESC_TRISTATE,
|
|
|
c7c90d |
.index = SPAPR_CAP_CFPC,
|
|
|
c7c90d |
- .get = spapr_cap_get_tristate,
|
|
|
c7c90d |
- .set = spapr_cap_set_tristate,
|
|
|
c7c90d |
+ .get = spapr_cap_get_string,
|
|
|
c7c90d |
+ .set = spapr_cap_set_string,
|
|
|
c7c90d |
.type = "string",
|
|
|
c7c90d |
+ .possible = &cap_cfpc_possible,
|
|
|
c7c90d |
.apply = cap_safe_cache_apply,
|
|
|
c7c90d |
},
|
|
|
c7c90d |
[SPAPR_CAP_SBBC] = {
|
|
|
c7c90d |
--
|
|
|
c7c90d |
1.8.3.1
|
|
|
c7c90d |
|