From patchwork Fri Sep 2 13:59:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 75306 Delivered-To: patch@linaro.org Received: by 10.140.29.8 with SMTP id a8csp887663qga; Fri, 2 Sep 2016 07:00:42 -0700 (PDT) X-Received: by 10.202.75.135 with SMTP id y129mr2227291oia.172.1472824841843; Fri, 02 Sep 2016 07:00:41 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z192si11771813oig.147.2016.09.02.07.00.41; Fri, 02 Sep 2016 07:00:41 -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 S1754090AbcIBOAj (ORCPT + 27 others); Fri, 2 Sep 2016 10:00:39 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:42693 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752956AbcIBOAY (ORCPT ); Fri, 2 Sep 2016 10:00:24 -0400 Received: from 172.24.1.137 (EHLO szxeml430-hub.china.huawei.com) ([172.24.1.137]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CHG03745; Fri, 02 Sep 2016 22:00:07 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.235.1; Fri, 2 Sep 2016 21:59:55 +0800 From: Wang Nan To: CC: , , Wang Nan , Hou Pengyang , He Kuang , Arnaldo Carvalho de Melo Subject: [PATCH 3/3] perf record: Mark MAP_HUGETLB during synthesizing mmap events Date: Fri, 2 Sep 2016 13:59:47 +0000 Message-ID: <1472824787-107939-4-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1472824787-107939-1-git-send-email-wangnan0@huawei.com> References: <1472824787-107939-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.0A020204.57C985E7.00E3, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 5415aad71089f5510878e0fe5433d254 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 Cc: Hou Pengyang Cc: He Kuang Cc: Arnaldo Carvalho de Melo --- tools/perf/util/event.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 1.8.3.4 diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index e20438b..4c2abdf 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,8 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool, bool truncation = false; unsigned long long timeout = proc_map_timeout * 1000000ULL; int rc = 0; + const char *hugetlbfs_mnt = hugetlbfs__mountpoint(); + int hugetlbfs_mnt_len = hugetlbfs_mnt ? strlen(hugetlbfs_mnt) : 0; if (machine__is_default_guest(machine)) return 0; @@ -342,6 +345,10 @@ out: if (!strcmp(execname, "")) strcpy(execname, anonstr); + if (!strncmp(execname, hugetlbfs_mnt, hugetlbfs_mnt_len)) { + strcpy(execname, anonstr); + event->mmap2.flags |= MAP_HUGETLB; + } size = strlen(execname) + 1; memcpy(event->mmap2.filename, execname, size);