pull-loongarch-20241102

-----BEGIN PGP SIGNATURE-----
 
 iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZyXbXgAKCRBAov/yOSY+
 37a9BADZ7vI2idWNXdH+mLNDZNSOxfdKp6ggNgKS3S48Hi2zR72MEhwvR9dGlHDL
 98agrbV7/jI9Z+0dLAxvlyl1MvXfnn2sXYgUuZp6IAaQzFBa11HBAK7UFh3sTA4A
 gD4oPwl8AdJiFvDN6vNjS+dO0ls+j/YMaoLkAKLv15dlWtg4Rw==
 =EZnr
 -----END PGP SIGNATURE-----

Merge tag 'pull-loongarch-20241102' of https://gitlab.com/gaosong/qemu into staging

pull-loongarch-20241102

# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZyXbXgAKCRBAov/yOSY+
# 37a9BADZ7vI2idWNXdH+mLNDZNSOxfdKp6ggNgKS3S48Hi2zR72MEhwvR9dGlHDL
# 98agrbV7/jI9Z+0dLAxvlyl1MvXfnn2sXYgUuZp6IAaQzFBa11HBAK7UFh3sTA4A
# gD4oPwl8AdJiFvDN6vNjS+dO0ls+j/YMaoLkAKLv15dlWtg4Rw==
# =EZnr
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 02 Nov 2024 07:57:18 GMT
# gpg:                using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B8FF 1DA0 D2FD CB2D A09C  6C2C 40A2 FFF2 3926 3EDF

* tag 'pull-loongarch-20241102' of https://gitlab.com/gaosong/qemu:
  target/loongarch: Add steal time support on migration
  hw/loongarch/boot: Use warn_report when no kernel filename
  linux-headers: Update to Linux v6.12-rc5
  linux-headers: loongarch: Add kvm_para.h
  linux-headers: Add unistd_64.h
  target/loongarch/kvm: Implement LoongArch PMU extension
  target/loongarch: Implement lbt registers save/restore function
  target/loongarch: Add loongson binary translation feature

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-11-04 16:01:10 +00:00
commit ee057a9f29
36 changed files with 2243 additions and 100 deletions

View file

