From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.27 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792856219; b=oqMTVAy9AM1aEYyMpc+EVwIT1l+NAHko1BRf7nP9fc2e31/myM+eKgja2b5wkWftLXUT h2h0Py3sFLD5MCcSSjfgGOoXqnAkEj3LP1zhvXcQp0i+8DiR4KG1aJN6p/5zdgNHy++u8 tMpW1Od+kk5NW0FH92a48ktf4DTBoCrMAVm6stvtThmALiEXP/X6C5As6wdlmMuL4S2eV Tw/Ov/G76+qdSPam6a1qTRWfZv8+laLeKL7wY+ZWk5yUirFRbRQMzDpxJssfmXa9nW1cc NvMtPuDY5q5yGLvxQb++xNCK73Xx1XMfZL4KmDcgXBrerl5Kc8g23YOYRbHFq3StVvg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792856219; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=KVTYbR14YYgS4yah5hFkztdQ5rEEHZC+1mz3Q0u1oEs=; b=ac0VTTDE0WzurcPwzxe85LGUdQGif2B7xY//q2na+tGr/yO0LYqbckdmvRwHF2eaLOyg X1/HKnaywgozBVZ8nbylhdcEWvF9B7ziFNPAxLMY89rkGh88xCxLCunoByNquxcIMDI8e jJmHgv0tQgGWo69f6MgEz1ky7w2tdVk4HdzuuBjsvmv7Q+G7zHlUqOHaoFHy502pAxTTn ZEzhmKf7twMkQBMrljsLNpLOVBtENXdcrTo+8iCWpUJ3xrAleY9kw7b7q9JTINZwyF+B2 hoUm1uY8SFoZ57O8GDI/xEEtZhCSOxNRMhp4onElOoXX6k37LNxAYu5ofxuWUAsBCnA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b="OxPKoJ/u"; arc=none smtp.remote-ip=95.215.58.27 Received: from mta1.migadu.com (out-27.mta1.migadu.com [95.215.58.27]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8AA3606A31D for ; Sat, 24 Oct 2026 15:36:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C8AA3606A31D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=OxPKoJ/u X-Envelope-To: bpf@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=CfPc369hGVqKqwx/bCg1l8qsUmx6TMYTOAmZtXg4gRU=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1792856217; v=1; x=1793461017; b=OxPKoJ/urMiMyl6V50voH4Tvlrn8l9isOgheXKd2FNpS5N05ZbiiXgB1xRWW9g8q9Rck4hna grxgQz3hfCkxK0UiRqEKt5snBc/RQSkP27OA4e8+RooFML3YULBm6qlTpLyHpDxbinFObD7y3Qi PzE8UspEUIfdS5zzOMIlBi9I= X-Envelope-To: bpf@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id c2f0715eee8f9767; Sat, 24 Oct 2026 15:36:57 +0000 X-Mizu-Trace-ID: c2f0715eee8f9767 X-Migadu-Flow: FLOW_OUT From: Leon Hwang To: bpf@vger.kernel.org Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Shuah Khan , Kuniyuki Iwashima , Hangbin Liu , Martin Karsten , Masashi Honma , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Leon Hwang Subject: [PATCH bpf-next v4 4/6] libbpf: Factor out __sys_bpf_fd helper Date: Sat, 24 Oct 2026 23:36:05 +0800 Message-ID: <20261024153608.58569-5-leon.hwang@linux.dev> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261024153608.58569-1-leon.hwang@linux.dev> References: <20261024153608.58569-1-leon.hwang@linux.dev> X-Mailing-List: bpf@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In the next patch, it also needs to use the extended BPF syscall to receive the reported log. So, factor out __sys_bpf_fd helper. No functional changes intended. Signed-off-by: Leon Hwang --- tools/lib/bpf/bpf.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index b49822d212ae..9a2107d4f6d8 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -203,6 +203,30 @@ int bump_rlimit_memlock(void) return 0; } +static int __sys_bpf_fd(union bpf_attr *attr, const size_t attr_sz, enum bpf_cmd cmd, + struct bpf_log_opts *log_opts) +{ + const size_t attr_common_sz = sizeof(struct bpf_common_attr); + struct bpf_common_attr attr_common; + int fd; + + if (!OPTS_VALID(log_opts, bpf_log_opts)) + return libbpf_err(-EINVAL); + + if (log_opts && feat_supported(NULL, FEAT_BPF_SYSCALL_COMMON_ATTRS)) { + memset(&attr_common, 0, attr_common_sz); + attr_common.log_buf = ptr_to_u64(OPTS_GET(log_opts, buf, NULL)); + attr_common.log_size = OPTS_GET(log_opts, size, 0); + attr_common.log_level = OPTS_GET(log_opts, level, 0); + fd = sys_bpf_ext_fd(cmd, attr, attr_sz, &attr_common, attr_common_sz); + OPTS_SET(log_opts, true_size, attr_common.log_true_size); + } else { + fd = sys_bpf_fd(cmd, attr, attr_sz); + OPTS_SET(log_opts, true_size, 0); + } + return fd; +} + int bpf_map_create(enum bpf_map_type map_type, const char *map_name, __u32 key_size, @@ -211,8 +235,6 @@ int bpf_map_create(enum bpf_map_type map_type, const struct bpf_map_create_opts *opts) { const size_t attr_sz = offsetofend(union bpf_attr, excl_prog_hash_size); - const size_t attr_common_sz = sizeof(struct bpf_common_attr); - struct bpf_common_attr attr_common; struct bpf_log_opts *log_opts; union bpf_attr attr; int fd; @@ -248,20 +270,7 @@ int bpf_map_create(enum bpf_map_type map_type, attr.excl_prog_hash_size = OPTS_GET(opts, excl_prog_hash_size, 0); log_opts = OPTS_GET(opts, log_opts, NULL); - if (!OPTS_VALID(log_opts, bpf_log_opts)) - return libbpf_err(-EINVAL); - - if (log_opts && feat_supported(NULL, FEAT_BPF_SYSCALL_COMMON_ATTRS)) { - memset(&attr_common, 0, attr_common_sz); - attr_common.log_buf = ptr_to_u64(OPTS_GET(log_opts, buf, NULL)); - attr_common.log_size = OPTS_GET(log_opts, size, 0); - attr_common.log_level = OPTS_GET(log_opts, level, 0); - fd = sys_bpf_ext_fd(BPF_MAP_CREATE, &attr, attr_sz, &attr_common, attr_common_sz); - OPTS_SET(log_opts, true_size, attr_common.log_true_size); - } else { - fd = sys_bpf_fd(BPF_MAP_CREATE, &attr, attr_sz); - OPTS_SET(log_opts, true_size, 0); - } + fd = __sys_bpf_fd(&attr, attr_sz, BPF_MAP_CREATE, log_opts); return libbpf_err_errno(fd); } -- 2.55.0