From patchwork Wed Apr 12 06:35:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balbir Singh X-Patchwork-Id: 749764 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w2vNG0jWhz9sNH for ; Wed, 12 Apr 2017 16:37:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RoRBrJqA"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3w2vNF6YV7zDqCC for ; Wed, 12 Apr 2017 16:37:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RoRBrJqA"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3w2vLk1D0JzDq7h for ; Wed, 12 Apr 2017 16:35:42 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RoRBrJqA"; dkim-atps=neutral Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by bilbo.ozlabs.org (Postfix) with ESMTP id 3w2vLk0WrKz8sZm for ; Wed, 12 Apr 2017 16:35:42 +1000 (AEST) Received: by ozlabs.org (Postfix) id 3w2vLk0LMkz9sNQ; Wed, 12 Apr 2017 16:35:42 +1000 (AEST) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w2vLj4HdTz9sNJ for ; Wed, 12 Apr 2017 16:35:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RoRBrJqA"; dkim-atps=neutral Received: by mail-pf0-x241.google.com with SMTP id a188so3191128pfa.2 for ; Tue, 11 Apr 2017 23:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=k3ur9BgXDMci5cdEM8NJdeODJtiaaVp4j9K3SOWitoQ=; b=RoRBrJqAGryC1ImcNN2YwuovePEVs/MgL+KixVG+joXWQ9eY13u4NLcMGtD85n203U dOljOdJHC4GSgAN3j8QgHVfnTFvk2XXoQxmbrOHjX/x1JMvSCTndxm/fah802ufEXcJ0 Ma0Ep7UhZeHWf/jhBdEQNmvJHXq+pw9ljHvNRO6ztyJwuUs66rg5DoJRAL2g9L2zGJ2p qOyy6t4798XHsBTYuJbVWAd4Cp/QvS2YoZDhl7GEMeUO+QN+R8QLnbgsnHiJreKizKLw 3NpdiEAw1GVvPTo+HLhKtCz7ccGheuL7JakTwByCLzWgW+5tS1MdqHzV76/Y417kfWVy kcmA== 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; bh=k3ur9BgXDMci5cdEM8NJdeODJtiaaVp4j9K3SOWitoQ=; b=c/kQ4Ha3G+cvcqlPjGRVWbxoZtjEpUW7l8fvSdkg3T7r7I5LXjqLgFjMmRClswYJAn 78zSclgEGM6P3WduRyqHd3CUkb6s8mwXmxDXUg6PVGPiPe831rWd2wfJLaBLzR159pjJ bx3ezoU2YPfvJ1TxQ7fys5PzS0gTIH0Y1kH5TltXtK8Cu4rIgClA1eFRigDZxBoGbYrK jRm7l2b8Nu1MaTiMqC99JFCJXomMc1FZ6YmlGyYkjAD8zBrJVGjTQcZrlpbD1XR6FRqp tF1e8tsJKucT0Jtu8oQQ8GZ9RFCsMpD+yw6oGWKVfLkCgRLMjQ26D+O0mu5CaZNb6BE5 7RLw== X-Gm-Message-State: AN3rC/6JssB1F9KIQxJaXz71AofzaeUv3PMSm8vVEUxvqELg7oxfKW6imDXSiPHpxAZ7+A== X-Received: by 10.98.212.11 with SMTP id a11mr3499854pfh.34.1491978940101; Tue, 11 Apr 2017 23:35:40 -0700 (PDT) Received: from firefly.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id s14sm34163278pgs.0.2017.04.11.23.35.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 23:35:38 -0700 (PDT) From: Balbir Singh To: mpe@ellerman.id.au, linuxppc-dev@ozlabs.org Subject: [PATCH] powerpc/syscalls/trace: Fix mmap in syscalls_trace Date: Wed, 12 Apr 2017 16:35:19 +1000 Message-Id: <20170412063519.18560-1-bsingharora@gmail.com> X-Mailer: git-send-email 2.9.3 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: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This patch uses SYSCALL_DEFINE6 for sys_mmap and sys_mmap2 so that the meta-data associated with these syscalls is visible to the syscall tracer. In the absence of this generic syscalls (defined outside arch) like munmap,etc. are visible in available_events, syscall_enter_mmap and syscall_exit_mmap is not. A side-effect of this change is that the return type has changed from unsigned long to long. Prior to these changes, we had, under /sys/kernel/tracing cat available_events | grep syscalls | grep map syscalls:sys_exit_remap_file_pages syscalls:sys_enter_remap_file_pages syscalls:sys_exit_munmap syscalls:sys_enter_munmap syscalls:sys_exit_mremap syscalls:sys_enter_mremap After these changes we have mmap in available_events. cat available_events | grep syscalls | grep map syscalls:sys_exit_mmap syscalls:sys_enter_mmap syscalls:sys_exit_remap_file_pages syscalls:sys_enter_remap_file_pages syscalls:sys_exit_munmap syscalls:sys_enter_munmap syscalls:sys_exit_mremap syscalls:sys_enter_mremap Sample trace: cat-3399 [001] .... 196.542410: sys_mmap(addr: 7fff922a0000, len: 20000, prot: 3, flags: 812, fd: 3, offset: 1b0000) cat-3399 [001] .... 196.542443: sys_mmap -> 0x7fff922a0000 cat-3399 [001] .... 196.542668: sys_munmap(addr: 7fff922c0000, len: 6d2c) cat-3399 [001] .... 196.542677: sys_munmap -> 0x0 Signed-off-by: Balbir Singh --- Changelog: Removed RFC Fixed len from unsigned long to size_t Added some examples of use of mmap trace arch/powerpc/include/asm/syscalls.h | 4 ++-- arch/powerpc/kernel/syscalls.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h index 23be8f1..16fab68 100644 --- a/arch/powerpc/include/asm/syscalls.h +++ b/arch/powerpc/include/asm/syscalls.h @@ -8,10 +8,10 @@ struct rtas_args; -asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len, +asmlinkage long sys_mmap(unsigned long addr, size_t len, unsigned long prot, unsigned long flags, unsigned long fd, off_t offset); -asmlinkage unsigned long sys_mmap2(unsigned long addr, size_t len, +asmlinkage long sys_mmap2(unsigned long addr, size_t len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff); asmlinkage long ppc64_personality(unsigned long personality); diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index de04c9f..a877bf8 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c @@ -42,11 +42,11 @@ #include #include -static inline unsigned long do_mmap2(unsigned long addr, size_t len, +static inline long do_mmap2(unsigned long addr, size_t len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long off, int shift) { - unsigned long ret = -EINVAL; + long ret = -EINVAL; if (!arch_validate_prot(prot)) goto out; @@ -62,16 +62,16 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len, return ret; } -unsigned long sys_mmap2(unsigned long addr, size_t len, - unsigned long prot, unsigned long flags, - unsigned long fd, unsigned long pgoff) +SYSCALL_DEFINE6(mmap2, unsigned long, addr, size_t, len, + unsigned long, prot, unsigned long, flags, + unsigned long, fd, unsigned long, pgoff) { return do_mmap2(addr, len, prot, flags, fd, pgoff, PAGE_SHIFT-12); } -unsigned long sys_mmap(unsigned long addr, size_t len, - unsigned long prot, unsigned long flags, - unsigned long fd, off_t offset) +SYSCALL_DEFINE6(mmap, unsigned long, addr, size_t, len, + unsigned long, prot, unsigned long, flags, + unsigned long, fd, off_t, offset) { return do_mmap2(addr, len, prot, flags, fd, offset, PAGE_SHIFT); }