From nobody Sun Sep 28 16:30:39 2025 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756402756; cv=none; d=zohomail.com; s=zohoarc; b=NFOh1UTqsGhh++mUuJJL14kyx+oYk9fI+l8WaHhga40dZGWu5cm2r9iGR1ggoarZiadBCnAEO9VAbp9b/t5a9btMKvKW9cQG4tU2pr76vWM6TmkmkfR6pUrzXxwqN99pyb26AAHFovVeDM9BB0C3IJlJ9w71tXB9U5sbMZ/Oj6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756402756; 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=jQHCDU/pTSK07tMwn49XfZ5g/Bp/iGqsx66exuLr2Ek=; b=EFpFTK3YgA+P/ZjF3vHHUNgFuZv8eRB2pkoBM0p40rMcSq2FTjVLa6oCavQgKv9/UfkhNnQOIE8mziCL25QnVliWH5u0Sln+t5P3KBIGaluoRi+VjwL2eLnXaoZeLEyfQegaa+1HR/Ac11eWPS5wGo/LZZUFcxbWeRsJ6y6G2rs= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756402756786988.0685074292948; Thu, 28 Aug 2025 10:39:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1urgJC-00005T-N6; Thu, 28 Aug 2025 13:21:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1urbWS-000889-Ud for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:14:37 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1urbWI-0008Kx-7H for qemu-devel@nongnu.org; Thu, 28 Aug 2025 08:14:27 -0400 Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-b4c53892a56so802825a12.2 for ; Thu, 28 Aug 2025 05:14:21 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-248e3e0b75esm15129025ad.8.2025.08.28.05.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Aug 2025 05:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756383260; x=1756988060; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jQHCDU/pTSK07tMwn49XfZ5g/Bp/iGqsx66exuLr2Ek=; b=lbqO+yw0I6CRnStSmJny8wentHQ3Q+DhVbxJCydyx9GkgDmkiYxdULvLjxr21tWqtu lkZOrBqkd9QZRbeEEJI2A6js3cSrMseYtnVMPgMF7TnQ9N7qJh6AMKaDmMZBz355D5tN Pkzc14+W0TKH0JCdZgKR/mt+MTGD0mu4YHBNL1SpqqQBtcpSqrkVqbdpXm4oUF+v8s4p tcDWzHfdepY0T8TxdcivsSXhPO6vxwzzANwMGw2zEt8ne/duPXn0c8NdPJvl6Cy8IeS7 90qhgMNPkeNiXlsaL+S2sw449m6ghAoK6Pr7tMxKSBq2nvhllXpzdxl5N6zAwAJRLhAl UbCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756383260; x=1756988060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jQHCDU/pTSK07tMwn49XfZ5g/Bp/iGqsx66exuLr2Ek=; b=hk1hL2l4RnKnec53oczzXreCcOAxOPwdlYze8C5FAsZEOUcdaiEfeRFPjVNj+OsfL6 6IvA16DzznjWfWmetQUN54Pg9k3qx5zI0mKDqPojP3my82mMskgNeQH0Uh4SaqpuzNnH A9yUveIj53m4htawAMG5SCsFR+xCe1Ma0OdW0hesIQ8lx6XUyqHTuOdsHnMxkaanTWFW VktLG3tqlzo4H15eDmoq1PbhP04VPnYKsy9K5dZAZwqmWAYL5ePD7toO5mHrpjqbba8L xcbJJOrj1xOeOql2VKN4uIYX7Now1if1JEXcL9UdhX7Zmcdv9Dii7MrHC10zJVNKX6p1 Sj+A== X-Gm-Message-State: AOJu0Yz88ohNfDbXPHcUsn+FiTuzn8fBYx/V1Ai3ka6EAWgW7NTCIR2W nOuNjs8GvUS8PmUki7IhR5d6NtSA0Ihc6f++A6c1wIcEdRV9Ixin9AaOwTILoD56LEu8kp84iug HUiKRpO4= X-Gm-Gg: ASbGncunIQvQBb6L3sPoJo54h1xoIG1k3DUzSt7NmaKsWmf2YFPdzCSVA8B3biWQGod FoX0e7rqFPj5WlRmN3rLSEdNPt+TXkZ7FWi0x+pXJ7h+rAknCUpmzWcyy4UG78istiu6oj0cFTk Wd1xw7SJ/zAWZdEwfdbcf86Vl+vzM8tYOaLuhnJoPtxxj2E1c5RIPJN8109k62T2VFsT4Vxns+7 0TNf9j1IlNZYBcOR3FTivO9QX6ueSvhBiMVyn7AjX6zsOwcApjNP52mfYVCK7Qk2DjRHqvPwAya y3Wy2E2ThPmyH+sUZJmaRCXJasYmbwlq0qmn7XyU7E6oQlKezfqTrxGCZiqkWAfxuIGC7jm8kdu SwQkIhBvW9PRN+c0Vbd5xncwYdaXyh50AVU51r4obu10JL+0= X-Google-Smtp-Source: AGHT+IHF81uD5MsSVSTAEayLAIRktmabSGF+w2l8vVTuCiTaHgrSJ+KfYyXh0U3Gsl5q+2afIgXOMA== X-Received: by 2002:a17:902:e745:b0:248:9429:363a with SMTP id d9443c01a7336-24894293a0dmr77462765ad.9.1756383260600; Thu, 28 Aug 2025 05:14:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PATCH v3 58/87] linux-user: Move init_guest_commpage to arm/elfload.c Date: Thu, 28 Aug 2025 22:08:07 +1000 Message-ID: <20250828120836.195358-59-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250828120836.195358-1-richard.henderson@linaro.org> References: <20250828120836.195358-1-richard.henderson@linaro.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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52c.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: 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 @linaro.org) X-ZM-MESSAGEID: 1756402759412124100 Content-Type: text/plain; charset="utf-8" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/arm/target_elf.h | 2 ++ linux-user/loader.h | 2 +- linux-user/arm/elfload.c | 46 +++++++++++++++++++++++++++++++++++ linux-user/elfload.c | 48 ------------------------------------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/linux-user/arm/target_elf.h b/linux-user/arm/target_elf.h index fa8f8af2f3..5f81a43efb 100644 --- a/linux-user/arm/target_elf.h +++ b/linux-user/arm/target_elf.h @@ -15,6 +15,8 @@ #define HAVE_ELF_PLATFORM 1 #define HAVE_ELF_CORE_DUMP 1 =20 +#define HI_COMMPAGE ((intptr_t)0xffff0f00u) + /* * See linux kernel: arch/arm/include/asm/elf.h, where * elf_gregset_t is mapped to struct pt_regs via sizeof. diff --git a/linux-user/loader.h b/linux-user/loader.h index 98015fba7d..0c2cc556c3 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -105,7 +105,7 @@ const char *elf_hwcap_str(uint32_t bit); const char *elf_hwcap2_str(uint32_t bit); const char *get_elf_platform(CPUState *cs); const char *get_elf_base_platform(CPUState *cs); -#if defined(TARGET_X86_64) +#if defined(TARGET_X86_64) || defined(TARGET_ARM) bool init_guest_commpage(void); #endif =20 diff --git a/linux-user/arm/elfload.c b/linux-user/arm/elfload.c index 726d3ec25c..a3f14af691 100644 --- a/linux-user/arm/elfload.c +++ b/linux-user/arm/elfload.c @@ -3,6 +3,8 @@ #include "qemu/osdep.h" #include "qemu.h" #include "loader.h" +#include "user-internals.h" +#include "target_elf.h" #include "target/arm/cpu-features.h" #include "target_elf.h" =20 @@ -201,6 +203,50 @@ const char *get_elf_platform(CPUState *cs) #undef END } =20 +bool init_guest_commpage(void) +{ + ARMCPU *cpu =3D ARM_CPU(thread_cpu); + int host_page_size =3D qemu_real_host_page_size(); + abi_ptr commpage; + void *want; + void *addr; + + /* + * M-profile allocates maximum of 2GB address space, so can never + * allocate the commpage. Skip it. + */ + if (arm_feature(&cpu->env, ARM_FEATURE_M)) { + return true; + } + + commpage =3D HI_COMMPAGE & -host_page_size; + want =3D g2h_untagged(commpage); + addr =3D mmap(want, host_page_size, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE | + (commpage < reserved_va ? MAP_FIXED : MAP_FIXED_NOREPLACE), + -1, 0); + + if (addr =3D=3D MAP_FAILED) { + perror("Allocating guest commpage"); + exit(EXIT_FAILURE); + } + if (addr !=3D want) { + return false; + } + + /* Set kernel helper versions; rest of page is 0. */ + __put_user(5, (uint32_t *)g2h_untagged(0xffff0ffcu)); + + if (mprotect(addr, host_page_size, PROT_READ)) { + perror("Protecting guest commpage"); + exit(EXIT_FAILURE); + } + + page_set_flags(commpage, commpage | (host_page_size - 1), + PAGE_READ | PAGE_EXEC | PAGE_VALID); + return true; +} + void elf_core_copy_regs(target_elf_gregset_t *r, const CPUARMState *env) { for (int i =3D 0; i < 16; ++i) { diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 0ba75a83b3..2281853c57 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -191,54 +191,6 @@ typedef abi_int target_pid_t; =20 #define ELF_EXEC_PAGESIZE 4096 =20 -/* The commpage only exists for 32 bit kernels */ - -#define HI_COMMPAGE (intptr_t)0xffff0f00u - -static bool init_guest_commpage(void) -{ - ARMCPU *cpu =3D ARM_CPU(thread_cpu); - int host_page_size =3D qemu_real_host_page_size(); - abi_ptr commpage; - void *want; - void *addr; - - /* - * M-profile allocates maximum of 2GB address space, so can never - * allocate the commpage. Skip it. - */ - if (arm_feature(&cpu->env, ARM_FEATURE_M)) { - return true; - } - - commpage =3D HI_COMMPAGE & -host_page_size; - want =3D g2h_untagged(commpage); - addr =3D mmap(want, host_page_size, PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_PRIVATE | - (commpage < reserved_va ? MAP_FIXED : MAP_FIXED_NOREPLACE), - -1, 0); - - if (addr =3D=3D MAP_FAILED) { - perror("Allocating guest commpage"); - exit(EXIT_FAILURE); - } - if (addr !=3D want) { - return false; - } - - /* Set kernel helper versions; rest of page is 0. */ - __put_user(5, (uint32_t *)g2h_untagged(0xffff0ffcu)); - - if (mprotect(addr, host_page_size, PROT_READ)) { - perror("Protecting guest commpage"); - exit(EXIT_FAILURE); - } - - page_set_flags(commpage, commpage | (host_page_size - 1), - PAGE_READ | PAGE_EXEC | PAGE_VALID); - return true; -} - #if TARGET_BIG_ENDIAN #include "elf.h" #include "vdso-be8.c.inc" --=20 2.43.0