@ -664,12 +664,55 @@ static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
}
}
static bool loongarch_get_lbt(Object *obj, Error **errp)
{
return LOONGARCH_CPU(obj)->lbt != ON_OFF_AUTO_OFF;
}
static void loongarch_set_lbt(Object *obj, bool value, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->lbt = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
static bool loongarch_get_pmu(Object *obj, Error **errp)
{
return LOONGARCH_CPU(obj)->pmu != ON_OFF_AUTO_OFF;
}
static void loongarch_set_pmu(Object *obj, bool value, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
}
void loongarch_cpu_post_init(Object *obj)
{
LoongArchCPU *cpu = LOONGARCH_CPU(obj);
object_property_add_bool(obj, "lsx", loongarch_get_lsx,
loongarch_set_lsx);
object_property_add_bool(obj, "lasx", loongarch_get_lasx,
loongarch_set_lasx);
/* lbt is enabled only in kvm mode, not supported in tcg mode */
if (kvm_enabled()) {
cpu->lbt = ON_OFF_AUTO_AUTO;
object_property_add_bool(obj, "lbt", loongarch_get_lbt,
loongarch_set_lbt);
object_property_set_description(obj, "lbt",
"Set off to disable Binary Tranlation.");
cpu->pmu = ON_OFF_AUTO_AUTO;
object_property_add_bool(obj, "pmu", loongarch_get_pmu,
loongarch_set_pmu);
object_property_set_description(obj, "pmu",
"Set off to performance monitor unit.");
} else {
cpu->lbt = ON_OFF_AUTO_OFF;
}
}
static void loongarch_cpu_init(Object *obj)

View file

@ -153,6 +153,7 @@ FIELD(CPUCFG2, LLFTP_VER, 15, 3)
FIELD(CPUCFG2, LBT_X86, 18, 1)
FIELD(CPUCFG2, LBT_ARM, 19, 1)
FIELD(CPUCFG2, LBT_MIPS, 20, 1)
FIELD(CPUCFG2, LBT_ALL, 18, 3)
FIELD(CPUCFG2, LSPW, 21, 1)
FIELD(CPUCFG2, LAM, 22, 1)
@ -281,6 +282,22 @@ struct LoongArchTLB {
typedef struct LoongArchTLB LoongArchTLB;
#endif
enum loongarch_features {
LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
LOONGARCH_FEATURE_PMU,
};
typedef struct LoongArchBT {
/* scratch registers */
uint64_t scr0;
uint64_t scr1;
uint64_t scr2;
uint64_t scr3;
/* loongarch eflags */
uint32_t eflags;
uint32_t ftop;
} lbt_t;
typedef struct CPUArchState {
uint64_t gpr[32];
uint64_t pc;
@ -288,6 +305,7 @@ typedef struct CPUArchState {
fpr_t fpr[32];
bool cf[8];
uint32_t fcsr0;
lbt_t lbt;
uint32_t cpucfg[21];
@ -346,6 +364,9 @@ typedef struct CPUArchState {
uint64_t CSR_DBG;
uint64_t CSR_DERA;
uint64_t CSR_DSAVE;
struct {
uint64_t guest_addr;
} stealtime;
#ifdef CONFIG_TCG
float_status fp_status;
@ -381,6 +402,8 @@ struct ArchCPU {
CPULoongArchState env;
QEMUTimer timer;
uint32_t phy_id;
OnOffAuto lbt;
OnOffAuto pmu;
/* 'compatible' string for this CPU for Linux device trees */
const char *dtb_compatible;

View file

@ -9,6 +9,7 @@
#include <sys/ioctl.h>
#include <linux/kvm.h>
#include "qapi/error.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
@ -33,6 +34,55 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO
};
static int kvm_get_stealtime(CPUState *cs)
{
CPULoongArchState *env = cpu_env(cs);
int err;
struct kvm_device_attr attr = {
.group = KVM_LOONGARCH_VCPU_PVTIME_CTRL,
.attr = KVM_LOONGARCH_VCPU_PVTIME_GPA,
.addr = (uint64_t)&env->stealtime.guest_addr,
};
err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr);
if (err) {
return 0;
}
err = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, attr);
if (err) {
error_report("PVTIME: KVM_GET_DEVICE_ATTR: %s", strerror(errno));
return err;
}
return 0;
}
static int kvm_set_stealtime(CPUState *cs)
{
CPULoongArchState *env = cpu_env(cs);
int err;
struct kvm_device_attr attr = {
.group = KVM_LOONGARCH_VCPU_PVTIME_CTRL,
.attr = KVM_LOONGARCH_VCPU_PVTIME_GPA,
.addr = (uint64_t)&env->stealtime.guest_addr,
};
err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr);
if (err) {
return 0;
}
err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, attr);
if (err) {
error_report("PVTIME: KVM_SET_DEVICE_ATTR %s with gpa "TARGET_FMT_lx,
strerror(errno), env->stealtime.guest_addr);
return err;
}
return 0;
}
static int kvm_loongarch_get_regs_core(CPUState *cs)
{
int ret = 0;
@ -476,6 +526,58 @@ static int kvm_loongarch_put_regs_fp(CPUState *cs)
return ret;
}
static int kvm_loongarch_put_lbt(CPUState *cs)
{
CPULoongArchState *env = cpu_env(cs);
uint64_t val;
int ret;
/* check whether vm support LBT firstly */
if (FIELD_EX32(env->cpucfg[2], CPUCFG2, LBT_ALL) != 7) {
return 0;
}
/* set six LBT registers including scr0-scr3, eflags, ftop */
ret = kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR0, &env->lbt.scr0);
ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR1, &env->lbt.scr1);
ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR2, &env->lbt.scr2);
ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR3, &env->lbt.scr3);
/*
* Be cautious, KVM_REG_LOONGARCH_LBT_FTOP is defined as 64-bit however
* lbt.ftop is 32-bit; the same with KVM_REG_LOONGARCH_LBT_EFLAGS register
*/
val = env->lbt.eflags;
ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_EFLAGS, &val);
val = env->lbt.ftop;
ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_FTOP, &val);
return ret;
}
static int kvm_loongarch_get_lbt(CPUState *cs)
{
CPULoongArchState *env = cpu_env(cs);
uint64_t val;
int ret;
/* check whether vm support LBT firstly */
if (FIELD_EX32(env->cpucfg[2], CPUCFG2, LBT_ALL) != 7) {
return 0;
}
/* get six LBT registers including scr0-scr3, eflags, ftop */
ret = kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR0, &env->lbt.scr0);
ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR1, &env->lbt.scr1);
ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR2, &env->lbt.scr2);
ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR3, &env->lbt.scr3);
ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_EFLAGS, &val);
env->lbt.eflags = (uint32_t)val;
ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_FTOP, &val);
env->lbt.ftop = (uint32_t)val;
return ret;
}
void kvm_arch_reset_vcpu(CPUState *cs)
{
CPULoongArchState *env = cpu_env(cs);
@ -612,6 +714,16 @@ int kvm_arch_get_registers(CPUState *cs, Error **errp)
return ret;
}
ret = kvm_loongarch_get_lbt(cs);
if (ret) {
return ret;
}
ret = kvm_get_stealtime(cs);
if (ret) {
return ret;
}
ret = kvm_loongarch_get_mpstate(cs);
return ret;
}
@ -640,6 +752,22 @@ int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)
return ret;
}
ret = kvm_loongarch_put_lbt(cs);
if (ret) {
return ret;
}
if (level >= KVM_PUT_FULL_STATE) {
/*
* only KVM_PUT_FULL_STATE is required, kvm kernel will clear
* guest_addr for KVM_PUT_RESET_STATE
*/
ret = kvm_set_stealtime(cs);
if (ret) {
return ret;
}
}
ret = kvm_loongarch_put_mpstate(cs);
return ret;
}
@ -666,17 +794,112 @@ static void kvm_loongarch_vm_stage_change(void *opaque, bool running,
}
}
static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)
{
int ret;
struct kvm_device_attr attr;
switch (feature) {
case LOONGARCH_FEATURE_LBT:
/*
* Return all if all the LBT features are supported such as:
* KVM_LOONGARCH_VM_FEAT_X86BT
* KVM_LOONGARCH_VM_FEAT_ARMBT
* KVM_LOONGARCH_VM_FEAT_MIPSBT
*/
attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
attr.attr = KVM_LOONGARCH_VM_FEAT_X86BT;
ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
attr.attr = KVM_LOONGARCH_VM_FEAT_ARMBT;
ret |= kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
attr.attr = KVM_LOONGARCH_VM_FEAT_MIPSBT;
ret |= kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
return (ret == 0);
case LOONGARCH_FEATURE_PMU:
attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;
attr.attr = KVM_LOONGARCH_VM_FEAT_PMU;
ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);
return (ret == 0);
default:
return false;
}
return false;
}
static int kvm_cpu_check_lbt(CPUState *cs, Error **errp)
{
CPULoongArchState *env = cpu_env(cs);
LoongArchCPU *cpu = LOONGARCH_CPU(cs);
bool kvm_supported;
kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LBT);
if (cpu->lbt == ON_OFF_AUTO_ON) {
if (kvm_supported) {
env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LBT_ALL, 7);
} else {
error_setg(errp, "'lbt' feature not supported by KVM on this host");
return -ENOTSUP;
}
} else if ((cpu->lbt == ON_OFF_AUTO_AUTO) && kvm_supported) {
env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LBT_ALL, 7);
}
return 0;
}
static int kvm_cpu_check_pmu(CPUState *cs, Error **errp)
{
LoongArchCPU *cpu = LOONGARCH_CPU(cs);
CPULoongArchState *env = cpu_env(cs);
bool kvm_supported;
kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_PMU);
if (cpu->pmu == ON_OFF_AUTO_ON) {
if (!kvm_supported) {
error_setg(errp, "'pmu' feature not supported by KVM on the host");
return -ENOTSUP;
}
} else if (cpu->pmu != ON_OFF_AUTO_AUTO) {
/* disable pmu if ON_OFF_AUTO_OFF is set */
kvm_supported = false;
}
if (kvm_supported) {
env->cpucfg[6] = FIELD_DP32(env->cpucfg[6], CPUCFG6, PMP, 1);
env->cpucfg[6] = FIELD_DP32(env->cpucfg[6], CPUCFG6, PMNUM, 3);
env->cpucfg[6] = FIELD_DP32(env->cpucfg[6], CPUCFG6, PMBITS, 63);
env->cpucfg[6] = FIELD_DP32(env->cpucfg[6], CPUCFG6, UPM, 1);
}
return 0;
}
int kvm_arch_init_vcpu(CPUState *cs)
{
uint64_t val;
int ret;
Error *local_err = NULL;
ret = 0;
qemu_add_vm_change_state_handler(kvm_loongarch_vm_stage_change, cs);
if (!kvm_get_one_reg(cs, KVM_REG_LOONGARCH_DEBUG_INST, &val)) {
brk_insn = val;
}
return 0;
ret = kvm_cpu_check_lbt(cs, &local_err);
if (ret < 0) {
error_report_err(local_err);
}
ret = kvm_cpu_check_pmu(cs, &local_err);
if (ret < 0) {
error_report_err(local_err);
}
return ret;
}
int kvm_arch_destroy_vcpu(CPUState *cs)

