From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELutPbgqrsJ1T9QHAj2iayM48LrhWUKU6A8NTlIZeBOeE1Rkb4RzPI2+uSrTj7UIbSmlF/5Q ARC-Seal: i=1; a=rsa-sha256; t=1521214894; cv=none; d=google.com; s=arc-20160816; b=JM01dDUp9t/dbk30YBVDZISxdtTGonCS0MPNEKvHRGZ6QccxG6AqTfKhBfoHBd7RCz MJUtyIwK1aBIJeK/TJ0UD/wn+l4vk605XAtToipxP1/RPnlUoexU2b6PBJiEH2Hb8iRv w2GZD4ChloNHmP1BNI3u2O0rwpzEo0uE9ziaxgqr2WMoRCtOIJwCXSpsOML16TN71W/8 CqkfPRKZwjPSJpUWX7it8dTSzPBoAyltdBZ2ioAN9FO1R/IW4+6B3PeaNnc02m/aoIYQ pT2KDWfOVaLZ3jxlRQqQsD0cgbpjKqWYaM+O42EkCe8MAhtVL1/y0lF5ZWBE/jXqozPf ZtdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Yq/BEDq3fpo5JKyQaT6j04GsDm3KACFBVzBVsQWehQQ=; b=PtQ8GjRWuzAqDXT84DtWH7dbClykwdGaFyAIlTQ/y49WXGA3kmEqD4WC3CH9Z0tASV JlLbQ0RVuQpciMSq55wJDP0+P88lMcB0D2a9Fw8J2sUVlCMxDpUgPAx3qUFls5exjaLL G1qtvwoSxWrJbYJLqzS2dvjq08EFNLsrEm22I9AS2h02TmDnlDfNyM08M9Ulb3dUuhVP eY9GWWvfeq4p7nzpNKnFJB4iptdKtyUgbKHzitqcNCy8cphvIpwpSdF+vAUjIyRUtYqb C2D+M8Yujdj2eAP9XJGeC0a3/PGsv++RV61OnvCHEe9c/htukrJuU0S94hc1DnrOZrSS O0Dw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Andi Kleen , David Ahern , Jiri Olsa , Namhyung Kim , Wang Nan , Thomas Gleixner , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 4.15 056/128] perf report: Fix -D output for user metadata events Date: Fri, 16 Mar 2018 16:23:17 +0100 Message-Id: <20180316152339.632837998@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152336.199007505@linuxfoundation.org> References: <20180316152336.199007505@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1595109429616968723?= X-GMAIL-MSGID: =?utf-8?q?1595109429616968723?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit f250b09c779550e4a7a412dae6d3ad34d5201019 ] The PERF_RECORD_USER_ events are synthesized by the tool to assist in processing the PERF_RECORD_ ones generated by the kernel, the printing of that information doesn't come with a perf_sample structure, so, when dumping the event fields using 'perf report -D' there were columns that end up not being printed. To tidy up a bit this, fake a perf_sample structure with zeroes to have the missing columns printed and avoid the occasional surprise with that. Before: 0 0x45b8 [0x68]: PERF_RECORD_MMAP -1/0: [0xffffffffc12ec000(0x4000) @ 0]: x /lib/modules/4.14.0+/kernel/fs/nls/nls_utf8.ko 0x4620 [0x28]: PERF_RECORD_THREAD_MAP nr: 1 thread: 27820 0x4648 [0x18]: PERF_RECORD_CPU_MAP: 0-3 0 0x4660 [0x28]: PERF_RECORD_COMM: perf:27820/27820 0x4a58 [0x8]: PERF_RECORD_FINISHED_ROUND 447723433020976 0x4688 [0x28]: PERF_RECORD_SAMPLE(IP, 0x4001): 27820/27820: 0xffffffff8f1b6d7a period: 1 addr: 0 After: $ perf report -D | grep PERF_RECORD_ | head 0 0xe8 [0x20]: PERF_RECORD_TIME_CONV: unhandled! 0 0x108 [0x28]: PERF_RECORD_THREAD_MAP nr: 1 thread: 32555 0 0x130 [0x18]: PERF_RECORD_CPU_MAP: 0-3 0 0x148 [0x28]: PERF_RECORD_COMM: perf:32555/32555 0 0x4e8 [0x8]: PERF_RECORD_FINISHED_ROUND 448743409421205 0x170 [0x28]: PERF_RECORD_COMM exec: sleep:32555/32555 448743409431883 0x198 [0x68]: PERF_RECORD_MMAP2 32555/32555: [0x55e11d75a000(0x208000) @ 0 fd:00 3147174 2566255743]: r-xp /usr/bin/sleep 448743409443873 0x200 [0x70]: PERF_RECORD_MMAP2 32555/32555: [0x7f0ced316000(0x229000) @ 0 fd:00 3151761 2566238119]: r-xp /usr/lib64/ld-2.25.so 448743409454790 0x270 [0x60]: PERF_RECORD_MMAP2 32555/32555: [0x7ffe84f6d000(0x2000) @ 0 00:00 0 0]: r-xp [vdso] 448743409479500 0x2d0 [0x28]: PERF_RECORD_SAMPLE(IP, 0x4002): 32555/32555: 0xffffffff8f84c7e7 period: 1 addr: 0 $ Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Cc: Thomas Gleixner Fixes: 9aefcab0de47 ("perf session: Consolidate the dump code") Link: https://lkml.kernel.org/n/tip-todcu15x0cwgppkh1gi6uhru@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1350,10 +1350,11 @@ static s64 perf_session__process_user_ev { struct ordered_events *oe = &session->ordered_events; struct perf_tool *tool = session->tool; + struct perf_sample sample = { .time = 0, }; int fd = perf_data__fd(session->data); int err; - dump_event(session->evlist, event, file_offset, NULL); + dump_event(session->evlist, event, file_offset, &sample); /* These events are processed right away */ switch (event->header.type) {