From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9683C4332F for ; Fri, 7 Oct 2022 23:46:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E5506B0073; Fri, 7 Oct 2022 19:46:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 07F946B0078; Fri, 7 Oct 2022 19:46:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFFD16B0075; Fri, 7 Oct 2022 19:46:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A343A6B0074 for ; Fri, 7 Oct 2022 19:46:09 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 76B38C0BC5 for ; Fri, 7 Oct 2022 23:46:09 +0000 (UTC) X-FDA: 79995789258.08.D9098C9 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf26.hostedemail.com (Postfix) with ESMTP id 19BBA14001E for ; Fri, 7 Oct 2022 23:46:08 +0000 (UTC) Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 297NZN3W003657 for ; Fri, 7 Oct 2022 16:46:08 -0700 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3k27ew0cba-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 07 Oct 2022 16:46:08 -0700 Received: from twshared19720.14.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 7 Oct 2022 16:46:05 -0700 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id 50A7CDE442FB; Fri, 7 Oct 2022 16:43:24 -0700 (PDT) From: Song Liu To: , CC: , , , , , , , , Song Liu Subject: [RFC v2 2/4] bpf: use vmalloc_exec Date: Fri, 7 Oct 2022 16:43:13 -0700 Message-ID: <20221007234315.2877365-3-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221007234315.2877365-1-song@kernel.org> References: <20221007234315.2877365-1-song@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: 0VtwMwTTITDyWJs7z3-SYsnSDVAFWHa- X-Proofpoint-ORIG-GUID: 0VtwMwTTITDyWJs7z3-SYsnSDVAFWHa- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-10-07_04,2022-10-07_01,2022-06-22_01 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1665186369; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h1A40AwNJfp2LzlmZIN4ufUjsZfpoyOzpJ46tZ9Bim8=; b=htajx7n69lxHLvhqQeTtVP5BHsH/bD6TaIv7Os2x/q9el5QjREij0HkBwL5aJnzC1Tm3k8 IJjX3t+EU3sm6QbMSNZwnWL0cCNlUMspel9MeBPkaoehdzxfDBskZ6wl94+bcz0g6iudni xvp/K/WgVw2E4IYcOCGelFOC/1Ae8tM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf26.hostedemail.com: domain of "prvs=1279faf8c2=songliubraving@fb.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=1279faf8c2=songliubraving@fb.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1665186369; a=rsa-sha256; cv=none; b=SzztNc2Ds6N5REjnxGfm3L+uvadmhK6lmnI+7w2rWPlwNwsBQKeAc0YIDivxU+BQKEiO3y 9KX9J5ZXC/yxX7F1PO6uib9fIZg0jN2D2IjQMOoTtHbtujc0fRujuCu4hUqcL1GjJWDnhL 1HLItqm/U8nyDKRi+d6xrDmVibgNvuc= Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf26.hostedemail.com: domain of "prvs=1279faf8c2=songliubraving@fb.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=1279faf8c2=songliubraving@fb.com" X-Stat-Signature: q4psd4tou9z3arrfynutdbf45wgbwzuo X-Rspamd-Queue-Id: 19BBA14001E X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1665186368-377305 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Use vmalloc_exec and vfree_exec instead of bpf_prog_pack_[alloc|free]. Signed-off-by: Song Liu --- kernel/bpf/core.c | 155 +++------------------------------------------- 1 file changed, 10 insertions(+), 145 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 3d9eb3ae334c..f96e8acaa34c 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -806,144 +806,6 @@ int bpf_jit_add_poke_descriptor(struct bpf_prog *pr= og, return slot; } =20 -/* - * BPF program pack allocator. - * - * Most BPF programs are pretty small. Allocating a hole page for each - * program is sometime a waste. Many small bpf program also adds pressur= e - * to instruction TLB. To solve this issue, we introduce a BPF program p= ack - * allocator. The prog_pack allocator uses HPAGE_PMD_SIZE page (2MB on x= 86) - * to host BPF programs. - */ -#define BPF_PROG_CHUNK_SHIFT 6 -#define BPF_PROG_CHUNK_SIZE (1 << BPF_PROG_CHUNK_SHIFT) -#define BPF_PROG_CHUNK_MASK (~(BPF_PROG_CHUNK_SIZE - 1)) - -struct bpf_prog_pack { - struct list_head list; - void *ptr; - unsigned long bitmap[]; -}; - -#define BPF_PROG_SIZE_TO_NBITS(size) (round_up(size, BPF_PROG_CHUNK_SIZE= ) / BPF_PROG_CHUNK_SIZE) - -static DEFINE_MUTEX(pack_mutex); -static LIST_HEAD(pack_list); - -/* PMD_SIZE is not available in some special config, e.g. ARCH=3Darm wit= h - * CONFIG_MMU=3Dn. Use PAGE_SIZE in these cases. - */ -#ifdef PMD_SIZE -#define BPF_PROG_PACK_SIZE (PMD_SIZE * num_possible_nodes()) -#else -#define BPF_PROG_PACK_SIZE PAGE_SIZE -#endif - -#define BPF_PROG_CHUNK_COUNT (BPF_PROG_PACK_SIZE / BPF_PROG_CHUNK_SIZE) - -static struct bpf_prog_pack *alloc_new_pack(bpf_jit_fill_hole_t bpf_fill= _ill_insns) -{ - struct bpf_prog_pack *pack; - - pack =3D kzalloc(struct_size(pack, bitmap, BITS_TO_LONGS(BPF_PROG_CHUNK= _COUNT)), - GFP_KERNEL); - if (!pack) - return NULL; - pack->ptr =3D module_alloc(BPF_PROG_PACK_SIZE); - if (!pack->ptr) { - kfree(pack); - return NULL; - } - bpf_fill_ill_insns(pack->ptr, BPF_PROG_PACK_SIZE); - bitmap_zero(pack->bitmap, BPF_PROG_PACK_SIZE / BPF_PROG_CHUNK_SIZE); - list_add_tail(&pack->list, &pack_list); - - set_vm_flush_reset_perms(pack->ptr); - set_memory_ro((unsigned long)pack->ptr, BPF_PROG_PACK_SIZE / PAGE_SIZE)= ; - set_memory_x((unsigned long)pack->ptr, BPF_PROG_PACK_SIZE / PAGE_SIZE); - return pack; -} - -static void *bpf_prog_pack_alloc(u32 size, bpf_jit_fill_hole_t bpf_fill_= ill_insns) -{ - unsigned int nbits =3D BPF_PROG_SIZE_TO_NBITS(size); - struct bpf_prog_pack *pack; - unsigned long pos; - void *ptr =3D NULL; - - mutex_lock(&pack_mutex); - if (size > BPF_PROG_PACK_SIZE) { - size =3D round_up(size, PAGE_SIZE); - ptr =3D module_alloc(size); - if (ptr) { - bpf_fill_ill_insns(ptr, size); - set_vm_flush_reset_perms(ptr); - set_memory_ro((unsigned long)ptr, size / PAGE_SIZE); - set_memory_x((unsigned long)ptr, size / PAGE_SIZE); - } - goto out; - } - list_for_each_entry(pack, &pack_list, list) { - pos =3D bitmap_find_next_zero_area(pack->bitmap, BPF_PROG_CHUNK_COUNT,= 0, - nbits, 0); - if (pos < BPF_PROG_CHUNK_COUNT) - goto found_free_area; - } - - pack =3D alloc_new_pack(bpf_fill_ill_insns); - if (!pack) - goto out; - - pos =3D 0; - -found_free_area: - bitmap_set(pack->bitmap, pos, nbits); - ptr =3D (void *)(pack->ptr) + (pos << BPF_PROG_CHUNK_SHIFT); - -out: - mutex_unlock(&pack_mutex); - return ptr; -} - -static void bpf_prog_pack_free(struct bpf_binary_header *hdr) -{ - struct bpf_prog_pack *pack =3D NULL, *tmp; - unsigned int nbits; - unsigned long pos; - - mutex_lock(&pack_mutex); - if (hdr->size > BPF_PROG_PACK_SIZE) { - module_memfree(hdr); - goto out; - } - - list_for_each_entry(tmp, &pack_list, list) { - if ((void *)hdr >=3D tmp->ptr && (tmp->ptr + BPF_PROG_PACK_SIZE) > (vo= id *)hdr) { - pack =3D tmp; - break; - } - } - - if (WARN_ONCE(!pack, "bpf_prog_pack bug\n")) - goto out; - - nbits =3D BPF_PROG_SIZE_TO_NBITS(hdr->size); - pos =3D ((unsigned long)hdr - (unsigned long)pack->ptr) >> BPF_PROG_CHU= NK_SHIFT; - - WARN_ONCE(bpf_arch_text_invalidate(hdr, hdr->size), - "bpf_prog_pack bug: missing bpf_arch_text_invalidate?\n"); - - bitmap_clear(pack->bitmap, pos, nbits); - if (bitmap_find_next_zero_area(pack->bitmap, BPF_PROG_CHUNK_COUNT, 0, - BPF_PROG_CHUNK_COUNT, 0) =3D=3D 0) { - list_del(&pack->list); - module_memfree(pack->ptr); - kfree(pack); - } -out: - mutex_unlock(&pack_mutex); -} - static atomic_long_t bpf_jit_current; =20 /* Can be overridden by an arch's JIT compiler if it has a custom, @@ -1043,6 +905,9 @@ void bpf_jit_binary_free(struct bpf_binary_header *h= dr) bpf_jit_uncharge_modmem(size); } =20 +#define BPF_PROG_EXEC_ALIGN 64 +#define BPF_PROG_EXEC_MASK (~(BPF_PROG_EXEC_ALIGN - 1)) + /* Allocate jit binary from bpf_prog_pack allocator. * Since the allocated memory is RO+X, the JIT engine cannot write direc= tly * to the memory. To solve this problem, a RW buffer is also allocated a= t @@ -1065,11 +930,11 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8= **image_ptr, alignment > BPF_IMAGE_ALIGNMENT); =20 /* add 16 bytes for a random section of illegal instructions */ - size =3D round_up(proglen + sizeof(*ro_header) + 16, BPF_PROG_CHUNK_SIZ= E); + size =3D round_up(proglen + sizeof(*ro_header) + 16, BPF_PROG_EXEC_ALIG= N); =20 if (bpf_jit_charge_modmem(size)) return NULL; - ro_header =3D bpf_prog_pack_alloc(size, bpf_fill_ill_insns); + ro_header =3D vmalloc_exec(size, BPF_PROG_EXEC_ALIGN); if (!ro_header) { bpf_jit_uncharge_modmem(size); return NULL; @@ -1078,7 +943,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 *= *image_ptr, *rw_header =3D kvmalloc(size, GFP_KERNEL); if (!*rw_header) { bpf_arch_text_copy(&ro_header->size, &size, sizeof(size)); - bpf_prog_pack_free(ro_header); + vfree_exec(ro_header); bpf_jit_uncharge_modmem(size); return NULL; } @@ -1088,7 +953,7 @@ bpf_jit_binary_pack_alloc(unsigned int proglen, u8 *= *image_ptr, (*rw_header)->size =3D size; =20 hole =3D min_t(unsigned int, size - (proglen + sizeof(*ro_header)), - BPF_PROG_CHUNK_SIZE - sizeof(*ro_header)); + BPF_PROG_EXEC_ALIGN - sizeof(*ro_header)); start =3D (get_random_int() % hole) & ~(alignment - 1); =20 *image_ptr =3D &ro_header->image[start]; @@ -1109,7 +974,7 @@ int bpf_jit_binary_pack_finalize(struct bpf_prog *pr= og, kvfree(rw_header); =20 if (IS_ERR(ptr)) { - bpf_prog_pack_free(ro_header); + vfree_exec(ro_header); return PTR_ERR(ptr); } return 0; @@ -1130,7 +995,7 @@ void bpf_jit_binary_pack_free(struct bpf_binary_head= er *ro_header, { u32 size =3D ro_header->size; =20 - bpf_prog_pack_free(ro_header); + vfree_exec(ro_header); kvfree(rw_header); bpf_jit_uncharge_modmem(size); } @@ -1141,7 +1006,7 @@ bpf_jit_binary_pack_hdr(const struct bpf_prog *fp) unsigned long real_start =3D (unsigned long)fp->bpf_func; unsigned long addr; =20 - addr =3D real_start & BPF_PROG_CHUNK_MASK; + addr =3D real_start & BPF_PROG_EXEC_MASK; return (void *)addr; } =20 --=20 2.30.2