From patchwork Tue Jan 19 22:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 12030943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30290C433E6 for ; Tue, 19 Jan 2021 22:10:25 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F076222E01 for ; Tue, 19 Jan 2021 22:10:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F076222E01 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MsaJHJpLvfPOgccT5j7qaRXmjHTfDR8R79RbGCSmKjk=; b=W5JJN0uJLmWyhskyJYoAtDw7U B2qD41F+eyBvN+MdA+53c56oSj3slwYxf50daGtE2FD4XdjpRjf607tiSSGWJHnHkBKBy3uxY7kcC T6aArHpKpvi/Ajbyh2FrLwi/PVggEVhsfwaboKzJq+Ax4rXRNEufG10+0WDeNqKluutv8+hftVm4d 5W1RIBxz86uo5OS+BwLATA9C/Dt+VHqdG7w5FrPIda0NBqgToOkBk4YqsTkLHSInUnzU/mmryV6Vg pWoSg928wCiWhXeaHwXFr2XXP506cad9+R8AKby4sbl70ZTFRL7P4qamzIy1KXHwPIknM3rsegHmg PbV4pSPVQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAn-0007T7-3L; Tue, 19 Jan 2021 22:08:25 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAf-0007QI-0h for linux-arm-kernel@lists.infradead.org; Tue, 19 Jan 2021 22:08:17 +0000 Received: by mail-pf1-x435.google.com with SMTP id y205so7345532pfc.5 for ; Tue, 19 Jan 2021 14:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OEjzhBF98dbnk/5sluVZcbU0ionst0PLBmFjjcrt57Y=; b=ifhiFkSVwmYAsIe1NEgU5OALrc/J1v23nOR45sANQBnTdYx1fozTj2YZ15HE9Y0h5n 265nWrcPvnLDq0tp9Rsb9uqbjPvnStApYh+UYe073uI4h4sf4MuayxPQHconDOJ2SJyv mG7Dg1hx0g7qmaMdqRcojS7WunD9wEJ5hFRpDaZLGxwrg4ogoHHObswAB6W4pO3sNX4v eQwBDl8UCudP8e6Fi52iq+Wgu0J9uk34V0hecy1BB00mfqlxpn93pQYuYK7HK6S2IYX2 yf3H1cl7hQhwoITK5G505Fr3Pt0jfBTfRumNm6R8EPMdJ4VU7vfS/MKT8OnFx5yleor2 wV/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OEjzhBF98dbnk/5sluVZcbU0ionst0PLBmFjjcrt57Y=; b=J0/OEYwcPlXRhoLgDGrkD7NmtTHnUGrAFRTGZnL36P2wqTkG2M3hj8Z6p2MuoBkVKU HxeSKI54DfE/UXPdZEtOeUIevWWJ66VMTqmwCzEhUIB+QfasaDljj9iw4CkgJ5hLmFWQ nAUW61EzaWVd8smlEtZSEGF2zCkZLHlzqp7wPesxjL/Cc+tdx/iBcvOEtXQcuRmZ2rUa VLY5T+OK3qofcwXaRU/U9B08yue/UEDyIKf7XaOx4NpRrtYz3INMcAsIqu8/UULEtn3d EkiT6tcbIrpVVh64yB2GpK+VODD2cfheFXtlZb+SzbU/63+5Q3NGi2/Vv3fWgDsLl7LA x4Qw== X-Gm-Message-State: AOAM530qXajgstGGrO5i0bBmGpAoCFpcW+D/V3i4ZKB8OoPAJAe9AWaG fdSnVpC17/fDfkAKCDttt98= X-Google-Smtp-Source: ABdhPJx6MCEYaTID6s+WBoU2uXbCUoUXXBLV2f8FF4ky28Djnk9NNEUtda6tRGnAf8LPk7FFWow5dA== X-Received: by 2002:a63:e22:: with SMTP id d34mr6305898pgl.142.1611094094931; Tue, 19 Jan 2021 14:08:14 -0800 (PST) Received: from laptop.hsd1.wa.comcast.net ([2601:600:9b7f:872e:a655:30fb:7373:c762]) by smtp.gmail.com with ESMTPSA id 72sm95196pfw.170.2021.01.19.14.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 14:08:14 -0800 (PST) From: Andrei Vagin To: Will Deacon , Catalin Marinas Subject: [PATCH 2/3] arm64/ptrace: introduce NT_ARM_PRSTATUS to get a full set of registers Date: Tue, 19 Jan 2021 14:06:36 -0800 Message-Id: <20210119220637.494476-3-avagin@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119220637.494476-1-avagin@gmail.com> References: <20210119220637.494476-1-avagin@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_170817_074861_E8ADDDD6 X-CRM114-Status: GOOD ( 15.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrei Vagin , Oleg Nesterov , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is an alternative to NT_PRSTATUS that clobbers ip/r12 on AArch32, x7 on AArch64 when a tracee is stopped in syscall entry or syscall exit traps. Signed-off-by: Andrei Vagin --- arch/arm64/kernel/ptrace.c | 39 ++++++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 2 files changed, 40 insertions(+) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 1863f080cb07..b8e4c2ddf636 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -591,6 +591,15 @@ static int gpr_get(struct task_struct *target, return ret; } +static int gpr_get_full(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + struct user_pt_regs *uregs = &task_pt_regs(target)->user_regs; + + return membuf_write(&to, uregs, sizeof(*uregs)); +} + static int gpr_set(struct task_struct *target, const struct user_regset *regset, unsigned int pos, unsigned int count, const void *kbuf, const void __user *ubuf) @@ -1088,6 +1097,7 @@ static int tagged_addr_ctrl_set(struct task_struct *target, const struct enum aarch64_regset { REGSET_GPR, + REGSET_GPR_FULL, REGSET_FPR, REGSET_TLS, #ifdef CONFIG_HAVE_HW_BREAKPOINT @@ -1119,6 +1129,14 @@ static const struct user_regset aarch64_regsets[] = { .regset_get = gpr_get, .set = gpr_set }, + [REGSET_GPR_FULL] = { + .core_note_type = NT_ARM_PRSTATUS, + .n = sizeof(struct user_pt_regs) / sizeof(u64), + .size = sizeof(u64), + .align = sizeof(u64), + .regset_get = gpr_get_full, + .set = gpr_set + }, [REGSET_FPR] = { .core_note_type = NT_PRFPREG, .n = sizeof(struct user_fpsimd_state) / sizeof(u32), @@ -1225,6 +1243,7 @@ static const struct user_regset_view user_aarch64_view = { #ifdef CONFIG_COMPAT enum compat_regset { REGSET_COMPAT_GPR, + REGSET_COMPAT_GPR_FULL, REGSET_COMPAT_VFP, }; @@ -1285,6 +1304,18 @@ static int compat_gpr_get(struct task_struct *target, return 0; } +/* compat_gpr_get_full doesn't overwrite x12 like compat_gpr_get. */ +static int compat_gpr_get_full(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + int i = 0; + + while (to.left) + membuf_store(&to, compat_get_user_reg(target, i++)); + return 0; +} + static int compat_gpr_set(struct task_struct *target, const struct user_regset *regset, unsigned int pos, unsigned int count, @@ -1435,6 +1466,14 @@ static const struct user_regset aarch32_regsets[] = { .regset_get = compat_gpr_get, .set = compat_gpr_set }, + [REGSET_COMPAT_GPR_FULL] = { + .core_note_type = NT_ARM_PRSTATUS, + .n = COMPAT_ELF_NGREG, + .size = sizeof(compat_elf_greg_t), + .align = sizeof(compat_elf_greg_t), + .regset_get = compat_gpr_get_full, + .set = compat_gpr_set + }, [REGSET_COMPAT_VFP] = { .core_note_type = NT_ARM_VFP, .n = VFP_STATE_SIZE / sizeof(compat_ulong_t), diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index 30f68b42eeb5..a2086d19263a 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -426,6 +426,7 @@ typedef struct elf64_shdr { #define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication address keys */ #define NT_ARM_PACG_KEYS 0x408 /* ARM pointer authentication generic key */ #define NT_ARM_TAGGED_ADDR_CTRL 0x409 /* arm64 tagged address control (prctl()) */ +#define NT_ARM_PRSTATUS 0x410 /* ARM general-purpose registers */ #define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */ #define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */ #define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */