From patchwork Mon Mar 18 10:49:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 160487 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp2500619jad; Mon, 18 Mar 2019 03:49:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqx19QtAPtmAYjdEuDqhaY4b0+4vYSPNVxVb8zV7gJgc7UsX73+KWs9xFQmA1Zljdkq6+YXx X-Received: by 2002:a17:902:7e46:: with SMTP id a6mr19312468pln.150.1552906199528; Mon, 18 Mar 2019 03:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552906199; cv=none; d=google.com; s=arc-20160816; b=VOt8UfJQNnxTx9BwDAqOK7fa6S2W8I49Rwwu/FtAW0m4EslIfQR5Qe62CRtKT9mI72 dhXtCNy9pCzcX4vdzqqMaGgqzgNzmLYYVX41ZE9rKuOA4mFgZceC2qGseGoloqnMBaDk xqPkjNSOA2f1AQ7BO0tIOYLPOL8ScZNXPP81xFJzbXCm+rNbs5kIuF+gSTGnBTbAokXe zBsc5G02xZnuRjrFbhweBoiNUd6ojOrbG2m0/I+Ji686xZgzdfYE4VkvKWHDlQxlMh9u 8ioXHh4ljX/SJOM2SuCNIUjDemwg5VqoVDjTNBZSY6UoVZxgiLkHbRjlwp87u+dyVx5z zQ/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=JyWRDZTjgGDuCrslIj+z9GhlP/S7piQ5pVRASDF2OOQ=; b=m5W+GbrN0yJCTLkjjYtPrgLDj7+2X/WJvJJ7vheJQMeUaEN4C1jS332kV74C/uCrsG wEv9922Wmh7bH/tvcWa8srta7ypBKmNFDr+rTkCl8y+2Ou/vaGMYorc5P4Uu+zKmD83I EG9ATCuwOaEBngUtd94iyEUNlqAVpsEsImz2btsQYgBtrDD0T8lp8pfNKf31Q4QnU5S3 XYIHExHf7L4qFsMy2MhKMdH5UQ2Kc8bHwuljck8pc/kCokUm9VODOgsYfLyYr0Em8aG7 rNZeo7hN/cG6UQXOPWvkq+XLIV1r4Tz1q5XFwuIdj5qcs0y3TtSjVneiVoHfE5B+dorI yQTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cv7si9628987plb.322.2019.03.18.03.49.59; Mon, 18 Mar 2019 03:49:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727797AbfCRKt6 (ORCPT + 31 others); Mon, 18 Mar 2019 06:49:58 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:59816 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727723AbfCRKtz (ORCPT ); Mon, 18 Mar 2019 06:49:55 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F36CC165C; Mon, 18 Mar 2019 03:49:54 -0700 (PDT) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 084643F614; Mon, 18 Mar 2019 03:49:51 -0700 (PDT) From: Sudeep Holla To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Sudeep Holla , Catalin Marinas , Will Deacon , Oleg Nesterov , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , Richard Weinberger , jdike@addtoit.com, Steve Capper , Haibo Xu , Bin Lu , Andy Lutomirski Subject: [PATCH v2 6/6] arm64: ptrace: add support for syscall emulation Date: Mon, 18 Mar 2019 10:49:25 +0000 Message-Id: <20190318104925.16600-7-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190318104925.16600-1-sudeep.holla@arm.com> References: <20190318104925.16600-1-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add PTRACE_SYSEMU and PTRACE_SYSEMU_SINGLESTEP support on arm64. We can just make sure of the generic ptrace_syscall_enter hook to support PTRACE_SYSEMU. We don't need any special handling for PTRACE_SYSEMU_SINGLESTEP. Cc: Catalin Marinas Cc: Will Deacon Signed-off-by: Sudeep Holla --- arch/arm64/include/asm/thread_info.h | 5 ++++- arch/arm64/kernel/ptrace.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index eb3ef73e07cf..c285d1ce7186 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -75,6 +75,7 @@ void arch_release_task_struct(struct task_struct *tsk); * TIF_SYSCALL_TRACE - syscall trace active * TIF_SYSCALL_TRACEPOINT - syscall tracepoint for ftrace * TIF_SYSCALL_AUDIT - syscall auditing + * TIF_SYSCALL_EMU - syscall emulation active * TIF_SECOMP - syscall secure computing * TIF_SIGPENDING - signal pending * TIF_NEED_RESCHED - rescheduling necessary @@ -91,6 +92,7 @@ void arch_release_task_struct(struct task_struct *tsk); #define TIF_SYSCALL_AUDIT 9 #define TIF_SYSCALL_TRACEPOINT 10 #define TIF_SECCOMP 11 +#define TIF_SYSCALL_EMU 12 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ #define TIF_FREEZE 19 #define TIF_RESTORE_SIGMASK 20 @@ -109,6 +111,7 @@ void arch_release_task_struct(struct task_struct *tsk); #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) +#define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_FSCHECK (1 << TIF_FSCHECK) #define _TIF_32BIT (1 << TIF_32BIT) @@ -120,7 +123,7 @@ void arch_release_task_struct(struct task_struct *tsk); #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \ - _TIF_NOHZ) + _TIF_NOHZ | _TIF_SYSCALL_EMU) #define INIT_THREAD_INFO(tsk) \ { \ diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index b82e0a9b3da3..cf29275cd4d9 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1819,6 +1819,9 @@ static void tracehook_report_syscall(struct pt_regs *regs, int syscall_trace_enter(struct pt_regs *regs) { + if (unlikely(ptrace_syscall_enter(regs))) + return -1; + if (test_thread_flag(TIF_SYSCALL_TRACE)) tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);