bpf: use rcu_migrate_* for bpf_task_storage_free()

image-dragon · Kernel Patches Daemon · commit 120386a2e40d · 2025-08-18T06:15:56.000-07:00
Replace the migrate_disable/migrate_enable with
rcu_migrate_disable/rcu_migrate_enable in bpf_task_storage_free to obtain
better performance when PREEMPT_RCU is not enabled.

Signed-off-by: Menglong Dong &lt;dongml2@chinatelecom.cn&gt;
diff --git a/kernel/bpf/bpf_task_storage.c b/kernel/bpf/bpf_task_storage.c
@@ -70,7 +70,7 @@ void bpf_task_storage_free(struct task_struct *task)
 {
 	struct bpf_local_storage *local_storage;
 
-	migrate_disable();
+	rcu_migrate_disable();
 	rcu_read_lock();
 
 	local_storage = rcu_dereference(task->bpf_storage);
@@ -82,7 +82,7 @@ void bpf_task_storage_free(struct task_struct *task)
 	bpf_task_storage_unlock();
 out:
 	rcu_read_unlock();
-	migrate_enable();
+	rcu_migrate_enable();
 }
 
 static void *bpf_pid_task_storage_lookup_elem(struct bpf_map *map, void *key)

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void bpf_task_storage_free(struct task_struct *task)`
`70`	`70`	`{`
`71`	`71`	`struct bpf_local_storage *local_storage;`
`72`	`72`
`73`		`- migrate_disable();`
	`73`	`+ rcu_migrate_disable();`
`74`	`74`	`rcu_read_lock();`
`75`	`75`
`76`	`76`	`local_storage = rcu_dereference(task->bpf_storage);`
`@@ -82,7 +82,7 @@ void bpf_task_storage_free(struct task_struct *task)`
`82`	`82`	`bpf_task_storage_unlock();`
`83`	`83`	`out:`
`84`	`84`	`rcu_read_unlock();`
`85`		`- migrate_enable();`
	`85`	`+ rcu_migrate_enable();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`static void bpf_pid_task_storage_lookup_elem(struct bpf_map map, void *key)`