autopatch/qemu-kvm
4
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patch

Browse Source
This commit is contained in:
eabdullin 2025-05-13 15:36:06 +03:00
parent 8d39745a55
commit e872349b08
1 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
files/2001-Add-ppc64-support.patch
View File

@ -62,13 +62,14 @@ index 000000000..4b801b126
+CONFIG_VHOST_VSOCK=y +CONFIG_VHOST_VSOCK=y
+CONFIG_VHOST_USER_VSOCK=y +CONFIG_VHOST_USER_VSOCK=y
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 370d7c35d..aed36a4de 100644 index b0a0f8c68..62c236c5e 100644
--- a/hw/ppc/spapr.c --- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c
@@ -1746,6 +1746,13 @@ static void spapr_machine_reset(MachineState *machine, ShutdownCause reason) @@ -1717,7 +1717,13 @@ static void spapr_machine_reset(MachineState *machine, ResetType type)
} }
spapr_caps_apply(spapr); spapr_caps_apply(spapr);
spapr_nested_reset(spapr); spapr_nested_reset(spapr);
-
+ if (spapr->svm_allowed) { + if (spapr->svm_allowed) {
+#ifdef CONFIG_KVM +#ifdef CONFIG_KVM
+ kvmppc_svm_allow(&error_fatal); + kvmppc_svm_allow(&error_fatal);
@ -76,10 +77,10 @@ index 370d7c35d..aed36a4de 100644
+ error_setg(&error_fatal, "No PEF support in tcg, try x-svm-allowed=off"); + error_setg(&error_fatal, "No PEF support in tcg, try x-svm-allowed=off");
+#endif +#endif
+ } + }
first_ppc_cpu = POWERPC_CPU(first_cpu); first_ppc_cpu = POWERPC_CPU(first_cpu);
if (kvm_enabled() && kvmppc_has_cap_mmu_radix() && if (kvm_enabled() && kvmppc_has_cap_mmu_radix() &&
@@ -3452,6 +3459,20 @@ static void spapr_set_host_serial(Object *obj, const char *value, Error **errp) ppc_type_check_compat(machine->cpu_type, CPU_POWERPC_LOGICAL_3_00, 0,
@@ -3408,6 +3414,21 @@ static void spapr_set_host_serial(Object *obj, const char *value, Error **errp)
spapr->host_serial = g_strdup(value); spapr->host_serial = g_strdup(value);
} }
@ -96,11 +97,12 @@ index 370d7c35d..aed36a4de 100644
+ +
+ spapr->svm_allowed = value; + spapr->svm_allowed = value;
+} +}
+
+ +
static void spapr_instance_init(Object *obj) static void spapr_instance_init(Object *obj)
{ {
SpaprMachineState *spapr = SPAPR_MACHINE(obj); SpaprMachineState *spapr = SPAPR_MACHINE(obj);
@@ -3530,6 +3551,12 @@ static void spapr_instance_init(Object *obj) @@ -3486,6 +3507,12 @@ static void spapr_instance_init(Object *obj)
spapr_get_host_serial, spapr_set_host_serial); spapr_get_host_serial, spapr_set_host_serial);
object_property_set_description(obj, "host-serial", object_property_set_description(obj, "host-serial",
"Host serial number to advertise in guest device tree"); "Host serial number to advertise in guest device tree");
@ -113,7 +115,7 @@ index 370d7c35d..aed36a4de 100644
} }
static void spapr_machine_finalizefn(Object *obj) static void spapr_machine_finalizefn(Object *obj)
@@ -4775,6 +4802,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) @@ -4706,6 +4733,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
vmc->client_architecture_support = spapr_vof_client_architecture_support; vmc->client_architecture_support = spapr_vof_client_architecture_support;
vmc->quiesce = spapr_vof_quiesce; vmc->quiesce = spapr_vof_quiesce;
vmc->setprop = spapr_vof_setprop; vmc->setprop = spapr_vof_setprop;
@ -121,7 +123,7 @@ index 370d7c35d..aed36a4de 100644
} }
static const TypeInfo spapr_machine_info = { static const TypeInfo spapr_machine_info = {
@@ -4830,13 +4858,14 @@ static void spapr_machine_latest_class_options(MachineClass *mc) @@ -4761,11 +4789,12 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
} \ } \
type_init(MACHINE_VER_SYM(register, spapr, __VA_ARGS__)) type_init(MACHINE_VER_SYM(register, spapr, __VA_ARGS__))
@ -129,33 +131,19 @@ index 370d7c35d..aed36a4de 100644
- DEFINE_SPAPR_MACHINE_IMPL(true, major, minor) - DEFINE_SPAPR_MACHINE_IMPL(true, major, minor)
-#define DEFINE_SPAPR_MACHINE(major, minor) \ -#define DEFINE_SPAPR_MACHINE(major, minor) \
- DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) - DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
-#define DEFINE_SPAPR_MACHINE_TAGGED(major, minor, tag) \
- DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, _, tag)
+#define DEFINE_SPAPR_MACHINE_AS_LATEST(major, minor, micro) \ +#define DEFINE_SPAPR_MACHINE_AS_LATEST(major, minor, micro) \
+ DEFINE_SPAPR_MACHINE_IMPL(true, major, minor, micro) + DEFINE_SPAPR_MACHINE_IMPL(true, major, minor, micro)
+#define DEFINE_SPAPR_MACHINE(major, minor, micro) \ +#define DEFINE_SPAPR_MACHINE(major, minor, micro) \
+ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, micro) + DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, micro)
+#define DEFINE_SPAPR_MACHINE_TAGGED(major, minor, micro, tag) \
+ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, micro, _, tag)
+#if 0 /* Disabled for Red Hat Enterprise Linux */ +#if 0 /* Disabled for Red Hat Enterprise Linux */
/* /*
* pseries-9.1 * pseries-10.0
*/ */
@@ -5056,6 +5085,9 @@ static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index, @@ -5060,6 +5089,96 @@ static void spapr_machine_3_0_class_options(MachineClass *mc)
}
return true;
} }
+#endif
+ DEFINE_SPAPR_MACHINE(3, 0);
+#if 0 /* Disabled for Red Hat Enterprise Linux */
static void spapr_machine_4_0_class_options(MachineClass *mc)
{
SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
@@ -5380,6 +5412,87 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
}
DEFINE_SPAPR_MACHINE(2, 1);
+#endif /* disabled for RHEL */ +#endif /* disabled for RHEL */
+ +
+static void spapr_rhel_machine_default_class_options(MachineClass *mc) +static void spapr_rhel_machine_default_class_options(MachineClass *mc)
@ -183,9 +171,19 @@ index 370d7c35d..aed36a4de 100644
+ +
+DEFINE_SPAPR_MACHINE_AS_LATEST(10, 0, 0); +DEFINE_SPAPR_MACHINE_AS_LATEST(10, 0, 0);
+ +
+static void spapr_rhel_machine_9_5_0_class_options(MachineClass *mc) +
+static void spapr_rhel_machine_9_6_0_class_options(MachineClass *mc)
+{ +{
+ spapr_rhel_machine_10_0_0_class_options(mc); + spapr_rhel_machine_10_0_0_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_6,
+ hw_compat_rhel_9_6_len);
+}
+
+DEFINE_SPAPR_MACHINE(9, 6, 0);
+
+static void spapr_rhel_machine_9_5_0_class_options(MachineClass *mc)
+{
+ spapr_rhel_machine_9_6_0_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_5, + compat_props_add(mc->compat_props, hw_compat_rhel_9_5,
+ hw_compat_rhel_9_5_len); + hw_compat_rhel_9_5_len);
+} +}
@ -236,23 +234,22 @@ index 370d7c35d..aed36a4de 100644
+} +}
+ +
+DEFINE_SPAPR_MACHINE(9, 0, 0); +DEFINE_SPAPR_MACHINE(9, 0, 0);
+
static void spapr_machine_register_types(void) static void spapr_machine_register_types(void)
{ {
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 56090abcd..e3371b24f 100644 index faf9170ba..df3bde0db 100644
--- a/hw/ppc/spapr_cpu_core.c --- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include "sysemu/reset.h" #include "system/reset.h"
#include "sysemu/hw_accel.h" #include "system/hw_accel.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
+#include "cpu-models.h" +#include "cpu-models.h"
static void spapr_reset_vcpu(PowerPCCPU *cpu) static void spapr_reset_vcpu(PowerPCCPU *cpu)
{ {
@@ -264,6 +265,7 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr, @@ -268,6 +269,7 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
{ {
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
@ -260,7 +257,7 @@ index 56090abcd..e3371b24f 100644
if (!qdev_realize(DEVICE(cpu), NULL, errp)) { if (!qdev_realize(DEVICE(cpu), NULL, errp)) {
return false; return false;
@@ -280,6 +282,18 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr, @@ -286,6 +288,17 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
/* Set time-base frequency to 512 MHz. vhyp must be set first. */ /* Set time-base frequency to 512 MHz. vhyp must be set first. */
cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ); cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
@ -274,12 +271,11 @@ index 56090abcd..e3371b24f 100644
+ "POWER9 CPU is not supported by this machine class"); + "POWER9 CPU is not supported by this machine class");
+ return false; + return false;
+ } + }
+
+ +
if (spapr_irq_cpu_intc_create(spapr, cpu, errp) < 0) { if (spapr_irq_cpu_intc_create(spapr, cpu, errp) < 0) {
qdev_unrealize(DEVICE(cpu)); qdev_unrealize(DEVICE(cpu));
return false; return false;
@@ -399,10 +413,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = { @@ -401,10 +414,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
.instance_size = sizeof(SpaprCpuCore), .instance_size = sizeof(SpaprCpuCore),
.class_size = sizeof(SpaprCpuCoreClass), .class_size = sizeof(SpaprCpuCoreClass),
}, },
@ -336,7 +332,7 @@ index ebef2ccce..ab7ed7680 100644
uint32_t min_compat_pvr, uint32_t max_compat_pvr) uint32_t min_compat_pvr, uint32_t max_compat_pvr)
{ {
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index f2301b43f..4c38fa517 100644 index ece348178..4a2db7f58 100644
--- a/target/ppc/cpu-models.c --- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
@ -366,7 +362,7 @@ index f2301b43f..4c38fa517 100644
POWERPC_DEF("power7_v2.3", CPU_POWERPC_POWER7_v23, POWER7, POWERPC_DEF("power7_v2.3", CPU_POWERPC_POWER7_v23, POWER7,
"POWER7 v2.3") "POWER7 v2.3")
POWERPC_DEF("power7p_v2.1", CPU_POWERPC_POWER7P_v21, POWER7, POWERPC_DEF("power7p_v2.1", CPU_POWERPC_POWER7P_v21, POWER7,
@@ -895,12 +899,14 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { @@ -897,12 +901,14 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "7457a", "7457a_v1.2" }, { "7457a", "7457a_v1.2" },
{ "apollo7pm", "7457a_v1.0" }, { "apollo7pm", "7457a_v1.0" },
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
@ -381,11 +377,9 @@ index f2301b43f..4c38fa517 100644
{ "power7", "power7_v2.3" }, { "power7", "power7_v2.3" },
{ "power7+", "power7p_v2.1" }, { "power7+", "power7p_v2.1" },
{ "power7+_v2.1", "power7p_v2.1" }, { "power7+_v2.1", "power7p_v2.1" },
@@ -910,13 +916,14 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { @@ -915,11 +921,13 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "power9", "power9_v2.2" },
{ "power10", "power10_v2.0" },
#endif #endif
-
+#if 0 /* Disabled for Red Hat Enterprise Linux */ +#if 0 /* Disabled for Red Hat Enterprise Linux */
/* Generic PowerPCs */ /* Generic PowerPCs */
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
@ -409,27 +403,20 @@ index 321ed2da7..e35a99762 100644
bool ppc_check_compat(PowerPCCPU *cpu, uint32_t compat_pvr, bool ppc_check_compat(PowerPCCPU *cpu, uint32_t compat_pvr,
uint32_t min_compat_pvr, uint32_t max_compat_pvr); uint32_t min_compat_pvr, uint32_t max_compat_pvr);
bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr, bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr,
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 907dba60d..c942ff55b 100644 index 992356cb7..7f658f138 100644
--- a/target/ppc/kvm.c --- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c +++ b/target/ppc/kvm.c
@@ -92,6 +92,7 @@ static int cap_large_decr; @@ -151,6 +151,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
static int cap_fwnmi;
static int cap_rpt_invalidate;
static int cap_ail_mode_3;
+static int cap_ppc_secure_guest;
#ifdef CONFIG_PSERIES
static int cap_papr;
@@ -150,6 +151,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
cap_resize_hpt = kvm_vm_check_extension(s, KVM_CAP_SPAPR_RESIZE_HPT); cap_resize_hpt = kvm_vm_check_extension(s, KVM_CAP_SPAPR_RESIZE_HPT);
kvmppc_get_cpu_characteristics(s); kvmppc_get_cpu_characteristics(s);
cap_ppc_nested_kvm_hv = kvm_vm_check_extension(s, KVM_CAP_PPC_NESTED_HV); cap_ppc_nested_kvm_hv = kvm_vm_check_extension(s, KVM_CAP_PPC_NESTED_HV);
+ cap_ppc_secure_guest = kvm_vm_check_extension(s, KVM_CAP_PPC_SECURE_GUEST); + cap_ppc_secure_guest = kvm_vm_check_extension(s, KVM_CAP_PPC_SECURE_GUEST);
cap_large_decr = kvmppc_get_dec_bits(); cap_large_decr = kvmppc_get_dec_bits();
cap_fwnmi = kvm_vm_check_extension(s, KVM_CAP_PPC_FWNMI); cap_fwnmi = kvm_vm_check_extension(s, KVM_CAP_PPC_FWNMI);
/* cap_dawr1 = kvm_vm_check_extension(s, KVM_CAP_PPC_DAWR1);
@@ -2597,6 +2599,16 @@ bool kvmppc_supports_ail_3(void) @@ -2609,6 +2610,16 @@ bool kvmppc_supports_ail_3(void)
return cap_ail_mode_3; return cap_ail_mode_3;
} }
@ -446,7 +433,7 @@ index 907dba60d..c942ff55b 100644
PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void) PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)
{ {
uint32_t host_pvr = mfpvr(); uint32_t host_pvr = mfpvr();
@@ -3012,3 +3024,18 @@ static void kvm_cpu_accel_register_types(void) @@ -3024,3 +3035,18 @@ static void kvm_cpu_accel_register_types(void)
type_register_static(&kvm_cpu_accel_type_info); type_register_static(&kvm_cpu_accel_type_info);
} }
type_init(kvm_cpu_accel_register_types); type_init(kvm_cpu_accel_register_types);