From patchwork Fri Mar 11 00:11:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delyan Kratunov X-Patchwork-Id: 12777130 X-Patchwork-Delegate: bpf@iogearbox.net 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 D3756C433F5 for ; Fri, 11 Mar 2022 00:11:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239727AbiCKAM4 (ORCPT ); Thu, 10 Mar 2022 19:12:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238512AbiCKAMz (ORCPT ); Thu, 10 Mar 2022 19:12:55 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ACE91A06E3 for ; Thu, 10 Mar 2022 16:11:53 -0800 (PST) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22AJFwk3005490 for ; Thu, 10 Mar 2022 16:11:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=facebook; bh=kTk9nENb9hAH9nik26fqOePPPvFRZeNfjevwh9PJBeE=; b=GwzRG8We0gk5n3Nj/RTb9u//+lGm2kTlaKAxWo1Da3OWlWa/7NbafoW/7dJ2PQgPRigj nRYlozg4U6RsFaYjCZQkHI7ouVZNKr/ktV43AIKXvTXPAzAqgzDP1JRqy+MNjDKoDC+J UZV8yX5XK7n4aTm59ieJ8xv3p5BeUj94fvE= Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2172.outbound.protection.outlook.com [104.47.58.172]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3eqqb5sykk-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Mar 2022 16:11:52 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OrFE/rr6IOUuZWMdYAoA9+KVebMu6KLY/oc/HU67/teshUYh5YC5IvtcbDjRspHI8iqK4JFy8N27kRLzImLPLGIe4YwrMrO3Fb8QBNrsCzohj+jNDxXe8Ilc5HHrFXAXN1DAbrs/yDtYGeSUkorUPZ7ykDH0NlawA5cnScBYiNcVcJyam/cxaRBCmjL/vhcnRje1+bNEdBWRKx1C5Yh7sJjN4Yce9yNmjiBsTF7L8N03U9LqyidoHWmX+z6t4MHa8Pld/ifjx0R5OEN3+mMBFH47NT1xFZQa1FSpY+Xj/B9l9UnYOjKsnUZzXqZDo96F8vBvx2zMi0gPnJ0SODHucw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kTk9nENb9hAH9nik26fqOePPPvFRZeNfjevwh9PJBeE=; b=c1k8Y8hs1Ybrk9g52c58Mznf9wwPAGyq+/vsv+wYAL6NTAQUJpW/4ks5XMLioG5kpKAa5wtS+6r7UdNl6hOFJa5uey9PzrqT/O14vXVP/fzo/xriOgDftXAqpNqs1wXI1ZGWOO7fthBQ0PYn9rwSILa94aFScrVapczj8YwePHH5EvUXU3/1KqhK/T1uUUvgwuGcTaqM5qIxrTzxT3kOCZmYp/cCsyKz95kGQA96hLDE1nRhk+hUYyC/iJfAPNa+Cno2WZ6XEhUeD+JMJST42SgVn0FSYH4y2mmnyY6CcTG5VuGVI5scEWwoTxNmeJyXZs1j1/GA+EeVebpm6cvxnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none Received: from SJ0PR15MB5154.namprd15.prod.outlook.com (2603:10b6:a03:423::6) by BN6PR15MB1170.namprd15.prod.outlook.com (2603:10b6:404:e8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22; Fri, 11 Mar 2022 00:11:50 +0000 Received: from SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3]) by SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3%6]) with mapi id 15.20.5061.022; Fri, 11 Mar 2022 00:11:50 +0000 From: Delyan Kratunov To: "daniel@iogearbox.net" , "ast@kernel.org" , "andrii@kernel.org" , "bpf@vger.kernel.org" Subject: [PATCH bpf-next v2 1/5] libbpf: add new strict flag for .text subprograms Thread-Topic: [PATCH bpf-next v2 1/5] libbpf: add new strict flag for .text subprograms Thread-Index: AQHYNNyaxglbi9iXjEWczoM5ePpXcw== Date: Fri, 11 Mar 2022 00:11:49 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e34ccb98-a20e-4c57-a3f9-08da02f3bd30 x-ms-traffictypediagnostic: BN6PR15MB1170:EE_ x-microsoft-antispam-prvs: x-fb-source: Internal x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Wstfnfj5nqGguMNdTxXue626kwqBv0Ud9B87aKdN9OPKGY06TiFIt7/x7iCMQ5RQBg+SZewxhLIU3Njx1NJiQ/n1EyCAuYPQYJ2yN2qikeOlpKU2+Fc494LnJ51S0Xhr1J8cFJssRRORlPBiSfV6IgFDKMob9TPyTvFnnrNu92o3EuY/aSu8H1Y9+P2909whBNtpC3PO3TuNvlVVTEfkpL8atoAAJZTq04gc+fFTYxoKYtG8yOEuATyImwK5OsBWl70vHHMGygSgEpUCs/e468GtPDcZBHccKQy1E59/fd9l1GLfMBlPP+iQEkv2Ors3Ji9xskjagEydGorUShuD9LPsbzDyDV5gjr+Ah+nB7M3+bCwOk0XjV+PtLcvhlQBLnh2CgF89MRBWRVHlm+QdaRXObkfz58vDMTAx/gFjPYxxdkFSTTRrQrESt/KKWX+H3rXEi9IE8CIX41xQ01CZKZqg8fLshOK42wRRWT7p99Ufep3pTFBAEaAtQV0jmyaARUsnTo8xvvntPMbjkpooauLNyEsKJbKhqgpp3mILbqm+uc2h1QZjQlrHmM8holtLSILTxANYtr0PR3d4OQFteGaBMsUcj8SpN8H6or+5SIxnSrrvYpqpAZkvDvshRgpjRydRh0eEnUI+W5NyDw24JPvc8Gam+UrNzDbVzsI/ElHQoreDssfOaIqVm2SiKz9QrsDet0DGq/8wRLMeO0LRvnx6/SduujmtAR2Fg4iMdWs= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR15MB5154.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66556008)(66446008)(66476007)(8676002)(91956017)(38070700005)(66946007)(64756008)(76116006)(6506007)(186003)(8936002)(316002)(36756003)(122000001)(38100700002)(71200400001)(508600001)(5660300002)(6486002)(2906002)(6512007)(110136005)(2616005)(86362001)(142923001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?0aZVRlGXJCO1nnUflc2pJz0?= =?iso-8859-1?q?7Vy4H5NM40V0GstEyafL2PjwpcOBiz7iKFShwKlezD9LdNzfzYQ81XTuiYdK?= =?iso-8859-1?q?A8sXKbFeF7hChcjOdr1NRvWPJ6+SROSj3t8s67Pijnz4wZBizqwydnNkjxbO?= =?iso-8859-1?q?1fbCh2so83kOOwCvwD1voNguVekpnX+Ju+7Y1BF0uluFWdBcbpg9YopOwBbD?= =?iso-8859-1?q?3jXbO22e/gdDl/br2/d2AHZWYGWmPCjjDvV3dxUWB6QXJpWxTWvOtg1UMZnw?= =?iso-8859-1?q?9jGuSPDjEPXvsvSYUy/BnceVeT/lgkp/qhH6atafj+dBxFtIAkZ5+WyFskOK?= =?iso-8859-1?q?+XGQlolqZlOl40Hj5OSd/JKpMDvu0wY9wpYB88HNxMFHRN9SobdpLGTNrjmz?= =?iso-8859-1?q?Ng5Q0zJr8ELw9mJdxrzt2W0cVKsUMywnOiVoJ1eZAwJ1/bAouVn/Gmjq8y7/?= =?iso-8859-1?q?yuOTY6eYi4owogxvp2+TgFPbpbr3cSoY+z6f5uNpzjLn+07VV0/wKpT00aQm?= =?iso-8859-1?q?A6H37/QrNP9pr3eH/b5h4m9mR8EUqIGH9fNtdHhNvYB0inTRihWjkKsxbgcg?= =?iso-8859-1?q?r+KFdLBheYlFlRhoX6rZkssgSFTsIJHon4J2Ff5WXQhb1ERN060ushanZWVy?= =?iso-8859-1?q?DdXy4N8oiMLOToF7DoH0afy4d4omcE/LaZZVc4Nj3hOGAS+UR+UxxPb8nuXE?= =?iso-8859-1?q?co84Mt3V4i1bUOvH5IYB3sax1iuVz9tERUSk5j3VjPHsARGK5M0DoQT4DdUJ?= =?iso-8859-1?q?M9NPI5kTzsKMmxBqhh/jEXdy1QpmHzPYJqGDWkvA7GQguNsMOlca/buEg6sj?= =?iso-8859-1?q?tpMUYLSz8t/dpI/EEnhJVpBTYRRH+7GO3zBCgJuobfLdCeYPlZgaOILVLEyW?= =?iso-8859-1?q?3Kxx4mXQCBidd7yILJgIurfZ92iD10pAMBOdCP6tkUg8FuOJqeV1ZrH+ZpQ8?= =?iso-8859-1?q?xctFcX9mpA/b/WlG58FY5fEZ7gfutG/EdO4ceoztrZTBgUJezelofhrelUiW?= =?iso-8859-1?q?IcaP1I9WNbJL0UZeEkmGquz6PnLzhcQcFV7MVh0Cc4gViE0WJ5j8eTWe7Q5A?= =?iso-8859-1?q?qQIPbTRDGpYjkx7Q/t73z9Ngyoi0W23Sp+lwLaWuFgC1da299TmbbZujPpTw?= =?iso-8859-1?q?CWlu0RUUGYiyikxR5S9iq0N1jLyGX6yCdSvZFLDzhniW/uI7BrFZm8InGb3W?= =?iso-8859-1?q?dOt1zdnt+HdsH/P8nSHOJ8nrBa4uj1NEbFQIbgZzV8FJJKwArJ6K9k1QoYWB?= =?iso-8859-1?q?KkUamy12ZZge0zp503NtDkQ7ll+RCk682nYlvPNfVo7w9B0cOB9BIpgzbSaL?= =?iso-8859-1?q?qOrYQm2LOYDcu1XZxCvc3/tcnq6+BUBEBXtw9H2icSIAD75cc5ZbIgHXT0Wr?= =?iso-8859-1?q?kElzi20A9bNDHBkun4QhhoBdLl8UoXNn4n8lLGG9QF5ZwjI07d/rBncwlbPD?= =?iso-8859-1?q?70WNAB7L4J4sr/PYVYWKzCltvivJnBcuZwXahv1TQniDecs+l4CbtY4iwaFI?= =?iso-8859-1?q?dUeFQ0Fb2bdWBDTsllezfxAOI3IxXO5MmA/VI5JG/3fd5qTceVrc=3D?= MIME-Version: 1.0 X-OriginatorOrg: fb.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB5154.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e34ccb98-a20e-4c57-a3f9-08da02f3bd30 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2022 00:11:49.9787 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: n2k3yaY4IZz+yrv7vQiisR7p0H+JcmFzaovE3dYYBRgn0ZTcOq5sHkwbnuQg8v8E X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR15MB1170 X-Proofpoint-ORIG-GUID: 0hIvTn6aJRomTB4IOtBgxDrDqyqFyafK X-Proofpoint-GUID: 0hIvTn6aJRomTB4IOtBgxDrDqyqFyafK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-10_09,2022-03-09_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Currently, libbpf considers a single routine in .text as a program. This is particularly confusing when it comes to library objects - a single routine meant to be used as an extern will instead be considered a bpf_program. This patch hides this compatibility behavior behind a libbpf_mode strict mode flag. Signed-off-by: Delyan Kratunov --- tools/lib/bpf/libbpf.c | 7 +++++++ tools/lib/bpf/libbpf_legacy.h | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 43161fdd44bb..b6f11ce0d6bc 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3832,7 +3832,14 @@ static bool prog_is_subprog(const struct bpf_object *obj, * .text programs are subprograms (even if they are not called from * other programs), because libbpf never explicitly supported mixing * SEC()-designated BPF programs and .text entry-point BPF programs. + * + * In libbpf 1.0 strict mode, we always consider .text + * programs to be subprograms. */ + + if (libbpf_mode & LIBBPF_STRICT_TEXT_ONLY_SUBPROGRAMS) + return prog->sec_idx == obj->efile.text_shndx; + return prog->sec_idx == obj->efile.text_shndx && obj->nr_programs > 1; } diff --git a/tools/lib/bpf/libbpf_legacy.h b/tools/lib/bpf/libbpf_legacy.h index a283cf031665..388384ea97a7 100644 --- a/tools/lib/bpf/libbpf_legacy.h +++ b/tools/lib/bpf/libbpf_legacy.h @@ -78,6 +78,12 @@ enum libbpf_strict_mode { * in favor of BTF-defined map definitions in SEC(".maps"). */ LIBBPF_STRICT_MAP_DEFINITIONS = 0x20, + /* + * When enabled, always consider routines in the .text section to + * be sub-programs. Previously, single routines in the .text section + * would be considered a program on their own. + */ + LIBBPF_STRICT_TEXT_ONLY_SUBPROGRAMS = 0x40, __LIBBPF_STRICT_LAST, }; From patchwork Fri Mar 11 00:11:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delyan Kratunov X-Patchwork-Id: 12777132 X-Patchwork-Delegate: bpf@iogearbox.net 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 154B9C4332F for ; Fri, 11 Mar 2022 00:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237173AbiCKAM5 (ORCPT ); Thu, 10 Mar 2022 19:12:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238512AbiCKAM4 (ORCPT ); Thu, 10 Mar 2022 19:12:56 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18C411A06D7 for ; Thu, 10 Mar 2022 16:11:55 -0800 (PST) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22AI5B1L000813 for ; Thu, 10 Mar 2022 16:11:54 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=facebook; bh=KoRasJeQc51+s0yTWQh4tVrM9f6vIxNbliOLO/4tPk8=; b=rnekLVgCbg/JxBEZmOD0BPhiwzRJkE2JC7d4F0rgn0ePu6iyrp0X5lB84jpPx1yJk1lH qnsBp3ube0u1UmypGSMV2qw0HNEU0tew33VDk6+mWaZwNGHlQk9y86ZAnFI+Kyewl4R5 iFCABCb03lpZ32pRJn1rrPqVTbj/MbDmI1o= Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2172.outbound.protection.outlook.com [104.47.55.172]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3eqex2dxp2-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Mar 2022 16:11:54 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ipcyMWzxyIAATXIdY2fDHa9wWYo0+0GilQXSsgAVHl80L04Onl0lMo2x4oAWn7sXvarfzYVx846XJlAfIP9Eedp49aY27qSFvXm9EnJJxC1yjE1g+KasbQRFPiWoJCaZAGCVjSw9cMK0fKoKX+ZHbyU5R89Fk1rwTSb8IFUukHJf1kK65LRQl1dE3DMFWa7Wrk+xRYq74R7EqvcSRZYEE2O+Zn4GUuNfd9S8ZzXs3o/jNG2hBs6Ggo4qaQehHS5vI4PUbcH4IDYHSOxmHiXOc4XcKMgs9Jgz0zAzcTU+wZY4fW/sHoCHO76lidW4QKO6SkPWrE1PhshBLbRgW448dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KoRasJeQc51+s0yTWQh4tVrM9f6vIxNbliOLO/4tPk8=; b=gGEditOU+Kh5veQGrhc0bT17MbwdaO9n/eNUvJ5EHqVTVh/27CPj2zBMep/ouPXLM4FA7jq2tNJ4IrCM5hojas6I3/ZnuRbjkjBWZ7W4/t74fRaxT8tyNX7EMuqsKoh/7wC9QhWweyszTTsHv/0lkB1uLcVXCvvuM2yK0lfJi78nouASZ4Ujsqyu81xV7fIlMyrPXuslOvrVX8wlcC02s7E1JnWy4bAdFTQahs285h6rkQcGom0NjrzHt4/pdtOjv5Iz14VDbAGitalkfVIll4Vg95PJcZZzuRlCquakjgIwosfa7eX8qlpQjsUgY5Hs4lmlUURZBBCx9dUDAI4t1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none Received: from SJ0PR15MB5154.namprd15.prod.outlook.com (2603:10b6:a03:423::6) by DM5PR1501MB2070.namprd15.prod.outlook.com (2603:10b6:4:a9::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22; Fri, 11 Mar 2022 00:11:52 +0000 Received: from SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3]) by SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3%6]) with mapi id 15.20.5061.022; Fri, 11 Mar 2022 00:11:51 +0000 From: Delyan Kratunov To: "daniel@iogearbox.net" , "ast@kernel.org" , "andrii@kernel.org" , "bpf@vger.kernel.org" Subject: [PATCH bpf-next v2 2/5] libbpf: init btf_{key,value}_type_id on internal map open Thread-Topic: [PATCH bpf-next v2 2/5] libbpf: init btf_{key,value}_type_id on internal map open Thread-Index: AQHYNNybmf6YAzvNikeVlKvsicc/SA== Date: Fri, 11 Mar 2022 00:11:51 +0000 Message-ID: <6d868b6effca2549681a9e42ccbdd71aac6287e8.1646957399.git.delyank@fb.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8f58a83a-3915-4916-8c28-08da02f3be28 x-ms-traffictypediagnostic: DM5PR1501MB2070:EE_ x-microsoft-antispam-prvs: x-fb-source: Internal x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LbZ6jOuQ/ImLRyJqNSUGZw7uK7si9aK0Umd9RechckzfGa6jmP+xXudZY34OGHjIxdV6pi+Jh1BERE5HFA+elO7Jb6aMhuZZ5VYViHJfklI3zNRJsBSPGi5JyYtz4hbvQFQeVDXFO90riIgr8nrDcMe/Y/UOOa4kLPPnMe1BFL1F1CoSw2PU2S5WfppVcTTKAOIO2+cxGV5YD2dlZBRa5bAXWosjcAjv1U/8UOsx+TqgaLJm1qCobpoDDdnDChvfmxozXW0qrdM8WmfmiHLZPWs0gDt5ThUnjdvRtZQvC5oDsp17pMbsWmIm1mubN0Y70M4Gnm9GxC8x3MdIegepqacXO94jBpsydcaDRtvncw1LjdpWPE2FM4Oce2dRN9lCOil7HLQOlzRlHByp1C82FNzCZd3UTdQHVF0W3aJh1dgKNSQgJPygPhTWjlQ+1KYoWzjtYHzDk3eXQ/hpUYeDByZzYkOqLuVUN3xHZG9g/VZMDCB/KNg64wN5O221Xf2ldH/4S/geMXKSyjmHQs1p1NB0q7wbGdtxwpepoF8oh0P4C6MDNiZtjt/Z/vWI9dXiEsFdab2LmH7ZXP9gh3JoUF7onJ/XZbxF+tcBUjFWUb3XFM8G0Z7Qx3kWbqAe/XzDiT4wEgJXqQCpxUWs7zxsK4QcqBwS9NTbDYGQ5FKgoRm7G07q1pvvMSdusGS7T7IcKjX8fPpWf/l3RVOA6Ij+2w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR15MB5154.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2906002)(38070700005)(91956017)(83380400001)(5660300002)(86362001)(66446008)(64756008)(66476007)(66556008)(8676002)(76116006)(66946007)(8936002)(2616005)(508600001)(110136005)(316002)(36756003)(186003)(38100700002)(6486002)(6512007)(122000001)(71200400001)(6506007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?w8cO3MRvInWGUaTZSmmw5fQ?= =?iso-8859-1?q?ego0NTLNCkUdWdU9K3Ra1/4Ho514LbcaOp4opROvzphCvHlxwz01MStZ6bIT?= =?iso-8859-1?q?+dXGpDmp4thzQNuws+mWHYP4Nv5SuZM0Q35mTE0WNdFcux4MBpUGWzlf5I0z?= =?iso-8859-1?q?i3ePll3qGd/RmHPGuexLi/xmR/tzak5fAlrZzVghwcWTz5LziuH12H6sKT2l?= =?iso-8859-1?q?Z3dGYN/hX1HfAxun6l4sBnFkFze9gCmYCTPLcAeOr5M5q3wgyR9pr7/+MJtA?= =?iso-8859-1?q?MHgzLcBwlAYXJYzH36ZoG3eMQYP44aHqHVbqwQG/49HENvMln4JL/RBedsSK?= =?iso-8859-1?q?dAFJyFhqi99AChlV0fwCSBUgXB1cpaUy4uPZpmvRRzzDOzcZZuzfXqBEEeY0?= =?iso-8859-1?q?0xmkaB3tx8xgCMjM60/EYHYQTtzva538jUdajJ7SugU9DqXduQoh4wxZxtFk?= =?iso-8859-1?q?UHHoZuF3J4h7m/fbM9FTIy7HNcAg2wYx2FxNGptlxEEEqU6ZPjBdFi2w9Kbn?= =?iso-8859-1?q?Zfl7wbkgpdVO6P/l7Cmg0Obxv76YbXPlOsATI5a3TusZEMKl1HWe8IYZ7Axq?= =?iso-8859-1?q?WyCUfrXh6Va2wooo2IkHEcgoKtUKLtsec/qAXO0GOzthnkg61Quc4U9Tzd1e?= =?iso-8859-1?q?ISd/NeTekY8kR9VSS21iE9V0pgmRfBP/E08G9k12wOGAknyAPYucRZbA9rhX?= =?iso-8859-1?q?acMmmSuNABqB4T6m24jY9D5I5f/6vIYIFuooMSOmumImjNy4HO3i/l1Ies4X?= =?iso-8859-1?q?9v5a1sqBbGbpb2vDNvNonPkVSUOe96YTsy3IvcU6E7Bwv3lJHYJGf0Zx47Rx?= =?iso-8859-1?q?RAy9q7ayRe0IDWbMlg5R+AgnVu8EPLGrSrE6u92rLpa9wBZ08l6/8B97vjPl?= =?iso-8859-1?q?JItX5K8JchoU5440qCztkV2WXuvqVwhJTy+GBxg3hWvIpSvzhj9AL7fXtPdg?= =?iso-8859-1?q?VaOuqSi1ovPhlbpKUr0rvdzdOx/PgDySZNfGKkws5LHTmJeinejCMapKrbxf?= =?iso-8859-1?q?kK2FWEE4vqGFPSRQWJNf8yPOUp7fcM25AThCd7mUgEmhlFHkfmj+tGltGNNj?= =?iso-8859-1?q?5IeiSFYdR7LTHv3denh63Rhb155CvGgy9YWnSHBu/bsN13aDUnI4zeWH87qd?= =?iso-8859-1?q?xmJnKMCCmuogymouHWKlu3pJjQDhBPk7IlaApwNcNDH00C4C26sqImlai3fV?= =?iso-8859-1?q?mJHmVVGMrP4XWjmo3y5zmpq8AqNqFCzr2bJ3PISTlnVCsKXOSE5vg08lWXHF?= =?iso-8859-1?q?t2VTheZZp0q6vXozZ3j9luKmL2XDWioK8LbGf8SRImi5HyGzVp6J4XaRgjEj?= =?iso-8859-1?q?bYPTevpjXwzkq97TQYNA6bmCPtpu7BNNjAzTHjPI1ZrXUTZj18XLao+uhP/a?= =?iso-8859-1?q?rHwfyXATBNKFekyb3OmTojDoFfvnyjWZL9CLx5E91xAypCSKGPMsmPpGi4Gb?= =?iso-8859-1?q?xyyPFtQLKiA93t3xOWgrOkPRa1kbzD4UfS0unWJWvQXwfXamzfDhcpRRSH1a?= =?iso-8859-1?q?02tO7/sUYsPfgcL/abrVLaouPelwUjJPbxtbf7348DYw1lFwVFzU=3D?= MIME-Version: 1.0 X-OriginatorOrg: fb.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB5154.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f58a83a-3915-4916-8c28-08da02f3be28 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2022 00:11:51.5733 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: K131ka128OZAr2YsCyJ/hENLyqrkTAa7gk7qXrDG0OTVTTdhBdpbRcCYLsko5qvj X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1501MB2070 X-Proofpoint-ORIG-GUID: 81jvI3oiplc9P8AFLH_3xV1uTSkCSBPq X-Proofpoint-GUID: 81jvI3oiplc9P8AFLH_3xV1uTSkCSBPq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-10_09,2022-03-09_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net For internal maps, look up the key and value btf types on open() and not load(), so that `bpf_map_btf_value_type_id` is usable in `bpftool gen`. Signed-off-by: Delyan Kratunov --- tools/lib/bpf/libbpf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index b6f11ce0d6bc..3fb9c926fe6e 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1517,6 +1517,9 @@ static char *internal_map_name(struct bpf_object *obj, const char *real_name) return strdup(map_name); } +static int +bpf_map_find_btf_info(struct bpf_object *obj, struct bpf_map *map); + static int bpf_object__init_internal_map(struct bpf_object *obj, enum libbpf_map_type type, const char *real_name, int sec_idx, void *data, size_t data_sz) @@ -1564,6 +1567,11 @@ bpf_object__init_internal_map(struct bpf_object *obj, enum libbpf_map_type type, return err; } + err = bpf_map_find_btf_info(obj, map); + /* intentionally ignoring err, failures are fine because of + * maps like .rodata.str1.1 + */ + if (data) memcpy(map->mmaped, data, data_sz); From patchwork Fri Mar 11 00:11:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delyan Kratunov X-Patchwork-Id: 12777133 X-Patchwork-Delegate: bpf@iogearbox.net 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 B4B86C433EF for ; Fri, 11 Mar 2022 00:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344735AbiCKAM6 (ORCPT ); Thu, 10 Mar 2022 19:12:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238512AbiCKAM5 (ORCPT ); Thu, 10 Mar 2022 19:12:57 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 206B21A06D7 for ; Thu, 10 Mar 2022 16:11:56 -0800 (PST) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22AI5B1N000813 for ; Thu, 10 Mar 2022 16:11:56 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=facebook; bh=qBzUd5D1bYuKr6S4R6PfSO79bIEALCPUMt6fmhJXXdg=; b=YeovT7E/hefoKG75a21QgbSEWk/A/2khZM8V8hQY6bD1EG6RymrgjuxYQ0htSr0mdo0U OCPYfgSuirpwgAx4f+sRTlaEyxGH8SRW1inpZZpzJHmAkibowbyVfbWnsWXtaWC+rS2l GRbmGRi5lgSFvnqZPzzbf7ED+1mn4+66/NU= Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2172.outbound.protection.outlook.com [104.47.55.172]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3eqex2dxp2-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Mar 2022 16:11:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=keL/uS8ZL7wHZ8QrYFPdWumq/dTKmnxTe/+KCqrlIqw6zuFKAGyCixmd/lKS/FlkuOPfwwyXcnVp1NjUQYAdWipKFcJNpwdILkWxMT3g30r2bSq7dN8s5dDD25k77CSusx0H7DKRGXtEr2pex5xE13Snxbb3xNc9yLk23aQxPPFKGYlwAXBN/iwU/Albi2fhF/6HJKIZAl27rg33lvl8SsYLZxAX461Oa3/Dzz+ppipz+I6fSCIGsbRIZzvsfHNqrRAqCjrQePjpJgQ9DZxd78wKdcBqjqfT37ZZCygpTeAAPQnw3F3ClVvI+whn/PLUS7QUMnCyL0YBZiNpLnMpCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qBzUd5D1bYuKr6S4R6PfSO79bIEALCPUMt6fmhJXXdg=; b=Y9v3Ao3H60ppiQ+idAYhrpNixiuWZdd08/g7tdU5im4Rz7WuOk3t5garDgULz0uU4APo7+2hFLIblGfiKYJAecuF3tE8TrQISjCQRGz16C0aPg1lWTqFp6tcp7ELlRmy1LeCsLXJXqh2dSGFfe8pIO0XcvzIgB0TU1W7A/1dsHBvl8wgPG/sRs/8CH0x6K6PqYCPVObiOaGPJhHitv4I+jnU57h0MPAo7D7U7WhDtxBJFS5PYSsXh3xtubyF7kG7WQ6iti6NtBCvSIZ/r0xQ88YZyNIudKOm9EfPHrnoPWh8Qao/khi0Mrw+yzuCTATl0yoeCq3XKT+qRx1JsNe0tg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none Received: from SJ0PR15MB5154.namprd15.prod.outlook.com (2603:10b6:a03:423::6) by DM5PR1501MB2070.namprd15.prod.outlook.com (2603:10b6:4:a9::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22; Fri, 11 Mar 2022 00:11:53 +0000 Received: from SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3]) by SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3%6]) with mapi id 15.20.5061.022; Fri, 11 Mar 2022 00:11:53 +0000 From: Delyan Kratunov To: "daniel@iogearbox.net" , "ast@kernel.org" , "andrii@kernel.org" , "bpf@vger.kernel.org" Subject: [PATCH bpf-next v2 3/5] libbpf: add subskeleton scaffolding Thread-Topic: [PATCH bpf-next v2 3/5] libbpf: add subskeleton scaffolding Thread-Index: AQHYNNycPbk4imFMsEyC5opEfn7KcA== Date: Fri, 11 Mar 2022 00:11:53 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8bcb6b6d-1f4d-49e3-591a-08da02f3bf12 x-ms-traffictypediagnostic: DM5PR1501MB2070:EE_ x-microsoft-antispam-prvs: x-fb-source: Internal x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZQiHfZkiOXq+8VxG5Yp6KmrZCjM/6LmTtexEl5LgPZ4xX+HAIzg5oG49bQbNlNddnILGTZj9V0VOTBYnmjctH3e7hVSh+HBjYFKZG+JPziMU02pwE7GBlY6Fb3YxllJHRqO0pzF4xtMHAyhtozVj6Y9/39TgkVrCRtoxInYGeLDIo01cD0kbVa3fP9jDhOoph5kg7LnXa4/0xL2g1AP1xFL1/hE5wq7frHUnW8F0snVzhF67kPHrOGzHSlGe4TTembGX5PpB01xjnatTxlRDCXrSBVwIKq74CIHlvi4OoUvisyTMixpT1glHpvCJkSMjltTZOKCkZoODNRl0wEp9ff/PWfK3iEKRU+UTNXRmJ4NjNZZyK3FiWatQyayrKPuB9bYqCoWxLK6kh0bvA6MwLTpucnVPsLv2yTqBlJGnLZhnQuCajgVoDeilouKmTC2twbi1W0DcOxr7+mcGurJmZEW+qXD9atbkotvSZ5KUABbBHw8lBdcucprUx9dlgxWuQyduCurdUmKDpKhZTK91abFd72ZfmSzxO+FlUxAM3p1pLIsxlMU72r/l7i/+PlQXq6pN3xDCx4Jmsud/VDWDyT8fJHv3AYe6oq4CUMLGVXsj8Kcel4ct5MVEdy2uEiGKwviKXZSo5G72w8PDIldo7YWgHgwATH+j41RchNYVbswSMIsM8+Dhgt17vnA3xqPXch2S12Pu4B1y9jvudLjBrA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR15MB5154.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2906002)(38070700005)(91956017)(83380400001)(5660300002)(86362001)(66446008)(64756008)(66476007)(66556008)(8676002)(76116006)(66946007)(8936002)(2616005)(508600001)(110136005)(316002)(36756003)(186003)(38100700002)(6486002)(6512007)(122000001)(71200400001)(6506007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?zWzRyrACIfW8p4MbNyvxokR?= =?iso-8859-1?q?j2ZhMSm3g97O/PHEz1Ll9SmzcHvTFSUCpS2mbXm9bXoQGDwu8NgG7mvlYx7u?= =?iso-8859-1?q?0NLVjjXHPZ1tY25XMy4AnVVY9w+p59MSdFxxcAHIz/0Qg863aAVzDMtw9gmW?= =?iso-8859-1?q?t+LWlHtFg+1hu/91mAhWQAnLeREeh5McHFpBlfql9x7tyjp3o1aE6ixWjDyO?= =?iso-8859-1?q?+IyM0qAoTq9T0EYQALjW8zAayEhJyqc8fCEmzeggDHsGN0CYaJajgacdVwJS?= =?iso-8859-1?q?QquBxwwSFlB6uHyfD4aP/0KJlBUQJU4JYZ25EuucBcoji2obdbrhJkUzZlXq?= =?iso-8859-1?q?H00ytPkDPuHI8ewuwnH9XP8BjE3FIHQQ/imxSaucHcwXNbQnIazgx97KISoU?= =?iso-8859-1?q?FAVE3ui9OIsdWNQx/Wb5kS4sIYmvjtZdvlwXTdTJKLriy9FC16p2v3abqwOP?= =?iso-8859-1?q?WkBNwXO7Ch9e+UsuQoDDH6OWRSnW6Oor0vFHKnD41QdPWJp8LktXVyAocQes?= =?iso-8859-1?q?rakI8G2L3wxu2DEn7ibRGQUgBs8PpqD1u5Uc/Iguqox2ZqP5Bq7FNv7WqCh5?= =?iso-8859-1?q?6M6T7JJnAeqEGCTDgBPg3OW57AapyQcTD5bk6iytj0dqY2i3FAh5dCy5HMQh?= =?iso-8859-1?q?uQ2rktJiwczhpj6W5dGd7CI5Yv/heLi/xMrYCEd8g1g6lUUc1a25byN9unca?= =?iso-8859-1?q?NJaeNUj/4Hi3HpItswcy8IGDRiC7kuOmlqP6CuwsV3Vt7jlWkrHElBe7InL5?= =?iso-8859-1?q?qc3A0AQYY3dov0t0giavz3h9rZ1ypvGox2cus+hl+HNlav9FgwVv1NThm8bA?= =?iso-8859-1?q?Os2X9BMXCgzp9sBDopJ6jJB8d6fPailIqSys13/G17//E6PiOcr/rxYO5+IU?= =?iso-8859-1?q?/PcNUWfrVNdVHw/OP5FDTJMcfMdWWTfW2c0MvwoVobfq59/Bwbut5iws4Ify?= =?iso-8859-1?q?JD59KYiQcnnzYGp9KcMKXeDYyCcsBODeQ2vVXkhFdpxEFoVdDh5TnMiWpkJW?= =?iso-8859-1?q?wlnP4PgHSjcm5qFyCmOFrfFrd7UqaCoe9Bq9bycfufmZnuflc+NzMKzAlmdA?= =?iso-8859-1?q?dgxeClE6UvjG7ZBBXmwPt9/2O5mqYMiAJ2vWY9BIAg/bBc8qePfLzFHkFaEa?= =?iso-8859-1?q?Qoh8GSlP93188z9ooWFYaG9rmt3L0Baoqi1HDLAJAWROHUX3is3JFd2PmdR5?= =?iso-8859-1?q?LA8du1rT0fKS2IWWQR5qo6ScbGmrzzioQDGAqEpZyjsXzGURCQbISyYnMjNV?= =?iso-8859-1?q?SdTip0mW/6IJ7dyN6spsIx3k85SHzmsPqVLKVU/hyXVQebgneQaZDhQiPRs1?= =?iso-8859-1?q?zp3euA80gfHks1ALq6HlbiMwRMvzWHNg4WX7eUaOVvzZ8Rt/YuKUBQaWCTiC?= =?iso-8859-1?q?kLq/A8vRZRb/4WrOV4IL3OboJNjnHk670rp7EtGKtCW75dNtinAHvfLSAMh9?= =?iso-8859-1?q?LSkIs6MpO3grWiHuuA+SRF5n1vUloYR6F9pa1qHJiSX3LTFpBYzTQVa/JMIw?= =?iso-8859-1?q?bvSIzkFzcKI52dH7y2zX7LsN81Gc+M4znF7nhPWPZcfbiQnNZTEk=3D?= MIME-Version: 1.0 X-OriginatorOrg: fb.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB5154.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bcb6b6d-1f4d-49e3-591a-08da02f3bf12 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2022 00:11:53.1055 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: aMwsrYGwrEze/aj/OSGf9vXW/AP2PNrqicKmiqGDv1buSmE80ZiCzpLsaOo9LXDP X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1501MB2070 X-Proofpoint-ORIG-GUID: fBVgXLSPj9zOD-opjb1bFq4x-Svv3-Jc X-Proofpoint-GUID: fBVgXLSPj9zOD-opjb1bFq4x-Svv3-Jc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-10_09,2022-03-09_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net In symmetry with bpf_object__open_skeleton(), bpf_object__open_subskeleton() performs the actual walking and linking of maps, progs, and globals described by bpf_*_skeleton objects. Signed-off-by: Delyan Kratunov --- tools/lib/bpf/libbpf.c | 136 +++++++++++++++++++++++++++++++++------ tools/lib/bpf/libbpf.h | 29 +++++++++ tools/lib/bpf/libbpf.map | 2 + 3 files changed, 146 insertions(+), 21 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 3fb9c926fe6e..ba7b25b11486 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -11810,6 +11810,49 @@ int libbpf_num_possible_cpus(void) return tmp_cpus; } +static int populate_skeleton_maps(const struct bpf_object* obj, + struct bpf_map_skeleton* maps, + size_t map_cnt) +{ + int i; + + for (i = 0; i < map_cnt; i++) { + struct bpf_map **map = maps[i].map; + const char *name = maps[i].name; + void **mmaped = maps[i].mmaped; + + *map = bpf_object__find_map_by_name(obj, name); + if (!*map) { + pr_warn("failed to find skeleton map '%s'\n", name); + return libbpf_err(-ESRCH); + } + + /* externs shouldn't be pre-setup from user code */ + if (mmaped && (*map)->libbpf_type != LIBBPF_MAP_KCONFIG) + *mmaped = (*map)->mmaped; + } + return 0; +} + +static int populate_skeleton_progs(const struct bpf_object* obj, + struct bpf_prog_skeleton* progs, + size_t prog_cnt) +{ + int i; + + for (i = 0; i < prog_cnt; i++) { + struct bpf_program **prog = progs[i].prog; + const char *name = progs[i].name; + + *prog = bpf_object__find_program_by_name(obj, name); + if (!*prog) { + pr_warn("failed to find skeleton program '%s'\n", name); + return libbpf_err(-ESRCH); + } + } + return 0; +} + int bpf_object__open_skeleton(struct bpf_object_skeleton *s, const struct bpf_object_open_opts *opts) { @@ -11817,7 +11860,7 @@ int bpf_object__open_skeleton(struct bpf_object_skeleton *s, .object_name = s->name, ); struct bpf_object *obj; - int i, err; + int err; /* Attempt to preserve opts->object_name, unless overriden by user * explicitly. Overwriting object name for skeletons is discouraged, @@ -11840,37 +11883,88 @@ int bpf_object__open_skeleton(struct bpf_object_skeleton *s, } *s->obj = obj; + err = populate_skeleton_maps(obj, s->maps, s->map_cnt); + if (err) { + pr_warn("failed to populate skeleton maps for '%s': %d\n", + s->name, err); + return libbpf_err(err); + } - for (i = 0; i < s->map_cnt; i++) { - struct bpf_map **map = s->maps[i].map; - const char *name = s->maps[i].name; - void **mmaped = s->maps[i].mmaped; + err = populate_skeleton_progs(obj, s->progs, s->prog_cnt); + if (err) { + pr_warn("failed to populate skeleton progs for '%s': %d\n", + s->name, err); + return libbpf_err(err); + } - *map = bpf_object__find_map_by_name(obj, name); - if (!*map) { - pr_warn("failed to find skeleton map '%s'\n", name); - return libbpf_err(-ESRCH); - } + return 0; +} - /* externs shouldn't be pre-setup from user code */ - if (mmaped && (*map)->libbpf_type != LIBBPF_MAP_KCONFIG) - *mmaped = (*map)->mmaped; +int bpf_object__open_subskeleton(struct bpf_object_subskeleton *s) +{ + int err, len, var_idx, i; + const char *var_name; + const struct bpf_map *map; + struct btf *btf; + __u32 map_type_id; + const struct btf_type *map_type, *var_type; + const struct bpf_var_skeleton *var_skel; + struct btf_var_secinfo *var; + + if (!s->obj) + return libbpf_err(-EINVAL); + + btf = bpf_object__btf(s->obj); + if (!btf) + return -errno; + + err = populate_skeleton_maps(s->obj, s->maps, s->map_cnt); + if (err) { + pr_warn("failed to populate subskeleton maps: %d\n", err); + return libbpf_err(err); } - for (i = 0; i < s->prog_cnt; i++) { - struct bpf_program **prog = s->progs[i].prog; - const char *name = s->progs[i].name; + err = populate_skeleton_progs(s->obj, s->progs, s->prog_cnt); + if (err) { + pr_warn("failed to populate subskeleton maps: %d\n", err); + return libbpf_err(err); + } - *prog = bpf_object__find_program_by_name(obj, name); - if (!*prog) { - pr_warn("failed to find skeleton program '%s'\n", name); - return libbpf_err(-ESRCH); + for (var_idx = 0; var_idx < s->var_cnt; var_idx++) { + var_skel = &s->vars[var_idx]; + map = *var_skel->map; + map_type_id = bpf_map__btf_value_type_id(map); + map_type = btf__type_by_id(btf, map_type_id); + + len = btf_vlen(map_type); + var = btf_var_secinfos(map_type); + for (i = 0; i < len; i++, var++) { + var_type = btf__type_by_id(btf, var->type); + if (!var_type) { + pr_warn("Could not find var type for item %1$d in section %2$s", + i, bpf_map__name(map)); + return libbpf_err(-EINVAL); + } + var_name = btf__name_by_offset(btf, var_type->name_off); + if (strcmp(var_name, var_skel->name) == 0) { + *var_skel->addr = (char *) map->mmaped + var->offset; + break; + } } } - return 0; } +void bpf_object__destroy_subskeleton(struct bpf_object_subskeleton *s) +{ + if (!s) + return; + free(s->maps); + free(s->progs); + free(s->vars); + free(s); +} + int bpf_object__load_skeleton(struct bpf_object_skeleton *s) { int i, err; diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index c1b0c2ef14d8..1bff7647d797 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -1289,6 +1289,35 @@ LIBBPF_API int bpf_object__attach_skeleton(struct bpf_object_skeleton *s); LIBBPF_API void bpf_object__detach_skeleton(struct bpf_object_skeleton *s); LIBBPF_API void bpf_object__destroy_skeleton(struct bpf_object_skeleton *s); +struct bpf_var_skeleton { + const char *name; + struct bpf_map **map; + void **addr; +}; + +struct bpf_object_subskeleton { + size_t sz; /* size of this struct, for forward/backward compatibility */ + + const struct bpf_object *obj; + + int map_cnt; + int map_skel_sz; /* sizeof(struct bpf_map_skeleton) */ + struct bpf_map_skeleton *maps; + + int prog_cnt; + int prog_skel_sz; /* sizeof(struct bpf_prog_skeleton) */ + struct bpf_prog_skeleton *progs; + + int var_cnt; + int var_skel_sz; /* sizeof(struct bpf_var_skeleton) */ + struct bpf_var_skeleton *vars; +}; + +LIBBPF_API int +bpf_object__open_subskeleton(struct bpf_object_subskeleton *s); +LIBBPF_API void +bpf_object__destroy_subskeleton(struct bpf_object_subskeleton *s); + struct gen_loader_opts { size_t sz; /* size of this struct, for forward/backward compatiblity */ const char *data; diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index df1b947792c8..d744fbb8612e 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -442,6 +442,8 @@ LIBBPF_0.7.0 { LIBBPF_0.8.0 { global: + bpf_object__open_subskeleton; + bpf_object__destroy_subskeleton; libbpf_register_prog_handler; libbpf_unregister_prog_handler; } LIBBPF_0.7.0; From patchwork Fri Mar 11 00:11:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delyan Kratunov X-Patchwork-Id: 12777134 X-Patchwork-Delegate: bpf@iogearbox.net 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 7EBE9C433EF for ; Fri, 11 Mar 2022 00:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234841AbiCKANC (ORCPT ); Thu, 10 Mar 2022 19:13:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344753AbiCKANA (ORCPT ); Thu, 10 Mar 2022 19:13:00 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59F2E1A06D7 for ; Thu, 10 Mar 2022 16:11:58 -0800 (PST) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 22AIOUZI013389 for ; Thu, 10 Mar 2022 16:11:58 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=facebook; bh=jZu4xsoyOdtj7kOZ7Xv3XaAMVEdJhDiYIlUVH+5RXzE=; b=oZ+xO+e+CGuMiWKfUlM/LjW3OcKuTDzgFjz3sP20gSdm5CURZBBslsBX7YY50AnYNGFF GeuN2fq2DiF/0/iYismwL+FFKohV2MssFQmL+iK4K6Nh/Fh+J051KIGlGeG72Bmvc1O+ RoSDbxgnCczCJsf12GFvLL5BfQc+4vMMyAk= Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2176.outbound.protection.outlook.com [104.47.55.176]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3eqpk72fkd-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Mar 2022 16:11:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bJ6a6FC4+NSaQA/9+le6Ey21nn+nA8DPP/RWsqIuKrYs9bYhT+luLkVbZftl8S2+HfKYb/A37xFqSlHXzH46Sypzs4Zwsynl4F2xXVqzwe9+Zff17Aof47AwHhZ/BzvHHyB+0gihYKTEhdfqz2wU1tKgC7IRo06jb+urIiQSlNx0XMTepjBXAi0LCaPH/Z/j4UOMnXeg2oedvd3PeKHYfW9L5a8mwP9V1u+UYyKJBX3mEFn0JeVMJi+2VFZTm03Ru+QDIeutR2reF5CQplnDWPvR1XvRyPWr7dlCPRmDwHA1jN1TsSHdGiVFf6NqxNny7LoFfzAnISExZpDD+ik27w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jZu4xsoyOdtj7kOZ7Xv3XaAMVEdJhDiYIlUVH+5RXzE=; b=YB+MxREKsrOlFhTtaU9NTXoJKLBmtUo1dGYAKP7+uJKW29SWNMh0kcZwSTyFEBi2Z5GPEbI1zG4Pw1GtfSsS194K923tvwfAaAeKj8jI7HV29uxS+C3iM4yhcnyx/oyZBRrEtcupvi5EhSzK7vFU/eyyHyWXg7xrIwghQ1xd6pD5AywzlH/GXNrexJRJPgk02zK4EMgXekUUSNIiuo/zTk/6tB7COEP/6P/LD0t90Fw+zQBC+ZMcze8qvZ98WDKGDG6l+32USDRQXgkoXZbNOTEso60YIRw5h7ckI6LjG/Ze1ABjr7AWyaAVGhcGdw3QeiG8hRWyQw4gDJxsSwNw2g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none Received: from SJ0PR15MB5154.namprd15.prod.outlook.com (2603:10b6:a03:423::6) by DM5PR1501MB2070.namprd15.prod.outlook.com (2603:10b6:4:a9::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.22; Fri, 11 Mar 2022 00:11:55 +0000 Received: from SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3]) by SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3%6]) with mapi id 15.20.5061.022; Fri, 11 Mar 2022 00:11:54 +0000 From: Delyan Kratunov To: "daniel@iogearbox.net" , "ast@kernel.org" , "andrii@kernel.org" , "bpf@vger.kernel.org" Subject: [PATCH bpf-next v2 4/5] bpftool: add support for subskeletons Thread-Topic: [PATCH bpf-next v2 4/5] bpftool: add support for subskeletons Thread-Index: AQHYNNydxSVHzF33VE6JX4WddU/LtA== Date: Fri, 11 Mar 2022 00:11:54 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0e4a9ecb-9fbc-44d3-d919-08da02f3c01f x-ms-traffictypediagnostic: DM5PR1501MB2070:EE_ x-microsoft-antispam-prvs: x-fb-source: Internal x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bqunEB06Z6PydusfDo3t5sXFhXhkc8yzOO598yb+fgXvDQhjnziBWPLtNZeywexZ2mn0fEnu2Z6gnYO5TFPPyJ0O/osdO88qM5kCBm9Km0jclHAgApi3c9HPIDIwRqCgrf/FQB60laFZeH9hqQV4UDKpHQhTRXZBhWaEHmI5m/u510zO7D4l6UOaHGWsqaXv+ihiML1FhmGkqKg5i8O9Ct2Xm0C7b2dvA8bJv4Bw9QmMv7/b80OPOm4pHk51IVRSsd97MzuE933MoLV/4P4/9BJKl2I5T9FsLiHaVev6UjSuxMQ6+FlsGRkaBJOM+enJg9PyZuuiJ4YbqQut/Xkk/XBvMjafSfgB4msFl0hX9Vwk0ns+LycuwRKimq6OwUyHUB8Qeekv+91CxO0M/5V2SWXiUeF3d/ZMg/zG7baE/ILliTcCrXpdLM4roCKni6xGhPTyVCgsUC+Ch/AQAyWJAC1qamSaC+l1SNOE1lgaWz/zkO6cu5FfSCdlM0jpa5mL8EBxUPjmghIYSSaYaFNs4Tjm4MsYn5/aWlcufEozqHavklM2zcZf0bQgaxYl5KkDV4PJ+O56WSNGpXjvyhx3s8c6xvyWmcqJWnmqAepXh0DtkG4rtG/D6mT1LTGini+2SPLfBef94+VbKsk56d3a/EQS3bvXsgN8nQRX6L/yhFfcl4xzOBeyy3CYbfPbXDpwHaAOjDpVyqUS4ZPy0DBU1A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR15MB5154.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2906002)(38070700005)(91956017)(83380400001)(5660300002)(86362001)(66446008)(64756008)(66476007)(66556008)(8676002)(76116006)(66946007)(30864003)(8936002)(2616005)(508600001)(110136005)(316002)(36756003)(186003)(38100700002)(6486002)(6512007)(122000001)(71200400001)(6506007)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?KDBBoDvW8L+p2H5IhiFcEl5?= =?iso-8859-1?q?26kh9eEGvKG5dWDLPk1N3lE3H60rTIxUxnc3FumNclwm3GrmHwPEhSSau9cB?= =?iso-8859-1?q?XwJtpmdnqCWQXOTkoQNu08X07iT2cIlm2S8fiyW+X9aptGwy4MUFw8qWqmLK?= =?iso-8859-1?q?ozGPaSlZd4e+e0/2eltqrVW9RjC1qS6Qmiv/TP2ufTYHoGc6yCbObyqq+4Y8?= =?iso-8859-1?q?l9jal2D9GTshTi1TfWoxd4zLTBNlpmerj6MB9+bDYH5cpeB5/lzJ291kMFXp?= =?iso-8859-1?q?9HdR/bIT1VQ5/nBe/mgL3fW6vgLiW/eqMfvoq/wwUaITWSOJGUvIkR/ifnzC?= =?iso-8859-1?q?0oyXCgCbdjDNbc/KZf4DuiLq6zBNyLIv4dohnInvKPtGb/MhrUMUk6ZYWwYx?= =?iso-8859-1?q?W3d4igqBAgzkeEN2CD8tmYHxJjPjjwlPsnDmc5xvSQk6PY6AzBfQzxNGCQe3?= =?iso-8859-1?q?bek2uTWXZhaTfny9TN5OSjLBkFkhxqBR67Ziwe0wDs/NboqjerLF3MkuW00k?= =?iso-8859-1?q?niDcYLE+vesotyqj/FIoRPXofcYLYw8Khp1xgVY/iIm5NyrakZPPTYAGTN/o?= =?iso-8859-1?q?0V50Y8Cbh+K8xHzJoZLeP7s9hBXCIaLQQCsQC0yZcg2HFX8Co+1QXwWIUpGK?= =?iso-8859-1?q?OyYqPqPMvYXVuvGMV5qyv0ShN+gaSdM8sqE95XsjxhKWuRkiVbgpgdv4u1qM?= =?iso-8859-1?q?4VTyabXDk6r0Cb1AUgoGm3DkdXNs+/DhrP/DzO0vGt8D81RdZuyRO4aM191D?= =?iso-8859-1?q?NC6KVQ/Oarzi8IVc8tuNSjdTsLH9pwbvgkC6YFqJGzRPWjSjtoG8PP+24oqb?= =?iso-8859-1?q?lgEkVNKGsbBf7z7QHYyoxCnSksV1ax+t7wD7ZYRMM55ubfioWDod8JCQizQx?= =?iso-8859-1?q?wNiuvOERQPM6wPOOFe+oMo0KSQm7Few9dWbJqBoj22PPRkSeWGB2xSnuV8Cf?= =?iso-8859-1?q?evGnKUrTLnxEMSeHaE3CAkYeCyjpcdewBgBjLDFQmk6eCM76ltpHbbSx6Z+Q?= =?iso-8859-1?q?ye/mPGGWSsgCT/3QQUZcC521F7hamJzeFUujoBv8olEEwZf+ikBwGOfLbzpC?= =?iso-8859-1?q?2VjnY49MpnO/CLiJoOMSKTwhisRJzqK1CROc5yr7u3Lg4RZNi/RhH/X6hmWw?= =?iso-8859-1?q?2hKld9Clk+AvD0Xfkt1yPBMfb+j00GyUuT9+I1xqyye/cmQwD1v+By1I4Q9f?= =?iso-8859-1?q?2/KMs+taIZjc/J7G+VirVCw9qBi3OykRZCGcC8cVfPwZ4OaQYB87c/DQkrP+?= =?iso-8859-1?q?4eiZm8KazrrUMkKMTEagj1CShSc5Pm1Mto3YAJba33egUU06qesT6+WStkUe?= =?iso-8859-1?q?f2mcWjuIl2tJIyEw9O1usrAfeHl21plU61UaDwJjZPH3LHqM4NGBfmuVZhXI?= =?iso-8859-1?q?7x/vzmRSRVBGcOOpghFuZm3Mv+/MbLdvF/gEvQpsf8TXbMXp8yApgO7PHBiR?= =?iso-8859-1?q?gaNkBxM0OPXpNgGOapp5ozg6zF3fSCrL9vYSG9T/w8siYTcmOA8H8zL5yg6W?= =?iso-8859-1?q?eUTFqaKAUaU8eGSGRyc6MYV/2cSR2NEJR2WLUdtLci+Upeq5C6fc=3D?= MIME-Version: 1.0 X-OriginatorOrg: fb.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB5154.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e4a9ecb-9fbc-44d3-d919-08da02f3c01f X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2022 00:11:54.8717 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: fBeEUNxhTkXrWZ0jK63fBzEO0/+KOy7QI8N2cUFoNBrfJ2wTzU1K1SU/50QQKIWA X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1501MB2070 X-Proofpoint-GUID: cQ4GLR_tYDrwU2gPBCef83TCBlYiR7DR X-Proofpoint-ORIG-GUID: cQ4GLR_tYDrwU2gPBCef83TCBlYiR7DR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-10_09,2022-03-09_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Subskeletons are headers which require an already loaded program to operate. For example, when a BPF library is linked into a larger BPF object file, the library userspace needs a way to access its own global variables without requiring knowledge about the larger program at build time. As a result, subskeletons require a loaded bpf_object to open(). Further, they find their own symbols in the larger program by walking BTF type data at run time. At this time, programs, maps, and globals are supported through non-owning pointers. Signed-off-by: Delyan Kratunov --- .../bpf/bpftool/Documentation/bpftool-gen.rst | 25 + tools/bpf/bpftool/bash-completion/bpftool | 14 +- tools/bpf/bpftool/gen.c | 589 ++++++++++++++++-- 3 files changed, 564 insertions(+), 64 deletions(-) diff --git a/tools/bpf/bpftool/Documentation/bpftool-gen.rst b/tools/bpf/bpftool/Documentation/bpftool-gen.rst index 18d646b571ec..68454ef28f58 100644 --- a/tools/bpf/bpftool/Documentation/bpftool-gen.rst +++ b/tools/bpf/bpftool/Documentation/bpftool-gen.rst @@ -25,6 +25,7 @@ GEN COMMANDS | **bpftool** **gen object** *OUTPUT_FILE* *INPUT_FILE* [*INPUT_FILE*...] | **bpftool** **gen skeleton** *FILE* [**name** *OBJECT_NAME*] +| **bpftool** **gen subskeleton** *FILE* [**name** *OBJECT_NAME*] | **bpftool** **gen min_core_btf** *INPUT* *OUTPUT* *OBJECT* [*OBJECT*...] | **bpftool** **gen help** @@ -150,6 +151,30 @@ DESCRIPTION (non-read-only) data from userspace, with same simplicity as for BPF side. + **bpftool gen subskeleton** *FILE* + Generate BPF subskeleton C header file for a given *FILE*. + + Subskeletons are similar to skeletons, except they do not own + the corresponding maps, programs, or global variables. They + require that the object file used to generate them is already + loaded into a *bpf_object* by some other means. + + This functionality is useful when a library is included into a + larger BPF program. A subskeleton for the library would have + access to all objects and globals defined in it, without + having to know about the larger program. + + Consequently, there are only two functions defined + for subskeletons: + + - **example__open(bpf_object\*)** + Instantiates a subskeleton from an already opened (but not + necessarily loaded) **bpf_object**. + + - **example__destroy()** + Frees the storage for the subskeleton but *does not* unload + any BPF programs or maps. + **bpftool** **gen min_core_btf** *INPUT* *OUTPUT* *OBJECT* [*OBJECT*...] Generate a minimum BTF file as *OUTPUT*, derived from a given *INPUT* BTF file, containing all needed BTF types so one, or diff --git a/tools/bpf/bpftool/bash-completion/bpftool b/tools/bpf/bpftool/bash-completion/bpftool index 958e1fd71b5c..5df8d72c5179 100644 --- a/tools/bpf/bpftool/bash-completion/bpftool +++ b/tools/bpf/bpftool/bash-completion/bpftool @@ -1003,13 +1003,25 @@ _bpftool() ;; esac ;; + subskeleton) + case $prev in + $command) + _filedir + return 0 + ;; + *) + _bpftool_once_attr 'name' + return 0 + ;; + esac + ;; min_core_btf) _filedir return 0 ;; *) [[ $prev == $object ]] && \ - COMPREPLY=( $( compgen -W 'object skeleton help min_core_btf' -- "$cur" ) ) + COMPREPLY=( $( compgen -W 'object skeleton subskeleton help min_core_btf' -- "$cur" ) ) ;; esac ;; diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index 145734b4fe41..3f05e3df94cf 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -64,11 +64,11 @@ static void get_obj_name(char *name, const char *file) sanitize_identifier(name); } -static void get_header_guard(char *guard, const char *obj_name) +static void get_header_guard(char *guard, const char *obj_name, const char *suffix) { int i; - sprintf(guard, "__%s_SKEL_H__", obj_name); + sprintf(guard, "__%s_%s__", obj_name, suffix); for (i = 0; guard[i]; i++) guard[i] = toupper(guard[i]); } @@ -280,6 +280,122 @@ static int codegen_datasecs(struct bpf_object *obj, const char *obj_name) return err; } +static bool btf_is_ptr_to_func_proto(const struct btf *btf, + const struct btf_type *v) +{ + return btf_is_ptr(v) && btf_is_func_proto(btf__type_by_id(btf, v->type)); +} + +static int codegen_subskel_datasecs(struct bpf_object *obj, const char *obj_name) +{ + struct btf *btf = bpf_object__btf(obj); + struct btf_dump *d; + struct bpf_map *map; + const struct btf_type *sec, *var; + const struct btf_var_secinfo *sec_var; + int i, err, vlen; + char map_ident[256], var_ident[256], sec_ident[256]; + bool strip_mods = false; + const char *sec_name, *var_name; + __u32 var_type_id; + + d = btf_dump__new(btf, codegen_btf_dump_printf, NULL, NULL); + err = libbpf_get_error(d); + if (err) + return err; + + bpf_object__for_each_map(map, obj) { + /* only generate definitions for memory-mapped internal maps */ + if (!bpf_map__is_internal(map)) + continue; + if (!(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) + continue; + if (!get_map_ident(map, map_ident, sizeof(map_ident))) + continue; + + sec = find_type_for_map(btf, map_ident); + if (!sec) + continue; + + sec_name = btf__name_by_offset(btf, sec->name_off); + if (!get_datasec_ident(sec_name, sec_ident, sizeof(sec_ident))) + continue; + + if (strcmp(sec_name, ".kconfig") != 0) + strip_mods = true; + + printf(" struct %s__%s {\n", obj_name, sec_ident); + + sec_var = btf_var_secinfos(sec); + vlen = btf_vlen(sec); + for (i = 0; i < vlen; i++, sec_var++) { + DECLARE_LIBBPF_OPTS(btf_dump_emit_type_decl_opts, opts, + .field_name = var_ident, + .indent_level = 2, + .strip_mods = strip_mods, + ); + + var = btf__type_by_id(btf, sec_var->type); + var_name = btf__name_by_offset(btf, var->name_off); + var_type_id = var->type; + + /* static variables are not exposed through BPF skeleton */ + if (btf_var(var)->linkage == BTF_VAR_STATIC) + continue; + + /* leave the first character for a * prefix, size - 2 + * as a result as well + */ + var_ident[0] = '\0'; + var_ident[1] = '\0'; + strncat(var_ident + 1, var_name, sizeof(var_ident) - 2); + + /* sanitize variable name, e.g., for static vars inside + * a function, it's name is '.', + * which we'll turn into a '_'. + */ + sanitize_identifier(var_ident + 1); + var_ident[0] = ' '; + + /* The datasec member has KIND_VAR but we want the + * underlying type of the variable (e.g. KIND_INT). + */ + var = btf__type_by_id(btf, var->type); + + /* Prepend * to the field name to make it a pointer. */ + var_ident[0] = '*'; + + printf("\t\t"); + /* Func and array members require special handling. + * Instead of producing `typename *var`, they produce + * `typeof(typename) *var`. This allows us to keep a + * similar syntax where the identifier is just prefixed + * by *, allowing us to ignore C declaration minutae. + */ + if (btf_is_array(var) || + btf_is_ptr_to_func_proto(btf, var)) { + printf("typeof("); + /* print the type inside typeof() without a name */ + opts.field_name = ""; + err = btf_dump__emit_type_decl(d, var_type_id, &opts); + if (err) + goto out; + printf(") %s", var_ident); + } else { + err = btf_dump__emit_type_decl(d, var_type_id, &opts); + if (err) + goto out; + } + printf(";\n"); + } + printf(" } %s;\n", sec_ident); + } + +out: + btf_dump__free(d); + return err; +} + static void codegen(const char *template, ...) { const char *src, *end; @@ -727,10 +843,93 @@ static int gen_trace(struct bpf_object *obj, const char *obj_name, const char *h return err; } +static void +codegen_maps_skeleton(struct bpf_object *obj, size_t map_cnt, bool mmaped) +{ + struct bpf_map *map; + char ident[256]; + size_t i; + + if (map_cnt) { + codegen("\ + \n\ + \n\ + /* maps */ \n\ + s->map_cnt = %zu; \n\ + s->map_skel_sz = sizeof(*s->maps); \n\ + s->maps = (struct bpf_map_skeleton *)calloc(s->map_cnt, s->map_skel_sz);\n\ + if (!s->maps) \n\ + goto err; \n\ + ", + map_cnt + ); + i = 0; + bpf_object__for_each_map(map, obj) { + if (!get_map_ident(map, ident, sizeof(ident))) + continue; + + codegen("\ + \n\ + \n\ + s->maps[%zu].name = \"%s\"; \n\ + s->maps[%zu].map = &obj->maps.%s; \n\ + ", + i, bpf_map__name(map), i, ident); + /* memory-mapped internal maps */ + if (mmaped && bpf_map__is_internal(map) && + (bpf_map__map_flags(map) & BPF_F_MMAPABLE)) { + printf("\ts->maps[%zu].mmaped = (void **)&obj->%s;\n", + i, ident); + } + i++; + } + } +} + +static void +codegen_progs_skeleton(struct bpf_object *obj, size_t prog_cnt, bool populate_links) +{ + struct bpf_program *prog; + int i; + + if (prog_cnt) { + codegen("\ + \n\ + \n\ + /* programs */ \n\ + s->prog_cnt = %zu; \n\ + s->prog_skel_sz = sizeof(*s->progs); \n\ + s->progs = (struct bpf_prog_skeleton *)calloc(s->prog_cnt, s->prog_skel_sz);\n\ + if (!s->progs) \n\ + goto err; \n\ + ", + prog_cnt + ); + i = 0; + bpf_object__for_each_program(prog, obj) { + codegen("\ + \n\ + \n\ + s->progs[%1$zu].name = \"%2$s\"; \n\ + s->progs[%1$zu].prog = &obj->progs.%2$s;\n\ + ", + i, bpf_program__name(prog)); + + if (populate_links) + codegen("\ + \n\ + s->progs[%1$zu].link = &obj->links.%2$s;\n\ + ", + i, bpf_program__name(prog)); + i++; + } + } +} + static int do_skeleton(int argc, char **argv) { char header_guard[MAX_OBJ_NAME_LEN + sizeof("__SKEL_H__")]; - size_t i, map_cnt = 0, prog_cnt = 0, file_sz, mmap_sz; + size_t map_cnt = 0, prog_cnt = 0, file_sz, mmap_sz; DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts); char obj_name[MAX_OBJ_NAME_LEN] = "", *obj_data; struct bpf_object *obj = NULL; @@ -821,7 +1020,7 @@ static int do_skeleton(int argc, char **argv) prog_cnt++; } - get_header_guard(header_guard, obj_name); + get_header_guard(header_guard, obj_name, "SKEL_H"); if (use_loader) { codegen("\ \n\ @@ -1024,66 +1223,10 @@ static int do_skeleton(int argc, char **argv) ", obj_name ); - if (map_cnt) { - codegen("\ - \n\ - \n\ - /* maps */ \n\ - s->map_cnt = %zu; \n\ - s->map_skel_sz = sizeof(*s->maps); \n\ - s->maps = (struct bpf_map_skeleton *)calloc(s->map_cnt, s->map_skel_sz);\n\ - if (!s->maps) \n\ - goto err; \n\ - ", - map_cnt - ); - i = 0; - bpf_object__for_each_map(map, obj) { - if (!get_map_ident(map, ident, sizeof(ident))) - continue; - codegen("\ - \n\ - \n\ - s->maps[%zu].name = \"%s\"; \n\ - s->maps[%zu].map = &obj->maps.%s; \n\ - ", - i, bpf_map__name(map), i, ident); - /* memory-mapped internal maps */ - if (bpf_map__is_internal(map) && - (bpf_map__map_flags(map) & BPF_F_MMAPABLE)) { - printf("\ts->maps[%zu].mmaped = (void **)&obj->%s;\n", - i, ident); - } - i++; - } - } - if (prog_cnt) { - codegen("\ - \n\ - \n\ - /* programs */ \n\ - s->prog_cnt = %zu; \n\ - s->prog_skel_sz = sizeof(*s->progs); \n\ - s->progs = (struct bpf_prog_skeleton *)calloc(s->prog_cnt, s->prog_skel_sz);\n\ - if (!s->progs) \n\ - goto err; \n\ - ", - prog_cnt - ); - i = 0; - bpf_object__for_each_program(prog, obj) { - codegen("\ - \n\ - \n\ - s->progs[%1$zu].name = \"%2$s\"; \n\ - s->progs[%1$zu].prog = &obj->progs.%2$s;\n\ - s->progs[%1$zu].link = &obj->links.%2$s;\n\ - ", - i, bpf_program__name(prog)); - i++; - } - } + codegen_maps_skeleton(obj, map_cnt, true /*mmaped*/); + codegen_progs_skeleton(obj, prog_cnt, true /*populate_links*/); + codegen("\ \n\ \n\ @@ -1141,6 +1284,324 @@ static int do_skeleton(int argc, char **argv) return err; } +/* Subskeletons are like skeletons, except they don't own the bpf_object, + * associated maps, links, etc. Instead, they know about the existence of + * variables, maps, programs and are able to find their locations + * _at runtime_ from an already loaded bpf_object. + * + * This allows for library-like BPF objects to have userspace counterparts + * with access to their own items without having to know anything about the + * final BPF object that the library was linked into. + */ +static int do_subskeleton(int argc, char **argv) +{ + char header_guard[MAX_OBJ_NAME_LEN + sizeof("__SUBSKEL_H__")]; + size_t i, len, file_sz, map_cnt = 0, prog_cnt = 0, mmap_sz, var_cnt = 0, var_idx = 0; + DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts); + char obj_name[MAX_OBJ_NAME_LEN] = "", *obj_data; + struct bpf_object *obj = NULL; + const char *file, *var_name; + char ident[256], var_ident[256]; + int fd, err = -1, map_type_id; + const struct bpf_map *map; + struct bpf_program *prog; + struct btf *btf; + const struct btf_type *map_type, *var_type; + const struct btf_var_secinfo *var; + struct stat st; + + if (!REQ_ARGS(1)) { + usage(); + return -1; + } + file = GET_ARG(); + + while (argc) { + if (!REQ_ARGS(2)) + return -1; + + if (is_prefix(*argv, "name")) { + NEXT_ARG(); + + if (obj_name[0] != '\0') { + p_err("object name already specified"); + return -1; + } + + strncpy(obj_name, *argv, MAX_OBJ_NAME_LEN - 1); + obj_name[MAX_OBJ_NAME_LEN - 1] = '\0'; + } else { + p_err("unknown arg %s", *argv); + return -1; + } + + NEXT_ARG(); + } + + if (argc) { + p_err("extra unknown arguments"); + return -1; + } + + if (use_loader) { + p_err("cannot use loader for subskeletons"); + return -1; + } + + if (stat(file, &st)) { + p_err("failed to stat() %s: %s", file, strerror(errno)); + return -1; + } + file_sz = st.st_size; + mmap_sz = roundup(file_sz, sysconf(_SC_PAGE_SIZE)); + fd = open(file, O_RDONLY); + if (fd < 0) { + p_err("failed to open() %s: %s", file, strerror(errno)); + return -1; + } + obj_data = mmap(NULL, mmap_sz, PROT_READ, MAP_PRIVATE, fd, 0); + if (obj_data == MAP_FAILED) { + obj_data = NULL; + p_err("failed to mmap() %s: %s", file, strerror(errno)); + goto out; + } + if (obj_name[0] == '\0') + get_obj_name(obj_name, file); + + /* The empty object name allows us to use bpf_map__name and produce + * ELF section names out of it. (".data" instead of "obj.data") + */ + opts.object_name = ""; + obj = bpf_object__open_mem(obj_data, file_sz, &opts); + if (!obj) { + char err_buf[256]; + + libbpf_strerror(errno, err_buf, sizeof(err_buf)); + p_err("failed to open BPF object file: %s", err_buf); + obj = NULL; + goto out; + } + + btf = bpf_object__btf(obj); + if (!btf) { + err = -1; + p_err("need btf type information for %s", obj_name); + goto out; + } + + bpf_object__for_each_program(prog, obj) { + prog_cnt++; + } + + /* First, count how many variables we have to find. + * We need this in advance so the subskel can allocate the right + * amount of storage. + */ + bpf_object__for_each_map(map, obj) { + if (!get_map_ident(map, ident, sizeof(ident))) + continue; + + /* Also count all maps that have a name */ + map_cnt++; + + if (!bpf_map__is_internal(map)) + continue; + if (!(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) + continue; + + map_type_id = bpf_map__btf_value_type_id(map); + if (map_type_id < 0) { + err = map_type_id; + goto out; + } + map_type = btf__type_by_id(btf, map_type_id); + + var = btf_var_secinfos(map_type); + len = btf_vlen(map_type); + for (i = 0; i < len; i++, var++) { + var_type = btf__type_by_id(btf, var->type); + + if (btf_var(var_type)->linkage == BTF_VAR_STATIC) + continue; + + var_cnt++; + } + } + + get_header_guard(header_guard, obj_name, "SUBSKEL_H"); + codegen("\ + \n\ + /* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ \n\ + \n\ + /* THIS FILE IS AUTOGENERATED! */ \n\ + #ifndef %2$s \n\ + #define %2$s \n\ + \n\ + #include \n\ + #include \n\ + #include \n\ + \n\ + struct %1$s { \n\ + struct bpf_object *obj; \n\ + struct bpf_object_subskeleton *subskel; \n\ + ", obj_name, header_guard); + + if (map_cnt) { + printf("\tstruct {\n"); + bpf_object__for_each_map(map, obj) { + if (!get_map_ident(map, ident, sizeof(ident))) + continue; + printf("\t\tstruct bpf_map *%s;\n", ident); + } + printf("\t} maps;\n"); + } + + if (prog_cnt) { + printf("\tstruct {\n"); + bpf_object__for_each_program(prog, obj) { + printf("\t\tstruct bpf_program *%s;\n", + bpf_program__name(prog)); + } + printf("\t} progs;\n"); + } + + err = codegen_subskel_datasecs(obj, obj_name); + if (err) + goto out; + + /* emit code that will allocate enough storage for all symbols */ + codegen("\ + \n\ + \n\ + #ifdef __cplusplus \n\ + static inline struct %1$s *open(const struct bpf_object *src);\n\ + static inline void destroy(struct %1$s *skel);\n\ + #endif /* __cplusplus */ \n\ + }; \n\ + \n\ + static inline void \n\ + %1$s__destroy(struct %1$s *skel) \n\ + { \n\ + if (!skel) \n\ + return; \n\ + if (skel->subskel) \n\ + bpf_object__destroy_subskeleton(skel->subskel);\n\ + free(skel); \n\ + } \n\ + \n\ + static inline struct %1$s * \n\ + %1$s__open(const struct bpf_object *src) \n\ + { \n\ + struct %1$s *obj; \n\ + struct bpf_object_subskeleton *s; \n\ + int err; \n\ + \n\ + obj = (struct %1$s *)calloc(1, sizeof(*obj)); \n\ + if (!obj) { \n\ + errno = ENOMEM; \n\ + goto err; \n\ + } \n\ + s = (struct bpf_object_subskeleton *)calloc(1, sizeof(*s));\n\ + if (!s) { \n\ + errno = ENOMEM; \n\ + goto err; \n\ + } \n\ + s->sz = sizeof(*s); \n\ + s->obj = src; \n\ + s->var_skel_sz = sizeof(*s->vars); \n\ + obj->subskel = s; \n\ + \n\ + /* vars */ \n\ + s->var_cnt = %2$d; \n\ + s->vars = (struct bpf_var_skeleton *)calloc(%2$d, sizeof(*s->vars));\n\ + if (!s->vars) { \n\ + errno = ENOMEM; \n\ + goto err; \n\ + } \n\ + \n\ + ", + obj_name, var_cnt + ); + + /* walk through each symbol and emit the runtime representation */ + bpf_object__for_each_map(map, obj) { + if (!bpf_map__is_internal(map)) + continue; + + if (!(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) + continue; + + if (!get_map_ident(map, ident, sizeof(ident))) + continue; + + map_type_id = bpf_map__btf_value_type_id(map); + if (map_type_id < 0) + /* skip over internal maps with no type*/ + continue; + + map_type = btf__type_by_id(btf, map_type_id); + var = btf_var_secinfos(map_type); + len = btf_vlen(map_type); + for (i = 0; i < len; i++, var++) { + var_type = btf__type_by_id(btf, var->type); + var_name = btf__name_by_offset(btf, var_type->name_off); + + if (btf_var(var_type)->linkage == BTF_VAR_STATIC) + continue; + + var_ident[0] = '\0'; + strncat(var_ident, var_name, sizeof(var_ident) - 1); + sanitize_identifier(var_ident); + + /* Note that we use the dot prefix in .data as the + * field access operator i.e. maps%s becomes maps.data + */ + codegen("\ + \n\ + s->vars[%4$d].name = \"%1$s\"; \n\ + s->vars[%4$d].map = &obj->maps%3$s; \n\ + s->vars[%4$d].addr = (void**) &obj->%2$s.%1$s;\n\ + ", var_ident, ident, bpf_map__name(map), var_idx); + + var_idx++; + } + } + + codegen_maps_skeleton(obj, map_cnt, false /*mmaped*/); + codegen_progs_skeleton(obj, prog_cnt, false /*links*/); + + codegen("\ + \n\ + \n\ + err = bpf_object__open_subskeleton(s); \n\ + if (err) { \n\ + errno = err; \n\ + goto err; \n\ + } \n\ + \n\ + return obj; \n\ + err: \n\ + %1$s__destroy(obj); \n\ + return NULL; \n\ + } \n\ + \n\ + #ifdef __cplusplus \n\ + struct %1$s *%1$s::open(const struct bpf_object *src) { return %1$s__open(src); }\n\ + void %1$s::destroy(struct %1$s *skel) { %1$s__destroy(skel); }\n\ + #endif /* __cplusplus */ \n\ + \n\ + #endif /* %2$s */ \n\ + ", + obj_name, header_guard); + err = 0; +out: + bpf_object__close(obj); + if (obj_data) + munmap(obj_data, mmap_sz); + close(fd); + return err; +} + static int do_object(int argc, char **argv) { struct bpf_linker *linker; @@ -1192,6 +1653,7 @@ static int do_help(int argc, char **argv) fprintf(stderr, "Usage: %1$s %2$s object OUTPUT_FILE INPUT_FILE [INPUT_FILE...]\n" " %1$s %2$s skeleton FILE [name OBJECT_NAME]\n" + " %1$s %2$s subskeleton FILE [name OBJECT_NAME]\n" " %1$s %2$s min_core_btf INPUT OUTPUT OBJECT [OBJECT...]\n" " %1$s %2$s help\n" "\n" @@ -1788,6 +2250,7 @@ static int do_min_core_btf(int argc, char **argv) static const struct cmd cmds[] = { { "object", do_object }, { "skeleton", do_skeleton }, + { "subskeleton", do_subskeleton }, { "min_core_btf", do_min_core_btf}, { "help", do_help }, { 0 } From patchwork Fri Mar 11 00:12:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delyan Kratunov X-Patchwork-Id: 12777135 X-Patchwork-Delegate: bpf@iogearbox.net 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 D9D1EC433F5 for ; Fri, 11 Mar 2022 00:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239798AbiCKANb (ORCPT ); Thu, 10 Mar 2022 19:13:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238512AbiCKANa (ORCPT ); Thu, 10 Mar 2022 19:13:30 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3E7B62F5 for ; Thu, 10 Mar 2022 16:12:26 -0800 (PST) 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 22AJQ4rx020300 for ; Thu, 10 Mar 2022 16:12:26 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=facebook; bh=4MWhU/WX5BiQ5dXo2Orb2E48CSjV8N3nspX05zjbIzA=; b=QWBTtahEBGaF9o0sluJNOMpmwyWaOjQm5zUZPChmfKJO6Tp/Q2RTqOpFelAvQvCNvgX0 BD3XIZGj74CFoJlH0IySW8mbqHV31Sdi9EYUHSOGijoblhifJTzmi0jb8vskkgGJSA9c BRA2vXxgGUmngSUh74YV7NDp1GUzDK/GT40= Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2177.outbound.protection.outlook.com [104.47.58.177]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3eqqfssuyt-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Mar 2022 16:12:25 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R+Lokg/yaSDwMUma6ThSP2YzODvuEt5QuP8KPoHiDRvxZgzZPEFfjkSttiChwZj7DGMwp+rdkn7qGoQ5BdbrO0d6zBhY7O/Q6yaZSRGPeu+giVW59rtl/SOSMhdBnsTjmS401a4a/G0OqciNcnZ0+bSOvOhSKPlQ/cCn/Cyp8u1MCB+V9/KswV3zTOnl0me9rpVURM+CMLalXma2ZSLiMhVUI/9wZY8ks408dLouzjYTKha9If3wrNObqhYznEJB4trFt/aGnNjfSR/YXguxtTkXqF64Q1Zy/iDcozUl49MSY2wOz00Tmm8WmfLVmtAbsEh+1dNyT8wzIsHiqR9vmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4MWhU/WX5BiQ5dXo2Orb2E48CSjV8N3nspX05zjbIzA=; b=jnb1WOUeZ48WDYikiR1Fm7OYvm2sK/Wpca3DadWRpGNcc1YbzqWGOgeujIuJMLwxyb5Rj3sOQa8BEj2VODXEmQgcTJRxuBvEdLP4/8X+6WcJ2hs1OkNR0zjzOC64H6Hcq+su/ZUq3jNi3NO5tQBZYlAf8EP8EiCena5/uZ8x9ScWGiSqiBwHi5Rw6gRhYPR+Ue1eVmh5erFi5LtOlplZSrexWwB62+oMrdeN6uJMXfCkkwRFmaseXeKu3jwlvbXwOuKkYWeh4gPqrEBMct2laYNMOAj40l5j3y5n7weH6ei454c5OFBguBFO0djPPJx8ADhyAN5jJSprffQVD/yetA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none Received: from SJ0PR15MB5154.namprd15.prod.outlook.com (2603:10b6:a03:423::6) by SJ0PR15MB4201.namprd15.prod.outlook.com (2603:10b6:a03:2ab::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Fri, 11 Mar 2022 00:12:12 +0000 Received: from SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3]) by SJ0PR15MB5154.namprd15.prod.outlook.com ([fe80::90c1:20f8:4fc6:d7a3%6]) with mapi id 15.20.5061.022; Fri, 11 Mar 2022 00:12:12 +0000 From: Delyan Kratunov To: "daniel@iogearbox.net" , "ast@kernel.org" , "andrii@kernel.org" , "bpf@vger.kernel.org" Subject: [PATCH bpf-next v2 5/5] selftests/bpf: test subskeleton functionality Thread-Topic: [PATCH bpf-next v2 5/5] selftests/bpf: test subskeleton functionality Thread-Index: AQHYNNynKBOOrW4LI0Oh4u2OfVdj+w== Date: Fri, 11 Mar 2022 00:12:11 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ec8f6196-652c-49db-c809-08da02f3ca47 x-ms-traffictypediagnostic: SJ0PR15MB4201:EE_ x-microsoft-antispam-prvs: x-fb-source: Internal x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: MM/k0U2svTOH88ZIhJVkyBpDhQ2p7irgVIjmjFtPeli8wqXJtTJW6q3ORiYHR67MVjDbjJWRIYgkGBWDEIcrxvZHyHW8m54Flod8RLdE/joTdMEM/f0a7eFiEXEtZZgTo+Hkd4/pdr4vOWzxw+YDiw+L05uNowXja4u3Zjl0OzLKPmNCMG2d0MPSIqfe9hAr4RJ+FGZeX8KKWWwn40zMDmh1a+InWfTgmHtYDfBLL0ZYiPN4tw9l9RkZ+6cJT3vfewnpWG2mReN7z1Oan7tKcl/6W/jUJ5vMfxp8w0fYO6yZZ96qnH0/0RvLSE4omZ+HlEow2A4YYaqjqS4J0mHZJLAWFER3wRfaAZsqHpiv3kOHQDxXZ3PmYXe9vDvjqc2La9ib3TjtGXmFMEspm1j4zFCbhKZO1rJ4pyb8bGhni0ISEzkQzZAJlKOF4QjwlWujKv8ityFMVkVVBL7NtRcdXaQSHE5s9loSK/wda6qtaEphPp+BYsOmkUrdEq+NnbroM75vGkU/vzu9RHsbQPVrI8qvWfyQl5jn29GJJf33+Kaky/hK5EcQJIhnuhsjQeqD7DOl/WXoE1Hcnj2N4gbk6+/4MoFhUlLKovSfIcKqKornSOjdIez1BIzlBdueTfXwi7Ly+Tcpjta0QadrvfJksdY7CJcXwQQ+UG6M7t3dUD3Hy26PhJHqKmz7GCmTaBv4f7FGqOLyOe79Yn3c1EmqoQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR15MB5154.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(38100700002)(122000001)(8676002)(86362001)(316002)(6486002)(38070700005)(66556008)(83380400001)(66946007)(186003)(64756008)(66476007)(2616005)(66446008)(76116006)(91956017)(36756003)(8936002)(2906002)(5660300002)(6506007)(6512007)(508600001)(71200400001)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?EXHYe6t/kyCNaZzpJ9O6mbJ?= =?iso-8859-1?q?Mm36HYW4uQL8vPXQjTjqzyYwvFxod8A18uVZd/lZuX98o1QPsdusvrjP4Evp?= =?iso-8859-1?q?NebArZGxpmjfLgSSDv/IvrGb3+Vf3vlfZwUfsPlslS1ena168fw+989LV7r/?= =?iso-8859-1?q?siGoL4l6jJW6GqjPCZp+wuW/R1ASEf8IAGFsgUYxiPptFmvzkZMf3dOd7/gP?= =?iso-8859-1?q?EfvgG4BcElJ0XY8VFeeOhDpEvIcRnInqcgILExFaNAAP8j4EzNPi9hi69Bvg?= =?iso-8859-1?q?k0OsGmFrrA6MOGec0HmQ3wpvE301yImowLyDB+z4BcaMvOvBhdizg3drX/b1?= =?iso-8859-1?q?4FJESMjHUaMRR+xJhory/gC0zAbK0RW9IhWo497bYDwVbFyPnRyJ9w+I5UEe?= =?iso-8859-1?q?32XPDjnW8NEQY7r4MOLQm0FXYctxW3GVlJHN5KSjKOc9dYcO6KXLeR+WcSgW?= =?iso-8859-1?q?wZaLifDQqI2QYCBbiccfjlDSVfNisBqpfP/d64L9grjW23P4C+T31uzMGv2p?= =?iso-8859-1?q?cpfX8wbCQZKRl5VYu0zLeMh7Wz5HiXzvdEoNGDN1A3onmnShoIKQWHIYFPHk?= =?iso-8859-1?q?Lup/27Hagqj+G48j9A4iSP/ZOSfK0Fm2Pc8vfJS9REaznPrhlmy+EeDLCvr0?= =?iso-8859-1?q?2qd/j7+nw4WFJxp7YMwoCzXlJvc0+LhjLAobQo9j5OjoPNRdNXKafwQF2xuG?= =?iso-8859-1?q?Bcy8DbVJT1u/y36zCSGdTMS7DmVJVGS+3ikl76/IcU3BEvFqzWXhU5CpPsti?= =?iso-8859-1?q?6+NTcF9bamlXDR8UQlvBmkCsorMqpYrHFyB5MLVO0cclhYFI+sL2VgG/Yksy?= =?iso-8859-1?q?ugYAapRS6Ixypcw/TmNbfe8khth7eR3tj0uDr/VA5Cys8p7IrkUpARxijGRe?= =?iso-8859-1?q?6Msrkl/19/Afk2p301nbS523n/XPzZJGNvXkz7+a5HcBWG2Psf+3mV0qi0Iu?= =?iso-8859-1?q?UB8XZ3s90XojXrCrLBECmDYFY43psljqCIuFKGQqv+0g6Foonuhppr+hPQCs?= =?iso-8859-1?q?HR7JaT5cwCEjhNF3sDQ8xjvZy++tNS9g4ABPKjLfzIkOTiBhvRrNWLWWhnu/?= =?iso-8859-1?q?15+OtJnF1c1Q8QeDl5u8gtXRmHHFLYN5+MHsop4jVpWqtNd5wzu6ICi2+skp?= =?iso-8859-1?q?NYmfT2oEamjO9EF8Rm0c7a6ihcYVIC79MZT4TX/a0f13AY2cSeEIJHZDnf2R?= =?iso-8859-1?q?TiQIq82kpXAnmnmPX0wM/nnfB8qJiJ83hZTpH9YG5CxyZJSp+P/mjACq5/Yp?= =?iso-8859-1?q?WVM86kFhfZV0yZ2rZNq6CeEIWnIjv8roIBFo1AQkZ3BuyVFc/CHabZfSqA0u?= =?iso-8859-1?q?bJC90ZOtTKvsLIy8HPASv2GA+p9ZxSUfdctNwYEJlDr5RF8p1v0UyDw70LUd?= =?iso-8859-1?q?2fUaDO8qmBSvfVuyNLo86srpGERi6QMs18hIQeb/u/CjRegGOj0RAYFmMZxd?= =?iso-8859-1?q?kv8DdrPDdE798m2byTX11L1ZB+C2xHFrH5rhDeqgaqCdYT0Gg6m0U2QepdHd?= =?iso-8859-1?q?EvGX/L0qHJNaeB7RE+E3qp+9RJHdcdy5EXO2NjJyF2zoRvWFtIoWsP5ZQz5g?= =?iso-8859-1?q?UVkt9iELfR1o2OmQEOtKcVOZXpBgDr0lD8FxfY/UFVtJoqAtdIFXA00bNeaV?= =?iso-8859-1?q?inGDzJocxI5Pkq05+FRQnSjf+Yuu8ItsqsTl8ig=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: fb.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR15MB5154.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec8f6196-652c-49db-c809-08da02f3ca47 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Mar 2022 00:12:11.9261 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: VwROJ/ZV4YIy5UJIRxNtfx/JVni4+a+UMlJYH0T15CwIAawS/s79k1vxq8keblXW X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR15MB4201 X-Proofpoint-GUID: C1bIicOLiFgA9pm3Q8wGxyr3mirp4qoK X-Proofpoint-ORIG-GUID: C1bIicOLiFgA9pm3Q8wGxyr3mirp4qoK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.64.514 definitions=2022-03-10_09,2022-03-09_01,2022-02-23_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This patch changes the selftests/bpf Makefile to also generate a subskel.h for every skel.h it would have normally generated. Separately, it also introduces a new subskeleton test which tests library objects, externs, weak symbols, kconfigs, and user maps. Signed-off-by: Delyan Kratunov --- tools/testing/selftests/bpf/.gitignore | 1 + tools/testing/selftests/bpf/Makefile | 10 ++- .../selftests/bpf/prog_tests/subskeleton.c | 83 +++++++++++++++++++ .../selftests/bpf/progs/test_subskeleton.c | 23 +++++ .../bpf/progs/test_subskeleton_lib.c | 56 +++++++++++++ .../bpf/progs/test_subskeleton_lib2.c | 16 ++++ 6 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/subskeleton.c create mode 100644 tools/testing/selftests/bpf/progs/test_subskeleton.c create mode 100644 tools/testing/selftests/bpf/progs/test_subskeleton_lib.c create mode 100644 tools/testing/selftests/bpf/progs/test_subskeleton_lib2.c diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index a7eead8820a0..595565eb68c0 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -31,6 +31,7 @@ test_tcp_check_syncookie_user test_sysctl xdping test_cpp +*.subskel.h *.skel.h *.lskel.h /no_alu32 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index fe12b4f5fe20..9f7b22faedd6 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -328,6 +328,12 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h +# In the subskeleton case, we want the test_subskeleton_lib.subskel.h file +# but that's created as a side-effect of the skel.h generation. +LINKED_SKELS += test_subskeleton.skel.h test_subskeleton_lib.skel.h +test_subskeleton.skel.h-deps := test_subskeleton_lib2.o test_subskeleton_lib.o test_subskeleton.o +test_subskeleton_lib.skel.h-deps := test_subskeleton_lib2.o test_subskeleton_lib.o + LSKELS := kfunc_call_test.c fentry_test.c fexit_test.c fexit_sleep.c \ test_ringbuf.c atomics.c trace_printk.c trace_vprintk.c \ map_ptr_kern.c core_kern.c core_kern_overflow.c @@ -404,6 +410,7 @@ $(TRUNNER_BPF_SKELS): %.skel.h: %.o $(BPFTOOL) | $(TRUNNER_OUTPUT) $(Q)$$(BPFTOOL) gen object $$(<:.o=.linked3.o) $$(<:.o=.linked2.o) $(Q)diff $$(<:.o=.linked2.o) $$(<:.o=.linked3.o) $(Q)$$(BPFTOOL) gen skeleton $$(<:.o=.linked3.o) name $$(notdir $$(<:.o=)) > $$@ + $(Q)$$(BPFTOOL) gen subskeleton $$(<:.o=.linked3.o) name $$(notdir $$(<:.o=)) > $$(@:.skel.h=.subskel.h) $(TRUNNER_BPF_LSKELS): %.lskel.h: %.o $(BPFTOOL) | $(TRUNNER_OUTPUT) $$(call msg,GEN-SKEL,$(TRUNNER_BINARY),$$@) @@ -421,6 +428,7 @@ $(TRUNNER_BPF_SKELS_LINKED): $(TRUNNER_BPF_OBJS) $(BPFTOOL) | $(TRUNNER_OUTPUT) $(Q)diff $$(@:.skel.h=.linked2.o) $$(@:.skel.h=.linked3.o) $$(call msg,GEN-SKEL,$(TRUNNER_BINARY),$$@) $(Q)$$(BPFTOOL) gen skeleton $$(@:.skel.h=.linked3.o) name $$(notdir $$(@:.skel.h=)) > $$@ + $(Q)$$(BPFTOOL) gen subskeleton $$(@:.skel.h=.linked3.o) name $$(notdir $$(@:.skel.h=)) > $$(@:.skel.h=.subskel.h) endif # ensure we set up tests.h header generation rule just once @@ -557,6 +565,6 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o \ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ prog_tests/tests.h map_tests/tests.h verifier/tests.h \ feature bpftool \ - $(addprefix $(OUTPUT)/,*.o *.skel.h *.lskel.h no_alu32 bpf_gcc bpf_testmod.ko) + $(addprefix $(OUTPUT)/,*.o *.skel.h *.lskel.h *.subskel.h no_alu32 bpf_gcc bpf_testmod.ko) .PHONY: docs docs-clean diff --git a/tools/testing/selftests/bpf/prog_tests/subskeleton.c b/tools/testing/selftests/bpf/prog_tests/subskeleton.c new file mode 100644 index 000000000000..9cbe17281f17 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/subskeleton.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) Meta Platforms, Inc. and affiliates. */ + +#include +#include "test_subskeleton.skel.h" +#include "test_subskeleton_lib.subskel.h" + +void subskeleton_lib_setup(struct bpf_object *obj) +{ + struct test_subskeleton_lib *lib = test_subskeleton_lib__open(obj); + + if (!ASSERT_OK_PTR(lib, "open subskeleton")) + goto out; + + *lib->rodata.var1 = 1; + *lib->data.var2 = 2; + lib->bss.var3->var3_1 = 3; + lib->bss.var3->var3_2 = 4; + +out: + test_subskeleton_lib__destroy(lib); +} + +int subskeleton_lib_subresult(struct bpf_object *obj) +{ + struct test_subskeleton_lib *lib = test_subskeleton_lib__open(obj); + int result; + + if (!ASSERT_OK_PTR(lib, "open subskeleton")) { + result = -EINVAL; + goto out; + } + + result = *lib->bss.libout1; + ASSERT_EQ(result, 1 + 2 + 3 + 4 + 5 + 6, "lib subresult"); + + ASSERT_OK_PTR(lib->progs.lib_perf_handler, "lib_perf_handler"); + ASSERT_STREQ(bpf_program__name(lib->progs.lib_perf_handler), + "lib_perf_handler", "program name"); + + ASSERT_OK_PTR(lib->maps.map1, "map1"); + ASSERT_STREQ(bpf_map__name(lib->maps.map1), "map1", "map name"); + + ASSERT_EQ(*lib->data.var5, 5, "__weak var5"); + ASSERT_EQ(*lib->data.var6, 6, "extern var6"); + ASSERT_TRUE(*lib->kconfig.CONFIG_BPF_SYSCALL, "CONFIG_BPF_SYSCALL"); + +out: + test_subskeleton_lib__destroy(lib); + return result; +} + +void test_subskeleton(void) +{ + int err, result; + struct test_subskeleton *skel; + + skel = test_subskeleton__open(); + if (!ASSERT_OK_PTR(skel, "skel_open")) + return; + + skel->rodata->rovar1 = 10; + skel->rodata->var1 = 1; + subskeleton_lib_setup(skel->obj); + + err = test_subskeleton__load(skel); + if (!ASSERT_OK(err, "skel_load")) + goto cleanup; + + + err = test_subskeleton__attach(skel); + if (!ASSERT_OK(err, "skel_attach")) + goto cleanup; + + /* trigger tracepoint */ + usleep(1); + + result = subskeleton_lib_subresult(skel->obj) * 10; + ASSERT_EQ(skel->bss->out1, result, "unexpected calculation"); + +cleanup: + test_subskeleton__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/test_subskeleton.c b/tools/testing/selftests/bpf/progs/test_subskeleton.c new file mode 100644 index 000000000000..5bd5452b41cd --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_subskeleton.c @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) Meta Platforms, Inc. and affiliates. */ + +#include +#include + +/* volatile to force a read, compiler may assume 0 otherwise */ +const volatile int rovar1; +int out1; + +/* Override weak symbol in test_subskeleton_lib */ +int var5 = 5; + +extern int lib_routine(void); + +SEC("raw_tp/sys_enter") +int handler1(const void *ctx) +{ + out1 = lib_routine() * rovar1; + return 0; +} + +char LICENSE[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/progs/test_subskeleton_lib.c b/tools/testing/selftests/bpf/progs/test_subskeleton_lib.c new file mode 100644 index 000000000000..665338006e33 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_subskeleton_lib.c @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) Meta Platforms, Inc. and affiliates. */ + +#include +#include +#include + +/* volatile to force a read */ +const volatile int var1; +volatile int var2 = 1; +struct { + int var3_1; + __s64 var3_2; +} var3; +int libout1; + +extern volatile bool CONFIG_BPF_SYSCALL __kconfig; + +int var4[4]; + +__weak int var5 SEC(".data"); +extern int var6; +int (*fn_ptr)(void); + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __type(key, __u32); + __type(value, __u32); + __uint(max_entries, 16); +} map1 SEC(".maps"); + +extern struct { + __uint(type, BPF_MAP_TYPE_HASH); + __type(key, __u32); + __type(value, __u32); + __uint(max_entries, 16); +} map2 SEC(".maps"); + +int lib_routine(void) +{ + __u32 key = 1, value = 2; + + (void) CONFIG_BPF_SYSCALL; + bpf_map_update_elem(&map2, &key, &value, BPF_ANY); + + libout1 = var1 + var2 + var3.var3_1 + var3.var3_2 + var5 + var6; + return libout1; +} + +SEC("perf_event") +int lib_perf_handler(struct pt_regs *ctx) +{ + return 0; +} + +char LICENSE[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/progs/test_subskeleton_lib2.c b/tools/testing/selftests/bpf/progs/test_subskeleton_lib2.c new file mode 100644 index 000000000000..cbff92674b76 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_subskeleton_lib2.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) Meta Platforms, Inc. and affiliates. */ + +#include +#include + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __type(key, __u32); + __type(value, __u32); + __uint(max_entries, 16); +} map2 SEC(".maps"); + +int var6 = 6; + +char LICENSE[] SEC("license") = "GPL";