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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 EE85DC432BE for ; Tue, 24 Aug 2021 06:02:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D66006124B for ; Tue, 24 Aug 2021 06:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234519AbhHXGDG (ORCPT ); Tue, 24 Aug 2021 02:03:06 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:54654 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234558AbhHXGDB (ORCPT ); Tue, 24 Aug 2021 02:03:01 -0400 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17O5wffW027007 for ; Mon, 23 Aug 2021 23:02:17 -0700 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-transfer-encoding : content-type; s=facebook; bh=W/qU/QT00iQ/2r4tg24ubHlMvgwd92oPznBU2FU6UV4=; b=qH90FkmMhIFu6Yp/jFAbKiA6QGVBBUDXr/ceqf2R00DyAzBPVrgqhh/Zb0snPEA2aprd DGLV7zA9kfG/ZIvToq81mzrcq5LlpsBA29rxIM1KWZX/VRVXyRHSeWNHQ6LBMCy1Dqkm IZ8dVD+mISeJOB7BWyf00XMWY9dHruL7fUo= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 3amd2ew0a4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 23 Aug 2021 23:02:17 -0700 Received: from intmgw001.06.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 23 Aug 2021 23:02:16 -0700 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id CC35ADDDF77E; Mon, 23 Aug 2021 23:02:11 -0700 (PDT) From: Song Liu To: , CC: , , , , Song Liu Subject: [PATCH bpf-next 2/3] bpf: introduce helper bpf_get_branch_trace Date: Mon, 23 Aug 2021 23:01:56 -0700 Message-ID: <20210824060157.3889139-3-songliubraving@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824060157.3889139-1-songliubraving@fb.com> References: <20210824060157.3889139-1-songliubraving@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-FB-Source: Intern X-Proofpoint-ORIG-GUID: D_86c360uV8UhtPJyQ1iUqM2IkDT55o5 X-Proofpoint-GUID: D_86c360uV8UhtPJyQ1iUqM2IkDT55o5 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-08-24_01:2021-08-23,2021-08-23 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 bulkscore=0 phishscore=0 adultscore=0 priorityscore=1501 mlxscore=0 clxscore=1015 spamscore=0 impostorscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108240039 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce bpf_get_branch_trace(), which allows tracing pogram to get branch trace from hardware (e.g. Intel LBR). To use the feature, the user need to create perf_event with proper branch_record filtering on each cpu, and then calls bpf_get_branch_trace in the bpf function. On Intel CPUs, VLBR event (raw event 0x1b00) can be use for this. Signed-off-by: Song Liu --- include/linux/filter.h | 3 ++- include/uapi/linux/bpf.h | 16 ++++++++++++++++ kernel/bpf/trampoline.c | 15 +++++++++++++++ kernel/bpf/verifier.c | 7 +++++++ kernel/trace/bpf_trace.c | 30 ++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 16 ++++++++++++++++ 6 files changed, 86 insertions(+), 1 deletion(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index 7d248941ecea3..8c30712f56ab2 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -575,7 +575,8 @@ struct bpf_prog { has_callchain_buf:1, /* callchain buffer allocated? */ enforce_expected_attach_type:1, /* Enforce expected_attach_type chec= king at attach time */ call_get_stack:1, /* Do we call bpf_get_stack() or bpf_get_stackid()= */ - call_get_func_ip:1; /* Do we call get_func_ip() */ + call_get_func_ip:1, /* Do we call get_func_ip() */ + call_get_branch:1; /* Do we call get_branch_trace() */ enum bpf_prog_type type; /* Type of BPF program */ enum bpf_attach_type expected_attach_type; /* For some prog types */ u32 len; /* Number of filter blocks */ diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 191f0b286ee39..4b1ddb76603a5 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -4871,6 +4871,21 @@ union bpf_attr { * Return * Value specified by user at BPF link creation/attachment time * or 0, if it was not specified. + * + * long bpf_get_branch_trace(void *entries, u32 size) + * Description + * Get branch trace from hardware engines like Intel LBR. The + * branch trace is taken soon after the trigger point of the + * BPF program, so it may contain some entries after the + * trigger point. The user need to filter these entries + * accordingly. + * + * The data is stored as struct perf_branch_entry into output + * buffer *entries*. *size* is the size of *entries* in bytes. + * + * Return + * > 0, number of valid output entries. + * **-EOPNOTSUP**, the hardware/kernel does not support this function */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5048,6 +5063,7 @@ union bpf_attr { FN(timer_cancel), \ FN(get_func_ip), \ FN(get_attach_cookie), \ + FN(get_branch_trace), \ /* */ =20 /* integer value in 'imm' field of BPF_CALL instruction selects which he= lper diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c index fe1e857324e66..c36d3d7366cc9 100644 --- a/kernel/bpf/trampoline.c +++ b/kernel/bpf/trampoline.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 /* dummy _ops. The verifier will operate on target program's ops. */ const struct bpf_verifier_ops bpf_extension_verifier_ops =3D { @@ -564,6 +565,20 @@ static void notrace inc_misses_counter(struct bpf_pr= og *prog) u64 notrace __bpf_prog_enter(struct bpf_prog *prog) __acquires(RCU) { + /* Calling migrate_disable costs two entries in the LBR. To save + * some entries, we call perf_snapshot_branch_stack before + * migrate_disable to save some entries. This is OK because we + * care about the branch trace before entering the BPF program. + * If migrate happens exactly here, there isn't much we can do to + * preserve the data. + */ + if (prog->call_get_branch) { +#ifdef CONFIG_HAVE_STATIC_CALL + static_call(perf_snapshot_branch_stack)(); +#else + perf_snapshot_branch_stack(); +#endif + } rcu_read_lock(); migrate_disable(); if (unlikely(__this_cpu_inc_return(*(prog->active)) !=3D 1)) { diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index f5a0077c99811..292d2b471892a 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -6446,6 +6446,13 @@ static int check_helper_call(struct bpf_verifier_e= nv *env, struct bpf_insn *insn env->prog->call_get_func_ip =3D true; } =20 + if (func_id =3D=3D BPF_FUNC_get_branch_trace) { + if (env->prog->aux->sleepable) { + verbose(env, "sleepable progs cannot call get_branch_trace\n"); + return -ENOTSUPP; + } + env->prog->call_get_branch =3D true; + } if (changes_data) clear_all_pkt_pointers(env); return 0; diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index cbc73c08c4a4e..fe0a653190a5f 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1002,6 +1002,19 @@ static const struct bpf_func_proto bpf_get_attach_= cookie_proto_pe =3D { .arg1_type =3D ARG_PTR_TO_CTX, }; =20 +BPF_CALL_2(bpf_get_branch_trace, void *, buf, u32, size) +{ + return perf_read_branch_snapshot(buf, size); +} + +static const struct bpf_func_proto bpf_get_branch_trace_proto =3D { + .func =3D bpf_get_branch_trace, + .gpl_only =3D true, + .ret_type =3D RET_INTEGER, + .arg1_type =3D ARG_PTR_TO_UNINIT_MEM, + .arg2_type =3D ARG_CONST_SIZE_OR_ZERO, +}; + static const struct bpf_func_proto * bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *= prog) { @@ -1115,6 +1128,8 @@ bpf_tracing_func_proto(enum bpf_func_id func_id, co= nst struct bpf_prog *prog) return &bpf_snprintf_proto; case BPF_FUNC_get_func_ip: return &bpf_get_func_ip_proto_tracing; + case BPF_FUNC_get_branch_trace: + return &bpf_get_branch_trace_proto; default: return bpf_base_func_proto(func_id); } @@ -1849,6 +1864,21 @@ void bpf_put_raw_tracepoint(struct bpf_raw_event_m= ap *btp) static __always_inline void __bpf_trace_run(struct bpf_prog *prog, u64 *args) { + /* Calling migrate_disable costs two entries in the LBR. To save + * some entries, we call perf_snapshot_branch_stack before + * migrate_disable to save some entries. This is OK because we + * care about the branch trace before entering the BPF program. + * If migrate happens exactly here, there isn't much we can do to + * preserve the data. + */ + if (prog->call_get_branch) { +#ifdef CONFIG_HAVE_STATIC_CALL + static_call(perf_snapshot_branch_stack)(); +#else + perf_snapshot_branch_stack(); +#endif + } + cant_sleep(); rcu_read_lock(); (void) bpf_prog_run(prog, args); diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bp= f.h index 191f0b286ee39..4b1ddb76603a5 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -4871,6 +4871,21 @@ union bpf_attr { * Return * Value specified by user at BPF link creation/attachment time * or 0, if it was not specified. + * + * long bpf_get_branch_trace(void *entries, u32 size) + * Description + * Get branch trace from hardware engines like Intel LBR. The + * branch trace is taken soon after the trigger point of the + * BPF program, so it may contain some entries after the + * trigger point. The user need to filter these entries + * accordingly. + * + * The data is stored as struct perf_branch_entry into output + * buffer *entries*. *size* is the size of *entries* in bytes. + * + * Return + * > 0, number of valid output entries. + * **-EOPNOTSUP**, the hardware/kernel does not support this function */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -5048,6 +5063,7 @@ union bpf_attr { FN(timer_cancel), \ FN(get_func_ip), \ FN(get_attach_cookie), \ + FN(get_branch_trace), \ /* */ =20 /* integer value in 'imm' field of BPF_CALL instruction selects which he= lper --=20 2.30.2