Commit 373a4e13 authored Jun 13, 2024 by Alexei Starovoitov

Merge branch 'fixes-for-kfunc-prototype-generation'

Daniel Xu says:

====================
Fixes for kfunc prototype generation

This patchset fixes new warnings and errors that kfunc prototype
generation caused.
====================

Link: https://lore.kernel.org/r/cover.1718295425.git.dxu@dxuuu.xyz


Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parents 041c1dc9 6a826014

kernel/bpf/helpers.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2433,7 +2433,7 @@ __bpf_kfunc struct task_struct *bpf_task_from_pid(s32 pid)

		/**
		* bpf_dynptr_slice() - Obtain a read-only pointer to the dynptr data.
		* @ptr: The dynptr whose data slice to retrieve
		* @p: The dynptr whose data slice to retrieve
		* @offset: Offset into the dynptr
		* @buffer__opt: User-provided buffer to copy contents into. May be NULL
		* @buffer__szk: Size (in bytes) of the buffer if present. This is the
		@@ -2504,7 +2504,7 @@ __bpf_kfunc void bpf_dynptr_slice(const struct bpf_dynptr p, u32 offset,

		/**
		* bpf_dynptr_slice_rdwr() - Obtain a writable pointer to the dynptr data.
		* @ptr: The dynptr whose data slice to retrieve
		* @p: The dynptr whose data slice to retrieve
		* @offset: Offset into the dynptr
		* @buffer__opt: User-provided buffer to copy contents into. May be NULL
		* @buffer__szk: Size (in bytes) of the buffer if present. This is the

tools/testing/selftests/bpf/progs/arena_htab.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
		#define BPF_NO_KFUNC_PROTOTYPES
		#include <vmlinux.h>
		#include <bpf/bpf_helpers.h>
		#include <bpf/bpf_tracing.h>

tools/testing/selftests/bpf/progs/arena_list.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
		#define BPF_NO_KFUNC_PROTOTYPES
		#include <vmlinux.h>
		#include <bpf/bpf_helpers.h>
		#include <bpf/bpf_tracing.h>

tools/testing/selftests/bpf/progs/verifier_arena.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */

		#define BPF_NO_KFUNC_PROTOTYPES
		#include <vmlinux.h>
		#include <bpf/bpf_helpers.h>
		#include <bpf/bpf_tracing.h>

tools/testing/selftests/bpf/progs/verifier_arena_large.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */

		#define BPF_NO_KFUNC_PROTOTYPES
		#include <vmlinux.h>
		#include <bpf/bpf_helpers.h>
		#include <bpf/bpf_tracing.h>