bpf: Use hlist_add_head_rcu when linking to sk_storage
Subsystems (3)
PATCH 1/1 bpf: Use hlist_add_head_rcu when linking to sk_storage
The sk_storage->list will be traversed by rcu reader in parallel. Thus, hlist_add_head_rcu() is needed in __selem_link_sk(). This patch fixes it.
This part of the code has recently been refactored in bpf-next. A separate fix will be provided for the bpf-next tree.
--- net/core/bpf_sk_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/bpf_sk_storage.c +1 -1
@@ -219,7 +219,7 @@ static void __selem_link_sk(struct bpf_sk_storage *sk_storage, struct bpf_sk_storage_elem *selem) {RCU_INIT_POINTER (selem->sk_storage, sk_storage); -hlist_add_head (&selem->snode, &sk_storage->list); +hlist_add_head_rcu (&selem->snode, &sk_storage->list); }static void selem_unlink_map (struct bpf_sk_storage_elem *selem)
Signature · 1 line
2.24.1
Quoted 18 lines · Martin KaFai Lau
The
sk_storage->listwill be traversed by rcu reader in parallel. Thus,hlist_add_head_rcu()is needed in__selem_link_sk(). This patch fixes it.This part of the code has recently been refactored in bpf-next. A separate fix will be provided for the bpf-next tree.
Fixes 6ac99e8f23d4 ("bpf: Introduce bpf sk local storage")Signed-off-by Martin KaFai Lau <[email protected]>--- net/core/bpf_sk_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/core/bpf_sk_storage.c +0
-0
net/core/bpf_sk_storage.c static void __selem_link_sk(struct bpf_sk_storage *sk_storage, · line 223
Quoted 6 lines
net/core/bpf_sk_storage.c +1
-1@@ -219,7 +219,7 @@ static void __selem_link_sk(struct bpf_sk_storage *sk_storage, struct bpf_sk_storage_elem *selem) {RCU_INIT_POINTER (selem->sk_storage, sk_storage); -hlist_add_head (&selem->snode, &sk_storage->list); +hlist_add_head_rcu (&selem->snode, &sk_storage->list); }
Applying the same, yet very different from git point of view, patch to bpf and bpf-next trees will create a ton of confusion for everyone. I prefer to take this fix (in bpf-next form) into bpf-next only and apply this fix (in bpf form) to 5.9 and stable after the merge window. The code has been around since April 2019 and it wasn't hit in prod, so I don't think there is urgency.
Agree?
Quoted 26 lines · Alexei Starovoitov
Quoted 18 lines · Martin KaFai Lau
The
sk_storage->listwill be traversed by rcu reader in parallel. Thus,hlist_add_head_rcu()is needed in__selem_link_sk(). This patch fixes it.This part of the code has recently been refactored in bpf-next. A separate fix will be provided for the bpf-next tree.
Fixes 6ac99e8f23d4 ("bpf: Introduce bpf sk local storage")Signed-off-by Martin KaFai Lau <[email protected]>--- net/core/bpf_sk_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/core/bpf_sk_storage.c +0
-0net/core/bpf_sk_storage.c static void __selem_link_sk(struct bpf_sk_storage *sk_storage, · line 223
Quoted 6 lines
net/core/bpf_sk_storage.c +1
-1@@ -219,7 +219,7 @@ static void __selem_link_sk(struct bpf_sk_storage *sk_storage, struct bpf_sk_storage_elem *selem) {RCU_INIT_POINTER (selem->sk_storage, sk_storage); -hlist_add_head (&selem->snode, &sk_storage->list); +hlist_add_head_rcu (&selem->snode, &sk_storage->list); }
Quoted 7 lines
Applying the same, yet very different from git point of view, patch to bpf and bpf-next trees will create a ton of confusion for everyone. I prefer to take this fix (in bpf-next form) into bpf-next only and apply this fix (in bpf form) to 5.9 and stable after the merge window. The code has been around since April 2019 and it wasn't hit in prod, so I don't think there is urgency.
Agree?
Yep, agree.