The following changes since commit b69801dd6b1eb4d107f7c2f643adf0a4e3ec9124:

Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2025-02-22 05:06:39 +0800)

https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20250225

for you to fetch changes up to db369c11c90b35f3a6ab59ad78564aea5b30c3da:

target/loongarch: Enable virtual extioi feature (2025-02-25 16:05:31 +0800)

pull-loongarch-20250225 queue

Bibo Mao (10):

target/loongarch/gdbstub: Fix gdbstub incorrectly handling some registers

target/loongarch: Correct maximum physical address in KVM mode

target/loongarch: Add post init function for kvm mode

target/loongarch: Move kvm specified vCPU property to kvm directory

target/loongarch: Add vCPU property for paravirt ipi feature

target/loongarch: Add paravirt ipi feature detection

target/loongarch: Enable paravirt ipi feature

target/loongarch: Add vCPU property for kvm steal time feature

target/loongarch: Add kvm steal time feature detection

target/loongarch: Enable virtual extioi feature

Xianglai Li (1):

target/loongarch: fix vcpu reset command word issue

hw/loongarch/virt.c | 8 --

include/hw/loongarch/virt.h | 9 ++

target/loongarch/cpu.c | 52 ++--------

target/loongarch/cpu.h | 13 +++

target/loongarch/gdbstub.c | 11 +-

target/loongarch/kvm/kvm.c | 186 +++++++++++++++++++++++++++++++++-

target/loongarch/loongarch-qmp-cmds.c | 2 +-

7 files changed, 224 insertions(+), 57 deletions(-)

From: Xianglai Li <lixianglai@loongson.cn>

target/loongarch/kvm/kvm.c | 9 ++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@ static int kvm_loongarch_get_lbt(CPUState *cs)

void kvm_arch_reset_vcpu(CPUState *cs)

{

CPULoongArchState *env = cpu_env(cs);

+ int ret = 0;

+ uint64_t unused = 0;

env->mp_state = KVM_MP_STATE_RUNNABLE;

- kvm_set_one_reg(cs, KVM_REG_LOONGARCH_VCPU_RESET, 0);

+ ret = kvm_set_one_reg(cs, KVM_REG_LOONGARCH_VCPU_RESET, &unused);

+ if (ret) {

+ error_report("Failed to set KVM_REG_LOONGARCH_VCPU_RESET: %s",

+ strerror(errno));

+ exit(EXIT_FAILURE);

+ }

}

static int kvm_loongarch_get_mpstate(CPUState *cs)

Write operation with R32 (orig_a0) and R34 (CSR_BADV) is discarded on

gdbstub implementation for LoongArch system. And return value should

be register size rather than 0, since it is used to calculate offset of

next register such as R33 (PC) in function handle_write_all_regs().

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/gdbstub.c | 11 ++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c

--- a/target/loongarch/gdbstub.c

+++ b/target/loongarch/gdbstub.c

@@ -XXX,XX +XXX,XX @@ int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)

{

CPULoongArchState *env = cpu_env(cs);

target_ulong tmp;

- int read_length;

int length = 0;

+ if (n < 0 || n > 34) {

+ return 0;

+ }

if (is_la64(env)) {

tmp = ldq_le_p(mem_buf);

- read_length = 8;

+ length = 8;

} else {

tmp = ldl_le_p(mem_buf);

- read_length = 4;

+ length = 4;

On 3A5000 system, the physical address space width for host is 48,

however 47 bit for KVM VM. For KVM VM, size of physical address space is

the same with that of virtual user space address.

Here modify physical address space width with 47 bit in KVM mode.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/cpu.c | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c

--- a/target/loongarch/cpu.c

+++ b/target/loongarch/cpu.c

@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)

{

LoongArchCPU *cpu = LOONGARCH_CPU(obj);

CPULoongArchState *env = &cpu->env;

- uint32_t data = 0;

+ uint32_t data = 0, field;

int i;

for (i = 0; i < 21; i++) {

@@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj)

data = FIELD_DP32(data, CPUCFG1, ARCH, 2);

data = FIELD_DP32(data, CPUCFG1, PGMMU, 1);

data = FIELD_DP32(data, CPUCFG1, IOCSR, 1);

- data = FIELD_DP32(data, CPUCFG1, PALEN, 0x2f);

+ if (kvm_enabled()) {

+ /* GPA address width of VM is 47, field value is 47 - 1 */

+ field = 0x2e;

+ } else {

+ field = 0x2f; /* 48 bit - 1 */

+ }

+ data = FIELD_DP32(data, CPUCFG1, PALEN, field);

data = FIELD_DP32(data, CPUCFG1, VALEN, 0x2f);

data = FIELD_DP32(data, CPUCFG1, UAL, 1);

data = FIELD_DP32(data, CPUCFG1, RI, 1);

Some features such as LBT and PMU are implemented in kvm mode,

With paravirt features in future, post init function is added

for kvm mode, so that property for these features will be created

in kvm post init function.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/cpu.c | 2 +-

target/loongarch/cpu.h | 8 ++++++++

target/loongarch/kvm/kvm.c | 4 ++++

3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c

--- a/target/loongarch/cpu.c

+++ b/target/loongarch/cpu.c

@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)

loongarch_set_pmu);

