From nobody Wed May 15 22:34:40 2024 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=1693350873; cv=none; d=zohomail.com; s=zohoarc; b=EDeofOhb3MMM/xdcCzR/co8GhVJzcX05QbxDtRWKqyUujHTtlwAdSqnuqOXr8/et7nL8MpDjttmo6ZXntnGOFnr6nYXV4WmhCK6qWVUVXFDUwnI45REGCJxiSU3X1kGXO8iqJjUaElvB+LeQ/kCOnek9zGGsNbrpJDBpH4uFW/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350873; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z20DSFbmc8dhdliPZzapqE4smuEONTK8kCxcYuZWd00=; b=cBYTAEAmZYl74fTmLECN/sBK3o2aW3ZK/qlCzdCNWDRuIM014dVv4Fm/wgDaw14htdmitytO8LvKtqF/Mjh/mdZj8gHK1nbnidOUTa8jbR5oJP5qAwJobn09uSDjXobkd9VjmqftS6mAtH3hVJAvqdcItb83Sid8V2rh3h/YmAY= 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 1693350873774982.7806517351397; Tue, 29 Aug 2023 16:14:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7mu-0000im-5k; Tue, 29 Aug 2023 19:06:20 -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 1qb6nD-0002N3-AZ for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:35 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nA-00047p-Rd for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:35 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-68bed286169so4216879b3a.1 for ; Tue, 29 Aug 2023 15:02:32 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346551; x=1693951351; 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=z20DSFbmc8dhdliPZzapqE4smuEONTK8kCxcYuZWd00=; b=p7hIiG3RnVruTX5Kht1/OUBzJ3kLWpUfH64ZNLc9glN8yAr1tBmczbqcfrZi81rAqK mGljDMpGFVLi+JF4o7yIlZkVtjCYtjrFIL8/BKgbowN3a+F5oOBvZ43VI2bSLQCD4tlJ ngM/muLP3dsQV3hsN2ZQ6r5Pgg1dpi8XHFPuv1aMXctK/TNHVgfmCr0ehb+Xce751s9b N2q5Vdfk2+3jnMeiIzMYWp7QtMh09am1QEE6pA09f+S1YvEtR0of1PORON8Rz8mRmN8p 7P955U6JijHk/+Ir4xSGGiwZ908tMGAZjeUfmyWeC3PwaBJaiWUXaluRwzK474/QYrNA EjxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346551; x=1693951351; 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=z20DSFbmc8dhdliPZzapqE4smuEONTK8kCxcYuZWd00=; b=Pl75UeaQO9SAbXCcGckylcjQvyNnb9h4YsK/MI8P2BLZPcpgM+3pKHSEw++aPZoIjV 186nH4uvFhoWB4yapSLCRkX0BAUVQZ+SXGuWeBWBufCAfRPrtV20eYjWMI3tSZZ/UO8s 3SMJHW1lHYZ24JJbA8F53M9CusoD5ctE1LyVM+bf9rTXTTso2RzETv1gHcOdTU9kpr/n QdMEu3QWJpNIpGrkfeGwI4oails8J6NB0NdPgj1vudVbcQhPlS6a6AlCOwxIKtAd5ig/ U3WTaRgAbzLYA7qx10J+72kBjlrDRY2hLM0sJRwoxdmz85+39E3B52N4yNzfmm+pxzE0 39Nw== X-Gm-Message-State: AOJu0YznazKaeBr4xQDwr5iK7YKsqNp87r9DaB9c4x9PcQwbh9DwvRIm C/wK754Ysao+zRxKhb4fcfpGID8FBJU2RJrMugg= X-Google-Smtp-Source: AGHT+IFYQNo2Fd+skH7UZtJg31nLhPQ8PJ/WCQmGJKy5XegXdZcdA7nZSxGEe+uCW4FePivYPUe0kg== X-Received: by 2002:a05:6a00:21c7:b0:68a:5cf8:dac5 with SMTP id t7-20020a056a0021c700b0068a5cf8dac5mr516153pfj.22.1693346551065; Tue, 29 Aug 2023 15:02:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 01/20] tests/docker: Update docker-loongarch-cross toolchain Date: Tue, 29 Aug 2023 15:02:09 -0700 Message-Id: <20230829220228.928506-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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: 1693350874326100005 Content-Type: text/plain; charset="utf-8" Update from clfs 5.0 to clfs 8.1, which includes updates to binutils 2.41, gcc 13.2, and glibc 2.38. See https://github.com/loongson/build-tools Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Song Gao --- tests/docker/dockerfiles/debian-loongarch-cross.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests= /docker/dockerfiles/debian-loongarch-cross.docker index 9d957547b5..b4bf265717 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -20,7 +20,7 @@ RUN apt-get update && \ git \ python3-minimal =20 -RUN curl -#SL https://github.com/loongson/build-tools/releases/download/20= 22.05.29/loongarch64-clfs-5.0-cross-tools-gcc-glibc.tar.xz \ +RUN curl -#SL https://github.com/loongson/build-tools/releases/download/20= 23.08.08/CLFS-loongarch64-8.1-x86_64-cross-tools-gcc-glibc.tar.xz \ | tar -xJC /opt =20 ENV PATH $PATH:/opt/cross-tools/bin --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351651; cv=none; d=zohomail.com; s=zohoarc; b=lkDMXIEnj1apPhZJPRfBOcnlS1iYOwlDUlBB09L2XSF6IhIX3pY0g4GNdRqpweiRJj5amhdMm1LJBQElFM9kOgvdHYC4Ta61wYojohJedNfcKefLdtCEHQXTEbIOt/fIzB5mHmZaXmjzecmQiwG4np3cEOXUeuqF1NcjTS0IuLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZTp80hQ0gujXFgw4WQRSMNPp9+tNR6xjDomKssEODI0=; b=RzqeEWxIZlSxtOEueFs0vTCMjh49NvpyxsN4ZNNuRHgwWVVwDk+4cV9XPOUha/W0a7o7RFI3iiWZDjQZbrOl0ANHUcU7l4ADyOYqrvt6ROPgA7pMmQWzK54Fdw/ZS3HGX57agwsel6GNuOhL/ipl0f0nuh63DPWA6//x/qJnyXA= 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 1693351651832671.311801922566; Tue, 29 Aug 2023 16:27:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7o7-0002Qe-62; Tue, 29 Aug 2023 19:07:35 -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 1qb6nF-0002NJ-68 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:37 -0400 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nB-00047t-7Z for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:36 -0400 Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-5712b68dbc0so3061961eaf.1 for ; Tue, 29 Aug 2023 15:02:32 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346552; x=1693951352; 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=ZTp80hQ0gujXFgw4WQRSMNPp9+tNR6xjDomKssEODI0=; b=pUc7B7C1j3/4jhV61IgOQoHK5gez7NHAcrx5KvtCkbwdrL+66ueOh5YS81rPnDLGKs UGI11S8m3oXuI2D2BlOlaFRX4qUNnUQEN2bJg5jNcY4pQv2UVa6pEpa6Zo/4RwKxbJqS JOit+e1xMZPvkyRIlGCKGD0sAnp8nVhuip7hNcBaHyHWoqIxJLHrqetRpnBXjsuA669D xkjPJMaEHAnJRclTE69byVoKDpqh+IGZ1pdHiBTYolr2l5UAZV+sV0B/U/22vcghPaq3 yB0pkLTF3FY7E0bKQXNrgaMjLT23LEVRolalsCyXh0rE38lI3SmlObaLHp1Nf8B6+qIO ILLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346552; x=1693951352; 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=ZTp80hQ0gujXFgw4WQRSMNPp9+tNR6xjDomKssEODI0=; b=bTqaIbNX93OnY6IrJfHoW5SUWB7FPpSe90c/p90oLBUCsLooB9VY6cPFthdkoO47i9 BEowA1ZRrLCmKukAi5nrpwHJ/Bdg6jPDqmpH/6/S34Knku40DIcFsiRhRmyV68ztZFq6 Kh6+HPp7P5TJqZvjqIZ1Q03c0KqW+CHY+aulEHhXngarf1swd8gp3Frt3+RLosSZ/Dag /3StYQ5VJG8W1MOtaeQG9G1k9DgKByXXOYK6vfq9dAdWsm7dxiMC63F6qa8rT5oIkNkt 0Ee/cqeluumMxMfaeSLZ/ohn6Y4NzUgkvb2+RFESzVKOKHPcRIlSczqm7iVKvha5MC/z 35Lw== X-Gm-Message-State: AOJu0YzJ6s20vhKs4Ngos71vOpSLP5k8hNx9KVbLRrIwzH9Z9TqsUfMl NVbaxC601VetDV6yVUlphudeO7j+O+JS2YbbHQE= X-Google-Smtp-Source: AGHT+IGMnThCyVfCzb3eBRBPUgGrVL5Buze5gEu8FyCmiA6SOBtvFAA5KMdSAC8iZLOeUSUltJjCLw== X-Received: by 2002:a05:6808:1789:b0:3a7:49e5:e0da with SMTP id bg9-20020a056808178900b003a749e5e0damr497069oib.26.1693346551935; Tue, 29 Aug 2023 15:02:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 02/20] linux-user: Introduce imgsrc_read, imgsrc_read_alloc Date: Tue, 29 Aug 2023 15:02:10 -0700 Message-Id: <20230829220228.928506-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-1-richard.henderson@linaro.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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c36; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc36.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: 1693351653224100006 Introduced and initialized, but not yet really used. These will tidy the current tests vs BPRM_BUF_SIZE. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- linux-user/loader.h | 61 +++++++++++++++++++++++----- linux-user/linuxload.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 9 deletions(-) diff --git a/linux-user/loader.h b/linux-user/loader.h index 59cbeacf24..311d20f5d1 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -18,6 +18,48 @@ #ifndef LINUX_USER_LOADER_H #define LINUX_USER_LOADER_H =20 +typedef struct { + const void *cache; + unsigned int cache_size; + int fd; +} ImageSource; + +/** + * imgsrc_read: Read from ImageSource + * @dst: destination for read + * @offset: offset within file for read + * @len: size of the read + * @img: ImageSource to read from + * @errp: Error details. + * + * Read into @dst, using the cache when possible. + */ +bool imgsrc_read(void *dst, off_t offset, size_t len, + const ImageSource *img, Error **errp); + +/** + * imgsrc_read_alloc: Read from ImageSource + * @offset: offset within file for read + * @size: size of the read + * @img: ImageSource to read from + * @errp: Error details. + * + * Read into newly allocated memory, using the cache when possible. + */ +void *imgsrc_read_alloc(off_t offset, size_t len, + const ImageSource *img, Error **errp); + +/** + * imgsrc_mmap: Map from ImageSource + * + * If @src has a file descriptor, pass on to target_mmap. Otherwise, + * this is "mapping" from a host buffer, which resolves to memcpy. + * Therefore, flags must be MAP_PRIVATE | MAP_FIXED; the argument is + * retained for clarity. + */ +abi_long imgsrc_mmap(abi_ulong start, abi_ulong len, int prot, + int flags, const ImageSource *src, abi_ulong offset); + /* * Read a good amount of data initially, to hopefully get all the * program headers loaded. @@ -29,15 +71,16 @@ * used when loading binaries. */ struct linux_binprm { - char buf[BPRM_BUF_SIZE] __attribute__((aligned)); - abi_ulong p; - int fd; - int e_uid, e_gid; - int argc, envc; - char **argv; - char **envp; - char *filename; /* Name of binary */ - int (*core_dump)(int, const CPUArchState *); /* coredump routine */ + char buf[BPRM_BUF_SIZE] __attribute__((aligned)); + ImageSource src; + abi_ulong p; + int fd; + int e_uid, e_gid; + int argc, envc; + char **argv; + char **envp; + char *filename; /* Name of binary */ + int (*core_dump)(int, const CPUArchState *); /* coredump routine */ }; =20 void do_init_thread(struct target_pt_regs *regs, struct image_info *infop); diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 745cce70ab..3536dd8104 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -3,7 +3,9 @@ #include "qemu/osdep.h" #include "qemu.h" #include "user-internals.h" +#include "user-mmap.h" #include "loader.h" +#include "qapi/error.h" =20 #define NGROUPS 32 =20 @@ -76,6 +78,10 @@ static int prepare_binprm(struct linux_binprm *bprm) /* Make sure the rest of the loader won't read garbage. */ memset(bprm->buf + retval, 0, BPRM_BUF_SIZE - retval); } + + bprm->src.cache =3D bprm->buf; + bprm->src.cache_size =3D retval; + return retval; } =20 @@ -139,6 +145,7 @@ int loader_exec(int fdexec, const char *filename, char = **argv, char **envp, int retval; =20 bprm->fd =3D fdexec; + bprm->src.fd =3D fdexec; bprm->filename =3D (char *)filename; bprm->argc =3D count(argv); bprm->argv =3D argv; @@ -173,3 +180,86 @@ int loader_exec(int fdexec, const char *filename, char= **argv, char **envp, =20 return retval; } + +bool imgsrc_read(void *dst, off_t offset, size_t len, + const ImageSource *img, Error **errp) +{ + ssize_t ret; + + if (offset + len <=3D img->cache_size) { + memcpy(dst, img->cache + offset, len); + return true; + } + + if (img->fd < 0) { + error_setg(errp, "read past end of buffer"); + return false; + } + + ret =3D pread(img->fd, dst, len, offset); + if (ret =3D=3D len) { + return true; + } + if (ret < 0) { + error_setg_errno(errp, errno, "Error reading file header"); + } else { + error_setg(errp, "Incomplete read of file header"); + } + return false; +} + +void *imgsrc_read_alloc(off_t offset, size_t len, + const ImageSource *img, Error **errp) +{ + void *alloc =3D g_malloc(len); + bool ok =3D imgsrc_read(alloc, offset, len, img, errp); + + if (!ok) { + g_free(alloc); + alloc =3D NULL; + } + return alloc; +} + +abi_long imgsrc_mmap(abi_ulong start, abi_ulong len, int prot, + int flags, const ImageSource *src, abi_ulong offset) +{ + const int prot_write =3D PROT_READ | PROT_WRITE; + abi_long ret; + void *haddr; + + assert(flags =3D=3D (MAP_PRIVATE | MAP_FIXED)); + + if (src->fd >=3D 0) { + return target_mmap(start, len, prot, flags, src->fd, offset); + } + + /* + * This case is for the vdso; we don't expect bad images. + * The mmap may extend beyond the end of the image, especially + * to the end of the page. Zero fill. + */ + assert(offset < src->cache_size); + + ret =3D target_mmap(start, len, prot_write, flags | MAP_ANON, -1, 0); + if (ret =3D=3D -1) { + return ret; + } + + haddr =3D lock_user(VERIFY_WRITE, start, len, 0); + assert(haddr !=3D NULL); + if (offset + len <=3D src->cache_size) { + memcpy(haddr, src->cache + offset, len); + } else { + size_t rest =3D src->cache_size - offset; + memcpy(haddr, src->cache + offset, rest); + memset(haddr + rest, 0, len - rest); + } + unlock_user(haddr, start, len); + + if (prot !=3D prot_write) { + target_mprotect(start, len, prot); + } + + return ret; +} --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351318; cv=none; d=zohomail.com; s=zohoarc; b=TqLF8a/guEUcDqMYjigsDcLdqYr5pp5pRKEm8naIQRe6KSnwUNBJxZQfynQheMV/hL9QplmwRTR5DVT6rOQk0UdPP94evEtdExE1kGbPBx1b3fwgHeYm3+YSqqPS6lHhjdRay94t0I2pua+ko0u9l61jEx73PxAuOE42l3b5Lf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351318; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BbPoiA4hDTDe4hGu5oLPJ3b2yV0sQkSxEUBuznSGCYM=; b=YRLr4NBsQRkAB4MVK8CmmJhKao2uJDTSQD/tZ8E27K+00/Dh3b2fsJI5PGH+2BFm9bj24AGMAcSIDb4V8swZ+pZ3Gn761nxAaZCbQBWmbfYVPOOfGoaImbiygvQoFs3jJ+j+u+6k30ajHvZOaey8nvyPZr665dNTdQA5sUa11JM= 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 1693351318698828.428185315729; Tue, 29 Aug 2023 16:21:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7n5-0000sZ-WB; Tue, 29 Aug 2023 19:06:32 -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 1qb6nE-0002NI-UO for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:37 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nC-000484-3m for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:36 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-68bed2c786eso3439161b3a.0 for ; Tue, 29 Aug 2023 15:02:33 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346553; x=1693951353; 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=BbPoiA4hDTDe4hGu5oLPJ3b2yV0sQkSxEUBuznSGCYM=; b=hG3z/rGTj/ci7t6TQvuaJGHAr6QayQo+7l5XjCD+b/Ie0tKkeJicDt27J/ehvBGh7W hth4a28z7N5omYH14ZH+0HM+V6H/RFUv2mLxdiIfWY0XoTngFXGG3qg2kJvLZNafQ0hb xJDWbq8mBhyLKLtDTZpZrZkTrajVL8TdthXtZZpBCDbuuugRAKsbwCQ0TGIGOjcvh/Bq alRiXFWirF5ghlNgVMcDlL/Ri63i25mIGRWPD74mzWZaBOdFvis+muc1kAey2KK5/Cb/ /0KSUpgtf1eDG0zp21eAPmjij1QPZAVuZCG/Le5bPr0kwQ7OhFMxXaFMM29ovwssXV51 UgzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346553; x=1693951353; 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=BbPoiA4hDTDe4hGu5oLPJ3b2yV0sQkSxEUBuznSGCYM=; b=LKyMGcdvHTaGIVWu9O4RwWR3nJRCLP1Nb/pni6zU7rhJuH6UmGk3JtChEmbOFhhT+Z C3lbwRGWnfbZ2hoI/0iCqsCS//wdljbR0rgzyJjAqQLz7daZ1MeBG8s976r92ezGLGSB e3az0Tn/5a3MaXoqS1ka1wqkEkFKZ6MT3J5f/fLDiiJr9DWNRN3zb++8FUOYL/SjcO+c oM/4xaNvV8ha9Oc3yQEzZbr9Tq9DCq9q0GRVKE1rCK71o+y6IuTXM6MyudfRhcZ01gfe pSKEVU4zrI8Q25cCNPDCRw5kJkQkAYMR2h09qNFxnoZS4yNHR34N6YjifymNnxjRzPJy uU4g== X-Gm-Message-State: AOJu0YyhhdjJlQQkkijvM/rp+qG8GRhUZJynCTnoXgBAvy1sqm3BYaW/ oEGPyeF0NxA7/0I5CEzKW4ZPZMxzP5IoLx0mhEA= X-Google-Smtp-Source: AGHT+IHLA0/pRYrIsucgut/SO0JFX8x+MuRjnpCJI0Av9cPDOQ5UzianjFxJjJXYcju3MgfNtqYYVw== X-Received: by 2002:a05:6a00:170d:b0:68b:e29c:b61 with SMTP id h13-20020a056a00170d00b0068be29c0b61mr447946pfc.19.1693346552720; Tue, 29 Aug 2023 15:02:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 03/20] linux-user: Tidy loader_exec Date: Tue, 29 Aug 2023 15:02:11 -0700 Message-Id: <20230829220228.928506-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-1-richard.henderson@linaro.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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: 1693351319696100001 Reorg the if cases to reduce indentation. Test for 4 bytes in the file before checking the signatures. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- linux-user/linuxload.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 3536dd8104..5b7e9ab983 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -154,31 +154,31 @@ int loader_exec(int fdexec, const char *filename, cha= r **argv, char **envp, =20 retval =3D prepare_binprm(bprm); =20 - if (retval >=3D 0) { - if (bprm->buf[0] =3D=3D 0x7f - && bprm->buf[1] =3D=3D 'E' - && bprm->buf[2] =3D=3D 'L' - && bprm->buf[3] =3D=3D 'F') { - retval =3D load_elf_binary(bprm, infop); -#if defined(TARGET_HAS_BFLT) - } else if (bprm->buf[0] =3D=3D 'b' - && bprm->buf[1] =3D=3D 'F' - && bprm->buf[2] =3D=3D 'L' - && bprm->buf[3] =3D=3D 'T') { - retval =3D load_flt_binary(bprm, infop); -#endif - } else { - return -ENOEXEC; - } + if (retval < 4) { + return -ENOEXEC; } - - if (retval >=3D 0) { - /* success. Initialize important registers */ - do_init_thread(regs, infop); + if (bprm->buf[0] =3D=3D 0x7f + && bprm->buf[1] =3D=3D 'E' + && bprm->buf[2] =3D=3D 'L' + && bprm->buf[3] =3D=3D 'F') { + retval =3D load_elf_binary(bprm, infop); +#if defined(TARGET_HAS_BFLT) + } else if (bprm->buf[0] =3D=3D 'b' + && bprm->buf[1] =3D=3D 'F' + && bprm->buf[2] =3D=3D 'L' + && bprm->buf[3] =3D=3D 'T') { + retval =3D load_flt_binary(bprm, infop); +#endif + } else { + return -ENOEXEC; + } + if (retval < 0) { return retval; } =20 - return retval; + /* Success. Initialize important registers. */ + do_init_thread(regs, infop); + return 0; } =20 bool imgsrc_read(void *dst, off_t offset, size_t len, --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351409; cv=none; d=zohomail.com; s=zohoarc; b=TTKNr53sZufoyOujJa4xG40KIRthjZ12V0Kl4Q2+tc2EHM5XQqdq8S8kUjj+qtxPczxq9mtWqGOOEmoj0jj0mUJYgX3NmjWgtkQ+0EgrQ2iKkxIB9XOnw9dCCC/8SMkL+QSfLrItkQH6MMyaG+pBs51bo8wqi4P52VPS6Zlnuqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351409; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YtpDBOXKHVSEIF4Yn08bUEAK6iy270wE2qCEwjH4NwE=; b=UuK7QOvXc7IOBYbRXVsWFfGIgwde2w6vDr/w9BbLX9UyLXXjEUeplP27uGevjcKMG4fK1noAaZzve/S4YTtLPumikgmpGu4cgYC4oMbjX4EJ78cJwhL/hs/ECH7E1OQrPQX3BBNBu7bUmnK9cxTlMJLbT/GNFT+fEjBg8sx22uY= 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 1693351409038252.89628001994788; Tue, 29 Aug 2023 16:23:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7mu-0000jI-Qg; Tue, 29 Aug 2023 19:06:20 -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 1qb6nF-0002NK-Bs for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:37 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nC-000489-So for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:37 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-68a42d06d02so3440244b3a.0 for ; Tue, 29 Aug 2023 15:02:34 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346553; x=1693951353; 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=YtpDBOXKHVSEIF4Yn08bUEAK6iy270wE2qCEwjH4NwE=; b=JqA3/s/W4ZhFfGgUhnqLP3oTJLjjQIsYIod0ZjJxffTbSXAd3QPFivcun7uTzeBXNx B5BOaJWB2M2U9TWK+EHukqZdPpo3gX4RkMjjZuBIiDDNAyxXTdO15q2URRFNiTNI50T7 D5iFcbFd03gRgADNsYABMi0XsSQpVmcj7r9jYNGrTPb2LQBApbZUxKKc7tCE6O0v8PE8 8J9wZqDw5HgjoaLGBhw6ek4HgflGjmmbUxD5qQf9DQutcOy9Lmuh4aZ1lv5wpcBIzaVw pTG1IikIqrMLpCQ1jOACQNyVsYmhbRmQbni/b67sff5Vt2kbq8Z3RrVNUvRfRIOfsMuo qfVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346553; x=1693951353; 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=YtpDBOXKHVSEIF4Yn08bUEAK6iy270wE2qCEwjH4NwE=; b=S/IynLuVMGSrqPIUpMNyl3HduaIGqOyXVycxIBYLK23niV5oxrPnbugzn3dkWdKU9u xIGaSyvR/I8SNbj28HTnD17ITbLrJX8IZOft7uBINSBwR5mJqNfj5Ccuwr+bxmzzbsjx mZisKm7Ev+QgRmk9h4ov38L311OXhEpza+IPm0O68Rra5zJM7AQHkhLfasabUd4y90bg AY7qQemaRKGIc1vqdkmR0LoHFEfIGqa2FYFNJ+9WKjCXDzXp6HOrHPk6LAWIiu8qN5ot uDwxC77qmXasbeLVHUTpvekfE3xktluevqBOP5/CPYVC/3Mt0iZmLrGVrP6Hnu5TKNvn 9LPA== X-Gm-Message-State: AOJu0YwMcMXGrSXdQFjZbQyGWGxj6TGE2sLehoDnimlqv4hQZfgeoP4L g9H3CXSOBgU8WCOoB7lOxOOQEf6LPDRUX9pB0F4= X-Google-Smtp-Source: AGHT+IFIJ3N/JkRRGucB4+WzFXcDKFBwzScVLbt97V/7rwPSFo4yVvJc7Xai80JX13qnyfAuvcpAHg== X-Received: by 2002:a05:6a00:3393:b0:68c:42:d3d7 with SMTP id cm19-20020a056a00339300b0068c0042d3d7mr457649pfb.25.1693346553526; Tue, 29 Aug 2023 15:02:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 04/20] linux-user: Do not clobber bprm_buf swapping ehdr Date: Tue, 29 Aug 2023 15:02:12 -0700 Message-Id: <20230829220228.928506-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-1-richard.henderson@linaro.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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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: 1693351410025100005 Rearrange the allocation of storage for ehdr between load_elf_image and load_elf_binary. The same set of copies are done, but we don't modify bprm_buf, which will be important later. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e --- linux-user/elfload.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 92b981c445..4d3b25ed14 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3020,16 +3020,17 @@ static bool parse_elf_properties(int image_fd, On return: INFO values will be filled in, as necessary or available. */ =20 static void load_elf_image(const char *image_name, int image_fd, - struct image_info *info, char **pinterp_name, + struct image_info *info, struct elfhdr *ehdr, + char **pinterp_name, char bprm_buf[BPRM_BUF_SIZE]) { - struct elfhdr *ehdr =3D (struct elfhdr *)bprm_buf; struct elf_phdr *phdr; abi_ulong load_addr, load_bias, loaddr, hiaddr, error; int i, retval, prot_exec; Error *err =3D NULL; =20 /* First of all, some simple consistency checks */ + memcpy(ehdr, bprm_buf, sizeof(*ehdr)); if (!elf_check_ident(ehdr)) { error_setg(&err, "Invalid ELF image for this architecture"); goto exit_errmsg; @@ -3344,6 +3345,7 @@ static void load_elf_image(const char *image_name, in= t image_fd, static void load_elf_interp(const char *filename, struct image_info *info, char bprm_buf[BPRM_BUF_SIZE]) { + struct elfhdr ehdr; int fd, retval; Error *err =3D NULL; =20 @@ -3365,7 +3367,7 @@ static void load_elf_interp(const char *filename, str= uct image_info *info, memset(bprm_buf + retval, 0, BPRM_BUF_SIZE - retval); } =20 - load_elf_image(filename, fd, info, NULL, bprm_buf); + load_elf_image(filename, fd, info, &ehdr, NULL, bprm_buf); } =20 static int symfind(const void *s0, const void *s1) @@ -3558,8 +3560,14 @@ uint32_t get_elf_eflags(int fd) =20 int load_elf_binary(struct linux_binprm *bprm, struct image_info *info) { + /* + * We need a copy of the elf header for passing to create_elf_tables. + * We will have overwritten the original when we re-use bprm->buf + * while loading the interpreter. Allocate the storage for this now + * and let elf_load_image do any swapping that may be required. + */ + struct elfhdr ehdr; struct image_info interp_info; - struct elfhdr elf_ex; char *elf_interpreter =3D NULL; char *scratch; =20 @@ -3571,12 +3579,7 @@ int load_elf_binary(struct linux_binprm *bprm, struc= t image_info *info) info->start_mmap =3D (abi_ulong)ELF_START_MMAP; =20 load_elf_image(bprm->filename, bprm->fd, info, - &elf_interpreter, bprm->buf); - - /* ??? We need a copy of the elf header for passing to create_elf_tabl= es. - If we do nothing, we'll have overwritten this when we re-use bprm->= buf - when we load the interpreter. */ - elf_ex =3D *(struct elfhdr *)bprm->buf; + &ehdr, &elf_interpreter, bprm->buf); =20 /* Do this so that we can load the interpreter, if need be. We will change some of these later */ @@ -3663,7 +3666,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct= image_info *info) target_mprotect(tramp_page, TARGET_PAGE_SIZE, PROT_READ | PROT_EXE= C); } =20 - bprm->p =3D create_elf_tables(bprm->p, bprm->argc, bprm->envc, &elf_ex, + bprm->p =3D create_elf_tables(bprm->p, bprm->argc, bprm->envc, &ehdr, info, (elf_interpreter ? &interp_info : NU= LL)); info->start_stack =3D bprm->p; =20 --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351445; cv=none; d=zohomail.com; s=zohoarc; b=Pxb28mmi5RxTDSaDQGLSa0wZuqlLJq2X63jkYwv/aXBmeWduFs31JOyDn7EqlL1vC+fK5cJRo9LEGmWV9RJUC8oKxT3CnmrwCJ5CFJXQYVr/CxvRs5lIE3klMHmRph5b2bSr9Iq1gvFU0gban3gTxTvOuP/BQ0YXVZLwQwlL5ws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351445; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1QSy9ZU0qavvxc/B/Z2XKJEh1HZrVJBfcA9oJSYmMj8=; b=chuVy+Bw2isEs99grQAOu2BCZcVDpH3gTNnejaavRs9JDRpNii20FbTCbvGM44aocS/d+K/lN7i8bzD88EePuyCuuAtLLwE7Tnx2cFMEoxOiVX7KxXjN02SFQwlTHgnaAZj6yjyRRK9f+EYG+UK49nEjkZnwVG9PT1eont3KbdA= 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 1693351445942119.95425339220037; Tue, 29 Aug 2023 16:24:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7oX-0002qd-1O; Tue, 29 Aug 2023 19:08:01 -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 1qb6nH-0002Ng-3O for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:41 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nE-00048Q-7U for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:38 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-68a3082c771so202648b3a.0 for ; Tue, 29 Aug 2023 15:02:35 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346555; x=1693951355; 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=1QSy9ZU0qavvxc/B/Z2XKJEh1HZrVJBfcA9oJSYmMj8=; b=ajxDbsK+v+9zNITLyGGUVb3KX/B0Q96RRcAcA6qyK0o9V4TmIH6OBplpkHG+96Plrf CGRiwvgUWcp/4SGtH5o3v204i9JshG7JtPYlZwocJFCv6Q9jQ8MJUOB1UZdw/AJSwYnf JDeP5+wgCEUyq+9BXt4Jlmwfb5yYKxMP4YY2ftMf+cOtWEdhcCv7XSzCtr9oB9uIE8rE Z+coLNhUvGdn3sHkGC7cKokfnv1Ahqn4uLWgeRsdPATGKeRLGn6tjYAUz2BDinwoz6UI dtGmqlmEfSR67ZtN/PuudOExYKhAg2WRassDz4l8otHVNrxHM/B5RHKAR3zpceDufW7C aayw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346555; x=1693951355; 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=1QSy9ZU0qavvxc/B/Z2XKJEh1HZrVJBfcA9oJSYmMj8=; b=Buh/M74ajjsRTvvfHJ1BE0LusDyEpTZtmb0PS92ooIiVkXl8DufCF+i3SgGddT5uJ4 EWr0kD+y71E8yzBGNZpXqzK3Mo6hSOS/LHf9k4AVWfeR6tBojyaQ/OsLTRRK5LiJvA5/ 9j/d2X4d9BV4oHv5MKoZ3eejWuwE2PY6RVPt31dC8hVDxQiqMpm65whVj/IsljUcVpus SVZtc3FSvlkj/80IEuRJ6H/pvW3pTwY+cXTp3ME7qYTI2SJKO2+KxIaSxMTjjq95PmUu uu4q6tqAj6Yo4v5E4sU/atnn4yeazI634fn2NVv+omhm5GUfsFGHgtnptu+aXUJn020U X5EA== X-Gm-Message-State: AOJu0Yzyz5xP8YKnHHEvWBOh0DR2Jg6Ud4ktViGbivsaHtP5QJJ/fia2 NGQ8iNydiFn2rrMvXEmWH2lNWOB+nOCSqSF50iE= X-Google-Smtp-Source: AGHT+IFkRbMCfxnp0I0SHp4iAZBY3DHq85hxKQqrjaVsm7TvNBFbS0zLErfpd4wPiC1jdwtPLbDZwg== X-Received: by 2002:a05:6a20:3d1e:b0:125:3445:8af0 with SMTP id y30-20020a056a203d1e00b0012534458af0mr824205pzi.7.1693346554621; Tue, 29 Aug 2023 15:02:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 05/20] linux-user: Use ImageSource in load_elf_image Date: Tue, 29 Aug 2023 15:02:13 -0700 Message-Id: <20230829220228.928506-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.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: 1693351448147100009 Content-Type: text/plain; charset="utf-8" Change parse_elf_properties as well, as the bprm_buf argument ties the two functions closely. Signed-off-by: Richard Henderson --- linux-user/elfload.c | 128 +++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 79 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 4d3b25ed14..833c22da25 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2923,10 +2923,9 @@ static bool parse_elf_property(const uint32_t *data,= int *off, int datasz, } =20 /* Process NT_GNU_PROPERTY_TYPE_0. */ -static bool parse_elf_properties(int image_fd, +static bool parse_elf_properties(const ImageSource *src, struct image_info *info, const struct elf_phdr *phdr, - char bprm_buf[BPRM_BUF_SIZE], Error **errp) { union { @@ -2954,14 +2953,8 @@ static bool parse_elf_properties(int image_fd, return false; } =20 - if (phdr->p_offset + n <=3D BPRM_BUF_SIZE) { - memcpy(¬e, bprm_buf + phdr->p_offset, n); - } else { - ssize_t len =3D pread(image_fd, ¬e, n, phdr->p_offset); - if (len !=3D n) { - error_setg_errno(errp, errno, "Error reading file header"); - return false; - } + if (!imgsrc_read(¬e, phdr->p_offset, n, src, errp)) { + return false; } =20 /* @@ -3007,30 +3000,34 @@ static bool parse_elf_properties(int image_fd, } } =20 -/* Load an ELF image into the address space. +/** + * load_elf_image: Load an ELF image into the address space. + * @image_name: the filename of the image, to use in error messages. + * @src: the ImageSource from which to read. + * @info: info collected from the loaded image. + * @ehdr: the ELF header, not yet bswapped. + * @pinterp_name: record any PT_INTERP string found. + * + * On return: @info values will be filled in, as necessary or available. + */ =20 - IMAGE_NAME is the filename of the image, to use in error messages. - IMAGE_FD is the open file descriptor for the image. - - BPRM_BUF is a copy of the beginning of the file; this of course - contains the elf file header at offset 0. It is assumed that this - buffer is sufficiently aligned to present no problems to the host - in accessing data at aligned offsets within the buffer. - - On return: INFO values will be filled in, as necessary or available. */ - -static void load_elf_image(const char *image_name, int image_fd, +static void load_elf_image(const char *image_name, const ImageSource *src, struct image_info *info, struct elfhdr *ehdr, - char **pinterp_name, - char bprm_buf[BPRM_BUF_SIZE]) + char **pinterp_name) { - struct elf_phdr *phdr; + g_autofree struct elf_phdr *phdr =3D NULL; abi_ulong load_addr, load_bias, loaddr, hiaddr, error; - int i, retval, prot_exec; + int i, prot_exec; Error *err =3D NULL; =20 - /* First of all, some simple consistency checks */ - memcpy(ehdr, bprm_buf, sizeof(*ehdr)); + /* + * First of all, some simple consistency checks. + * Note that we rely on the bswapped ehdr staying in bprm_buf, + * for later use by load_elf_binary and create_elf_tables. + */ + if (!imgsrc_read(ehdr, 0, sizeof(*ehdr), src, &err)) { + goto exit_errmsg; + } if (!elf_check_ident(ehdr)) { error_setg(&err, "Invalid ELF image for this architecture"); goto exit_errmsg; @@ -3041,15 +3038,11 @@ static void load_elf_image(const char *image_name, = int image_fd, goto exit_errmsg; } =20 - i =3D ehdr->e_phnum * sizeof(struct elf_phdr); - if (ehdr->e_phoff + i <=3D BPRM_BUF_SIZE) { - phdr =3D (struct elf_phdr *)(bprm_buf + ehdr->e_phoff); - } else { - phdr =3D (struct elf_phdr *) alloca(i); - retval =3D pread(image_fd, phdr, i, ehdr->e_phoff); - if (retval !=3D i) { - goto exit_read; - } + phdr =3D imgsrc_read_alloc(ehdr->e_phoff, + ehdr->e_phnum * sizeof(struct elf_phdr), + src, &err); + if (phdr =3D=3D NULL) { + goto exit_errmsg; } bswap_phdr(phdr, ehdr->e_phnum); =20 @@ -3086,17 +3079,10 @@ static void load_elf_image(const char *image_name, = int image_fd, goto exit_errmsg; } =20 - interp_name =3D g_malloc(eppnt->p_filesz); - - if (eppnt->p_offset + eppnt->p_filesz <=3D BPRM_BUF_SIZE) { - memcpy(interp_name, bprm_buf + eppnt->p_offset, - eppnt->p_filesz); - } else { - retval =3D pread(image_fd, interp_name, eppnt->p_filesz, - eppnt->p_offset); - if (retval !=3D eppnt->p_filesz) { - goto exit_read; - } + interp_name =3D imgsrc_read_alloc(eppnt->p_offset, eppnt->p_fi= lesz, + src, &err); + if (interp_name =3D=3D NULL) { + goto exit_errmsg; } if (interp_name[eppnt->p_filesz - 1] !=3D 0) { error_setg(&err, "Invalid PT_INTERP entry"); @@ -3104,7 +3090,7 @@ static void load_elf_image(const char *image_name, in= t image_fd, } *pinterp_name =3D g_steal_pointer(&interp_name); } else if (eppnt->p_type =3D=3D PT_GNU_PROPERTY) { - if (!parse_elf_properties(image_fd, info, eppnt, bprm_buf, &er= r)) { + if (!parse_elf_properties(src, info, eppnt, &err)) { goto exit_errmsg; } } else if (eppnt->p_type =3D=3D PT_GNU_STACK) { @@ -3257,9 +3243,9 @@ static void load_elf_image(const char *image_name, in= t image_fd, * but no backing file segment. */ if (eppnt->p_filesz !=3D 0) { - error =3D target_mmap(vaddr_ps, eppnt->p_filesz + vaddr_po, + error =3D imgsrc_mmap(vaddr_ps, eppnt->p_filesz + vaddr_po, elf_prot, MAP_PRIVATE | MAP_FIXED, - image_fd, eppnt->p_offset - vaddr_po); + src, eppnt->p_offset - vaddr_po); if (error =3D=3D -1) { goto exit_mmap; } @@ -3291,20 +3277,11 @@ static void load_elf_image(const char *image_name, = int image_fd, #ifdef TARGET_MIPS } else if (eppnt->p_type =3D=3D PT_MIPS_ABIFLAGS) { Mips_elf_abiflags_v0 abiflags; - if (eppnt->p_filesz < sizeof(Mips_elf_abiflags_v0)) { - error_setg(&err, "Invalid PT_MIPS_ABIFLAGS entry"); + + if (!imgsrc_read(&abiflags, eppnt->p_offset, sizeof(abiflags), + src, &err)) { goto exit_errmsg; } - if (eppnt->p_offset + eppnt->p_filesz <=3D BPRM_BUF_SIZE) { - memcpy(&abiflags, bprm_buf + eppnt->p_offset, - sizeof(Mips_elf_abiflags_v0)); - } else { - retval =3D pread(image_fd, &abiflags, sizeof(Mips_elf_abif= lags_v0), - eppnt->p_offset); - if (retval !=3D sizeof(Mips_elf_abiflags_v0)) { - goto exit_read; - } - } bswap_mips_abiflags(&abiflags); info->fp_abi =3D abiflags.fp_abi; #endif @@ -3317,23 +3294,16 @@ static void load_elf_image(const char *image_name, = int image_fd, } =20 if (qemu_log_enabled()) { - load_symbols(ehdr, image_fd, load_bias); + load_symbols(ehdr, src->fd, load_bias); } =20 - debuginfo_report_elf(image_name, image_fd, load_bias); + debuginfo_report_elf(image_name, src->fd, load_bias); =20 mmap_unlock(); =20 - close(image_fd); + close(src->fd); return; =20 - exit_read: - if (retval >=3D 0) { - error_setg(&err, "Incomplete read of file header"); - } else { - error_setg_errno(&err, errno, "Error reading file header"); - } - goto exit_errmsg; exit_mmap: error_setg_errno(&err, errno, "Error mapping file"); goto exit_errmsg; @@ -3346,6 +3316,7 @@ static void load_elf_interp(const char *filename, str= uct image_info *info, char bprm_buf[BPRM_BUF_SIZE]) { struct elfhdr ehdr; + ImageSource src; int fd, retval; Error *err =3D NULL; =20 @@ -3363,11 +3334,11 @@ static void load_elf_interp(const char *filename, s= truct image_info *info, exit(-1); } =20 - if (retval < BPRM_BUF_SIZE) { - memset(bprm_buf + retval, 0, BPRM_BUF_SIZE - retval); - } + src.fd =3D fd; + src.cache =3D bprm_buf; + src.cache_size =3D retval; =20 - load_elf_image(filename, fd, info, &ehdr, NULL, bprm_buf); + load_elf_image(filename, &src, info, &ehdr, NULL); } =20 static int symfind(const void *s0, const void *s1) @@ -3578,8 +3549,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct= image_info *info) =20 info->start_mmap =3D (abi_ulong)ELF_START_MMAP; =20 - load_elf_image(bprm->filename, bprm->fd, info, - &ehdr, &elf_interpreter, bprm->buf); + load_elf_image(bprm->filename, &bprm->src, info, &ehdr, &elf_interpret= er); =20 /* Do this so that we can load the interpreter, if need be. We will change some of these later */ --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351592; cv=none; d=zohomail.com; s=zohoarc; b=nfCO0afSCyA54FFMh3f1+Q8ZNuHzax8eGw5zZ81Ljh2DkhYewDzFfpo4Wz3FDTuq98HXqfAStTqX3HJyXNh9ZNHKrgygbpNQ4Cj72F2ezF8+kK+DUzGiRMyoOVloDz9Fw/mb4iiR81pO8vikseEK+sf/+sbbTjCc/Yzj1WDS/bA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351592; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7xFPEtg96l7SmhuQ+kSd7xl3J9r3mzIhq+0WeXI+CaA=; b=HIpmBGuiWl6JSOCLQXidgnZ4tXivkSNkIbAcacAkSElO1uN77U67iv86wVrYxDfRDFVYs60ziikdarOtLAB91L1jXwTb2NZ5qe/fxJSeOTGhKIxpiUHDevK3IbkX3dcuAoUT9Yu2GsIXUj9gtXC1rt96LYey/4o8Yg3+BH6j7YA= 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 1693351592214708.039525975953; Tue, 29 Aug 2023 16:26:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7nE-0000vf-I2; Tue, 29 Aug 2023 19:06:41 -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 1qb6nH-0002Nh-Os for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:41 -0400 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nE-00048X-UQ for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:39 -0400 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-34dea77cbe6so4264715ab.2 for ; Tue, 29 Aug 2023 15:02:36 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346556; x=1693951356; 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=7xFPEtg96l7SmhuQ+kSd7xl3J9r3mzIhq+0WeXI+CaA=; b=DPFPaNc8i5fatVmwo7CpfxKA+RPXO1XKIbQh25WgUFUoPXhK4r4qiuh8ze+JePLBBI vvIuy+ZjxW6uW+Ki4rYGx+CW+FHhGw3n1uny+oXHQ79tkRK3GGImy8Nkf6hiPWlOUU6g dfJa/QKNS+52ZAkYjHrSbb7Px7uyPqqbhRBAx+wkMAZGHz2cuiDWeYs9iwYG2b4mpJpZ u+sQEMOdx/nlUJ+xz9KpTlUUfPvsLP9AWFwl1ZkVSI/5OhJ4KBtMj8nRRT4WLK1RJzAR W5TXRPgm9AvZzswQT8sJD6F+8mlIjjOeVKc13ef4VX852vwxhl/q6XAxPZSkzgysScGx 2Fjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346556; x=1693951356; 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=7xFPEtg96l7SmhuQ+kSd7xl3J9r3mzIhq+0WeXI+CaA=; b=ZVLxhPdKFL4gN0SE3lh1w5Kn4FSpO6bQHQ6r+e0QdW4cazNyambiBm1ROfCUM8QwC0 BHbZe7/oxQwrEtrx+4Py2SPU0HtKor1lpsBcUaeX8naeO7mHwDs0v3id0GsXS268oh3z 98W6enYWMcxFwPFV9OTtT52eCRCFbF9Fc1xrZrXje2XXPh0oXu6cmJRFhNPLcLctOLD2 9OD7r73TqTfSFBJ0GONjVjnJ63dG7sTmvh1HKFgIWFWG1tMqW7c4Jgk0hg+/2PPXcmv3 VwxNnWO2Woja5GdHvOTGgpD9Kf7K1Md4kOOY/Zfp8NOd8Kc1NQ3ATSgf1sFh87cwUNzi bZTw== X-Gm-Message-State: AOJu0Ywmk4HbWLYBT8ayBr1qTa64/RQSIKNHhMcAk5vCsdVJ+br2wHs/ Yc+yHwsoQxqTRBiHHfqqYK9EGjKcW+S00QW7Pq4= X-Google-Smtp-Source: AGHT+IEJAUkvmVTXMeZ3D+d0ePlNiUa7670mvrt7epxbUCSdYXOkaV63BmOwkOmyOpCvXESVx7QSHA== X-Received: by 2002:a05:6e02:1a6c:b0:345:af1c:29c4 with SMTP id w12-20020a056e021a6c00b00345af1c29c4mr763380ilv.25.1693346555817; Tue, 29 Aug 2023 15:02:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 06/20] linux-user: Use ImageSource in load_symbols Date: Tue, 29 Aug 2023 15:02:14 -0700 Message-Id: <20230829220228.928506-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-1-richard.henderson@linaro.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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x12c.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: 1693351593980100003 Aside from the section headers, we're unlikely to hit the ImageSource cache on guest executables. But the interface for imgsrc_read_* is better. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- linux-user/elfload.c | 87 ++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 833c22da25..f34fb64c0c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2049,7 +2049,8 @@ static inline void bswap_mips_abiflags(Mips_elf_abifl= ags_v0 *abiflags) { } #ifdef USE_ELF_CORE_DUMP static int elf_core_dump(int, const CPUArchState *); #endif /* USE_ELF_CORE_DUMP */ -static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias); +static void load_symbols(struct elfhdr *hdr, const ImageSource *src, + abi_ulong load_bias); =20 /* Verify the portions of EHDR within E_IDENT for the target. This can be performed before bswapping the entire header. */ @@ -3294,7 +3295,7 @@ static void load_elf_image(const char *image_name, co= nst ImageSource *src, } =20 if (qemu_log_enabled()) { - load_symbols(ehdr, src->fd, load_bias); + load_symbols(ehdr, src, load_bias); } =20 debuginfo_report_elf(image_name, src->fd, load_bias); @@ -3385,19 +3386,20 @@ static int symcmp(const void *s0, const void *s1) } =20 /* Best attempt to load symbols from this ELF object. */ -static void load_symbols(struct elfhdr *hdr, int fd, abi_ulong load_bias) +static void load_symbols(struct elfhdr *hdr, const ImageSource *src, + abi_ulong load_bias) { int i, shnum, nsyms, sym_idx =3D 0, str_idx =3D 0; - uint64_t segsz; - struct elf_shdr *shdr; + g_autofree struct elf_shdr *shdr =3D NULL; char *strings =3D NULL; - struct syminfo *s =3D NULL; - struct elf_sym *new_syms, *syms =3D NULL; + struct elf_sym *syms =3D NULL; + struct elf_sym *new_syms; + uint64_t segsz; =20 shnum =3D hdr->e_shnum; - i =3D shnum * sizeof(struct elf_shdr); - shdr =3D (struct elf_shdr *)alloca(i); - if (pread(fd, shdr, i, hdr->e_shoff) !=3D i) { + shdr =3D imgsrc_read_alloc(hdr->e_shoff, shnum * sizeof(struct elf_shd= r), + src, NULL); + if (shdr =3D=3D NULL) { return; } =20 @@ -3415,31 +3417,33 @@ static void load_symbols(struct elfhdr *hdr, int fd= , abi_ulong load_bias) =20 found: /* Now know where the strtab and symtab are. Snarf them. */ - s =3D g_try_new(struct syminfo, 1); - if (!s) { - goto give_up; - } =20 segsz =3D shdr[str_idx].sh_size; - s->disas_strtab =3D strings =3D g_try_malloc(segsz); - if (!strings || - pread(fd, strings, segsz, shdr[str_idx].sh_offset) !=3D segsz) { + strings =3D g_try_malloc(segsz); + if (!strings) { + goto give_up; + } + if (!imgsrc_read(strings, shdr[str_idx].sh_offset, segsz, src, NULL)) { goto give_up; } =20 segsz =3D shdr[sym_idx].sh_size; - syms =3D g_try_malloc(segsz); - if (!syms || pread(fd, syms, segsz, shdr[sym_idx].sh_offset) !=3D segs= z) { - goto give_up; - } - if (segsz / sizeof(struct elf_sym) > INT_MAX) { - /* Implausibly large symbol table: give up rather than ploughing - * on with the number of symbols calculation overflowing + /* + * Implausibly large symbol table: give up rather than ploughing + * on with the number of symbols calculation overflowing. */ goto give_up; } nsyms =3D segsz / sizeof(struct elf_sym); + syms =3D g_try_malloc(segsz); + if (!syms) { + goto give_up; + } + if (!imgsrc_read(syms, shdr[sym_idx].sh_offset, segsz, src, NULL)) { + goto give_up; + } + for (i =3D 0; i < nsyms; ) { bswap_sym(syms + i); /* Throw away entries which we do not need. */ @@ -3464,10 +3468,12 @@ static void load_symbols(struct elfhdr *hdr, int fd= , abi_ulong load_bias) goto give_up; } =20 - /* Attempt to free the storage associated with the local symbols - that we threw away. Whether or not this has any effect on the - memory allocation depends on the malloc implementation and how - many symbols we managed to discard. */ + /* + * Attempt to free the storage associated with the local symbols + * that we threw away. Whether or not this has any effect on the + * memory allocation depends on the malloc implementation and how + * many symbols we managed to discard. + */ new_syms =3D g_try_renew(struct elf_sym, syms, nsyms); if (new_syms =3D=3D NULL) { goto give_up; @@ -3476,20 +3482,23 @@ static void load_symbols(struct elfhdr *hdr, int fd= , abi_ulong load_bias) =20 qsort(syms, nsyms, sizeof(*syms), symcmp); =20 - s->disas_num_syms =3D nsyms; -#if ELF_CLASS =3D=3D ELFCLASS32 - s->disas_symtab.elf32 =3D syms; -#else - s->disas_symtab.elf64 =3D syms; -#endif - s->lookup_symbol =3D lookup_symbolxx; - s->next =3D syminfos; - syminfos =3D s; + { + struct syminfo *s =3D g_new(struct syminfo, 1); =20 + s->disas_strtab =3D strings; + s->disas_num_syms =3D nsyms; +#if ELF_CLASS =3D=3D ELFCLASS32 + s->disas_symtab.elf32 =3D syms; +#else + s->disas_symtab.elf64 =3D syms; +#endif + s->lookup_symbol =3D lookup_symbolxx; + s->next =3D syminfos; + syminfos =3D s; + } return; =20 -give_up: - g_free(s); + give_up: g_free(strings); g_free(syms); } --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351677; cv=none; d=zohomail.com; s=zohoarc; b=G9dItSSnMherXM4KkwrwEkB8gc4YGjNY4xAwZRzBR+4EDOput2EZgk/YEQhJeJYYT8tyIBzkPx734rC25c+v/DeMAgkcjLcv9SZr4vlcRj2KnlKE9ikTws6LJbzZZVjRXSACDOP/+Y9QoYv8c0zlvmqIhhHz8wtzXans80QPn9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RtG96b3jmli1q7lVtewuvoGgDoJMS7AqHQZel0hsDHw=; b=Ovmm8sePLr2k9b3KtnFv3d1fdKLx4W8bFUKZyu6CuFJMK7F8O4tv/qTZ3i7KS9Phc1uiUy+mGsxXP9sfBrV71QXbCQ6gdCmdiDHN3oVi4ba+6lvbdL7UGqFPAib/JQyLAOquYgYdJi/daqQv+G0zIpghUmZ2GGcfb2BZlQesMp0= 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 1693351676993977.1284438684576; Tue, 29 Aug 2023 16:27:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7ov-0003GG-LZ; Tue, 29 Aug 2023 19:08:25 -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 1qb6nJ-0002Ns-If for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:42 -0400 Received: from mail-oa1-x36.google.com ([2001:4860:4864:20::36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nG-00048t-RL for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:40 -0400 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1cccbd43250so3481872fac.1 for ; Tue, 29 Aug 2023 15:02:37 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346557; x=1693951357; 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=RtG96b3jmli1q7lVtewuvoGgDoJMS7AqHQZel0hsDHw=; b=zuISEipDTVKCziWcRRcRCa/WR24i2orPvxaPumvEN2L7yH17vV/NRNhkqnHSAqxvQt vAluQA5u5db/553lY5BVJNl9BsAHxf3S5ZeNixfQ24FBBDlVBRjHmHGJuc5Lu+mJRQse imy4Sv8Z/eFOIt9siJ6xlkEtX71moX0TI6I5GnuHPK5yZuAW1lZ/9BL/R/OFgxswiDU7 MnCBS9zPlbZ9Ondf6WDg71ttpbGWpRF/43dHzIKaNPp+A6weEjJQCTbmm4SXBTx3sZyq hb7l/3zcMOkMPJipZqpBTCkUAa0EONhlaScw5hZZBl1dIo3Ya6Cz1ENvvClLUtjZYfEd L/tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346557; x=1693951357; 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=RtG96b3jmli1q7lVtewuvoGgDoJMS7AqHQZel0hsDHw=; b=eZyvbFuJX7nnyCLvqr6XJ9/af8teVwSD13Z0oZxfvEjvVgx4KK7Dyk7D9jSMoq5l7x UUDGkHGqKhWMGhR3v731VpLqPC+pj8Ooe46+7eTYMIOSeD1nD0z2hKoqbTEBg8YkBYd/ HS1N00IAzxA9ZoMt/EFLZ+EiOSGAXxWeHWnZv1TTFGMce6wJotpciuZH0w/s4+jFkmIa xmXIVO3+G7gwwRdiDj/6+Yi954kqZg0zn5GnWTKWMtNtksY0GyPowjWEFzhGuRny/xd0 k3Yt/cOE/b3RkBDvrHSE0aws+VCgJuSF+6OJHNz6Jml3tsUO0Mn5cqFAPHxRgnv0AxCi 64vw== X-Gm-Message-State: AOJu0YxYrooHJLtA2B79UlDsxBITSzS79b9XMoRR7hjYdDUcAS2ry5Cp tkQ5ytplcHwFQSsHy1FceZtsVa9EJkg88McRqX4= X-Google-Smtp-Source: AGHT+IF8ltVCvYw395ZFJBncZVlSPGfJFNrFlHYBaV8q1PV0j/6t4jbaFhuv340ggwBORJBuR4oySA== X-Received: by 2002:a05:6871:205:b0:1c8:b715:6c81 with SMTP id t5-20020a056871020500b001c8b7156c81mr548472oad.55.1693346556873; Tue, 29 Aug 2023 15:02:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 07/20] linux-user: Replace bprm->fd with bprm->src.fd Date: Tue, 29 Aug 2023 15:02:15 -0700 Message-Id: <20230829220228.928506-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-1-richard.henderson@linaro.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=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::36; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x36.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: 1693351678377100005 There are only a couple of uses of bprm->fd remaining. Migrate to the other field. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- linux-user/loader.h | 1 - linux-user/flatload.c | 8 ++++---- linux-user/linuxload.c | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/linux-user/loader.h b/linux-user/loader.h index 311d20f5d1..5b4cdddd50 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -74,7 +74,6 @@ struct linux_binprm { char buf[BPRM_BUF_SIZE] __attribute__((aligned)); ImageSource src; abi_ulong p; - int fd; int e_uid, e_gid; int argc, envc; char **argv; diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 8f5e9f489b..15e3ec5f6b 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -463,7 +463,7 @@ static int load_flat_file(struct linux_binprm * bprm, DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n"); =20 textpos =3D target_mmap(0, text_len, PROT_READ|PROT_EXEC, - MAP_PRIVATE, bprm->fd, 0); + MAP_PRIVATE, bprm->src.fd, 0); if (textpos =3D=3D -1) { fprintf(stderr, "Unable to mmap process text\n"); return -1; @@ -490,7 +490,7 @@ static int load_flat_file(struct linux_binprm * bprm, } else #endif { - result =3D target_pread(bprm->fd, datapos, + result =3D target_pread(bprm->src.fd, datapos, data_len + (relocs * sizeof(abi_ulong)), fpos); } @@ -540,10 +540,10 @@ static int load_flat_file(struct linux_binprm * bprm, else #endif { - result =3D target_pread(bprm->fd, textpos, + result =3D target_pread(bprm->src.fd, textpos, text_len, 0); if (result >=3D 0) { - result =3D target_pread(bprm->fd, datapos, + result =3D target_pread(bprm->src.fd, datapos, data_len + (relocs * sizeof(abi_ulong)), ntohl(hdr->data_start)); } diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 5b7e9ab983..4a794f8cea 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -39,7 +39,7 @@ static int prepare_binprm(struct linux_binprm *bprm) int mode; int retval; =20 - if (fstat(bprm->fd, &st) < 0) { + if (fstat(bprm->src.fd, &st) < 0) { return -errno; } =20 @@ -69,7 +69,7 @@ static int prepare_binprm(struct linux_binprm *bprm) bprm->e_gid =3D st.st_gid; } =20 - retval =3D read(bprm->fd, bprm->buf, BPRM_BUF_SIZE); + retval =3D read(bprm->src.fd, bprm->buf, BPRM_BUF_SIZE); if (retval < 0) { perror("prepare_binprm"); exit(-1); @@ -144,7 +144,6 @@ int loader_exec(int fdexec, const char *filename, char = **argv, char **envp, { int retval; =20 - bprm->fd =3D fdexec; bprm->src.fd =3D fdexec; bprm->filename =3D (char *)filename; bprm->argc =3D count(argv); --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693350924; cv=none; d=zohomail.com; s=zohoarc; b=jNmBw7269hGoCv7tkYIuwEDAgNTInq0MzKftiVQDzK7hfF59jU1ZxNdsMicp4DRw5RH0FHEdEYZiez0M/NW4P5Z+5061lHsrxnfboBME0zAaZOgEcK9J3TohUyVOUGOBoiw741Z/FvuDyDnWdcykxAe5zmUHTIvhZz7ao9QZbC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350924; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=37NCcnAuJjn+I5L6WJxLaF09JKApB7jM4OXRupDrJSg=; b=J5F1QYTcN76sSbCE7xCuwE6drhBdeiJsJZFku6gyjptu6HrCZXphfj9ZXE/uxbM60Pt4xnZH3ngTAsYpXSF2Z6IRm8w8kwLrip1tsEbIRwUHgZBMAMrAaiK4ZMiFVC04dK47t5uUVBYhJNbz7qbdcRZ/MpRmvR0AqC47nGYgjwc= 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 1693350924722368.38615178496013; Tue, 29 Aug 2023 16:15:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7ox-0003Sm-Mg; Tue, 29 Aug 2023 19:08:27 -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 1qb6nK-0002OL-RP for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:43 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nH-000491-Gb for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:42 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-68bedc0c268so4223623b3a.0 for ; Tue, 29 Aug 2023 15:02:38 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346558; x=1693951358; 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=37NCcnAuJjn+I5L6WJxLaF09JKApB7jM4OXRupDrJSg=; b=WNkWNkOok0jNRZGjMS2Z+5sO5VRuH1vgnkSEoVR/PJG+xzz0bfiy/+4mP6XQmwmQ+v ejnc3cqEfEIdHKeWAd+uZbDvisQ6YngrmmVGWcxpf16ftEb9Amc3ihWM7uTMqTHIcSST SMq4nOsMdJbe3qhGZdyyQQ7T+8dJm1J9Hpe8xz3AJZnI/zCQX+NAu5mIAaFxdBcetrtA cckWk5TDgUFz7+m13haZPTo/KHp5Bcl+yN1TwzWPhAU/oEOYfyrOb/8Me6VuHFvr27p+ pchC3os7Byynw8fp2WhjD+Pb4hO7taIbrzbKh1sEKzhqEZK0Irjg8g7Wdmg1oxfCPONg fgFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346558; x=1693951358; 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=37NCcnAuJjn+I5L6WJxLaF09JKApB7jM4OXRupDrJSg=; b=IZXKqNBiov5c3F7plkx0lZOcNKnHCM53hVTIhjM12MWqCHHmuA6uhk+TN8rcE00nNW 5hiEF0bqCJPdFKSm/Ygwgb5MsxMuoJD3Z3RPoXRb3kzQvmDa9hyR2h3ezZsHvLEuZT64 332ekUarGBQcpWttH2er00s1bgwZb0wm5LQx2PQ+4YxYY0H6TTVjfy+ZpbHeTZA+Chjx 51beZm1De8WxSU6wMXznIGL+HnteYHvqMccCjQLCsuyh/4TkeZydcMATEJTpB6CzxipB 4SyH2XsBsbXdtvQbp17xXQU1at8mvM0KoRpZSA9eHjza6XMCNJ5xxmFAjnWqt5jt7fN4 Gklw== X-Gm-Message-State: AOJu0YzJctXeIsOMMwSXknh/uRvuji5ItWWs9BTuHOND5WBas6Oc8fhD /1G0QNfloPKlz2wDMQ7T/IhEID9MDLmbnsqbkOA= X-Google-Smtp-Source: AGHT+IEivUHd3NncHUTrOT2+P3fTj8QyZ9uJlutLnuL0rS88t8drQIDLs/bZiZJaIrMdiDRpzUMbLw== X-Received: by 2002:a05:6a00:1acb:b0:687:7d09:c0f with SMTP id f11-20020a056a001acb00b006877d090c0fmr551564pfv.12.1693346557728; Tue, 29 Aug 2023 15:02:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 08/20] linux-user: Load vdso image if available Date: Tue, 29 Aug 2023 15:02:16 -0700 Message-Id: <20230829220228.928506-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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: 1693350925165100001 Content-Type: text/plain; charset="utf-8" The vdso image will be pre-processed into a C data array, with a simple list of relocations to perform, and identifying the location of signal trampolines. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/elfload.c | 87 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index f34fb64c0c..2a6adebb4a 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -33,6 +33,19 @@ #undef ELF_ARCH #endif =20 +#ifndef TARGET_ARCH_HAS_SIGTRAMP_PAGE +#define TARGET_ARCH_HAS_SIGTRAMP_PAGE 0 +#endif + +typedef struct { + const uint8_t *image; + const uint32_t *relocs; + unsigned image_size; + unsigned reloc_count; + unsigned sigreturn_ofs; + unsigned rt_sigreturn_ofs; +} VdsoImageInfo; + #define ELF_OSABI ELFOSABI_SYSV =20 /* from personality.h */ @@ -2292,7 +2305,8 @@ static abi_ulong loader_build_fdpic_loadmap(struct im= age_info *info, abi_ulong s static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, struct elfhdr *exec, struct image_info *info, - struct image_info *interp_info) + struct image_info *interp_info, + struct image_info *vdso_info) { abi_ulong sp; abi_ulong u_argc, u_argv, u_envp, u_auxv; @@ -2380,10 +2394,15 @@ static abi_ulong create_elf_tables(abi_ulong p, int= argc, int envc, } =20 size =3D (DLINFO_ITEMS + 1) * 2; - if (k_base_platform) + if (k_base_platform) { size +=3D 2; - if (k_platform) + } + if (k_platform) { size +=3D 2; + } + if (vdso_info) { + size +=3D 2; + } #ifdef DLINFO_ARCH_ITEMS size +=3D DLINFO_ARCH_ITEMS * 2; #endif @@ -2465,6 +2484,9 @@ static abi_ulong create_elf_tables(abi_ulong p, int a= rgc, int envc, if (u_platform) { NEW_AUX_ENT(AT_PLATFORM, u_platform); } + if (vdso_info) { + NEW_AUX_ENT(AT_SYSINFO_EHDR, vdso_info->load_addr); + } NEW_AUX_ENT (AT_NULL, 0); #undef NEW_AUX_ENT =20 @@ -3342,6 +3364,49 @@ static void load_elf_interp(const char *filename, st= ruct image_info *info, load_elf_image(filename, &src, info, &ehdr, NULL); } =20 +#ifndef vdso_image_info +#define vdso_image_info() NULL +#endif + +static void load_elf_vdso(struct image_info *info, const VdsoImageInfo *vd= so) +{ + ImageSource src; + struct elfhdr ehdr; + abi_ulong load_bias, load_addr; + + src.fd =3D -1; + src.cache =3D vdso->image; + src.cache_size =3D vdso->image_size; + + load_elf_image("", &src, info, &ehdr, NULL); + load_addr =3D info->load_addr; + load_bias =3D info->load_bias; + + /* + * We need to relocate the VDSO image. The one built into the kernel + * is built for a fixed address. The one built for QEMU is not, since + * that requires close control of the guest address space. + * We pre-processed the image to locate all of the addresses that need + * to be updated. + */ + for (unsigned i =3D 0, n =3D vdso->reloc_count; i < n; i++) { + abi_ulong *addr =3D g2h_untagged(load_addr + vdso->relocs[i]); + *addr =3D tswapal(tswapal(*addr) + load_bias); + } + + /* Install signal trampolines, if present. */ + if (vdso->sigreturn_ofs) { + default_sigreturn =3D load_addr + vdso->sigreturn_ofs; + } + if (vdso->rt_sigreturn_ofs) { + default_rt_sigreturn =3D load_addr + vdso->rt_sigreturn_ofs; + } + + /* Remove write from VDSO segment. */ + target_mprotect(info->start_data, info->end_data - info->start_data, + PROT_READ | PROT_EXEC); +} + static int symfind(const void *s0, const void *s1) { struct elf_sym *sym =3D (struct elf_sym *)s1; @@ -3547,7 +3612,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct= image_info *info) * and let elf_load_image do any swapping that may be required. */ struct elfhdr ehdr; - struct image_info interp_info; + struct image_info interp_info, vdso_info; char *elf_interpreter =3D NULL; char *scratch; =20 @@ -3630,10 +3695,13 @@ int load_elf_binary(struct linux_binprm *bprm, stru= ct image_info *info) } =20 /* - * TODO: load a vdso, which would also contain the signal trampolines. - * Otherwise, allocate a private page to hold them. + * Load a vdso if available, which will amongst other things contain t= he + * signal trampolines. Otherwise, allocate a separate page for them. */ - if (TARGET_ARCH_HAS_SIGTRAMP_PAGE) { + const VdsoImageInfo *vdso =3D vdso_image_info(); + if (vdso) { + load_elf_vdso(&vdso_info, vdso); + } else if (TARGET_ARCH_HAS_SIGTRAMP_PAGE) { abi_long tramp_page =3D target_mmap(0, TARGET_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); @@ -3645,8 +3713,9 @@ int load_elf_binary(struct linux_binprm *bprm, struct= image_info *info) target_mprotect(tramp_page, TARGET_PAGE_SIZE, PROT_READ | PROT_EXE= C); } =20 - bprm->p =3D create_elf_tables(bprm->p, bprm->argc, bprm->envc, &ehdr, - info, (elf_interpreter ? &interp_info : NU= LL)); + bprm->p =3D create_elf_tables(bprm->p, bprm->argc, bprm->envc, &ehdr, = info, + elf_interpreter ? &interp_info : NULL, + vdso ? &vdso_info : NULL); info->start_stack =3D bprm->p; =20 /* If we have an interpreter, set that as the program's entry point. --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693350887; cv=none; d=zohomail.com; s=zohoarc; b=jkF6PQzsHfsedusnQPYGIzYxJac7Lu+kE2GGbJ14ge533FljbAO5WTkYX7NgZ1yseEWZydUjVeMHoQiYjlP4wgAt2wy0Z+hHgMYECYU5bL5/PGkniHf8ztolrW6Ntj7+rklTmZze8CtbmElQLDB7gNVoKSwugFx2GIe3eRpOzYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350887; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8DdcwZ9eARbtAsO2bsYseMjavqpyn3Vml59R5brpVvQ=; b=IJCn0rAqkCifc2qbzvs/m5WH0ob5nrp4u3og60FZoU4o4Bv4cTJY6fyt46WlE5DqteL938pSE1pzIw5MNBYLOzqUd9AkVcIKlAhTL9wdRxkCBhg2w+dlGwDwvaF3dJbLHEY8OhqfnWtsCnOAivj7VnBuIiV6Va/5YMqbGvYJhAE= 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 1693350887582130.4072293219234; Tue, 29 Aug 2023 16:14:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7nA-0000uu-Ne; Tue, 29 Aug 2023 19:06:38 -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 1qb6nM-0002PJ-KL for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:47 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nJ-00049B-B5 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:44 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-68a3b66f350so4227172b3a.3 for ; Tue, 29 Aug 2023 15:02:39 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346559; x=1693951359; 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=8DdcwZ9eARbtAsO2bsYseMjavqpyn3Vml59R5brpVvQ=; b=VdbKIgII7S5kNd7Ce3cXlNfG/fs9usvyJ2KnsuNdRiA3f+1ZF6FH5Wzg2XKYKMFi1J jlmRtJqOpjugsw+6ZmkKzUre20GxUlnNmcvXPSPJ9s8h456CJX7jsE26P2tmigvjiqla hDcJP35EKrcHhoW+YANBWrD8u3aumOWPmx2sPlibanDYVQp8+HpEd42BMMGZ73UKtWfe lT5h7WMKMv6EcbOEtsmJQpJguCCux/iMhOI1iFeMO91S3BOvGxMhxBSnmUBE1ppElWGj Sw1ziDdTgaHrQECmQwyfC/rPnpc5tqFFHgq6CwIkMhyX+tjdxk7K1H+G4T6EoeTnLZYc giXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346559; x=1693951359; 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=8DdcwZ9eARbtAsO2bsYseMjavqpyn3Vml59R5brpVvQ=; b=Ui1IxlMFqVh9+LmVgpdd/83yaZHVPp+3sUpBgTHqwzY9qbj8KcAJrUqJXojH0kwKT5 XlJYxQWnhlWs9fhw2zqUnCb3mXHVCHFskmRS3Fo9s1f9SRpZDbrX1B2UPpWoNaukHozu M6OnhM59gT9G/LyegZpfwzL5ZZkejZR8OsYZah42lysfHeITarkljblrCWoUl9VZR4zs zUzi+fVWLNq8qXOeOIQw02ayk5FDcF1CjiP0YO/BzDHEw2msU8Xre0e/FuOvGzLLqw0T i8+6B3fqHwXVhPoFm6j0FPlUPQGHazj7A5cSR0/b1XQHbBZQ5FbK5i4H2rvugWYg0HRk 1iuw== X-Gm-Message-State: AOJu0YycxgetRJ9K7swo1jMsXk0Ve/pviaMLv9BTP5RIdMadBuHIDg4J LykhsD7RllimGdyNrJxXGJQ0Vm9zCiOs9Gldhjw= X-Google-Smtp-Source: AGHT+IGQuo2Jk1R0fDIdiP09QN3kLV5UgyHIBK/x9RyVqFetBO6aKsmIv560nfofh8AljJvgq79tbQ== X-Received: by 2002:a05:6a20:13d1:b0:140:ef2a:9b79 with SMTP id ho17-20020a056a2013d100b00140ef2a9b79mr571136pzc.33.1693346558687; Tue, 29 Aug 2023 15:02:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 09/20] linux-user: Add gen-vdso tool Date: Tue, 29 Aug 2023 15:02:17 -0700 Message-Id: <20230829220228.928506-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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: 1693350888354100007 Content-Type: text/plain; charset="utf-8" This tool will be used for post-processing the linked vdso image, turning it into something that is easy to include into elfload.c. Signed-off-by: Richard Henderson --- linux-user/gen-vdso.c | 223 ++++++++++++++++++++++++ linux-user/gen-vdso-elfn.c.inc | 307 +++++++++++++++++++++++++++++++++ linux-user/meson.build | 6 +- 3 files changed, 535 insertions(+), 1 deletion(-) create mode 100644 linux-user/gen-vdso.c create mode 100644 linux-user/gen-vdso-elfn.c.inc diff --git a/linux-user/gen-vdso.c b/linux-user/gen-vdso.c new file mode 100644 index 0000000000..a6c61d2f6e --- /dev/null +++ b/linux-user/gen-vdso.c @@ -0,0 +1,223 @@ +/* + * Post-process a vdso elf image for inclusion into qemu. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "elf.h" + + +#define bswap_(p) _Generic(*(p), \ + uint16_t: __builtin_bswap16, \ + uint32_t: __builtin_bswap32, \ + uint64_t: __builtin_bswap64, \ + int16_t: __builtin_bswap16, \ + int32_t: __builtin_bswap32, \ + int64_t: __builtin_bswap64) +#define bswaps(p) (*(p) =3D bswap_(p)(*(p))) + +static void output_reloc(FILE *outf, void *buf, void *loc) +{ + fprintf(outf, " 0x%08lx,\n", (unsigned long)(loc - buf)); +} + +static const char *sigreturn_sym; +static const char *rt_sigreturn_sym; + +static unsigned sigreturn_addr; +static unsigned rt_sigreturn_addr; + +#define N 32 +#define elfN(x) elf32_##x +#define ElfN(x) Elf32_##x +#include "gen-vdso-elfn.c.inc" +#undef N +#undef elfN +#undef ElfN + +#define N 64 +#define elfN(x) elf64_##x +#define ElfN(x) Elf64_##x +#include "gen-vdso-elfn.c.inc" +#undef N +#undef elfN +#undef ElfN + + +int main(int argc, char **argv) +{ + FILE *inf, *outf; + long total_len; + const char *prefix =3D "vdso"; + const char *inf_name; + const char *outf_name =3D NULL; + unsigned char *buf; + bool need_bswap; + + while (1) { + int opt =3D getopt(argc, argv, "o:p:r:s:"); + if (opt < 0) { + break; + } + switch (opt) { + case 'o': + outf_name =3D optarg; + break; + case 'p': + prefix =3D optarg; + break; + case 'r': + rt_sigreturn_sym =3D optarg; + break; + case 's': + sigreturn_sym =3D optarg; + break; + default: + usage: + fprintf(stderr, "usage: [-p prefix] [-r rt-sigreturn-name] " + "[-s sigreturn-name] -o output-file input-file\n"); + return EXIT_FAILURE; + } + } + + if (optind >=3D argc || outf_name =3D=3D NULL) { + goto usage; + } + inf_name =3D argv[optind]; + + /* + * Open the input and output files. + */ + inf =3D fopen(inf_name, "rb"); + if (inf =3D=3D NULL) { + goto perror_inf; + } + outf =3D fopen(outf_name, "w"); + if (outf =3D=3D NULL) { + goto perror_outf; + } + + /* + * Read the input file into a buffer. + * We expect the vdso to be small, on the order of one page, + * therefore we do not expect a partial read. + */ + fseek(inf, 0, SEEK_END); + total_len =3D ftell(inf); + fseek(inf, 0, SEEK_SET); + + buf =3D malloc(total_len); + if (buf =3D=3D NULL) { + goto perror_inf; + } + + errno =3D 0; + if (fread(buf, 1, total_len, inf) !=3D total_len) { + if (errno) { + goto perror_inf; + } + fprintf(stderr, "%s: incomplete read\n", inf_name); + return EXIT_FAILURE; + } + fclose(inf); + + /* + * Write out the vdso image now, before we make local changes. + */ + + fprintf(outf, + "/* Automatically generated from linux-user/gen-vdso.c. */\n" + "\n" + "static const uint8_t %s_image[] =3D {", + prefix); + for (long i =3D 0; i < total_len; ++i) { + if (i % 12 =3D=3D 0) { + fputs("\n ", outf); + } + fprintf(outf, " 0x%02x,", buf[i]); + } + fprintf(outf, "\n};\n\n"); + + /* + * Identify which elf flavor we're processing. + * The first 16 bytes of the file are e_ident. + */ + + if (buf[EI_MAG0] !=3D ELFMAG0 || buf[EI_MAG1] !=3D ELFMAG1 || + buf[EI_MAG2] !=3D ELFMAG2 || buf[EI_MAG3] !=3D ELFMAG3) { + fprintf(stderr, "%s: not an elf file\n", inf_name); + return EXIT_FAILURE; + } + switch (buf[EI_DATA]) { + case ELFDATA2LSB: + need_bswap =3D BYTE_ORDER !=3D LITTLE_ENDIAN; + break; + case ELFDATA2MSB: + need_bswap =3D BYTE_ORDER !=3D BIG_ENDIAN; + break; + default: + fprintf(stderr, "%s: invalid elf EI_DATA (%u)\n", + inf_name, buf[EI_DATA]); + return EXIT_FAILURE; + } + + /* + * We need to relocate the VDSO image. The one built into the kernel + * is built for a fixed address. The one we built for QEMU is not, + * since that requires close control of the guest address space. + * + * Output relocation addresses as we go. + */ + + fprintf(outf, "static const unsigned %s_relocs[] =3D {\n", prefix); + + switch (buf[EI_CLASS]) { + case ELFCLASS32: + elf32_process(outf, buf, need_bswap); + break; + case ELFCLASS64: + elf64_process(outf, buf, need_bswap); + break; + default: + fprintf(stderr, "%s: invalid elf EI_CLASS (%u)\n", + inf_name, buf[EI_CLASS]); + return EXIT_FAILURE; + } + + fprintf(outf, "};\n\n"); /* end vdso_relocs. */ + + fprintf(outf, "static const VdsoImageInfo %s_image_info =3D {\n", pref= ix); + fprintf(outf, " .image =3D %s_image,\n", prefix); + fprintf(outf, " .relocs =3D %s_relocs,\n", prefix); + fprintf(outf, " .image_size =3D sizeof(%s_image),\n", prefix); + fprintf(outf, " .reloc_count =3D ARRAY_SIZE(%s_relocs),\n", prefix); + fprintf(outf, " .sigreturn_ofs =3D 0x%x,\n", sigreturn_addr); + fprintf(outf, " .rt_sigreturn_ofs =3D 0x%x,\n", rt_sigreturn_addr); + fprintf(outf, "};\n"); + + /* + * Everything should have gone well. + */ + if (fclose(outf)) { + goto perror_outf; + } + return EXIT_SUCCESS; + + perror_inf: + perror(inf_name); + return EXIT_FAILURE; + + perror_outf: + perror(outf_name); + return EXIT_FAILURE; +} diff --git a/linux-user/gen-vdso-elfn.c.inc b/linux-user/gen-vdso-elfn.c.inc new file mode 100644 index 0000000000..7034c36d5e --- /dev/null +++ b/linux-user/gen-vdso-elfn.c.inc @@ -0,0 +1,307 @@ +/* + * Post-process a vdso elf image for inclusion into qemu. + * Elf size specialization. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +static void elfN(bswap_ehdr)(ElfN(Ehdr) *ehdr) +{ + bswaps(&ehdr->e_type); /* Object file type */ + bswaps(&ehdr->e_machine); /* Architecture */ + bswaps(&ehdr->e_version); /* Object file version */ + bswaps(&ehdr->e_entry); /* Entry point virtual address */ + bswaps(&ehdr->e_phoff); /* Program header table file offset = */ + bswaps(&ehdr->e_shoff); /* Section header table file offset = */ + bswaps(&ehdr->e_flags); /* Processor-specific flags */ + bswaps(&ehdr->e_ehsize); /* ELF header size in bytes */ + bswaps(&ehdr->e_phentsize); /* Program header table entry size */ + bswaps(&ehdr->e_phnum); /* Program header table entry count = */ + bswaps(&ehdr->e_shentsize); /* Section header table entry size */ + bswaps(&ehdr->e_shnum); /* Section header table entry count = */ + bswaps(&ehdr->e_shstrndx); /* Section header string table index= */ +} + +static void elfN(bswap_phdr)(ElfN(Phdr) *phdr) +{ + bswaps(&phdr->p_type); /* Segment type */ + bswaps(&phdr->p_flags); /* Segment flags */ + bswaps(&phdr->p_offset); /* Segment file offset */ + bswaps(&phdr->p_vaddr); /* Segment virtual address */ + bswaps(&phdr->p_paddr); /* Segment physical address */ + bswaps(&phdr->p_filesz); /* Segment size in file */ + bswaps(&phdr->p_memsz); /* Segment size in memory */ + bswaps(&phdr->p_align); /* Segment alignment */ +} + +static void elfN(bswap_shdr)(ElfN(Shdr) *shdr) +{ + bswaps(&shdr->sh_name); + bswaps(&shdr->sh_type); + bswaps(&shdr->sh_flags); + bswaps(&shdr->sh_addr); + bswaps(&shdr->sh_offset); + bswaps(&shdr->sh_size); + bswaps(&shdr->sh_link); + bswaps(&shdr->sh_info); + bswaps(&shdr->sh_addralign); + bswaps(&shdr->sh_entsize); +} + +static void elfN(bswap_sym)(ElfN(Sym) *sym) +{ + bswaps(&sym->st_name); + bswaps(&sym->st_value); + bswaps(&sym->st_size); + bswaps(&sym->st_shndx); +} + +static void elfN(bswap_dyn)(ElfN(Dyn) *dyn) +{ + bswaps(&dyn->d_tag); /* Dynamic type tag */ + bswaps(&dyn->d_un.d_ptr); /* Dynamic ptr or val, in union */ +} + +static void elfN(search_symtab)(ElfN(Shdr) *shdr, unsigned sym_idx, + void *buf, bool need_bswap) +{ + unsigned str_idx =3D shdr[sym_idx].sh_link; + ElfN(Sym) *sym =3D buf + shdr[sym_idx].sh_offset; + unsigned sym_n =3D shdr[sym_idx].sh_size / sizeof(*sym); + const char *str =3D buf + shdr[str_idx].sh_offset; + + for (unsigned i =3D 0; i < sym_n; ++i) { + const char *name; + + if (need_bswap) { + elfN(bswap_sym)(sym + i); + } + name =3D str + sym[i].st_name; + + if (sigreturn_sym && strcmp(sigreturn_sym, name) =3D=3D 0) { + sigreturn_addr =3D sym[i].st_value; + } + if (rt_sigreturn_sym && strcmp(rt_sigreturn_sym, name) =3D=3D 0) { + rt_sigreturn_addr =3D sym[i].st_value; + } + } +} + +static void elfN(process)(FILE *outf, void *buf, bool need_bswap) +{ + ElfN(Ehdr) *ehdr =3D buf; + ElfN(Phdr) *phdr; + ElfN(Shdr) *shdr; + unsigned phnum, shnum; + unsigned dynamic_ofs =3D 0; + unsigned dynamic_addr =3D 0; + unsigned symtab_idx =3D 0; + unsigned dynsym_idx =3D 0; + unsigned first_segsz =3D 0; + int errors =3D 0; + + if (need_bswap) { + elfN(bswap_ehdr)(ehdr); + } + + phnum =3D ehdr->e_phnum; + phdr =3D buf + ehdr->e_phoff; + if (need_bswap) { + for (unsigned i =3D 0; i < phnum; ++i) { + elfN(bswap_phdr)(phdr + i); + } + } + + shnum =3D ehdr->e_shnum; + shdr =3D buf + ehdr->e_shoff; + if (need_bswap) { + for (unsigned i =3D 0; i < shnum; ++i) { + elfN(bswap_shdr)(shdr + i); + } + } + for (unsigned i =3D 0; i < shnum; ++i) { + switch (shdr[i].sh_type) { + case SHT_SYMTAB: + symtab_idx =3D i; + break; + case SHT_DYNSYM: + dynsym_idx =3D i; + break; + } + } + + /* + * Validate the VDSO is created as we expect: that PT_PHDR, + * PT_DYNAMIC, and PT_NOTE located in a writable data segment. + * PHDR and DYNAMIC require relocation, and NOTE will get the + * linux version number. + */ + for (unsigned i =3D 0; i < phnum; ++i) { + if (phdr[i].p_type !=3D PT_LOAD) { + continue; + } + if (first_segsz !=3D 0) { + fprintf(stderr, "Multiple LOAD segments\n"); + errors++; + } + if (phdr[i].p_offset !=3D 0) { + fprintf(stderr, "LOAD segment does not cover EHDR\n"); + errors++; + } + if (phdr[i].p_vaddr !=3D 0) { + fprintf(stderr, "LOAD segment not loaded at address 0\n"); + errors++; + } + first_segsz =3D phdr[i].p_filesz; + if (first_segsz < ehdr->e_phoff + phnum * sizeof(*phdr)) { + fprintf(stderr, "LOAD segment does not cover PHDRs\n"); + errors++; + } + if ((phdr[i].p_flags & (PF_R | PF_W)) !=3D (PF_R | PF_W)) { + fprintf(stderr, "LOAD segment is not read-write\n"); + errors++; + } + } + for (unsigned i =3D 0; i < phnum; ++i) { + const char *which; + + switch (phdr[i].p_type) { + case PT_PHDR: + which =3D "PT_PHDR"; + break; + case PT_NOTE: + which =3D "PT_NOTE"; + break; + case PT_DYNAMIC: + dynamic_ofs =3D phdr[i].p_offset; + dynamic_addr =3D phdr[i].p_vaddr; + which =3D "PT_DYNAMIC"; + break; + default: + continue; + } + if (first_segsz < phdr[i].p_vaddr + phdr[i].p_filesz) { + fprintf(stderr, "LOAD segment does not cover %s\n", which); + errors++; + } + } + if (errors) { + exit(EXIT_FAILURE); + } + + /* Relocate the program headers. */ + for (unsigned i =3D 0; i < phnum; ++i) { + output_reloc(outf, buf, &phdr[i].p_vaddr); + output_reloc(outf, buf, &phdr[i].p_paddr); + } + + /* Relocate the DYNAMIC entries. */ + if (dynamic_addr) { + ElfN(Dyn) *dyn =3D buf + dynamic_ofs; + __typeof(dyn->d_tag) tag; + + do { + + if (need_bswap) { + elfN(bswap_dyn)(dyn); + } + tag =3D dyn->d_tag; + + switch (tag) { + case DT_HASH: + case DT_SYMTAB: + case DT_STRTAB: + case DT_VERDEF: + case DT_VERSYM: + case DT_PLTGOT: + case DT_ADDRRNGLO ... DT_ADDRRNGHI: + /* These entries store an address in the entry. */ + output_reloc(outf, buf, &dyn->d_un.d_val); + break; + + case DT_NULL: + case DT_STRSZ: + case DT_SONAME: + case DT_DEBUG: + case DT_FLAGS: + case DT_FLAGS_1: + case DT_SYMBOLIC: + case DT_BIND_NOW: + case DT_VERDEFNUM: + case DT_VALRNGLO ... DT_VALRNGHI: + /* These entries store an integer in the entry. */ + break; + + case DT_SYMENT: + if (dyn->d_un.d_val !=3D sizeof(ElfN(Sym))) { + fprintf(stderr, "VDSO has incorrect dynamic symbol siz= e\n"); + errors++; + } + break; + + case DT_REL: + case DT_RELSZ: + case DT_RELA: + case DT_RELASZ: + /* + * These entries indicate that the VDSO was built incorrec= tly. + * It should not have any real relocations. + * ??? The RISC-V toolchain will emit these even when there + * are no relocations. Validate zeros. + */ + if (dyn->d_un.d_val !=3D 0) { + fprintf(stderr, "VDSO has dynamic relocations\n"); + errors++; + } + break; + case DT_RELENT: + case DT_RELAENT: + case DT_TEXTREL: + /* These entries store an integer in the entry. */ + /* Should not be required; see above. */ + break; + + case DT_NEEDED: + case DT_VERNEED: + case DT_PLTREL: + case DT_JMPREL: + case DT_RPATH: + case DT_RUNPATH: + fprintf(stderr, "VDSO has external dependencies\n"); + errors++; + break; + + default: + /* This is probably something target specific. */ + fprintf(stderr, "VDSO has unknown DYNAMIC entry (%lx)\n", + (unsigned long)tag); + errors++; + break; + } + dyn++; + } while (tag !=3D DT_NULL); + if (errors) { + exit(EXIT_FAILURE); + } + } + + /* Relocate the dynamic symbol table. */ + if (dynsym_idx) { + ElfN(Sym) *sym =3D buf + shdr[dynsym_idx].sh_offset; + unsigned sym_n =3D shdr[dynsym_idx].sh_size / sizeof(*sym); + + for (unsigned i =3D 0; i < sym_n; ++i) { + output_reloc(outf, buf, &sym[i].st_value); + } + } + + /* Search both dynsym and symtab for the signal return symbols. */ + if (dynsym_idx) { + elfN(search_symtab)(shdr, dynsym_idx, buf, need_bswap); + } + if (symtab_idx) { + elfN(search_symtab)(shdr, symtab_idx, buf, need_bswap); + } +} diff --git a/linux-user/meson.build b/linux-user/meson.build index 7171dc60be..e4cb70ed2d 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -28,9 +28,13 @@ linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: file= s('flatload.c')) linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c')) linux_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: file= s('semihost.c')) =20 - syscall_nr_generators =3D {} =20 +gen_vdso_exe =3D executable('gen-vdso', 'gen-vdso.c', + native: true, build_by_default: false) +gen_vdso =3D generator(gen_vdso_exe, output: '@BASENAME@.c.inc', + arguments: ['-o', '@OUTPUT@', '@EXTRA_ARGS@', '@INPUT= @']) + subdir('alpha') subdir('arm') subdir('hppa') --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693350443; cv=none; d=zohomail.com; s=zohoarc; b=kmrdrTjIQqUSebBjYwXe16M9vtrhBCc2ln5CvLXf/G+m7S6WiXxbG+o4xXx15zViL+5PWw/Aour+s+ayC6HJttieP1C8oyaEDxT5u9YWrWDgmC+IPuARut/BbqeAjYQZqwqJ1oJwXgzxid1CykQzXUed3BKgoPENa9cT5IgkNSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350443; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=80yiBDrasGbCP19yEMmSaaDi0ipiYiAfvI51hXAWE6g=; b=ZgSY+c7KePUYfWDLsGbaXLJPttyiklaJ43qaEJMAEH/HgM3gbAI+ao2QEl3V6jHcNASxe3WGuW8NXqQyr36YQKY1Jg+28a4jaUQqgWpLebFMuBNMoff3XsTLUwK//lm2ALCPqJlGsmXLcUGq8296+7DloffgsICrkpWBVsyL8zs= 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 1693350443741245.57397622602923; Tue, 29 Aug 2023 16:07:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7ml-0000c8-Kn; Tue, 29 Aug 2023 19:06:11 -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 1qb6nN-0002PK-JH for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:48 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nK-00049Z-Je for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:44 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-68bec3a9bdbso3174541b3a.3 for ; Tue, 29 Aug 2023 15:02:42 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346561; x=1693951361; 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=80yiBDrasGbCP19yEMmSaaDi0ipiYiAfvI51hXAWE6g=; b=dgJs6X4nB1fJ6mdNPymBrmOQXNgHyf5e5yomo65NlYcdHUzOIcmgFlhnj81MuPCaay 5zNQ/067rPBKGclMhC/nXkXaMbQZ7Dq/Fg9eSbBbuBp9P4nQVp6K+uoNDEvWAgb5bpYR 6CRiMKxESMMreg5vJFSegn21HXkdRsd9cTkcAGXqiREtX1LTgmt3JC6li/BHLZ2l671W Ew5Y4CghLbbGFbp9xAClIEjOp32VL5F4tsPIGAeUTnIh2LIscovwbYzCxlaboF2hY5BM pHM46GkcADtJJHCRAWYaHMuPR0bAjCc3g5nTdVZpQOPu/nK6nNRjEldrR6DKQsmYPZEA ypUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346561; x=1693951361; 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=80yiBDrasGbCP19yEMmSaaDi0ipiYiAfvI51hXAWE6g=; b=d/TdtwsE068REjxigskaZnwBeLIm9cO8gjBEHhWFm3M1zad83V5U7hzRU2CTudCUMO MEaVfl8XN5uuRM/FMeYXPDrjxTWCEwquxhIL+9x06XAk9G/ExGnLErN7T3EXEracTPJy Ho3Fmm46JCtybygwSMN/9VCuzkZLb5pY4g476/49QUUpoyI61967bztFObuLepJx2TWX queBtzKWwXGOADo+lOMBZ2SOTBeKx4WrZltwVrsVE9RO8pKACetgwCIqEW4tcKZfW5TY 9C8raKY5YVC5bYgUjFE7bc20XOAD10XXv0qBDuIPd7V5kOogT+CGlRtop+WgOGxdXsz4 dXxw== X-Gm-Message-State: AOJu0YzN3CPbzw9GTdy/tK/fW4U99RGY8B7PqqjugVzlnoBLRfLDz3yW UJsPTeOiu+pyUlbNSbX6UGCmlvL86Ok30wMV3ec= X-Google-Smtp-Source: AGHT+IEYqtmEs7UyU5CQp9LYocu2HIox4mly2xbtEHjXx70NdGvFzU0cqrnaw/OJwURc0JC1VzjANQ== X-Received: by 2002:a05:6a00:3982:b0:675:ef91:7922 with SMTP id fi2-20020a056a00398200b00675ef917922mr568966pfb.4.1693346559671; Tue, 29 Aug 2023 15:02:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 10/20] linux-user: Add build-vdso.sh tool Date: Tue, 29 Aug 2023 15:02:18 -0700 Message-Id: <20230829220228.928506-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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: 1693350444549100001 Content-Type: text/plain; charset="utf-8" A shell script to build the vdso using the cross-compiler makefile fragment. If none detected, fall back to copying the pre-build vdso from the source directory. Signed-off-by: Richard Henderson --- linux-user/build-vdso.sh | 31 +++++++++++++++++++++++++++++++ linux-user/meson.build | 1 + 2 files changed, 32 insertions(+) create mode 100755 linux-user/build-vdso.sh diff --git a/linux-user/build-vdso.sh b/linux-user/build-vdso.sh new file mode 100755 index 0000000000..489088737f --- /dev/null +++ b/linux-user/build-vdso.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Build vdso using cross tools + +build_dir=3Derror +source_dir=3Derror +target_dir=3Derror +output=3Derror + +while test $# -gt 0; do + opt=3D"$1" + shift + case "$opt" in + -B) build_dir=3D$1; shift;; + -C) source_dir=3D$1; shift;; + -T) target_dir=3D$1; shift;; + -o) output=3D$1; shift;; + --) break;; + esac +done + +frag=3D"${build_dir}/tests/tcg/${target_dir}/config-target.mak" +if ! test -f "$frag"; then + # No cross-compiler available + # Copy pre-build image into build tree + cp "${source_dir}/$(basename ${output})" "${output}" + exit $? +fi + +# Extract cross-compiler from the makefile fragment, and build. +CC=3D$(grep CC=3D "$frag" | sed s/CC=3D//) +exec $CC -o "$output" $@ diff --git a/linux-user/meson.build b/linux-user/meson.build index e4cb70ed2d..099e5c4fe0 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -30,6 +30,7 @@ linux_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTIN= G', if_true: files('sem =20 syscall_nr_generators =3D {} =20 +build_vdso_cmd =3D find_program('build-vdso.sh') gen_vdso_exe =3D executable('gen-vdso', 'gen-vdso.c', native: true, build_by_default: false) gen_vdso =3D generator(gen_vdso_exe, output: '@BASENAME@.c.inc', --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693350586; cv=none; d=zohomail.com; s=zohoarc; b=Y6aJB1A54hqD342yjiwMx0o7ryWfc5ErnEYl+xYWuONjiVBkpHicp2LAzTxeRCz8JbVXyqd3RL2KrTun2hn5CwMbacorxjfzN0VxrRL2xIaYZee7mPg1JXrtC9pCuYXdqRkLuUuhqOkq2PGp2GJuNqlkcu5AdiKrfkBoY1GoG3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350586; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kee2mUckLTu0r5fI4Zox2tGZrq73NQtpZRaUibEwLSc=; b=GOhOvnt0Z88+xxyNLxVwZkU5F/4F7DhhBevOJyibRn4g5mFGRqp9i2CwnbA9F+shoEVdNYRsNzqrjpV2agSpYrz0/s8vU/mZ6oQ19+clwJ2Vb69kx2lTlaHleoVdb9xq0VTyijItERd/xm/fFLv80qzTD5/GLXT24nCIdjdcLpo= 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 1693350586643876.5391697693751; Tue, 29 Aug 2023 16:09:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7ml-0000dp-F5; Tue, 29 Aug 2023 19:06:11 -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 1qb6nR-0002R1-CV for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:51 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nK-00049W-J9 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:47 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-68bed286169so4216993b3a.1 for ; Tue, 29 Aug 2023 15:02:41 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346561; x=1693951361; 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=Kee2mUckLTu0r5fI4Zox2tGZrq73NQtpZRaUibEwLSc=; b=NYnRP5kgztaNlnwcyCgcHQG+7Kf9dqNM2RU6nuI8jFAQEc6ZbfWK9l/RuzuvGHbbZ8 fY3UvlySFCPAxQ8owMfc16ZlqYIdkmVDOZs6VTN4/U+SoOQNDRHoCCa9wiNB1b0wy4C8 uxrHh26glr59o4jW0Sup64YkWB7QVeWloKz1btc1tFVeerAS3VcJXdSYFrjxdddPGMuu x37IwV1RuAH3n/I3Gzpw7r1tREW9Ob0FylBukklXjfudHTo0URwIvqE2xNHFqba/84iB hVDMbdwY5RwNzPFBVjfSv3troo1nMYWOPgqKP5+MyX3LMmaY7t8FPfc3APm/QKQn2tgM epEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346561; x=1693951361; 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=Kee2mUckLTu0r5fI4Zox2tGZrq73NQtpZRaUibEwLSc=; b=jsCrgbIgGdyge8xNdBpajcuiuhgEgG5bTAXarKQ0WVvcoFenqhiWH+rn7L1EXpaDme 9+O8U8vDMdUj57KgxzT9SzQQY0G9wRdg8y0XtZmWn1i2wJH5+F9uBenCGVb5yB6NGsae a72zSdYYKFvTYEKhlqIJMYQ6JOrGTQXbspnm/sSLNI1XqkXfz86/K213SjkQot4Bn8V+ 84BZ/DTCayQw84Gv1J/8ehDG9Thlvl836fFaBKRtb4bHj8V4BHZdfAWGaYB3r6TVoqWp DRFHCpYyqNUU/Uob+C/VWbVPB1TC1spjI1wURWaLfvv1QWPpk0If7tYZQCV2sajxpzZ0 j7Kw== X-Gm-Message-State: AOJu0Yykg0o2V75hxdhJwh0uuHOlNg+0aW3u8O/5lCi2zZeVFNZ9hJo3 2BghY47qVC+UrV9Stp5tSsYKAmLuT3aoLy5hfbc= X-Google-Smtp-Source: AGHT+IGE0r81mPNxATsiulAv+zUirOuvtzw8Hqc04791kFA3YYhsEm24CL3xvxNq3BALktgEb0QiSg== X-Received: by 2002:a05:6a00:3903:b0:68c:3f2:6000 with SMTP id fh3-20020a056a00390300b0068c03f26000mr517468pfb.6.1693346560823; Tue, 29 Aug 2023 15:02:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 11/20] linux-user/i386: Add vdso Date: Tue, 29 Aug 2023 15:02:19 -0700 Message-Id: <20230829220228.928506-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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: 1693350588202100019 Content-Type: text/plain; charset="utf-8" Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1267 Signed-off-by: Richard Henderson --- linux-user/i386/vdso-asmoffset.h | 6 ++ linux-user/elfload.c | 16 +++- linux-user/i386/signal.c | 11 +++ linux-user/i386/meson.build | 24 ++++++ linux-user/i386/vdso.S | 143 +++++++++++++++++++++++++++++++ linux-user/i386/vdso.ld | 76 ++++++++++++++++ linux-user/i386/vdso.so | Bin 0 -> 2672 bytes 7 files changed, 274 insertions(+), 2 deletions(-) create mode 100644 linux-user/i386/vdso-asmoffset.h create mode 100644 linux-user/i386/vdso.S create mode 100644 linux-user/i386/vdso.ld create mode 100755 linux-user/i386/vdso.so diff --git a/linux-user/i386/vdso-asmoffset.h b/linux-user/i386/vdso-asmoff= set.h new file mode 100644 index 0000000000..4e5ee0dd49 --- /dev/null +++ b/linux-user/i386/vdso-asmoffset.h @@ -0,0 +1,6 @@ +/* + * offsetof(struct sigframe, sc.eip) + * offsetof(struct rt_sigframe, uc.tuc_mcontext.eip) + */ +#define SIGFRAME_SIGCONTEXT_eip 64 +#define RT_SIGFRAME_SIGCONTEXT_eip 220 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 2a6adebb4a..fb876ae30a 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -309,12 +309,24 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, const CPUX86State *en (*regs)[15] =3D tswapreg(env->regs[R_ESP]); (*regs)[16] =3D tswapreg(env->segs[R_SS].selector & 0xffff); } -#endif + +/* + * i386 is the only target which supplies AT_SYSINFO for the vdso. + * All others only supply AT_SYSINFO_EHDR. + */ +#define DLINFO_ARCH_ITEMS 1 +#define ARCH_DLINFO NEW_AUX_ENT(AT_SYSINFO, vdso_info->entry); + +#include "vdso.c.inc" + +#define vdso_image_info() &vdso_image_info + +#endif /* TARGET_X86_64 */ =20 #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 -#endif +#endif /* TARGET_I386 */ =20 #ifdef TARGET_ARM =20 diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c index 60fa07d6f9..bc5d45302e 100644 --- a/linux-user/i386/signal.c +++ b/linux-user/i386/signal.c @@ -214,6 +214,17 @@ struct rt_sigframe { }; #define TARGET_RT_SIGFRAME_FXSAVE_OFFSET ( = \ offsetof(struct rt_sigframe, fpstate) + TARGET_FPSTATE_FXSAVE_OFFSET) + +/* + * Verify that vdso-asmoffset.h constants match. + */ +#include "i386/vdso-asmoffset.h" + +QEMU_BUILD_BUG_ON(offsetof(struct sigframe, sc.eip) + !=3D SIGFRAME_SIGCONTEXT_eip); +QEMU_BUILD_BUG_ON(offsetof(struct rt_sigframe, uc.tuc_mcontext.eip) + !=3D RT_SIGFRAME_SIGCONTEXT_eip); + #else =20 struct rt_sigframe { diff --git a/linux-user/i386/meson.build b/linux-user/i386/meson.build index ee523019a5..d858bf1d77 100644 --- a/linux-user/i386/meson.build +++ b/linux-user/i386/meson.build @@ -3,3 +3,27 @@ syscall_nr_generators +=3D { arguments: [ meson.current_source_dir() / 'syscallhdr.= sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], output: '@BASENAME@_nr.h') } + +vdso_so =3D custom_target(output: 'vdso.so', + input: files('vdso.S', 'vdso.ld'), + depend_files: files('vdso-asmoffset.h'), + command: [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'i386-linux-user', + '-o', '@OUTPUT@', + '--', '-m32', '-nostdlib', '-shared', + '-Wl,-h,linux-gate.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' + ]) + +vdso_inc =3D gen_vdso.process(vdso_so, extra_args: [ + '-s', '__kernel_sigreturn', + '-r', '__kernel_rt_sigreturn' + ]) + +linux_user_ss.add(when: 'TARGET_I386', if_true: vdso_inc) diff --git a/linux-user/i386/vdso.S b/linux-user/i386/vdso.S new file mode 100644 index 0000000000..e7a1f333a1 --- /dev/null +++ b/linux-user/i386/vdso.S @@ -0,0 +1,143 @@ +/* + * i386 linux replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include "vdso-asmoffset.h" + +.macro endf name + .globl \name + .type \name, @function + .size \name, . - \name +.endm + +.macro vdso_syscall1 name, nr +\name: + .cfi_startproc + mov %ebx, %edx + .cfi_register %ebx, %edx + mov 4(%esp), %ebx + mov $\nr, %eax + int $0x80 + mov %edx, %ebx + ret + .cfi_endproc +endf \name +.endm + +.macro vdso_syscall2 name, nr +\name: + .cfi_startproc + mov %ebx, %edx + .cfi_register %ebx, %edx + mov 4(%esp), %ebx + mov 8(%esp), %ecx + mov $\nr, %eax + int $0x80 + mov %edx, %ebx + ret + .cfi_endproc +endf \name +.endm + +.macro vdso_syscall3 name, nr +\name: + .cfi_startproc + push %ebx + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset %ebx, 0 + mov 8(%esp), %ebx + mov 12(%esp), %ecx + mov 16(%esp), %edx + mov $\nr, %eax + int $0x80 + pop %ebx + .cfi_adjust_cfa_offset -4 + .cfi_restore %ebx + ret + .cfi_endproc +endf \name +.endm + +__kernel_vsyscall: + .cfi_startproc + int $0x80 + ret + .cfi_endproc +endf __kernel_vsyscall + +vdso_syscall2 __vdso_clock_gettime, __NR_clock_gettime +vdso_syscall2 __vdso_clock_gettime64, __NR_clock_gettime64 +vdso_syscall2 __vdso_clock_getres, __NR_clock_getres +vdso_syscall2 __vdso_gettimeofday, __NR_gettimeofday +vdso_syscall1 __vdso_time, __NR_time +vdso_syscall3 __vdso_getcpu, __NR_gettimeofday + +/* + * Signal return handlers. + */ + + .cfi_startproc simple + .cfi_signal_frame + +/* + * For convenience, put the cfa just above eip in sigcontext, and count + * offsets backward from there. Re-compute the cfa in the two contexts + * we have for signal unwinding. This is far simpler than the + * DW_CFA_expression form that the kernel uses, and is equally correct. + */ + + .cfi_def_cfa %esp, SIGFRAME_SIGCONTEXT_eip + 4 + + .cfi_offset %eip, -4 + /* err, -8 */ + /* trapno, -12 */ + .cfi_offset %eax, -16 + .cfi_offset %ecx, -20 + .cfi_offset %edx, -24 + .cfi_offset %ebx, -28 + .cfi_offset %esp, -32 + .cfi_offset %ebp, -36 + .cfi_offset %esi, -40 + .cfi_offset %edi, -44 + +/* + * While this frame is marked as a signal frame, that only applies to how + * the return address is handled for the outer frame. The return address + * that arrived here, from the inner frame, is not marked as a signal frame + * and so the unwinder still tries to subtract 1 to examine the presumed + * call insn. Thus we must extend the unwind info to a nop before the sta= rt. + */ + nop + +__kernel_sigreturn: + popl %eax /* pop sig */ + .cfi_adjust_cfa_offset -4 + movl $__NR_sigreturn, %eax + int $0x80 +endf __kernel_sigreturn + + .cfi_def_cfa_offset RT_SIGFRAME_SIGCONTEXT_eip + 4 + nop + +__kernel_rt_sigreturn: + movl $__NR_rt_sigreturn, %eax + int $0x80 +endf __kernel_rt_sigreturn + + .cfi_endproc + +/* + * TODO: Add elf notes. E.g. + * + * #include + * ELFNOTE_START(Linux, 0, "a") + * .long LINUX_VERSION_CODE + * ELFNOTE_END + * + * but what version number would we set for QEMU? + */ diff --git a/linux-user/i386/vdso.ld b/linux-user/i386/vdso.ld new file mode 100644 index 0000000000..326b7a8f98 --- /dev/null +++ b/linux-user/i386/vdso.ld @@ -0,0 +1,76 @@ +/* + * Linker script for linux i386 replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +ENTRY(__kernel_vsyscall) + +VERSION { + LINUX_2.6 { + global: + __vdso_clock_gettime; + __vdso_gettimeofday; + __vdso_time; + __vdso_clock_getres; + __vdso_clock_gettime64; + __vdso_getcpu; + }; + + LINUX_2.5 { + global: + __kernel_vsyscall; + __kernel_sigreturn; + __kernel_rt_sigreturn; + local: *; + }; +} + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; /* FLAGS= =3DRWX */ + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + .data : { + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load =3D0x90909090 +} diff --git a/linux-user/i386/vdso.so b/linux-user/i386/vdso.so new file mode 100755 index 0000000000000000000000000000000000000000..bdece5dfcf8da036d013262d4e3= 7208350283cfa GIT binary patch literal 2672 zcmbtWU1%It6u#5lG_z^4ZB?X_C>9o5sxCF8QBlyONt?nZ)?|y73e)ZGba%;SR(597 zjTXE8QIiHtY6YPbDhO>6s(mPS(FX(Z2Q`g?1xp_^KInr_=3D|f8&)b;yj=3D5}w=3DeGok1 z%XiMX=3DbrmB_ny0ldSlx(O%qZAA|PnR8-(ZpuhYGj4)L&P5F5p65f&@qVw=3DPV(21ar zS~fT!zaSUUNMnrKqu7p`(Ouv?E|~S#J4vR z?eBj&+ji~rg~eZ!zf~VSJr_pXM}D8DFrl0ORPzVHn5LKmbB!e|qzOC^tO77~@mIB) zzl6kpgPDI3e2U8d6uIY2bq_`x0-wZWxDMLSfe$J6M%crOeHivUY<@1rr@`l7bI!EC z1WQ>fZdBic@iW@_P1t@f_$4LZXEGSfcpH2f?e~Kj&v`Zj+$T!NBlkb|jQhnHeiL+a z&lJblO18$ z-OkRAyW9oSmOj5{et#-4CVgruv?pIJqQxKI&ZY~dQ!H3DSHUrA-dxrymL5+h95ZU? zqfdy~j)7gfjrM5g9c>HN9>C7?j(;zF-_-GQuCsOgock95 z$CvrnLFHO513c5BE36+~5f2BEAVM30`47nj^o(oe;NgZND~~oF)87oe)%5l%caD!C zZUR`#4&CABw}%(BE9KdV>yxiUf|Id`UI}64SIQGVslJnSd`)$H14yd$t+Ysc2OQ(J+srhD+k<&>BHxRjq5)uze70i3T0nE36-;4MD zX|P(C`eCbeVGnF6>~F$Q>&)x0)jBo>TdiYfVXJlMbJ%KKV=3DY$enlO4^9_Z@du@yHB zwchCMGqw$O_4gWmJ%e{HQ)lfOF0TyrZnl4$<)z$G>%HU>FE1lXy;xFj>Xa70cGRgB zZe?YqcLID@7{~XU=3Dz-4s6vh$lz%9JdjN|)G?1a8N?pfc* zIKKY`&zcmDP2m_-KOf(Hg0)2EV}IgBfWHx_^Y;P~hc5SkbEE79n459x?;V(~$T$m@ zjElobxDGGOT`N`AK*n(#-do~0bSZKjGMDr(AZ`H$D-74d^xS8@>$IiJAn|o+fMq_` OKQ- (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 1693351818167145.22134261182418; Tue, 29 Aug 2023 16:30:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7nv-0001uF-Qi; Tue, 29 Aug 2023 19:07:23 -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 1qb6nR-0002R0-CM for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:51 -0400 Received: from mail-oi1-x22b.google.com ([2607:f8b0:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nL-00049h-C4 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:47 -0400 Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-3a88ef953adso3442793b6e.0 for ; Tue, 29 Aug 2023 15:02:42 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346562; x=1693951362; 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=eeodzQae6xgscra1MOigH7Kir+wMGq9VLUD6APjis3k=; b=MpM4tcEAt6KKfGBWgeH9Kl7o0ROQVVsCLLCWhidU7dTQ4FY5D213QeDphznixmux89 GoJR9d1tt7ns5SAqTI+gwbwdm41l2SkphI97ttvkPTMcvgRIKm6KAcAwE//TiioPg7JZ f9IQJ5yGymV8k1BStUTE9CcDBIsLrz6t9Q1kDGOxVzxajsXLp7NwxGaLthCpRSr73on5 MizGt3LzWwwy4b6dvzWfGjwQ0IJxGctelgwOovQB49P8IUVg56K5Z26oiYLraPzam+/Y vYTlq0R4hzNFgIJGFgzhGfOxa5pWd9ilFuYJ3srHIpy9tW91qhQM78ajPvc2C29EPBE3 kNTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346562; x=1693951362; 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=eeodzQae6xgscra1MOigH7Kir+wMGq9VLUD6APjis3k=; b=F0TmykmYL/Rih+fn0ydsh4HQGiHJSLVQpWoqXSjzfym6tWtJ5WVWakFlIRtu2dE7TV fTLTGzoINVtbHVG/7s6XBNNNdUYoSL6oxbygFRW4+QdcbSVROP6CpySQgtgC457GIda6 iUo6Xh3wj+HOZSVFomyR/1r84JFy/bv54i8ttlR0vxub49ouFXz3r4HTxuvwMLb3iK/p ty/zU8Pcvfuc4hq7AnAPllc6XIChaCKdq0dzuaCbL+J0VI3xhv46znMIjOFDRR+NCoHN 5SDhYr/QqeP1sdppVGDm3t/lVC/eg83RHLG4HOircAjnTrjFntBBTNNt5ffGpiLalI/V 27Xw== X-Gm-Message-State: AOJu0YwmpyylPlJpCcMSiig9SAKyiT2peCJalSOx+IA5pcguLGYPsifv zcqTargLgrTUOzQl8XF8Lh8C5wmnD6ciEtNfsPY= X-Google-Smtp-Source: AGHT+IGvB5vl2wY3mepkyCZo4rt/jGJZptxDN5k1wb52Q8VjdGQ0BtFAngzVl0R1qKJuXEBA0RTBmQ== X-Received: by 2002:a54:4413:0:b0:3a7:af4c:2406 with SMTP id k19-20020a544413000000b003a7af4c2406mr304177oiw.44.1693346561762; Tue, 29 Aug 2023 15:02:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 12/20] linux-user/x86_64: Add vdso Date: Tue, 29 Aug 2023 15:02:20 -0700 Message-Id: <20230829220228.928506-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.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: 1693351819429100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/elfload.c | 4 +- linux-user/x86_64/meson.build | 20 +++++++++ linux-user/x86_64/vdso.S | 78 ++++++++++++++++++++++++++++++++++ linux-user/x86_64/vdso.ld | 73 +++++++++++++++++++++++++++++++ linux-user/x86_64/vdso.so | Bin 0 -> 2968 bytes 5 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 linux-user/x86_64/vdso.S create mode 100644 linux-user/x86_64/vdso.ld create mode 100755 linux-user/x86_64/vdso.so diff --git a/linux-user/elfload.c b/linux-user/elfload.c index fb876ae30a..b421f04675 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -317,12 +317,12 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, const CPUX86State *en #define DLINFO_ARCH_ITEMS 1 #define ARCH_DLINFO NEW_AUX_ENT(AT_SYSINFO, vdso_info->entry); =20 +#endif /* TARGET_X86_64 */ + #include "vdso.c.inc" =20 #define vdso_image_info() &vdso_image_info =20 -#endif /* TARGET_X86_64 */ - #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 diff --git a/linux-user/x86_64/meson.build b/linux-user/x86_64/meson.build index 203af9a60c..6744563a11 100644 --- a/linux-user/x86_64/meson.build +++ b/linux-user/x86_64/meson.build @@ -3,3 +3,23 @@ syscall_nr_generators +=3D { arguments: [ meson.current_source_dir() / 'syscallhd= r.sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], output: '@BASENAME@_nr.h') } + +vdso_so =3D custom_target(output: 'vdso.so', + input: files('vdso.S', 'vdso.ld'), + command: [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'x86_64-linux-user', + '-o', '@OUTPUT@', + '--', '-nostdlib', '-shared', + '-Wl,-h,linux-vdso.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' + ]) + +vdso_inc =3D gen_vdso.process(vdso_so) + +linux_user_ss.add(when: 'TARGET_X86_64', if_true: vdso_inc) diff --git a/linux-user/x86_64/vdso.S b/linux-user/x86_64/vdso.S new file mode 100644 index 0000000000..47d16c00ab --- /dev/null +++ b/linux-user/x86_64/vdso.S @@ -0,0 +1,78 @@ +/* + * x86-64 linux replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include + +.macro endf name + .globl \name + .type \name, @function + .size \name, . - \name +.endm + +.macro weakalias name +\name =3D __vdso_\name + .weak \name +.endm + +.macro vdso_syscall name, nr +__vdso_\name: + mov $\nr, %eax + syscall + ret +endf __vdso_\name +weakalias \name +.endm + + .cfi_startproc + +vdso_syscall clock_gettime, __NR_clock_gettime +vdso_syscall clock_getres, __NR_clock_getres +vdso_syscall gettimeofday, __NR_gettimeofday +vdso_syscall time, __NR_time + +__vdso_getcpu: + /* + * There is no syscall number for this allocated on x64. + * We can handle this several ways: + * + * (1) Invent a syscall number for use within qemu. + * It should be easy enough to pick a number that + * is well out of the way of the kernel numbers. + * + * (2) Force the emulated cpu to support the rdtscp insn, + * and initialize the TSC_AUX value the appropriate value. + * + * (3) Pretend that we're always running on cpu 0. + * + * This last is the one that's implemented here, with the + * tiny bit of extra code to support rdtscp in place. + */ + xor %ecx, %ecx /* rdtscp w/ tsc_aux =3D 0 */ + + /* if (cpu !=3D NULL) *cpu =3D (ecx & 0xfff); */ + test %rdi, %rdi + jz 1f + mov %ecx, %eax + and $0xfff, %eax + mov %eax, (%rdi) + + /* if (node !=3D NULL) *node =3D (ecx >> 12); */ +1: test %rsi, %rsi + jz 2f + shr $12, %ecx + mov %ecx, (%rsi) + +2: xor %eax, %eax + ret +endf __vdso_getcpu + +weakalias getcpu + + .cfi_endproc + +/* TODO: Add elf note for LINUX_VERSION_CODE */ diff --git a/linux-user/x86_64/vdso.ld b/linux-user/x86_64/vdso.ld new file mode 100644 index 0000000000..ca6001cc3c --- /dev/null +++ b/linux-user/x86_64/vdso.ld @@ -0,0 +1,73 @@ +/* + * Linker script for linux x86-64 replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_2.6 { + global: + clock_gettime; + __vdso_clock_gettime; + gettimeofday; + __vdso_gettimeofday; + getcpu; + __vdso_getcpu; + time; + __vdso_time; + clock_getres; + __vdso_clock_getres; + + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; /* FLAGS= =3DRWX */ + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + .data : { + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load =3D0x90909090 +} diff --git a/linux-user/x86_64/vdso.so b/linux-user/x86_64/vdso.so new file mode 100755 index 0000000000000000000000000000000000000000..c873d6ea580b393825506d2ffbd= dcf9827d89e14 GIT binary patch literal 2968 zcmcgtO=3Dw(I6uvKUOl$t7l}J=3DnY6?Lgol-PVEvcEL6HP)om@-1c>vZO|6VjQnGcRQ# zQlk(xE{v3}x(Eh$E+iYFJ0pdXxDr=3DE=3D&lLvMs(4vwBz~aoiCl-j=3DCuHBzL}hzkANP z=3DiPhmJs%H_3^h28p){If=3DE2CAex2B8q6WA=3D6OrF`(`KF&`Uz?MI&EW@IwS5;Jq_-2rSodh0=3Dh5M8yR&|8~q9xUzjR(|@2weye zz8a;S7@IIXlUIKD#o1b1+rN5odUE>L=3Dz;rh$dv40C`m=3Dye*;62d-p2^;2j+^>^@b* z{zK-lF(OZeV2X;(id~9-RYHGjYX7&6)!h7{=3D_DaLK@yv17h=3D=3DzIwme4kF^2|U3rG4QL%vz2K73uCxOLI|+`aN! z$F-%z;-Tzk@6K$E*Jv}RD{ao_%it)TlnNq<^Unr!fz4Lw$ zOy&HC$f92&rz(YWnba(~S{s>9e=3DuV%Oyy_Fufeq||4}nCJT{T^4!f^Qd<}K~WJ1Kz zzvUl)Z^gZPP8#nNzOg~(w`aa@FjYY9u^!IW^5APGzK1@7^HK>gD4>;p^R}arI;0o1?04=3DjpKWw!W)=3D?0Yt=3D zynUbER^IkMss3a7y}So_=3DMcZ`$9S>#$BvH<4@j=3Db`|AzHy`jYM(LpaBOVlKlW^ujb z)P%J2ye6gV=3D6*G&ja!<{1*x-wK{3QEd-+1(8#gnXPvxf4)sE;I_k4cF&8AA(kO_(* zbIC83rV9C8121D-KkJ<idjF0yGj>9sy zEwzyLtiMFu4~T6avc|lrbF^o@CbB+LUq6S#>RVK)S)cWo$nWI(T!)Byg4)h8>pihg zSHk{7hu^QXIU^m!MEjk0M(-crN9uFmIL=3D%4U1~>sm5Pe?`en6ee(>HC`S#L{y??u6 vr;^|o8ppUAvD!gdKbRPND1BpVH#|fA;?X5$6$T literal 0 HcmV?d00001 --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351553; cv=none; d=zohomail.com; s=zohoarc; b=hxYFZ0BxxM+vi9o2v5vJh4Z2vXQwqgoGvauvTUz1JJrLzcHeiS8zxqVC+x57189/qu9oYqZEQaeUdlc9ZafDBC8L7QuuXs4gCpcRoEC25h1KexbsqB7WTdKK+T1W+fWEtzdqHGl7EI8rptDSFAGw3pW8x2Rl6mIb6nnRemIePx8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351553; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pLMtweIj9VXeYhHPPyPr7xGLS4OZL75mnN+1BxZJcQ0=; b=geLt2ZVNskkmBSoKykPSttReDeWCJcxVrTkiv7dWGDsKOjz+VBRrJ7G98ai8OP0J6vVW/vEhRr63KA/I0BXOesiRdHlTeLosqEj0SCd1MWk3qQ9IFQo5531OTbMWBjQxVS9JnoO5JJFjjfLeeLO43xxyD6kcTEOeb8xrr+2GkNQ= 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 1693351553914534.810543169065; Tue, 29 Aug 2023 16:25:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7mm-0000e3-Dn; Tue, 29 Aug 2023 19:06:12 -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 1qb6nR-0002Qz-CN for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:51 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nL-0004A0-TB for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:47 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-68a410316a2so3613913b3a.0 for ; Tue, 29 Aug 2023 15:02:43 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346562; x=1693951362; 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=pLMtweIj9VXeYhHPPyPr7xGLS4OZL75mnN+1BxZJcQ0=; b=CbjjBw9g3IllOGxkZYsxUjtZMrFfuQxgioLEgwjzD1Rbk65uyviyMWkBzx3ndqKcUt gwRXcmMNGECOKDuTAWza/BSITD12KurxQOReExCr6RsQ81ix4xUGCpKvRjjGfGsZLgDp 6ES6Xc2foed6mDDDSJjCVrNghQirJ01AAaP4qAmai4MgU5zgiWXoZ9GpT07yPSUbRlvb ZuopSAdARtBSABfwRHJMDa1Dy4uC+IVlGAx0Xxy2LsNVilxFgDcTMZsAIBy9YENitnP3 YUA4x99xuR9sAVQ1IZnx/6Zk5L01kPk+Lf3WfhDMPihKaQG5D1RFGXIx2+HPYmJGgIiG g7Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346562; x=1693951362; 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=pLMtweIj9VXeYhHPPyPr7xGLS4OZL75mnN+1BxZJcQ0=; b=D7xIXDasXgPJBOWoZYoEyYhH2qeXf7ejf8FVni2Mw9NuCwIi4LpjYpWtz8Fr2I3Dyf TUNFI6OmpPk7Dd3R6ra587EKSnD1ByvVukKpH/+DmEFKAGJot6k3Cg2N0EiApT91eAQe 2xIvAqkidFfGtGtOCQ7xUonfB1COeFlv6T7h2wB7ddHctW9XDmev471sTG918GLovyCJ A94OU24ckI55a3jLXiqOa0HUmpyGVC/CVuY9M6CMZLtRA0NbnUO0eEeIlCHKOuqHHlqq wMm/030+YquV12CPwc/WC7nxGYGwys8cyRAjroUe/pwSPpSiceYLkRFCD3puxAfxSqjN 0bTA== X-Gm-Message-State: AOJu0YymtOb0RczihlY747igprFtuIlJ6RxcJGRBkjVHGq2nOPf8Abyz KIyIrjGAlRs8pMBT7TyOLyaY1PMdWOVjSotSh6o= X-Google-Smtp-Source: AGHT+IFb5Ak9DZaGrFwSRcSm2f8ZhkQjpI612fElKuQ1rxT4EPNGfPPRvixQlK/qpleyVkdksMHEEg== X-Received: by 2002:a05:6a00:1256:b0:68a:5395:7a9c with SMTP id u22-20020a056a00125600b0068a53957a9cmr564445pfi.9.1693346562589; Tue, 29 Aug 2023 15:02:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 13/20] linux-user/aarch64: Add vdso Date: Tue, 29 Aug 2023 15:02:21 -0700 Message-Id: <20230829220228.928506-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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: 1693351554535100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/elfload.c | 7 ++++ linux-user/aarch64/meson.build | 33 +++++++++++++++ linux-user/aarch64/vdso-be.so | Bin 0 -> 3216 bytes linux-user/aarch64/vdso-le.so | Bin 0 -> 3216 bytes linux-user/aarch64/vdso.S | 73 +++++++++++++++++++++++++++++++++ linux-user/aarch64/vdso.ld | 72 ++++++++++++++++++++++++++++++++ linux-user/meson.build | 1 + 7 files changed, 186 insertions(+) create mode 100644 linux-user/aarch64/meson.build create mode 100755 linux-user/aarch64/vdso-be.so create mode 100755 linux-user/aarch64/vdso-le.so create mode 100644 linux-user/aarch64/vdso.S create mode 100644 linux-user/aarch64/vdso.ld diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b421f04675..8316868bd2 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -768,6 +768,13 @@ static uint32_t get_elf_hwcap2(void) =20 #undef GET_FEATURE_ID =20 +#if TARGET_BIG_ENDIAN +# include "vdso-be.c.inc" +#else +# include "vdso-le.c.inc" +#endif +#define vdso_image_info() &vdso_image_info + #endif /* not TARGET_AARCH64 */ #endif /* TARGET_ARM */ =20 diff --git a/linux-user/aarch64/meson.build b/linux-user/aarch64/meson.build new file mode 100644 index 0000000000..b769c87570 --- /dev/null +++ b/linux-user/aarch64/meson.build @@ -0,0 +1,33 @@ +# TARGET_BIG_ENDIAN is defined to 'n' for little-endian; which means it +# is always true as far as source_set.apply() is concerned. Always build +# both header files and include the right one via #if. + +vdso_cmd =3D [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'aarch64-linux-user', + '-o', '@OUTPUT@', + '--', + '-nostdlib', '-shared', + '-Wl,-h,linux-vdso.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' +] + +vdso_le_so =3D custom_target(output: 'vdso-le.so', + input: files('vdso.S', 'vdso.ld'), + command: vdso_cmd + ['-mlittle-endian']) + +vdso_be_so =3D custom_target(output: 'vdso-be.so', + input: files('vdso.S', 'vdso.ld'), + command: vdso_cmd + ['-mbig-endian']) + +gen =3D [ + gen_vdso.process(vdso_le_so, extra_args: ['-r', '__kernel_rt_sigreturn']= ), + gen_vdso.process(vdso_be_so, extra_args: ['-r', '__kernel_rt_sigreturn']= ), +] + +linux_user_ss.add(when: 'TARGET_AARCH64', if_true: gen) diff --git a/linux-user/aarch64/vdso-be.so b/linux-user/aarch64/vdso-be.so new file mode 100755 index 0000000000000000000000000000000000000000..b19563b648cc3e33a45b9394695= d747f55c11db7 GIT binary patch literal 3216 zcmc&$O>A355T57v+5{-Ysi=3Dq)1g#XIswz)u5h$n}>|m!!<)$HRMcT{OwO?YViH)9L zih~5?z=3DZ>%s3*h$7jXfJb1N?G0i;U3Re&lXl@n4Wq>3KOr9bY>?#y~^Y=3Dp#tN%nm^ z-^}dn+ud2e5A%iTRLTP@K3u}SLugCJ*oV)vHVIoG18H~$^{v9^IFFKH#BtTHHOQ{@AI9wplKX>5uW8hLCPZyyWXO)_afvt zPLSS@;?mf*9GW`;SFwXaoUePPPkDT@e|7!-C&$uv?_9aC^5d7czWDXKi@WpeN3fmy zrxg`AO2vOhEfH@8NmszJhLP@nW06fX~F5^>-dY|g;_5-5_8A8+_8Xaiu zNtb<@VE+Gra0kFPlQ_7^6QK3ZIs9$rX+Ks*pnaEh7d*#b){Dk@&f%|d0P+7IUJH%1 zzr5bM&wHW6q^_JZtbK^5wzY+&;bq`^*2&Mmc`*9?v*xFNq)(mxVb@Eo+;87xAA(Y6 zqqr8Ws^ut2s%uewsa)LXu%*>{>8#lL&~eo0uyLXq)#W%!*5ewiR%`3cm(P_O^$`E} zLt%FA#G*P7z81dnI?e_Uk^LjhGk;ItxpEOTI?vBzGv}1vC)X5a8Aq>- z7#qb765KeN3yRdY(U8~Y9{HAGERQApnQ&<1ck3^+0AX=3DwCnN+i%_Ix1rxS#7W+- zv2SI-_&YqCw`=3D{!FtFcyg&lu?#tx46!hrgJ%c*ns9$9wy+dK}f`}+yt+Qg2P{9 z|1^|Jhik7ER%XLGjF(}&2`YDTE_-D5O)NjW_*H&JO)q4RP8yjm$@eE=3DT8>~pLR!<@b%Nw=3DgTD7D*=3D!;lP ziV!Z>*27A%Q89cH8|GXTH>&kom!irLMisRb7uOeseg#`A)!b<~d>?B9E;Zi4Rbl#NYS7*iYg&jqWqTB>r&Ch+0LWOd$gY72BNkeGV(#x;0H@0bFqxB|r zDgixk;Y1K8ZU%9ID-u*(=3Dz#+gH&jr?C8tW2K#(5b)Yi=3DG&a>A)TY-ec*nj8$H#2|! z{y#JO-^~^B1E~~&9QvAiBciklwuhl1*h$*Q&v80P4>3H*Ev;gkPwHggm`30swMk;T zGAR=3D{>8b`86H!~|wRv~(Du=3D(NTR~auS~{=3DIA7z;kxT=3DM|q<>!Lvw1eOA_9j$u^H#K zkK5_R716pbm?J$V>5DHJi~P$^cZTvA|Eu|5{&?}o=3DEzQE<+n#zLt18ET-@rRrL{)s5@ZRm?=3D^d8Bt}f;aF))Xy)9ee+$ z!uj{Um(+z6uXE1Y|19H4`Tr{8Np+;6xLrryR@|-^A1S`4UX)4;OIHe)Yi@(4%QW30 zlYMoP9}MRF_k4YyisRwF#{BV^O_ zo3%#0Z(z#gdR4RP7uP*gEwd&@!A zJ8%xJkZ^Z_J?hqRmdZC3{!t&mw + +/* ??? These are in include/elf.h, which is not ready for inclusion in asm= . */ +#define NT_GNU_PROPERTY_TYPE_0 5 +#define GNU_PROPERTY_AARCH64_FEATURE_1_AND 0xc0000000 +#define GNU_PROPERTY_AARCH64_FEATURE_1_BTI (1U << 0) +#define GNU_PROPERTY_AARCH64_FEATURE_1_PAC (1U << 1) + +#define GNU_PROPERTY_AARCH64_FEATURE_1_DEFAULT \ + (GNU_PROPERTY_AARCH64_FEATURE_1_BTI | GNU_PROPERTY_AARCH64_FEATURE_1_P= AC) + + .section .note.gnu.property + .align 3 + .long 2f - 1f + .long 6f - 3f + .long NT_GNU_PROPERTY_TYPE_0 +1: .string "GNU" +2: .align 3 +3: .long GNU_PROPERTY_AARCH64_FEATURE_1_AND + .long 5f - 4f +4: .long GNU_PROPERTY_AARCH64_FEATURE_1_DEFAULT +5: .align 3 +6: + + .text + +.macro endf name + .globl \name + .type \name, @function + .size \name, . - \name +.endm + +.macro vdso_syscall name, nr +\name: + bti c + mov x8, #\nr + svc #0 + ret +endf \name +.endm + + .cfi_startproc + +vdso_syscall __kernel_gettimeofday, __NR_gettimeofday +vdso_syscall __kernel_clock_gettime, __NR_clock_gettime +vdso_syscall __kernel_clock_getres, __NR_clock_getres + + .cfi_endproc + + +/* + * TODO: The kernel makes a big deal of turning off the .cfi directives, + * because they cause libgcc to crash, but that's because they're wrong. + * + * For now, elide the unwind info for __kernel_rt_sigreturn and rely on + * the libgcc fallback routine as we have always done. This requires + * that the code sequence used be exact. + */ +__kernel_rt_sigreturn: + /* No BTI C insn here -- we arrive via RET. */ + mov x8, #__NR_rt_sigreturn + svc #0 +endf __kernel_rt_sigreturn + +/* TODO: Add elf note for LINUX_VERSION_CODE */ diff --git a/linux-user/aarch64/vdso.ld b/linux-user/aarch64/vdso.ld new file mode 100644 index 0000000000..4c12f33352 --- /dev/null +++ b/linux-user/aarch64/vdso.ld @@ -0,0 +1,72 @@ +/* + * Linker script for linux aarch64 replacement vdso. + * + * Copyright 2021 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_2.6.39 { + global: + __kernel_rt_sigreturn; + __kernel_gettimeofday; + __kernel_clock_gettime; + __kernel_clock_getres; + + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + /* + * We can't prelink to any address without knowing something about + * the virtual memory space of the host, since that leaks over into + * the available memory space of the guest. + */ + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + .data : { + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load =3D0xd503201f +} diff --git a/linux-user/meson.build b/linux-user/meson.build index 099e5c4fe0..1b265ed365 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -36,6 +36,7 @@ gen_vdso_exe =3D executable('gen-vdso', 'gen-vdso.c', gen_vdso =3D generator(gen_vdso_exe, output: '@BASENAME@.c.inc', arguments: ['-o', '@OUTPUT@', '@EXTRA_ARGS@', '@INPUT= @']) =20 +subdir('aarch64') subdir('alpha') subdir('arm') subdir('hppa') --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351090; cv=none; d=zohomail.com; s=zohoarc; b=BKt2l5mofLvFRj7Cr0r/mQ3zYr9KpfrtupXKxHP/yHy+t/PwC1FhWflgtxrnLUheE68LFi+HAZ5KAyK+XXkZpcRwTpKyhy0voxi0TOO0wELFOACTL+8mmRdMKKu2+2QDdqgyDzOGohA6md4LPEvrSrX4J6Mb0yJS3RWbvKjIBVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351090; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4P8uKuAKuluc1/WNH9Ak63d99XD9VhlZvaJdI6JNt38=; b=JR3r77wztPsxIhWqxmJz2olGHCBD6Oj0LrEL4TZXOfc3e+oVmEODmo/dyzqlmEaVl8f1dsJis5fEKVM96z4dmvb2Xrrd89OJfwDkp+P2dp3lXRbmDqZy/MD/mKTDbGnlD1THN+u0UxRCUeZ321HuetPjXp+bAlmEkmWmslF2LDI= 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 1693351090775308.07118046059236; Tue, 29 Aug 2023 16:18:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7mm-0000ds-1z; Tue, 29 Aug 2023 19:06:12 -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 1qb6nT-0002R9-DE for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:53 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nN-0004A9-CT for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:50 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-68bedc0c268so4223677b3a.0 for ; Tue, 29 Aug 2023 15:02:44 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346563; x=1693951363; 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=4P8uKuAKuluc1/WNH9Ak63d99XD9VhlZvaJdI6JNt38=; b=UC9731egNHoPB9f/Z9cgRMbC9H5MN/KjbDz6htetQqVfVpwfuSjhC1Zy46wjB6rFc1 TM8abRvqXe5ngOWEVZ1plUjjR7QfU+sH0DLpD/8N37+VDdPh5mxOxPpH/uga1UMx9c6b uIoDK2kaiJnrwpZGtD4nY99iUqHn6rvw13XFSbkABozACUcLFc4PFZfRgrX6JWNUc7US R8g0WRVY0Da3GxEGFHvf6kIDDICQoQTSSv5hGbOh5/eNDDZ7AzJE/TOkAESBp5G6CfqX npC7bAn0oS5PCpnI4UG/y3y2ER9N2O8YJO5EJmp2ldh2Mfof8IRjpMadfjeelbkPtwEP wWqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346563; x=1693951363; 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=4P8uKuAKuluc1/WNH9Ak63d99XD9VhlZvaJdI6JNt38=; b=da7i4uPPAw6kOwR1CJ6AC163UECHtp+vrOa4AkfFUs41ZP/sCLQL7evnX4fKvy2CM0 SJrT/kmhCd30HYxdgIHKV0ZvlAQYkO7iSbMFKmf2QgnwtF3/XfP1PqwmpS9+dnpWWLRc kj/3cdh/tRukGVcHGnoB6pHbi8S7q4/SUxHHT2fJBkDzxTzbdlX6OUXLO7b2c+lEX9iO KwP5oZNaH66o18XqH2gXr89lWYm51eUh9qKUlgEPDrUp52WEUC1NTWQuW7axRzBE8sIJ XkXKV8VGStkNPhPI4CBPrLsKlqs4go082aPq65EuEhZwyBOUCTVAHs/vaxqZqZh2NKpI bgDw== X-Gm-Message-State: AOJu0YwNzEugo2TvLeBoPoT2qyUoPkSmu2KWlj1VwLXx7WlZSQNCSPDU WBrsjECs6wrBgY4idqVFFelgeWfbcjuB73qXOT4= X-Google-Smtp-Source: AGHT+IE5vIigCbLQDYLN5Zw9bVd+VQsWIvl+8i9AnUAoAJUCkerSV56ZhMoGmd5LkkZdtJ85RuKrgQ== X-Received: by 2002:a05:6a20:8f22:b0:14c:7020:d613 with SMTP id b34-20020a056a208f2200b0014c7020d613mr713963pzk.37.1693346563363; Tue, 29 Aug 2023 15:02:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 14/20] linux-user/arm: Add vdso Date: Tue, 29 Aug 2023 15:02:22 -0700 Message-Id: <20230829220228.928506-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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: 1693351092036100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/arm/signal.c | 28 +++--- linux-user/elfload.c | 3 +- linux-user/arm/meson.build | 35 ++++++++ linux-user/arm/vdso-be.so | Bin 0 -> 2680 bytes linux-user/arm/vdso-le.so | Bin 0 -> 2680 bytes linux-user/arm/vdso.S | 177 +++++++++++++++++++++++++++++++++++++ linux-user/arm/vdso.ld | 67 ++++++++++++++ 7 files changed, 293 insertions(+), 17 deletions(-) create mode 100755 linux-user/arm/vdso-be.so create mode 100755 linux-user/arm/vdso-le.so create mode 100644 linux-user/arm/vdso.S create mode 100644 linux-user/arm/vdso.ld diff --git a/linux-user/arm/signal.c b/linux-user/arm/signal.c index cf99fd7b8a..c328d31081 100644 --- a/linux-user/arm/signal.c +++ b/linux-user/arm/signal.c @@ -167,9 +167,8 @@ setup_return(CPUARMState *env, struct target_sigaction = *ka, int usig, abi_ulong handler =3D 0; abi_ulong handler_fdpic_GOT =3D 0; abi_ulong retcode; - int thumb, retcode_idx; + int thumb; int is_fdpic =3D info_is_fdpic(((TaskState *)thread_cpu->opaque)->info= ); - bool copy_retcode; =20 if (is_fdpic) { /* In FDPIC mode, ka->_sa_handler points to a function @@ -184,9 +183,7 @@ setup_return(CPUARMState *env, struct target_sigaction = *ka, int usig, } else { handler =3D ka->_sa_handler; } - thumb =3D handler & 1; - retcode_idx =3D thumb + (ka->sa_flags & TARGET_SA_SIGINFO ? 2 : 0); =20 uint32_t cpsr =3D cpsr_read(env); =20 @@ -202,24 +199,23 @@ setup_return(CPUARMState *env, struct target_sigactio= n *ka, int usig, cpsr &=3D ~CPSR_E; } =20 + /* Our vdso default_sigreturn label is a table of entry points. */ + int idx =3D is_fdpic * 2 + ((ka->sa_flags & TARGET_SA_SIGINFO) !=3D 0); + retcode =3D default_sigreturn + idx * 16; + + /* + * Put the sigreturn code on the stack no matter which return + * mechanism we use in order to remain ABI compliant. + */ + memcpy(frame->retcode, g2h_untagged(retcode & ~1), 16); + if (ka->sa_flags & TARGET_SA_RESTORER) { if (is_fdpic) { + /* Place the function descriptor in slot 3. */ __put_user((abi_ulong)ka->sa_restorer, &frame->retcode[3]); - retcode =3D (sigreturn_fdpic_tramp + - retcode_idx * RETCODE_BYTES + thumb); - copy_retcode =3D true; } else { retcode =3D ka->sa_restorer; - copy_retcode =3D false; } - } else { - retcode =3D default_sigreturn + retcode_idx * RETCODE_BYTES + thum= b; - copy_retcode =3D true; - } - - /* Copy the code to the stack slot for ABI compatibility. */ - if (copy_retcode) { - memcpy(frame->retcode, g2h_untagged(retcode & ~1), RETCODE_BYTES); } =20 env->regs[0] =3D usig; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8316868bd2..cd2ab4292c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -768,6 +768,8 @@ static uint32_t get_elf_hwcap2(void) =20 #undef GET_FEATURE_ID =20 +#endif /* not TARGET_AARCH64 */ + #if TARGET_BIG_ENDIAN # include "vdso-be.c.inc" #else @@ -775,7 +777,6 @@ static uint32_t get_elf_hwcap2(void) #endif #define vdso_image_info() &vdso_image_info =20 -#endif /* not TARGET_AARCH64 */ #endif /* TARGET_ARM */ =20 #ifdef TARGET_SPARC diff --git a/linux-user/arm/meson.build b/linux-user/arm/meson.build index 5a93c925cf..6a8ce075c3 100644 --- a/linux-user/arm/meson.build +++ b/linux-user/arm/meson.build @@ -5,3 +5,38 @@ syscall_nr_generators +=3D { arguments: [ meson.current_source_dir() / 'syscallhdr.s= h', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], output: '@BASENAME@_nr.h') } + +# TARGET_BIG_ENDIAN is defined to 'n' for little-endian; which means it +# is always true as far as source_set.apply() is concerned. Always build +# both header files and include the right one via #if. + +vdso_cmd =3D [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'arm-linux-user', + '-o', '@OUTPUT@', + '--', + '-nostdlib', '-shared', + '-Wl,-use-blx', + '-Wl,-h,linux-vdso.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' +] + +vdso_le_so =3D custom_target(output: 'vdso-le.so', + input: files('vdso.S', 'vdso.ld'), + command: vdso_cmd + ['-mlittle-endian']) + +vdso_be_so =3D custom_target(output: 'vdso-be.so', + input: files('vdso.S', 'vdso.ld'), + command: vdso_cmd + ['-mbig-endian']) + +gen =3D [ + gen_vdso.process(vdso_be_so, extra_args: ['-s', 'sigreturn_codes']), + gen_vdso.process(vdso_le_so, extra_args: ['-s', 'sigreturn_codes']) +] + +linux_user_ss.add(when: 'TARGET_ARM', if_true: gen) diff --git a/linux-user/arm/vdso-be.so b/linux-user/arm/vdso-be.so new file mode 100755 index 0000000000000000000000000000000000000000..591db80fe47540707e5c627443a= c566d7f2c7c60 GIT binary patch literal 2680 zcmbtWO>9(E6h3eMTiWT=3D5TvP^8XGYPBfGXI^Vd zPzOb*g0LYZMoBQb)ieeZH^f;P!@{t@#DxYIb)&{;qQ-?de&2of)@kj=3Dc&6Vw_dDm@ zpLg%M=3Dk?|Op|s_*WL5m~0NTco5DDK1R(&D~>5?FP?Gl4O1i-h7D`*n|4bvZ#5~z8Q zupSu$${!7=3DqD`p&IrqCmB0l&HBn2O#{950HHt0s1X!LIe_YaJW%cD~hJ$pKCTisvo z|KV2P=3DtGz9zVtqPQDEHbW380xfBlB}_-;Yy6g1w^T7Yf_O28%{R;t(kgue!T8{7x| zGt^bI|F0yme9jZOL!yqDfVYKy=3D8-2yT_d4$XZ2MWU?fG1#WM^ke+2`zO z$8`&{&W6UliGP{PPQ}=3DC&(c&bvnVr#;@rYcjvL3{!!mSWWc-M|JH8jIz=3Dp5>EUXj1 z)}KCo7j~ZcT>#J3yqV?yaPD_7`Y39jtWN*qX!ihN1Rj9~tV!r&&@<3W(DTq&pkIQ< zIa}`l5nvhE0b2|Z>-ebnPDHKFmR3^EvlZa}H%l@aIpaIey`+5?@cjn%LD;_Dz&-)n z7eJ(8oCG-MJd8=3D(IO#++cCzi2=3D&P-#T3*|9y7^4gQsnjU8=3DB1#sky;x#_Oo2cP8^Rvc4{5&7}S!*DHLwtg_P#XbfqM3KV;?#Xdj290d6Fc?HNOJf7wv2*r>X^ty4^o$ zr$>{+{q|sLRP2GFgT2Wi`(QeKxPQzZOZE=3D++YKc{7pOG_W_{6WC`4-t*#)BRc2hUKp6) zNIR7;%-JfSa~$d9<@a`I<{8H0JyLgR0-SNoRmQPi?$#XR@qVd0)|lUnBX}2h&p6(S z2iXD6bx=3D&)K74~&-x0_AsP1F}e0^N6wlOZ{L4DU@R$}hclNhfK3*)YOQ1`)%2RnW8 zwD}(ZwB|wf!Or)kpX;Mc0UVp-VeizP$NZ~e;#^pC9P0pKt=3D|`R;Z94B2qP2sqIipsG?Q6`Prl;KQ%uX6*`&hPO^*1PT8Hr zL~2a6w$ax1r7uzo6+xdWMHGA~?vvCaQlt-kQ1qd`h)M-5c~IByyE8XV(mV*B-EYtD zJ@?L?d(PcgyLz*cNJKOl@~~*F4aRHr_=3D!raO}0u5zGg{F947iSEUV>`5YoBF&xCXbx~69Nt;YS;#C_oNkdrV>5ucTL z!pmn2Z3O+Xx-Buv97A2MwpT_d7}_w}0`FSk`R5;##>WH}|47>3Cjo z+F94Qr|k}N*{Nt-Fw&jK+w(G2EX~aAWL^{BN2Pav|H!Dd+uXxNL{~l$tdyVkKL0hz zcYZIx_e%1gEh4vPJ~HSd>3xc{7*Fnl&NDfRz)|pV@WbF!;7j1M;1|Fbz;A)S3*G=3D+ z0(JmA52VP;gAzTGinKH)h4X9%xc_{2l1Vk3h@Otnz6>uwVE(tIO{jzV3HA-4_i1 z4N7$-KB3~--~4!WB4lq+poZ!;A_s#)HBkRyG9(#1fp4uty)#0`3*wuo>w*vR=3D^TvT z1V#6V2=3Do@{M=3D{?%@F>PVLVvJ6p4g|M>-}K-Fmz4qH;15v`&SuyxPS57h5Ofe=3D;8h) zx!mmhfHQQ!bfwjk*1TAq&-G{e_IF67I9YbQnR3a>xp~zs(A2H29xFST>Fct3ItRt- z?j2~)^jZVi>`>RRHJoYh?Xp5GBWO^o8qC_J6>3DQ8reEMOZ7J~EA!KyJr3@beO}N~ z$@LsD^YbNpx|mY}V!>_C7IU&RV;1a6!MA&5-!kizD@C`oO0n`{It6Q@Y)?B@A&*F{ ziRn3Wo|u`zKGXKRa&dgd!`A$F;`{cm_J8lv*3j_a=3D*j)C>AQpHg;)gq6Yk#&>`&VP z-jO^qtRrF!GUHe_%*WobJJ5MFd7g;y>1G_kUd1Y7KGq$v1F}BSI_`1UZU=3DWU>ycoO zTpQOO*qD#^JHdNh6VfX>fZtk>kM&D%eL5dhwWepm^?!gWj0D%B_mt}+O#sZzapC_n zP!;Jo51Ni+A0Qg_qTthU3qc&;3G1CW3|W)v&rps5NU`FoB5tz|0@tbaoZ58*alGHy mKlq;ms(NqiSb7g2$`TgvF@=3DD1zGmp*xF@h7XLS&`j{64#seq6G literal 0 HcmV?d00001 diff --git a/linux-user/arm/vdso.S b/linux-user/arm/vdso.S new file mode 100644 index 0000000000..ea27cdd9b3 --- /dev/null +++ b/linux-user/arm/vdso.S @@ -0,0 +1,177 @@ +/* + * arm linux replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include + +/* + * All supported cpus have T16 instructions: at least arm4t. + * + * We support user-user with m-profile cpus as an extension, because it + * is useful for testing gcc, which requires we avoid A32 instructions. + */ + .thumb + .arch armv4t + .eabi_attribute Tag_FP_arch, 0 + .eabi_attribute Tag_ARM_ISA_use, 0 + + .text + +.macro raw_syscall n + .ifne \n < 0x100 + mov r7, #\n + .elseif \n < 0x1ff + mov r7, #0xff + add r7, #(\n - 0xff) + .else + .err + .endif + swi #0 +.endm + +.macro fdpic_thunk ofs + ldr r3, [sp, #\ofs] + ldmia r2, {r2, r3} + mov r9, r3 + bx r2 +.endm + +.macro endf name + .globl \name + .type \name, %function + .size \name, . - \name +.endm + +/* + * We must save/restore r7 for the EABI syscall number. + * While we're doing that, we might as well save LR to get a free return, + * and a branch that is interworking back to ARMv5. + */ + +.macro SYSCALL name, nr +\name: + .cfi_startproc + push {r7, lr} + .cfi_adjust_cfa_offset 8 + .cfi_offset r7, -8 + .cfi_offset lr, -4 + raw_syscall \nr + pop {r7, pc} + .cfi_endproc +endf \name +.endm + +SYSCALL __vdso_clock_gettime, __NR_clock_gettime +SYSCALL __vdso_clock_gettime64, __NR_clock_gettime64 +SYSCALL __vdso_clock_getres, __NR_clock_getres +SYSCALL __vdso_gettimeofday, __NR_gettimeofday + + +/* + * We, like the real kernel, use a table of sigreturn trampolines. + * Unlike the real kernel, we do not attempt to pack this into as + * few bytes as possible -- simply use 16 bytes per slot. + * + * Within each slot, use the exact same code sequence as the kernel, + * lest we trip up someone doing code inspection. + */ + +/* offsetof(struct sigframe, retcode[3]) */ +#define SIGFRAME_RC3_OFFSET 756 +#define RT_SIGFRAME_RC3_OFFSET 884 + +.macro slot n + .balign 16 + .org sigreturn_codes + 16 * \n +.endm + +.macro cfi_fdpic_r9 ofs + /* + * fd =3D *(r13 + ofs) + * r9 =3D *(fd + 4) + * + * DW_CFA_expression r9, length (7), + * DW_OP_breg13, ofs, DW_OP_deref, + * DW_OP_plus_uconst, 4, DW_OP_deref + */ + .cfi_escape 0x10, 9, 7, 0x7d, (\ofs & 0x7f) + 0x80, (\ofs >> 7), 0x06, 0x= 23, 4, 0x06 +.endm + +.macro cfi_fdpic_pc ofs + /* + * fd =3D *(r13 + ofs) + * pc =3D *fd + * + * DW_CFA_expression lr (14), length (5), + * DW_OP_breg13, ofs, DW_OP_deref, DW_OP_deref + */ + .cfi_escape 0x10, 14, 5, 0x7d, (\ofs & 0x7f) + 0x80, (\ofs >> 7), 0x06, 0= x06 +.endm + +/* + * Start the unwind info at least one instruction before the signal + * trampoline, because the unwinder will assume we are returning + * after a call site. + */ + .cfi_startproc simple + .cfi_signal_frame + .cfi_return_column 15 + + .cfi_def_cfa sp, 32 + 64 + .cfi_offset r0, -16 * 4 + .cfi_offset r1, -15 * 4 + .cfi_offset r2, -14 * 4 + .cfi_offset r3, -13 * 4 + .cfi_offset r4, -12 * 4 + .cfi_offset r5, -11 * 4 + .cfi_offset r6, -10 * 4 + .cfi_offset r7, -9 * 4 + .cfi_offset r8, -8 * 4 + .cfi_offset r9, -7 * 4 + .cfi_offset r10, -6 * 4 + .cfi_offset r11, -5 * 4 + .cfi_offset r12, -4 * 4 + .cfi_offset r13, -3 * 4 + .cfi_offset r14, -2 * 4 + .cfi_offset r15, -1 * 4 + + nop + + .balign 16 +sigreturn_codes: + /* [EO]ABI sigreturn */ + slot 0 + raw_syscall __NR_sigreturn + + .cfi_def_cfa_offset 160 + 64 + + /* [EO]ABI rt_sigreturn */ + slot 1 + raw_syscall __NR_rt_sigreturn + + .cfi_endproc + + /* FDPIC sigreturn */ + .cfi_startproc + cfi_fdpic_pc SIGFRAME_RC3_OFFSET + cfi_fdpic_r9 SIGFRAME_RC3_OFFSET + + slot 2 + fdpic_thunk SIGFRAME_RC3_OFFSET + .cfi_endproc + + /* FDPIC rt_sigreturn */ + .cfi_startproc + cfi_fdpic_pc RT_SIGFRAME_RC3_OFFSET + cfi_fdpic_r9 RT_SIGFRAME_RC3_OFFSET + + slot 3 + fdpic_thunk RT_SIGFRAME_RC3_OFFSET + .cfi_endproc + + .balign 16 +endf sigreturn_codes diff --git a/linux-user/arm/vdso.ld b/linux-user/arm/vdso.ld new file mode 100644 index 0000000000..3b00adf27a --- /dev/null +++ b/linux-user/arm/vdso.ld @@ -0,0 +1,67 @@ +/* + * Linker script for linux arm replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_2.6 { + global: + __vdso_clock_gettime; + __vdso_gettimeofday; + __vdso_clock_getres; + __vdso_clock_gettime64; + + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; /* FLAGS= =3DRWX */ + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + .data : { + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load +} --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693350872; cv=none; d=zohomail.com; s=zohoarc; b=USTLQ7yiPZiSDWd3IAJ8+svNQn29+5S9cl1ATncw4ZvXj6qySViWH/6tqF2CeXCLlMGRLw+7mSeQqJnLuh1cQ/76E+H36T3Qh2Ls8+JaDkB0ttDicmC9EGLTyWFzkqpXIEZ7JYgLxL7DVhtjzktP5fvxiDMj0ccbKzQOANW0VYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350872; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I7HQy8Pf3V+6dbDojL94FaVgMwfQELi+RTDuhyeAeO4=; b=n9SSMqUjAU5Tn6hJ3xQWbPt0GHTMf73xm/dfCpm+KPKQCQAbngQDdCIciKWubMGqgAU4Ltf43f1NwUQi+Ey0G9DjPQQYewyKU4qCbohNLOS0ozOCG2dSuQeZqGp4qPWreMFAF1WAgPaPVWGD1QzZ23pp0+t3EUHxJW3saTujL7E= 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 1693350872438407.76401322204003; Tue, 29 Aug 2023 16:14:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7p0-0003bU-CY; Tue, 29 Aug 2023 19:08:30 -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 1qb6nW-0002SI-48 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:54 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nQ-0004AP-VB for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:53 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-68a520dba33so3914700b3a.0 for ; Tue, 29 Aug 2023 15:02:45 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346564; x=1693951364; 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=I7HQy8Pf3V+6dbDojL94FaVgMwfQELi+RTDuhyeAeO4=; b=tAgT8QrRbQeD7o8jv5H6gLqrlfov22XPJtNZehW37Cf2+MHUeR+uqRIgTG2rw/Iw4L RYKynx5VmwcCC9fa73T4CObdX/N9nie+wrlIc+Fm8C51KWlrneeKMFDBmCkYuislS1v8 VVrMEb2uwKCY7CaB+sABmBVQCt/ncmZeuvsS7NQfgROHgvJgjMX3lPQt3PPOVDkg8+sx OtHCSK9VbvjIUHSuUDhs/sPekSsKAhAmZFtFVl1f0VOezVLxkbvz/+1xPGUOL7bb4eYM Ci+2t+oYblfATOFwDoN7VOnkLGCpSsDodxs5EiH6oiH1ZOxQSVGa+t0SE6yMSPtFp+dn Yy/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346564; x=1693951364; 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=I7HQy8Pf3V+6dbDojL94FaVgMwfQELi+RTDuhyeAeO4=; b=lKbMnfB/mSaJdkkM3/jj7lyDl0hTieCJ6SHT7c0t3ItVeRmfGeJakARZop776BEQ6W DE7EBE+0XOLNHmISm7RMLNxpmohbkPpqA1oQDNj1J/x27TRRaQafSUMzjWYUDXjc59R+ hR5aJVqcIjFjmnJxvk05xcSiGanj5wZAn9qS2HK1s+G83dKst1Rs71Bvn9VMGv0cicrE UICO7Waa0Knphacx65k7SDzkkP9Y+WAkqp8KjgeAfRbRRCldwkQ0ui02uIUg73CaHWJM jnxJEgaAaa8XGiYql4pDkxMHxWK57gVrZwyAEKg8ZYlmkxRBY7Zb/mtAv4Ovc0lLvRia 205Q== X-Gm-Message-State: AOJu0YxWdplY8wFD3FBzFpUpUpYkS0tXgMuy5sZQxSYdpg7ivdooamQq pJ928Nn+Mwr84uLE9OrS/hjFmvDqq4hu//lt8p0= X-Google-Smtp-Source: AGHT+IH1G5sWMPVWrSgDRpqJaDGGKhfsTwzKS01/EjcrF0JjXP0bQrXHqMy02wvGZz+yo74wdOwiAg== X-Received: by 2002:a05:6a20:9742:b0:11d:8a8f:655d with SMTP id hs2-20020a056a20974200b0011d8a8f655dmr573756pzc.4.1693346564174; Tue, 29 Aug 2023 15:02:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 15/20] linux-user/hppa: Add vdso Date: Tue, 29 Aug 2023 15:02:23 -0700 Message-Id: <20230829220228.928506-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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: 1693350874357100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/hppa/vdso-asmoffset.h | 12 +++ linux-user/elfload.c | 4 + linux-user/hppa/signal.c | 24 +++-- linux-user/hppa/meson.build | 23 +++++ linux-user/hppa/vdso.S | 165 +++++++++++++++++++++++++++++++ linux-user/hppa/vdso.ld | 77 +++++++++++++++ linux-user/hppa/vdso.so | Bin 0 -> 2104 bytes 7 files changed, 295 insertions(+), 10 deletions(-) create mode 100644 linux-user/hppa/vdso-asmoffset.h create mode 100644 linux-user/hppa/vdso.S create mode 100644 linux-user/hppa/vdso.ld create mode 100755 linux-user/hppa/vdso.so diff --git a/linux-user/hppa/vdso-asmoffset.h b/linux-user/hppa/vdso-asmoff= set.h new file mode 100644 index 0000000000..c8b40c0332 --- /dev/null +++ b/linux-user/hppa/vdso-asmoffset.h @@ -0,0 +1,12 @@ +#define sizeof_rt_sigframe 584 +#define offsetof_sigcontext 160 +#define offsetof_sigcontext_gr 0x4 +#define offsetof_sigcontext_fr 0x88 +#define offsetof_sigcontext_iaoq 0x190 +#define offsetof_sigcontext_sar 0x198 + +/* arch/parisc/include/asm/rt_sigframe.h */ +#define SIGFRAME 64 +#define FUNCTIONCALLFRAME 48 +#define PARISC_RT_SIGFRAME_SIZE32 \ + (((sizeof_rt_sigframe) + FUNCTIONCALLFRAME + SIGFRAME) & -SIGFRAME) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index cd2ab4292c..eb22a17e0e 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1771,6 +1771,10 @@ static inline void init_thread(struct target_pt_regs= *regs, #define STACK_GROWS_DOWN 0 #define STACK_ALIGNMENT 64 =20 +#include "vdso.c.inc" + +#define vdso_image_info() &vdso_image_info + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { diff --git a/linux-user/hppa/signal.c b/linux-user/hppa/signal.c index f253a15864..ada22556c1 100644 --- a/linux-user/hppa/signal.c +++ b/linux-user/hppa/signal.c @@ -21,6 +21,7 @@ #include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" +#include "vdso-asmoffset.h" =20 struct target_sigcontext { abi_ulong sc_flags; @@ -47,6 +48,19 @@ struct target_rt_sigframe { /* hidden location of upper halves of pa2.0 64-bit gregs */ }; =20 +QEMU_BUILD_BUG_ON(sizeof(struct target_rt_sigframe) !=3D sizeof_rt_sigfram= e); +QEMU_BUILD_BUG_ON(offsetof(struct target_rt_sigframe, uc.tuc_mcontext) + !=3D offsetof_sigcontext); +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_gr) + !=3D offsetof_sigcontext_gr); +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_fr) + !=3D offsetof_sigcontext_fr); +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_iaoq) + !=3D offsetof_sigcontext_iaoq); +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_sar) + !=3D offsetof_sigcontext_sar); + + static void setup_sigcontext(struct target_sigcontext *sc, CPUArchState *e= nv) { int i; @@ -91,16 +105,6 @@ static void restore_sigcontext(CPUArchState *env, struc= t target_sigcontext *sc) __get_user(env->cr[CR_SAR], &sc->sc_sar); } =20 -#if TARGET_ABI_BITS =3D=3D 32 -#define SIGFRAME 64 -#define FUNCTIONCALLFRAME 48 -#else -#define SIGFRAME 128 -#define FUNCTIONCALLFRAME 96 -#endif -#define PARISC_RT_SIGFRAME_SIZE32 \ - ((sizeof(struct target_rt_sigframe) + FUNCTIONCALLFRAME + SIGFRAME) & = -SIGFRAME) - void setup_rt_frame(int sig, struct target_sigaction *ka, target_siginfo_t *info, target_sigset_t *set, CPUArchState *env) diff --git a/linux-user/hppa/meson.build b/linux-user/hppa/meson.build index 4709508a09..e13ea4e9ab 100644 --- a/linux-user/hppa/meson.build +++ b/linux-user/hppa/meson.build @@ -3,3 +3,26 @@ syscall_nr_generators +=3D { arguments: [ meson.current_source_dir() / 'syscallhdr.= sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], output: '@BASENAME@_nr.h') } + +vdso_so =3D custom_target(output: 'vdso.so', + input: files('vdso.S', 'vdso.ld'), + depend_files: files('vdso-asmoffset.h'), + command: [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'hppa-linux-user', + '-o', '@OUTPUT@', + '--', '-nostdlib', '-shared', + '-Wl,-h,linux-vdso32.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' + ]) + +vdso_inc =3D gen_vdso.process(vdso_so, extra_args: [ + '-r', '__kernel_sigtramp_rt' + ]) + +linux_user_ss.add(when: 'TARGET_HPPA', if_true: vdso_inc) diff --git a/linux-user/hppa/vdso.S b/linux-user/hppa/vdso.S new file mode 100644 index 0000000000..5be14d2f70 --- /dev/null +++ b/linux-user/hppa/vdso.S @@ -0,0 +1,165 @@ +/* + * hppa linux kernel vdso replacement. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include "vdso-asmoffset.h" + + .text + + +/* + * arch/parisc/kernel/vdso32/sigtramp.S: + * Gdb expects the trampoline is on the stack and the pc is offset from + * a 64-byte boundary by 0, 4 or 5 instructions. Since the vdso trampoline + * is not on the stack, we need a new variant with different offsets and + * data to tell gdb where to find the signal context on the stack. + * + * Here we put the offset to the context data at the start of the trampoli= ne + * region and offset the first trampoline by 2 instructions. Please do + * not change the trampoline as the code in gdb depends on the following + * instruction sequence exactly. + */ + +/* arch/parisc/kernel/asm-offsets.c */ +#define SIGFRAME_CONTEXT_REGS32 \ + (offsetof_sigcontext - PARISC_RT_SIGFRAME_SIZE32) + + .align 64 + .word SIGFRAME_CONTEXT_REGS32 + +/* + * All that said, we can provide a proper unwind record, which means that + * GDB should not actually need the offset magic. + * + * The return address that arrived here, from the inner frame, is + * not marked as a signal frame and so the unwinder still tries to + * subtract 1 to examine the presumed call insn. Thus we must + * extend the unwind info to a nop before the start. + */ + + .cfi_startproc simple + .cfi_signal_frame + + /* Compare pa32_fallback_frame_state from libgcc. */ + + /* + * Place the CFA at the start of sigcontext for convenience. + * The previous CFA will be restored from the saved stack pointer. + */ + .cfi_def_cfa 30, -PARISC_RT_SIGFRAME_SIZE32 + offsetof_sigcontext + + /* Record save offset of general registers. */ + .cfi_offset 1, offsetof_sigcontext_gr + 1 * 4 + .cfi_offset 2, offsetof_sigcontext_gr + 2 * 4 + .cfi_offset 3, offsetof_sigcontext_gr + 3 * 4 + .cfi_offset 4, offsetof_sigcontext_gr + 4 * 4 + .cfi_offset 5, offsetof_sigcontext_gr + 5 * 4 + .cfi_offset 6, offsetof_sigcontext_gr + 6 * 4 + .cfi_offset 7, offsetof_sigcontext_gr + 7 * 4 + .cfi_offset 8, offsetof_sigcontext_gr + 8 * 4 + .cfi_offset 9, offsetof_sigcontext_gr + 9 * 4 + .cfi_offset 10, offsetof_sigcontext_gr + 10 * 4 + .cfi_offset 11, offsetof_sigcontext_gr + 11 * 4 + .cfi_offset 12, offsetof_sigcontext_gr + 12 * 4 + .cfi_offset 13, offsetof_sigcontext_gr + 13 * 4 + .cfi_offset 14, offsetof_sigcontext_gr + 14 * 4 + .cfi_offset 15, offsetof_sigcontext_gr + 15 * 4 + .cfi_offset 16, offsetof_sigcontext_gr + 16 * 4 + .cfi_offset 17, offsetof_sigcontext_gr + 17 * 4 + .cfi_offset 18, offsetof_sigcontext_gr + 18 * 4 + .cfi_offset 19, offsetof_sigcontext_gr + 19 * 4 + .cfi_offset 20, offsetof_sigcontext_gr + 20 * 4 + .cfi_offset 21, offsetof_sigcontext_gr + 21 * 4 + .cfi_offset 22, offsetof_sigcontext_gr + 22 * 4 + .cfi_offset 23, offsetof_sigcontext_gr + 23 * 4 + .cfi_offset 24, offsetof_sigcontext_gr + 24 * 4 + .cfi_offset 25, offsetof_sigcontext_gr + 25 * 4 + .cfi_offset 26, offsetof_sigcontext_gr + 26 * 4 + .cfi_offset 27, offsetof_sigcontext_gr + 27 * 4 + .cfi_offset 28, offsetof_sigcontext_gr + 28 * 4 + .cfi_offset 29, offsetof_sigcontext_gr + 29 * 4 + .cfi_offset 30, offsetof_sigcontext_gr + 30 * 4 + .cfi_offset 31, offsetof_sigcontext_gr + 31 * 4 + + /* Record save offset of fp registers, left and right halves. */ + .cfi_offset 32, offsetof_sigcontext_fr + 4 * 8 + .cfi_offset 33, offsetof_sigcontext_fr + 4 * 8 + 4 + .cfi_offset 34, offsetof_sigcontext_fr + 5 * 8 + .cfi_offset 35, offsetof_sigcontext_fr + 5 * 8 + 4 + .cfi_offset 36, offsetof_sigcontext_fr + 6 * 8 + .cfi_offset 37, offsetof_sigcontext_fr + 6 * 8 + 4 + .cfi_offset 38, offsetof_sigcontext_fr + 7 * 8 + .cfi_offset 39, offsetof_sigcontext_fr + 7 * 8 + 4 + .cfi_offset 40, offsetof_sigcontext_fr + 8 * 8 + .cfi_offset 41, offsetof_sigcontext_fr + 8 * 8 + 4 + .cfi_offset 42, offsetof_sigcontext_fr + 9 * 8 + .cfi_offset 43, offsetof_sigcontext_fr + 9 * 8 + 4 + .cfi_offset 44, offsetof_sigcontext_fr + 10 * 8 + .cfi_offset 45, offsetof_sigcontext_fr + 10 * 8 + 4 + .cfi_offset 46, offsetof_sigcontext_fr + 11 * 8 + .cfi_offset 47, offsetof_sigcontext_fr + 11 * 8 + 4 + .cfi_offset 48, offsetof_sigcontext_fr + 12 * 8 + .cfi_offset 49, offsetof_sigcontext_fr + 12 * 8 + 4 + .cfi_offset 50, offsetof_sigcontext_fr + 13 * 8 + .cfi_offset 51, offsetof_sigcontext_fr + 13 * 8 + 4 + .cfi_offset 52, offsetof_sigcontext_fr + 14 * 8 + .cfi_offset 53, offsetof_sigcontext_fr + 14 * 8 + 4 + .cfi_offset 54, offsetof_sigcontext_fr + 15 * 8 + .cfi_offset 55, offsetof_sigcontext_fr + 15 * 8 + 4 + .cfi_offset 56, offsetof_sigcontext_fr + 16 * 8 + .cfi_offset 57, offsetof_sigcontext_fr + 16 * 8 + 4 + .cfi_offset 58, offsetof_sigcontext_fr + 17 * 8 + .cfi_offset 59, offsetof_sigcontext_fr + 17 * 8 + 4 + .cfi_offset 60, offsetof_sigcontext_fr + 18 * 8 + .cfi_offset 61, offsetof_sigcontext_fr + 18 * 8 + 4 + .cfi_offset 62, offsetof_sigcontext_fr + 19 * 8 + .cfi_offset 63, offsetof_sigcontext_fr + 19 * 8 + 4 + .cfi_offset 64, offsetof_sigcontext_fr + 20 * 8 + .cfi_offset 65, offsetof_sigcontext_fr + 20 * 8 + 4 + .cfi_offset 66, offsetof_sigcontext_fr + 21 * 8 + .cfi_offset 67, offsetof_sigcontext_fr + 21 * 8 + 4 + .cfi_offset 68, offsetof_sigcontext_fr + 22 * 8 + .cfi_offset 69, offsetof_sigcontext_fr + 22 * 8 + 4 + .cfi_offset 70, offsetof_sigcontext_fr + 23 * 8 + .cfi_offset 71, offsetof_sigcontext_fr + 23 * 8 + 4 + .cfi_offset 72, offsetof_sigcontext_fr + 24 * 8 + .cfi_offset 73, offsetof_sigcontext_fr + 24 * 8 + 4 + .cfi_offset 74, offsetof_sigcontext_fr + 25 * 8 + .cfi_offset 75, offsetof_sigcontext_fr + 25 * 8 + 4 + .cfi_offset 76, offsetof_sigcontext_fr + 26 * 8 + .cfi_offset 77, offsetof_sigcontext_fr + 26 * 8 + 4 + .cfi_offset 78, offsetof_sigcontext_fr + 27 * 8 + .cfi_offset 79, offsetof_sigcontext_fr + 27 * 8 + 4 + .cfi_offset 80, offsetof_sigcontext_fr + 28 * 8 + .cfi_offset 81, offsetof_sigcontext_fr + 28 * 8 + 4 + .cfi_offset 82, offsetof_sigcontext_fr + 29 * 8 + .cfi_offset 83, offsetof_sigcontext_fr + 29 * 8 + 4 + .cfi_offset 84, offsetof_sigcontext_fr + 30 * 8 + .cfi_offset 85, offsetof_sigcontext_fr + 30 * 8 + 4 + .cfi_offset 86, offsetof_sigcontext_fr + 31 * 8 + .cfi_offset 87, offsetof_sigcontext_fr + 31 * 8 + 4 + + /* Record save offset of %sar */ + .cfi_offset 88, offsetof_sigcontext_sar + + /* Record save offset of return address, iaoq[0]. */ + .cfi_return_column 89 + .cfi_offset 89, offsetof_sigcontext_iaoq + + nop + +__kernel_sigtramp_rt: + ldi 0, %r25 + ldi __NR_rt_sigreturn, %r20 + be,l 0x100(%sr2, %r0), %sr0, %r31 + nop + + .cfi_endproc + .size __kernel_sigtramp_rt, . - __kernel_sigtramp_rt + .type __kernel_sigtramp_rt, @function + .globl __kernel_sigtramp_rt diff --git a/linux-user/hppa/vdso.ld b/linux-user/hppa/vdso.ld new file mode 100644 index 0000000000..b17ad974f3 --- /dev/null +++ b/linux-user/hppa/vdso.ld @@ -0,0 +1,77 @@ +/* + * Linker script for linux hppa vdso. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +VERSION { + /* + * The kernel's vdso32.lds.S attempts to export + * __kernel_sigtramp_rt32 + * __kernel_restart_syscall32 + * except that those symbols don't exist. The actual symbols are + * __kernel_sigtramp_rt + * __kernel_restart_syscall + * which means that nothing is exported at all. + * QEMU handles syscall restart internally, so we don't + * need to implement __kernel_restart_syscall at all. + */ + LINUX_5.18 { + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; + dynamic PT_DYNAMIC FLAGS(4); + note PT_NOTE FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; +} + +SECTIONS { + . =3D SIZEOF_HEADERS; + + /* The following, including the FILEHDRS and PHDRS, are modified + when we relocate the binary. We want them to be initially + writable for the relocation; we'll force them read-only after. = */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + .data : { + /* There ought not be any real read-write data. + But since we manipulated the segment layout, + we have to put these sections somewhere. */ + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load +} diff --git a/linux-user/hppa/vdso.so b/linux-user/hppa/vdso.so new file mode 100755 index 0000000000000000000000000000000000000000..e1ddd70c37e9eb6871c21d538dc= ce0a1e736a918 GIT binary patch literal 2104 zcmbtVTXR!Y6kaFkhEgcBP%l`hafWdil!Lv1RY03GNz;<1rD7>6(0JUG~~*U)EYXMdFQ(BmGb?r%x-$mIFC+3xTU<+0?(1N%-~JGte| zwo#0&1h`Mkv8G3g7ybaBfv&)R1jiYzaqu#r23QVo^SCSe7yscgz|X_x1OE;7zacM{ z)|dd5Qv4kHJ82ot+=3DCYbD;A=3D;?E| z+O@bm6U{_s6$j@&=3DK!(p?Mg~X zNxxOSx@O|YQQtBD{UyiM14~XUeXw+5*+XR~mp{DXk@8b3A6<32;<3udS3j}l$*QL=3D zd;0Qcu9&>?*|pDI^?daU>t0;{Qq9X(zY>_*^y+o5UH|&#H|#gJymiCdwbOO))W6&C z-q!cGeQ@K4jUV0g@y(xX|8&P^J3qhW%&lKEeHlC(`l|Ws@Hdf}=3D(jE3#lCMHW; zONHX9xm|@5D$=3D2%ovLNGigl^hq-yI{yLwc7k81B#i9XfQuR8at-M6W(+g0)o)qSVx zanzoDsyC(j22_8Vr_*Qt6`W`0eJzTL#S4K_@ijH9MKe`ddw-H+LR}U|=3DQy2(>V?rY z1fBH)(sj*o{IovBFBJ9<$eQLCI%^7~`+_?Ao;v%3I{KO9);;u6S9h0zzRc5gxj|&Sy_i8rNTu72w>n-mm4>KjyI4HF5rW`17r(z$)~w!;~p-Ow|1nqfFBMc>aU8q_P9)|;yMpZzCl>C4=3D|Coz%^Y;{L;DN4)bKq{t{_fJydxBhI~~zzGScmI z2Sf3Qv!HS8{Ndq3>MpVKg`CR=3Djg%cJWW-J%&ZdTk?$!c)!Bd5l*!#1i_FyVM=3D-LZ8 z*K#P6%MXoY7bs3z?98AufIVfL!8AOLCUzk+R&dYvKfl%RW1g54)&;QvFy!T2u7QF1 zMOrSt&AewX$GSF{-%SAXhIp(aT}uJz^keQAkM9EVqIJY$eh5<^kS@K|J0P>p7;oBz z?knzt#CSv_-q=3D6E=3D{Ms-0?_~K7xHZML!Ihc<@;@jdnC0XUJ;yrc(-*8a~%^8c8*D} zdE;G`CSg6AJLMeG0KnLAF#k;p-Us8y>=3D{4wf$jxe@351M-+hqjhn)DwT}TsjLrtFG t#WH69ET#p-{eR>C0pl?r>_u}nn& (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 1693350627842231.73346637584223; Tue, 29 Aug 2023 16:10:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7mp-0000h1-Rq; Tue, 29 Aug 2023 19:06:15 -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 1qb6nV-0002S4-Pm for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:53 -0400 Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nQ-0004Ad-VV for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:52 -0400 Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-7923ae72111so180923039f.0 for ; Tue, 29 Aug 2023 15:02:46 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346566; x=1693951366; 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=PALhtNLDTEQBplpEDAV9CBTQKyCRvnx9lwlRHrFIaiA=; b=zyZrwRhpOkxWUpIyiGR84QasUF3iAXz7H7HFNOup5yghWqtbX1zzNu9m/IySEZF0cL YvEqakECcyGLoVPBiNofPJYgXuG4NXvwDISIOzC4JrIk8auq8EuaAzPeNZzXlY1VDk0Q WxIiYLQX4rvyD0SFQ/QihRTiKRCfJQgVv8l3B4r2vUV6q2plLrPLTasa/tOGQ5/RNoaV BYOkjLLPAUWp7RoQAcxfUcKYWLGjllnuGZRK4gppRB/UYN4P1jK5Y23lQXrRrlP0jjgo nst527nCwkvRAm2qlKDE63AtK7J55lwWOWdNzND3txUvEeMqz5kMY6HzCRZONzolaeK9 fS6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346566; x=1693951366; 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=PALhtNLDTEQBplpEDAV9CBTQKyCRvnx9lwlRHrFIaiA=; b=QZF1890Zv7X2SbZ7xlqZ7q4h45ioVXicWIFDF2Dp3k8G81fXwf9ZWAfBEzdu1tRXiQ wfaS2B9Pca5UeKXd2kFXqaep3hQ0A861qq2LcqezP4Nl5+uTIkzEvfaztv3WstyRpYRG LzCIw/9VsP/Es+/Wsh98y+3WUue5v91kSygABAMqxG10mEBnizj7O0HkS1KD8IYp+OhL dtvNUQ+JxzYYcajR4Gl1uKsmHQX85MexhyQEY4CFAKqOQtmrHm/2lZk7syspClB1u35l VSJIweYwthKoR2oBgaOuyWW5EwACxY0fnsNNGRElKkVsXJAz0YNsOgf/Odwn/hDtXNaO sonA== X-Gm-Message-State: AOJu0Yy0pdBDpNYcKT+zEDkvL0ID5uqt/EX8vZXmlqCGxdu+uhXBdVde Aa/ojDXFyKHxcUm2WYZMGjKcl71eifTSinrfkgM= X-Google-Smtp-Source: AGHT+IHqgeQBV1NzhREUtrfHwYf3viORRCyuQ/I1tXFRRRvG2nhCtpmXD+HYn6Qm/49v3qjgubHDTw== X-Received: by 2002:a05:6602:1b14:b0:790:d813:2d38 with SMTP id dk20-20020a0566021b1400b00790d8132d38mr614519iob.11.1693346565808; Tue, 29 Aug 2023 15:02:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 16/20] linux-user/riscv: Add vdso Date: Tue, 29 Aug 2023 15:02:24 -0700 Message-Id: <20230829220228.928506-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::d36; envelope-from=richard.henderson@linaro.org; helo=mail-io1-xd36.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: 1693350629406100009 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Acked-by: Alistair Francis --- linux-user/riscv/vdso-asmoffset.h | 9 ++ linux-user/elfload.c | 4 + linux-user/riscv/signal.c | 8 ++ linux-user/meson.build | 1 + linux-user/riscv/meson.build | 30 +++++ linux-user/riscv/vdso-32.so | Bin 0 -> 2888 bytes linux-user/riscv/vdso-64.so | Bin 0 -> 3840 bytes linux-user/riscv/vdso.S | 186 ++++++++++++++++++++++++++++++ linux-user/riscv/vdso.ld | 74 ++++++++++++ 9 files changed, 312 insertions(+) create mode 100644 linux-user/riscv/vdso-asmoffset.h create mode 100644 linux-user/riscv/meson.build create mode 100755 linux-user/riscv/vdso-32.so create mode 100755 linux-user/riscv/vdso-64.so create mode 100644 linux-user/riscv/vdso.S create mode 100644 linux-user/riscv/vdso.ld diff --git a/linux-user/riscv/vdso-asmoffset.h b/linux-user/riscv/vdso-asmo= ffset.h new file mode 100644 index 0000000000..123902ef61 --- /dev/null +++ b/linux-user/riscv/vdso-asmoffset.h @@ -0,0 +1,9 @@ +#ifdef TARGET_ABI32 +# define sizeof_rt_sigframe 0x2b0 +# define offsetof_uc_mcontext 0x120 +# define offsetof_freg0 0x80 +#else +# define sizeof_rt_sigframe 0x340 +# define offsetof_uc_mcontext 0x130 +# define offsetof_freg0 0x100 +#endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index eb22a17e0e..8f902bb427 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1733,8 +1733,10 @@ static void elf_core_copy_regs(target_elf_gregset_t = *regs, =20 #ifdef TARGET_RISCV32 #define ELF_CLASS ELFCLASS32 +#include "vdso-32.c.inc" #else #define ELF_CLASS ELFCLASS64 +#include "vdso-64.c.inc" #endif =20 #define ELF_HWCAP get_elf_hwcap() @@ -1751,6 +1753,8 @@ static uint32_t get_elf_hwcap(void) #undef MISA_BIT } =20 +#define vdso_image_info() &vdso_image_info + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c index eaa168199a..5449c7618a 100644 --- a/linux-user/riscv/signal.c +++ b/linux-user/riscv/signal.c @@ -21,6 +21,7 @@ #include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" +#include "vdso-asmoffset.h" =20 /* Signal handler invocation must be transparent for the code being interrupted. Complete CPU (hart) state is saved on entry and restored @@ -37,6 +38,8 @@ struct target_sigcontext { uint32_t fcsr; }; /* cf. riscv-linux:arch/riscv/include/uapi/asm/ptrace.h */ =20 +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, fpr) !=3D offsetof_fr= eg0); + struct target_ucontext { unsigned long uc_flags; struct target_ucontext *uc_link; @@ -51,6 +54,11 @@ struct target_rt_sigframe { struct target_ucontext uc; }; =20 +QEMU_BUILD_BUG_ON(sizeof(struct target_rt_sigframe) + !=3D sizeof_rt_sigframe); +QEMU_BUILD_BUG_ON(offsetof(struct target_rt_sigframe, uc.uc_mcontext) + !=3D offsetof_uc_mcontext); + static abi_ulong get_sigframe(struct target_sigaction *ka, CPURISCVState *regs, size_t framesize) { diff --git a/linux-user/meson.build b/linux-user/meson.build index 1b265ed365..3aa967b27c 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -46,6 +46,7 @@ subdir('microblaze') subdir('mips64') subdir('mips') subdir('ppc') +subdir('riscv') subdir('s390x') subdir('sh4') subdir('sparc') diff --git a/linux-user/riscv/meson.build b/linux-user/riscv/meson.build new file mode 100644 index 0000000000..0a00cae9fd --- /dev/null +++ b/linux-user/riscv/meson.build @@ -0,0 +1,30 @@ +vdso_cmd =3D [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'riscv64-linux-user', + '-o', '@OUTPUT@', + '--', + '-nostdlib', '-shared', '-fpic', + '-Wl,-h,linux-vdso.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' +] + +vdso_32_so =3D custom_target(output: 'vdso-32.so', + input: files('vdso.S', 'vdso.ld'), + depend_files: files('vdso-asmoffset.h'), + command: vdso_cmd + ['-mabi=3Dilp32d', '-march= =3Drv32g']) + +vdso_64_so =3D custom_target(output: 'vdso-64.so', + input: files('vdso.S', 'vdso.ld'), + depend_files: files('vdso-asmoffset.h'), + command: vdso_cmd + ['-mabi=3Dlp64d', '-march= =3Drv64g']) + +vdso_32_inc =3D gen_vdso.process(vdso_32_so, extra_args: ['-r', '__vdso_rt= _sigreturn']) +vdso_64_inc =3D gen_vdso.process(vdso_64_so, extra_args: ['-r', '__vdso_rt= _sigreturn']) + +linux_user_ss.add(when: 'TARGET_RISCV32', if_true: vdso_32_inc) +linux_user_ss.add(when: 'TARGET_RISCV64', if_true: vdso_64_inc) diff --git a/linux-user/riscv/vdso-32.so b/linux-user/riscv/vdso-32.so new file mode 100755 index 0000000000000000000000000000000000000000..189e2f49e78f158cf49e6092edf= 7ece8cf7e8a25 GIT binary patch literal 2888 zcmb_eU2GIp6h5=3Dd;!>e*DVSm#Q)tD8)XjFOgkaNj+iv-BX`4b7lsMh)Zo3=3DlZnHbv zKtn88L{tQ{1rbpTD59cPKoLbD(ZobwOnmZPD<<^Y^{LDbXfEp#G@rpF=3D2!%M0Js^z)U7o@ z&HZq;Sg2rzUufRx+n9 zBt9Q)=3D9&HQMfv201A%14_`a!A7Y7zEI@ywLSorzTJ12V+qU%HPTt@Ft7)EL!k?D&^ zw<}+4YbN%viu}u&P2`jh7sm$k%Ie#i&n5L#EE-D|%4ZEdm+H?ZjC?jNTT|)$w!3&+ zKmO|^vbMc@lV0zyyBiaRxTgKF*R8+fmw%kco~r=3DZR}}7*3%~i1?~53tsQuB(-SmkaV2yTx)XXY^fmecihHlpOKF=3DkrQwDqmum_~GxH67rW^Mprtx9OhxTSdg z1{7%0%ICT!J)WlcuHHv`MjzU}<*^6$Y_(pzUDmGtJL7 zjWv!p99ngF<#Q{J)IT3Q8hF8ftoFraFV(!fbfWcm^NFUDjjuGky6V)**H)aae?9m{ z;7$LT+P9XyUGvV;$?A8PoUJ@}`}vCZZhOD%!mS@HxH$hq-$%ul=3D6+oCiTCnsbFRlQ zH$DrV9ZGDEN2(@(6CNqmwChzh$EDPx$(T2=3DD2Mpy5>4DyAsMaOC8Kv}8gg7QpT||| z>HITR;YO}VY4Og+b6oK44QjEvElV18l&G^Zt za))b7IW(4sxhUV&xL0>5zo$VZl_-Lx#mZ^4ipLeXHecLO$I&({o3-r3dB5^nA83hSVRdqbUmB&>s3@Q%^LYxK6R(E6~xrnO7- z)sc?oP(<%&Yugass1hAiViVg;Y%~+uP3N#_d}UWE(4m9*3O`=3Di=3D%^7De}6jfPeyY|%Wq^Y&rl+pOJ&m23_ULXL{jg|Mh6ml zGLB4TiQhy@0h0dDQjSb^H(Q5o9uSh<9nVsh_Si{>-hloC)=3D0x*q4O57hL9;b_2k+W<8!)f*hh+n>hr1zuVsk zJjX;6eE-aAwtWbj-y=3DNZ{0>pVIZ@UDQ+7R`dtyF(svfT=3D?g!MjNe_Yq=3Di*#1OyT)r zZC>O2{(@84(M&92P;-?}2 literal 0 HcmV?d00001 diff --git a/linux-user/riscv/vdso-64.so b/linux-user/riscv/vdso-64.so new file mode 100755 index 0000000000000000000000000000000000000000..3c3b3a8cc579649e5108402b706= bf7f741efd2e4 GIT binary patch literal 3840 zcmc&%Z){Ul6hCieP{)QF3^Uxa3^Nr8G^Lqjk%hc&>o&BEW`j7R$)jt#wQ*~k_I247 zB2(voWYYm6qJk)jf9oF<{Kq~RB_>8b>UWK3jL{hVV9yZ8LL z_r7!Q{k_}0fnZmerh$kHeuc{|0G$o<6?SC_f)1^)6rVLvjR;`tY`bnlAuhz73A)+t z0!UNb2z5|GIuxDEiEx=3D>b2gNPdG242#U zpSA9v*XR3Zyzzzu`xZ`~9bLQTL`Sl1^=3DC(}&kx4HFvg@90q;t|58p&njMj{f9#0%YLOe32Z&cw`ICJ7^nWNv&T4eP=3DGO%UAH zyKBH`@oc&gCyY{7^k?fdd_(#>e(t9#I$sS~J&%?g=3Dq#{lYOA=3D(X{%iGD}D2=3DK>blKjgOo%XutKSV#`rK(YN8tZVg^ zW%EnR^=3Da+yDeay;_l{4S_oeS2c_98^^r77k-|@)6zMYST_6KKrW;-9#A8(s$Jkct4gsk)=3DJPgg%v`Kw=3D# zw*K{XZ(Nsee)F2Qn%-`Fr{VO~@7BF{)tTC}E8nmFV8w@(A60zpK1ch3=3D6eiFD;9Z& zIrnTu7Td#90CVo@WmKPYH!)6GwpF;{$iB+5<=3Dy1tZ^uU_k&TRjM*Wp%#x}PkeCbWb zs4wj`!c-gbrF}+}9+QbkHbeT!#8505iJ_wxgZ@EWxER8-PB#~>uAGx%y$gi@iuH^6 zfb1?PFYs%zKW0h}mBZk|)1#NvyP*{Cx$p!FUpl(MaVrYnonrlR=3D#hi%Ft{AN1aH}EeVPB9fu;PfLOY!Rv z>WN=3DfzMN#e%HR80ukz?o)~h_7XT8ezpRiu#Z-_*~og>+}&y#}YaWFb>>-BHn)&WMS zZ%0R*Lr6QgE$5Yf!o7?)ZyWyZi0ok)g96A`O| zzKCHn44&a+&Jz!3S z&|OQ$7d{gFikwhnjuKDjiiFM)4I$&pxe*k9@+FbBAbrn>LS%foKME30lSuy(CwU_zLdQ5U^nIW^ugt%Wo#oEzjHP;re^7j_7}W7=3D&@OB1 QbiILp&>V6qv98Ad4M&HUy8r+H literal 0 HcmV?d00001 diff --git a/linux-user/riscv/vdso.S b/linux-user/riscv/vdso.S new file mode 100644 index 0000000000..70a4f710db --- /dev/null +++ b/linux-user/riscv/vdso.S @@ -0,0 +1,186 @@ +/* + * RISC-V linux replacement vdso. + * + * Copyright 2021 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include + +#if __riscv_xlen =3D=3D 32 +# define TARGET_ABI32 +#endif +#include "vdso-asmoffset.h" + + .text + +.macro endf name + .globl \name + .type \name, @function + .size \name, . - \name +.endm + +.macro raw_syscall nr + li a7, \nr + ecall +.endm + +.macro vdso_syscall name, nr +\name: + raw_syscall \nr +endf \name +.endm + +__vdso_gettimeofday: + .cfi_startproc +#ifdef __NR_gettimeofday + raw_syscall __NR_gettimeofday + ret +#else + /* No gettimeofday, fall back to clock_gettime64. */ + beq a1, zero, 1f + sw zero, 0(a1) /* tz->tz_minuteswest =3D 0 */ + sw zero, 4(a1) /* tz->tz_dsttime =3D 0 */ +1: addi sp, sp, -32 + .cfi_adjust_cfa_offset 32 + sw a0, 16(sp) /* save tv */ + mv a0, sp + raw_syscall __NR_clock_gettime64 + lw t0, 0(sp) /* timespec.tv_sec.low */ + lw t1, 4(sp) /* timespec.tv_sec.high */ + lw t2, 8(sp) /* timespec.tv_nsec.low */ + lw a1, 16(sp) /* restore tv */ + addi sp, sp, 32 + .cfi_adjust_cfa_offset -32 + bne a0, zero, 9f /* syscall error? */ + li a0, -EOVERFLOW + bne t1, zero, 9f /* y2038? */ + li a0, 0 + li t3, 1000 + divu t2, t2, t3 /* nsec -> usec */ + sw t0, 0(a1) /* tz->tv_sec */ + sw t2, 4(a1) /* tz->tv_usec */ +9: ret +#endif + .cfi_endproc +endf __vdso_gettimeofday + + .cfi_startproc + +#ifdef __NR_clock_gettime +vdso_syscall __vdso_clock_gettime, __NR_clock_gettime +#else +vdso_syscall __vdso_clock_gettime, __NR_clock_gettime64 +#endif + +#ifdef __NR_clock_getres +vdso_syscall __vdso_clock_getres, __NR_clock_getres +#else +vdso_syscall __vdso_clock_getres, __NR_clock_getres_time64 +#endif + +vdso_syscall __vdso_getcpu, __NR_getcpu + +__vdso_flush_icache: + /* qemu does not need to flush the icache */ + li a0, 0 + ret +endf __vdso_flush_icache + + .cfi_endproc + +/* + * Start the unwind info at least one instruction before the signal + * trampoline, because the unwinder will assume we are returning + * after a call site. + */ + + .cfi_startproc simple + .cfi_signal_frame + +#define sizeof_reg (__riscv_xlen / 4) +#define sizeof_freg 8 +#define B_GR (offsetof_uc_mcontext - sizeof_rt_sigframe) +#define B_FR (offsetof_uc_mcontext - sizeof_rt_sigframe + offsetof_freg0) + + .cfi_def_cfa 2, sizeof_rt_sigframe + + /* Return address */ + .cfi_return_column 64 + .cfi_offset 64, B_GR + 0 /* pc */ + + /* Integer registers */ + .cfi_offset 1, B_GR + 1 * sizeof_reg /* r1 (ra) */ + .cfi_offset 2, B_GR + 2 * sizeof_reg /* r2 (sp) */ + .cfi_offset 3, B_GR + 3 * sizeof_reg + .cfi_offset 4, B_GR + 4 * sizeof_reg + .cfi_offset 5, B_GR + 5 * sizeof_reg + .cfi_offset 6, B_GR + 6 * sizeof_reg + .cfi_offset 7, B_GR + 7 * sizeof_reg + .cfi_offset 8, B_GR + 8 * sizeof_reg + .cfi_offset 9, B_GR + 9 * sizeof_reg + .cfi_offset 10, B_GR + 10 * sizeof_reg + .cfi_offset 11, B_GR + 11 * sizeof_reg + .cfi_offset 12, B_GR + 12 * sizeof_reg + .cfi_offset 13, B_GR + 13 * sizeof_reg + .cfi_offset 14, B_GR + 14 * sizeof_reg + .cfi_offset 15, B_GR + 15 * sizeof_reg + .cfi_offset 16, B_GR + 16 * sizeof_reg + .cfi_offset 17, B_GR + 17 * sizeof_reg + .cfi_offset 18, B_GR + 18 * sizeof_reg + .cfi_offset 19, B_GR + 19 * sizeof_reg + .cfi_offset 20, B_GR + 20 * sizeof_reg + .cfi_offset 21, B_GR + 21 * sizeof_reg + .cfi_offset 22, B_GR + 22 * sizeof_reg + .cfi_offset 23, B_GR + 23 * sizeof_reg + .cfi_offset 24, B_GR + 24 * sizeof_reg + .cfi_offset 25, B_GR + 25 * sizeof_reg + .cfi_offset 26, B_GR + 26 * sizeof_reg + .cfi_offset 27, B_GR + 27 * sizeof_reg + .cfi_offset 28, B_GR + 28 * sizeof_reg + .cfi_offset 29, B_GR + 29 * sizeof_reg + .cfi_offset 30, B_GR + 30 * sizeof_reg + .cfi_offset 31, B_GR + 31 * sizeof_reg /* r31 */ + + .cfi_offset 32, B_FR + 0 /* f0 */ + .cfi_offset 33, B_FR + 1 * sizeof_freg /* f1 */ + .cfi_offset 34, B_FR + 2 * sizeof_freg + .cfi_offset 35, B_FR + 3 * sizeof_freg + .cfi_offset 36, B_FR + 4 * sizeof_freg + .cfi_offset 37, B_FR + 5 * sizeof_freg + .cfi_offset 38, B_FR + 6 * sizeof_freg + .cfi_offset 39, B_FR + 7 * sizeof_freg + .cfi_offset 40, B_FR + 8 * sizeof_freg + .cfi_offset 41, B_FR + 9 * sizeof_freg + .cfi_offset 42, B_FR + 10 * sizeof_freg + .cfi_offset 43, B_FR + 11 * sizeof_freg + .cfi_offset 44, B_FR + 12 * sizeof_freg + .cfi_offset 45, B_FR + 13 * sizeof_freg + .cfi_offset 46, B_FR + 14 * sizeof_freg + .cfi_offset 47, B_FR + 15 * sizeof_freg + .cfi_offset 48, B_FR + 16 * sizeof_freg + .cfi_offset 49, B_FR + 17 * sizeof_freg + .cfi_offset 50, B_FR + 18 * sizeof_freg + .cfi_offset 51, B_FR + 19 * sizeof_freg + .cfi_offset 52, B_FR + 20 * sizeof_freg + .cfi_offset 53, B_FR + 21 * sizeof_freg + .cfi_offset 54, B_FR + 22 * sizeof_freg + .cfi_offset 55, B_FR + 23 * sizeof_freg + .cfi_offset 56, B_FR + 24 * sizeof_freg + .cfi_offset 57, B_FR + 25 * sizeof_freg + .cfi_offset 58, B_FR + 26 * sizeof_freg + .cfi_offset 59, B_FR + 27 * sizeof_freg + .cfi_offset 60, B_FR + 28 * sizeof_freg + .cfi_offset 61, B_FR + 29 * sizeof_freg + .cfi_offset 62, B_FR + 30 * sizeof_freg + .cfi_offset 63, B_FR + 31 * sizeof_freg /* f31 */ + + nop + +__vdso_rt_sigreturn: + raw_syscall __NR_rt_sigreturn +endf __vdso_rt_sigreturn + + .cfi_endproc diff --git a/linux-user/riscv/vdso.ld b/linux-user/riscv/vdso.ld new file mode 100644 index 0000000000..aabe2b0ab3 --- /dev/null +++ b/linux-user/riscv/vdso.ld @@ -0,0 +1,74 @@ +/* + * Linker script for linux riscv replacement vdso. + * + * Copyright 2021 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_4.15 { + global: + __vdso_rt_sigreturn; + __vdso_gettimeofday; + __vdso_clock_gettime; + __vdso_clock_getres; + __vdso_getcpu; + __vdso_flush_icache; + + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + /* + * We can't prelink to any address without knowing something about + * the virtual memory space of the host, since that leaks over into + * the available memory space of the guest. + */ + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + .data : { + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load =3D0xd503201f +} --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693350882; cv=none; d=zohomail.com; s=zohoarc; b=PLZ9CjoBx/Is++7B3r0/pV5Do1OhlV/WAjZBBGoSaWFAoHpWx27xDfu83163ET2qTb7dCMPq/8BVctxm8MAeCHycgiKx7Iy9TK0D5PKOSY8+QGXVSvb6rjEAt//NXh+d8Youbn4hfFl3D06Xivv+AEhLy5p0zKHSnMQZkypwXC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693350882; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gyxTT+anvnZfHbyIIXF7vWiXkzp3T/0mrjFYVIbCTWA=; b=AzFGoHJHk8jo5Oc69/VGNS7ePV7AmWnH+MPog5MFkhfxuFl9lHoWLts8Z4hTQcXq/NxgOKFmzv+4TK2jDnGqdamTPd65p9vN9jpVbEGQC6z7uSY7CFAVbrUwkUVH0/pR9xwntXm1W4wwR4mTX6tQ8e0+8Sp0s77rek4DXQcs6Yo= 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 1693350882414834.5443116976354; Tue, 29 Aug 2023 16:14:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7mv-0000jL-Cp; Tue, 29 Aug 2023 19:06:21 -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 1qb6nV-0002S5-R0 for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:53 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nR-0004Ap-5V for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:53 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-68a3082c771so202742b3a.0 for ; Tue, 29 Aug 2023 15:02:48 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346567; x=1693951367; 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=gyxTT+anvnZfHbyIIXF7vWiXkzp3T/0mrjFYVIbCTWA=; b=Ve4NgooRJN//YdSEXt13yPT6OUvxHLbuoDEemyVvOi8Un9csmG0UZrMBL/19bY2GgL j5NrILe30dP1r+fEKuFegWc89Loxzv02fuaSHdOY7Y2KMv2b/YgoITiEdm6TaH7Oft5g vHrufPvUTvjFgzaUu8zMKI+u99uhx2bG7s8rr2evUwI1T0vQ9PJmJ933/b9qlRfaTKmE 8RSLMTnJ953neEknQZKxeTpJfa1wtlaS4d1X1gJpmbEbAmv7qEKo0jMHlEeqjknJgPQ7 wJXPvKj6iBqgxpYi8TJmcDaeanwwA+lusoM1mBz8gRWrjzOdNp0j6bDYiDJImbpA0aq8 mE3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346567; x=1693951367; 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=gyxTT+anvnZfHbyIIXF7vWiXkzp3T/0mrjFYVIbCTWA=; b=ZZTJVhh/R+H86crupYia71xvxL/ewd5kHHMkmPyvPgqYrtPI1MsR0QX2mCA9kYnGwR iQHLodjnPjRzzUzBJNVFmZNXA5NNkSRwE+Y5hXfF1cxwXpoS6YUfVhaL7f2BLSUJWezE MXQnZbxU6yMfB4PaG4YTwJUhdEOSrPu1zSNe3Ri0gBHqoAXZdHyWkUTcPFZFxzmBchCj a90xXPNVyzwsH344fM2BfwD0oVUjyi2QfidvD5AWGsWztPyldPQ6/VWfVe/OlMtM6Xvs sDszI6LeBvxQ2TYVnkBzIWdUw4n+CRfSEih37X4MImKsWWA74KcH2dr1naSXsUbg/Erb 0pnQ== X-Gm-Message-State: AOJu0YzmEDNa/QJMi09rzYssTKI4bP2KLMwzzg0HSTutR9h3uSIM91SV TGbtNTOfu4+XUvciOi6qFbNE2FDLRmPwucmKrdI= X-Google-Smtp-Source: AGHT+IFZwq7WLuRO/oTV9xUWNpp1OCCYrQrUeD+tZQQdDStvRM8Gzs+KsOhNgn0aiJKwDTjrgn9WBA== X-Received: by 2002:a05:6a20:7f9d:b0:12e:caac:f263 with SMTP id d29-20020a056a207f9d00b0012ecaacf263mr741930pzj.20.1693346567377; Tue, 29 Aug 2023 15:02:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu, Song Gao Subject: [PATCH v5 17/20] linux-user/loongarch64: Add vdso Date: Tue, 29 Aug 2023 15:02:25 -0700 Message-Id: <20230829220228.928506-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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: 1693350884418100006 Content-Type: text/plain; charset="utf-8" Requires a relatively recent binutils version in order to avoid spurious R_LARCH_NONE relocations. The presence of these relocs are diagnosed by our gen-vdso tool. Tested-by: Song Gao Reviewed-by: Song Gao Signed-off-by: Richard Henderson --- linux-user/loongarch64/vdso-asmoffset.h | 8 ++ linux-user/elfload.c | 4 + linux-user/loongarch64/signal.c | 17 +++- linux-user/loongarch64/meson.build | 21 ++++ linux-user/loongarch64/vdso.S | 130 ++++++++++++++++++++++++ linux-user/loongarch64/vdso.ld | 73 +++++++++++++ linux-user/loongarch64/vdso.so | Bin 0 -> 3560 bytes linux-user/meson.build | 1 + 8 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 linux-user/loongarch64/vdso-asmoffset.h create mode 100644 linux-user/loongarch64/meson.build create mode 100644 linux-user/loongarch64/vdso.S create mode 100644 linux-user/loongarch64/vdso.ld create mode 100755 linux-user/loongarch64/vdso.so diff --git a/linux-user/loongarch64/vdso-asmoffset.h b/linux-user/loongarch= 64/vdso-asmoffset.h new file mode 100644 index 0000000000..60d113822f --- /dev/null +++ b/linux-user/loongarch64/vdso-asmoffset.h @@ -0,0 +1,8 @@ +#define sizeof_rt_sigframe 0x240 +#define sizeof_sigcontext 0x110 +#define sizeof_sctx_info 0x10 + +#define offsetof_sigcontext 0x130 +#define offsetof_sigcontext_pc 0 +#define offsetof_sigcontext_gr 8 +#define offsetof_fpucontext_fr 0 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8f902bb427..877727e9e7 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1027,6 +1027,10 @@ static void elf_core_copy_regs(target_elf_gregset_t = *regs, const CPUPPCState *en =20 #define elf_check_arch(x) ((x) =3D=3D EM_LOONGARCH) =20 +#include "vdso.c.inc" + +#define vdso_image_info() &vdso_image_info + static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop) { diff --git a/linux-user/loongarch64/signal.c b/linux-user/loongarch64/signa= l.c index bb8efb1172..b9d0a4cad7 100644 --- a/linux-user/loongarch64/signal.c +++ b/linux-user/loongarch64/signal.c @@ -10,8 +10,8 @@ #include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" - #include "target/loongarch/internals.h" +#include "vdso-asmoffset.h" =20 /* FP context was used */ #define SC_USED_FP (1 << 0) @@ -23,6 +23,11 @@ struct target_sigcontext { uint64_t sc_extcontext[0] QEMU_ALIGNED(16); }; =20 +QEMU_BUILD_BUG_ON(sizeof(struct target_sigcontext) !=3D sizeof_sigcontext); +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_pc) + !=3D offsetof_sigcontext_pc); +QEMU_BUILD_BUG_ON(offsetof(struct target_sigcontext, sc_regs) + !=3D offsetof_sigcontext_gr); =20 #define FPU_CTX_MAGIC 0x46505501 #define FPU_CTX_ALIGN 8 @@ -32,6 +37,9 @@ struct target_fpu_context { uint32_t fcsr; } QEMU_ALIGNED(FPU_CTX_ALIGN); =20 +QEMU_BUILD_BUG_ON(offsetof(struct target_fpu_context, regs) + !=3D offsetof_fpucontext_fr); + #define CONTEXT_INFO_ALIGN 16 struct target_sctx_info { uint32_t magic; @@ -39,6 +47,8 @@ struct target_sctx_info { uint64_t padding; } QEMU_ALIGNED(CONTEXT_INFO_ALIGN); =20 +QEMU_BUILD_BUG_ON(sizeof(struct target_sctx_info) !=3D sizeof_sctx_info); + struct target_ucontext { abi_ulong tuc_flags; abi_ptr tuc_link; @@ -53,6 +63,11 @@ struct target_rt_sigframe { struct target_ucontext rs_uc; }; =20 +QEMU_BUILD_BUG_ON(sizeof(struct target_rt_sigframe) + !=3D sizeof_rt_sigframe); +QEMU_BUILD_BUG_ON(offsetof(struct target_rt_sigframe, rs_uc.tuc_mcontext) + !=3D offsetof_sigcontext); + /* * These two structures are not present in guest memory, are private * to the signal implementation, but are largely copied from the diff --git a/linux-user/loongarch64/meson.build b/linux-user/loongarch64/me= son.build new file mode 100644 index 0000000000..fea83312f5 --- /dev/null +++ b/linux-user/loongarch64/meson.build @@ -0,0 +1,21 @@ +vdso_so =3D custom_target(output: 'vdso.so', + input: files('vdso.S', 'vdso.ld'), + depend_files: files('vdso-asmoffset.h'), + command: [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 'loongarch64-linux-user', + '-o', '@OUTPUT@', + '--', '-nostdlib', '-shared', '-fpic', + '-Wl,-h,linux-vdso.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,--no-warn-rwx-segments', + '-Wl,-T,@INPUT1@', + '@INPUT0@' + ]) + +vdso_inc =3D gen_vdso.process(vdso_so, extra_args: ['-r', '__vdso_rt_sigre= turn']) + +linux_user_ss.add(when: 'TARGET_LOONGARCH64', if_true: vdso_inc) diff --git a/linux-user/loongarch64/vdso.S b/linux-user/loongarch64/vdso.S new file mode 100644 index 0000000000..780a5fda12 --- /dev/null +++ b/linux-user/loongarch64/vdso.S @@ -0,0 +1,130 @@ +/* + * Loongarch64 linux replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include "vdso-asmoffset.h" + + + .text + +.macro endf name + .globl \name + .type \name, @function + .size \name, . - \name +.endm + +.macro vdso_syscall name, nr +\name: + li.w $a7, \nr + syscall 0 + jr $ra +endf \name +.endm + + .cfi_startproc + +vdso_syscall __vdso_gettimeofday, __NR_gettimeofday +vdso_syscall __vdso_clock_gettime, __NR_clock_gettime +vdso_syscall __vdso_clock_getres, __NR_clock_getres +vdso_syscall __vdso_getcpu, __NR_getcpu + + .cfi_endproc + +/* + * Start the unwind info at least one instruction before the signal + * trampoline, because the unwinder will assume we are returning + * after a call site. + */ + + .cfi_startproc simple + .cfi_signal_frame + +#define B_GR offsetof_sigcontext_gr +#define B_FR sizeof_sigcontext + sizeof_sctx_info + offsetof_fpucontext_fr + + .cfi_def_cfa 2, offsetof_sigcontext + + /* Return address */ + .cfi_return_column 64 + .cfi_offset 64, offsetof_sigcontext_pc /* pc */ + + /* Integer registers */ + .cfi_offset 1, B_GR + 1 * 8 + .cfi_offset 2, B_GR + 2 * 8 + .cfi_offset 3, B_GR + 3 * 8 + .cfi_offset 4, B_GR + 4 * 8 + .cfi_offset 5, B_GR + 5 * 8 + .cfi_offset 6, B_GR + 6 * 8 + .cfi_offset 7, B_GR + 7 * 8 + .cfi_offset 8, B_GR + 8 * 8 + .cfi_offset 9, B_GR + 9 * 8 + .cfi_offset 10, B_GR + 10 * 8 + .cfi_offset 11, B_GR + 11 * 8 + .cfi_offset 12, B_GR + 12 * 8 + .cfi_offset 13, B_GR + 13 * 8 + .cfi_offset 14, B_GR + 14 * 8 + .cfi_offset 15, B_GR + 15 * 8 + .cfi_offset 16, B_GR + 16 * 8 + .cfi_offset 17, B_GR + 17 * 8 + .cfi_offset 18, B_GR + 18 * 8 + .cfi_offset 19, B_GR + 19 * 8 + .cfi_offset 20, B_GR + 20 * 8 + .cfi_offset 21, B_GR + 21 * 8 + .cfi_offset 22, B_GR + 22 * 8 + .cfi_offset 23, B_GR + 23 * 8 + .cfi_offset 24, B_GR + 24 * 8 + .cfi_offset 25, B_GR + 25 * 8 + .cfi_offset 26, B_GR + 26 * 8 + .cfi_offset 27, B_GR + 27 * 8 + .cfi_offset 28, B_GR + 28 * 8 + .cfi_offset 29, B_GR + 29 * 8 + .cfi_offset 30, B_GR + 30 * 8 + .cfi_offset 31, B_GR + 31 * 8 + + /* Floating point registers */ + .cfi_offset 32, B_FR + 0 + .cfi_offset 33, B_FR + 1 * 8 + .cfi_offset 34, B_FR + 2 * 8 + .cfi_offset 35, B_FR + 3 * 8 + .cfi_offset 36, B_FR + 4 * 8 + .cfi_offset 37, B_FR + 5 * 8 + .cfi_offset 38, B_FR + 6 * 8 + .cfi_offset 39, B_FR + 7 * 8 + .cfi_offset 40, B_FR + 8 * 8 + .cfi_offset 41, B_FR + 9 * 8 + .cfi_offset 42, B_FR + 10 * 8 + .cfi_offset 43, B_FR + 11 * 8 + .cfi_offset 44, B_FR + 12 * 8 + .cfi_offset 45, B_FR + 13 * 8 + .cfi_offset 46, B_FR + 14 * 8 + .cfi_offset 47, B_FR + 15 * 8 + .cfi_offset 48, B_FR + 16 * 8 + .cfi_offset 49, B_FR + 17 * 8 + .cfi_offset 50, B_FR + 18 * 8 + .cfi_offset 51, B_FR + 19 * 8 + .cfi_offset 52, B_FR + 20 * 8 + .cfi_offset 53, B_FR + 21 * 8 + .cfi_offset 54, B_FR + 22 * 8 + .cfi_offset 55, B_FR + 23 * 8 + .cfi_offset 56, B_FR + 24 * 8 + .cfi_offset 57, B_FR + 25 * 8 + .cfi_offset 58, B_FR + 26 * 8 + .cfi_offset 59, B_FR + 27 * 8 + .cfi_offset 60, B_FR + 28 * 8 + .cfi_offset 61, B_FR + 29 * 8 + .cfi_offset 62, B_FR + 30 * 8 + .cfi_offset 63, B_FR + 31 * 8 + + nop + +__vdso_rt_sigreturn: + li.w $a7, __NR_rt_sigreturn + syscall 0 + .cfi_endproc +endf __vdso_rt_sigreturn diff --git a/linux-user/loongarch64/vdso.ld b/linux-user/loongarch64/vdso.ld new file mode 100644 index 0000000000..682446ed0c --- /dev/null +++ b/linux-user/loongarch64/vdso.ld @@ -0,0 +1,73 @@ +/* + * Linker script for linux loongarch64 replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_5.10 { + global: + __vdso_getcpu; + __vdso_clock_getres; + __vdso_clock_gettime; + __vdso_gettimeofday; + __vdso_rt_sigreturn; + + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + /* + * We can't prelink to any address without knowing something about + * the virtual memory space of the host, since that leaks over into + * the available memory space of the guest. + */ + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + .data : { + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load =3D0xd503201f +} diff --git a/linux-user/loongarch64/vdso.so b/linux-user/loongarch64/vdso.so new file mode 100755 index 0000000000000000000000000000000000000000..bfaa26f2bfe1aaa01d9a349b8b0= 30ef6323e1f8e GIT binary patch literal 3560 zcmc&%|4$r66ra5Rj;76P?0 z*pkLHYK<{!)EKHwLri1P7+ZfbCjMajKaBm!V50tDu=3Dw8YyuH2cp)oP>9lM{I&%8Hp zXLj~8gA7MHeVQiNbm6WE5mF5|x7&qwgpg0iJ4G?pw^^Ls9SZ#nWrv<>Jc~e?al4l|Sbrr}2@GURkPzG*L^O6Z1o0 zZQxR4^6J;qwR=3DBlPwiV9O)S*Bz9|f2E}l&r6A9CtoKB?29A1Vu*s!Ds2$jnW)gtYFeN| zw>bJ9NW=3DJ%e$Dv}pkqi2l>63vMIiy&S@4|!eIB;WL6Hf?87P^7(iCi;g0dIDpM>&p zsEEUkQP?>GmCpm5hF#CW9mBBu8Q3!jcShl^eyHk$y%D(k1O&RFx)bi{fP35Ez7W*h zkWl-Tg!{jg@W2-m>eeJY_?d)#*Cagjsf7Kj5+1%P;lLFM^&d-USdnn>BMHF|B|P%J zgvR$IG`%C?(AyFoeM>^~n-UJcA>pytBpkUYq2*Nxk6)1R#Il5=3D=3DOi3klJMlMML52( z2v7a7XwT0Ej{O*3{0;c8oWtc+FKUE{_`iE4SN`5rUdj33Z0r68yRN3OAn5oGS#RAA zxJNnqpU>-#4(9V)=3D|YjCv-$qTj^5_;C64aq^QEGY{^|IovTo-4mpS`TKL77@N<+O^ zQtOucA&szjr7z6aS%us49#Q^Y-RwoakPgNa@6|8bq{!c^gXb0R)y;Pm@72d^$QRN< zVRW48Ywhi67e;^dWP7+{C>l0UD4uTZ3LAs1ZIQ5n+JZZ+5$-lRqpiJRqq`$2jIPMZ zw$_Mova@p_JeYIbQqTTIrj!agisuqHha-K=3D)30E5VcLw1ieT2v*qG!}Ds3i2FustA zO;3(l1@uLXnK2QZNX-V5v24=3Dj&5X^=3DB{JE`bSkf6#6>WXG{!Tr>4cGtqbJuy&`ivm zIHCW61+Wj=3Db9mq9?~>78U%5oIuehxiE7rcFNM5&$d|u;yjrTCtW7>b|EW`Qvyu-Mz z`lWcv&GCGWIfNX2Dkx5t@p@-uf7R^7Gf#R)doSnb^BE(xlX3qX$MevFZNKALiR1Y^ z$GBCz)hXWERNoxW=3DRZb1@3Fr}7Q_i`*mUJ*y<+5jlAoXRFg}a%boS#q>l!1CkBrv{ zkKbm67{>xV6UTec;nnP@kmrqQTE^~pKF=3D{Wdj{;yk6V`&&$7tpK1QB@&gbbaFE{%T t^8Y9M)xhXH4|s8YUVn6E (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 1693351127401948.2378974600085; Tue, 29 Aug 2023 16:18:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7n0-0000oC-KH; Tue, 29 Aug 2023 19:06:26 -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 1qb6nY-0002Sf-Dg for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:57 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nT-0004B9-6S for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:54 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-68c3b9f8333so194731b3a.1 for ; Tue, 29 Aug 2023 15:02:50 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346570; x=1693951370; 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=2CCqAI87RDUUhBj/86FgFEVxTPijNG+eDAgI8fzzqE4=; b=njXzBByrNfPcNIzYABQtSQKOABAY7ARip6bQW2G/YZ+ufCJRjM//aO4MaRWkS/hE9X XzQi+7mGXbGR75UbiI2n40v0pdBAqEOuRfpfWIifsyw0sOLg+E/sEkbECw9mMaz6dkFX VAhpaei+GsFsFA5/YicouNlq/HL+oLkbK+8Dihwcv2LiE3dw0u27goiAhOi1qYpx7mDN 4wQ/mBovpPXEU1SddpMy7JT8OsISqFj+ywPOGv3GDAYr96ZTI5l6/lhZz+LAtQxfTwtP Rrco3yHZeu8ot9vRZ7r5AplwrMzujNhN3k89TIgxQjfAzUiQU5o6aRQW22swy9tzoQlh y5gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346570; x=1693951370; 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=2CCqAI87RDUUhBj/86FgFEVxTPijNG+eDAgI8fzzqE4=; b=A51UI8hndrCsLJJJY8vHjtShX+EBPRz6e/aOakNRoErFdaIArwSoxrNix6tccnZ7zV ItbkXKrHNu7k2BT4cASsZ+x0bmXbrnySNxhHmbpuo6RFBCZ6Ot84JXQP+NhZ95IAZaNh Ac9zjhdJqcWGS53jCCnXbuiCTGy/vehaIawZpHugwzRI8D9ASMnnETtzPEgftGPe1olu +JqZKB3q+/T6MPxBvczPatRbCEQIzalCWo+eUckGm9PUKDbh2S0s44p0E3ut19+sE0al FUOCuixsLBjOj8mIXLsWaHcrg4n74N+b71+MJS8WP9nI0S9ryGpPYMWIkUTD9V08bR/b RsSw== X-Gm-Message-State: AOJu0Yz6rWoddbe35rn8k/d8mWnBW1iWLe5gWglNljHKOTqu3S+ydOiJ spRQSSEkPmqCn/IsB8owHNKhYybGHHkIEnLyJPA= X-Google-Smtp-Source: AGHT+IHVKNp4IHN1n8PG4kilG1NvexsgModqbqoefxioUasfBLw0VP3hV/Y2kbS+4EVGUjtg69uiUQ== X-Received: by 2002:a05:6a20:9381:b0:14b:3681:4e2e with SMTP id x1-20020a056a20938100b0014b36814e2emr783067pzh.17.1693346569732; Tue, 29 Aug 2023 15:02:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 18/20] linux-user/ppc: Add vdso Date: Tue, 29 Aug 2023 15:02:26 -0700 Message-Id: <20230829220228.928506-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::42c; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42c.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: 1693351128119100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/ppc/vdso-asmoffset.h | 20 +++ linux-user/elfload.c | 9 ++ linux-user/ppc/signal.c | 31 +++-- linux-user/gen-vdso-elfn.c.inc | 7 + linux-user/ppc/Makefile.vdso | 18 +++ linux-user/ppc/meson.build | 12 ++ linux-user/ppc/vdso-32.ld | 70 ++++++++++ linux-user/ppc/vdso-32.so | Bin 0 -> 3020 bytes linux-user/ppc/vdso-64.ld | 68 +++++++++ linux-user/ppc/vdso-64.so | Bin 0 -> 3896 bytes linux-user/ppc/vdso-64le.so | Bin 0 -> 3896 bytes linux-user/ppc/vdso.S | 239 ++++++++++++++++++++++++++++++++ 12 files changed, 466 insertions(+), 8 deletions(-) create mode 100644 linux-user/ppc/vdso-asmoffset.h create mode 100644 linux-user/ppc/Makefile.vdso create mode 100644 linux-user/ppc/vdso-32.ld create mode 100755 linux-user/ppc/vdso-32.so create mode 100644 linux-user/ppc/vdso-64.ld create mode 100755 linux-user/ppc/vdso-64.so create mode 100755 linux-user/ppc/vdso-64le.so create mode 100644 linux-user/ppc/vdso.S diff --git a/linux-user/ppc/vdso-asmoffset.h b/linux-user/ppc/vdso-asmoffse= t.h new file mode 100644 index 0000000000..6844c8c81c --- /dev/null +++ b/linux-user/ppc/vdso-asmoffset.h @@ -0,0 +1,20 @@ +/* + * Size of dummy stack frame allocated when calling signal handler. + * See arch/powerpc/include/asm/ptrace.h. + */ +#ifdef TARGET_ABI32 +# define SIGNAL_FRAMESIZE 64 +#else +# define SIGNAL_FRAMESIZE 128 +#endif + +#ifdef TARGET_ABI32 +# define offsetof_sigframe_mcontext 0x20 +# define offsetof_rt_sigframe_mcontext 0x140 +# define offsetof_mcontext_fregs 0xc0 +# define offsetof_mcontext_vregs 0x1d0 +#else +# define offsetof_rt_sigframe_mcontext 0xe8 +# define offsetof_mcontext_fregs 0x180 +# define offsetof_mcontext_vregs_ptr 0x288 +#endif diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 877727e9e7..cdc517952b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1015,6 +1015,15 @@ static void elf_core_copy_regs(target_elf_gregset_t = *regs, const CPUPPCState *en #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 +#ifndef TARGET_PPC64 +# include "vdso-32.c.inc" +#elif TARGET_BIG_ENDIAN +# include "vdso-64.c.inc" +#else +# include "vdso-64le.c.inc" +#endif +#define vdso_image_info() &vdso_image_info + #endif =20 #ifdef TARGET_LOONGARCH64 diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c index a616f20efb..7e7302823b 100644 --- a/linux-user/ppc/signal.c +++ b/linux-user/ppc/signal.c @@ -21,14 +21,7 @@ #include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" - -/* Size of dummy stack frame allocated when calling signal handler. - See arch/powerpc/include/asm/ptrace.h. */ -#if defined(TARGET_PPC64) -#define SIGNAL_FRAMESIZE 128 -#else -#define SIGNAL_FRAMESIZE 64 -#endif +#include "vdso-asmoffset.h" =20 /* See arch/powerpc/include/asm/ucontext.h. Only used for 32-bit PPC; on 64-bit PPC, sigcontext and mcontext are one and the same. */ @@ -73,6 +66,16 @@ struct target_mcontext { #endif }; =20 +QEMU_BUILD_BUG_ON(offsetof(struct target_mcontext, mc_fregs) + !=3D offsetof_mcontext_fregs); +#if defined(TARGET_PPC64) +QEMU_BUILD_BUG_ON(offsetof(struct target_mcontext, v_regs) + !=3D offsetof_mcontext_vregs_ptr); +#else +QEMU_BUILD_BUG_ON(offsetof(struct target_mcontext, mc_vregs) + !=3D offsetof_mcontext_vregs); +#endif + /* See arch/powerpc/include/asm/sigcontext.h. */ struct target_sigcontext { target_ulong _unused[4]; @@ -161,6 +164,7 @@ struct target_ucontext { #endif }; =20 +#if !defined(TARGET_PPC64) /* See arch/powerpc/kernel/signal_32.c. */ struct target_sigframe { struct target_sigcontext sctx; @@ -168,6 +172,10 @@ struct target_sigframe { int32_t abigap[56]; }; =20 +QEMU_BUILD_BUG_ON(offsetof(struct target_sigframe, mctx) + !=3D offsetof_sigframe_mcontext); +#endif + #if defined(TARGET_PPC64) =20 #define TARGET_TRAMP_SIZE 6 @@ -184,6 +192,10 @@ struct target_rt_sigframe { char abigap[288]; } __attribute__((aligned(16))); =20 +QEMU_BUILD_BUG_ON(offsetof(struct target_rt_sigframe, + uc.tuc_sigcontext.mcontext) + !=3D offsetof_rt_sigframe_mcontext); + #else =20 struct target_rt_sigframe { @@ -192,6 +204,9 @@ struct target_rt_sigframe { int32_t abigap[56]; }; =20 +QEMU_BUILD_BUG_ON(offsetof(struct target_rt_sigframe, uc.tuc_mcontext) + !=3D offsetof_rt_sigframe_mcontext); + #endif =20 #if defined(TARGET_PPC64) diff --git a/linux-user/gen-vdso-elfn.c.inc b/linux-user/gen-vdso-elfn.c.inc index 7034c36d5e..95856eb839 100644 --- a/linux-user/gen-vdso-elfn.c.inc +++ b/linux-user/gen-vdso-elfn.c.inc @@ -273,7 +273,14 @@ static void elfN(process)(FILE *outf, void *buf, bool = need_bswap) errors++; break; =20 + case PT_LOPROC + 3: + if (ehdr->e_machine =3D=3D EM_PPC64) { + break; /* DT_PPC64_OPT: integer bitmask */ + } + goto do_default; + default: + do_default: /* This is probably something target specific. */ fprintf(stderr, "VDSO has unknown DYNAMIC entry (%lx)\n", (unsigned long)tag); diff --git a/linux-user/ppc/Makefile.vdso b/linux-user/ppc/Makefile.vdso new file mode 100644 index 0000000000..e9d2b16839 --- /dev/null +++ b/linux-user/ppc/Makefile.vdso @@ -0,0 +1,18 @@ +CROSS_CC ?=3D powerpc64-linux-gnu-gcc + +all: vdso-32.so vdso-64.so vdso-64le.so + +LDFLAGS32 :=3D -nostdlib -shared -Wl,-T,vdso-32.ld \ + -Wl,-h,linux-vdso32.so.1 -Wl,--hash-style=3Dboth -Wl,--build-id=3Dsh= a1 +LDFLAGS64 :=3D -nostdlib -shared -Wl,-T,vdso-64.ld \ + -Wl,-h,linux-vdso64.so.1 -Wl,--hash-style=3Dboth -Wl,--build-id=3Dsh= a1 + +vdso-32.so: vdso.S vdso-32.ld vdso-asmoffset.h Makefile.vdso + $(CROSS_CC) $(LDFLAGS32) -m32 vdso.S -o $@ + +vdso-64.so: vdso.S vdso-64.ld vdso-asmoffset.h Makefile.vdso + $(CROSS_CC) $(LDFLAGS64) -mbig-endian vdso.S -o $@ + +vdso-64le.so: vdso.S vdso-64.ld vdso-asmoffset.h Makefile.vdso + $(CROSS_CC) $(LDFLAGS64) -mlittle-endian vdso.S -o $@ + diff --git a/linux-user/ppc/meson.build b/linux-user/ppc/meson.build index 19fead7bc8..5a838f182f 100644 --- a/linux-user/ppc/meson.build +++ b/linux-user/ppc/meson.build @@ -3,3 +3,15 @@ syscall_nr_generators +=3D { arguments: [ meson.current_source_dir() / 'syscallhdr.s= h', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], output: '@BASENAME@_nr.h') } + +gen32 =3D [ + gen_vdso.process('vdso-32.so', extra_args: ['-s', '__kernel_sigtramp32', + '-r', '__kernel_sigtramp_rt3= 2']), +] +linux_user_ss.add(when: 'TARGET_PPC', if_true: gen32) + +gen64 =3D [ + gen_vdso.process('vdso-64.so', extra_args: ['-r', '__kernel_sigtramp_rt6= 4']), + gen_vdso.process('vdso-64le.so', extra_args: ['-r', '__kernel_sigtramp_r= t64']) +] +linux_user_ss.add(when: 'TARGET_PPC64', if_true: gen64) diff --git a/linux-user/ppc/vdso-32.ld b/linux-user/ppc/vdso-32.ld new file mode 100644 index 0000000000..6962696540 --- /dev/null +++ b/linux-user/ppc/vdso-32.ld @@ -0,0 +1,70 @@ +/* + * Linker script for linux powerpc64 replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_2.6.15 { + global: + __kernel_gettimeofday; + __kernel_clock_gettime; + __kernel_clock_gettime64; + __kernel_clock_getres; + __kernel_time; + __kernel_sync_dicache; + __kernel_sigtramp32; + __kernel_sigtramp_rt32; + __kernel_getcpu; + local: *; + }; +} + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; /* FLAGS= =3DRWX */ + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + .data : { + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load +} diff --git a/linux-user/ppc/vdso-32.so b/linux-user/ppc/vdso-32.so new file mode 100755 index 0000000000000000000000000000000000000000..b19baafb0d38e15b4a24def5c44= a6d684714be45 GIT binary patch literal 3020 zcmbtWeQXp}5P#e27f_&s6{-a-h*%I#XbYl%a{b~XN2zU*57F)Q?%F%r-of3qv<2Um z1QRhNq7Vb7G1Z^}LI}~u5YuQA2$G0I6M`g?$RC*a2ZmczErej|%2|`C~)=3DmL~agwClu?S594u8bd8b zfqm~5&l#xt?zrckFwM4LED~%tTZ4&2xFZ;C3HW-_R)2fc-=3D=3D+Im}9|s+KLqZ?VV}N z`O;`qswL%VN4zKEHv?h6&mVGx$HT3On6G2I8B3IvI)ZI8Z0+GlXZM1xKs;Jj>W)X< zi-dPg?S@Tese6fg(PEqipU>a__~g{z#Mf5vdoKWUZ*VQ^Q#EqTFWv`YACsyTqsX-k zI@c7=3D-M9w15NZkZbI`dKgwb0sGIx87qCC~YY(u^l^odTqROT| zL54*cl3XuS=3D5ET`McKWS(?hx4G;Sx2@1hBvl$W51ahepP$vY^2J5iLTMCiT_Drl$s z+i2=3DGnii(Q5IxXJ54KQIkfsM{hMyj4riXpx*-ABAsJM=3D1*3v95J+hW&uck+9XigP9 zRzW2zY3`>M%^R}l@lPz8f5xH(A6w)ewCITsEn0ZmqD7}HDm`gY*$Iovk6E<%1B;d% zwdl$BELu8X(NphO^mM;P%igwV`C*Gzyk*fdhb(&bO^ep;x2X12i`MV8sIJeV=3Dk7|X zzay#P7fFq`ByG4U>G>ZdZM-3A({)LkuSwc+RniNWC2jpm(u)@*y>vm6c}`N(uq5A* zq~Kz-~@oI*$AOB2TZwh3x1TN<*oID>uY6dgrnZbCNufRMzSnF5U)QoWr+L-4Kh<`U! zygidL)hxn#dtRv-$NBOQ#(P%#g~I#An&kSVE@r^2_6tAnw+yVvp1CWrZN8tLsdd2D z9k>OLF&kLV;9g+PqvH=3DE{(=3DJ^ho5^+&*aa53mxmPAfETD*WUo<^G{;4YICh;-I_{F z8~pB>)vL{#de6FQb9Gg{FjslkS9rYU`kI=3DC>PEBCQ{k;PM-Lq5C>=3DEiQAUq{%l6vRUM5 zjdZ$0zIZ5UPsEazu3#)4jz&fSGa%f-klBKn9yCJ%L~115iC}jEZ{gol5kmEEA-_Ln zt`kjMBTO^F+y^Mv)b~;!bh{T+O>%wD19N?&hPmHV&z-j8xW+jj*HtN)G4gR;tJ>y1 z(8O`f%fZ}_$jAMudUPc)?}JIlEyefGZD5YW38>!n0{=3DCx!nSeTaFW$G70ilwPfTl( zZv+x?+~=3Dy-rvmGIu(MBW)Zbrl4JMgKVCqbHe@y5<^}L)9eX4qUy7DA1Iu3i+aXc@W zjo~rkcm(ra@lLpJRqqBIar!w}@;+_i?_Xm8fWJ9af7_C0mVP#)CnmTqg{%ZkNv1|DMDif%Nj)) z+SG@i^||i;3HB)Dr!rAf{TX@o{{yAc6^gQ0?s{t>&Ub_T#VA&??jrT0FQi60`-@Rj zsW^=3D~W-02{u9k!1`mJ|PoV_YnU0i;>+kW%g%Rg34j;I)dMT)~Ja?jwPd!Xu_)|yK|XHUw=3D50tEm>f$<)Bm zhQU}iT~i&%rURQq)1H=3Dt?cvRVn!u(l_(C{3Gyh04_|H7HgXWg@7wuWzH#9P)F#O@G z?mSG5r1i5A@q6@CBgZL2cDzmahJr>#IW^>HSl^5xuOk7=3DO}b&d z{aCS{D&8=3Dmz9TQdu)#bD*2~~K0VOX%>2dH6L)j3_dlBXj!h!)P&%wehEXu&*7eMv{ zq+v-4?&yQ1y|AnY?mPy|ldvKIcXh+vT~HB+l`&Wqg?l>T-UtMbLgNvrY=3DzbP;Jy}E z(+pKjaQ{=3DVb}u}z2iEO|2Y12xMtGaOJo>c_)nD1L zy>6*NdEzCxQ+{bKG$W~@!LO#uGT*x+N6GHB1HYwx*W>Z2QWR^GNGt5Q|d5GDl zA=3D{aa8S*f*aYG(qHetwTnN1q?4)RY~}#!MMuHg3vJW)r52 zGMhAIjM|!=3Dz$!=3Dz&mP{}kvt*LlxFwGB$0-wWIb6u4NZImL8v8y}K}bk2f@gtM>_+P#%fS8+OzvKMvy zr{d-n$3oHP5Md=3D4mF1paoVT#O|a<}b&Ey2}4<9@Dxy6KCcdtgp^Z&QqTDRld{t zoIO}y<-HR1ysl2?Hx~bCM(1we;LJ7-)b?!cubLyjtoNM%=3DT!UD-&T+A&0nn^T|W=3Di z@ABy5svUZd6CVAF(rLWj@aQx0phq83^~*&#bhsthyr&+|Z2Ue6H|!2KwgsCT!n;Fl zGtXgf(wK4LyXm4hFU*o!{!Kn`JDQnF+-@9M1hT_@xkx8sF2k76ES1j1MIbhuiu5I; z4#B#Jkz7Osx>EyzL?oMFJ(po+FrLXK)2SIoI3@z|M7RqxRXm)CVNGp`KrTL%Q$zTl zp#odb-@kg@seS40&#IzcX#RCsjYRD$y-)T2brGlD?StafzH)NgdbIU-q3U1nbB*Gf zidW}`8@~ee&3I`Yw;C0F9%yvyv%AngJ;!#uN|ZzOug?vQbTsOBb8716r*Wvo@6uaE z@#olf&zTU~>e(ERjwfTM$EW*u@;inobibdSV7%$~C3`RSKdl@pUY}PQ#S-*;`&adx zbLLR-cQziYW89ub=3DlyAo=3Ds555ccHGINB4h2#Vd4w$FS_4+m1;KxhP(rlN!yu4pit} ze`(nZa2_*`eAl7sC-m^P9tkJ~8vza;H z{q8yU%)K-BoV!kQYl~?Zg2fU`M7||NqwZ*!&lbcrh*G>uQ7PsiU4mDm?)K_sdN9`I z+K%Wljf<%%-N{<$r!vu);$`%>UM)4xn&Wl+oDP%U6}lDC%M~qHYqM-D!Uy%ZUR|U8 zSiAieW1ofBj`scH*7la@tux=3DQtI3pvuGN0C{_N=3D+7s+)Y-B4avDjSdBAUUGk_;WTv z`n+zJQUm3xZqxdcjM2iN%u`CduQk86Wx9=3DSgBoVlAG2!w3H{)=3Dbz2W7W_0^ao|xPD zf5bkFB}IietG|m19ebbVFM9ZM$b+~(tIcvMpzY6l?7KBTsd=3D6*y>^Ow%40vG`R_E( z-`P^lk9q9HN$fzO*ETncgrGHMKjQh_Qa8n?*z|sBDC(y+b8l4#O8w=3Dco7&Vzc5g(s zT;6-_ht($F6k6Th5$EnF2CUtK+N;pFby{&#*7w%r#=3D#v}c9ZzP?L4MY+>;oxYV z4fQ8NecV@sPDWCB7KaE84&~c4UcQwYjfd=3DTEEEhy-E6EkoeT~P+R1c%o#>Cnhep;7 zhf|6AI$tW`s}-%g+V>x{H~Q**wVQB0rsszg&R_kmZ#!zz{-XWLdxzG-#QwLxx67!H z&s?xV0Y2Fs#wPcPit162`N9)=3DYmxUU=3DT4}$*)v>b-&4p_Md9%zSEZBWw+4?Yd6 zcf&)wV9ic=3Dcn7R)fk&F*(EzM#0^fF6?}rVIQ2Vt58^3bku`eB{`@(@upF2?hnFEi1 z>OjLK2cG!Efz2N~u;n8MwqA5#+XV-n{Lq1?K5%I6xHi9{9!H(sZ?dgy)vKj*R%L{2 zS7=3DPgJqnEr*`d&ckk2SIDP*TYQ$p@lXj;g93e5<)U!ja4pH*ngkOveRH{?NuCJcE< zp-Dp?R%ptQ&nYx*$Ri5P81i|AGNyb%p)ph13XPkxOQ8u<1{In#Ww%08rVJ@GZOX7h zGp39vl(A%wLSvTfRcPFjQH3Tf8B=3DJ|l1CMqvSgn^)0XU4XvUHQ3S~-UT%psn&)bD) zz|SmDEi&ylUHCT__8EDb1umX^aEPw=3DG>7CwEm9v#=3Dbx9*(Le6c!6&vQpT zvIB?O{cXFNFlXcW#BSbcw{-g3n(du|&cZzGE*b?HKUXfib)iUU`8V|-7pSn5N@WGtnj{MU88wclqcM>5*t+Wc^mTn zWzFYbeGJK+Gq~2#cS>hNj?ep?^=3D0fMA%EH%d`_X7NU{+x;yFI&1J-O$wj|tUy%jmy znjD|=3D2I~fLLgDe*kJo|vZ{pdM{W-s|4rIOW^w+f5uE%D7K2Nje^E2DiT-~x88?&zX zoUd3f(#HJ!9EbG*?5DFfw>ht|=3DK1qC!t>{6p!`73#Qxs@HT*w@?Rnj}O<%FwpYtT^ z3=3Dgawy#6P&KYfEFoWEGNDmr)fuAe)0&Ikej-&>>OFGQ{qFP=3DYte{_cCwMCed-}T}8 WQjSr;8y}D^=3D0BklzBu&{{(k}Ee8OG; literal 0 HcmV?d00001 diff --git a/linux-user/ppc/vdso.S b/linux-user/ppc/vdso.S new file mode 100644 index 0000000000..d035a020f9 --- /dev/null +++ b/linux-user/ppc/vdso.S @@ -0,0 +1,239 @@ +/* + * PowerPC linux replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include + +#ifndef _ARCH_PPC64 +# define TARGET_ABI32 +#endif +#include "vdso-asmoffset.h" + + + .text + +.macro endf name + .globl \name + .size \name, .-\name + /* For PPC64, functions have special linkage; we export pointers. */ +#ifndef _ARCH_PPC64 + .type \name, @function +#endif +.endm + +.macro raw_syscall nr + addi 0, 0, \nr + sc +.endm + +.macro vdso_syscall name, nr +\name: + raw_syscall \nr + blr +endf \name +.endm + + .cfi_startproc + +vdso_syscall __kernel_gettimeofday, __NR_gettimeofday +vdso_syscall __kernel_clock_gettime, __NR_clock_gettime +vdso_syscall __kernel_clock_getres, __NR_clock_getres +vdso_syscall __kernel_getcpu, __NR_getcpu +vdso_syscall __kernel_time, __NR_time + +#ifdef __NR_clock_gettime64 +vdso_syscall __kernel_clock_gettime64, __NR_clock_gettime64 +#endif + +__kernel_sync_dicache: + /* qemu does not need to flush caches */ + blr +endf __kernel_sync_dicache + + .cfi_endproc + +/* + * TODO: __kernel_get_tbfreq + * This is probably a constant for QEMU. + */ + +/* + * Start the unwind info at least one instruction before the signal + * trampoline, because the unwinder will assume we are returning + * after a call site. + */ + + .cfi_startproc simple + .cfi_signal_frame + +#ifdef _ARCH_PPC64 +# define __kernel_sigtramp_rt __kernel_sigtramp_rt64 +# define sizeof_reg 8 +#else +# define __kernel_sigtramp_rt __kernel_sigtramp_rt32 +# define sizeof_reg 4 +#endif +#define sizeof_freg 8 +#define sizeof_vreg 16 + + .cfi_def_cfa 1, SIGNAL_FRAMESIZE + offsetof_rt_sigframe_mcontext + + /* Return address */ + .cfi_return_column 67 + .cfi_offset 67, 32 * sizeof_reg /* nip */ + + /* Integer registers */ + .cfi_offset 0, 0 * sizeof_reg + .cfi_offset 1, 1 * sizeof_reg + .cfi_offset 2, 2 * sizeof_reg + .cfi_offset 3, 3 * sizeof_reg + .cfi_offset 4, 4 * sizeof_reg + .cfi_offset 5, 5 * sizeof_reg + .cfi_offset 6, 6 * sizeof_reg + .cfi_offset 7, 7 * sizeof_reg + .cfi_offset 8, 8 * sizeof_reg + .cfi_offset 9, 9 * sizeof_reg + .cfi_offset 10, 10 * sizeof_reg + .cfi_offset 11, 11 * sizeof_reg + .cfi_offset 12, 12 * sizeof_reg + .cfi_offset 13, 13 * sizeof_reg + .cfi_offset 14, 14 * sizeof_reg + .cfi_offset 15, 15 * sizeof_reg + .cfi_offset 16, 16 * sizeof_reg + .cfi_offset 17, 17 * sizeof_reg + .cfi_offset 18, 18 * sizeof_reg + .cfi_offset 19, 19 * sizeof_reg + .cfi_offset 20, 20 * sizeof_reg + .cfi_offset 21, 21 * sizeof_reg + .cfi_offset 22, 22 * sizeof_reg + .cfi_offset 23, 23 * sizeof_reg + .cfi_offset 24, 24 * sizeof_reg + .cfi_offset 25, 25 * sizeof_reg + .cfi_offset 26, 26 * sizeof_reg + .cfi_offset 27, 27 * sizeof_reg + .cfi_offset 28, 28 * sizeof_reg + .cfi_offset 29, 29 * sizeof_reg + .cfi_offset 30, 30 * sizeof_reg + .cfi_offset 31, 31 * sizeof_reg + .cfi_offset 65, 36 * sizeof_reg /* lr */ + .cfi_offset 70, 38 * sizeof_reg /* ccr */ + + /* Floating point registers */ + .cfi_offset 32, offsetof_mcontext_fregs + .cfi_offset 33, offsetof_mcontext_fregs + 1 * sizeof_freg + .cfi_offset 34, offsetof_mcontext_fregs + 2 * sizeof_freg + .cfi_offset 35, offsetof_mcontext_fregs + 3 * sizeof_freg + .cfi_offset 36, offsetof_mcontext_fregs + 4 * sizeof_freg + .cfi_offset 37, offsetof_mcontext_fregs + 5 * sizeof_freg + .cfi_offset 38, offsetof_mcontext_fregs + 6 * sizeof_freg + .cfi_offset 39, offsetof_mcontext_fregs + 7 * sizeof_freg + .cfi_offset 40, offsetof_mcontext_fregs + 8 * sizeof_freg + .cfi_offset 41, offsetof_mcontext_fregs + 9 * sizeof_freg + .cfi_offset 42, offsetof_mcontext_fregs + 10 * sizeof_freg + .cfi_offset 43, offsetof_mcontext_fregs + 11 * sizeof_freg + .cfi_offset 44, offsetof_mcontext_fregs + 12 * sizeof_freg + .cfi_offset 45, offsetof_mcontext_fregs + 13 * sizeof_freg + .cfi_offset 46, offsetof_mcontext_fregs + 14 * sizeof_freg + .cfi_offset 47, offsetof_mcontext_fregs + 15 * sizeof_freg + .cfi_offset 48, offsetof_mcontext_fregs + 16 * sizeof_freg + .cfi_offset 49, offsetof_mcontext_fregs + 17 * sizeof_freg + .cfi_offset 50, offsetof_mcontext_fregs + 18 * sizeof_freg + .cfi_offset 51, offsetof_mcontext_fregs + 19 * sizeof_freg + .cfi_offset 52, offsetof_mcontext_fregs + 20 * sizeof_freg + .cfi_offset 53, offsetof_mcontext_fregs + 21 * sizeof_freg + .cfi_offset 54, offsetof_mcontext_fregs + 22 * sizeof_freg + .cfi_offset 55, offsetof_mcontext_fregs + 23 * sizeof_freg + .cfi_offset 56, offsetof_mcontext_fregs + 24 * sizeof_freg + .cfi_offset 57, offsetof_mcontext_fregs + 25 * sizeof_freg + .cfi_offset 58, offsetof_mcontext_fregs + 26 * sizeof_freg + .cfi_offset 59, offsetof_mcontext_fregs + 27 * sizeof_freg + .cfi_offset 60, offsetof_mcontext_fregs + 28 * sizeof_freg + .cfi_offset 61, offsetof_mcontext_fregs + 29 * sizeof_freg + .cfi_offset 62, offsetof_mcontext_fregs + 30 * sizeof_freg + .cfi_offset 63, offsetof_mcontext_fregs + 31 * sizeof_freg + + /* + * Unlike the kernel, unconditionally represent the Altivec/VSX regs. + * The space within the stack frame is always available, and most of + * our supported processors have them enabled. The only complication + * for PPC64 is the misalignment, so that we have to use indirection. + */ +.macro save_vreg_ofs reg, ofs +#ifdef _ARCH_PPC64 + /* + * vreg =3D *(cfa + offsetof(v_regs)) + ofs + *=20 + * The CFA is input to the expression on the stack, so: + * DW_CFA_expression reg, length (7), + * DW_OP_plus_uconst (0x23), vreg_ptr, DW_OP_deref (0x06), + * DW_OP_plus_uconst (0x23), ofs + */ + .cfi_escape 0x10, 77 + \reg, 7, 0x23, (offsetof_mcontext_vregs_ptr & 0x7f= ) + 0x80, offsetof_mcontext_vregs_ptr >> 7, 0x06, 0x23, (\ofs & 0x7f) | 0x8= 0, \ofs >> 7 +#else + .cfi_offset 77 + \reg, offsetof_mcontext_vregs + \ofs +#endif +.endm + +.macro save_vreg reg + save_vreg_ofs \reg, (\reg * sizeof_vreg) +.endm + + save_vreg 0 + save_vreg 1 + save_vreg 2 + save_vreg 3 + save_vreg 4 + save_vreg 5 + save_vreg 6 + save_vreg 7 + save_vreg 8 + save_vreg 9 + save_vreg 10 + save_vreg 11 + save_vreg 12 + save_vreg 13 + save_vreg 14 + save_vreg 15 + save_vreg 16 + save_vreg 17 + save_vreg 18 + save_vreg 19 + save_vreg 20 + save_vreg 21 + save_vreg 22 + save_vreg 23 + save_vreg 24 + save_vreg 25 + save_vreg 26 + save_vreg 27 + save_vreg 28 + save_vreg 29 + save_vreg 30 + save_vreg 31 + save_vreg 32 + save_vreg_ofs 33, (32 * sizeof_vreg + 12) + + nop + +__kernel_sigtramp_rt: + raw_syscall __NR_rt_sigreturn +endf __kernel_sigtramp_rt + +#ifndef _ARCH_PPC64 + /* + * The non-rt sigreturn has the same layout at a different offset. + * Move the CFA and leave all othe other descriptions the same. + */ + .cfi_def_cfa 1, SIGNAL_FRAMESIZE + offsetof_sigframe_mcontext + nop +__kernel_sigtramp32: + raw_syscall __NR_sigreturn +endf __kernel_sigtramp32 +#endif + + .cfi_endproc --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351812; cv=none; d=zohomail.com; s=zohoarc; b=HEqmHLmSknmOKyR75ADpW4jkhk3FGh9wsDR47sAb/3x6p0rd6G84SVQdO4RKsaGO7VV+ULCtejLKQWgWpecsGGpnfQXNiZiv/Q51XCQXXnV3bJ1geOl8G68+kz/d/kXfY5FXs85Qw1lQovGEl9M2tcdih7QVo8XuLu6PYrT6GPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351812; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6RKu2/5G+zSGtoRuicJK2UTVps/EcNkegXQWs2RCjrs=; b=Ptm2zaun49hUOkNKEeKRFzg+s4lEl0crbsfCcBzbDvIc6UFc7zeHdO4jldMdqvu/ryGiCTkDmMNgWkEnUU6+EgzvXxZorscOCb5PsXA2KbEYXnJr63BECbAMBytsy7uvGyFjC5UEs3qGkST1IpvqPUxbXfbfpBbnHOQEnYwEq1Q= 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 1693351812219100.00475298899835; Tue, 29 Aug 2023 16:30:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7ov-0003GD-KI; Tue, 29 Aug 2023 19:08:25 -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 1qb6nY-0002Sg-Eq for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:57 -0400 Received: from mail-oo1-xc2c.google.com ([2607:f8b0:4864:20::c2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nV-0004BQ-Ic for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:55 -0400 Received: by mail-oo1-xc2c.google.com with SMTP id 006d021491bc7-57128297bd7so3168628eaf.0 for ; Tue, 29 Aug 2023 15:02:52 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346572; x=1693951372; 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=6RKu2/5G+zSGtoRuicJK2UTVps/EcNkegXQWs2RCjrs=; b=oWlqfU2hZ+kWwQQlvK1SVEH/+RFgewXJG91jsLi2bQgXqwSOfylnYelmr9dIXF347j T+peIJGMLR1m0lI2P/H9eQraU60z3nzvFwwDDinyHhBU80gX6LNUiwweQaa5+jlR2LP5 HF+5yfzT8rWUnFoEWq8GnF/Fr9b89/Kzjxgxqnsw+trpiP0bPIfoXmIe0OE3yExiWsrX qqPpq8km6EetFOfl6FaVoonAzoIba19AtNJ6/R7rN31MMQPl1j5dzXazbg5HZTjEDTWC s5GSSC8yxHXCBouXG9bcCHwHHJSb2kWvngKIx1PsM8WWL9MXioOKXmnobtUjEPD1rCtS 7keg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346572; x=1693951372; 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=6RKu2/5G+zSGtoRuicJK2UTVps/EcNkegXQWs2RCjrs=; b=LXWR4KiwAaWp5IMFHEVMQs0RbY2zQkOe3SeAoWGWI9LdAcYQZjS+wmOJTuw9a4CVaM QWOktV+CvmD1QWyS0e/U5O1myHYcLFL2nfxwdgGcpByfa6FdLtOylWKRbDbiPCjWZcWf m5ZQHw/lVxVEi5pRwxL/teGGYNFgge2gzQiDplTXfLX6rTMGc3AJfnnt6PlOqh5Xc8Cf RDYuyNw5q5DGvTWxy1XPuzOk5edLt3kOiJLRpyyzHIRuJdA8lpL+8S97WlXdo8MXwFRQ GN4oEtjjYQf6fxWLM1+IdjsIBTgr0WP+CH36L0gqw6o7tNnlj74LvpBimtvVl+CgSeIR JWCw== X-Gm-Message-State: AOJu0YyJiMJvGb3nqvkE3J6oyBFM+qezd2vTfk6U5bMKDHRUuXXZLT9g t7Ywwn/9sp1R0G9cW1By67PLl4eMTSkyDQTPYUc= X-Google-Smtp-Source: AGHT+IG38/WlVYgcPqjOb0ZTghM/dFfHd8DlLqah0bD/PeZEWnaz8ZqRg2E5POoA+2OWYVyxOAwljA== X-Received: by 2002:a05:6808:14d5:b0:3a8:5207:1d88 with SMTP id f21-20020a05680814d500b003a852071d88mr528428oiw.49.1693346572019; Tue, 29 Aug 2023 15:02:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 19/20] linux-user/s390x: Rename __SIGNAL_FRAMESIZE to STACK_FRAME_OVERHEAD Date: Tue, 29 Aug 2023 15:02:27 -0700 Message-Id: <20230829220228.928506-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::c2c; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc2c.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: 1693351813365100015 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/s390x/signal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index f72165576f..0f8b8e04bf 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -26,7 +26,8 @@ #define __NUM_FPRS 16 #define __NUM_ACRS 16 =20 -#define __SIGNAL_FRAMESIZE 160 /* FIXME: 31-bit mode -> 96 */ +/* Minimum stack frame size */ +#define STACK_FRAME_OVERHEAD 160 =20 #define _SIGCONTEXT_NSIG 64 #define _SIGCONTEXT_NSIG_BPW 64 /* FIXME: 31-bit mode -> 32 */ @@ -63,7 +64,7 @@ typedef struct { } target_sigcontext; =20 typedef struct { - uint8_t callee_used_stack[__SIGNAL_FRAMESIZE]; + uint8_t callee_used_stack[STACK_FRAME_OVERHEAD]; target_sigcontext sc; target_sigregs sregs; int signo; @@ -83,7 +84,7 @@ struct target_ucontext { }; =20 typedef struct { - uint8_t callee_used_stack[__SIGNAL_FRAMESIZE]; + uint8_t callee_used_stack[STACK_FRAME_OVERHEAD]; /* * This field is no longer initialized by the kernel, but it's still a= part * of the ABI. --=20 2.34.1 From nobody Wed May 15 22:34:40 2024 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=1693351340; cv=none; d=zohomail.com; s=zohoarc; b=Q2i/4P6nbR0Xa0I5A2upmuttFvZHtWZiaDdTUFEUSwZihGiHcpPY7izdSVrLLIPWKOKHOQwhOmk3abeKyy7C5xidtLtvqLq/u/A9Ymj2TyXDIAqiLVRxtdzzqIMKA9kaSD43K8FoiITQgMWd3UCiaEeWuw8/ZUpWq8CxRBn6boc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693351340; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7re6yj1S+h9m9uCUehUb99ACWmViioN0zk7S4xxmMv0=; b=RKD9kjSFZ270bAIthkDG9omT7e+yNOUglv/bREjHyNC62+BbmW5u1/0sjtvzt1sgOynnMJ7gdtIWLhonjtCA/QVoK1SPnPMzBVYgwdQ/dcylrTRaFWEA2DBWpxsCYEOXjST5QJqxMW3S+fWZ4Gj9DGK2yWUZSsX0kIPGissHlLQ= 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 169335134095067.70679613528716; Tue, 29 Aug 2023 16:22:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb7p6-0003oC-MG; Tue, 29 Aug 2023 19:08:37 -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 1qb6nY-0002Sh-IR for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:57 -0400 Received: from mail-oi1-x22b.google.com ([2607:f8b0:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb6nV-0004BX-PO for qemu-devel@nongnu.org; Tue, 29 Aug 2023 18:02:56 -0400 Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-3a44cccbd96so3408034b6e.3 for ; Tue, 29 Aug 2023 15:02:53 -0700 (PDT) Received: from stoup.. ([71.212.131.115]) by smtp.gmail.com with ESMTPSA id b28-20020a63715c000000b0056606274e54sm9538196pgn.31.2023.08.29.15.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 15:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693346573; x=1693951373; 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=7re6yj1S+h9m9uCUehUb99ACWmViioN0zk7S4xxmMv0=; b=Kg2F06PQwRp6FunoNziUv96e3wrrtpJjHEcDCtnZSvBYpeHPKfay4DoAjjVybtk6Ud brDgX0b6WM34BsMfABKTM+Hh/GOTZ0SrjkSMS90FGWOnsHdv6bS4yklKkpg+MlO9ScoO rNAuryKa1zeuLvyfLLu8ek9RFHVHkMYtFTDITz0Bdssf+tyPra4oC7BdurUc7yvrEqQj X3OMA4IGKNakUHpJf0FNCYeGTA7Ry+whoRiUbKcRRyLfoffhwGTsNaOrUI/wBkpImEop 5FxNjRvwNv/nlBbPU3xLtfxwHqrmbHS/7Y/rpb6V1iqWCW7SPUv5DGfQEhXbEIYQSATY 04ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693346573; x=1693951373; 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=7re6yj1S+h9m9uCUehUb99ACWmViioN0zk7S4xxmMv0=; b=PY55O9J82G2REtDC1s74OfWdI/G+qjl0X0RJGmZzzlokhGlgdmmofXvBmr8MxP4o6Y Ta0LibDm6Y3+TJN6LRx5qfdPbrb5T56yFiahX8BOHjz1g9Pzuqf8lVyq48eR3kaVxKcN aLi61QNediYcr1+47sfYyuAQqn7UJdwyivRlf4YMma5H2Z4MiiiW8kUc4GMIo1fgOXcf IySBsXJaqPOHBngAAqdxUozDPqq9xVBPqiPYTFnaMby45iUwcyPY+qhhSUvUcb6h+STr prwK5jvUIlABElr2CaSoiQlVCy9hMCVTcG5BRS6DNJb1Yn3QHy1v1Gwzf6UT+H4LSmbn ghTw== X-Gm-Message-State: AOJu0YzWFxu/0pBeWuivnX4WIrAaTElQuZ4jucCnXzXoQH4H22EFGtni f/zl8pAdhx+QJe2VSi9XcJIOmHC7YDEgBnBswHI= X-Google-Smtp-Source: AGHT+IGUfNfGUEIgraQ9O01gOkT1G9TmQFzyFXpa9ObtSZUVp2Qccb0jLZXN7huH94frRprzsQO+Fg== X-Received: by 2002:a05:6808:2d7:b0:3a8:8ab1:57ff with SMTP id a23-20020a05680802d700b003a88ab157ffmr337400oid.45.1693346572730; Tue, 29 Aug 2023 15:02:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, laurent@vivier.eu Subject: [PATCH v5 20/20] linux-user/s390x: Add vdso Date: Tue, 29 Aug 2023 15:02:28 -0700 Message-Id: <20230829220228.928506-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230829220228.928506-1-richard.henderson@linaro.org> References: <20230829220228.928506-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::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.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: 1693351342304100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson --- linux-user/s390x/vdso-asmoffset.h | 2 + linux-user/elfload.c | 3 ++ linux-user/s390x/signal.c | 4 +- linux-user/s390x/meson.build | 24 +++++++++++ linux-user/s390x/vdso.S | 61 ++++++++++++++++++++++++++ linux-user/s390x/vdso.ld | 69 ++++++++++++++++++++++++++++++ linux-user/s390x/vdso.so | Bin 0 -> 3464 bytes 7 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 linux-user/s390x/vdso-asmoffset.h create mode 100644 linux-user/s390x/vdso.S create mode 100644 linux-user/s390x/vdso.ld create mode 100755 linux-user/s390x/vdso.so diff --git a/linux-user/s390x/vdso-asmoffset.h b/linux-user/s390x/vdso-asmo= ffset.h new file mode 100644 index 0000000000..27a062d6c1 --- /dev/null +++ b/linux-user/s390x/vdso-asmoffset.h @@ -0,0 +1,2 @@ +/* Minimum stack frame size */ +#define STACK_FRAME_OVERHEAD 160 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index cdc517952b..19503d8469 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1737,6 +1737,9 @@ static void elf_core_copy_regs(target_elf_gregset_t *= regs, #define USE_ELF_CORE_DUMP #define ELF_EXEC_PAGESIZE 4096 =20 +#include "vdso.c.inc" +#define vdso_image_info() &vdso_image_info + #endif /* TARGET_S390X */ =20 #ifdef TARGET_RISCV diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index 0f8b8e04bf..b40f738a70 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -21,14 +21,12 @@ #include "user-internals.h" #include "signal-common.h" #include "linux-user/trace.h" +#include "vdso-asmoffset.h" =20 #define __NUM_GPRS 16 #define __NUM_FPRS 16 #define __NUM_ACRS 16 =20 -/* Minimum stack frame size */ -#define STACK_FRAME_OVERHEAD 160 - #define _SIGCONTEXT_NSIG 64 #define _SIGCONTEXT_NSIG_BPW 64 /* FIXME: 31-bit mode -> 32 */ #define _SIGCONTEXT_NSIG_WORDS (_SIGCONTEXT_NSIG / _SIGCONTEXT_NSIG_BPW) diff --git a/linux-user/s390x/meson.build b/linux-user/s390x/meson.build index 0781ccea1d..09afd98deb 100644 --- a/linux-user/s390x/meson.build +++ b/linux-user/s390x/meson.build @@ -3,3 +3,27 @@ syscall_nr_generators +=3D { arguments: [ meson.current_source_dir() / 'syscallhdr= .sh', '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@' ], output: '@BASENAME@_nr.h') } + +vdso_so =3D custom_target(output: 'vdso.so', + input: files('vdso.S', 'vdso.ld'), + depend_files: files('vdso-asmoffset.h'), + command: [ + build_vdso_cmd, + '-B', meson.project_build_root(), + '-C', meson.current_source_dir(), + '-T', 's390x-linux-user', + '-o', '@OUTPUT@', + '--', '-nostdlib', '-shared', + '-Wl,-h,linux-vdso64.so.1', + '-Wl,--build-id=3Dsha1', + '-Wl,--hash-style=3Dboth', + '-Wl,-T,@INPUT1@', + '@INPUT0@' + ]) + +vdso_inc =3D gen_vdso.process('vdso.so', extra_args: [ + '-s', '__kernel_sigreturn', + '-r', '__kernel_rt_sigreturn' + ]) + +linux_user_ss.add(when: 'TARGET_S390X', if_true: vdso_inc) diff --git a/linux-user/s390x/vdso.S b/linux-user/s390x/vdso.S new file mode 100644 index 0000000000..3332492477 --- /dev/null +++ b/linux-user/s390x/vdso.S @@ -0,0 +1,61 @@ +/* + * s390x linux replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include "vdso-asmoffset.h" + +.macro endf name + .globl \name + .type \name, @function + .size \name, . - \name +.endm + +.macro raw_syscall n + .ifne \n < 0x100 + svc \n + .else + lghi %r1, \n + svc 0 + .endif +.endm + +.macro vdso_syscall name, nr +\name: + .cfi_startproc + aghi %r15, -(STACK_FRAME_OVERHEAD + 16) + .cfi_adjust_cfa_offset STACK_FRAME_OVERHEAD + 16 + stg %r14, STACK_FRAME_OVERHEAD(%r15) + .cfi_rel_offset %r14, STACK_FRAME_OVERHEAD + raw_syscall \nr + lg %r14, STACK_FRAME_OVERHEAD(%r15) + aghi %r15, STACK_FRAME_OVERHEAD + 16 + .cfi_restore %r14 + .cfi_adjust_cfa_offset -(STACK_FRAME_OVERHEAD + 16) + br %r14 + .cfi_endproc +endf \name +.endm + +vdso_syscall __kernel_gettimeofday, __NR_gettimeofday +vdso_syscall __kernel_clock_gettime, __NR_clock_gettime +vdso_syscall __kernel_clock_getres, __NR_clock_getres +vdso_syscall __kernel_getcpu, __NR_getcpu + +/* + * TODO unwind info, though we're ok without it. + * The kernel supplies bogus empty unwind info, and it is likely ignored + * by all users. Without it we get the fallback signal frame handling. + */ + +__kernel_sigreturn: + raw_syscall __NR_sigreturn +endf __kernel_sigreturn + +__kernel_rt_sigreturn: + raw_syscall __NR_rt_sigreturn +endf __kernel_rt_sigreturn diff --git a/linux-user/s390x/vdso.ld b/linux-user/s390x/vdso.ld new file mode 100644 index 0000000000..2a30ff382a --- /dev/null +++ b/linux-user/s390x/vdso.ld @@ -0,0 +1,69 @@ +/* + * Linker script for linux x86-64 replacement vdso. + * + * Copyright 2023 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +VERSION { + LINUX_2.6.29 { + global: + __kernel_gettimeofday; + __kernel_clock_gettime; + __kernel_clock_getres; + __kernel_getcpu; + __kernel_restart_syscall; + __kernel_rt_sigreturn; + __kernel_sigreturn; + local: *; + }; +} + + +PHDRS { + phdr PT_PHDR FLAGS(4) PHDRS; + load PT_LOAD FLAGS(7) FILEHDR PHDRS; /* FLAGS= =3DRWX */ + dynamic PT_DYNAMIC FLAGS(4); + eh_frame_hdr PT_GNU_EH_FRAME; + note PT_NOTE FLAGS(4); +} + +SECTIONS { + . =3D SIZEOF_HEADERS; + + /* + * The following, including the FILEHDRS and PHDRS, are modified + * when we relocate the binary. We want them to be initially + * writable for the relocation; we'll force them read-only after. + */ + .note : { *(.note*) } :load :note + .dynamic : { *(.dynamic) } :load :dynamic + .dynsym : { *(.dynsym) } :load + .data : { + /* + * There ought not be any real read-write data. + * But since we manipulated the segment layout, + * we have to put these sections somewhere. + */ + *(.data*) + *(.sdata*) + *(.got.plt) *(.got) + *(.gnu.linkonce.d.*) + *(.bss*) + *(.dynbss*) + *(.gnu.linkonce.b.*) + } + + .rodata : { *(.rodata*) } + .hash : { *(.hash) } + .gnu.hash : { *(.gnu.hash) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .eh_frame_hdr : { *(.eh_frame_hdr) } :load :eh_frame_hdr + .eh_frame : { *(.eh_frame) } :load + + .text : { *(.text*) } :load +} diff --git a/linux-user/s390x/vdso.so b/linux-user/s390x/vdso.so new file mode 100755 index 0000000000000000000000000000000000000000..64130f6f335269b03291653d006= 225b365be9cd9 GIT binary patch literal 3464 zcmcguUuaup6hAlrn#R#}B6HHJ6^h8v3s#wtDI{HzWs-HJcB~u1U2JZX*fw`0w>2I9 z>4SqkSsXs>VMq|PDvEm&1Rwf1RK!O?(CHKhzDz`4)-9g%edpXip_vbYU-<6tJHKy{lI$0|t_^w-9%V;CvX_ZVV@~UP z5ysh1P<-w|K6-fSIDGtl`ke<)|Mc0}bJcWb@yj2!fBy7s_8}PJ^{b5Jk0Yw$Io;cT zvAm@bv#$o5>1TjUWL@)+V!Xt77o&O(PPe!{_5F56Dq|HugaG54H=3D!y#f0xtl;=3D^ z{(|Oe9c6~jI}MdzM5-AY|8oAd5niPp<$=3Dq-bPi}udYXw&GFgmg;C+@!7ys^{eeuHj z*T4PgtbX)Xd*k=3D9hda69Q>Wkk@x$ybu&hP9*|3+as_nYLm7yGF<^c5IqMK$gD%EM^dJJ&HRX_=3DUlHe3oHd-=3D zIM1UMJ^v4I(xAP;I6DJId&n5swY$R)f#T6@HFFH}{sl84Bv3LERZ;$NK58 z{sq)6-9i5f>gc{kWqnFM;93k>t zPf{jYi+obAVwW^}{2=3DpE|4KxA?w|60@a(yd##JBHtcojrD!7kfczq<42ikk5{qOhf zLwR_@?>o{q)cHH)^P&ED(&rPwe&_gnsNbFI)9)_$_Mtxep3ldxa1KVn%AK6b9zAjh zOC8^LR=3D#KzX0k`~RxvjN*5T5z$!y6wRwz85pS5PQlcl`n_k`ZI;q{zQa|v~hox4`3 zdw3>(zwsz90(Cq9v$eMDmS044n;L7fYB;V9W@W8WUarrp1=3D=3DE(-7=3DWf#)?@hw`!Vq zo0?g*o2|Oj2nkjNOuJ?+G|S7jRjZ(-NMO2l+m)mAUvLDS<$WUcH>WrB>T|p&K(J6A zLY*8iECCvFZapMYV$hoF3cmya_T!ZA42~~#E(lv_L;l=3D1Jb$XEi2%>>r49tu`x(u=3D zA@PZzo*QQk$Cth#sCp{ztt`c#Fpb|mfA{!rX*tRW8I*VOC$q_bj^j&u1tHXb&|dOD z{?B3jE-i3~KihkKi}DYWds%Kr-5;5sp;iO3^}^sP;K oq#^O?{L#B0m|N2GNEUhVg)ofre@WbfvycCv+~*tYC*b-21AbI{0ssI2 literal 0 HcmV?d00001 --=20 2.34.1