From patchwork Thu Sep 8 20:46:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 75829 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp26531qgf; Thu, 8 Sep 2016 13:49:22 -0700 (PDT) X-Received: by 10.98.62.90 with SMTP id l87mr2840444pfa.99.1473367762192; Thu, 08 Sep 2016 13:49:22 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w79si41782167pfk.131.2016.09.08.13.49.21; Thu, 08 Sep 2016 13:49:22 -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 S1758341AbcIHUtS (ORCPT + 27 others); Thu, 8 Sep 2016 16:49:18 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:48728 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756519AbcIHUqe (ORCPT ); Thu, 8 Sep 2016 16:46:34 -0400 Received: from 191-247-226-42.3g.claro.net.br ([191.247.226.42] helo=jouet.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.85_2 #1 (Red Hat Linux)) id 1bi6DP-0004KP-Ut; Thu, 08 Sep 2016 20:46:32 +0000 Received: by jouet.infradead.org (Postfix, from userid 1000) id CF5DE143F8A; Thu, 8 Sep 2016 17:46:23 -0300 (BRT) From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Wang Nan , He Kuang , Hou Pengyang , Zefan Li , Arnaldo Carvalho de Melo Subject: [PATCH 08/12] perf record: Mark MAP_HUGETLB when synthesizing mmap events Date: Thu, 8 Sep 2016 17:46:17 -0300 Message-Id: <1473367581-5996-9-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473367581-5996-1-git-send-email-acme@kernel.org> References: <1473367581-5996-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Nan When synthesizing mmap events, add MAP_HUGETLB map flag if the source of mapping is file in hugetlbfs. After this patch, perf can identify hugetlb mapping even if perf is started after the mapping of huge pages (like with 'perf top'). Signed-off-by: Wang Nan Reviewed-by: Nilay Vaish Cc: He Kuang Cc: Hou Pengyang Cc: Zefan Li Link: http://lkml.kernel.org/r/1473137909-142064-4-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/event.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.7.4 diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 9ad7d32dba2b..6c3017139c67 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -1,5 +1,6 @@ #include #include +#include #include "event.h" #include "debug.h" #include "hist.h" @@ -248,6 +249,10 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool, bool truncation = false; unsigned long long timeout = proc_map_timeout * 1000000ULL; int rc = 0; +#ifdef MAP_HUGETLB + const char *hugetlbfs_mnt = hugetlbfs__mountpoint(); + int hugetlbfs_mnt_len = hugetlbfs_mnt ? strlen(hugetlbfs_mnt) : 0; +#endif if (machine__is_default_guest(machine)) return 0; @@ -342,6 +347,12 @@ out: if (!strcmp(execname, "")) strcpy(execname, anonstr); +#ifdef MAP_HUGETLB + if (!strncmp(execname, hugetlbfs_mnt, hugetlbfs_mnt_len)) { + strcpy(execname, anonstr); + event->mmap2.flags |= MAP_HUGETLB; + } +#endif size = strlen(execname) + 1; memcpy(event->mmap2.filename, execname, size);