object_property_set_description(obj, "pmu",

"Set off to performance monitor unit.");

-

+ kvm_loongarch_cpu_post_init(cpu);

} else {

cpu->lbt = ON_OFF_AUTO_OFF;

cpu->pmu = ON_OFF_AUTO_OFF;

diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/cpu.h

+++ b/target/loongarch/cpu.h

@@ -XXX,XX +XXX,XX @@ static inline void cpu_get_tb_cpu_state(CPULoongArchState *env, vaddr *pc,

void loongarch_cpu_post_init(Object *obj);

+#ifdef CONFIG_KVM

+void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu);

+#else

+static inline void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)

+{

+}

+#endif

+

#endif /* LOONGARCH_CPU_H */

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)

return ret;

+void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)

int kvm_arch_destroy_vcpu(CPUState *cs)

{

return 0;

LBT and PMU feature is supported only in kvm mode, move property

about these two features to function kvm_loongarch_cpu_post_init().

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/cpu.c | 40 ++------------------------------------

target/loongarch/kvm/kvm.c | 35 +++++++++++++++++++++++++++++++++

2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c

--- a/target/loongarch/cpu.c

+++ b/target/loongarch/cpu.c

@@ -XXX,XX +XXX,XX @@ static void loongarch_set_lasx(Object *obj, bool value, Error **errp)

cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value);

-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);

+ cpu->lbt = ON_OFF_AUTO_OFF;

+ cpu->pmu = ON_OFF_AUTO_OFF;

cpu->lsx = ON_OFF_AUTO_AUTO;

cpu->lasx = ON_OFF_AUTO_AUTO;

object_property_add_bool(obj, "lsx", loongarch_get_lsx,

@@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj)

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.");

kvm_loongarch_cpu_post_init(cpu);

- } else {

- cpu->lbt = ON_OFF_AUTO_OFF;

- cpu->pmu = ON_OFF_AUTO_OFF;

}

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)

return ret;

}

+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 kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)

{

+ cpu->lbt = ON_OFF_AUTO_AUTO;

+ object_property_add_bool(OBJECT(cpu), "lbt", loongarch_get_lbt,

+ loongarch_set_lbt);

+ object_property_set_description(OBJECT(cpu), "lbt",

+ "Set off to disable Binary Tranlation.");

+

+ cpu->pmu = ON_OFF_AUTO_AUTO;

+ object_property_add_bool(OBJECT(cpu), "pmu", loongarch_get_pmu,

+ loongarch_set_pmu);

+ object_property_set_description(OBJECT(cpu), "pmu",

+ "Set off to disable performance monitor unit.");

}

int kvm_arch_destroy_vcpu(CPUState *cs)

Property kvm-pv-ipi is added to paravirt ipi feature, it is specially

for kvm mode.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/cpu.h | 1 +

target/loongarch/kvm/kvm.c | 18 ++++++++++++++++++

target/loongarch/loongarch-qmp-cmds.c | 2 +-

3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h

--- a/target/loongarch/cpu.h

+++ b/target/loongarch/cpu.h

@@ -XXX,XX +XXX,XX @@ struct ArchCPU {

OnOffAuto pmu;

OnOffAuto lsx;

OnOffAuto lasx;

+ OnOffAuto kvm_pv_ipi;

/* 'compatible' string for this CPU for Linux device trees */

const char *dtb_compatible;

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@ static void loongarch_set_pmu(Object *obj, bool value, Error **errp)

cpu->pmu = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;

+static bool kvm_pv_ipi_get(Object *obj, Error **errp)

+{

+ return LOONGARCH_CPU(obj)->kvm_pv_ipi != ON_OFF_AUTO_OFF;

+}

+

+static void kvm_pv_ipi_set(Object *obj, bool value, Error **errp)

+{

+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+

+ cpu->kvm_pv_ipi = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;

+}

+

void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)

cpu->lbt = ON_OFF_AUTO_AUTO;

@@ -XXX,XX +XXX,XX @@ void kvm_loongarch_cpu_post_init(LoongArchCPU *cpu)

loongarch_set_pmu);

object_property_set_description(OBJECT(cpu), "pmu",

"Set off to disable performance monitor unit.");

+

+ cpu->kvm_pv_ipi = ON_OFF_AUTO_AUTO;

+ object_property_add_bool(OBJECT(cpu), "kvm-pv-ipi", kvm_pv_ipi_get,

+ kvm_pv_ipi_set);

+ object_property_set_description(OBJECT(cpu), "kvm-pv-ipi",

+ "Set off to disable KVM paravirt IPI.");

int kvm_arch_destroy_vcpu(CPUState *cs)

diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/loongarch-qmp-cmds.c

+++ b/target/loongarch/loongarch-qmp-cmds.c

@@ -XXX,XX +XXX,XX @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)

}

