mirror of https://github.com/xemu-project/xemu.git
spapr: nested: Introduce H_GUEST_CREATE_VCPU hcall.
Introduce the nested PAPR hcall H_GUEST_CREATE_VCPU which is used to create and initialize the specified VCPU resource for the previously created guest. Each guest can have multiple VCPUs upto max 2048. All VCPUs for a guest gets deallocated on guest delete. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
f560562602
commit
c6664be077
|
@ -8,6 +8,7 @@
|
||||||
#include "hw/ppc/spapr_nested.h"
|
#include "hw/ppc/spapr_nested.h"
|
||||||
#include "mmu-book3s-v3.h"
|
#include "mmu-book3s-v3.h"
|
||||||
#include "cpu-models.h"
|
#include "cpu-models.h"
|
||||||
|
#include "qemu/log.h"
|
||||||
|
|
||||||
void spapr_nested_reset(SpaprMachineState *spapr)
|
void spapr_nested_reset(SpaprMachineState *spapr)
|
||||||
{
|
{
|
||||||
|
@ -434,6 +435,16 @@ void spapr_exit_nested(PowerPCCPU *cpu, int excp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static
|
||||||
|
SpaprMachineStateNestedGuest *spapr_get_nested_guest(SpaprMachineState *spapr,
|
||||||
|
target_ulong guestid)
|
||||||
|
{
|
||||||
|
SpaprMachineStateNestedGuest *guest;
|
||||||
|
|
||||||
|
guest = g_hash_table_lookup(spapr->nested.guests, GINT_TO_POINTER(guestid));
|
||||||
|
return guest;
|
||||||
|
}
|
||||||
|
|
||||||
static target_ulong h_guest_get_capabilities(PowerPCCPU *cpu,
|
static target_ulong h_guest_get_capabilities(PowerPCCPU *cpu,
|
||||||
SpaprMachineState *spapr,
|
SpaprMachineState *spapr,
|
||||||
target_ulong opcode,
|
target_ulong opcode,
|
||||||
|
@ -525,6 +536,7 @@ static void
|
||||||
destroy_guest_helper(gpointer value)
|
destroy_guest_helper(gpointer value)
|
||||||
{
|
{
|
||||||
struct SpaprMachineStateNestedGuest *guest = value;
|
struct SpaprMachineStateNestedGuest *guest = value;
|
||||||
|
g_free(guest->vcpus);
|
||||||
g_free(guest);
|
g_free(guest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -620,6 +632,54 @@ static target_ulong h_guest_delete(PowerPCCPU *cpu,
|
||||||
return H_SUCCESS;
|
return H_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static target_ulong h_guest_create_vcpu(PowerPCCPU *cpu,
|
||||||
|
SpaprMachineState *spapr,
|
||||||
|
target_ulong opcode,
|
||||||
|
target_ulong *args)
|
||||||
|
{
|
||||||
|
target_ulong flags = args[0];
|
||||||
|
target_ulong guestid = args[1];
|
||||||
|
target_ulong vcpuid = args[2];
|
||||||
|
SpaprMachineStateNestedGuest *guest;
|
||||||
|
|
||||||
|
if (flags) { /* don't handle any flags for now */
|
||||||
|
return H_UNSUPPORTED_FLAG;
|
||||||
|
}
|
||||||
|
|
||||||
|
guest = spapr_get_nested_guest(spapr, guestid);
|
||||||
|
if (!guest) {
|
||||||
|
return H_P2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vcpuid < guest->nr_vcpus) {
|
||||||
|
qemu_log_mask(LOG_UNIMP, "vcpuid " TARGET_FMT_ld " already in use.",
|
||||||
|
vcpuid);
|
||||||
|
return H_IN_USE;
|
||||||
|
}
|
||||||
|
/* linear vcpuid allocation only */
|
||||||
|
assert(vcpuid == guest->nr_vcpus);
|
||||||
|
|
||||||
|
if (guest->nr_vcpus >= PAPR_NESTED_GUEST_VCPU_MAX) {
|
||||||
|
return H_P3;
|
||||||
|
}
|
||||||
|
|
||||||
|
SpaprMachineStateNestedGuestVcpu *vcpus, *curr_vcpu;
|
||||||
|
vcpus = g_try_renew(struct SpaprMachineStateNestedGuestVcpu,
|
||||||
|
guest->vcpus,
|
||||||
|
guest->nr_vcpus + 1);
|
||||||
|
if (!vcpus) {
|
||||||
|
return H_NO_MEM;
|
||||||
|
}
|
||||||
|
guest->vcpus = vcpus;
|
||||||
|
curr_vcpu = &vcpus[guest->nr_vcpus];
|
||||||
|
memset(curr_vcpu, 0, sizeof(SpaprMachineStateNestedGuestVcpu));
|
||||||
|
|
||||||
|
curr_vcpu->enabled = true;
|
||||||
|
guest->nr_vcpus++;
|
||||||
|
|
||||||
|
return H_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
void spapr_register_nested_hv(void)
|
void spapr_register_nested_hv(void)
|
||||||
{
|
{
|
||||||
spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl);
|
spapr_register_hypercall(KVMPPC_H_SET_PARTITION_TABLE, h_set_ptbl);
|
||||||
|
@ -644,6 +704,7 @@ void spapr_register_nested_papr(void)
|
||||||
h_guest_set_capabilities);
|
h_guest_set_capabilities);
|
||||||
spapr_register_hypercall(H_GUEST_CREATE, h_guest_create);
|
spapr_register_hypercall(H_GUEST_CREATE, h_guest_create);
|
||||||
spapr_register_hypercall(H_GUEST_DELETE, h_guest_delete);
|
spapr_register_hypercall(H_GUEST_DELETE, h_guest_delete);
|
||||||
|
spapr_register_hypercall(H_GUEST_CREATE_VCPU, h_guest_create_vcpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
void spapr_unregister_nested_papr(void)
|
void spapr_unregister_nested_papr(void)
|
||||||
|
@ -652,6 +713,7 @@ void spapr_unregister_nested_papr(void)
|
||||||
spapr_unregister_hypercall(H_GUEST_SET_CAPABILITIES);
|
spapr_unregister_hypercall(H_GUEST_SET_CAPABILITIES);
|
||||||
spapr_unregister_hypercall(H_GUEST_CREATE);
|
spapr_unregister_hypercall(H_GUEST_CREATE);
|
||||||
spapr_unregister_hypercall(H_GUEST_DELETE);
|
spapr_unregister_hypercall(H_GUEST_DELETE);
|
||||||
|
spapr_unregister_hypercall(H_GUEST_CREATE_VCPU);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -365,6 +365,7 @@ struct SpaprMachineState {
|
||||||
#define H_UNSUPPORTED -67
|
#define H_UNSUPPORTED -67
|
||||||
#define H_OVERLAP -68
|
#define H_OVERLAP -68
|
||||||
#define H_STATE -75
|
#define H_STATE -75
|
||||||
|
#define H_IN_USE -77
|
||||||
#define H_UNSUPPORTED_FLAG -256
|
#define H_UNSUPPORTED_FLAG -256
|
||||||
#define H_MULTI_THREADS_ACTIVE -9005
|
#define H_MULTI_THREADS_ACTIVE -9005
|
||||||
|
|
||||||
|
@ -587,6 +588,7 @@ struct SpaprMachineState {
|
||||||
#define H_GUEST_GET_CAPABILITIES 0x460
|
#define H_GUEST_GET_CAPABILITIES 0x460
|
||||||
#define H_GUEST_SET_CAPABILITIES 0x464
|
#define H_GUEST_SET_CAPABILITIES 0x464
|
||||||
#define H_GUEST_CREATE 0x470
|
#define H_GUEST_CREATE 0x470
|
||||||
|
#define H_GUEST_CREATE_VCPU 0x474
|
||||||
#define H_GUEST_DELETE 0x488
|
#define H_GUEST_DELETE 0x488
|
||||||
|
|
||||||
#define MAX_HCALL_OPCODE H_GUEST_DELETE
|
#define MAX_HCALL_OPCODE H_GUEST_DELETE
|
||||||
|
|
|
@ -14,6 +14,8 @@ typedef struct SpaprMachineStateNested {
|
||||||
|
|
||||||
typedef struct SpaprMachineStateNestedGuest {
|
typedef struct SpaprMachineStateNestedGuest {
|
||||||
uint32_t pvr_logical;
|
uint32_t pvr_logical;
|
||||||
|
unsigned long nr_vcpus;
|
||||||
|
struct SpaprMachineStateNestedGuestVcpu *vcpus;
|
||||||
} SpaprMachineStateNestedGuest;
|
} SpaprMachineStateNestedGuest;
|
||||||
|
|
||||||
/* Nested PAPR API related macros */
|
/* Nested PAPR API related macros */
|
||||||
|
@ -27,6 +29,7 @@ typedef struct SpaprMachineStateNestedGuest {
|
||||||
#define H_GUEST_CAP_P10_MODE_BMAP 2
|
#define H_GUEST_CAP_P10_MODE_BMAP 2
|
||||||
#define PAPR_NESTED_GUEST_MAX 4096
|
#define PAPR_NESTED_GUEST_MAX 4096
|
||||||
#define H_GUEST_DELETE_ALL_FLAG 0x8000000000000000ULL
|
#define H_GUEST_DELETE_ALL_FLAG 0x8000000000000000ULL
|
||||||
|
#define PAPR_NESTED_GUEST_VCPU_MAX 2048
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Register state for entering a nested guest with H_ENTER_NESTED.
|
* Register state for entering a nested guest with H_ENTER_NESTED.
|
||||||
|
@ -120,6 +123,11 @@ struct nested_ppc_state {
|
||||||
int64_t tb_offset;
|
int64_t tb_offset;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
typedef struct SpaprMachineStateNestedGuestVcpu {
|
||||||
|
bool enabled;
|
||||||
|
struct nested_ppc_state state;
|
||||||
|
} SpaprMachineStateNestedGuestVcpu;
|
||||||
|
|
||||||
void spapr_exit_nested(PowerPCCPU *cpu, int excp);
|
void spapr_exit_nested(PowerPCCPU *cpu, int excp);
|
||||||
typedef struct SpaprMachineState SpaprMachineState;
|
typedef struct SpaprMachineState SpaprMachineState;
|
||||||
bool spapr_get_pate_nested_hv(SpaprMachineState *spapr, PowerPCCPU *cpu,
|
bool spapr_get_pate_nested_hv(SpaprMachineState *spapr, PowerPCCPU *cpu,
|
||||||
|
|
Loading…
Reference in New Issue