From patchwork Thu Mar 13 10:13:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 26190 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BA0F2206A0 for ; Thu, 13 Mar 2014 10:15:37 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id a108sf1779830qge.0 for ; Thu, 13 Mar 2014 03:15:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=80sq3m2b8IIZQ8/YsPVJQ0ywYiLsEPhZ0ZlVtjBQvjA=; b=GiIXwmPxuF+xLu5K3mf0C15kjfPLgV7IJbaiylYztFl/ejbOxE5JUTxOVRxOf+eXFW iKaMRO2fvzceuECvdyuQz3acdfTpHsyzQf3mbzDEwHF/+dSIbPjsh+EEwVvFG2BCQ5Ks TWg19oFapH9DR4viWwSpS89TgB80owAcrvSqkOFIQIfUuvKgiS9tvm3Vtro4PyEo8l2F vCtnmGFCkSyKxV3BkNavV+l1Ywdyh2j9+H05+PxqNS95W36kFBoyf4aCVrzfq26pagN3 VtvU4zdQIH0Aedr0XQFtWxqAQsIwwXS2bXHfKmzF2hlgAhEmS3FCcMOyVoUHdAnBo2ET /Ogg== X-Gm-Message-State: ALoCoQk9qYwht2NrQKCx3IJl4knTctiAkzOItIblYK8iRzRtvdVow0UpbH5Osyk4rnds01zVhbEO X-Received: by 10.236.129.41 with SMTP id g29mr367948yhi.20.1394705737524; Thu, 13 Mar 2014 03:15:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.81 with SMTP id 75ls202474qgg.75.gmail; Thu, 13 Mar 2014 03:15:37 -0700 (PDT) X-Received: by 10.58.49.129 with SMTP id u1mr760020ven.0.1394705737353; Thu, 13 Mar 2014 03:15:37 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id xo2si631808vec.122.2014.03.13.03.15.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 03:15:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oy12so835586veb.32 for ; Thu, 13 Mar 2014 03:15:37 -0700 (PDT) X-Received: by 10.52.61.133 with SMTP id p5mr622170vdr.4.1394705737259; Thu, 13 Mar 2014 03:15:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp355945vck; Thu, 13 Mar 2014 03:15:36 -0700 (PDT) X-Received: by 10.69.31.43 with SMTP id kj11mr1176376pbd.67.1394705736301; Thu, 13 Mar 2014 03:15:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qe9si1788803pbb.312.2014.03.13.03.15.35; Thu, 13 Mar 2014 03:15:35 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754180AbaCMKPV (ORCPT + 26 others); Thu, 13 Mar 2014 06:15:21 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:63678 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753556AbaCMKPP (ORCPT ); Thu, 13 Mar 2014 06:15:15 -0400 Received: by mail-pb0-f52.google.com with SMTP id rr13so894424pbb.39 for ; Thu, 13 Mar 2014 03:15:15 -0700 (PDT) X-Received: by 10.68.143.34 with SMTP id sb2mr1129699pbb.135.1394705715237; Thu, 13 Mar 2014 03:15:15 -0700 (PDT) Received: from localhost.localdomain (KD182249091179.au-net.ne.jp. [182.249.91.179]) by mx.google.com with ESMTPSA id yj1sm7505037pab.30.2014.03.13.03.15.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 03:15:13 -0700 (PDT) From: AKASHI Takahiro To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com, catalin.marinas@arm.com, will.deacon@arm.com, tim.bird@sonymobile.com Cc: gkulkarni@caviumnetworks.com, dsaxena@linaro.org, arndb@arndb.de, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v6 7/7] arm64: ftrace: Add system call tracepoint Date: Thu, 13 Mar 2014 19:13:50 +0900 Message-Id: <1394705630-12384-8-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394705630-12384-1-git-send-email-takahiro.akashi@linaro.org> References: <1393564724-3966-1-git-send-email-takahiro.akashi@linaro.org> <1394705630-12384-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch allows system call entry or exit to be traced as ftrace events, ie. sys_enter_*/sys_exit_*, if CONFIG_FTRACE_SYSCALLS is enabled. Those events appear and can be controlled under ${sysfs}/tracing/events/syscalls/ Please note that we can't trace compat system calls here because AArch32 mode does not share the same syscall table with AArch64. Just define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS in order to avoid unexpected results (bogus syscalls reported or even hang-up). Signed-off-by: AKASHI Takahiro --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/ftrace.h | 20 ++++++++++++++++ arch/arm64/include/asm/syscall.h | 1 + arch/arm64/include/asm/unistd.h | 2 ++ arch/arm64/kernel/ptrace.c | 48 ++++++++++++++++++++++---------------- 5 files changed, 52 insertions(+), 20 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6954959..b1dcdb4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -43,6 +43,7 @@ config ARM64 select HAVE_MEMBLOCK select HAVE_PATA_PLATFORM select HAVE_PERF_EVENTS + select HAVE_SYSCALL_TRACEPOINTS select IRQ_DOMAIN select MODULES_USE_ELF_RELA select NO_BOOTMEM diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h index c44c4b1..4ef06f1 100644 --- a/arch/arm64/include/asm/ftrace.h +++ b/arch/arm64/include/asm/ftrace.h @@ -44,6 +44,26 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) #define CALLER_ADDR4 ((unsigned long)return_address(4)) #define CALLER_ADDR5 ((unsigned long)return_address(5)) #define CALLER_ADDR6 ((unsigned long)return_address(6)) + +#include + +/* + * Because AArch32 mode does not share the same syscall table with AArch64, + * tracing compat syscalls may result in reporting bogus syscalls or even + * hang-up, so just do not trace them. + * See kernel/trace/trace_syscalls.c + * + * x86 code says: + * If the user realy wants these, then they should use the + * raw syscall tracepoints with filtering. + */ +#define ARCH_TRACE_IGNORE_COMPAT_SYSCALLS 1 +static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) +{ + if (is_compat_task()) + return true; + return false; +} #endif /* ifndef __ASSEMBLY__ */ #endif /* __ASM_FTRACE_H */ diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h index 70ba9d4..383771e 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -18,6 +18,7 @@ #include +extern const void *sys_call_table[]; static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 82ce217..c335479 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -28,3 +28,5 @@ #endif #define __ARCH_WANT_SYS_CLONE #include + +#define NR_syscalls (__NR_syscalls) diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 9993a8f..9c52b3e 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -41,6 +41,9 @@ #include #include +#define CREATE_TRACE_POINTS +#include + /* * TODO: does not yet catch signals sent when the child dies. * in exit.c or in signal.c. @@ -1062,29 +1065,31 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) { unsigned long saved_reg; - if (!test_thread_flag(TIF_SYSCALL_TRACE)) - return regs->syscallno; + if (test_thread_flag(TIF_SYSCALL_TRACE)) { + /* + * A scrach register (ip(r12) on AArch32, x7 on AArch64) is + * used to denote syscall entry/exit: + * 0 -> entry + */ + if (is_compat_task()) { + saved_reg = regs->regs[12]; + regs->regs[12] = 0; + } else { + saved_reg = regs->regs[7]; + regs->regs[7] = 0; + } - /* - * A scrach register (ip(r12) on AArch32, x7 on AArch64) is - * used to denote syscall entry/exit: - * 0 -> entry - */ - if (is_compat_task()) { - saved_reg = regs->regs[12]; - regs->regs[12] = 0; - } else { - saved_reg = regs->regs[7]; - regs->regs[7] = 0; - } + if (tracehook_report_syscall_entry(regs)) + regs->syscallno = ~0UL; - if (tracehook_report_syscall_entry(regs)) - regs->syscallno = ~0UL; + if (is_compat_task()) + regs->regs[12] = saved_reg; + else + regs->regs[7] = saved_reg; + } - if (is_compat_task()) - regs->regs[12] = saved_reg; - else - regs->regs[7] = saved_reg; + if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) + trace_sys_enter(regs, regs->syscallno); return regs->syscallno; } @@ -1093,6 +1098,9 @@ asmlinkage void syscall_trace_exit(struct pt_regs *regs) { unsigned long saved_reg; + if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) + trace_sys_exit(regs, regs_return_value(regs)); + if (!test_thread_flag(TIF_SYSCALL_TRACE)) return;