From patchwork Tue Sep 6 04:58:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 75457 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp360459qgf; Mon, 5 Sep 2016 21:59:34 -0700 (PDT) X-Received: by 10.98.196.130 with SMTP id h2mr27894983pfk.140.1473137974604; Mon, 05 Sep 2016 21:59:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f81si19948152pfj.40.2016.09.05.21.59.34; Mon, 05 Sep 2016 21:59:34 -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 S1754819AbcIFE7P (ORCPT + 27 others); Tue, 6 Sep 2016 00:59:15 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:12034 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582AbcIFE7M (ORCPT ); Tue, 6 Sep 2016 00:59:12 -0400 Received: from 172.24.1.136 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.136]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DQQ84625; Tue, 06 Sep 2016 12:58:45 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.235.1; Tue, 6 Sep 2016 12:58:35 +0800 From: Wang Nan To: CC: , , , Wang Nan , Hou Pengyang , He Kuang , "Arnaldo Carvalho de Melo" Subject: [PATCH v2 3/3] perf record: Mark MAP_HUGETLB during synthesizing mmap events Date: Tue, 6 Sep 2016 04:58:29 +0000 Message-ID: <1473137909-142064-4-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1473137909-142064-1-git-send-email-wangnan0@huawei.com> References: <1473137909-142064-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.57CE4D06.0081, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 15a204d6a5dd09a2f7bc77779f1d1ca4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During 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 perf top). Signed-off-by: Wang Nan Reviewed-by: Nilay Vaish Cc: Hou Pengyang Cc: He Kuang Cc: Arnaldo Carvalho de Melo --- tools/perf/util/event.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 1.8.3.4 diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index e20438b..23c3ebd 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);