static const char *cpu_model_advertised_features[] = {

- "lsx", "lasx", "lbt", "pmu", NULL

+ "lsx", "lasx", "lbt", "pmu", "kvm-pv-ipi", NULL

CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,

Paravirt ipi feature is OnOffAuto type, feature detection is added

to check whether it is supported by KVM host.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/cpu.h | 2 ++

target/loongarch/kvm/kvm.c | 36 +++++++++++++++++++++++++++++++++++-

2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h

--- a/target/loongarch/cpu.h

+++ b/target/loongarch/cpu.h

@@ -XXX,XX +XXX,XX @@ enum loongarch_features {

LOONGARCH_FEATURE_LASX,

LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */

LOONGARCH_FEATURE_PMU,

+ LOONGARCH_FEATURE_PV_IPI,

};

typedef struct LoongArchBT {

@@ -XXX,XX +XXX,XX @@ typedef struct CPUArchState {

lbt_t lbt;

uint32_t cpucfg[21];

+ uint32_t pv_features;

/* LoongArch CSRs */

uint64_t CSR_CRMD;

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include <sys/ioctl.h>

#include <linux/kvm.h>

-

+#include "asm-loongarch/kvm_para.h"

#include "qapi/error.h"

#include "qemu/timer.h"

#include "qemu/error-report.h"

@@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature)

ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);

return (ret == 0);

+ case LOONGARCH_FEATURE_PV_IPI:

+ attr.group = KVM_LOONGARCH_VM_FEAT_CTRL;

+ attr.attr = KVM_LOONGARCH_VM_FEAT_PV_IPI;

+ ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr);

+ return (ret == 0);

+

default:

return false;

}

@@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_pmu(CPUState *cs, Error **errp)

+static int kvm_cpu_check_pv_features(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_PV_IPI);

+ if (cpu->kvm_pv_ipi == ON_OFF_AUTO_ON) {

+ if (!kvm_supported) {

+ error_setg(errp, "'pv_ipi' feature not supported by KVM host");

+ return -ENOTSUP;

+ }

+ } else if (cpu->kvm_pv_ipi != ON_OFF_AUTO_AUTO) {

+ kvm_supported = false;

+ }

+

+ if (kvm_supported) {

+ env->pv_features |= BIT(KVM_FEATURE_IPI);

+ }

+

+ return 0;

int kvm_arch_init_vcpu(CPUState *cs)

{

uint64_t val;

@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)

error_report_err(local_err);

+ ret = kvm_cpu_check_pv_features(cs, &local_err);

+ if (ret < 0) {

+ error_report_err(local_err);

+ }

+

return ret;

}

The similiar with cpucfg register, paravirt ipi feature is set in

function kvm_arch_put_registers(). Instead the paravirt feature can

be enabled only once, it cannot be changed dynamically.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/kvm/kvm.c | 36 ++++++++++++++++++++++++++++++++++++

1 file changed, 36 insertions(+)

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c

--- a/target/loongarch/kvm/kvm.c

+++ b/target/loongarch/kvm/kvm.c

@@ -XXX,XX +XXX,XX @@ static int kvm_set_stealtime(CPUState *cs)

return 0;

}

+static int kvm_set_pv_features(CPUState *cs)

+ CPULoongArchState *env = cpu_env(cs);

+ int err;

+ uint64_t val;

+ struct kvm_device_attr attr = {

+ .group = KVM_LOONGARCH_VCPU_CPUCFG,

+ .attr = CPUCFG_KVM_FEATURE,

+ .addr = (uint64_t)&val,

+ };

+ err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr);

+ if (err) {

+ return 0;

+ }

+

+ val = env->pv_features;

+ err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, attr);

+ if (err) {

+ error_report("Fail to set pv feature "TARGET_FMT_lx " with error %s",

+ val, strerror(errno));

+ return err;

static int kvm_loongarch_get_regs_core(CPUState *cs)

{

int ret = 0;

@@ -XXX,XX +XXX,XX @@ int kvm_arch_get_registers(CPUState *cs, Error **errp)

int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)

{

int ret;

+ static int once;

ret = kvm_loongarch_put_regs_core(cs);

if (ret) {

@@ -XXX,XX +XXX,XX @@ int kvm_arch_put_registers(CPUState *cs, int level, Error **errp)

return ret;

}

+ if (!once) {

+ ret = kvm_set_pv_features(cs);

+ if (ret) {

+ return ret;

+ }

+ once = 1;

if (level >= KVM_PUT_FULL_STATE) {

/*

* only KVM_PUT_FULL_STATE is required, kvm kernel will clear

Property kvm-steal-time is added for kvm steal time feature, it is

specially for kvm mode.

Reviewed-by: Bibo Mao <maobibo@loongson.cn>

target/loongarch/cpu.h | 1 +

target/loongarch/kvm/kvm.c | 18 ++++++++++++++++++

target/loongarch/loongarch-qmp-cmds.c | 2 +-

3 files changed, 20 insertions(+), 1 deletion(-)