From patchwork Tue Sep 6 05:48:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 75460 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp375230qgf; Mon, 5 Sep 2016 22:49:47 -0700 (PDT) X-Received: by 10.98.25.66 with SMTP id 63mr24451621pfz.94.1473140987430; Mon, 05 Sep 2016 22:49:47 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dj4si33485187pad.195.2016.09.05.22.49.45; Mon, 05 Sep 2016 22:49:47 -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 S1755058AbcIFFtY (ORCPT + 27 others); Tue, 6 Sep 2016 01:49:24 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:7702 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754740AbcIFFtU (ORCPT ); Tue, 6 Sep 2016 01:49:20 -0400 Received: from 172.24.1.137 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.137]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CHJ94774; Tue, 06 Sep 2016 13:49:07 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Tue, 6 Sep 2016 13:48:59 +0800 From: Wang Nan To: CC: , , , Wang Nan , Hou Pengyang , He Kuang , "Arnaldo Carvalho de Melo" Subject: [PATCH 2/2] perf tools: Fix mman macros using mman-fix.h Date: Tue, 6 Sep 2016 05:48:52 +0000 Message-ID: <1473140932-143524-3-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1473140932-143524-1-git-send-email-wangnan0@huawei.com> References: <1473140932-143524-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.0A090201.57CE58D4.001B, 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: 683b187a552ccd9786bb0ade6c42411e Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use mman-fix.h to fix potential undefined macros in mman.h for building perf in old systems. Signed-off-by: Wang Nan Cc: Nilay Vaish Cc: Hou Pengyang Cc: He Kuang Cc: Arnaldo Carvalho de Melo --- tools/perf/trace/beauty/mmap.c | 63 +----------------------------------------- tools/perf/util/event.c | 5 +--- tools/perf/util/map.c | 3 +- 3 files changed, 3 insertions(+), 68 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index d0a3a8e..c96b3e2 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c @@ -1,8 +1,5 @@ #include - -#ifndef PROT_SEM -#define PROT_SEM 0x8 -#endif +#include static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct syscall_arg *arg) @@ -33,31 +30,6 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, #define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot -#ifndef MAP_FIXED -#define MAP_FIXED 0x10 -#endif - -#ifndef MAP_ANONYMOUS -#define MAP_ANONYMOUS 0x20 -#endif - -#ifndef MAP_32BIT -#define MAP_32BIT 0x40 -#endif - -#ifndef MAP_STACK -#define MAP_STACK 0x20000 -#endif - -#ifndef MAP_HUGETLB -#define MAP_HUGETLB 0x40000 -#endif - -#ifndef MAP_UNINITIALIZED -#define MAP_UNINITIALIZED 0x4000000 -#endif - - static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, struct syscall_arg *arg) { @@ -125,39 +97,6 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, #define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags -#ifndef MADV_HWPOISON -#define MADV_HWPOISON 100 -#endif - -#ifndef MADV_SOFT_OFFLINE -#define MADV_SOFT_OFFLINE 101 -#endif - -#ifndef MADV_MERGEABLE -#define MADV_MERGEABLE 12 -#endif - -#ifndef MADV_UNMERGEABLE -#define MADV_UNMERGEABLE 13 -#endif - -#ifndef MADV_HUGEPAGE -#define MADV_HUGEPAGE 14 -#endif - -#ifndef MADV_NOHUGEPAGE -#define MADV_NOHUGEPAGE 15 -#endif - -#ifndef MADV_DONTDUMP -#define MADV_DONTDUMP 16 -#endif - -#ifndef MADV_DODUMP -#define MADV_DODUMP 17 -#endif - - static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, struct syscall_arg *arg) { diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 23c3ebd..df85931 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -1,5 +1,6 @@ #include #include +#include #include #include "event.h" #include "debug.h" @@ -249,10 +250,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; -#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; @@ -347,12 +346,10 @@ 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); diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index f52d460..76c68853 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "map.h" #include "thread.h" #include "strlist.h" @@ -29,9 +30,7 @@ static inline int is_anon_memory(const char *filename, u32 flags) { u32 anon_flags = 0; -#ifdef MAP_HUGETLB anon_flags |= MAP_HUGETLB; -#endif return flags & anon_flags || !strcmp(filename, "//anon") || !strncmp(filename, "/dev/zero", sizeof("/dev/zero") - 1) ||