From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AFCFC433E2 for ; Sun, 13 Sep 2020 21:03:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4ABDF221F0 for ; Sun, 13 Sep 2020 21:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600031030; bh=6jTJ5hCPeAG1qV+ZNiIoPA26k387rlEQL8p7N9WwbLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BzOqPG8Vm2BR5FX7nQCYaiv2xd3dVWVomQpCsaa7tlB7ZJw2tYZ44a4JG/rc1ZlDi zDtp40HXFjxyMZdpViewSYvxJXsXLYk0ksdg5yu8UXrqUpVANhJ/HvRW+AtJTl3QRk 67FijzJlmZd17vX7rkZnCpiBPLfHhDt2OGY/ZH7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725987AbgIMVDs convert rfc822-to-8bit (ORCPT ); Sun, 13 Sep 2020 17:03:48 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33758 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725968AbgIMVDm (ORCPT ); Sun, 13 Sep 2020 17:03:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-KDjRN5-RMfKk6dQltk75jw-1; Sun, 13 Sep 2020 17:03:34 -0400 X-MC-Unique: KDjRN5-RMfKk6dQltk75jw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 554C6185A0E5; Sun, 13 Sep 2020 21:03:32 +0000 (UTC) Received: from krava.redhat.com (ovpn-112-4.ams2.redhat.com [10.36.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAC471002393; Sun, 13 Sep 2020 21:03:27 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Michael Petlan , Song Liu , "Frank Ch. Eigler" , Ian Rogers , Stephane Eranian , Alexey Budankov , Andi Kleen , Adrian Hunter Subject: [PATCH 03/26] tools headers uapi: Sync tools/include/uapi/linux/perf_event.h Date: Sun, 13 Sep 2020 23:02:50 +0200 Message-Id: <20200913210313.1985612-4-jolsa@kernel.org> In-Reply-To: <20200913210313.1985612-1-jolsa@kernel.org> References: <20200913210313.1985612-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sync uapi header with kernel version for mmap3 support. Signed-off-by: Jiri Olsa --- tools/include/uapi/linux/perf_event.h | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 3e5dcdd48a49..84a0cbdab1ef 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h @@ -384,7 +384,8 @@ struct perf_event_attr { aux_output : 1, /* generate AUX records instead of events */ cgroup : 1, /* include cgroup events */ text_poke : 1, /* include text poke events */ - __reserved_1 : 30; + mmap3 : 1, /* include bpf events */ + __reserved_1 : 29; union { __u32 wakeup_events; /* wakeup every n events */ @@ -1060,6 +1061,30 @@ enum perf_event_type { */ PERF_RECORD_TEXT_POKE = 20, + /* + * The MMAP3 records are an augmented version of MMAP2, they add + * build id value to identify the exact binary behind map + * + * struct { + * struct perf_event_header header; + * + * u32 pid, tid; + * u64 addr; + * u64 len; + * u64 pgoff; + * u32 maj; + * u32 min; + * u64 ino; + * u64 ino_generation; + * u32 prot, flags; + * u32 reserved; + * u8 buildid[20]; + * char filename[]; + * struct sample_id sample_id; + * }; + */ + PERF_RECORD_MMAP3 = 21, + PERF_RECORD_MAX, /* non-ABI */ }; -- 2.26.2