Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp3317pxb; Mon, 31 Jan 2022 03:50:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnBIbqq6PfNAxhwyxWaG5wwO3gLBXEzZbk15DWtPfXJWTaNwdQHDK9iySh0tcwdcFix2sj X-Received: by 2002:a17:90a:de84:: with SMTP id n4mr34138229pjv.76.1643629814897; Mon, 31 Jan 2022 03:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643629814; cv=none; d=google.com; s=arc-20160816; b=D3Mg01fOMbunXkpqvKvc+D4IdQopTqA4COWxp7W8TX3iN8FLCvLigStWGRe5iXLeOe cmTcldPnDbljRSWAmxCNYZuX2gQGXtoj+sfgqXTWJ+twUDFVOFp2WRmUBt6A9qAl4ZG4 aH7yH4i/FiWs/+jESmL7G3awK/QZ9Yt555DEkOG+6ZnZa+S8tp0llgB025Iml1wwMvbz xPEECY2SmcgJ8wNsj5tdFEjPcApBV70gSiAOF3uJzybsQbpuCjqFpsLGp9t7a2RVMOs4 xrePLcxwKCROdEcafqQs2oY3iiU8+njwCPEiGudQSnA1YPlh42eDPFG2syTvSy48Tv4h V8DQ== 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=yVcssgek9UITl8Fb+Lkx91wbFoc9/QbdsVTFuXMiX/k=; b=nzJLvJzo/yCTwTOdacQMZnJytUSGcU+i98ntnMuWMR890lQ3FzC681FrZ9LaRNRxWF 6ERRnCNvjJn9Z4YfKGnX0RVKDW3IxU01mzaqZNvzg1oLQtNmBs3HBRe0GZEpXxjBI4qN aPfRXG+U6+1JFcEZvAVJcYyDMsD5ke/wd2iqEXykq2zJ9zWYK5X+gbjGwhp4Hr4Egygb rXgFPQRiUE6jHJ7u6yIhCpBdcR9fflejwC1hX6g7kHOySEdZaj0KhrSc1qJzO9oALD5T CTRVX2bajVk+gHgzGe/F9m3axWJdoAJqSrq9KfGcr6fPli49bxR1zDfMAi2B2/xSNJqg +iyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j4si12100918pld.288.2022.01.31.03.50.03; Mon, 31 Jan 2022 03:50:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S243718AbiA1XsP convert rfc822-to-8bit (ORCPT + 99 others); Fri, 28 Jan 2022 18:48:15 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:60286 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242914AbiA1XsO (ORCPT ); Fri, 28 Jan 2022 18:48:14 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20SFIkdP030176 for ; Fri, 28 Jan 2022 15:48:14 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3dvk0n37ue-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 28 Jan 2022 15:48:14 -0800 Received: from twshared12416.02.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Fri, 28 Jan 2022 15:48:12 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id E82F928E02F85; Fri, 28 Jan 2022 15:45:32 -0800 (PST) From: Song Liu To: , , CC: , , , , , , , Song Liu Subject: [PATCH v7 bpf-next 4/9] bpf: use prog->jited_len in bpf_prog_ksym_set_addr() Date: Fri, 28 Jan 2022 15:45:12 -0800 Message-ID: <20220128234517.3503701-5-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220128234517.3503701-1-song@kernel.org> References: <20220128234517.3503701-1-song@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: iZ7EvUD0Y1__y8vHlpLaKYJZeclzmnyZ X-Proofpoint-GUID: iZ7EvUD0Y1__y8vHlpLaKYJZeclzmnyZ 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-01-28_08,2022-01-28_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxlogscore=999 mlxscore=0 clxscore=1034 phishscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2201280129 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 69f348d9f816..7cbcf6bfbb52 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