Skip to contentSkip to conversation

bpf: Don't use idx variable when registering kfunc dtors

PATCH Applied David Vernet 3 participants 3 messages Nov 23, 2022 BPF

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: Don't use idx variable when registering kfunc dtors

In commit fda01efc6160 ("bpf: Enable cgroups to be used as kptrs"), I added an 'int idx' variable to kfunc_init() which was meant to dynamically set the index of the btf id entries of the 'generic_dtor_ids' array. This was done to make the code slightly less brittle as the struct cgroup * kptr kfuncs such as bpf_cgroup_aquire() are compiled out if CONFIG_CGROUPS is not defined. This, however, causes an lkp build warning:

Quoted 1 line
Quoted 1 line

kernel/bpf/helpers.c:2005:40: warning: multiple unsequenced

modifications to 'idx' [-Wunsequenced]
.btf_id = generic_dtor_ids[idx++],

Fix the warning by just hard-coding the indices.

Fixes fda01efc6160 ("bpf: Enable cgroups to be used as kptrs")
---
 kernel/bpf/helpers.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/bpf/helpers.c +5 -5
index e4e9db301db5..da2681ebb7c3 100644
@@ -2019,16 +2019,16 @@ static const struct btf_kfunc_id_set common_kfunc_set = {
 
 static int __init kfunc_init(void)
 {
-	int ret, idx = 0;
+	int ret;
 	const struct btf_id_dtor_kfunc generic_dtors[] = {
 		{
-			.btf_id       = generic_dtor_ids[idx++],
-			.kfunc_btf_id = generic_dtor_ids[idx++]
+			.btf_id       = generic_dtor_ids[0],
+			.kfunc_btf_id = generic_dtor_ids[1]
 		},
 #ifdef CONFIG_CGROUPS
 		{
-			.btf_id       = generic_dtor_ids[idx++],
-			.kfunc_btf_id = generic_dtor_ids[idx++]
+			.btf_id       = generic_dtor_ids[2],
+			.kfunc_btf_id = generic_dtor_ids[3]
 		},
 #endif
 	};
Signature · 1 line
2.38.1
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · David Vernet

In commit fda01efc6160 ("bpf: Enable cgroups to be used as kptrs"), I added an 'int idx' variable to kfunc_init() which was meant to dynamically set the index of the btf id entries of the 'generic_dtor_ids' array. This was done to make the code slightly less brittle as the struct cgroup * kptr kfuncs such as bpf_cgroup_aquire() are compiled out if CONFIG_CGROUPS is not defined. This, however, causes an lkp build warning:

Quoted 1 line
Quoted 1 line

kernel/bpf/helpers.c:2005:40: warning: multiple unsequenced

Quoted 8 lines

modifications to 'idx' [-Wunsequenced]
.btf_id = generic_dtor_ids[idx++],

Fix the warning by just hard-coding the indices.

Fixes fda01efc6160 ("bpf: Enable cgroups to be used as kptrs")

I hit the same issue with clang build and used the same workaround below.

Quoted 30 lines
---
  kernel/bpf/helpers.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
kernel/bpf/helpers.c +5 -5
index e4e9db301db5..da2681ebb7c3 100644
@@ -2019,16 +2019,16 @@ static const struct btf_kfunc_id_set common_kfunc_set = {
 
  static int __init kfunc_init(void)
  {
-	int ret, idx = 0;
+	int ret;
  	const struct btf_id_dtor_kfunc generic_dtors[] = {
  		{
-			.btf_id       = generic_dtor_ids[idx++],
-			.kfunc_btf_id = generic_dtor_ids[idx++]
+			.btf_id       = generic_dtor_ids[0],
+			.kfunc_btf_id = generic_dtor_ids[1]
  		},
  #ifdef CONFIG_CGROUPS
  		{
-			.btf_id       = generic_dtor_ids[idx++],
-			.kfunc_btf_id = generic_dtor_ids[idx++]
+			.btf_id       = generic_dtor_ids[2],
+			.kfunc_btf_id = generic_dtor_ids[3]
  		},
  #endif
  	};
#2 lore raw
In reply to David Vernet
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 9 lines · On Wed, 23 Nov 2022 07:52:53 -0600 you wrote:

In commit fda01efc6160 ("bpf: Enable cgroups to be used as kptrs"), I added an 'int idx' variable to kfunc_init() which was meant to dynamically set the index of the btf id entries of the 'generic_dtor_ids' array. This was done to make the code slightly less brittle as the struct cgroup * kptr kfuncs such as bpf_cgroup_aquire() are compiled out if CONFIG_CGROUPS is not defined. This, however, causes an lkp build warning:

[...]

Here is the summary with links:
- [bpf-next] bpf: Don't use idx variable when registering kfunc dtors

    https://git.kernel.org/bpf/bpf-next/c/2fcc6081a7bf

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html