From patchwork Sun Nov 12 23:40:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 837306 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="GTjQs7K7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqz25Y8fz9s84 for ; Mon, 13 Nov 2017 10:41:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751470AbdKLXlB (ORCPT ); Sun, 12 Nov 2017 18:41:01 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:57814 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751039AbdKLXkS (ORCPT ); Sun, 12 Nov 2017 18:40:18 -0500 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vACNb7ON018652 for ; Sun, 12 Nov 2017 15:40:18 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=v63xu/KRPzslKNNLOOi5Y0NW3ycpodKLN5nH25UcNVY=; b=GTjQs7K7PnxOxgOPPbojTeGFnwurDqRv66Al1VuolWLRjnPLrUzB4OVaxYnt2uC20zLh D4rNUSmTbsHQ/9jPXlNoRivJ7DbYS9KnzjS2KY050i7lhFm0Jpu0sRRYfF7dl4mCAkZf V5oEcWg19ZwRYyOR31y1W2m8kld5cviFTEY= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 2e6xwmr3mf-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Sun, 12 Nov 2017 15:40:18 -0800 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB06.TheFacebook.com (192.168.16.16) with Microsoft SMTP Server id 14.3.361.1; Sun, 12 Nov 2017 15:40:16 -0800 Received: by devbig102.frc2.facebook.com (Postfix, from userid 4523) id 4A7D8428249D; Sun, 12 Nov 2017 15:40:16 -0800 (PST) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig102.frc2.facebook.com To: , , , , , , CC: , Song Liu Smtp-Origin-Cluster: frc2c02 Subject: [RFC v2 2/6] perf: copy new perf_event.h to tools/include/uapi Date: Sun, 12 Nov 2017 15:40:10 -0800 Message-ID: <20171112234014.2983360-5-songliubraving@fb.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171112234014.2983360-1-songliubraving@fb.com> References: <20171112234014.2983360-1-songliubraving@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-12_10:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org perf_event.h is updated in previous patch, this patch applies same changes to the tools/ version. This is part is put in a separate patch in case the two files are back ported separately. Signed-off-by: Song Liu Reviewed-by: Yonghong Song Reviewed-by: Josef Bacik Acked-by: Alexei Starovoitov --- tools/include/uapi/linux/perf_event.h | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 362493a..cc42d59 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h @@ -33,6 +33,7 @@ enum perf_type_id { PERF_TYPE_HW_CACHE = 3, PERF_TYPE_RAW = 4, PERF_TYPE_BREAKPOINT = 5, + PERF_TYPE_PROBE = 6, PERF_TYPE_MAX, /* non-ABI */ }; @@ -299,6 +300,29 @@ enum perf_event_read_format { #define PERF_ATTR_SIZE_VER4 104 /* add: sample_regs_intr */ #define PERF_ATTR_SIZE_VER5 112 /* add: aux_watermark */ +#define MAX_PROBE_FUNC_NAME_LEN 64 +/* + * Describe a kprobe or uprobe for PERF_TYPE_PROBE. + * perf_event_attr.probe_desc will point to this structure. is_uprobe + * and is_return are used to differentiate different types of probe + * (k/u, probe/retprobe). + * + * The two unions should be used as follows: + * For uprobe: use path and offset; + * For kprobe: if func is empty, use addr + * if func is not emtpy, use func and offset + */ +struct probe_desc { + union { + __aligned_u64 func; + __aligned_u64 path; + }; + union { + __aligned_u64 addr; + __u64 offset; + }; +}; + /* * Hardware event_id to monitor via a performance monitoring event: * @@ -320,7 +344,10 @@ struct perf_event_attr { /* * Type specific configuration information. */ - __u64 config; + union { + __u64 config; + __u64 probe_desc; /* ptr to struct probe_desc */ + }; union { __u64 sample_period; @@ -370,7 +397,11 @@ struct perf_event_attr { context_switch : 1, /* context switch data */ write_backward : 1, /* Write ring buffer from end to beginning */ namespaces : 1, /* include namespaces data */ - __reserved_1 : 35; + + /* For PERF_TYPE_PROBE */ + is_uprobe : 1, /* 0: kprobe, 1: uprobe */ + is_return : 1, /* 0: probe, 1: retprobe */ + __reserved_1 : 33; union { __u32 wakeup_events; /* wakeup every n events */