View file

@ -40,7 +40,7 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
}
static const char *cpu_model_advertised_features[] = {
"lsx", "lasx", NULL
"lsx", "lasx", "lbt", "pmu", NULL
};
CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,

View file

@ -110,6 +110,29 @@ static const VMStateDescription vmstate_lasx = {
},
};
static bool lbt_needed(void *opaque)
{
LoongArchCPU *cpu = opaque;
return !!FIELD_EX64(cpu->env.cpucfg[2], CPUCFG2, LBT_ALL);
}
static const VMStateDescription vmstate_lbt = {
.name = "cpu/lbt",
.version_id = 0,
.minimum_version_id = 0,
.needed = lbt_needed,
.fields = (const VMStateField[]) {
VMSTATE_UINT64(env.lbt.scr0, LoongArchCPU),
VMSTATE_UINT64(env.lbt.scr1, LoongArchCPU),
VMSTATE_UINT64(env.lbt.scr2, LoongArchCPU),
VMSTATE_UINT64(env.lbt.scr3, LoongArchCPU),
VMSTATE_UINT32(env.lbt.eflags, LoongArchCPU),
VMSTATE_UINT32(env.lbt.ftop, LoongArchCPU),
VMSTATE_END_OF_LIST()
},
};
#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
static bool tlb_needed(void *opaque)
{
@ -145,8 +168,8 @@ static const VMStateDescription vmstate_tlb = {
/* LoongArch CPU state */
const VMStateDescription vmstate_loongarch_cpu = {
.name = "cpu",
.version_id = 2,
.minimum_version_id = 2,
.version_id = 3,
.minimum_version_id = 3,
.fields = (const VMStateField[]) {
VMSTATE_UINTTL_ARRAY(env.gpr, LoongArchCPU, 32),
VMSTATE_UINTTL(env.pc, LoongArchCPU),
@ -209,6 +232,8 @@ const VMStateDescription vmstate_loongarch_cpu = {
VMSTATE_UINT64(env.CSR_DSAVE, LoongArchCPU),
VMSTATE_UINT64(kvm_state_counter, LoongArchCPU),
/* PV steal time */
VMSTATE_UINT64(env.stealtime.guest_addr, LoongArchCPU),
VMSTATE_END_OF_LIST()
},
@ -219,6 +244,7 @@ const VMStateDescription vmstate_loongarch_cpu = {
#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
&vmstate_tlb,
#endif
&vmstate_lbt,
NULL
}
};