From patchwork Thu Nov 30 01:44:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 842850 X-Patchwork-Delegate: bpf@iogearbox.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="d/or3Ljb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynKz61Y2qz9sDB for ; Thu, 30 Nov 2017 12:47:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753809AbdK3BrY (ORCPT ); Wed, 29 Nov 2017 20:47:24 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:47982 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753109AbdK3Bo7 (ORCPT ); Wed, 29 Nov 2017 20:44:59 -0500 Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vAU1hBqd004318 for ; Wed, 29 Nov 2017 17:44:58 -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=SYZyhsvnEtX98DHJv/w/1z7fnBoLRvdE3kQVAkzNhhQ=; b=d/or3Ljbzmd+pS3FygJibOGvb5KMqOC7c9mC9XS7NOmdzdmM9g8mg20G72gIg3iObvxf IPcJA9Kf5iip2Sug9FC4UvVKxFHOdD9uNa/MSRV1UMP7vTMgMQXZIQQ7iqkFrDwZOf4G rapOzULvrjonlDdmEATlPYIZO/+E/jBWgwo= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2ej6wa07nt-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 29 Nov 2017 17:44:58 -0800 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB08.TheFacebook.com (192.168.16.18) with Microsoft SMTP Server id 14.3.361.1; Wed, 29 Nov 2017 17:44:57 -0800 Received: by devbig102.frc2.facebook.com (Postfix, from userid 4523) id C27B6428284A; Wed, 29 Nov 2017 17:44:56 -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: [PATCH v2 1/6] perf: Add new types PERF_TYPE_KPROBE and PERF_TYPE_UPROBE Date: Wed, 29 Nov 2017 17:44:41 -0800 Message-ID: <20171130014447.190229-3-songliubraving@fb.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171130014447.190229-1-songliubraving@fb.com> References: <20171130014447.190229-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-29_09:, , 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 Two new perf types, PERF_TYPE_KPROBE and PERF_TYPE_UPROBE, are added to allow creating [k,u]probe with perf_event_open. These [k,u]probe are associated with the file decriptor created by perf_event_open, thus are easy to clean when the file descriptor is destroyed. kprobe_func and uprobe_path are added to union config1 for pointers to function name for kprobe or binary path for uprobe. kprobe_addr and probe_offset are added to union config2 for kernel address (when kprobe_func is NULL), or [k,u]probe offset. Signed-off-by: Song Liu Reviewed-by: Yonghong Song Reviewed-by: Josef Bacik Acked-by: Alexei Starovoitov --- include/uapi/linux/perf_event.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 362493a..5220600 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -33,6 +33,8 @@ enum perf_type_id { PERF_TYPE_HW_CACHE = 3, PERF_TYPE_RAW = 4, PERF_TYPE_BREAKPOINT = 5, + PERF_TYPE_KPROBE = 6, + PERF_TYPE_UPROBE = 7, PERF_TYPE_MAX, /* non-ABI */ }; @@ -299,6 +301,8 @@ 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 + /* * Hardware event_id to monitor via a performance monitoring event: * @@ -380,10 +384,14 @@ struct perf_event_attr { __u32 bp_type; union { __u64 bp_addr; + __u64 kprobe_func; /* for PERF_TYPE_KPROBE */ + __u64 uprobe_path; /* for PERF_TYPE_UPROBE */ __u64 config1; /* extension of config */ }; union { __u64 bp_len; + __u64 kprobe_addr; /* for PERF_TYPE_KPROBE, with kprobe_func == NULL */ + __u64 probe_offset; /* for PERF_TYPE_[K,U]PROBE */ __u64 config2; /* extension of config1 */ }; __u64 branch_sample_type; /* enum perf_branch_sample_type */