* [PATCH v3 0/2] target/s390x/kvm: Simplify the synchronization code
@ 2023-10-11 8:05 Thomas Huth
2023-10-11 8:05 ` [PATCH v3 1/2] target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement Thomas Huth
2023-10-11 8:05 ` [PATCH v3 2/2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code Thomas Huth
0 siblings, 2 replies; 5+ messages in thread
From: Thomas Huth @ 2023-10-11 8:05 UTC (permalink / raw
To: qemu-devel, Halil Pasic, Christian Borntraeger
Cc: qemu-s390x, David Hildenbrand, Cédric Le Goater
KVM_SYNC_GPRS, KVM_SYNC_ACRS, KVM_SYNC_CRS and KVM_SYNC_PREFIX are
available since kernel 3.10. Since we already require at least kernel
3.15 in the s390x KVM code, we can also assume that the KVM_CAP_SYNC_REGS
sync code is always possible for these registers, and remove the
related checks and fallbacks via KVM_SET_REGS and KVM_GET_REGS.
v3:
- Don't sync ACRs, CRs and prefix in kvm_arch_put_registers()
when using level == KVM_PUT_RUNTIME_STATE
- Use g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS)) instead
of open-coding it.
v2:
- Split the patch from v1 into two patches
- Use a #define KVM_SYNC_REQUIRED_BITS for the required sync bits
- Use memcpy() instead of for-loops for copying the registers
Thomas Huth (2):
target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement
target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix
synchronization code
target/s390x/kvm/kvm.c | 124 ++++++++++++-----------------------------
1 file changed, 37 insertions(+), 87 deletions(-)
--
2.41.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 1/2] target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement
2023-10-11 8:05 [PATCH v3 0/2] target/s390x/kvm: Simplify the synchronization code Thomas Huth
@ 2023-10-11 8:05 ` Thomas Huth
2023-10-24 6:12 ` Cédric Le Goater
2023-10-11 8:05 ` [PATCH v3 2/2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code Thomas Huth
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Huth @ 2023-10-11 8:05 UTC (permalink / raw
To: qemu-devel, Halil Pasic, Christian Borntraeger
Cc: qemu-s390x, David Hildenbrand, Cédric Le Goater
Since we already require at least kernel 3.15 in the s390x KVM code,
we can assume that the KVM_CAP_SYNC_REGS capability is always there.
Thus turn this into a hard requirement now.
Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/s390x/kvm/kvm.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index bc5c56a305..b3e2eaa2eb 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -337,21 +337,29 @@ int kvm_arch_get_default_type(MachineState *ms)
int kvm_arch_init(MachineState *ms, KVMState *s)
{
+ int required_caps[] = {
+ KVM_CAP_DEVICE_CTRL,
+ KVM_CAP_SYNC_REGS,
+ };
+
+ for (int i = 0; i < ARRAY_SIZE(required_caps); i++) {
+ if (!kvm_check_extension(s, required_caps[i])) {
+ error_report("KVM is missing capability #%d - "
+ "please use kernel 3.15 or newer", required_caps[i]);
+ return -1;
+ }
+ }
+
object_class_foreach(ccw_machine_class_foreach, TYPE_S390_CCW_MACHINE,
false, NULL);
- if (!kvm_check_extension(kvm_state, KVM_CAP_DEVICE_CTRL)) {
- error_report("KVM is missing capability KVM_CAP_DEVICE_CTRL - "
- "please use kernel 3.15 or newer");
- return -1;
- }
if (!kvm_check_extension(s, KVM_CAP_S390_COW)) {
error_report("KVM is missing capability KVM_CAP_S390_COW - "
"unsupported environment");
return -1;
}
- cap_sync_regs = kvm_check_extension(s, KVM_CAP_SYNC_REGS);
+ cap_sync_regs = true;
cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);
cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);
cap_mem_op_extension = kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EXTENSION);
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v3 2/2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code
2023-10-11 8:05 [PATCH v3 0/2] target/s390x/kvm: Simplify the synchronization code Thomas Huth
2023-10-11 8:05 ` [PATCH v3 1/2] target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement Thomas Huth
@ 2023-10-11 8:05 ` Thomas Huth
2023-10-24 6:11 ` Cédric Le Goater
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Huth @ 2023-10-11 8:05 UTC (permalink / raw
To: qemu-devel, Halil Pasic, Christian Borntraeger
Cc: qemu-s390x, David Hildenbrand, Cédric Le Goater
KVM_SYNC_GPRS, KVM_SYNC_ACRS, KVM_SYNC_CRS and KVM_SYNC_PREFIX are
available since kernel 3.10. Since we already require at least kernel
3.15 in the s390x KVM code, we can also assume that the KVM_CAP_SYNC_REGS
sync code is always possible for these registers, and remove the
related checks and fallbacks via KVM_SET_REGS and KVM_GET_REGS.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/s390x/kvm/kvm.c | 106 ++++++++++-------------------------------
1 file changed, 24 insertions(+), 82 deletions(-)
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index b3e2eaa2eb..dc76f63d94 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -138,7 +138,6 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO
};
-static int cap_sync_regs;
static int cap_async_pf;
static int cap_mem_op;
static int cap_mem_op_extension;
@@ -359,7 +358,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
return -1;
}
- cap_sync_regs = true;
cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);
cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);
cap_mem_op_extension = kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EXTENSION);
@@ -466,37 +464,28 @@ void kvm_s390_reset_vcpu_normal(S390CPU *cpu)
static int can_sync_regs(CPUState *cs, int regs)
{
- return cap_sync_regs && (cs->kvm_run->kvm_valid_regs & regs) == regs;
+ return (cs->kvm_run->kvm_valid_regs & regs) == regs;
}
+#define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \
+ KVM_SYNC_CRS | KVM_SYNC_PREFIX)
+
int kvm_arch_put_registers(CPUState *cs, int level)
{
S390CPU *cpu = S390_CPU(cs);
CPUS390XState *env = &cpu->env;
- struct kvm_sregs sregs;
- struct kvm_regs regs;
struct kvm_fpu fpu = {};
int r;
int i;
+ g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS));
+
/* always save the PSW and the GPRS*/
cs->kvm_run->psw_addr = env->psw.addr;
cs->kvm_run->psw_mask = env->psw.mask;
- if (can_sync_regs(cs, KVM_SYNC_GPRS)) {
- for (i = 0; i < 16; i++) {
- cs->kvm_run->s.regs.gprs[i] = env->regs[i];
- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;
- }
- } else {
- for (i = 0; i < 16; i++) {
- regs.gprs[i] = env->regs[i];
- }
- r = kvm_vcpu_ioctl(cs, KVM_SET_REGS, ®s);
- if (r < 0) {
- return r;
- }
- }
+ memcpy(cs->kvm_run->s.regs.gprs, env->regs, sizeof(cs->kvm_run->s.regs.gprs));
+ cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;
if (can_sync_regs(cs, KVM_SYNC_VRS)) {
for (i = 0; i < 32; i++) {
@@ -529,6 +518,15 @@ int kvm_arch_put_registers(CPUState *cs, int level)
return 0;
}
+ /*
+ * Access registers, control registers and the prefix - these are
+ * always available via kvm_sync_regs in the kernels that we support
+ */
+ memcpy(cs->kvm_run->s.regs.acrs, env->aregs, sizeof(cs->kvm_run->s.regs.acrs));
+ memcpy(cs->kvm_run->s.regs.crs, env->cregs, sizeof(cs->kvm_run->s.regs.crs));
+ cs->kvm_run->s.regs.prefix = env->psa;
+ cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS | KVM_SYNC_CRS | KVM_SYNC_PREFIX;
+
if (can_sync_regs(cs, KVM_SYNC_ARCH0)) {
cs->kvm_run->s.regs.cputm = env->cputm;
cs->kvm_run->s.regs.ckc = env->ckc;
@@ -575,25 +573,6 @@ int kvm_arch_put_registers(CPUState *cs, int level)
}
}
- /* access registers and control registers*/
- if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {
- for (i = 0; i < 16; i++) {
- cs->kvm_run->s.regs.acrs[i] = env->aregs[i];
- cs->kvm_run->s.regs.crs[i] = env->cregs[i];
- }
- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS;
- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_CRS;
- } else {
- for (i = 0; i < 16; i++) {
- sregs.acrs[i] = env->aregs[i];
- sregs.crs[i] = env->cregs[i];
- }
- r = kvm_vcpu_ioctl(cs, KVM_SET_SREGS, &sregs);
- if (r < 0) {
- return r;
- }
- }
-
if (can_sync_regs(cs, KVM_SYNC_GSCB)) {
memcpy(cs->kvm_run->s.regs.gscb, env->gscb, 32);
cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GSCB;
@@ -615,13 +594,6 @@ int kvm_arch_put_registers(CPUState *cs, int level)
cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_DIAG318;
}
- /* Finally the prefix */
- if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {
- cs->kvm_run->s.regs.prefix = env->psa;
- cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_PREFIX;
- } else {
- /* prefix is only supported via sync regs */
- }
return 0;
}
@@ -629,8 +601,6 @@ int kvm_arch_get_registers(CPUState *cs)
{
S390CPU *cpu = S390_CPU(cs);
CPUS390XState *env = &cpu->env;
- struct kvm_sregs sregs;
- struct kvm_regs regs;
struct kvm_fpu fpu;
int i, r;
@@ -638,37 +608,14 @@ int kvm_arch_get_registers(CPUState *cs)
env->psw.addr = cs->kvm_run->psw_addr;
env->psw.mask = cs->kvm_run->psw_mask;
- /* the GPRS */
- if (can_sync_regs(cs, KVM_SYNC_GPRS)) {
- for (i = 0; i < 16; i++) {
- env->regs[i] = cs->kvm_run->s.regs.gprs[i];
- }
- } else {
- r = kvm_vcpu_ioctl(cs, KVM_GET_REGS, ®s);
- if (r < 0) {
- return r;
- }
- for (i = 0; i < 16; i++) {
- env->regs[i] = regs.gprs[i];
- }
- }
+ /* the GPRS, ACRS and CRS */
+ g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS));
+ memcpy(env->regs, cs->kvm_run->s.regs.gprs, sizeof(env->regs));
+ memcpy(env->aregs, cs->kvm_run->s.regs.acrs, sizeof(env->aregs));
+ memcpy(env->cregs, cs->kvm_run->s.regs.crs, sizeof(env->cregs));
- /* The ACRS and CRS */
- if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {
- for (i = 0; i < 16; i++) {
- env->aregs[i] = cs->kvm_run->s.regs.acrs[i];
- env->cregs[i] = cs->kvm_run->s.regs.crs[i];
- }
- } else {
- r = kvm_vcpu_ioctl(cs, KVM_GET_SREGS, &sregs);
- if (r < 0) {
- return r;
- }
- for (i = 0; i < 16; i++) {
- env->aregs[i] = sregs.acrs[i];
- env->cregs[i] = sregs.crs[i];
- }
- }
+ /* The prefix */
+ env->psa = cs->kvm_run->s.regs.prefix;
/* Floating point and vector registers */
if (can_sync_regs(cs, KVM_SYNC_VRS)) {
@@ -693,11 +640,6 @@ int kvm_arch_get_registers(CPUState *cs)
env->fpc = fpu.fpc;
}
- /* The prefix */
- if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {
- env->psa = cs->kvm_run->s.regs.prefix;
- }
-
if (can_sync_regs(cs, KVM_SYNC_ARCH0)) {
env->cputm = cs->kvm_run->s.regs.cputm;
env->ckc = cs->kvm_run->s.regs.ckc;
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 2/2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code
2023-10-11 8:05 ` [PATCH v3 2/2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code Thomas Huth
@ 2023-10-24 6:11 ` Cédric Le Goater
0 siblings, 0 replies; 5+ messages in thread
From: Cédric Le Goater @ 2023-10-24 6:11 UTC (permalink / raw
To: Thomas Huth, qemu-devel, Halil Pasic, Christian Borntraeger
Cc: qemu-s390x, David Hildenbrand
On 10/11/23 10:05, Thomas Huth wrote:
> KVM_SYNC_GPRS, KVM_SYNC_ACRS, KVM_SYNC_CRS and KVM_SYNC_PREFIX are
> available since kernel 3.10. Since we already require at least kernel
> 3.15 in the s390x KVM code, we can also assume that the KVM_CAP_SYNC_REGS
> sync code is always possible for these registers, and remove the
> related checks and fallbacks via KVM_SET_REGS and KVM_GET_REGS.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> target/s390x/kvm/kvm.c | 106 ++++++++++-------------------------------
> 1 file changed, 24 insertions(+), 82 deletions(-)
>
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index b3e2eaa2eb..dc76f63d94 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -138,7 +138,6 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
> KVM_CAP_LAST_INFO
> };
>
> -static int cap_sync_regs;
> static int cap_async_pf;
> static int cap_mem_op;
> static int cap_mem_op_extension;
> @@ -359,7 +358,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
> return -1;
> }
>
> - cap_sync_regs = true;
> cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);
> cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);
> cap_mem_op_extension = kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EXTENSION);
> @@ -466,37 +464,28 @@ void kvm_s390_reset_vcpu_normal(S390CPU *cpu)
>
> static int can_sync_regs(CPUState *cs, int regs)
> {
> - return cap_sync_regs && (cs->kvm_run->kvm_valid_regs & regs) == regs;
> + return (cs->kvm_run->kvm_valid_regs & regs) == regs;
> }
>
> +#define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \
> + KVM_SYNC_CRS | KVM_SYNC_PREFIX)
> +
> int kvm_arch_put_registers(CPUState *cs, int level)
> {
> S390CPU *cpu = S390_CPU(cs);
> CPUS390XState *env = &cpu->env;
> - struct kvm_sregs sregs;
> - struct kvm_regs regs;
> struct kvm_fpu fpu = {};
> int r;
> int i;
>
> + g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS));
> +
> /* always save the PSW and the GPRS*/
> cs->kvm_run->psw_addr = env->psw.addr;
> cs->kvm_run->psw_mask = env->psw.mask;
>
> - if (can_sync_regs(cs, KVM_SYNC_GPRS)) {
> - for (i = 0; i < 16; i++) {
> - cs->kvm_run->s.regs.gprs[i] = env->regs[i];
> - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;
> - }
> - } else {
> - for (i = 0; i < 16; i++) {
> - regs.gprs[i] = env->regs[i];
> - }
> - r = kvm_vcpu_ioctl(cs, KVM_SET_REGS, ®s);
> - if (r < 0) {
> - return r;
> - }
> - }
> + memcpy(cs->kvm_run->s.regs.gprs, env->regs, sizeof(cs->kvm_run->s.regs.gprs));
> + cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GPRS;
>
> if (can_sync_regs(cs, KVM_SYNC_VRS)) {
> for (i = 0; i < 32; i++) {
> @@ -529,6 +518,15 @@ int kvm_arch_put_registers(CPUState *cs, int level)
> return 0;
> }
>
> + /*
> + * Access registers, control registers and the prefix - these are
> + * always available via kvm_sync_regs in the kernels that we support
> + */
> + memcpy(cs->kvm_run->s.regs.acrs, env->aregs, sizeof(cs->kvm_run->s.regs.acrs));
> + memcpy(cs->kvm_run->s.regs.crs, env->cregs, sizeof(cs->kvm_run->s.regs.crs));
> + cs->kvm_run->s.regs.prefix = env->psa;
> + cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS | KVM_SYNC_CRS | KVM_SYNC_PREFIX;
> +
> if (can_sync_regs(cs, KVM_SYNC_ARCH0)) {
> cs->kvm_run->s.regs.cputm = env->cputm;
> cs->kvm_run->s.regs.ckc = env->ckc;
> @@ -575,25 +573,6 @@ int kvm_arch_put_registers(CPUState *cs, int level)
> }
> }
>
> - /* access registers and control registers*/
> - if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {
> - for (i = 0; i < 16; i++) {
> - cs->kvm_run->s.regs.acrs[i] = env->aregs[i];
> - cs->kvm_run->s.regs.crs[i] = env->cregs[i];
> - }
> - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_ACRS;
> - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_CRS;
> - } else {
> - for (i = 0; i < 16; i++) {
> - sregs.acrs[i] = env->aregs[i];
> - sregs.crs[i] = env->cregs[i];
> - }
> - r = kvm_vcpu_ioctl(cs, KVM_SET_SREGS, &sregs);
> - if (r < 0) {
> - return r;
> - }
> - }
> -
> if (can_sync_regs(cs, KVM_SYNC_GSCB)) {
> memcpy(cs->kvm_run->s.regs.gscb, env->gscb, 32);
> cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_GSCB;
> @@ -615,13 +594,6 @@ int kvm_arch_put_registers(CPUState *cs, int level)
> cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_DIAG318;
> }
>
> - /* Finally the prefix */
> - if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {
> - cs->kvm_run->s.regs.prefix = env->psa;
> - cs->kvm_run->kvm_dirty_regs |= KVM_SYNC_PREFIX;
> - } else {
> - /* prefix is only supported via sync regs */
> - }
> return 0;
> }
>
> @@ -629,8 +601,6 @@ int kvm_arch_get_registers(CPUState *cs)
> {
> S390CPU *cpu = S390_CPU(cs);
> CPUS390XState *env = &cpu->env;
> - struct kvm_sregs sregs;
> - struct kvm_regs regs;
> struct kvm_fpu fpu;
> int i, r;
>
> @@ -638,37 +608,14 @@ int kvm_arch_get_registers(CPUState *cs)
> env->psw.addr = cs->kvm_run->psw_addr;
> env->psw.mask = cs->kvm_run->psw_mask;
>
> - /* the GPRS */
> - if (can_sync_regs(cs, KVM_SYNC_GPRS)) {
> - for (i = 0; i < 16; i++) {
> - env->regs[i] = cs->kvm_run->s.regs.gprs[i];
> - }
> - } else {
> - r = kvm_vcpu_ioctl(cs, KVM_GET_REGS, ®s);
> - if (r < 0) {
> - return r;
> - }
> - for (i = 0; i < 16; i++) {
> - env->regs[i] = regs.gprs[i];
> - }
> - }
> + /* the GPRS, ACRS and CRS */
> + g_assert(can_sync_regs(cs, KVM_SYNC_REQUIRED_REGS));
> + memcpy(env->regs, cs->kvm_run->s.regs.gprs, sizeof(env->regs));
> + memcpy(env->aregs, cs->kvm_run->s.regs.acrs, sizeof(env->aregs));
> + memcpy(env->cregs, cs->kvm_run->s.regs.crs, sizeof(env->cregs));
>
> - /* The ACRS and CRS */
> - if (can_sync_regs(cs, KVM_SYNC_ACRS | KVM_SYNC_CRS)) {
> - for (i = 0; i < 16; i++) {
> - env->aregs[i] = cs->kvm_run->s.regs.acrs[i];
> - env->cregs[i] = cs->kvm_run->s.regs.crs[i];
> - }
> - } else {
> - r = kvm_vcpu_ioctl(cs, KVM_GET_SREGS, &sregs);
> - if (r < 0) {
> - return r;
> - }
> - for (i = 0; i < 16; i++) {
> - env->aregs[i] = sregs.acrs[i];
> - env->cregs[i] = sregs.crs[i];
> - }
> - }
> + /* The prefix */
> + env->psa = cs->kvm_run->s.regs.prefix;
>
> /* Floating point and vector registers */
> if (can_sync_regs(cs, KVM_SYNC_VRS)) {
> @@ -693,11 +640,6 @@ int kvm_arch_get_registers(CPUState *cs)
> env->fpc = fpu.fpc;
> }
>
> - /* The prefix */
> - if (can_sync_regs(cs, KVM_SYNC_PREFIX)) {
> - env->psa = cs->kvm_run->s.regs.prefix;
> - }
> -
> if (can_sync_regs(cs, KVM_SYNC_ARCH0)) {
> env->cputm = cs->kvm_run->s.regs.cputm;
> env->ckc = cs->kvm_run->s.regs.ckc;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 1/2] target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement
2023-10-11 8:05 ` [PATCH v3 1/2] target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement Thomas Huth
@ 2023-10-24 6:12 ` Cédric Le Goater
0 siblings, 0 replies; 5+ messages in thread
From: Cédric Le Goater @ 2023-10-24 6:12 UTC (permalink / raw
To: Thomas Huth, qemu-devel, Halil Pasic, Christian Borntraeger
Cc: qemu-s390x, David Hildenbrand
On 10/11/23 10:05, Thomas Huth wrote:
> Since we already require at least kernel 3.15 in the s390x KVM code,
> we can assume that the KVM_CAP_SYNC_REGS capability is always there.
> Thus turn this into a hard requirement now.
>
> Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> target/s390x/kvm/kvm.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index bc5c56a305..b3e2eaa2eb 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -337,21 +337,29 @@ int kvm_arch_get_default_type(MachineState *ms)
>
> int kvm_arch_init(MachineState *ms, KVMState *s)
> {
> + int required_caps[] = {
> + KVM_CAP_DEVICE_CTRL,
> + KVM_CAP_SYNC_REGS,
> + };
> +
> + for (int i = 0; i < ARRAY_SIZE(required_caps); i++) {
> + if (!kvm_check_extension(s, required_caps[i])) {
> + error_report("KVM is missing capability #%d - "
> + "please use kernel 3.15 or newer", required_caps[i]);
> + return -1;
> + }
> + }
> +
> object_class_foreach(ccw_machine_class_foreach, TYPE_S390_CCW_MACHINE,
> false, NULL);
>
> - if (!kvm_check_extension(kvm_state, KVM_CAP_DEVICE_CTRL)) {
> - error_report("KVM is missing capability KVM_CAP_DEVICE_CTRL - "
> - "please use kernel 3.15 or newer");
> - return -1;
> - }
> if (!kvm_check_extension(s, KVM_CAP_S390_COW)) {
> error_report("KVM is missing capability KVM_CAP_S390_COW - "
> "unsupported environment");
> return -1;
> }
>
> - cap_sync_regs = kvm_check_extension(s, KVM_CAP_SYNC_REGS);
> + cap_sync_regs = true;
> cap_async_pf = kvm_check_extension(s, KVM_CAP_ASYNC_PF);
> cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);
> cap_mem_op_extension = kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EXTENSION);
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-24 6:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-11 8:05 [PATCH v3 0/2] target/s390x/kvm: Simplify the synchronization code Thomas Huth
2023-10-11 8:05 ` [PATCH v3 1/2] target/s390x/kvm: Turn KVM_CAP_SYNC_REGS into a hard requirement Thomas Huth
2023-10-24 6:12 ` Cédric Le Goater
2023-10-11 8:05 ` [PATCH v3 2/2] target/s390x/kvm: Simplify the GPRs, ACRs, CRs and prefix synchronization code Thomas Huth
2023-10-24 6:11 ` Cédric Le Goater
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.