Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp1292897pxb; Fri, 21 Jan 2022 14:34:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3GvsF+iqo9hFza3lWGddSvhjTU0CBRyg856yV+0ZbVk786f9xly8UwDLKhy8XWRBeWPn3 X-Received: by 2002:a05:6a00:1589:b0:4c3:cc45:58e2 with SMTP id u9-20020a056a00158900b004c3cc4558e2mr5358462pfk.86.1642804460278; Fri, 21 Jan 2022 14:34:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642804460; cv=none; d=google.com; s=arc-20160816; b=Hn0uQsceUUHuVCbR4v78IfGAePs6LVBgbOwd950PXQUJdZ8QGhwl58qqqEWqu5NOsO k1x2YGXam8vS/02qijaUbeK2ygs36kp3eLtkrxrmpCPer9ADSl3wnrk09sVI67OIMJIO holFwZk/0GtDTZtx1L07vRuNeDULYQtmRark/d59Z6G/tVzymrREFxUKu2cUuuZjEgz/ HgxQJNO6CURRqMCo3AVz063pHOwW9W8FeaxUwAi1MQO9selkCGHjiryeHuYGC8fT8+9D h32T8JKFpHWwdGL5GMf0EQBYnUNt7Au9l/CdG21d7cgbG8yD8A+W2/xsDDkqd89ckb3n IoWg== 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=a8XBFJaRGi3C+mH77gltKxRNcExMEwLF0lnQ2nf2hJM=; b=DbhGYCjhPkz5GC2aa+gZsoBaBXzq0P2IphTKwh+q9zj+hW9deacxkdz9mSuaWL5Nma lZuSB/Lrc57Ym95k2v4mU/DDcz172Hmj7qEpKrs7FzSyTzviQtwidGIy/HZWa6lz0jmx /E4acDsH7O+lxXs668NaKRdcaewJxrebCnBF/s4tPDJev9nL6Beg3NuGgmjMHng3LX16 RK2bEwyCDJhbH6qlHzaW1cLEXfJXKrjIeLWDnwY7NFe8+WHaHfPhNmp5DfOfgsLOkuam wICrK6VTJzH1FA1EbVMVbOmEjo/Uu7ixp7lvKaiMM8C8SscdmsBodTPnt+BvfJ9Uf68k K5Cg== 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 om4si15187802pjb.48.2022.01.21.14.34.06; Fri, 21 Jan 2022 14:34:20 -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 S1377503AbiATTNh convert rfc822-to-8bit (ORCPT + 99 others); Thu, 20 Jan 2022 14:13:37 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:39952 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1377427AbiATTNY (ORCPT ); Thu, 20 Jan 2022 14:13:24 -0500 Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.1.2/8.16.1.2) with ESMTP id 20KHxaB6015107 for ; Thu, 20 Jan 2022 11:13:24 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by m0089730.ppops.net (PPS) with ESMTPS id 3dpynjcu3w-18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 20 Jan 2022 11:13:24 -0800 Received: from twshared3115.02.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 20 Jan 2022 11:13:22 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 2C0F8283245EA; Thu, 20 Jan 2022 11:13:21 -0800 (PST) From: Song Liu To: , , CC: , , , , , , Song Liu Subject: [PATCH v5 bpf-next 3/7] bpf: use size instead of pages in bpf_binary_header Date: Thu, 20 Jan 2022 11:13:01 -0800 Message-ID: <20220120191306.1801459-4-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220120191306.1801459-1-song@kernel.org> References: <20220120191306.1801459-1-song@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: -AvAGO-mnx_z9xSA-oOThtKyI5VBUxB0 X-Proofpoint-GUID: -AvAGO-mnx_z9xSA-oOThtKyI5VBUxB0 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-20_07,2022-01-20_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 clxscore=1015 adultscore=0 mlxscore=0 impostorscore=0 spamscore=0 malwarescore=0 bulkscore=0 mlxlogscore=905 lowpriorityscore=0 priorityscore=1501 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201200096 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Song Liu This is necessary to charge sub page memory for the BPF program. Signed-off-by: Song Liu --- include/linux/filter.h | 6 +++--- kernel/bpf/core.c | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index d23e999dc032..5855eb474c62 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -548,7 +548,7 @@ struct sock_fprog_kern { #define BPF_IMAGE_ALIGNMENT 8 struct bpf_binary_header { - u32 pages; + u32 size; u8 image[] __aligned(BPF_IMAGE_ALIGNMENT); }; @@ -886,8 +886,8 @@ static inline void bpf_prog_lock_ro(struct bpf_prog *fp) static inline void bpf_jit_binary_lock_ro(struct bpf_binary_header *hdr) { set_vm_flush_reset_perms(hdr); - set_memory_ro((unsigned long)hdr, hdr->pages); - set_memory_x((unsigned long)hdr, hdr->pages); + set_memory_ro((unsigned long)hdr, hdr->size >> PAGE_SHIFT); + set_memory_x((unsigned long)hdr, hdr->size >> PAGE_SHIFT); } static inline struct bpf_binary_header * diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index b9c6a426a7dd..f252d8529b0b 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -543,7 +543,7 @@ bpf_prog_ksym_set_addr(struct bpf_prog *prog) WARN_ON_ONCE(!bpf_prog_ebpf_jited(prog)); prog->aux->ksym.start = (unsigned long) prog->bpf_func; - prog->aux->ksym.end = addr + hdr->pages * PAGE_SIZE; + prog->aux->ksym.end = addr + hdr->size; } static void @@ -866,7 +866,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, bpf_jit_fill_hole_t bpf_fill_ill_insns) { struct bpf_binary_header *hdr; - u32 size, hole, start, pages; + u32 size, hole, start; WARN_ON_ONCE(!is_power_of_2(alignment) || alignment > BPF_IMAGE_ALIGNMENT); @@ -876,7 +876,6 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, * random section of illegal instructions. */ size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE); - pages = size / PAGE_SIZE; if (bpf_jit_charge_modmem(size)) return NULL; @@ -889,7 +888,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, /* Fill space with illegal/arch-dep instructions. */ bpf_fill_ill_insns(hdr, size); - hdr->pages = pages; + hdr->size = size; hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)), PAGE_SIZE - sizeof(*hdr)); start = (get_random_int() % hole) & ~(alignment - 1); @@ -902,10 +901,10 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr, void bpf_jit_binary_free(struct bpf_binary_header *hdr) { - u32 pages = hdr->pages; + u32 size = hdr->size; bpf_jit_free_exec(hdr); - bpf_jit_uncharge_modmem(pages << PAGE_SHIFT); + bpf_jit_uncharge_modmem(size); } /* This symbol is only overridden by archs that have different -- 2.30.2