The following changes since commit d762bf97931b58839316b68a570eecc6143c9e3e:

Merge tag 'pull-target-arm-20231102' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-11-03 10:04:12 +0800)

https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20231103

for you to fetch changes up to f7077737531b40aa879d4644837aeda0f7fc6aa8:

linux-user/loongarch64: Add LASX sigcontext save/restore (2023-11-03 14:13:46 +0800)

pull-loongarch-20231103

Richard Henderson (1):

linux-user/loongarch64: Use traps to track LSX/LASX usage

Song Gao (9):

target/loongarch: Add cpu model 'max'

target/loongarch: Allow user enable/disable LSX/LASX features

target/loongarch: Implement query-cpu-model-expansion

target/loongarch: Support 4K page size

linux-user/loongarch64: Fix setup_extcontext alloc wrong fpu_context size

linux-user/loongarch64: setup_sigframe() set 'end' context size 0

linux-user/loongarch64: Use abi_{ulong,uint} types

linux-user/loongarch64: Add LSX sigcontext save/restore

linux-user/loongarch64: Add LASX sigcontext save/restore

linux-user/loongarch64/cpu_loop.c | 13 ++

linux-user/loongarch64/signal.c | 189 +++++++++++++++++++++++-----

qapi/machine-target.json | 6 +-

target/loongarch/cpu-param.h | 2 +-

target/loongarch/cpu.c | 74 +++++++++++

target/loongarch/cpu.h | 2 +

target/loongarch/insn_trans/trans_vec.c.inc | 11 --

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

target/loongarch/tlb_helper.c | 9 +-

9 files changed, 318 insertions(+), 52 deletions(-)

Signed-off-by: Song Gao <gaosong@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20231101030816.2353416-7-gaosong@loongson.cn>

linux-user/loongarch64/signal.c | 68 ++++++++++++++++++++++++++++++---

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

diff --git a/linux-user/loongarch64/signal.c b/linux-user/loongarch64/signal.c

--- a/linux-user/loongarch64/signal.c

+++ b/linux-user/loongarch64/signal.c

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

abi_uint fcsr;

} QEMU_ALIGNED(LSX_CTX_ALIGN);

+#define LASX_CTX_MAGIC 0x41535801

+#define LASX_CTX_ALIGN 32

+struct target_lasx_context {

+ abi_ulong regs[4 * 32];

+ abi_ulong fcc;

+ abi_uint fcsr;

+} QEMU_ALIGNED(LASX_CTX_ALIGN);

+

#define CONTEXT_INFO_ALIGN 16

struct target_sctx_info {

abi_uint magic;

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

unsigned int flags;

struct ctx_layout fpu;

struct ctx_layout lsx;

+ struct ctx_layout lasx;

struct ctx_layout end;

2.25.1

We use cpu la464 for the 'max' cpu.

Signed-off-by: Song Gao <gaosong@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20231020084925.3457084-2-gaosong@loongson.cn>

target/loongarch/cpu.c | 7 +++++++

1 file changed, 7 insertions(+)

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_la132_initfn(Object *obj)

env->cpucfg[1] = data;

+static void loongarch_max_initfn(Object *obj)

+ /* '-cpu max' for TCG: we use cpu la464. */

+ loongarch_la464_initfn(obj);

static void loongarch_cpu_list_entry(gpointer data, gpointer user_data)

const char *typename = object_class_get_name(OBJECT_CLASS(data));

@@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_cpu_type_infos[] = {

},

DEFINE_LOONGARCH_CPU_TYPE(64, "la464", loongarch_la464_initfn),

DEFINE_LOONGARCH_CPU_TYPE(32, "la132", loongarch_la132_initfn),

+ DEFINE_LOONGARCH_CPU_TYPE(64, "max", loongarch_max_initfn),

DEFINE_TYPES(loongarch_cpu_type_infos)

2.25.1

Some users may not need LSX/LASX, this patch allows the user

enable/disable LSX/LASX features.

e.g

'-cpu max,lsx=on,lasx=on' (default);

'-cpu max,lsx=on,lasx=off' (enabled LSX);

'-cpu max,lsx=off,lasx=on' (enabled LASX, LSX);

'-cpu max,lsx=off' (disable LSX and LASX).

Signed-off-by: Song Gao <gaosong@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20231020084925.3457084-3-gaosong@loongson.cn>

---

target/loongarch/cpu.c | 67 ++++++++++++++++++++++++++++++++++++++++++

target/loongarch/cpu.h | 2 ++

2 files changed, 69 insertions(+)

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)

