Commit cf8c1e96 authored by Hawkins Jiawei's avatar Hawkins Jiawei Committed by Jakub Kicinski

net: refactor bpf_sk_reuseport_detach()

Refactor sk_user_data dereference using more generic function
__rcu_dereference_sk_user_data_with_flags(), which improve its
maintainability
Suggested-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarHawkins Jiawei <yin31149@gmail.com>
Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2a013372
...@@ -21,14 +21,11 @@ static struct reuseport_array *reuseport_array(struct bpf_map *map) ...@@ -21,14 +21,11 @@ static struct reuseport_array *reuseport_array(struct bpf_map *map)
/* The caller must hold the reuseport_lock */ /* The caller must hold the reuseport_lock */
void bpf_sk_reuseport_detach(struct sock *sk) void bpf_sk_reuseport_detach(struct sock *sk)
{ {
uintptr_t sk_user_data; struct sock __rcu **socks;
write_lock_bh(&sk->sk_callback_lock); write_lock_bh(&sk->sk_callback_lock);
sk_user_data = (uintptr_t)sk->sk_user_data; socks = __rcu_dereference_sk_user_data_with_flags(sk, SK_USER_DATA_BPF);
if (sk_user_data & SK_USER_DATA_BPF) { if (socks) {
struct sock __rcu **socks;
socks = (void *)(sk_user_data & SK_USER_DATA_PTRMASK);
WRITE_ONCE(sk->sk_user_data, NULL); WRITE_ONCE(sk->sk_user_data, NULL);
/* /*
* Do not move this NULL assignment outside of * Do not move this NULL assignment outside of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment