From patchwork Tue May 18 05:31:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1479983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FklcW54KKz9sWk for ; Tue, 18 May 2021 15:56:27 +1000 (AEST) Received: from localhost ([::1]:51098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lisiP-0002IT-P0 for incoming@patchwork.ozlabs.org; Tue, 18 May 2021 01:56:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKy-0008G1-SK for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:12 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:39211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKu-0007Fg-5A for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:12 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MPXMa-1m4Ew20b7C-00Mfmm; Tue, 18 May 2021 07:32:04 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 59/59] linux-user/elfload: add s390x core dumping support Date: Tue, 18 May 2021 07:31:31 +0200 Message-Id: <20210518053131.87212-60-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518053131.87212-1-laurent@vivier.eu> References: <20210518053131.87212-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:UB0M8/AP8+vEhOxNroUTuVpihz2jCsPzOFXihu/f7YfZK0U33Ko AvxbOPK2MtnSjfDvx/AaVfbQJ2rR/iqLVglLiSFQmMMJebFVbrq4XFHpEvey8cHmp36DOb6 vgKntCLUqDZQr8Ml97C9edUmXk7lCVrhTfu7lXcOxHS5i08Tl5dygNgSeO9aSfvvcCvIAbL XQiLqaO1WzplgI0ZSp7Gw== X-UI-Out-Filterresults: notjunk:1;V03:K0:xjLIdSS/zeE=:FzgMK0KIcce9AdDbCgmy3t muvOTIARJXEMuWkmQPsxI+LBL7xNjec9ZqmEJCfnEIwn/gi/eN5TxXoywt7M9cXorjbc84lJX YYxGZSsvPoB5640Ipp++EkWOv0SYmU9rDI0rWF01y3RikmnMzKc9vYS4jx3AbRQQCgi8WpuAm JEawS2uACjxpa6jWEX33A1JGfQboS19gjN8MlLxPTKX5o6OGfj3DXTRyC6kMPmSywd2vQNb7W Yio3pQ0Pg7xIAnA85wRNQKvfHEs4DLT3MthPphEyhGDIB5WotjQHL7+a80/jLCIS6Bm31p2+s t63lP45WM72aR2zhNE5IDLXAqKyVgJdgsY3sfOLQPei2YeRLf2IbBIw+TXaUZV5Q0cDpuuNEx H4NmT5sR3yL+kqXcNlLvLGJvgYRWPmDVzBsDf/4ux0M5TwxZyczh7UBVBlFbtQCUdNduaJk44 +IzslO+NBbkloYhufuu0WoDKu39iOsDpC6No2eNeb+MfyUIBeVuCGNkK9qiYArdYvjop1iYHP CsdtpDq3b4rltWVLHrDV8k= Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Ilya Leoshkevich Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Ilya Leoshkevich Provide the following definitions required by the common code: * ELF_NREG: with the value of sizeof(s390_regs) / sizeof(long). * target_elf_gregset_t: define it like all the other arches do. * elf_core_copy_regs(): similar to kernel's s390_regs_get(). * USE_ELF_CORE_DUMP. * ELF_EXEC_PAGESIZE. Signed-off-by: Ilya Leoshkevich Message-Id: <20210413205608.22587-1-iii@linux.ibm.com> Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 9779263727ba..0e832b2649f6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1375,6 +1375,39 @@ static inline void init_thread(struct target_pt_regs *regs, struct image_info *i regs->gprs[15] = infop->start_stack; } +/* See linux kernel: arch/s390/include/uapi/asm/ptrace.h (s390_regs). */ +#define ELF_NREG 27 +typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; + +enum { + TARGET_REG_PSWM = 0, + TARGET_REG_PSWA = 1, + TARGET_REG_GPRS = 2, + TARGET_REG_ARS = 18, + TARGET_REG_ORIG_R2 = 26, +}; + +static void elf_core_copy_regs(target_elf_gregset_t *regs, + const CPUS390XState *env) +{ + int i; + uint32_t *aregs; + + (*regs)[TARGET_REG_PSWM] = tswapreg(env->psw.mask); + (*regs)[TARGET_REG_PSWA] = tswapreg(env->psw.addr); + for (i = 0; i < 16; i++) { + (*regs)[TARGET_REG_GPRS + i] = tswapreg(env->regs[i]); + } + aregs = (uint32_t *)&((*regs)[TARGET_REG_ARS]); + for (i = 0; i < 16; i++) { + aregs[i] = tswap32(env->aregs[i]); + } + (*regs)[TARGET_REG_ORIG_R2] = 0; +} + +#define USE_ELF_CORE_DUMP +#define ELF_EXEC_PAGESIZE 4096 + #endif /* TARGET_S390X */ #ifdef TARGET_RISCV