From patchwork Fri Jul 15 22:25:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 72152 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp23910qga; Fri, 15 Jul 2016 15:26:16 -0700 (PDT) X-Received: by 10.66.80.2 with SMTP id n2mr35445989pax.134.1468621575831; Fri, 15 Jul 2016 15:26:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r73si2434819pfi.287.2016.07.15.15.26.15; Fri, 15 Jul 2016 15:26:15 -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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751820AbcGOWZu (ORCPT + 29 others); Fri, 15 Jul 2016 18:25:50 -0400 Received: from mail-io0-f175.google.com ([209.85.223.175]:34844 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbcGOWZq (ORCPT ); Fri, 15 Jul 2016 18:25:46 -0400 Received: by mail-io0-f175.google.com with SMTP id m101so116138669ioi.2 for ; Fri, 15 Jul 2016 15:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=28KjItPyRbj7SibE49DPk2DKvEPubGTLSxPAAYHdLSw=; b=cucjPhrEMJvdM/kH6viqXknAdeExfJOyja6YMaPgvecB9NlbZs+IZzfqbVo+cBB+1/ G7V++BbTZggoLaCAA7KBxXBafONCARDGAm1cyJosw4lmnsIQMljV6glGicDClMEiSIsH KOVeGQOdQC+BRc/hzZe4uKZjzyWirgxPdGJmw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=28KjItPyRbj7SibE49DPk2DKvEPubGTLSxPAAYHdLSw=; b=a9iEtS0VDiVI7+fy720Z9/aMM+cgd36d5mBuYJOV9B9hlGhHSOhS88Z2e633PSwg57 qRTj/O63VJwDgpV2fyq3zQx8KUqMn+O+4aHb2gbs5rgLyCeJKxZMZEILPTmOTW40Fdi3 F8YCPGTBefBp1SKsTlNXSEzbLXB/e2i4MuRo2KP1YWHUm9WGRRQtvWs27uT6PvIraUap lI3yY1wR6uBMKzkammGgUuMJ3R1Tp4s27NsCAsY9bStJZyZnUF4mApiy2LSYt6lribLl AVgdDkvvYAub478G+wCWd2AWZmw6UgwQpKWd62suWtjYkVcxvJxgpEbRtb0P8F8PcYNn YRKA== X-Gm-Message-State: ALyK8tJUE6N4VG2BqqdwDqqOoO43hUsCM1oZvKYP5GicfMp5lbzzA402Hxleq55VP5YRWC2T X-Received: by 10.107.38.76 with SMTP id m73mr26955647iom.7.1468621545310; Fri, 15 Jul 2016 15:25:45 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id d15sm302758itb.12.2016.07.15.15.25.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 15:25:44 -0700 (PDT) From: Mathieu Poirier To: alexander.shishkin@linux.intel.com Cc: peterz@infradead.org, mingo@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH RFC 2/3] perf/core: update filter only on executable mmap Date: Fri, 15 Jul 2016 16:25:40 -0600 Message-Id: <1468621541-31024-3-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468621541-31024-1-git-send-email-mathieu.poirier@linaro.org> References: <1468621541-31024-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Function perf_event_mmap() is called by the MM subsystem each time part of a binary is loaded in memory. There can be several mapping for a binary, many times unrelated to the code section. Each time a section of a binary is mapped address filters are updated, event when the map doesn't pertain to the code section. The end result is that filters are configured based on the last map event that was received rather than the last mapping of the code segment. For example if we have an executable 'main' that calls library 'libcstest.so.1.0', and that we want to collect traces on code that is in that library. The perf cmd line for this scenario would be: perf record -e cs_etm// --filter 'filter 0x72c/0x40@/opt/lib/libcstest.so.1.0' --per-thread ./main Resulting in binaries being mapped this way: root@linaro-nano:~# cat /proc/1950/maps 00400000-00401000 r-xp 00000000 08:02 33169 /home/linaro/main 00410000-00411000 r--p 00000000 08:02 33169 /home/linaro/main 00411000-00412000 rw-p 00001000 08:02 33169 /home/linaro/main 7fa2464000-7fa2474000 rw-p 00000000 00:00 0 7fa2474000-7fa25a4000 r-xp 00000000 08:02 543 /lib/aarch64-linux-gnu/libc-2.21.so 7fa25a4000-7fa25b3000 ---p 00130000 08:02 543 /lib/aarch64-linux-gnu/libc-2.21.so 7fa25b3000-7fa25b7000 r--p 0012f000 08:02 543 /lib/aarch64-linux-gnu/libc-2.21.so 7fa25b7000-7fa25b9000 rw-p 00133000 08:02 543 /lib/aarch64-linux-gnu/libc-2.21.so 7fa25b9000-7fa25bd000 rw-p 00000000 00:00 0 7fa25bd000-7fa25be000 r-xp 00000000 08:02 38308 /opt/lib/libcstest.so.1.0 7fa25be000-7fa25cd000 ---p 00001000 08:02 38308 /opt/lib/libcstest.so.1.0 7fa25cd000-7fa25ce000 r--p 00000000 08:02 38308 /opt/lib/libcstest.so.1.0 7fa25ce000-7fa25cf000 rw-p 00001000 08:02 38308 /opt/lib/libcstest.so.1.0 7fa25cf000-7fa25eb000 r-xp 00000000 08:02 574 /lib/aarch64-linux-gnu/ld-2.21.so 7fa25ef000-7fa25f2000 rw-p 00000000 00:00 0 7fa25f7000-7fa25f9000 rw-p 00000000 00:00 0 7fa25f9000-7fa25fa000 r--p 00000000 00:00 0 [vvar] 7fa25fa000-7fa25fb000 r-xp 00000000 00:00 0 [vdso] 7fa25fb000-7fa25fc000 r--p 0001c000 08:02 574 /lib/aarch64-linux-gnu/ld-2.21.so 7fa25fc000-7fa25fe000 rw-p 0001d000 08:02 574 /lib/aarch64-linux-gnu/ld-2.21.so 7ff2ea8000-7ff2ec9000 rw-p 00000000 00:00 0 [stack] root@linaro-nano:~# Before 'main' can execute 'libcstest.so.1.0' has to be loaded in memory. Once that has been done perf_event_mmap() has been called 4 times, with the last map starting at address 0x7fa25ce000 and the address filter configured to start filtering when the IP has passed over address 0x0x7fa25ce72c (0x7fa25ce000 + 0x72c). But that is wrong since the code segment for library 'libcstest.so.1.0' as been mapped at 0x7fa25bd000, resulting in traces not being collected. This patch corrects the situation by requesting that address filters be updated only if the mapped event is for a code segment. Signed-off-by: Mathieu Poirier --- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/kernel/events/core.c b/kernel/events/core.c index df21611585d7..b9aa8f0ff070 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6604,7 +6604,8 @@ void perf_event_mmap(struct vm_area_struct *vma) /* .flags (attr_mmap2 only) */ }; - perf_addr_filters_adjust(vma); + if ((vma->vm_flags & VM_EXEC) && (vma->vm_pgoff == 0)) + perf_addr_filters_adjust(vma); perf_event_mmap_event(&mmap_event); }