From nobody Tue Jun 9 01:36:55 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=1780947837; cv=none; d=zohomail.com; s=zohoarc; b=fysge7YTPmCHOf3cjnQ1fjJXMz8vX1ezixe/DlEJfECnIOVMFAAh+zasRG3noec6DOFeXnVbwQ31nR8pB1S9G2y7QlZfwpxvAykuI8nTTC2vayVEFGd8JwT97lRmq1HHPnxRFMGS/CImI2/BHq05wiBokxzgUS2dUjLIrCrTerc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947837; 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=SZokrjayKiS1ulA/9qnPoBKc5DedE8QybE5mhesGm2A=; b=IllqTtSunS7YcU0LKHIOXPXnkYdNdwtXawAaVopezfd9psrQ108DFWr/BjwUK6ftf0shlR0PUHBUOI9xo9K6wMCbfneZj5o/RvVh835g0kDZ2kfJesY99TeLfCtV1xAoayzOs7GLiyDbH1u7CPxuizqUzrf0Dtf/EYpCKgwPLVM= 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 1780947837816626.2673367685226; Mon, 8 Jun 2026 12:43:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsP-0008SU-4d; Mon, 08 Jun 2026 15:43:17 -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 1wWfsG-0008Rx-W0 for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:05 -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 1wWfsF-0006BQ-C6 for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:04 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 7E0B5601D8; Mon, 8 Jun 2026 19:43:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A56761F00893; Mon, 8 Jun 2026 19:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947782; bh=SZokrjayKiS1ulA/9qnPoBKc5DedE8QybE5mhesGm2A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q0CHjFzTqagiUMlFRToG8/60LidYM9Od3uAa+ERpdCV3vhBo8JdhTnNeGJCgNxLKJ 8EqQj6Y5WtpKV9l5v8MghD5e0gw9Z5ar41jATOzsrlMEGECr3sd5M2yNwQh8/GmrHR 3wf4Zyfmvm6/VVuy10TAhZIEwRcp7AQjoS+0farRvn6fv9sx7bZHS4zc5QY7XOqXfR qGsfYhlfVKpqdVwjXG8zWN24/EQt8EOchkcHt9V5MBzENQYtwZGCId4k7RRbBBK+4E TDgPLWt7KVzMmTgS3Soq19BCyUMDrykIbDGhfxRsbqmn2lxV8WgMY5Q1crT1gOPXEw YhLqynkCRdKJw== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Xinhui Yang Subject: [PULL 1/8] linux-user: implement fsmount(2) series of syscalls Date: Mon, 8 Jun 2026 21:42:49 +0200 Message-ID: <20260608194256.13794-2-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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: 1780947839826154101 Content-Type: text/plain; charset="utf-8" From: Xinhui Yang This series of syscalls replaces the old mount(2) syscall with a series of syscalls that operates around a filesystem context. This series of syscalls is available since Linux 5.2 and glibc 2.36+. Their users include systemd since v259 and libmount from util-linux, and possibly other widely used projects. Preliminary checks are implemented to ensure the validity of the interface. Signed-off-by: Xinhui Yang Reviewed-by: Pierrick Bouvier Signed-off-by: Helge Deller --- linux-user/syscall.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7d7a7b489c..c5c2aa80ec 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -14412,6 +14412,97 @@ static abi_long do_syscall1(CPUArchState *cpu_env,= int num, abi_long arg1, return do_map_shadow_stack(cpu_env, arg1, arg2, arg3); #endif =20 +#if defined(TARGET_NR_fsopen) + case TARGET_NR_fsopen: + { + p =3D lock_user_string(arg1); + if (!p) { + return -TARGET_EFAULT; + } + ret =3D get_errno(fsopen(p, arg2)); + unlock_user(p, arg1, 0); + } + return ret; + case TARGET_NR_fsconfig: + { + /* + * fsconfig(int, int, char *, void *, int) + * NOTE: p4 is nullable and its type might not be a string. + */ + void *p3, *p4; + int cmd =3D (int) arg2; + switch (cmd) { + case FSCONFIG_SET_BINARY: + case FSCONFIG_SET_STRING: + case FSCONFIG_SET_PATH: + case FSCONFIG_SET_PATH_EMPTY: + p3 =3D lock_user_string(arg3); + if (!p3) { + return -TARGET_EFAULT; + } + if (cmd !=3D FSCONFIG_SET_BINARY) { + /* key and value must be strings. */ + p4 =3D lock_user_string(arg4); + } else { + /* + * Otherwise the value must be a raw buffer with its + * length specified in arg5 (aux). + */ + p4 =3D lock_user(VERIFY_READ, arg4, arg5, 1); + } + if (!p4) { + unlock_user(p3, arg3, 0); + return -TARGET_EFAULT; + } + ret =3D get_errno(fsconfig(arg1, arg2, p3, p4, arg5)); + unlock_user(p3, arg3, 0); + unlock_user(p4, arg4, 0); + break; + + case FSCONFIG_SET_FLAG: + case FSCONFIG_SET_FD: + /* arg4 (value) must be NULL. */ + if (arg4) { + return -TARGET_EFAULT; + } + p3 =3D lock_user_string(arg3); + if (!p3) { + return -TARGET_EFAULT; + } + ret =3D get_errno(fsconfig(arg1, arg2, p3, NULL, arg5)); + unlock_user(p3, arg3, 0); + break; + case FSCONFIG_CMD_CREATE: + case FSCONFIG_CMD_RECONFIGURE: +#ifdef FSCONFIG_CMD_CREATE_EXCL + /* + * FSCONFIG_CMD_CREATE_EXCL is only available since Linux + * 6.6. Guarding it to allow building with pre-6.6 headers. + */ + case FSCONFIG_CMD_CREATE_EXCL: +#endif + /* key and value must be NULL, aux must be 0. */ + if (arg3 || arg4 || arg5) { + return -TARGET_EFAULT; + } + ret =3D get_errno(fsconfig(arg1, arg2, NULL, NULL, 0)); + break; + default: + return -TARGET_EFAULT; + } + } + return ret; + case TARGET_NR_fsmount: + ret =3D get_errno(fsmount(arg1, arg2, arg3)); + return ret; + case TARGET_NR_fspick: + { + p =3D lock_user_string(arg2); + ret =3D get_errno(fspick(arg1, p, arg3)); + unlock_user(p, arg2, 0); + } + return ret; +#endif default: qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num); return -TARGET_ENOSYS; --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947842; cv=none; d=zohomail.com; s=zohoarc; b=fRJ/8orOSk6g72ybo7s6gvBxEM9aHwAGw7doQpTk9mwJ4P/v358nGBqGh/1Z+o8/09NRgPVc0oe8C/24mjODofbirZqvD1nHkUED7LERrM+WLSk3R4nmKI5qcsBAfrZy1v11WHr99XtJVY1Im/sXX5Vj8y2TNOoOh/VuqA5unu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947842; 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=MqB7UL4fPRYcru3EnbnH7S5G3PK67/sx3b0o2FxbdEo=; b=Z/t5wQGAXoVq6YD2GAqN0W1RkvMa8VQqIcEzWTD8wplL71C5UxQUrlJtRJkH5VYYGRkX/u7MELMJEqZekjoDuAFnMvbUEpCgZyP6Nf1ELPMQaaJNQFbxcMN0zIsPAbF9N89YsAztG3QdIMaHAXvQfpVzayO8NDDNz+ytBiR4hoo= 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 1780947842319732.1947742877702; Mon, 8 Jun 2026 12:44:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsd-0008VE-JE; Mon, 08 Jun 2026 15:43: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 1wWfsK-0008SD-5H for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:08 -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 1wWfsI-0006Bl-78 for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:07 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 8413640B93; Mon, 8 Jun 2026 19:43:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A977D1F00893; Mon, 8 Jun 2026 19:43:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947784; bh=MqB7UL4fPRYcru3EnbnH7S5G3PK67/sx3b0o2FxbdEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=f4VB0GK8g1fgpO9IcOi+OOyBglgCEoYaP10Ep/yKmw5TZDNLOPbhFzlAx0hdQ1BXb b7LFV0T8I8rM4orEXJVYfoMVPxYM6jwHwXBHtPNp53V1o4YMbyQ1dk2uUBn4rkzt7X cpJGadEVmTPNWPDwlKeczRiHrdcbAJ5a4ffCkFal/QJeJapvfyomf4XwfYbrdKoY2A Jra64dUG9ogTsYpYDJ2kcbeiN/XlxMeZHLYVEQ1gyQa4nvUvo7QDWbIILllkLbljzB 9v6Vx1csLVfW6WXOLnw2qFPbapk8DC8fgCMnti5H1Ph80DXIW3FXA7lrunrr66t9T4 QtzCBFpEToZ9Q== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Xinhui Yang Subject: [PULL 2/8] linux-user/strace: add fsmount series of syscalls Date: Mon, 8 Jun 2026 21:42:50 +0200 Message-ID: <20260608194256.13794-3-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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: 1780947843261158500 Content-Type: text/plain; charset="utf-8" From: Xinhui Yang Following the addition of fsmount(2) series of syscalls in the syscall handler, strace support is added, with a dedicated function to print the parameters of fsconfig(2), which contains parameters that can be interpreted as multiple types. Snippet of the strace dump when running `mount -t tmpfs tmpfs /media`: 18 fsopen(tmpfs,1) =3D 3 18 read(3,0x407fcf1c,8191) =3D -1 errno=3D61 (No data available) 18 fsconfig(3,FSCONFIG_SET_STRING,"source","tmpfs",0) =3D 0 18 read(3,0x407fce3c,8191) =3D -1 errno=3D61 (No data available) 18 fsconfig(3,FSCONFIG_CMD_CREATE,NULL,NULL,0) =3D 0 18 read(3,0x407fce3c,8191) =3D -1 errno=3D61 (No data available) 18 fsmount(3,1,0) =3D 4 18 read(3,0x407fce3c,8191) =3D -1 errno=3D61 (No data available) 18 statx(4,"",AT_EMPTY_PATH|AT_STATX_SYNC_AS_STAT,0x1000,0x407fee98) =3D 0 18 move_mount(4,,-100,/media,4) =3D 0 18 read(3,0x407fcfcc,8191) =3D -1 errno=3D61 (No data available) 18 close(3) =3D 0 18 close(4) =3D 0 Signed-off-by: Xinhui Yang Reviewed-by: Pierrick Bouvier Signed-off-by: Helge Deller --- linux-user/strace.c | 105 +++++++++++++++++++++++++++++++++++++++++ linux-user/strace.list | 15 ++++++ 2 files changed, 120 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 2cbaf94c89..d861f311f6 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -4344,6 +4344,111 @@ print_statx(CPUArchState *cpu_env, const struct sys= callname *name, } #endif =20 +#ifdef TARGET_NR_fsconfig +static void +print_fsconfig_cmd_name(int cmd) +{ + switch (cmd) { + case FSCONFIG_SET_FLAG: + qemu_log("%s%s", "FSCONFIG_SET_FLAG", get_comma(0)); + break; + case FSCONFIG_SET_STRING: + qemu_log("%s%s", "FSCONFIG_SET_STRING", get_comma(0)); + break; + case FSCONFIG_SET_BINARY: + qemu_log("%s%s", "FSCONFIG_SET_BINARY", get_comma(0)); + break; + case FSCONFIG_SET_PATH: + qemu_log("%s%s", "FSCONFIG_SET_PATH", get_comma(0)); + break; + case FSCONFIG_SET_PATH_EMPTY: + qemu_log("%s%s", "FSCONFIG_SET_PATH_EMPTY", get_comma(0)); + break; + case FSCONFIG_SET_FD: + qemu_log("%s%s", "FSCONFIG_SET_FD", get_comma(0)); + break; + case FSCONFIG_CMD_CREATE: + qemu_log("%s%s", "FSCONFIG_CMD_CREATE", get_comma(0)); + break; + case FSCONFIG_CMD_RECONFIGURE: + qemu_log("%s%s", "FSCONFIG_CMD_RECONFIGURE", get_comma(0)); + break; +#ifdef FSCONFIG_CMD_CREATE_EXCL + case FSCONFIG_CMD_CREATE_EXCL: + /* Only available since Linux 6.6. */ + qemu_log("%s%s", "FSCONFIG_CMD_CREATE_EXCL", get_comma(0)); + break; +#endif + default: + qemu_log("%s (%d)%s", "UNKNOWN_CMD", cmd, get_comma(0)); + break; + } +} + +static void +print_fsconfig(CPUArchState *cpu_env, const struct syscallname *name, + abi_long arg0, abi_long arg1, abi_long arg2, + abi_long arg3, abi_long arg4, abi_long arg5) +{ + /* + * fsconfig(int fd, int cmd, char* key, void* value, int aux) + * Where: + * fd: file descriptor returned by fsopen(). + * cmd: integer constant specifying a command. + * key: a string, can be NULL on certain commands. + * value: any data in a buffer, can be NULL, raw buffer or a string. + * aux: axillary values such as flags for FSCONFIG_SET_PATH. + */ + int cmd =3D (int) arg1; + print_syscall_prologue(name); + print_raw_param("%d", arg0, 0); + print_fsconfig_cmd_name(cmd); + /* Process arg2 (key). */ + switch (cmd) { + case FSCONFIG_SET_FLAG: + case FSCONFIG_SET_STRING: + case FSCONFIG_SET_BINARY: + case FSCONFIG_SET_PATH: + case FSCONFIG_SET_PATH_EMPTY: + case FSCONFIG_SET_FD: + print_string(arg2, 0); + break; + default: + print_pointer(arg2, 0); + break; + } + /* Process arg3 (value). */ + switch (cmd) { + case FSCONFIG_SET_STRING: + case FSCONFIG_SET_PATH: + case FSCONFIG_SET_PATH_EMPTY: + print_string(arg3, 0); + break; + default: + print_pointer(arg3, 0); + break; + } + /* + * Process arg4 (aux). + * On FSCONFIG_SET_PATH and FSCONFIG_SET_PATH_EMPTY, aux can + * be either 0 or AT_FDCWD. + * On FSCONFIG_SET_BINARY, aux is an integer to state the length + * of the buffer pointed by arg3. + * Otherwise, it must be 0. + */ + switch (cmd) { + case FSCONFIG_SET_PATH: + case FSCONFIG_SET_PATH_EMPTY: + print_at_dirfd(arg4, 1); + break; + default: + print_raw_param("%d", arg4, 1); + break; + } + print_syscall_epilogue(name); +} +#endif + #ifdef TARGET_NR_ioctl static void print_ioctl(CPUArchState *cpu_env, const struct syscallname *name, diff --git a/linux-user/strace.list b/linux-user/strace.list index 6162a407f9..3a366b8cac 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1722,3 +1722,18 @@ #ifdef TARGET_NR_rseq { TARGET_NR_rseq, "rseq" , "%s(%p,%u,%d,%#x)", NULL, NULL }, #endif +#ifdef TARGET_NR_fsopen +{ TARGET_NR_fsopen, "fsopen", "%s(%s,%d)", NULL, NULL }, +#endif +#ifdef TARGET_NR_fsconfig +{ TARGET_NR_fsconfig, "fsconfig", NULL, print_fsconfig, NULL }, +#endif +#ifdef TARGET_NR_fsmount +{ TARGET_NR_fsmount, "fsmount", "%s(%d,%d,%d)", NULL, NULL }, +#endif +#ifdef TARGET_NR_move_mount +{ TARGET_NR_move_mount, "move_mount", "%s(%d,%s,%d,%s,%d)", NULL, NULL }, +#endif +#ifdef TARGET_NR_fspick +{ TARGET_NR_fspick, "fspick", "%s(%d,%s,%d)", NULL, NULL }, +#endif --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947861; cv=none; d=zohomail.com; s=zohoarc; b=H9l2rirDw0qLzMqZq+gdmSpKf888aaMg18lR18c/9PT1meGwTiug5al8j5UsBtU9c+4nFHzNt9HMyFdhAwHI2Snvc4tbFDFl7dOeinpCfYsBZK4oEtlbeeX6UjZ+2zF7B/dijO1MlaqXgR4Rp+W3mJ6sHvys8zFsfQIX6OQJCtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947861; 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=7yYTiLNsF0Ma6LBU7IM8obbatVSGeWaX23IU43WW7R0=; b=YTloC8Uc0A2PMwwx3Ljpb/Ssu8FkbQwRi/tUNKHgAd1Buk4Hocn+F7RLo9bGOAOIX/XD7AI1W1lmNj4q44kn6noQicW6hUu/IGyHcADK7NnINBiysB/x4tzRB15qxKmGWERV6pQ89hb65WbI+fKKZ8KHrB27gzl3SLL1S+JxrpM= 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 1780947861293466.9106163171981; Mon, 8 Jun 2026 12:44:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsh-0008W2-OH; Mon, 08 Jun 2026 15:43: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 1wWfsL-0008SG-2A for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:09 -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 1wWfsJ-0006Bx-KO for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:08 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 148B260098; Mon, 8 Jun 2026 19:43:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC3731F00893; Mon, 8 Jun 2026 19:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947786; bh=7yYTiLNsF0Ma6LBU7IM8obbatVSGeWaX23IU43WW7R0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IQ0Kwd8KcSl6+tpseZvf/kuAu7TjIKDdUDkHEQHAKQmFQUia1zhzpegTOGXmo9EKV FvTcccpNjKy95yT8n76W6bPkzFwwMZEMfmy8uY7CcxU3+WK1QJ8vnRwH0h0ObYinJ7 iOWxy2F8thf2zdFf3jakUXY/a4c24DXNNekQRN/dyCIrVA/6ZsCau42yLF1eQj6bYB nwo+un7poKxyFCteoAwtiVO1l+/a7y3qkSUUjO2Nykmb6AgP5y8ciMMUQO2PcS5ODx cxsnQvpcBn3yoJ6OaQLqqJtsuoyc9WxAnvj5JTCYGfs6nQWsHXKlcaI7RSXvKG9E7d 5WnVDrbIO6LRA== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Matt Turner , Richard Henderson Subject: [PULL 3/8] linux-user/alpha: add coredump support Date: Mon, 8 Jun 2026 21:42:51 +0200 Message-ID: <20260608194256.13794-4-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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: 1780947862102154100 Content-Type: text/plain; charset="utf-8" From: Matt Turner Define HAVE_ELF_CORE_DUMP and target_elf_gregset_t in target_elf.h, mirroring the kernel's elf_gregset_t (ELF_NGREG =3D 66): r0-r31 [0..31], f0-f31 [32..63], pc [64], unique [65]. Implement elf_core_copy_regs() in elfload.c to populate the gregset from CPUAlphaState. Without this, bprm->core_dump is NULL for Alpha targets. When a guest signal goes unhandled, dump_core_and_abort() skips the core write and falls through to die_with_signal(), which re-raises the signal to the host. The host kernel then writes an x86-64 core file for the qemu-alpha process instead of an Alpha guest core. v2: Store thread unique field, same as in Linux kernel. Added by Helge & suggested by Richard. Signed-off-by: Matt Turner Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- linux-user/alpha/elfload.c | 12 ++++++++++++ linux-user/alpha/target_elf.h | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/linux-user/alpha/elfload.c b/linux-user/alpha/elfload.c index 1e44475c47..1969f620a5 100644 --- a/linux-user/alpha/elfload.c +++ b/linux-user/alpha/elfload.c @@ -3,8 +3,20 @@ #include "qemu/osdep.h" #include "qemu.h" #include "loader.h" +#include "target_elf.h" =20 =20 +void elf_core_copy_regs(target_elf_gregset_t *r, const CPUAlphaState *env) +{ + int i; + + for (i =3D 0; i < 31; i++) { + r->regs[i] =3D tswap64(env->ir[i]); + } + r->pc =3D tswap64(env->pc); + r->unique =3D tswap64(env->unique); +} + const char *get_elf_cpu_model(uint32_t eflags) { return "ev67"; diff --git a/linux-user/alpha/target_elf.h b/linux-user/alpha/target_elf.h index 864dc6e2e6..4987ae3944 100644 --- a/linux-user/alpha/target_elf.h +++ b/linux-user/alpha/target_elf.h @@ -11,4 +11,17 @@ #define ELF_CLASS ELFCLASS64 #define ELF_MACHINE EM_ALPHA =20 +#define HAVE_ELF_CORE_DUMP 1 + +/* + * Matches the kernel's elf_gregset_t (ELF_NGREG =3D 33): + * r0-r30 at indices 0-30, pc at 31, ps at 32. + * r31 (hardwired zero) is not stored; pc occupies index 31. + */ +typedef struct target_elf_gregset_t { + abi_ulong regs[31]; /* integer registers r0-r30 [0..30] */ + abi_ulong pc; /* program counter [31] */ + abi_ulong unique; /* thread's UNIQUE field [32] */ +} target_elf_gregset_t; + #endif --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947875; cv=none; d=zohomail.com; s=zohoarc; b=HNxsgiuhcLVny/5kSo8WL+a8No4XCIfCP1WDQlGKWldNFYT9So1quReLYVBSghlCdJ30tQEAU2twG/es7pJV7KgjFSukBKpMFK/+Rz8XGPjZf4V695gilu+NI8cs+9KfOkfNA//JP/CqPZNJmEMa7U8V443OmKUDoIwRMfDYRRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947875; 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=UPeXJIlKzbTxaer6fjTxCLj0ISR2mmzL0SNT7pcKTJM=; b=VkhlIZdOl/tT/KBXPZ2EadJy0qzhna5T2U+Dn5FD2YbqpmXY7Rf8hnh3cXy+6k8xwyKxA4WNshrnbVjoUEWZT9b7jbYYwp58yjR6cbh1f1In/EEHW3EGMwituhFSYTtZDeZ2gFFcOu8Wmva5KtVVJmyHckGW0Cq3sg3kOSJLLEU= 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 1780947875892649.3793695826091; Mon, 8 Jun 2026 12:44:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsX-0008UJ-8V; Mon, 08 Jun 2026 15:43:21 -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 1wWfsP-0008Sr-Ak for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:17 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324: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 1wWfsM-0006CF-Dn for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:11 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 6BECD601D8; Mon, 8 Jun 2026 19:43:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F8C81F00893; Mon, 8 Jun 2026 19:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947789; bh=UPeXJIlKzbTxaer6fjTxCLj0ISR2mmzL0SNT7pcKTJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gy0S67x4kJimjdzptojarBQaJyLNbi5WBgr4kqRGF4gdnA4Z6bIe/JJ9pqQeJNMr8 XJ0IEKE42sdt0plfFLhdm4kAaNYybBfcIUVa5B02yLWTEviBxHf8bfojOnIOdDJCBf bVooSnGrmepI1mix0OPMWtJ4zGZ3XkexzYDG1guhJB74Ln6kuOB+VQmjFR8Xi77R3z 3D6u104tbLTgiIPRhLJclzdKU2EqyJPnXpLF/+Dm3R4S2fmu8M4DJA52m9t8c6budp b/xTQWJ5AgDhsBGVYOMJbuVDH4bMTV1493Ero7DAUaLLQ/DwADePOa9rQQHz1hHbaw VU4t04cn83tgg== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Matt Turner , Mark Cave-Ayland Subject: [PULL 4/8] linux-user/sparc: add coredump support Date: Mon, 8 Jun 2026 21:42:52 +0200 Message-ID: <20260608194256.13794-5-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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:3c04:e001:324:0:1991:8:25; 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: 1780947877307158500 Content-Type: text/plain; charset="utf-8" From: Matt Turner Define HAVE_ELF_CORE_DUMP and target_elf_gregset_t in target_elf.h sized to match the kernel's elf_gregset_t: sparc32/sparc32plus (ELF_NGREG =3D 38): [0] PSR [1] PC [2] NPC [3] Y [4..11] G0-G7 [12..19] O0-O7 [20..27] L0-L7 [28..35] I0-I7 [36..37] reserved (stack_check) sparc64 (ELF_NGREG =3D 36): [0..7] G0-G7 [8..15] O0-O7 [16..23] L0-L7 [24..31] I0-I7 [32] TSTATE [33] TPC [34] TNPC [35] Y Also define ELF_MACHINE as EM_SPARC32PLUS for TARGET_ABI32 builds, matching the kernel and ensuring the correct machine type appears in the core file. Implement elf_core_copy_regs() in elfload.c to populate the gregset from CPUSPARCState, including L0-L7 and I0-I7 from env->regwptr. A memset() at entry zeros the trailing reserved slots. Without this, bprm->core_dump is NULL for SPARC targets. When a guest signal goes unhandled, dump_core_and_abort() skips the core write and falls through to die_with_signal(), which re-raises the signal to the host. The host kernel then writes an x86-64 core file for the qemu-sparc process instead of a SPARC guest core. Populating the full register layout is required for tools like libunwind-coredump, which reads pr_reg[33] for the trap PC and pr_reg[16..31] for the windowed registers. Signed-off-by: Matt Turner Cc: Mark Cave-Ayland Signed-off-by: Helge Deller --- linux-user/sparc/elfload.c | 27 +++++++++++++++++++++++++++ linux-user/sparc/target_elf.h | 11 +++++++++++ 2 files changed, 38 insertions(+) diff --git a/linux-user/sparc/elfload.c b/linux-user/sparc/elfload.c index 32ca1b05b1..e6387ec891 100644 --- a/linux-user/sparc/elfload.c +++ b/linux-user/sparc/elfload.c @@ -4,8 +4,35 @@ #include "qemu.h" #include "loader.h" #include "elf.h" +#include "target_elf.h" =20 =20 +void elf_core_copy_regs(target_elf_gregset_t *r, const CPUArchState *env) +{ + CPUSPARCState *e =3D (CPUSPARCState *)env; + int i; + +#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) + for (i =3D 0; i < 8; i++) { + r->regs[i] =3D tswap64(env->gregs[i]); + r->regs[8 + i] =3D tswap64(env->regwptr[WREG_O0 + i]); + } + r->regs[16] =3D tswap64(sparc64_tstate(e)); + r->regs[17] =3D tswap64(env->pc); + r->regs[18] =3D tswap64(env->npc); + r->regs[19] =3D tswap64(env->y); +#else + r->regs[0] =3D tswap32(cpu_get_psr(e)); + r->regs[1] =3D tswap32(env->pc); + r->regs[2] =3D tswap32(env->npc); + r->regs[3] =3D tswap32(env->y); + for (i =3D 0; i < 8; i++) { + r->regs[4 + i] =3D tswap32(env->gregs[i]); + r->regs[12 + i] =3D tswap32(env->regwptr[WREG_O0 + i]); + } +#endif +} + const char *get_elf_cpu_model(uint32_t eflags) { #ifdef TARGET_SPARC64 diff --git a/linux-user/sparc/target_elf.h b/linux-user/sparc/target_elf.h index 7827767bcb..edb0b3103c 100644 --- a/linux-user/sparc/target_elf.h +++ b/linux-user/sparc/target_elf.h @@ -13,6 +13,7 @@ # define ELF_MACHINE EM_SPARC #elif defined(TARGET_ABI32) # define ELF_CLASS ELFCLASS32 +# define ELF_MACHINE EM_SPARC32PLUS # define elf_check_machine(x) ((x) =3D=3D EM_SPARC32PLUS || (x) =3D=3D E= M_SPARC) #else # define ELF_CLASS ELFCLASS64 @@ -20,5 +21,15 @@ #endif =20 #define HAVE_ELF_HWCAP 1 +#define HAVE_ELF_CORE_DUMP 1 + +/* + * Matches the kernel's elf_gregset_t (ELF_NGREG =3D 20). + * sparc32/sparc32plus: psr, pc, npc, y, u_regs[16] (g0-g7, o0-o7) + * sparc64: u_regs[16] (g0-g7, o0-o7), tstate, pc, npc, y + */ +typedef struct target_elf_gregset_t { + abi_ulong regs[20]; +} target_elf_gregset_t; =20 #endif --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947820; cv=none; d=zohomail.com; s=zohoarc; b=IFKihomNDeEz/qpxvnHlvKCCNH1368zyEv2OP4PkskIWYn8Vj7JJuG6kTWxQjmky902E5YfrIWxtDSVAB3RYM1wD1MxFWUxPpO6uuIpJzHtx1tdn9/wk1vA6fW/rKfJ7m3dv8wfHl5BLCOFsWgDbUGT2CkmFaG9lXo5OWPPyyiU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947820; 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=J1AWjYZU/hD53VPk5IiZ2Jz6nUV+3nPhEWHBfOxyoTE=; b=N0AwHralIRcBkRI7/wReoZXn/Ijj/OWgNg8FyrRAxoKu8sD1twgLruGS/kBaXt//0iRdp946kD31mSSwYi/KupIJObvHJv6S+LS2MP4ccmo0j43ZMrEWydXkghj+P4stHljIBXmu9fEogs5jZISGlLc6KJ8vLJxP/mRBBx6WRwc= 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 1780947820915294.21484954557434; Mon, 8 Jun 2026 12:43:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsW-0008UE-S2; Mon, 08 Jun 2026 15:43:20 -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 1wWfsQ-0008Sw-F4 for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:17 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324: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 1wWfsP-0006CQ-3D for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:14 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id C2F4E601E6; Mon, 8 Jun 2026 19:43:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9716C1F00893; Mon, 8 Jun 2026 19:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947791; bh=J1AWjYZU/hD53VPk5IiZ2Jz6nUV+3nPhEWHBfOxyoTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=R2ivfNzxfXIQU7w3syeCZjx/mD67o8bbckXdY7IkpctPu9KU/AdVWS1U14xqNUyAt 2wkQaM+69x7so/DFtjuSUisczfIIJEzAzeszrGoalt23up+35THKjMjJV9Vp3rVEgJ 7ew+eW5DmEMn8CdUhe/T/aPyCl/4QttQqK0gS+bAbhyR9c0MHZsibGfXTO4BNoORnu uHN5Gln+NQeeme5h4o4vfRRI49GUaHma6CmVCC2Igl/fXX0/y+gvl79W6kn3gxgg0W mg90XcCljkuD7rajW6vkkAhuR5MLuKczHcFf0Xb9ORQiIKXBGKlm9T0l+nBrhpHpRM trbNU3FuqRMug== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Matt Turner , Mark Cave-Ayland Subject: [PULL 5/8] linux-user/sparc: restore L/I registers from RSA in sparc64_set_context Date: Mon, 8 Jun 2026 21:42:53 +0200 Message-ID: <20260608194256.13794-6-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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:3c04:e001:324:0:1991:8:25; 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: 1780947823228158500 Content-Type: text/plain; charset="utf-8" From: Matt Turner The kernel's do_rt_sigreturn loads L and I registers from the register save area (RSA) at the restored O6+STACK_BIAS. QEMU lacks the kernel's window-fill path, so restore L0-L7 and I0-I5 explicitly from the RSA. I6 and I7 are already restored from mc_fp/mc_i7. Signed-off-by: Matt Turner Cc: Mark Cave-Ayland Signed-off-by: Helge Deller --- linux-user/sparc/signal.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c index d339f89928..fda5508c48 100644 --- a/linux-user/sparc/signal.c +++ b/linux-user/sparc/signal.c @@ -656,6 +656,24 @@ void sparc64_set_context(CPUSPARCState *env) __get_user(env->regwptr[WREG_FP], &(ucp->tuc_mcontext.mc_fp)); __get_user(env->regwptr[WREG_I7], &(ucp->tuc_mcontext.mc_i7)); =20 + /* + * The kernel's do_rt_sigreturn loads L and I registers from the + * register save area (RSA) at the new O6+STACK_BIAS. Unlike the + * kernel, QEMU has no kernel-mode path that triggers a window fill, + * so we must do it explicitly here. I6 and I7 are already restored + * from mc_fp and mc_i7 above; restore L0-L7 and I0-I5 from the RSA. + */ + { + abi_ulong sp_ptr =3D env->regwptr[WREG_O6]; + /* LP64 O6 is biased (8-byte-aligned - 2047); low bit set. ILP32 O= 6 is 4-byte-aligned. */ + if (sp_ptr & 3) + sp_ptr +=3D TARGET_STACK_BIAS; + for (i =3D 0; i < 8; i++) + get_user_ual(env->regwptr[WREG_L0 + i], sp_ptr + i * 8); + for (i =3D 0; i < 6; i++) /* I0-I5; I6=3DFP and I7 already restor= ed */ + get_user_ual(env->regwptr[WREG_I0 + i], sp_ptr + 64 + i * 8); + } + fpup =3D &ucp->tuc_mcontext.mc_fpregs; =20 __get_user(fenab, &(fpup->mcfpu_enab)); --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947854; cv=none; d=zohomail.com; s=zohoarc; b=ZgeITl+3xCE4OeZWQfIJptNudf1pR9G9mDDYVkIDU67ea7TZCkRhLsRS9JyRF+9zHoUNgFBG8nqSlA0s12DMmXG/jtFhiI+wOQVSw9L4ZESIN70i1ZeQCj6UDkeq0Cj8Pdy+2wbWF5thW6kxZX/lZ0/A1iIh/gj7a8+CBiwk/uA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947854; 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=Z1dfaMdDG1BHIABJPuyTvw9aGXsVucAwD1oVosQ69OE=; b=YtLycXdubvVy8ZjBjPSbTJ6Qn6guSkqCdVZUGOBIM7K7drTVS6xCPP3hhoNj65wKR1Oya3+VgmLnr5kaL4hDGCrqSyzaogxcJ7HGlqlQsVkaRGzWwrwX8zQudXQACk8h5b70JBVhJ6vlPJPCdeyZF2U1X31V81Vekuyvum/44EY= 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 17809478547840.054475689020137; Mon, 8 Jun 2026 12:44:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsd-0008VB-Ir; Mon, 08 Jun 2026 15:43: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 1wWfsS-0008T5-Or for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:17 -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 1wWfsR-0006DF-7C for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:16 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id EDE0040A50; Mon, 8 Jun 2026 19:43:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F05EB1F00893; Mon, 8 Jun 2026 19:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947793; bh=Z1dfaMdDG1BHIABJPuyTvw9aGXsVucAwD1oVosQ69OE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z6xEbIPto6U+AvHb0dH5/GAOjqih6V4qVuZe+Vs5Z6JvwtHWI05dlDIxXmLXvQ5US qG2ULjiTxQ2tw458dczjJbrZTmmKI0U4fxlHv+JK/4zUdN5ozzEa2taFv0jp0KfZSi lZak/Bibf+4HEvrV2mMmXtoCga+GFnVE07bBZmrOXBD8DtQvqtElAl4tRks8cqyYm0 N5ZzpHcStnVkvfae97Z5MRHPtxamKvwSt8YGC3r6GvJ3KgtOvjWwsLBfA9bgjGLO2h DmDkfKB7i6g5n6XE7DymUrooYiFTxZqCd4ajeEYFCO6LTolPKjCy7MOuVB9n2kV+dU f+HVdUdAC/P6w== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Matt Turner , Mark Cave-Ayland Subject: [PULL 6/8] linux-user/sparc: call block_signals() before set_sigmask() in setcontext Date: Mon, 8 Jun 2026 21:42:54 +0200 Message-ID: <20260608194256.13794-7-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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: 1780947856014154100 Content-Type: text/plain; charset="utf-8" From: Matt Turner sparc64_set_context() emulates the kernel's `ta 0x6f` trap by calling set_sigmask() to install the mask supplied via the user's ucontext_t. The contract of set_sigmask() (see its comment in linux-user/signal.c) is that the caller must have first called block_signals(), which sets TaskState::signal_pending. Without block_signals(), if a guest signal is pending-and-blocked at the time setcontext is invoked and the new mask unblocks it, signal_pending stays 0 and the post-trap process_pending_signals() call in linux-user/sparc/cpu_loop.c never enters its while loop, so the now-deliverable signal is left undelivered indefinitely. This affects programs that use getcontext/setcontext to swap signal masks, including libunwind's unw_resume() out of a signal handler: without this fix, the test program below loops forever printing "calling setcontext" instead of delivering the pending SIGUSR2. #define _GNU_SOURCE #include #include #include #include static int got; static void h(int s) { got =3D 1; } int main(void) { signal(SIGUSR2, h); sigset_t m; sigemptyset(&m); sigaddset(&m, SIGUSR2); sigprocmask(SIG_BLOCK, &m, NULL); kill(getpid(), SIGUSR2); ucontext_t uc; getcontext(&uc); if (got) return 0; uc.uc_sigmask.__val[0] =3D 0; setcontext(&uc); return 1; } The 32-bit sparc do_sigreturn / do_rt_sigreturn paths already get block_signals() from the rt_sigreturn syscall wrapper in linux-user/syscall.c, so only sparc64_set_context (invoked directly from cpu_loop) needs the addition. Signed-off-by: Matt Turner Cc: Mark Cave-Ayland Signed-off-by: Helge Deller --- linux-user/sparc/signal.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/linux-user/sparc/signal.c b/linux-user/sparc/signal.c index fda5508c48..ba692c3123 100644 --- a/linux-user/sparc/signal.c +++ b/linux-user/sparc/signal.c @@ -619,6 +619,15 @@ void sparc64_set_context(CPUSPARCState *env) } } target_to_host_sigset_internal(&set, &target_set); + /* + * set_sigmask() requires the caller to have first called + * block_signals() so that process_pending_signals() is guaranteed + * to run after the mask change. Without this, a guest signal that + * is pending-and-blocked at setcontext time is left undelivered + * even after its mask bit is cleared, because signal_pending stays + * 0 and the post-trap process_pending_signals() loop never enters. + */ + block_signals(); set_sigmask(&set); } env->pc =3D pc; --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947870; cv=none; d=zohomail.com; s=zohoarc; b=g8Xpv0ZIcl9DJbnJobqFhZF3t261hKaRmF9ZOLwMwAlqmcjrzvy+2ggWoA1OE1GvfVl0oWudX0jSlaEX5l1uprYOfslALsm7dwicIetquzjqmbrGTT4wBh9vPf7gtpXtouk1spmVXtRuDK9sK1FGOhUhFjFYUL6hvn3X79BY0+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947870; 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=gEmpbKVD9hDcSZqLWrik9HtYpOvGlKu3Ri0bvNo/FQk=; b=cfUvu5qK3AE+6QGsR4aAvgzMJQSjE9eMdfIhhK5KlFrCqQoZ0umjMkm43aiWkHNwwtuBsyzbplc2tDBM5WFppGQa0V2E2bZLa4Erl8JcNfSHiM/8qcSSOsku1kHzdoA3HYydfOoP08P5tTV6hOuq254kQWDmS41T0cFWdbXYXYY= 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 1780947870905764.5663269861363; Mon, 8 Jun 2026 12:44:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsX-0008UL-Bg; Mon, 08 Jun 2026 15:43:21 -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 1wWfsV-0008To-C4 for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:19 -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 1wWfsT-0006DW-6X for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:19 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 84A1F601D8; Mon, 8 Jun 2026 19:43:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 538751F00893; Mon, 8 Jun 2026 19:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947796; bh=gEmpbKVD9hDcSZqLWrik9HtYpOvGlKu3Ri0bvNo/FQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PMNErd1rza7QUf5aEvKwqrPRfJIZA/iCMYKCyoT0K6gQz4GQ/AS0COnIogLFjXukD Wj/4G1/Fxgrf3J7H/EC+WjTljZ0Y1PXXEmy4g08XwXyaMHQJjqOla2/oI44mNYPVS7 BLZ2ZN0xPcAtK1mJ8f8ptgFHi9zts54J5vYYn5KKSpOKqN1GCbU7SIlJ72hoJlvCQf ubdwEzO9kkmm0BcXV6HMi+ZwiaP+LF0T7HoUTvU4zsDC6aiWDTIpXF/GKxcR8Nvkut wtn+pB1nkfIooqW57eYCzjl+5R62V6tm0swxExWjAx2vePZBWrfoAsDSBiYTSSNZdc 8waOw9mzR3z4A== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Matt Turner , Mark Cave-Ayland Subject: [PULL 7/8] linux-user/sparc: flush register windows before core dump Date: Mon, 8 Jun 2026 21:42:55 +0200 Message-ID: <20260608194256.13794-8-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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: 1780947871443158500 Content-Type: text/plain; charset="utf-8" From: Matt Turner Without this, only the crash frame's window is spilled to the stack; all deeper call frames remain in the register file and are absent from the core's memory segments. Stack unwinding fails past the first DWARF step because the callers' register save areas contain stale/garbage data. The real kernel calls flush_all_user_windows() at the top of do_coredump(). Mirror that via a weak target_flush_windows() hook called from dump_core_and_abort(), with the SPARC override calling the existing flush_windows() in cpu_loop.c. Signed-off-by: Matt Turner Cc: Mark Cave-Ayland Signed-off-by: Helge Deller --- linux-user/elfload.c | 9 ++++++++ linux-user/sparc/cpu_loop.c | 3 ++- linux-user/sparc/cpu_loop.h | 7 +++++++ linux-user/sparc/elfload.c | 39 +++++++++++++++++++++++++++++------ linux-user/sparc/target_elf.h | 17 +++++++++++---- 5 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 linux-user/sparc/cpu_loop.h diff --git a/linux-user/elfload.c b/linux-user/elfload.c index f7625c0952..b05b8b0c6b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2445,6 +2445,9 @@ static int wmr_write_region(void *opaque, vaddr start, * handler (provided that target process haven't registered * handler for that) that does the dump when signal is received. */ +#ifdef TARGET_SPARC +#include "sparc/cpu_loop.h" +#endif static int elf_core_dump(int signr, const CPUArchState *env) { const CPUState *cpu =3D env_cpu_const(env); @@ -2468,6 +2471,12 @@ static int elf_core_dump(int signr, const CPUArchSta= te *env) cpu_list_lock(); mmap_lock(); =20 +#ifdef TARGET_SPARC + CPU_FOREACH(cpu_iter) { + flush_windows(cpu_env(cpu_iter)); + } +#endif + /* By unprotecting, we merge vmas that might be split. */ walk_memory_regions(NULL, wmr_page_unprotect_regions); =20 diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index ab633eeae3..0aacda9448 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -22,6 +22,7 @@ #include "user-internals.h" #include "user/cpu_loop.h" #include "signal-common.h" +#include "sparc/cpu_loop.h" =20 #define SPARC64_STACK_BIAS 2047 =20 @@ -119,7 +120,7 @@ static void restore_window(CPUSPARCState *env) #endif } =20 -static void flush_windows(CPUSPARCState *env) +void flush_windows(CPUSPARCState *env) { int offset, cwp1; =20 diff --git a/linux-user/sparc/cpu_loop.h b/linux-user/sparc/cpu_loop.h new file mode 100644 index 0000000000..fb6e82d372 --- /dev/null +++ b/linux-user/sparc/cpu_loop.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef SPARC_CPU_LOOP_H +#define SPARC_CPU_LOOP_H + +void flush_windows(CPUSPARCState *env); + +#endif diff --git a/linux-user/sparc/elfload.c b/linux-user/sparc/elfload.c index e6387ec891..181f1e00b5 100644 --- a/linux-user/sparc/elfload.c +++ b/linux-user/sparc/elfload.c @@ -12,16 +12,41 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const = CPUArchState *env) CPUSPARCState *e =3D (CPUSPARCState *)env; int i; =20 + memset(r, 0, sizeof(*r)); + #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) + /* Linux kernel layout for sparc64 (arch/sparc/include/asm/elf_64.h): + * [0..7] G0-G7 + * [8..15] O0-O7 + * [16..23] L0-L7 + * [24..31] I0-I7 + * [32] TSTATE + * [33] TPC + * [34] TNPC + * [35] Y + */ for (i =3D 0; i < 8; i++) { - r->regs[i] =3D tswap64(env->gregs[i]); - r->regs[8 + i] =3D tswap64(env->regwptr[WREG_O0 + i]); + r->regs[i] =3D tswap64(env->gregs[i]); + r->regs[8 + i] =3D tswap64(env->regwptr[WREG_O0 + i]); + r->regs[16 + i] =3D tswap64(env->regwptr[WREG_L0 + i]); + r->regs[24 + i] =3D tswap64(env->regwptr[WREG_I0 + i]); } - r->regs[16] =3D tswap64(sparc64_tstate(e)); - r->regs[17] =3D tswap64(env->pc); - r->regs[18] =3D tswap64(env->npc); - r->regs[19] =3D tswap64(env->y); + r->regs[32] =3D tswap64(sparc64_tstate(e)); + r->regs[33] =3D tswap64(env->pc); + r->regs[34] =3D tswap64(env->npc); + r->regs[35] =3D tswap64(env->y); #else + /* Linux kernel layout for sparc32 (arch/sparc/include/asm/elf_32.h): + * [0] PSR + * [1] PC + * [2] NPC + * [3] Y + * [4..11] G0-G7 + * [12..19] O0-O7 + * [20..27] L0-L7 + * [28..35] I0-I7 + * [36..37] reserved (stack_check) + */ r->regs[0] =3D tswap32(cpu_get_psr(e)); r->regs[1] =3D tswap32(env->pc); r->regs[2] =3D tswap32(env->npc); @@ -29,6 +54,8 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CP= UArchState *env) for (i =3D 0; i < 8; i++) { r->regs[4 + i] =3D tswap32(env->gregs[i]); r->regs[12 + i] =3D tswap32(env->regwptr[WREG_O0 + i]); + r->regs[20 + i] =3D tswap32(env->regwptr[WREG_L0 + i]); + r->regs[28 + i] =3D tswap32(env->regwptr[WREG_I0 + i]); } #endif } diff --git a/linux-user/sparc/target_elf.h b/linux-user/sparc/target_elf.h index edb0b3103c..365af864b0 100644 --- a/linux-user/sparc/target_elf.h +++ b/linux-user/sparc/target_elf.h @@ -24,12 +24,21 @@ #define HAVE_ELF_CORE_DUMP 1 =20 /* - * Matches the kernel's elf_gregset_t (ELF_NGREG =3D 20). - * sparc32/sparc32plus: psr, pc, npc, y, u_regs[16] (g0-g7, o0-o7) - * sparc64: u_regs[16] (g0-g7, o0-o7), tstate, pc, npc, y + * Matches the kernel's elf_gregset_t. + * sparc32/sparc32plus (ELF_NGREG =3D 38): + * psr, pc, npc, y, u_regs[16] (g0-g7, o0-o7), + * reg_window[16] (l0-l7, i0-i7), stack_check[2] + * sparc64 (ELF_NGREG =3D 36): + * u_regs[16] (g0-g7, o0-o7), reg_window[16] (l0-l7, i0-i7), + * tstate, tpc, tnpc, y */ +#if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) +# define TARGET_ELF_NGREG 36 +#else +# define TARGET_ELF_NGREG 38 +#endif typedef struct target_elf_gregset_t { - abi_ulong regs[20]; + abi_ulong regs[TARGET_ELF_NGREG]; } target_elf_gregset_t; =20 #endif --=20 2.54.0 From nobody Tue Jun 9 01:36:55 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=1780947847; cv=none; d=zohomail.com; s=zohoarc; b=fBGJSEY+mWL04KI6gZG+73hFQjbLQppedmFJdSdQk+JkCPMUuql9AMS1ZyJQ9y+3oYcouX+GnvbEF6iZQPb70F0DdV2akEr7tX54ZtDWGCzJcc3GFmqiUwcFkbsy8W6vLahCv6P9xSixR0I+qI39oRllqBFD1q16rP55F3zA8H4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780947847; 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=jX18zqXFA+LNSDjlxcNAVPph0zpvwfV3CNTKM9znobo=; b=Gth7TgqnSw0HMSJJIEBY7skdpElpV0peQ4lavfQNi3AL/9WTtPn+s2tp7bx/i7PwGzHt0A4aVrqtb6scg/g7JiFYo3v3GUXkcbwcVD31WfiW6u5Xhqm8+eEZVfex9hAa7bqPaTgA3ZI2ZUXcPdJ8KGbjGT+z0/lMqDfwzfAVzCA= 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 1780947847314370.95905078453336; Mon, 8 Jun 2026 12:44:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wWfsi-0008WH-4e; Mon, 08 Jun 2026 15:43:32 -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 1wWfsX-0008UI-40 for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:21 -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 1wWfsV-0006Dv-KT for qemu-devel@nongnu.org; Mon, 08 Jun 2026 15:43:20 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id B10864013E; Mon, 8 Jun 2026 19:43:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF9AB1F00893; Mon, 8 Jun 2026 19:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1780947798; bh=jX18zqXFA+LNSDjlxcNAVPph0zpvwfV3CNTKM9znobo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dSNszXUEzgadrSPpxlI3USw/vZG9rTGVN5r6mfp+z6gRpNcunvARbTZOFpIDkZ+Ah c0Bv51RUvVPMc+cQs4t1bYRiAwZPvve7cYVCPGUTawSL6IMyvSMHrH7a7ybqsUnlCc 5QEFfvpyjJKuQRDwbFZSzW7sf6ld2+mtCvk3SLPKyx4uEfr+ZRqHXnWWSEt0ay8/85 FpKTMkmsAMjS/z3MObbbxswiWOCkrcN7o8xv3n7PghsjdD9RE4O/3qkhL/k1uw22r1 0OS4DS+uFEixjVCPA81l3MdP8EFWx4YzX3dxdhg1WtMR40Wtd7ggS3hRZdAVo6TMvM T/xyXHYoqBArw== From: Helge Deller To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Max Filippov , Helge Deller , Yoshinori Sato , Laurent Vivier , Matt Turner , Richard Henderson Subject: [PULL 8/8] target/sh4: decode_gusa: recognize add#imm with prior mov Rm, Rn Date: Mon, 8 Jun 2026 21:42:56 +0200 Message-ID: <20260608194256.13794-9-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608194256.13794-1-deller@kernel.org> References: <20260608194256.13794-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: 1780947849282158500 Content-Type: text/plain; charset="utf-8" From: Matt Turner The gUSA pattern matcher rejected `add #imm, Rn` whenever any prior `mov Rm, Rn` appeared (mv_src >=3D 0), forcing a fallback to cpu_exec_step_atomic for sequences like: mov.l @r2, r3 ; load mov r3, r7 ; save old value (mv_src =3D=3D ld_dst) add #1, r7 ; increment copy mov.l r7, @r2 ; store When mv_src =3D=3D ld_dst the move merely copies the loaded value to preserve it -- exactly the situation already accepted for the `add Rm, Rn` form. The immediate form can be handled identically with tcg_gen_atomic_fetch_add_i32 + tcg_gen_add_i32, so translate it inline instead of taking the slower single-step atomic fallback. Signed-off-by: Matt Turner Cc: Yoshinori Sato Cc: Richard Henderson Signed-off-by: Helge Deller --- target/sh4/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index 5adf650744..d38a6bd352 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -1974,7 +1974,7 @@ static void decode_gusa(DisasContext *ctx, CPUSH4Stat= e *env) break; =20 case 0x7000 ... 0x700f: /* add #imm,Rn */ - if (op_dst !=3D B11_8 || mv_src >=3D 0) { + if (op_dst !=3D B11_8 || (mv_src >=3D 0 && mv_src !=3D ld_dst)) { goto fail; } op_opc =3D INDEX_op_add; --=20 2.54.0