motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390x/s390-virtio-hcall: prepare for more diag500 hypercalls

Browse source 
Let's generalize, abstracting the virtio bits. diag500 is now a generic
hypercall to handle QEMU/KVM specific things. Explicitly specify all
already defined subcodes, including legacy ones (so we know what we can
use for new hypercalls).

Move the PGM_SPECIFICATION injection into the renamed function
handle_diag_500(), so we can turn it into a void function.

We'll rename the files separately, so git properly detects the rename.

Message-ID: <20241219144115.2820241-4-david@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
David Hildenbrand 2024-12-19 15:41:04 +01:00
parent 4be0fce498
commit 6e9cc2da4e
4 changed files with 20 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/s390x/s390-virtio-hcall.c
View file

@ -1,5 +1,5 @@
/* /*
* Support for virtio hypercalls on s390 * Support for QEMU/KVM hypercalls on s390
* *
* Copyright 2012 IBM Corp. * Copyright 2012 IBM Corp.
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com> * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
@ -57,18 +57,19 @@ static int handle_virtio_ccw_notify(uint64_t subch_id, uint64_t data)
return 0; return 0;
} }
int s390_virtio_hypercall(CPUS390XState *env) void handle_diag_500(S390CPU *cpu, uintptr_t ra)
{ {
CPUS390XState *env = &cpu->env;
const uint64_t subcode = env->regs[1]; const uint64_t subcode = env->regs[1];
switch (subcode) { switch (subcode) {
case KVM_S390_VIRTIO_NOTIFY: case DIAG500_VIRTIO_NOTIFY:
env->regs[2] = handle_virtio_notify(env->regs[2]); env->regs[2] = handle_virtio_notify(env->regs[2]);
return 0; break;
case KVM_S390_VIRTIO_CCW_NOTIFY: case DIAG500_VIRTIO_CCW_NOTIFY:
env->regs[2] = handle_virtio_ccw_notify(env->regs[2], env->regs[3]); env->regs[2] = handle_virtio_ccw_notify(env->regs[2], env->regs[3]);
return 0; break;
default: default:
return -EINVAL; s390_program_interrupt(env, PGM_SPECIFICATION, ra);
} }
} }

11
hw/s390x/s390-virtio-hcall.h
View file

@ -1,5 +1,5 @@
/* /*
* Support for virtio hypercalls on s390x * Support for QEMU/KVM hypercalls on s390x
* *
* Copyright IBM Corp. 2012, 2017 * Copyright IBM Corp. 2012, 2017
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com> * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
@ -12,12 +12,13 @@
#ifndef HW_S390_VIRTIO_HCALL_H #ifndef HW_S390_VIRTIO_HCALL_H
#define HW_S390_VIRTIO_HCALL_H #define HW_S390_VIRTIO_HCALL_H
#include "standard-headers/asm-s390/virtio-ccw.h"
#include "cpu.h" #include "cpu.h"
/* The only thing that we need from the old kvm_virtio.h file */ #define DIAG500_VIRTIO_NOTIFY 0 /* legacy, implemented as a NOP */
#define KVM_S390_VIRTIO_NOTIFY 0 #define DIAG500_VIRTIO_RESET 1 /* legacy */
#define DIAG500_VIRTIO_SET_STATUS 2 /* legacy */
#define DIAG500_VIRTIO_CCW_NOTIFY 3 /* KVM_S390_VIRTIO_CCW_NOTIFY */
int s390_virtio_hypercall(CPUS390XState *env); void handle_diag_500(S390CPU *cpu, uintptr_t ra);
#endif /* HW_S390_VIRTIO_HCALL_H */ #endif /* HW_S390_VIRTIO_HCALL_H */

20
target/s390x/kvm/kvm.c
View file

@ -1492,22 +1492,6 @@ static int handle_e3(S390CPU *cpu, struct kvm_run *run, uint8_t ipbl)
return r; return r;
} }
static int handle_hypercall(S390CPU *cpu, struct kvm_run *run)
{
CPUS390XState *env = &cpu->env;
int ret = -EINVAL;
#ifdef CONFIG_S390_CCW_VIRTIO
ret = s390_virtio_hypercall(env);
#endif /* CONFIG_S390_CCW_VIRTIO */
if (ret == -EINVAL) {
kvm_s390_program_interrupt(cpu, PGM_SPECIFICATION);
return 0;
}
return ret;
}
static void kvm_handle_diag_288(S390CPU *cpu, struct kvm_run *run) static void kvm_handle_diag_288(S390CPU *cpu, struct kvm_run *run)
{ {
uint64_t r1, r3; uint64_t r1, r3;
@ -1603,9 +1587,11 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run, uint32_t ipb)
case DIAG_SET_CONTROL_PROGRAM_CODES: case DIAG_SET_CONTROL_PROGRAM_CODES:
handle_diag_318(cpu, run); handle_diag_318(cpu, run);
break; break;
#ifdef CONFIG_S390_CCW_VIRTIO
case DIAG_KVM_HYPERCALL: case DIAG_KVM_HYPERCALL:
r = handle_hypercall(cpu, run); handle_diag_500(cpu, RA_IGNORED);
break; break;
#endif /* CONFIG_S390_CCW_VIRTIO */
case DIAG_KVM_BREAKPOINT: case DIAG_KVM_BREAKPOINT:
r = handle_sw_breakpoint(cpu, run); r = handle_sw_breakpoint(cpu, run);
break; break;

5
target/s390x/tcg/misc_helper.c
View file

@ -119,10 +119,11 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num)
switch (num) { switch (num) {
#ifdef CONFIG_S390_CCW_VIRTIO #ifdef CONFIG_S390_CCW_VIRTIO
case 0x500: case 0x500:
/* KVM hypercall */ /* QEMU/KVM hypercall */
bql_lock(); bql_lock();
r = s390_virtio_hypercall(env); handle_diag_500(env_archcpu(env), GETPC());
bql_unlock(); bql_unlock();
r = 0;
break; break;
#endif /* CONFIG_S390_CCW_VIRTIO */ #endif /* CONFIG_S390_CCW_VIRTIO */
case 0x44: case 0x44: