{"id":2229182,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229182/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427210133.6016-3-deller@kernel.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260427210133.6016-3-deller@kernel.org>","date":"2026-04-27T21:01:20","name":"[PULL,v2,02/15] linux-user/ppc: Fix ppc64 rt_sigframe stack offset","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2d21272ea9d5c0b0abab7e9167fc412e43da566c","submitter":{"id":87076,"url":"http://patchwork.ozlabs.org/api/1.1/people/87076/?format=json","name":"Helge Deller","email":"deller@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427210133.6016-3-deller@kernel.org/mbox/","series":[{"id":501726,"url":"http://patchwork.ozlabs.org/api/1.1/series/501726/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501726","date":"2026-04-27T21:01:22","name":"[PULL,v2,01/15] MAINTAINERS: Add myself as maintainer for linux-user","version":2,"mbox":"http://patchwork.ozlabs.org/series/501726/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229182/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229182/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=YJIV4Ohq;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g4GJj5htJz1yHv\n\tfor ; Tue, 28 Apr 2026 07:04:05 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wHT5X-0000JK-Pp; Mon, 27 Apr 2026 17:01:55 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wHT5R-0000CU-4w\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 17:01:50 -0400","from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wHT5K-0003TU-P4\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 17:01:44 -0400","from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n by sea.source.kernel.org (Postfix) with ESMTP id 9B744408CB;\n Mon, 27 Apr 2026 21:01:40 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 16A97C2BCB5;\n Mon, 27 Apr 2026 21:01:38 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1777323700;\n bh=N0SltF6kWrhKYQvGQd+k67AMBYWPlgGMkWYMzuPa5JM=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=YJIV4Ohqm4oYfmdBPKEC9tENPUxqCv2ktdv0Ru3Z1LePrpdUimOIXfVItCi8fhDyF\n PCc5F1S+9jb36b8CWNZa/e2SRJdw14H896dBL3XVosdaKqd67TsyEQ7t208cG0iGVr\n 4V9zhff2iutsQvW4PNh6+aFc9YSkU4/SQZGThZNQuSowD/RsS1e6gxtFWuitOwzEwu\n +MK6ruPn4S1FjWb02GhARRaKTGfNX+d4pViXAtNlcgdZZHwu3pOnvbMNBWffoQAIKX\n jZ7md7ijioVz73RdX/6tLcjeFB+B5TRoLXvS+bOSV6vllARPGZsXo7/09kafu9MXiT\n y8bUpElIFZhHA==","From":"Helge Deller ","To":"qemu-devel@nongnu.org","Cc":"Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?q?=C3=A9?= , Helge Deller ,\n Jiaxun Yang ,\n Pierrick Bouvier ","Subject":"[PULL v2 02/15] linux-user/ppc: Fix ppc64 rt_sigframe stack offset","Date":"Mon, 27 Apr 2026 23:01:20 +0200","Message-ID":"<20260427210133.6016-3-deller@kernel.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260427210133.6016-1-deller@kernel.org>","References":"<20260427210133.6016-1-deller@kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2600:3c0a:e001:78e:0:1991:8:25;\n envelope-from=deller@kernel.org; helo=sea.source.kernel.org","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Matt Turner \n\nThe kernel's 64-bit signal delivery (signal_64.c) uses:\n\n newsp = frame - __SIGNAL_FRAMESIZE\n\nwhile the 32-bit path (signal_32.c) uses:\n\n newsp = frame - (__SIGNAL_FRAMESIZE + 16)\n\nThe extra 16 bytes in the 32-bit case is to place siginfo and ucontext\nat the same offsets as older kernels (see the comment in signal_32.c).\nThe 64-bit rt_sigframe starts with ucontext directly and does not need\nthis adjustment.\n\nQEMU's setup_rt_frame() unconditionally used (SIGNAL_FRAMESIZE + 16)\nfor both 32-bit and 64-bit, placing the handler's SP 16 bytes too low\non ppc64. Signal delivery and return still worked because do_rt_sigreturn\nhad the matching wrong offset, but the vDSO DWARF unwind info encodes\nthe correct kernel offset. This caused any DWARF unwinder (libunwind,\nlibgcc, etc.) to compute a CFA that is 16 bytes off, reading garbage\nregister values from the signal frame.\n\nDefine RT_SIGFRAME_ADJUST (0 on ppc64, 16 on ppc32) and use it in both\nsetup_rt_frame and do_rt_sigreturn to match the kernel.\n\nThis was verified by A/B testing with libunwind's test suite:\n\n ppc64le: Gtest-bt, Ltest-bt, Gtest-concurrent, Ltest-concurrent,\n and Ltest-sig-context all change from FAIL to PASS.\n ppc64be: Gtest-bt, Ltest-bt, and Ltest-sig-context all change\n from FAIL to PASS.\n\nSigned-off-by: Matt Turner \nReviewed-by: Peter Maydell \nSigned-off-by: Helge Deller \nCc: qemu-stable@nongnu.org\n---\n linux-user/ppc/signal.c | 16 ++++++++++++++--\n 1 file changed, 14 insertions(+), 2 deletions(-)","diff":"diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c\nindex 24e5a02a78..a9c10e0987 100644\n--- a/linux-user/ppc/signal.c\n+++ b/linux-user/ppc/signal.c\n@@ -210,6 +210,18 @@ QEMU_BUILD_BUG_ON(offsetof(struct target_rt_sigframe, uc.tuc_mcontext)\n \n #endif\n \n+#ifdef TARGET_PPC64\n+#define RT_SIGFRAME_ADJUST 0\n+#else\n+/*\n+ * For 32-bit rt sigframes we have an extra 16 bytes of gap\n+ * on top of __SIGNAL_FRAMESIZE; this is to get the siginfo\n+ * and ucontext in the same positions as in older kernels.\n+ * See Linux's arch/powerpc/kernel/signal_32.c.\n+ */\n+#define RT_SIGFRAME_ADJUST 16\n+#endif\n+\n #if defined(TARGET_PPC64)\n \n struct target_func_ptr {\n@@ -525,7 +537,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,\n env->fpscr = 0;\n \n /* Create a stack frame for the caller of the handler. */\n- newsp = rt_sf_addr - (SIGNAL_FRAMESIZE + 16);\n+ newsp = rt_sf_addr - (SIGNAL_FRAMESIZE + RT_SIGFRAME_ADJUST);\n err |= put_user(env->gpr[1], newsp, target_ulong);\n \n if (err)\n@@ -641,7 +653,7 @@ long do_rt_sigreturn(CPUPPCState *env)\n struct target_rt_sigframe *rt_sf = NULL;\n target_ulong rt_sf_addr;\n \n- rt_sf_addr = env->gpr[1] + SIGNAL_FRAMESIZE + 16;\n+ rt_sf_addr = env->gpr[1] + SIGNAL_FRAMESIZE + RT_SIGFRAME_ADJUST;\n if (!lock_user_struct(VERIFY_READ, rt_sf, rt_sf_addr, 1))\n goto sigsegv;\n \n","prefixes":["PULL","v2","02/15"]}