From nobody Sun Jul 26 12:38:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1781819706; cv=none; d=zohomail.com; s=zohoarc; b=L8nxCzLIwEYzAEbdFCncB800eFQQ5SsST12kYQwPEDNQ+pjjP2unOsuctvUqXs7eHtlKbB2GWj+ushl64FHk4LyjEbA29Ri0qOXd7xC8ZZgtAb14qhVKmc1YnEIYMn5L1Z2tRyrJUv8h56y7YL0y9aUPqmB766gHeiNp3FwHqt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781819706; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+/z2gsMFDguQ4ik1vH3gPJhI22TKOIejE07Hin8CMOU=; b=hAv1aqoJayskNLliWE3fmj8GaMVHT5p/yC5Set/4URbhkD7q7R8v4SiVty843gaZ7P/NFVm/k5Zd6MItz8ibdjr1a3zAquyQ4gEtRenHU0YGInogSHNEhDF9liPe4+8kdYz+4y3G5tI8AmqMBn5Wz8wGqbYfqJ1dkrtKl2MVtdY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781819706147241.99527019469406; Thu, 18 Jun 2026 14:55:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1waKgt-0003f6-Uj; Thu, 18 Jun 2026 17:54:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgs-0003ei-GE for qemu-devel@nongnu.org; Thu, 18 Jun 2026 17:54:26 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgq-0002Jk-Nb for qemu-devel@nongnu.org; Thu, 18 Jun 2026 17:54:26 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 36C6E43430; Thu, 18 Jun 2026 21:54:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B5581F000E9; Thu, 18 Jun 2026 21:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781819656; bh=+/z2gsMFDguQ4ik1vH3gPJhI22TKOIejE07Hin8CMOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=edEsvv4CFf0l5/HdrtEFUGhb6xsZ3b4p2evjCeGJuq9yU72F1hvInJFZnM9x6W6sI b3sBbGZNi2VUgJZw4SEuGtz/mB6Bi05rEjTb7kdr7gcV1gax2Ar0Q3CYtGIjNup8EO VqDX0nuod03xM47fhi+tmFi3OZsmd0vZz1NkEinI2iqKvsU8D6LHMl1a2+gMBjK3bh xBTDYUFLVuuNEkYJKisJEIpRkjtqGrT1dlJ2SDqr9HwQwosGR5cX+Z9Rln2l/Ir4+H A3yb/XDHHak9rpzxzhJe2alOOL43fExSSLms9d953RY6sZ9B5EPpq45lfLWy2LBnly lkHU+SetWC/Og== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Pierrick Bouvier , Laurent Vivier , deller@gmx.de, Akshit Yadav Subject: [PULL 1/4] linux-user: Fix AT_PHDR when program headers are relocated into their own segment Date: Thu, 18 Jun 2026 23:54:08 +0200 Message-ID: <20260618215411.22057-2-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260618215411.22057-1-deller@kernel.org> References: <20260618215411.22057-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=172.234.252.31; envelope-from=deller@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1781819708104158500 Content-Type: text/plain; charset="utf-8" From: Akshit Yadav When a binary is patched or relocated such that the program header table is moved into a separate PT_LOAD segment (rather than sitting at the start of = the first loadable segment), QEMU's AT_PHDR auxv entry becomes incorrect. The loader was computing AT_PHDR as load_addr + e_phoff, which assumes the head= ers are mapped 1:1 from file offset 0. This breaks when the headers are elsewhe= re. The Linux kernel instead locates the PT_LOAD segment that contains e_phoff, then computes the in-memory address as p_vaddr + (e_phoff - p_offset). This correctly handles relocated headers. Fix by: 1. Add phdr_addr field to image_info to cache the resolved address. 2. Initialize to load_addr + e_phoff (fallback for headers outside any PT_L= OAD). 3. In the PT_LOAD mapping loop, detect if the segment contains e_phoff and override with the segment-relative address. 4. Use info->phdr_addr for AT_PHDR instead of the incorrect formula. Signed-off-by: Akshit Yadav Reviewed-by: Helge Deller --- linux-user/elfload.c | 21 ++++++++++++++++++++- linux-user/qemu.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b05b8b0c6b..8049c8ae62 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -699,7 +699,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int arg= c, int envc, /* There must be exactly DLINFO_ITEMS entries here, or the assert * on info->auxv_len will trigger. */ - NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->load_addr + exec->e_phoff)); + NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->phdr_addr)); NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof (struct elf_phdr))); NEW_AUX_ENT(AT_PHNUM, (abi_ulong)(exec->e_phnum)); NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE)); @@ -1469,6 +1469,12 @@ static void load_elf_image(const char *image_name, c= onst ImageSource *src, info->data_offset =3D load_bias; info->load_addr =3D load_addr; info->entry =3D ehdr->e_entry + load_bias; + /* + * Fallback for AT_PHDR if the program headers do not fall within + * any PT_LOAD segment (see the loop below, which overrides this with + * the correct in-memory address when a containing segment is found). + */ + info->phdr_addr =3D load_addr + ehdr->e_phoff; info->start_code =3D -1; info->end_code =3D 0; info->start_data =3D -1; @@ -1523,6 +1529,19 @@ static void load_elf_image(const char *image_name, c= onst ImageSource *src, vaddr_ef =3D vaddr + eppnt->p_filesz; vaddr_em =3D vaddr + eppnt->p_memsz; =20 + /* + * If this segment contains the program headers, record their + * in-memory address for AT_PHDR. This matches the kernel, whi= ch + * locates the headers via the containing PT_LOAD rather than + * assuming load_addr + e_phoff (false when the phdrs are not + * mapped 1:1 from file offset 0, e.g. relocated into their own + * segment by a binary patcher). + */ + if (eppnt->p_offset <=3D ehdr->e_phoff && + ehdr->e_phoff < eppnt->p_offset + eppnt->p_filesz) { + info->phdr_addr =3D vaddr + (ehdr->e_phoff - eppnt->p_offs= et); + } + /* * Some segments may be completely empty, with a non-zero p_me= msz * but no backing file segment. diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 07fe801628..2268493141 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -26,6 +26,7 @@ struct image_info { abi_ulong load_bias; abi_ulong load_addr; + abi_ulong phdr_addr; abi_ulong start_code; abi_ulong end_code; abi_ulong start_data; --=20 2.54.0 From nobody Sun Jul 26 12:38:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1781819725; cv=none; d=zohomail.com; s=zohoarc; b=F8dGAxAoHLSZlXIoDvgyRVHJYuvyWwe1Lux6Xb5T/qKGcIKTEorMtAXXIIC+S/Xt8ACewuFuZ3ZP5rUt3NCgu7Ic+OYc7wOCt0j4mA2DETEmoxrjmb6TwJw7KCzpIkgzfQmlyBdNbeuYUyo3TNT33yyR1XZkMaWcdaPUgdGLmus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781819725; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Il/D/59EcDGFMbeKx110OhFMLzw22+Wm+90eKW+Hs6k=; b=a5hbHy4NppO+Ntg05bLCnqvQQo+WQ2jZGjoOauLK7nVsVTmaMa79zDYNm5/yxN5Q34G5wZt3YMmY3qMl4Dhys1q9MqjpoOSgoWpmQWtrc5TJEdCEXQtv8DFf1d1pnFYQrr9WuZRoAEQ5syC9yv/DjDn8CNXEHFS89HnRJk0z21I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781819725179173.89040499415967; Thu, 18 Jun 2026 14:55:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1waKgv-0003gS-Qu; Thu, 18 Jun 2026 17:54:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgu-0003fp-Gt for qemu-devel@nongnu.org; Thu, 18 Jun 2026 17:54:28 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgs-0002KE-OM for qemu-devel@nongnu.org; Thu, 18 Jun 2026 17:54:28 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 4327443CD9; Thu, 18 Jun 2026 21:54:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 520081F000E9; Thu, 18 Jun 2026 21:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781819659; bh=Il/D/59EcDGFMbeKx110OhFMLzw22+Wm+90eKW+Hs6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UNeHbB6w1oKKdo3zLf8BWamjxmDnlyhF5y8YKMj8pT3qN/Kqg1VaW0f4dBFvU0o8X 5i2QDhn+AzEU73A/lHQtLD99RlQ+nW8asnM4SY9YUKA1o/gGcpxdet2a5b4B3zuxHy d/fC/H/O1ZsQVme61N/93g2TaE8ZiFt5MfnaKml6QNvtldDDYOBqJsg4YMu2ABRN1X Ojy4fv/pqaZ/Gj9/UcjPebLVIWJkoOgHb/TQPO/ed2DppSqwGTxxJ9VUpaWUMzOxSa iCnxPrOcuXS9/nJbGcu/tDtQdXhh66EvE8RmpU7WFd9suZ3iIz3nqFZA0+z8naFjCO 6cBSpv32DTMxQ== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Pierrick Bouvier , Laurent Vivier , deller@gmx.de, Song Gao , Bibo Mao , Jiaxun Yang Subject: [PULL 2/4] linux-user: Implement /proc/cpuinfo for loongarch cpus Date: Thu, 18 Jun 2026 23:54:09 +0200 Message-ID: <20260618215411.22057-3-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260618215411.22057-1-deller@kernel.org> References: <20260618215411.22057-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=172.234.252.31; envelope-from=deller@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1781819727957158500 Content-Type: text/plain; charset="utf-8" From: Helge Deller Mimic the entries for /proc/cpuinfo to what can be seen on the debian porterbox loomis.debian.org. Cc: Song Gao Cc: Bibo Mao Cc: Jiaxun Yang Signed-off-by: Helge Deller --- linux-user/loongarch64/elfload.c | 20 +++++++ linux-user/loongarch64/target_proc.h | 79 +++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/linux-user/loongarch64/elfload.c b/linux-user/loongarch64/elfl= oad.c index e53957e36d..2242f20202 100644 --- a/linux-user/loongarch64/elfload.c +++ b/linux-user/loongarch64/elfload.c @@ -28,6 +28,26 @@ enum { HWCAP_LOONGARCH_LBT_MIPS =3D (1 << 12), }; =20 +const char *elf_hwcap_str(uint32_t bit) +{ + static const char *hwcap_str[] =3D { + [__builtin_ctz(HWCAP_LOONGARCH_CPUCFG )] =3D "cpucfg", + [__builtin_ctz(HWCAP_LOONGARCH_LAM )] =3D "lam", + [__builtin_ctz(HWCAP_LOONGARCH_UAL )] =3D "lam_bh", + [__builtin_ctz(HWCAP_LOONGARCH_FPU )] =3D "fpu", + [__builtin_ctz(HWCAP_LOONGARCH_LSX )] =3D "lsx", + [__builtin_ctz(HWCAP_LOONGARCH_LASX )] =3D "lasx", + [__builtin_ctz(HWCAP_LOONGARCH_CRC32 )] =3D "crc32", + [__builtin_ctz(HWCAP_LOONGARCH_COMPLEX )] =3D "complex", + [__builtin_ctz(HWCAP_LOONGARCH_CRYPTO )] =3D "crypto", + [__builtin_ctz(HWCAP_LOONGARCH_LVZ )] =3D "lvz", + [__builtin_ctz(HWCAP_LOONGARCH_LBT_X86 )] =3D "lbt_x86", + [__builtin_ctz(HWCAP_LOONGARCH_LBT_ARM )] =3D "lbt_arm", + [__builtin_ctz(HWCAP_LOONGARCH_LBT_MIPS)] =3D "lbt_mips", + }; + + return bit < ARRAY_SIZE(hwcap_str) ? hwcap_str[bit] : NULL; +} abi_ulong get_elf_hwcap(CPUState *cs) { LoongArchCPU *cpu =3D LOONGARCH_CPU(cs); diff --git a/linux-user/loongarch64/target_proc.h b/linux-user/loongarch64/= target_proc.h index 43fe29ca72..f739520fab 100644 --- a/linux-user/loongarch64/target_proc.h +++ b/linux-user/loongarch64/target_proc.h @@ -1 +1,78 @@ -/* No target-specific /proc support */ +/* + * Loongson specific proc functions for linux-user + * + * Copyright (c) 2026 Helge Deller + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef LOONGARCH_TARGET_PROC_H +#define LOONGARCH_TARGET_PROC_H + +static int open_cpuinfo(CPUArchState *cpu_env, int fd) +{ + uint32_t elf_hwcap =3D get_elf_hwcap(env_cpu(cpu_env)); + uint32_t prid, ser_id, pabits, vabits, i, n, num_cpus; + bool is_64bit =3D is_la64(cpu_env); + const char *hwcap_str; + struct timespec res; + double freq_mhz; + +#if TARGET_LONG_BITS =3D=3D 32 + pabits =3D 31; + vabits =3D 31; +#else + pabits =3D FIELD_EX32(cpu_env->cpucfg[1], CPUCFG1, PALEN); + vabits =3D FIELD_EX32(cpu_env->cpucfg[1], CPUCFG1, VALEN); +#endif + + if (clock_getres(CLOCK_REALTIME, &res) =3D=3D -1) { + res.tv_nsec =3D 1; + } + freq_mhz =3D 1000.0 / res.tv_nsec; + + ser_id =3D FIELD_EX32(cpu_env->cpucfg[0], CPUCFG0, SERID); + prid =3D FIELD_EX32(cpu_env->cpucfg[0], CPUCFG0, PRID); + + dprintf(fd, "system type\t\t: generic-loongson-machine\n"); + + num_cpus =3D sysconf(_SC_NPROCESSORS_ONLN); + for (n =3D 0; n < num_cpus; n++) { + dprintf(fd, "\nprocessor\t\t: %d\n", n); + dprintf(fd, "package\t\t\t: 0\n"); + dprintf(fd, "core\t\t\t: %d\n", n); + dprintf(fd, "global_id\t\t: %d\n", n); + dprintf(fd, "CPU Family\t\t: Loongson-%dbit\n", is_64bit ? 64 : 32= ); + dprintf(fd, "Model Name\t\t: QEMU_user-v" QEMU_VERSION "\n"); + dprintf(fd, "PRID\t\t\t: %s (%08x)\n", + ser_id =3D=3D PRID_SERIES_LA464 ? "LA464" : + ser_id =3D=3D PRID_SERIES_LA132 ? "LA132" : "Unknown", + cpu_env->cpucfg[0]); + dprintf(fd, "CPU Revision\t\t: 0x%02x\n", prid); + dprintf(fd, "FPU Revision\t\t: 0x%02x\n", + FIELD_EX32(cpu_env->cpucfg[2], CPUCFG2, FP_VER)); + dprintf(fd, "CPU MHz\t\t\t: %.2f\n", freq_mhz); + dprintf(fd, "Address Sizes\t\t: %d bits physical, %d bits virtual\= n", + pabits + 1, vabits + 1); + + dprintf(fd, "ISA\t\t\t:%s", " loongarch32r loongarch32s"); + if (is_64bit) { + dprintf(fd, " loongarch64"); + } + + dprintf(fd, "\nFeatures\t\t:"); + for (i =3D 0; i < sizeof(elf_hwcap) * 8; i++) { + if (!(elf_hwcap & (1 << i))) { + continue; + } + hwcap_str =3D elf_hwcap_str(i); + if (hwcap_str) { + dprintf(fd, " %s", hwcap_str); + } + } + dprintf(fd, "\nHardware Watchpoint\t: no\n"); + } + return 0; +} +#define HAVE_ARCH_PROC_CPUINFO + +#endif /* LOONGARCH_TARGET_PROC_H */ --=20 2.54.0 From nobody Sun Jul 26 12:38:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1781819705; cv=none; d=zohomail.com; s=zohoarc; b=TjK9g/JhHbrQclPZBOjX/WrlYYbToyS8wDm/RS5iUla9gYqmRmH5nLcq2e/qS20LT12KQu+QDgqgBh1c+uHLt1NE0/G+X7bQFXBuPjRu67OIHtP3krW+YUAxka8SKquwU6MG3KifYQtUSleiO+5UC5iZxkEIoFwQ4idWPt/mACA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781819705; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PEnXMMVv9dWFj8YPlqBxVILE7oewYr7Nm0uK+8bv6uo=; b=jYj0jR3RCjYuVuKAvi/cFl5N5Uel+7zf6ftRIx/mgvEtzBJcEYOfeOl89pxrHzTboYhDj0o4opIoJUf+4mATxm56jQJ/ycR9WP+pywBXSJuBhiRFGJ3ZirqPEAKq+ykYjwOlTlYlAg9LEH1EDcGa1LW8+ezc9g7Pf01g6QDKf30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178181970563188.33973098484046; Thu, 18 Jun 2026 14:55:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1waKgx-0003gq-8e; Thu, 18 Jun 2026 17:54:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgw-0003gT-64 for qemu-devel@nongnu.org; Thu, 18 Jun 2026 17:54:30 -0400 Received: from tor.source.kernel.org ([172.105.4.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgu-0002Kd-MQ for qemu-devel@nongnu.org; Thu, 18 Jun 2026 17:54:29 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 4699E601E1; Thu, 18 Jun 2026 21:54:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93C401F000E9; Thu, 18 Jun 2026 21:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781819661; bh=PEnXMMVv9dWFj8YPlqBxVILE7oewYr7Nm0uK+8bv6uo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bNtoS5pNY+z5l3l5leKVZQcE7g5fsytNv9ZU51MgfBKEzUpj4LYi3dckOy6IJYeTl e/j8BojoGxUbFXEcuyKeRbwRrLqIg9qHeDoE8nZwjVqptfGECg8yiasN4MRgy/kNbB fPOTmw3AbzDUZsmY/sOn0IvA0sFhbbuTsO+nj3zm5qQStt7D8IiI/t9P/H56bkEnaE TI459BBbiQ/E3XqRMhcOtd+qtnTyjahuQNcLfRCrm2iQV1mOvT39N/cQBzY9pvz3AI UQxKXDoaHZag0HXwcrfdOxGC/AuB54vpzKSwNQNKj7YzyMbt6xYExn5anWCloW3xyB xjALnlZ6/hX9A== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Pierrick Bouvier , Laurent Vivier , deller@gmx.de, Thomas Huth Subject: [PULL 3/4] linux-user: Implement /proc/cpuinfo for m68k CPU Date: Thu, 18 Jun 2026 23:54:10 +0200 Message-ID: <20260618215411.22057-4-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260618215411.22057-1-deller@kernel.org> References: <20260618215411.22057-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=172.105.4.254; envelope-from=deller@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1781819708220158500 Content-Type: text/plain; charset="utf-8" From: Helge Deller Mimic the entries for /proc/cpuinfo to what can be seen on the debian porterbox mitchy.debian.org. Cc: Thomas Huth Cc: Laurent Vivier Signed-off-by: Helge Deller --- linux-user/m68k/target_proc.h | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/linux-user/m68k/target_proc.h b/linux-user/m68k/target_proc.h index 3df8f28e22..dca77d8483 100644 --- a/linux-user/m68k/target_proc.h +++ b/linux-user/m68k/target_proc.h @@ -1,6 +1,8 @@ /* * M68K specific proc functions for linux-user * + * Copyright (c) 2026 Helge Deller + * * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef M68K_TARGET_PROC_H @@ -13,4 +15,48 @@ static int open_hardware(CPUArchState *cpu_env, int fd) } #define HAVE_ARCH_PROC_HARDWARE =20 + +static int open_cpuinfo(CPUArchState *cpu_env, int fd) +{ + const char *cpu, *fpu; + struct timespec res; + double freq_mhz; + + if (clock_getres(CLOCK_REALTIME, &res) =3D=3D -1) { + res.tv_nsec =3D 1; + } + freq_mhz =3D 1000.0 / res.tv_nsec; + + if (m68k_feature(cpu_env, M68K_FEATURE_M68010)) { + cpu =3D "68010"; + } else if (m68k_feature(cpu_env, M68K_FEATURE_M68020)) { + cpu =3D "68020"; + } else if (m68k_feature(cpu_env, M68K_FEATURE_M68030)) { + cpu =3D "68030"; + } else if (m68k_feature(cpu_env, M68K_FEATURE_M68040)) { + cpu =3D "68040"; + } else if (m68k_feature(cpu_env, M68K_FEATURE_M68060)) { + cpu =3D "68060"; + } else { + cpu =3D "680x0"; + } + + if (m68k_feature(cpu_env, M68K_FEATURE_FPU)) { + fpu =3D cpu; + } else { + fpu =3D "none(soft float)"; + } + + dprintf(fd, "CPU:\t\t%s\n" + "MMU:\t\t%s\n" + "FPU:\t\t%s\n" + "Clocking:\t%.1fMHz\n" + "Model:\t\tQEMU user v" QEMU_VERSION "\n", + cpu, cpu, fpu, freq_mhz); + /* dropped BogoMips and Calibration for now */ + + return 0; +} +#define HAVE_ARCH_PROC_CPUINFO + #endif /* M68K_TARGET_PROC_H */ --=20 2.54.0 From nobody Sun Jul 26 12:38:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1781819725; cv=none; d=zohomail.com; s=zohoarc; b=hR9qokWarmnrFL/cx92Jf/zwcwjjyP6KbDaFFvG19Msl+r+2bZotYD4zF83P6ZHBY4zB6tJNzJc06ZJ7a+Rckg+CwzBIBQR7KZ5Z/sBvAXJIXzYYkKx2ZxOTJVsQfIRlGvo01QDExLLgNAoDe8mWF3FdlRPVQP1OjmqJ+bCk5LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781819725; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8P2EgFQk+ZR72MD1XtSiusYTZJj70kGRSnZOGBod6KQ=; b=Qv+XmBdKNuvrM+NuColJfKO7EeQfnpqzRilkKQachV5aY7FZpEtXoo4U/3mIcV729EV54YmcotyUAo/BoiuX/cqlNs1YGlynIHa0eMBnNaibO++kyBkzcwPVc30KAWfpZWibb/j63LT0Bq/cZG120NAL/mYZ34lx/Nb90Pw/yVA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781819725288725.5727077025433; Thu, 18 Jun 2026 14:55:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1waKgu-0003fn-D2; Thu, 18 Jun 2026 17:54:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgt-0003eq-9I; Thu, 18 Jun 2026 17:54:27 -0400 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1waKgr-0002Ks-28; Thu, 18 Jun 2026 17:54:27 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 15312440B7; Thu, 18 Jun 2026 21:54:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C34B1F000E9; Thu, 18 Jun 2026 21:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781819663; bh=8P2EgFQk+ZR72MD1XtSiusYTZJj70kGRSnZOGBod6KQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZRT/mm9e8caXr5XPW5sNbsLvSOVNO2L5YsedeY9+ZRJf5mNF7XJP0InOC8sQq/JYL qtw8evjkEIrNMm81EtwJlMq3kZQARzWz/1MvtCp2Fwt/WuvRtwfHKQZJ7wNvDePruv vFBm5gT9aSsT5ORFatURwq2xrYsW5ZsvWZH5nMfKRQjhlni3o7IAwkxdUf58AZYgA8 6vhgNdUYrRNb3eB7dtXucnOW8qfVUZ3KJkPZE3upFu+OVkfMa9xxZv3QZtCDVbPJU4 anGte6eKbGI91i3tY3DsuomPke5MRBbx6mpUByeBc5Zd6dyBEd1LEpHmnIxn2oMjxY 43QpmWh3q/vsw== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Pierrick Bouvier , Laurent Vivier , deller@gmx.de, Matt Turner , qemu-stable@nongnu.org Subject: [PULL 4/4] linux-user/xtensa: fix unlock of uninitialized frame pointer on sigreturn Date: Thu, 18 Jun 2026 23:54:11 +0200 Message-ID: <20260618215411.22057-5-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260618215411.22057-1-deller@kernel.org> References: <20260618215411.22057-1-deller@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2600:3c0a:e001:78e:0:1991:8:25; envelope-from=deller@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1781819727732158500 Content-Type: text/plain; charset="utf-8" From: Matt Turner If lock_user_struct fails, frame is uninitialized but the badframe label unconditionally calls unlock_user_struct on it. Handle the lock failure inline so badframe is only reached with a valid lock. Signed-off-by: Matt Turner Cc: qemu-stable@nongnu.org Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/xtensa/signal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c index e3f9da322b..4990c50045 100644 --- a/linux-user/xtensa/signal.c +++ b/linux-user/xtensa/signal.c @@ -355,7 +355,8 @@ long do_rt_sigreturn(CPUXtensaState *env) =20 trace_user_do_rt_sigreturn(env, frame_addr); if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) { - goto badframe; + force_sig(TARGET_SIGSEGV); + return -QEMU_ESIGRETURN; } target_to_host_sigset(&set, &frame->uc.tuc_sigmask); set_sigmask(&set); --=20 2.54.0