env->cpucfg[20] = data;

env->CSR_ASID = FIELD_DP64(0, CSR_ASID, ASIDBITS, 0xa);

+ loongarch_cpu_post_init(obj);

static void loongarch_la132_initfn(Object *obj)

@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps loongarch_qemu_ops = {

};

#endif

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

+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+ bool ret;

+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {

+ ret = true;

+ } else {

+ ret = false;

+ }

+ return ret;

+}

+

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

+{

+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+

+ if (value) {

+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);

+ } else {

+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 0);

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

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

+{

+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+ bool ret;

+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) {

+ ret = true;

+ } else {

+ ret = false;

+ return ret;

+}

+

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

+{

+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+

+ if (value) {

+    if (!FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {

+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);

+    }

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

+ } else {

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

+ }

+}

+

+void loongarch_cpu_post_init(Object *obj)

+{

+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);

+

+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {

+ object_property_add_bool(obj, "lsx", loongarch_get_lsx,

+ loongarch_set_lsx);

+ }

+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) {

+ object_property_add_bool(obj, "lasx", loongarch_get_lasx,

+ loongarch_set_lasx);

+ }

+}

+

static void loongarch_cpu_init(Object *obj)

{

#ifndef CONFIG_USER_ONLY

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 @@ void loongarch_cpu_list(void);

#define LOONGARCH_CPU_TYPE_NAME(model) model LOONGARCH_CPU_TYPE_SUFFIX

#define CPU_RESOLVING_TYPE TYPE_LOONGARCH_CPU

+void loongarch_cpu_post_init(Object *obj);

+

#endif /* LOONGARCH_CPU_H */

2.25.1

From: Richard Henderson <richard.henderson@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20231101030816.2353416-2-gaosong@loongson.cn>

Signed-off-by: Song Gao <gaosong@loongson.cn>

linux-user/loongarch64/cpu_loop.c | 13 +++++++++++++

target/loongarch/insn_trans/trans_vec.c.inc | 11 -----------

2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/linux-user/loongarch64/cpu_loop.c b/linux-user/loongarch64/cpu_loop.c

--- a/linux-user/loongarch64/cpu_loop.c

+++ b/linux-user/loongarch64/cpu_loop.c

@@ -XXX,XX +XXX,XX @@ void cpu_loop(CPULoongArchState *env)

case EXCCODE_BCE:

force_sig_fault(TARGET_SIGSYS, TARGET_SI_KERNEL, env->pc);

break;

+

+ /*

+ * Begin with LSX and LASX disabled, then enable on the first trap.

+ * In this way we can tell if the unit is in use. This is used to

+ * choose the layout of any signal frame.

+ */

+ case EXCCODE_SXD:

+ env->CSR_EUEN |= R_CSR_EUEN_SXE_MASK;

+ break;

+ case EXCCODE_ASXD:

+ env->CSR_EUEN |= R_CSR_EUEN_ASXE_MASK;

+ break;

+

case EXCP_ATOMIC:

cpu_exec_step_atomic(cs);

break;

diff --git a/target/loongarch/insn_trans/trans_vec.c.inc b/target/loongarch/insn_trans/trans_vec.c.inc

index XXXXXXX..XXXXXXX 100644

--- a/target/loongarch/insn_trans/trans_vec.c.inc

+++ b/target/loongarch/insn_trans/trans_vec.c.inc

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

* Copyright (c) 2022-2023 Loongson Technology Corporation Limited

*/

-#ifndef CONFIG_USER_ONLY

-

static bool check_vec(DisasContext *ctx, uint32_t oprsz)

if ((oprsz == 16) && ((ctx->base.tb->flags & HW_FLAGS_EUEN_SXE) == 0)) {

@@ -XXX,XX +XXX,XX @@ static bool check_vec(DisasContext *ctx, uint32_t oprsz)

return true;

-#else

-

-static bool check_vec(DisasContext *ctx, uint32_t oprsz)

- return true;

-#endif

-

static bool gen_vvvv_ptr_vl(DisasContext *ctx, arg_vvvv *a, uint32_t oprsz,

gen_helper_gvec_4_ptr *fn)

2.25.1

Add support for the query-cpu-model-expansion QMP command to LoongArch.

We support query the cpu features.

e.g

la464 and max cpu support LSX/LASX, default enable,

la132 not support LSX/LASX.

1. start with '-cpu max,lasx=off'

(QEMU) query-cpu-model-expansion type=static model={"name":"max"}

{"return": {"model": {"name": "max", "props": {"lasx": false, "lsx": true}}}}

2. start with '-cpu la464,lasx=off'

(QEMU) query-cpu-model-expansion type=static model={"name":"la464"}

{"return": {"model": {"name": "max", "props": {"lasx": false, "lsx": true}}}

3. start with '-cpu la132,lasx=off'

qemu-system-loongarch64: can't apply global la132-loongarch-cpu.lasx=off: Property 'la132-loongarch-cpu.lasx' not found

4. start with '-cpu max,lasx=off' or start with '-cpu la464,lasx=off' query cpu model la132

(QEMU) query-cpu-model-expansion type=static model={"name":"la132"}

{"return": {"model": {"name": "la132"}}}

Acked-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Song Gao <gaosong@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20231020084925.3457084-4-gaosong@loongson.cn>

---

qapi/machine-target.json | 6 ++-

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

2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/qapi/machine-target.json b/qapi/machine-target.json

--- a/qapi/machine-target.json

+++ b/qapi/machine-target.json

'data': { 'model': 'CpuModelInfo' },

'if': { 'any': [ 'TARGET_S390X',

'TARGET_I386',

- 'TARGET_ARM' ] } }

+ 'TARGET_ARM',

+ 'TARGET_LOONGARCH64' ] } }

