From patchwork Fri Jan 8 02:08:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5b2t5rWpKFJpY2hhcmQp?= X-Patchwork-Id: 12005567 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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 285D0C433E0 for ; Fri, 8 Jan 2021 02:09:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D936423601 for ; Fri, 8 Jan 2021 02:09:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726526AbhAHCJf (ORCPT ); Thu, 7 Jan 2021 21:09:35 -0500 Received: from mail-eopbgr1320082.outbound.protection.outlook.com ([40.107.132.82]:7229 "EHLO APC01-PU1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726477AbhAHCJe (ORCPT ); Thu, 7 Jan 2021 21:09:34 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ln6ejZ580otBLJZArlB/YkE4tMhk3z48UnEQHbkHwiakP8PWP/+zy6EWNzlRw9azTTFy6XUIyEny0pfTqznpPXr3NFMnpTEgh4Q+wjrOPQYtcYK94gTRkEmciWyAUux017AHVBU+WXT9JC1elk3KCQeo6ySkKEg/GLRfL6Q2vWHZMVtNPqnltS4wC7pOxNUl5X56pMdb73/PqK9kLksPlo38poNWSbzkQCsetzSXtIvDVVqLjGJkULoPni86pwqbI7svpnHo9kY7R4QDt6Dc/oq0nUBIdVaD4i33GmeBxSDbJ9JR9iBWSbW68Qo6r+8r5fZ+wHA/ovQhvOxrlk5F4w== 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-SenderADCheck; bh=q0iJgr2FmvEC2+OBdUqxmKDXCLlDE5BeBVLPO/Cii9M=; b=ICDiuwp+TC031vzIXjJFK5jvoICu0GTrV1S314Larfmeev6tFIexVUaaj/k78CHRcANopz4yLtbhvc5k+D0w593ty3Gr83Mz40px1szTbRVCUoObofgV7rSgo4PpscgVDDlL2sOwCsH453qljGRLY1t0R/i7rcWlAV4HGcG044rAC//ksLF/ki/BfXPY3EGBNkFQ5jHwE25clS9gboJA+awA9IwMUBD4OX4zOBD/KFeXCnkEZ9H/KNVuWTzvp7kYzTPq4HjsWtxjj2eNTN2nIaKJxvqBx6VenGKulMax9mTLrzwa0biYWQQyZlEIO/M8WAoyy4vBGS25WDBZjdzsdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oppo.com; dmarc=pass action=none header.from=oppo.com; dkim=pass header.d=oppo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oppoglobal.onmicrosoft.com; s=selector1-oppoglobal-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q0iJgr2FmvEC2+OBdUqxmKDXCLlDE5BeBVLPO/Cii9M=; b=hSP1sJeARc9e9z9dk9gj8yvgdtNSVLEdpy372wHvf3hZiSF2R1qwOIlNGNy2iHnSVfVUzGjL74fCTh7M+wRAGBVt6d5cBd8VwdMmHnKp7Y6RdttLLq8cNXdA+pgZnu8nuok1M/JYRb0lVDkOyy1sFmpvfd6JvMO98D9YqSBdIqA= Received: from HKAPR02MB4291.apcprd02.prod.outlook.com (2603:1096:203:d3::12) by HK2PR02MB3873.apcprd02.prod.outlook.com (2603:1096:202:19::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Fri, 8 Jan 2021 02:08:00 +0000 Received: from HKAPR02MB4291.apcprd02.prod.outlook.com ([fe80::e87c:a07c:77fc:630c]) by HKAPR02MB4291.apcprd02.prod.outlook.com ([fe80::e87c:a07c:77fc:630c%7]) with mapi id 15.20.3742.006; Fri, 8 Jan 2021 02:08:00 +0000 From: =?utf-8?b?5b2t5rWpKFJpY2hhcmQp?= To: "ast@kernel.org" , "andrii@kernel.org" CC: "bpf@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] tools/bpf: Remove unnecessary parameter in bpf_object__probe_loading Thread-Topic: [PATCH] tools/bpf: Remove unnecessary parameter in bpf_object__probe_loading Thread-Index: AdblYbQpQKmKVR0hTa2lc5nK9Yvjhg== Date: Fri, 8 Jan 2021 02:08:00 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=oppo.com; x-originating-ip: [58.255.79.102] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b53abdac-c101-4555-3c6e-08d8b37a396e x-ms-traffictypediagnostic: HK2PR02MB3873: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2657; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ygcFEZcaN8fwqaHnVBSVnPvIUXLhVAvcpv4VyQpgutwYHg6qy3f7YqW+Ps66cx3Qa4U8uE8CYWJ12ee9rt8fL2drulAgi+LWWBBNh0n6GO4yulEI5OiTNf2gg0i+0RVJ/hIQTn4fVu7WJMkXHNkED7rq3Iax73rTzJ9su/TS9tpS2kjLLA6CCfmYTWt2ylOWFpu8xyaSNeELOBDb7hy0eCFMMZvLNEgGA9JnMwQxDDZqTVsaGW9ePp59LYazK6YL57CSUbazK3L4rnOvXrAVKwbZPMgYl0wQtTU8d2GZDt8GB4+DgRaOg1oiN6sIaOkl64CGrhHyJUaa/6qZN7VkGIlrVfXt5G1CVb62Ts2GnOB4CufBlY7MJe50ihi6uMNcoYGScmdpnWdkd1Pskha/JSQj2w+mgohwMlshEH+CzYMDEtl4XgNVticmuBKPOmz3BSuHHV8z0sR/6mWtHpawO5wLGdLJDGP0kOt3lzx/Sr0= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HKAPR02MB4291.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39860400002)(376002)(396003)(366004)(136003)(64756008)(66556008)(66446008)(8676002)(66946007)(83380400001)(4744005)(8936002)(9686003)(186003)(66476007)(52536014)(478600001)(6506007)(33656002)(26005)(110136005)(7696005)(71200400001)(86362001)(5660300002)(55016002)(2906002)(4326008)(316002)(85182001)(54906003)(76116006)(11606006)(101420200001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?utf-8?q?Wpyvqpr4DDJfr7cqGqczlYVa7sKfYk?= =?utf-8?q?cHuGf+tjPGsKhqai2Bw3yF8PdvahPcjzU/SRs4wSYrQPQlZStc0+tYU8wTfKXfxaU?= =?utf-8?q?ejvSXO6qnafjSwRun8OZmrMFl0zGzaRto07VJDXlS1GzDEHD9WiD6YbwuTmAMdBnn?= =?utf-8?q?UiTndeq7x8G6E/CUNO4GhQc2YCsRH8ELN7pVcZE2CzPsvSPg4OBIhUXKO+NNYjlik?= =?utf-8?q?x21/ON50rOHiXvfL5lSOV/xi7xugxFvJpJth19xPtrBTIqygNdjYQIIbIEh7aKKD0?= =?utf-8?q?UIe0GDqEE7AUFTWE8cf1LyD369x5eZcznRJnbFpWGaw0oQxHHBJNV7flA5uKxb04i?= =?utf-8?q?9R7ogYChsf/cZ/vPlzOz0Rq209FDbmXpofZmLQeaNgqn4zANkxYDFGEtpPtU5eLSq?= =?utf-8?q?48Yc6QAdwc05F6SssG0PhntpYxHHRCVMJC/DGGWcCqWHVxIGQlkvupEm0JksJeUwr?= =?utf-8?q?6j08bvk4B+tO8cYKAx6sqSSt3bWeXxmIbC+Emgp9fjB0mAgIjqPxwGdxY4puzl2v4?= =?utf-8?q?OhAOFHe7TidihyAT+eVUyzvWl/1mKh5IM6J4d+IHKAYeq/R6ciCMMZ6y5gFKW8YNf?= =?utf-8?q?t1MkGqonwiwVZMkjInuaoH2tlL4Cx/5SVElBl8rzidxmu7XzmlHHfZoR9KrlXjpS1?= =?utf-8?q?V6U5kzl4rPcKG1mHXK8ujYJ31bBgLzLVGP27x+I62418IyWjuaP3kKjV82IctBSqE?= =?utf-8?q?JdailXsB8icamK+gxlzUBqzcUSYr2L1Hs5w13hdisaJJk8es5IgsRsxw3O2m//oW4?= =?utf-8?q?fAG/7KtXO1Hfe0nqMuigj2LC5kCtJhrGxbDJQETwC35FQIK+d/baLYS/iAyloHkeV?= =?utf-8?q?ZZ+QZ/g9ewko/x0VOPwsUoloKxFNVnP5uTlnte4SFjmOoMf1uU8CNitOD5ymz8OlW?= =?utf-8?q?kCk9yBmO2XqYc4YYVzrr6+ng9PItxm+NPAWk8h3wcZfLVNc5SbHqbqrPU//A80c?= =?utf-8?q?=3D?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: HKAPR02MB4291.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b53abdac-c101-4555-3c6e-08d8b37a396e X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2021 02:08:00.2558 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rTGu1R4hFl6r4zMRjxeNLIIIK458/UTd6FtJcBHu5txZ+oGCpH/OTmzguAyHqKWU0Sj0Skd77IQmTmDKkN7y+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR02MB3873 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org struct bpf_object *obj is not used in bpf_object__probe_loading, so we can remove it. Signed-off-by: Peng Hao Acked-by: Yonghong Song --- tools/lib/bpf/libbpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.18.4 diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 313034117070..17d90779f09a 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3685,7 +3685,7 @@ int bpf_map__resize(struct bpf_map *map, __u32 max_entries) } static int -bpf_object__probe_loading(struct bpf_object *obj) +bpf_object__probe_loading(void) { struct bpf_load_program_attr attr; char *cp, errmsg[STRERR_BUFSIZE]; @@ -7258,7 +7258,7 @@ int bpf_object__load_xattr(struct bpf_object_load_attr *attr) return -EINVAL; } - err = bpf_object__probe_loading(obj); + err = bpf_object__probe_loading(); err = err ? : bpf_object__load_vmlinux_btf(obj); err = err ? : bpf_object__resolve_externs(obj, obj->kconfig); err = err ? : bpf_object__sanitize_and_load_btf(obj);