From patchwork Mon Sep 25 21:53:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 13398476 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A8602421C for ; Mon, 25 Sep 2023 21:53:43 +0000 (UTC) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21A99116 for ; Mon, 25 Sep 2023 14:53:41 -0700 (PDT) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38PKH9vh027000 for ; Mon, 25 Sep 2023 14:53:40 -0700 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3tb9fadxdf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 25 Sep 2023 14:53:40 -0700 Received: from twshared19625.39.frc1.facebook.com (2620:10d:c0a8:1c::1b) by mail.thefacebook.com (2620:10d:c0a8:82::b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 25 Sep 2023 14:53:37 -0700 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id 6C42624F393EE; Mon, 25 Sep 2023 14:53:28 -0700 (PDT) From: Song Liu To: CC: , , , , , , Song Liu Subject: [PATCH v2 bpf-next 0/8] Allocate bpf trampoline on bpf_prog_pack Date: Mon, 25 Sep 2023 14:53:16 -0700 Message-ID: <20230925215324.2962716-1-song@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: fBj3UpnYieZI1dceX4T1Mo24YWQAjJW- X-Proofpoint-ORIG-GUID: fBj3UpnYieZI1dceX4T1Mo24YWQAjJW- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-09-25_18,2023-09-25_01,2023-05-22_02 X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: bpf@iogearbox.net This set enables allocating bpf trampoline from bpf_prog_pack on x86. The majority of this work, however, is the refactoring of trampoline code. This is needed because we need to handle 4 archs and 2 users (trampoline and struct_ops). 1/8 is a dependency that is already applied to bpf tree. 2/8 through 7/8 refactors trampoline code. A few helpers are added. 8/8 finally let bpf trampoline on x86 use bpf_prog_pack. Changes in v2: 1. Add missing changes in net/bpf/bpf_dummy_struct_ops.c. 2. Reduce one dry run in arch_prepare_bpf_trampoline. (Xu Kuohai) 3. Other small fixes. Song Liu (8): s390/bpf: Let arch_prepare_bpf_trampoline return program size bpf: Let bpf_prog_pack_free handle any pointer bpf: Adjust argument names of arch_prepare_bpf_trampoline() bpf: Add helpers for trampoline image management bpf, x86: Adjust arch_prepare_bpf_trampoline return value bpf: Add arch_bpf_trampoline_size() bpf: Use arch_bpf_trampoline_size x86, bpf: Use bpf_prog_pack for bpf trampoline arch/arm64/net/bpf_jit_comp.c | 55 +++++++++----- arch/riscv/net/bpf_jit_comp64.c | 24 ++++--- arch/s390/net/bpf_jit_comp.c | 43 ++++++----- arch/x86/net/bpf_jit_comp.c | 124 +++++++++++++++++++++++++------- include/linux/bpf.h | 12 +++- include/linux/filter.h | 2 +- kernel/bpf/bpf_struct_ops.c | 19 +++-- kernel/bpf/core.c | 21 +++--- kernel/bpf/dispatcher.c | 5 +- kernel/bpf/trampoline.c | 93 ++++++++++++++++++------ net/bpf/bpf_dummy_struct_ops.c | 7 +- 11 files changed, 277 insertions(+), 128 deletions(-) Acked-by: Ilya Leoshkevich Tested-by: Ilya Leoshkevich # on s390x --- 2.34.1