From nobody Mon Sep 28 02:07:20 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=1785230255; cv=none; d=zohomail.com; s=zohoarc; b=NTKkpyZMyzB2VmCXz7w7N4gcIVM4XMpmIYyiUcWRXbA2ZvkI+KThL65yljA9vKfdmXTAUYoU0KPaszj+GmEoGxqCpQJizp+3Ky9idgG5gBbCtb3AZmcbnCVxTWwMc5D3RDW8UO78rFAV7oAdbCwTg3T8T1vmCBNqC9KFHg1lPb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785230255; h=Content-Type: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=bkZ2H5TuZE7h4EbnfmA/D810yCl1zvvzvVMjl14NPlY=; b=HcXNJXxEoSLlGX6y5VYqECYNZcEWfdvr61LKsg4JYW4W/02DbusLr/vcvvtkAxRsOAlJQGFLsMoslqUcd1ZkrNzw2nC6WZGP44cEUIAgStzJ7KvYsp2Jhh8iQL1MhiousruJ8Umiswj/25gF746cl7h9ipwvmNJY8NIsl2H5hFY= 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 1785230255331945.9177399575027; Tue, 28 Jul 2026 02:17:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wodvZ-0001Md-9j; Tue, 28 Jul 2026 05:16:45 -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 1wodvX-0001M6-I5 for qemu-devel@nongnu.org; Tue, 28 Jul 2026 05:16:43 -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 1wodvW-0002Fu-82 for qemu-devel@nongnu.org; Tue, 28 Jul 2026 05:16:43 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id CDBF260A70; Tue, 28 Jul 2026 09:16:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88F981F000E9; Tue, 28 Jul 2026 09:16:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785230199; bh=bkZ2H5TuZE7h4EbnfmA/D810yCl1zvvzvVMjl14NPlY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fs9f+I98DkMJj2PnuQITuDaBzIAfpGMpLjQUC8+AHMXtCR9xXcuNWr1PfioTcjmVV GP/lU4Ym2lXPbyH7hGBbVcHuxB+I1HhTLTaGx5GRitEBwh38amvKyr+6Q7qR9X8moo Eb3w95Y3eVu5h3uFcqlQWzGvBkxVESXkypbcXA7SgDPmx+6tFmmc6jFHyQ9IK+zfGU gzTwXO3c9Xf5SvWgQwvTiuVQpQ2Nw5xfvjvwq0bPkFTlheEX2xC83sClj3GgX2ZEZp vVvBJ8+QWhs++9pfkSX6aVnh+W6YEA4E8NEThlO4B5cTl2ZrxEmoFJ7FeigJT3C26L qxD4Ec8L7T11g== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Yoshinori Sato , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Helge Deller , Laurent Vivier , Matt Turner , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 1/3] linux-user: Guard local FUTEX_CMD_MASK definition Date: Tue, 28 Jul 2026 11:16:31 +0200 Message-ID: <20260728091633.29765-2-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260728091633.29765-1-deller@kernel.org> References: <20260728091633.29765-1-deller@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, 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: 1785230255991158500 From: C=C3=A9dric Le Goater Building linux-user on a host with Linux 7.2 kernel headers fails with a macro redefinition error for FUTEX_CMD_MASK. The kernel commit 3ca9595d9fb6 ("futex: Add support for unlocking robust futexes") expanded the mask to include the new FUTEX_ROBUST_UNLOCK and FUTEX_ROBUST_LIST32 flags, which conflicts with QEMU's local definition. Add a #ifndef guard so the host definition takes precedence when available. The local fallback is kept for older kernel headers (pre-2.6.29) that lack FUTEX_CMD_MASK or define a mask without FUTEX_CLOCK_REALTIME. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Helge Deller --- linux-user/syscall_defs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 5799769f83..e033c7db34 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2593,7 +2593,9 @@ struct target_drm_i915_getparam { =20 #define FUTEX_PRIVATE_FLAG 128 #define FUTEX_CLOCK_REALTIME 256 +#ifndef FUTEX_CMD_MASK #define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIM= E) +#endif =20 #if defined(TARGET_X86_64) #define TARGET_EPOLL_PACKED QEMU_PACKED --=20 2.54.0 From nobody Mon Sep 28 02:07:20 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=1785230251; cv=none; d=zohomail.com; s=zohoarc; b=nspyEsyfe6LUEIQV6GM4Bj39rd9Isp9JARs5pE0PuE/BBSNgGi/LUqk/fNpGMv9+JcbkbFNmOYpGnjg7PTMXPz1cPwE/kiyn62HCLTYTJ+k4UziWI78yz1s7K2vKs1imOZR22P58+2HgAo9oRQGyqTos9mJKKSn4bJDxCgirdnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785230251; 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=AHXx/6JWT/+sw2/94m8VkSsOAJZZX+38Q7mo68/hWT4=; b=lnCURDfYf7BxvYfGA3hwJREsufwXPCZv9ss8RYFErnplBiRuxxQr+1gObCiHCNrGBK0GPogTUHtnVncyWWxUD7ESMq6h9jvTjOaj7Ex/dkSs9PDphBpdRhE32Xku9r6hD2+UrMOIGvas7D6lV1TeErCMY3Mey9u+MGLU8NAXIm8= 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 1785230251445847.5832959817855; Tue, 28 Jul 2026 02:17:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wodva-0001NC-Ck; Tue, 28 Jul 2026 05:16:46 -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 1wodvY-0001MP-QK for qemu-devel@nongnu.org; Tue, 28 Jul 2026 05:16:44 -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 1wodvX-0002G7-31 for qemu-devel@nongnu.org; Tue, 28 Jul 2026 05:16:44 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id E05CE411B3; Tue, 28 Jul 2026 09:16:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 028EB1F000E9; Tue, 28 Jul 2026 09:16:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785230201; bh=AHXx/6JWT/+sw2/94m8VkSsOAJZZX+38Q7mo68/hWT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JHw4iZfEq5L8POVtNgm7ztklKmr6X3NxeSeylF+90XrznqlhYsavLpbktAnhzEj+d Ax8Bt6w6d3zamdGewkas45D4rmKxxktQytY461V2+46R1V7jIt8MxytLSFWX/TOljn HJb5pvDGFns/KWpkHcYvlzd8Of/MPq4s725jp09YXQr/L0pSRH5ekPW9Gv1OxlBnfm EKS3sTjW07qGGl3g5D2UZAR1n4Wvzg9hlVJ2RMy8ZXnlYLWm42g6HT9eEPgbgkf179 YmdqzF9RSOFjD0v6o5F+yK6DHcKzc21g42OJbrWGFQQZdWI1bmuxnImjJCg7mfKrL0 h1wkHsmWRaPtg== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Yoshinori Sato , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Helge Deller , Laurent Vivier , Matt Turner , Pierrick Bouvier Subject: [PULL 2/3] linux-user: fix guards for the fsmount(2) syscall series Date: Tue, 28 Jul 2026 11:16:32 +0200 Message-ID: <20260728091633.29765-3-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260728091633.29765-1-deller@kernel.org> References: <20260728091633.29765-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: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, 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: 1785230254036158500 Content-Type: text/plain; charset="utf-8" From: Matt Turner The fsopen(), fsconfig(), fsmount() and fspick() implementations are guarded by defined(NR_fsopen) rather than defined(__NR_fsopen). No such macro exists, so the guard is never true and the entire series compiles out. Guests calling any of the four get -ENOSYS, which for example makes systemd's credential setup fail with EXIT_CREDENTIALS for most units. The strace bits for fsconfig() have the same typo. Check if FSCONFIG_SET_FLAG is defined to avoid build errors in the strace code on some older distributions (Helge). Fixes: 767c32fe6983 ("linux-user: implement fsmount(2) series of syscalls") Fixes: 6e0aa9f6c731 ("linux-user/strace: add fsmount series of syscalls") Signed-off-by: Matt Turner Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/strace.c | 2 +- linux-user/strace.list | 2 +- linux-user/syscall.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 3a81cc95f4..bc43a95a77 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -4344,7 +4344,7 @@ print_statx(CPUArchState *cpu_env, const struct sysca= llname *name, } #endif =20 -#if defined(TARGET_NR_fsconfig) && defined(NR_fsconfig) +#if defined(TARGET_NR_fsconfig) && defined(__NR_fsconfig) && defined(FSCON= FIG_SET_FLAG) static void print_fsconfig_cmd_name(int cmd) { diff --git a/linux-user/strace.list b/linux-user/strace.list index e363892e0a..25ace05187 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1725,7 +1725,7 @@ #ifdef TARGET_NR_fsopen { TARGET_NR_fsopen, "fsopen", "%s(%s,%d)", NULL, NULL }, #endif -#if defined(TARGET_NR_fsconfig) && defined(NR_fsconfig) +#if defined(TARGET_NR_fsconfig) && defined(__NR_fsconfig) && defined(FSCON= FIG_SET_FLAG) { TARGET_NR_fsconfig, "fsconfig", NULL, print_fsconfig, NULL }, #endif #ifdef TARGET_NR_fsmount diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 3da5530d42..740142825d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9740,7 +9740,7 @@ _syscall5(int, sys_move_mount, int, __from_dfd, const= char *, __from_pathname, int, __to_dfd, const char *, __to_pathname, unsigned int, flag) #endif =20 -#if defined(TARGET_NR_fsopen) && defined(NR_fsopen) +#if defined(TARGET_NR_fsopen) && defined(__NR_fsopen) #define __NR_sys_fsopen __NR_fsopen _syscall2(int, sys_fsopen, const char *, fs_name, unsigned int, flags); #define __NR_sys_fsconfig __NR_fsconfig @@ -14485,7 +14485,7 @@ 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) && defined(NR_fsopen) +#if defined(TARGET_NR_fsopen) && defined(__NR_fsopen) case TARGET_NR_fsopen: { p =3D lock_user_string(arg1); --=20 2.54.0 From nobody Mon Sep 28 02:07:20 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=1785230256; cv=none; d=zohomail.com; s=zohoarc; b=HHQOW+qJiSzFP3bLYAbd521OOoBqlmKylDg5aFdDL5rq0Ws5okN8A1V35dlH8udgfZKV/mNCXtsdF5wKHDS5YXhw+tO8VtA1FHI/CvkvSeI2mGVj5Puo/UcmpnI7pJ2XTQaqdSd3F1/6MRQQprSJWNTGGdbmk9CBk9trRt7OfEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785230256; 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=6rj02GtnDs+0doitejnDaOYtpT5WonY0xjQXCfOhfMs=; b=KEbzoePXL9qJ12AtAKyK3wPu0ptTf3098z5SPqEHEg/GYVnI6q9yCDgM7BlcMPm9AEognMmPXe+dlAzWH070YnAe26+FzjNZwrP8XJze19Hzl6VUSxGSCdjogZJH9yPlJqJ6rp8SQoNdD7meKro5dO67tblrvNzgZFj5gtJFjhA= 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 1785230256519429.16550558037295; Tue, 28 Jul 2026 02:17:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wodvd-0001Ni-5O; Tue, 28 Jul 2026 05:16:49 -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 1wodvb-0001NU-Bs for qemu-devel@nongnu.org; Tue, 28 Jul 2026 05:16:47 -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 1wodvZ-0002Gh-7R for qemu-devel@nongnu.org; Tue, 28 Jul 2026 05:16:46 -0400 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 5B5C543D27; Tue, 28 Jul 2026 09:16:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4276D1F000E9; Tue, 28 Jul 2026 09:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785230204; bh=6rj02GtnDs+0doitejnDaOYtpT5WonY0xjQXCfOhfMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=P3cdwCPOvm2LBnAsBEaTLBuBlBOkEhuF7kaTDevHzVrgWSUPZzY3yjSObq6xGgCa+ j3JZdABTDtB/eRu4TKyny1uKH5XrWOj14Mihn9ImLFqsIRuyLSMJMGXbCSKEwtB9gA Fehvv2ugNPhASLlWaxabcwLgWJPJ31nxgeFldVcMpOLndePJiFkLg7+w2K7c8h5plI lRy280rltHNBbkrpnfADa+F5WoN+IgPPfkVLYAs+nwuvXYHhBkjxV/8+p3N4wgJsA4 /ovmqo1bGr6QPJ/vJwfugK2Dvcvwn5esT7s4H0vKI4y70uXnPdSn32tjp3M3ZFvcnv 4GOLLkIEUevrw== From: Helge Deller To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Yoshinori Sato , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Helge Deller , Laurent Vivier , Matt Turner , Pierrick Bouvier , John Paul Adrian Glaubitz Subject: [PULL 3/3] linux-user/sh4: allow full 32-bit address space Date: Tue, 28 Jul 2026 11:16:33 +0200 Message-ID: <20260728091633.29765-4-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260728091633.29765-1-deller@kernel.org> References: <20260728091633.29765-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: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, 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: 1785230258286158500 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier On real SH4 hardware, the address space is split between user mode (U0, 0x00000000-0x7fffffff) and kernel mode (P1-P4, 0x80000000-0xffffffff), so TARGET_VIRT_ADDR_SPACE_BITS was set to 31 for CONFIG_USER_ONLY. However, qemu-user does not emulate the MMU, so this limit is not needed. The only effect is to restrict reserved_va to 2 GB, causing OOM failures for memory-intensive builds (e.g. webkit2gtk on Debian sh4 buildds). Set TARGET_VIRT_ADDR_SPACE_BITS to 32 unconditionally, like most other 32-bit targets. Also fix the TASK_UNMAPPED_BASE macro to use 1ull instead of 1u to avoid undefined behavior when shifting by 32. Reported-by: John Paul Adrian Glaubitz Signed-off-by: Laurent Vivier Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/sh4/target_mman.h | 2 +- target/sh4/cpu-param.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/linux-user/sh4/target_mman.h b/linux-user/sh4/target_mman.h index dd9016081e..2d05837c2f 100644 --- a/linux-user/sh4/target_mman.h +++ b/linux-user/sh4/target_mman.h @@ -1,6 +1,6 @@ /* arch/sh/include/asm/processor_32.h */ #define TASK_UNMAPPED_BASE \ - TARGET_PAGE_ALIGN((1u << TARGET_VIRT_ADDR_SPACE_BITS) / 3) + TARGET_PAGE_ALIGN((1ull << TARGET_VIRT_ADDR_SPACE_BITS) / 3) =20 /* arch/sh/include/asm/elf.h */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE * 2) diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h index c3b8114e53..9d72e35e31 100644 --- a/target/sh4/cpu-param.h +++ b/target/sh4/cpu-param.h @@ -9,10 +9,8 @@ #define SH4_CPU_PARAM_H =20 #define TARGET_PAGE_BITS 12 /* 4k */ -#ifdef CONFIG_USER_ONLY -# define TARGET_VIRT_ADDR_SPACE_BITS 31 -#else -# define TARGET_VIRT_ADDR_SPACE_BITS 32 -#endif + +/* qemu-user does not emulate the MMU, so no need to limit to 31 bits. */ +#define TARGET_VIRT_ADDR_SPACE_BITS 32 =20 #endif --=20 2.54.0