From patchwork Wed Dec 6 22:40:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 13482334 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8EC48328B7 for ; Wed, 6 Dec 2023 22:41:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Mml4qU99" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16B41C433C8; Wed, 6 Dec 2023 22:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701902489; bh=C5kFTkjwk/+nhFV0+QdeNG0D0sJqptT51Ihn/WuTIKo=; h=From:To:Cc:Subject:Date:From; b=Mml4qU99CuNOd6Rp1WE/oK+sGtCIj6bRrjLWnob+cMfgTqWUBUdsBL7Dti+jOjiZl Xlnd2tPiOhZgdo82cPBKQhX6Kov30u8l8OpDZ8g5Ts7SIlpW7TLSZBwkyx/jPXR9Q+ DTr7XKuqE2W0IfYCGaaeba3cfEeBZfn8XJ1wuKCYq1KUxPecCCFkhgexfvRo5KSMuq vFGHyNmbQJ44dBHjKN7j7yWnvD9aOAkAbnqIpKG8abVfweWNvsv3ho5R1UeY3SDzRp 1QtUQsvtgziOd1kWRb+y8VKU2O+zgtDqg9N9ZUf0b0BeYJz6Nr2291HLFAs7URsOtq c9ASRW6bTA/ag== From: Song Liu To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, kernel-team@meta.com, Song Liu Subject: [PATCH v7 bpf-next 0/7] Allocate bpf trampoline on bpf_prog_pack Date: Wed, 6 Dec 2023 14:40:47 -0800 Message-Id: <20231206224054.492250-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-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/7 through 6/7 refactors trampoline code. A few helpers are added. 7/7 finally let bpf trampoline on x86 use bpf_prog_pack. Changes in v7: 1. Use kvmalloc for rw_image in x86/arch_prepare_bpf_trampoline. (Alexei) 2. Add comment to explain why we cannot use kvmalloc in x86/arch_bpf_trampoline_size. (Alexei) Changes in v6: 1. Rebase. 2. Add Acked-by and Tested-by from Jiri Olsa and Björn Töpel. Changes in v5: 1. Adjust size of trampoline ksym. (Jiri) 2. Use "unsigned int size" arg in image management helpers.(Daniel) Changes in v4: 1. Dropped 1/8 in v3, which is already merged in bpf-next. 2. Add Reviewed-by from Björn Töpel. Changes in v3: 1. Fix bug in s390. (Thanks to Ilya Leoshkevich). 2. Fix build error in riscv. (kernel test robot). 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 (7): 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 | 25 +++--- arch/s390/net/bpf_jit_comp.c | 56 ++++++++------ arch/x86/net/bpf_jit_comp.c | 130 +++++++++++++++++++++++++------- include/linux/bpf.h | 14 +++- include/linux/filter.h | 2 +- kernel/bpf/bpf_struct_ops.c | 19 +++-- kernel/bpf/core.c | 21 +++--- kernel/bpf/dispatcher.c | 7 +- kernel/bpf/trampoline.c | 101 +++++++++++++++++++------ net/bpf/bpf_dummy_struct_ops.c | 7 +- 11 files changed, 305 insertions(+), 132 deletions(-) --- 2.34.1