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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21629C433EF for ; Thu, 16 Dec 2021 22:23:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233727AbhLPWXK (ORCPT ); Thu, 16 Dec 2021 17:23:10 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:64072 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233713AbhLPWXK (ORCPT ); Thu, 16 Dec 2021 17:23:10 -0500 Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BGJ1qDL006085 for ; Thu, 16 Dec 2021 14:23:09 -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-transfer-encoding : content-type; s=facebook; bh=kZGp4SALCBQYWguUiQk5w6Jyl0sb+Yx0G89kpUgWXKM=; b=nsuFEeWbhPZZMf6rHggVEjV4gTA1gYXOrrfvhggkSgBVd83klhYnT+j6gRol+o9GWIHM IN8zvdiEdIkztbj+MNuMlXS7ksXL49bgdEnjKEvJhOcN9USLAwDl8MDEzg8c8flWK7kp PVGo8weG2fIVWF+o1QndysOI2XcYn8rb+jU= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3d03d5w86m-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 16 Dec 2021 14:23:09 -0800 Received: from twshared10140.39.prn1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 16 Dec 2021 14:22:07 -0800 Received: by devbig921.prn2.facebook.com (Postfix, from userid 132113) id E4B707909AD; Thu, 16 Dec 2021 14:22:02 -0800 (PST) From: Christy Lee To: , CC: , , , , Subject: [PATCH bpf-next 1/2] perf: stop using deprecated bpf_prog_load() API Date: Thu, 16 Dec 2021 14:21:07 -0800 Message-ID: <20211216222108.110518-2-christylee@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211216222108.110518-1-christylee@fb.com> References: <20211216222108.110518-1-christylee@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: QEyh1M2upd8NUIFVGCiqUcPKbtoimBbu X-Proofpoint-GUID: QEyh1M2upd8NUIFVGCiqUcPKbtoimBbu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-16_09,2021-12-16_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 suspectscore=0 mlxscore=0 priorityscore=1501 adultscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 impostorscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112160117 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Signed-off-by: Christy Lee Acked-by: Andrii Nakryiko --- tools/perf/tests/bpf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c index 573490530194..57b9591f7cbb 100644 --- a/tools/perf/tests/bpf.c +++ b/tools/perf/tests/bpf.c @@ -281,8 +281,8 @@ static int __test__bpf(int idx) =20 static int check_env(void) { + LIBBPF_OPTS(bpf_prog_load_opts, opts); int err; - unsigned int kver_int; char license[] =3D "GPL"; =20 struct bpf_insn insns[] =3D { @@ -290,19 +290,13 @@ static int check_env(void) BPF_EXIT_INSN(), }; =20 - err =3D fetch_kernel_version(&kver_int, NULL, 0); + err =3D fetch_kernel_version(&opts.kern_version, NULL, 0); if (err) { pr_debug("Unable to get kernel version\n"); return err; } - -/* temporarily disable libbpf deprecation warnings */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - err =3D bpf_load_program(BPF_PROG_TYPE_KPROBE, insns, - ARRAY_SIZE(insns), - license, kver_int, NULL, 0); -#pragma GCC diagnostic pop + err =3D bpf_prog_load(BPF_PROG_TYPE_KPROBE, NULL, license, insns, + ARRAY_SIZE(insns), &opts); if (err < 0) { pr_err("Missing basic BPF support, skip this test: %s\n", strerror(errno)); --=20 2.30.2