Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1302640pxb; Wed, 2 Feb 2022 01:34:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0ARi2ZzR9tmjZ31558aPTIKspd/Nd7je2bysVt+UxXi8Os3/msNC6BPYvYYgEFwPOTm9V X-Received: by 2002:a17:907:97ca:: with SMTP id js10mr24132148ejc.347.1643794475399; Wed, 02 Feb 2022 01:34:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643794475; cv=none; d=google.com; s=arc-20160816; b=Cv7AX1AIjCfzdprHGeZDRZ4sLfkpz2eMMRsI1t3liDkUPKT6BZJ8/U++YYLTM34FRP leA4nomjJRZAgt8EpL7BYh4nLkHf9cqiFT9KeGL2Mb7mXtBgVSA0diXyIIaI/HwCAYmL zXNBXCqLNOL1gur1UvUt1u40bwyE7Zl09A2kGUAwkmuVsexj4dBKdSf/C+8rliV0T6if ZdXZYlG9QseBz1smRv0QQW2knThy7Jy/EYDMGCX5JU4cDoCsk2bFBPoeTjwW7Q8C0hH2 ptyXC/DhVfCd8uInUX+cl8G8ziAyrrgL3L/jRsFevfq0KsoZS2XU1QN7GARPPBYTJwWF /NcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=q/mP7ZudeIsBrYnD6XayEjEvQGkcZumqhY1CaVnimdk=; b=z72ne3cQVHnPkTXkycOAG41oevOXZIzMuovgIiRTEJTgJMP0+723b2c+eNYIEeqTWy 935rzuGsTbcysM9meCSNqKdpZ4U0Sx8pspHqLo9LHiYF/FK75/uI+xPkIQRRu0pBiLjB QEV6K6YTPRwYItKeecLVshn6RXAjQ3+mB1/DUFxVWr9gRHEZ0V3aNy0rmOcK3Qc7906Z GjLehylwX0+P+albt8/G5IFxXrc99NzBu9oXC3SYZu0/RA4J+Y/ZzUzG1MX/8VtbrnjB Jlkdd+toRWbTdlHhBI4oKkq6/4PUUS+gdHx7dT+1NWpz6w5OHbWUo4uovzTGxGAdEnsj GuQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qa37si10729938ejc.700.2022.02.02.01.34.10; Wed, 02 Feb 2022 01:34:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234269AbiBAGbU convert rfc822-to-8bit (ORCPT + 99 others); Tue, 1 Feb 2022 01:31:20 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:38958 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234221AbiBAGbP (ORCPT ); Tue, 1 Feb 2022 01:31:15 -0500 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21111Nho022115 for ; Mon, 31 Jan 2022 22:31:14 -0800 Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3dxqxb28w2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 31 Jan 2022 22:31:14 -0800 Received: from twshared7634.08.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Mon, 31 Jan 2022 22:31:13 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 2C995290EC8FE; Mon, 31 Jan 2022 22:28:17 -0800 (PST) From: Song Liu To: , , CC: , , , , , , , Song Liu Subject: [PATCH v8 bpf-next 4/9] bpf: use prog->jited_len in bpf_prog_ksym_set_addr() Date: Mon, 31 Jan 2022 22:27:58 -0800 Message-ID: <20220201062803.2675204-5-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201062803.2675204-1-song@kernel.org> References: <20220201062803.2675204-1-song@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: U9GhksLX_mIXdNeN9Drffl7ytZHsO4ZO X-Proofpoint-GUID: U9GhksLX_mIXdNeN9Drffl7ytZHsO4ZO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-01_02,2022-01-31_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 mlxscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 adultscore=0 bulkscore=0 phishscore=0 clxscore=1015 impostorscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202010033 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Using prog->jited_len is simpler and more accurate than current estimation (header + header->size). Signed-off-by: Song Liu --- kernel/bpf/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 14199228a6f0..e3fe53df0a71 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -537,13 +537,10 @@ long bpf_jit_limit_max __read_mostly; static void bpf_prog_ksym_set_addr(struct bpf_prog *prog) { - const struct bpf_binary_header *hdr = bpf_jit_binary_hdr(prog); - unsigned long addr = (unsigned long)hdr; - WARN_ON_ONCE(!bpf_prog_ebpf_jited(prog)); prog->aux->ksym.start = (unsigned long) prog->bpf_func; - prog->aux->ksym.end = addr + hdr->size; + prog->aux->ksym.end = prog->aux->ksym.start + prog->jited_len; } static void -- 2.30.2