##

# @query-cpu-model-expansion:

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

'returns': 'CpuModelExpansionInfo',

'if': { 'any': [ 'TARGET_S390X',

'TARGET_I386',

- 'TARGET_ARM' ] } }

+ 'TARGET_ARM',

+ 'TARGET_LOONGARCH64' ] } }

##

# @CpuDefinitionInfo:

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 @@

*/

#include "qemu/osdep.h"

+#include "qapi/error.h"

#include "qapi/qapi-commands-machine-target.h"

#include "cpu.h"

+#include "qapi/qmp/qerror.h"

+#include "qapi/qmp/qdict.h"

+#include "qapi/qobject-input-visitor.h"

+#include "qom/qom-qobject.h"

static void loongarch_cpu_add_definition(gpointer data, gpointer user_data)

{

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

return cpu_list;

}

+static const char *cpu_model_advertised_features[] = {

+ "lsx", "lasx", NULL

+};

+

+CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,

+ CpuModelInfo *model,

+ Error **errp)

+{

+ CpuModelExpansionInfo *expansion_info;

+ QDict *qdict_out;

+ ObjectClass *oc;

+ Object *obj;

+ const char *name;

+ int i;

+

+ if (type != CPU_MODEL_EXPANSION_TYPE_STATIC) {

+ error_setg(errp, "The requested expansion type is not supported");

+ return NULL;

+ oc = cpu_class_by_name(TYPE_LOONGARCH_CPU, model->name);

+ if (!oc) {

+ error_setg(errp, "The CPU type '%s' is not a recognized LoongArch CPU type",

+ model->name);

+ return NULL;

+ obj = object_new(object_class_get_name(oc));

+ expansion_info = g_new0(CpuModelExpansionInfo, 1);

+ expansion_info->model = g_malloc0(sizeof(*expansion_info->model));

+ expansion_info->model->name = g_strdup(model->name);

+

+ qdict_out = qdict_new();

+

+ i = 0;

+ while ((name = cpu_model_advertised_features[i++]) != NULL) {

+ ObjectProperty *prop = object_property_find(obj, name);

+ if (prop) {

+ QObject *value;

+

+ assert(prop->get);

+ value = object_property_get_qobject(obj, name, &error_abort);

+

+ qdict_put_obj(qdict_out, name, value);

+ }

+ }

+

+ if (!qdict_size(qdict_out)) {

+ qobject_unref(qdict_out);

+ } else {

+ expansion_info->model->props = QOBJECT(qdict_out);

+ }

+

+ object_unref(obj);

+

+ return expansion_info;

+}

2.25.1

Signed-off-by: Song Gao <gaosong@loongson.cn>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20231101030816.2353416-5-gaosong@loongson.cn>

linux-user/loongarch64/signal.c | 24 ++++++++++++------------

1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/linux-user/loongarch64/signal.c b/linux-user/loongarch64/signal.c

--- a/linux-user/loongarch64/signal.c

+++ b/linux-user/loongarch64/signal.c

#define SC_USED_FP (1 << 0)

struct target_sigcontext {

- uint64_t sc_pc;

- uint64_t sc_regs[32];

- uint32_t sc_flags;

- uint64_t sc_extcontext[0] QEMU_ALIGNED(16);

+ abi_ulong sc_pc;

+ abi_ulong sc_regs[32];

+ abi_uint sc_flags;

+ abi_ulong sc_extcontext[0] QEMU_ALIGNED(16);

QEMU_BUILD_BUG_ON(sizeof(struct target_sigcontext) != sizeof_sigcontext);

@@ -XXX,XX +XXX,XX @@ QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_regs)

#define FPU_CTX_MAGIC 0x46505501

#define FPU_CTX_ALIGN 8

struct target_fpu_context {

- uint64_t regs[32];

- uint64_t fcc;

- uint32_t fcsr;

+ abi_ulong regs[32];

+ abi_ulong fcc;

+ abi_uint fcsr;

} QEMU_ALIGNED(FPU_CTX_ALIGN);

QEMU_BUILD_BUG_ON(offsetof(struct target_fpu_context, regs)

@@ -XXX,XX +XXX,XX @@ QEMU_BUILD_BUG_ON(offsetof(struct target_fpu_context, regs)

#define CONTEXT_INFO_ALIGN 16

struct target_sctx_info {

- uint32_t magic;

- uint32_t size;

- uint64_t padding;

+ abi_uint magic;

+ abi_uint size;

+ abi_ulong padding;

} QEMU_ALIGNED(CONTEXT_INFO_ALIGN);

QEMU_BUILD_BUG_ON(sizeof(struct target_sctx_info) != sizeof_sctx_info);

@@ -XXX,XX +XXX,XX @@ static bool parse_extcontext(struct extctx_layout *extctx, abi_ptr frame)

memset(extctx, 0, sizeof(*extctx));

while (1) {

- uint32_t magic, size;

+ abi_uint magic, size;

if (get_user_u32(magic, frame) || get_user_u32(size, frame + 4)) {

return false;

@@ -XXX,XX +XXX,XX @@ static void restore_sigframe(CPULoongArchState *env,

if (extctx->fpu.haddr) {

struct target_fpu_context *fpu_ctx =

extctx->fpu.haddr + sizeof(struct target_sctx_info);

- uint64_t fcc;

+ abi_ulong fcc;

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

__get_user(env->fpr[i].vreg.D(0), &fpu_ctx->regs[i]);

2.25.1

See:

https://github.com/torvalds/linux/blob/master/arch/loongarch/kernel/signal.c

The kernel setup_sigcontext() set end context size 0.