Skip to content

bpf: Use rcu_read_lock_dont_migrate() and and rcu_read_unlock_migrate() #6098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

bpf: Use rcu_read_lock_dont_migrate() and and rcu_read_unlock_migrate() #6098

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions net/core/bpf_sk_storage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,14 @@ void bpf_sk_storage_free(struct sock *sk)
{
struct bpf_local_storage *sk_storage;

migrate_disable();
rcu_read_lock();
rcu_read_lock_dont_migrate();
sk_storage = rcu_dereference(sk->sk_bpf_storage);
if (!sk_storage)
goto out;

bpf_local_storage_destroy(sk_storage);
out:
rcu_read_unlock();
migrate_enable();
rcu_read_unlock_migrate();
}

static void bpf_sk_storage_map_free(struct bpf_map *map)
Expand Down Expand Up @@ -161,8 +159,7 @@ int bpf_sk_storage_clone(const struct sock *sk, struct sock *newsk)

RCU_INIT_POINTER(newsk->sk_bpf_storage, NULL);

migrate_disable();
rcu_read_lock();
rcu_read_lock_dont_migrate();
sk_storage = rcu_dereference(sk->sk_bpf_storage);

if (!sk_storage || hlist_empty(&sk_storage->list))
Expand Down Expand Up @@ -213,9 +210,8 @@ int bpf_sk_storage_clone(const struct sock *sk, struct sock *newsk)
}

out:
rcu_read_unlock();
migrate_enable();

rcu_read_unlock_migrate();
/* In case of an error, don't free anything explicitly here, the
* caller is responsible to call bpf_sk_storage_free.
*/
Expand Down
Loading