From patchwork Fri Oct 14 08:35:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Nowakowski X-Patchwork-Id: 682162 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3swLYX2Y4zz9s2Q for ; Fri, 14 Oct 2016 19:36:48 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3swLYX0rKbzDsyH for ; Fri, 14 Oct 2016 19:36:48 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mailapp01.imgtec.com (mailapp02.imgtec.com [217.156.133.132]) by lists.ozlabs.org (Postfix) with ESMTP id 3swLX36wQyzDsyH for ; Fri, 14 Oct 2016 19:35:31 +1100 (AEDT) Received: from HHMAIL03.hh.imgtec.org (unknown [10.44.0.21]) by Forcepoint Email with ESMTPS id A1EF5310EF54; Fri, 14 Oct 2016 09:35:26 +0100 (IST) Received: from HHMAIL01.hh.imgtec.org (10.100.10.19) by HHMAIL03.hh.imgtec.org (10.44.0.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Fri, 14 Oct 2016 09:35:28 +0100 Received: from WR-NOWAKOWSKI.kl.imgtec.org (10.80.2.5) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Fri, 14 Oct 2016 09:35:28 +0100 From: Marcin Nowakowski To: Subject: [PATCH v4 04/12] tracing/syscalls: add compat syscall metadata Date: Fri, 14 Oct 2016 10:35:06 +0200 Message-ID: <1476434115-25428-5-git-send-email-marcin.nowakowski@imgtec.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476434115-25428-1-git-send-email-marcin.nowakowski@imgtec.com> References: <1476434115-25428-1-git-send-email-marcin.nowakowski@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.80.2.5] X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-api@vger.kernel.org, rostedt@goodmis.org, luto@amacapital.net, Ingo Molnar , Paul Mackerras , linuxppc-dev@lists.ozlabs.org, Marcin Nowakowski Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Now that compat syscalls are properly distinguished from native calls, we can add metadata for compat syscalls as well. All the macros used to generate the metadata are the same as for standard syscalls, but with a compat_ prefix to distinguish them easily. Signed-off-by: Marcin Nowakowski Cc: Steven Rostedt Cc: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org --- include/linux/compat.h | 74 +++++++++++++++++++++++++++++++++++++++++++ kernel/trace/trace_syscalls.c | 10 ++++-- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index 6360939..ef2a70f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -30,7 +30,80 @@ #define __SC_DELOUSE(t,v) ((t)(unsigned long)(v)) #endif +#ifdef CONFIG_FTRACE_SYSCALLS +#ifndef __SC_STR_ADECL +#define __SC_STR_ADECL(t, a) #a +#endif + +#ifndef __SC_STR_TDECL +#define __SC_STR_TDECL(t, a) #t +#endif + +extern struct trace_event_class event_class_syscall_enter; +extern struct trace_event_class event_class_syscall_exit; +extern struct trace_event_functions enter_syscall_print_funcs; +extern struct trace_event_functions exit_syscall_print_funcs; + +#define COMPAT_SYSCALL_TRACE_ENTER_EVENT(sname) \ + static struct syscall_metadata __syscall_meta_compat_##sname; \ + static struct trace_event_call __used \ + event_enter_compat_##sname = { \ + .class = &event_class_syscall_enter, \ + { \ + .name = "compat_sys_enter"#sname, \ + }, \ + .event.funcs = &enter_syscall_print_funcs, \ + .data = (void *)&__syscall_meta_compat_##sname,\ + .flags = TRACE_EVENT_FL_CAP_ANY, \ + }; \ + static struct trace_event_call __used \ + __attribute__((section("_ftrace_events"))) \ + *__event_enter_compat_##sname = &event_enter_compat_##sname; + +#define COMPAT_SYSCALL_TRACE_EXIT_EVENT(sname) \ + static struct syscall_metadata __syscall_meta_compat_##sname; \ + static struct trace_event_call __used \ + event_exit_compat_##sname = { \ + .class = &event_class_syscall_exit, \ + { \ + .name = "compat_sys_exit"#sname, \ + }, \ + .event.funcs = &exit_syscall_print_funcs, \ + .data = (void *)&__syscall_meta_compat_##sname,\ + .flags = TRACE_EVENT_FL_CAP_ANY, \ + }; \ + static struct trace_event_call __used \ + __attribute__((section("_ftrace_events"))) \ + *__event_exit_compat_##sname = &event_exit_compat_##sname; + +#define COMPAT_SYSCALL_METADATA(sname, nb, ...) \ + static const char *types_compat_##sname[] = { \ + __MAP(nb,__SC_STR_TDECL,__VA_ARGS__) \ + }; \ + static const char *args_compat_##sname[] = { \ + __MAP(nb,__SC_STR_ADECL,__VA_ARGS__) \ + }; \ + COMPAT_SYSCALL_TRACE_ENTER_EVENT(sname); \ + COMPAT_SYSCALL_TRACE_EXIT_EVENT(sname); \ + static struct syscall_metadata __used \ + __syscall_meta_compat_##sname = { \ + .name = "compat_sys"#sname, \ + .nb_args = nb, \ + .types = nb ? types_compat_##sname : NULL, \ + .args = nb ? args_compat_##sname : NULL, \ + .enter_event = &event_enter_compat_##sname, \ + .exit_event = &event_exit_compat_##sname, \ + .enter_fields = LIST_HEAD_INIT(__syscall_meta_compat_##sname.enter_fields), \ + }; \ + static struct syscall_metadata __used \ + __attribute__((section("__syscalls_metadata"))) \ + *__p_syscall_meta_compat_##sname = &__syscall_meta_compat_##sname; +#else +#define COMPAT_SYSCALL_METADATA(sname, nb, ...) +#endif + #define COMPAT_SYSCALL_DEFINE0(name) \ + COMPAT_SYSCALL_METADATA(_##name, 0); \ asmlinkage long compat_sys_##name(void) #define COMPAT_SYSCALL_DEFINE1(name, ...) \ @@ -47,6 +120,7 @@ COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__) #define COMPAT_SYSCALL_DEFINEx(x, name, ...) \ + COMPAT_SYSCALL_METADATA(name, x, __VA_ARGS__) \ asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\ __attribute__((alias(__stringify(compat_SyS##name)))); \ static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 707a57c..10c058f 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -38,12 +38,18 @@ static struct syscall_metadata **syscalls_metadata; static inline bool syscall_match_sym_name(const char *sym, const char *name) { /* - * Only compare after the "sys" prefix. Archs that use + * Only compare after the "sys" or "compat_sys" prefix. Archs that use * syscall wrappers may have syscalls symbols aliases prefixed * with ".SyS" or ".sys" instead of "sys", leading to an unwanted * mismatch. */ - return !strcmp(sym + 3 + ARCH_SYM_NAME_SKIP_CHARS, name + 3); + int prefix_len = 3; + + if (!strncasecmp(sym, "compat_", 7)) + prefix_len = 10; + + return !strcmp(sym + prefix_len + ARCH_SYM_NAME_SKIP_CHARS, + name + prefix_len); } #ifdef ARCH_COMPAT_SYSCALL_NUMBERS_OVERLAP