From patchwork Tue Jan 19 22:06:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 12030939 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 DC417C433E0 for ; Tue, 19 Jan 2021 22:10:23 +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 94B8122E01 for ; Tue, 19 Jan 2021 22:10:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94B8122E01 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=BBrOsG51pY9NHgtQ2PT83WGIHN3ElSy9gEKuVJVTP+U=; b=1KjoYBo/ffw9MnUaTlblqdqB7 P59JRlKv3WhAQBUrl6Zy5SeM8qEiYr2hc3l37/OsynwWZIDpbBPX88vcCgM/Dpgk5HAvB31KhyftC EpUa/culnBc5CT5oFF0HROTCRNON7cJWXRIQufQN10d9anaEqgusoTJyvK79BOtJZwY0vsv/4vZmE lKH9yywwdytiHgTCeG1usLWG2S2nlOk/vuTUiRX/9/xhJypDGgSVIckRqxjNr39FyLkcDlq2G/Wyp TThlw/8dLyT9jmeEbXsScSDkn3pQnO8aUbqzNRtBRQP9cersR+OJVxU1CmSzgwS2jqs9H5v9iZ9kf RaJYVof7A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAl-0007Sg-05; Tue, 19 Jan 2021 22:08:23 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAe-0007Q4-P4 for linux-arm-kernel@lists.infradead.org; Tue, 19 Jan 2021 22:08:17 +0000 Received: by mail-pl1-x62a.google.com with SMTP id x18so11346558pln.6 for ; Tue, 19 Jan 2021 14:08:15 -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=ZtvWiGPK2eweAPRjtJhZb7309sm3REWVBB+tfD69F30=; b=UUp1Z0eBKhUHBfdI83AvJ0436gY4K8mRwO4+iCyC1cdjEpBkDz0fEtQqNWLOo1RLyJ edyTCAwWw1jmaG8rElV8Jo6kHnmFMkjpiXb+Hy4vZDXwlm9AruyVqDrLFb0fP8m/5noE rnyw0qvkd9sRrRwzR3Xl6IMRkMfCqyK8PR+K8rnQ560jK0NU8P3pTkzqluJpu88YVx3d 7uIts3SNc/HOqQRQlIYYWnVAvdfgM7lrI+LLjj/k9CKE8kUMX6wvO/LTS1NSqaFGCI2B iDEZWwZmRPt541vMUH7DyH5z+MWOJwQBIxaiwrBHvzJf/9Tyie4AOlRKGYobM6PBZAXz 3+RA== 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=ZtvWiGPK2eweAPRjtJhZb7309sm3REWVBB+tfD69F30=; b=TEfnQEkjpckJTNRMeukwvUjp6Y6OjHpgVJs9V2Q+MiLZiMe2mPaLYIZQNkhzgkORdn QN/hBKiX5CyUoUsrk1C+NdHEENua4R/pUOU4I/RqdTfKKzBmFES+vV5+d6KGuzX8BwUb 09ERSyMQXeej9qlShAdNtEllbLZO2vpeEe5NJeHHICP3o48+STxdXGgFBg44MbPByTw0 2bQxJDqhKZ8hW3xVjtg9iywvXmNGpsdwGmLijLwM26RScs8py+CYSlKQoM4iGB7GM59d toXtCz78TQ0RR3gf1qBz3W+XmFAnJAkK8zR/OnYKGOawst8zwCB1LXu+/cgSSjxOtEiG o5uQ== X-Gm-Message-State: AOAM5321wP5qFvDsbH8a9rF7Of6qnakTMWYLh0hvL2vL34TC7mgBZCgq LbNMEyJA7y2Lffy5uTVOxRU= X-Google-Smtp-Source: ABdhPJwVEJjtlAzTiLDNsWz7WVQ+ZoNp8rnM4n36DrBPJbku6zgklznseRI6dyryA7b5X3MK2hJnZg== X-Received: by 2002:a17:902:d48a:b029:de:ae4d:2c7b with SMTP id c10-20020a170902d48ab02900deae4d2c7bmr6838343plg.62.1611094093364; Tue, 19 Jan 2021 14:08:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 14:08:12 -0800 (PST) From: Andrei Vagin To: Will Deacon , Catalin Marinas Subject: [PATCH 1/3] arm64/ptrace: don't clobber task registers on syscall entry/exit traps Date: Tue, 19 Jan 2021 14:06:35 -0800 Message-Id: <20210119220637.494476-2-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_170816_837903_8AED8BD9 X-CRM114-Status: GOOD ( 23.17 ) 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 ip/r12 for AArch32 and x7 for AArch64 is used to indicate whether or not the stop has been signalled from syscall entry or syscall exit. This means that: - Any writes by the tracer to this register during the stop are ignored/discarded. - The actual value of the register is not available during the stop, so the tracer cannot save it and restore it later. Right now, these registers are clobbered in tracehook_report_syscall. This change moves this logic to gpr_get and compat_gpr_get where registers are copied into a user-space buffer. This will allow to change these registers and to introduce a new NT_ARM_PRSTATUS command to get the full set of registers. Signed-off-by: Andrei Vagin --- arch/arm64/include/asm/ptrace.h | 5 ++ arch/arm64/kernel/ptrace.c | 104 +++++++++++++++++++------------- 2 files changed, 67 insertions(+), 42 deletions(-) diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index e58bca832dff..0a9552b4f61e 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -170,6 +170,11 @@ static inline unsigned long pstate_to_compat_psr(const unsigned long pstate) return psr; } +enum ptrace_syscall_dir { + PTRACE_SYSCALL_ENTER = 0, + PTRACE_SYSCALL_EXIT, +}; + /* * This struct defines the way the registers are stored on the stack during an * exception. Note that sizeof(struct pt_regs) has to be a multiple of 16 (for diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 8ac487c84e37..1863f080cb07 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -40,6 +40,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -561,7 +562,33 @@ static int gpr_get(struct task_struct *target, struct membuf to) { struct user_pt_regs *uregs = &task_pt_regs(target)->user_regs; - return membuf_write(&to, uregs, sizeof(*uregs)); + unsigned long saved_reg; + int ret; + + /* + * We have some ABI weirdness here in the way that we handle syscall + * exit stops because we indicate whether or not the stop has been + * signalled from syscall entry or syscall exit by clobbering the general + * purpose register x7. + */ + switch (target->ptrace_message) { + case PTRACE_EVENTMSG_SYSCALL_ENTRY: + saved_reg = uregs->regs[7]; + uregs->regs[7] = PTRACE_SYSCALL_ENTER; + break; + case PTRACE_EVENTMSG_SYSCALL_EXIT: + saved_reg = uregs->regs[7]; + uregs->regs[7] = PTRACE_SYSCALL_EXIT; + break; + } + + ret = membuf_write(&to, uregs, sizeof(*uregs)); + + if (target->ptrace_message == PTRACE_EVENTMSG_SYSCALL_ENTRY || + target->ptrace_message == PTRACE_EVENTMSG_SYSCALL_EXIT) + uregs->regs[7] = saved_reg; + + return ret; } static int gpr_set(struct task_struct *target, const struct user_regset *regset, @@ -1221,10 +1248,40 @@ static int compat_gpr_get(struct task_struct *target, const struct user_regset *regset, struct membuf to) { + compat_ulong_t r12; + bool overwrite_r12; int i = 0; - while (to.left) - membuf_store(&to, compat_get_user_reg(target, i++)); + /* + * We have some ABI weirdness here in the way that we handle syscall + * exit stops because we indicate whether or not the stop has been + * signalled from syscall entry or syscall exit by clobbering the + * general purpose register r12. + */ + switch (target->ptrace_message) { + case PTRACE_EVENTMSG_SYSCALL_ENTRY: + r12 = PTRACE_SYSCALL_ENTER; + overwrite_r12 = true; + break; + case PTRACE_EVENTMSG_SYSCALL_EXIT: + r12 = PTRACE_SYSCALL_EXIT; + overwrite_r12 = true; + break; + default: + overwrite_r12 = false; + break; + } + + while (to.left) { + compat_ulong_t val; + + if (!overwrite_r12 || i != 12) + val = compat_get_user_reg(target, i++); + else + val = r12; + membuf_store(&to, val); + } + return 0; } @@ -1740,53 +1797,16 @@ long arch_ptrace(struct task_struct *child, long request, return ptrace_request(child, request, addr, data); } -enum ptrace_syscall_dir { - PTRACE_SYSCALL_ENTER = 0, - PTRACE_SYSCALL_EXIT, -}; - static void tracehook_report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) { - int regno; - unsigned long saved_reg; - - /* - * We have some ABI weirdness here in the way that we handle syscall - * exit stops because we indicate whether or not the stop has been - * signalled from syscall entry or syscall exit by clobbering a general - * purpose register (ip/r12 for AArch32, x7 for AArch64) in the tracee - * and restoring its old value after the stop. This means that: - * - * - Any writes by the tracer to this register during the stop are - * ignored/discarded. - * - * - The actual value of the register is not available during the stop, - * so the tracer cannot save it and restore it later. - * - * - Syscall stops behave differently to seccomp and pseudo-step traps - * (the latter do not nobble any registers). - */ - regno = (is_compat_task() ? 12 : 7); - saved_reg = regs->regs[regno]; - regs->regs[regno] = dir; - if (dir == PTRACE_SYSCALL_ENTER) { if (tracehook_report_syscall_entry(regs)) forget_syscall(regs); - regs->regs[regno] = saved_reg; - } else if (!test_thread_flag(TIF_SINGLESTEP)) { - tracehook_report_syscall_exit(regs, 0); - regs->regs[regno] = saved_reg; } else { - regs->regs[regno] = saved_reg; + int singlestep = test_thread_flag(TIF_SINGLESTEP); - /* - * Signal a pseudo-step exception since we are stepping but - * tracer modifications to the registers may have rewound the - * state machine. - */ - tracehook_report_syscall_exit(regs, 1); + tracehook_report_syscall_exit(regs, singlestep); } } 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 */ From patchwork Tue Jan 19 22:06:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 12030941 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 87EE2C433DB for ; Tue, 19 Jan 2021 22:10:24 +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 382BD22E01 for ; Tue, 19 Jan 2021 22:10:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 382BD22E01 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=WVw1XLJkIRiIj3KUhMpnf1+QKVesJZr7gLPbCBsCx3Q=; b=CCXnBZ6eirYH7pJGuXOTvsZ/y Ll7djwFRj7b1mExEgsiB70/rPNtMx+zbjbC27VF9y5yrlFtg0jFk8rVNJ8vDiUXtS2Z7EsGKUbJri mttdtfeDAteybN1AYmqmnTDJZMcoHVIGozWV42oqEeGZDqI/6NtbDszxIOnQizQIAnENOXYR4YofP xveO23AEy7GBRPRKUKh2mBGoc4QvGg+GZJ5U1u8dVBIcBELBymeFX5n4FXo9/MBqL557I3MUhIlKs BcF1BNFl1dcx0IgBxYkiEwxep3mFZMdF4C+bG6itvdMtpOSLHch5F0VvjQPdy2cukArx7i3g+Cw1p 6T63ywM+w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAq-0007Tr-8r; Tue, 19 Jan 2021 22:08:28 +0000 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1zAg-0007R3-Gs for linux-arm-kernel@lists.infradead.org; Tue, 19 Jan 2021 22:08:20 +0000 Received: by mail-pg1-x52b.google.com with SMTP id p18so13818178pgm.11 for ; Tue, 19 Jan 2021 14:08:17 -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=Fzr5ZmyqkA8PO0rKR84r5wnTkX6dyXCN2TjKwSkTcCQ=; b=YqqYzbHq8KUuNlsVV8uwX4a0tFYj85lWPFI48TJfZyr4Zmv8WL6MT/v2KFm08aiB9+ ZaTTebjTlB2CZ7O5HN7YO5bGtEn1DxCepQOl/lNmRZpgk6m1ih3VeaKfoayD7MJJ8n/r K+g7jYDBP1uGGTPuNf8MyfTVMGCmZCzq8PjbR9oWO0zuYzaUzAhsGVU/FxPVqXvc3DM2 +Z47rau7jLXrmUUlLYytzT6XhCYmi0OtLKewHxHaep4pXTsQhO0SxnkVtN4NVe91EBYW zsbHh7VrR9DP7Oy1hbTc8p/GCDqkUNhsO4d1PPeTzZE5M5ogY46bQrcQcS1ZJMvt7T8b /hrg== 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=Fzr5ZmyqkA8PO0rKR84r5wnTkX6dyXCN2TjKwSkTcCQ=; b=HIRqtWaO4G9zIdzz7E/hxr7r0YxRrlJ+agO+iK2HXUuZgEXOWgYOie6VjfbyUzJ2qw UFvKkTLapQT43KhSHGxllFMsGuhELcMCkwNzQfakLtbzI9Njv3J6VijM56o5Y5S73yBE gI+Qeikyr59CZ+yDr1Uk8fqniZWqXc+nX70RH92baOvKYNusQtgz+TAAEu6yK+QSFrRF A3hhILog79Sg23o/xrOsB76tybrDb39EtH0PsKk2vVOV3pA/ilOkr2oBTA5j1arB8mmA xjsx3gZfPEcTOong67SmnCZ52kzrwS5+zBt15tX4sT+nUgrnJn1otO5RxzPcOxGXVYc9 /elQ== X-Gm-Message-State: AOAM531yLf3QRt9tquIcVUbG1EpfanYTiBewTVt0ItSAVqE4YTa4zFq8 w1fAHwsepSxKMx9+EBfKJ3daQPHSLsaCDA== X-Google-Smtp-Source: ABdhPJy28WqsBvPwRH+gTwECasNDKDCvTk+9y/hhs1zMjQCiho52tcSsFNcJidbKFqaA0/ZV4wJE9w== X-Received: by 2002:a63:fb54:: with SMTP id w20mr6211413pgj.419.1611094096174; Tue, 19 Jan 2021 14:08:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 14:08:15 -0800 (PST) From: Andrei Vagin To: Will Deacon , Catalin Marinas Subject: [PATCH 3/3] selftest/arm64/ptrace: add a test for NT_ARM_PRSTATUS Date: Tue, 19 Jan 2021 14:06:37 -0800 Message-Id: <20210119220637.494476-4-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_170818_821616_E26D6716 X-CRM114-Status: GOOD ( 20.78 ) 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 Test output: TAP version 13 1..1 # selftests: arm64/ptrace: ptrace_syscall_regs_test # 1..3 # ok 1 NT_PRSTATUS: x7 0 # ok 2 NT_ARM_PRSTATUS: x7 686920776f726c64 # ok 3 The child exited with code 0. # # Totals: pass:3 fail:0 xfail:0 xpass:0 skip:0 error:0 ok 1 selftests: arm64/ptrace: ptrace_syscall_regs_test Signed-off-by: Andrei Vagin --- tools/testing/selftests/arm64/Makefile | 2 +- tools/testing/selftests/arm64/ptrace/Makefile | 6 + .../arm64/ptrace/ptrace_syscall_regs_test.c | 147 ++++++++++++++++++ 3 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/arm64/ptrace/Makefile create mode 100644 tools/testing/selftests/arm64/ptrace/ptrace_syscall_regs_test.c diff --git a/tools/testing/selftests/arm64/Makefile b/tools/testing/selftests/arm64/Makefile index 2c9d012797a7..704770a60ece 100644 --- a/tools/testing/selftests/arm64/Makefile +++ b/tools/testing/selftests/arm64/Makefile @@ -4,7 +4,7 @@ ARCH ?= $(shell uname -m 2>/dev/null || echo not) ifneq (,$(filter $(ARCH),aarch64 arm64)) -ARM64_SUBTARGETS ?= tags signal pauth fp mte +ARM64_SUBTARGETS ?= tags signal pauth fp mte ptrace else ARM64_SUBTARGETS := endif diff --git a/tools/testing/selftests/arm64/ptrace/Makefile b/tools/testing/selftests/arm64/ptrace/Makefile new file mode 100644 index 000000000000..ca906ce3a581 --- /dev/null +++ b/tools/testing/selftests/arm64/ptrace/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +CFLAGS += -g -I../../../../../usr/include/ +TEST_GEN_PROGS := ptrace_syscall_regs_test + +include ../../lib.mk diff --git a/tools/testing/selftests/arm64/ptrace/ptrace_syscall_regs_test.c b/tools/testing/selftests/arm64/ptrace/ptrace_syscall_regs_test.c new file mode 100644 index 000000000000..601378b7591d --- /dev/null +++ b/tools/testing/selftests/arm64/ptrace/ptrace_syscall_regs_test.c @@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "../../kselftest.h" + +#define TEST_VAL 0x686920776f726c64UL + +#define pr_p(func, fmt, ...) func(fmt ": %m", ##__VA_ARGS__) + +#define pr_err(fmt, ...) \ + ({ \ + ksft_test_result_error(fmt "\n", ##__VA_ARGS__); \ + -1; \ + }) + +#define pr_fail(fmt, ...) \ + ({ \ + ksft_test_result_fail(fmt "\n", ##__VA_ARGS__); \ + -1; \ + }) + +#define pr_perror(fmt, ...) pr_p(pr_err, fmt, ##__VA_ARGS__) + +static long loop(void *val) +{ + register long x0 __asm__("x0"); + register void *x1 __asm__("x1") = val; + register long x8 __asm__("x8") = 555; + + __asm__ ( + "again:\n" + "ldr x7, [x1, 0]\n" + "svc 0\n" + "str x7, [x1, 0]\n" + : "=r"(x0) + : "r"(x1), "r"(x8) + : + ); + return 0; +} + +static int child(void) +{ + long val = TEST_VAL; + + loop(&val); + if (val != ~TEST_VAL) { + ksft_print_msg("Unexpected x7: %lx\n", val); + return 1; + } + + return 0; +} + +#ifndef PTRACE_SYSEMU +#define PTRACE_SYSEMU 31 +#endif + +#ifndef NT_ARM_PRSTATUS +#define NT_ARM_PRSTATUS 0x410 +#endif + +int main(int argc, void **argv) +{ + struct user_regs_struct regs = {}; + struct iovec iov = { + .iov_base = ®s, + .iov_len = sizeof(struct user_regs_struct), + }; + int status; + pid_t pid; + + ksft_set_plan(3); + + pid = fork(); + if (pid == 0) { + kill(getpid(), SIGSTOP); + child(); + _exit(0); + } + if (pid < 0) + return 1; + + if (ptrace(PTRACE_ATTACH, pid, 0, 0)) + return pr_perror("Can't attach to the child %d", pid); + if (waitpid(pid, &status, 0) != pid) + return pr_perror("Can't wait for the child %d", pid); + /* skip SIGSTOP */ + if (ptrace(PTRACE_CONT, pid, 0, 0)) + return pr_perror("Can't resume the child %d", pid); + if (waitpid(pid, &status, 0) != pid) + return pr_perror("Can't wait for the child %d", pid); + + /* Resume the child to the next system call. */ + if (ptrace(PTRACE_SYSEMU, pid, 0, 0)) + return pr_perror("Can't resume the child %d", pid); + if (waitpid(pid, &status, 0) != pid) + return pr_perror("Can't wait for the child %d", pid); + if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGTRAP) + return pr_err("Unexpected status: %d", status); + + /* Check that x7 is zero in the case of NT_PRSTATUS. */ + if (ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov)) + return pr_perror("Can't get child registers"); + if (regs.regs[7] != 0) + return pr_fail("NT_PRSTATUS: unexpected x7: %lx", regs.regs[7]); + ksft_test_result_pass("NT_PRSTATUS: x7 %llx\n", regs.regs[7]); + + /* Check that x7 isnt't clobbered in the case of NT_ARM_PRSTATUS. */ + if (ptrace(PTRACE_GETREGSET, pid, NT_ARM_PRSTATUS, &iov)) + return pr_perror("Can't get child registers"); + if (regs.regs[7] != TEST_VAL) + return pr_fail("NT_ARM_PRSTATUS: unexpected x7: %lx", regs.regs[7]); + ksft_test_result_pass("NT_ARM_PRSTATUS: x7 %llx\n", regs.regs[7]); + + /* Check that the child will see a new value of x7. */ + regs.regs[0] = 0; + regs.regs[7] = ~TEST_VAL; + if (ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov)) + return pr_perror("Can't set child registers"); + + if (ptrace(PTRACE_CONT, pid, 0, 0)) + return pr_perror("Can't resume the child %d", pid); + if (waitpid(pid, &status, 0) != pid) + return pr_perror("Can't wait for the child %d", pid); + + if (status != 0) + return pr_fail("Child exited with code %d.", status); + + ksft_test_result_pass("The child exited with code 0.\n"); + ksft_exit_pass(); + return 0; +} +