Received-SPF: pass (google.com: domain of linux-kernel+bounces-51839-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <25615f41-a725-4276-bc0a-a3e7fe47b864@linux.dev>
Date: Sun, 4 Feb 2024 10:10:45 -0800
Precedence: bulk
MIME-Version: 1.0
Subject: Re: [PATCH] bpf: merge two CONFIG_BPF entries
Content-Language: en-GB
To: Masahiro Yamada <masahiroy@kernel.org>,
 Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>,
 John Fastabend <john.fastabend@gmail.com>, bpf@vger.kernel.org
Cc: Andrii Nakryiko <andrii@kernel.org>, Hao Luo <haoluo@google.com>,
 Jiri Olsa <jolsa@kernel.org>, KP Singh <kpsingh@kernel.org>,
 Martin KaFai Lau <martin.lau@linux.dev>, Song Liu <song@kernel.org>,
 Stanislav Fomichev <sdf@google.com>, linux-kernel@vger.kernel.org
References: <20240204075634.32969-1-masahiroy@kernel.org>
From: Yonghong Song <yonghong.song@linux.dev>
In-Reply-To: <20240204075634.32969-1-masahiroy@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit


On 2/3/24 11:56 PM, Masahiro Yamada wrote:
> 'config BPF' exists in both init/Kconfig and kernel/bpf/Kconfig.
>
> Commit b24abcff918a ("bpf, kconfig: Add consolidated menu entry for bpf
> with core options") added the second one to kernel/bpf/Kconfig instead
> of moving the existing one.
>
> Merge them together.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
>   init/Kconfig       | 5 -----
>   kernel/bpf/Kconfig | 1 +
>   2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/init/Kconfig b/init/Kconfig
> index 8d4e836e1b6b..46ccad83a664 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -1457,11 +1457,6 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
>   config HAVE_PCSPKR_PLATFORM
>   	bool
>   
> -# interpreter that classic socket filters depend on
> -config BPF
> -	bool
> -	select CRYPTO_LIB_SHA1
> -
>   menuconfig EXPERT
>   	bool "Configure standard kernel features (expert users)"
>   	# Unhide debug options, to make the on-by-default options visible
> diff --git a/kernel/bpf/Kconfig b/kernel/bpf/Kconfig
> index 6a906ff93006..bc25f5098a25 100644
> --- a/kernel/bpf/Kconfig
> +++ b/kernel/bpf/Kconfig
> @@ -3,6 +3,7 @@
>   # BPF interpreter that, for example, classic socket filters depend on.
>   config BPF
>   	bool
> +	select CRYPTO_LIB_SHA1

Currently, the kernel/bpf directory is guarded with CONFIG_BPF
   obj-$(CONFIG_BPF) += bpf/
in kernel/bpf/Makefile.

Your patch probably works since there are lots of some other BPF related
configurations which requires CONFIG_BPF. But maybe we sould
keep 'config BPF' in init/Kconfig and remove 'config BPF'
in kernel/bpf/Kconfig. This will be less confusing?

>   
>   # Used by archs to tell that they support BPF JIT compiler plus which
>   # flavour. Only one of the two can be selected for a specific arch since