Skip to content

Remove redundant work_backlog_mutex #1

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

Merged
congwang merged 2 commits into from
Nov 20, 2024
Merged

Remove redundant work_backlog_mutex #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d2561
Update skmsg.c
congwang Nov 20, 2024
16fe69d
Update skmsg.h
congwang Nov 20, 2024
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
1 change: 0 additions & 1 deletion include/linux/skmsg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ struct sk_psock {
struct mutex work_mutex;
struct sk_psock_work_state work_state;
struct delayed_work work;
struct mutex work_backlog_mutex;
bool work_backlog_delayed;
struct delayed_work work_backlog;
struct sock *sk_pair;
Expand Down
5 changes: 0 additions & 5 deletions net/core/skmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,7 @@ static void sk_psock_backlog_msg_work(struct work_struct *work)
struct delayed_work *dwork = to_delayed_work(work);
struct sk_psock *psock = container_of(dwork, struct sk_psock, work_backlog);

mutex_lock(&psock->work_backlog_mutex);
sk_psock_backlog_msg(psock);
mutex_unlock(&psock->work_backlog_mutex);
}

struct sk_psock *sk_psock_init(struct sock *sk, int node)
Expand Down Expand Up @@ -847,7 +845,6 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)
INIT_DELAYED_WORK(&psock->work, sk_psock_backlog);
mutex_init(&psock->work_mutex);
INIT_DELAYED_WORK(&psock->work_backlog, sk_psock_backlog_msg_work);
mutex_init(&psock->work_backlog_mutex);
INIT_LIST_HEAD(&psock->ingress_msg);
spin_lock_init(&psock->ingress_lock);
INIT_LIST_HEAD(&psock->backlog_msg);
Expand Down Expand Up @@ -963,8 +960,6 @@ static void sk_psock_destroy(struct work_struct *work)
__sk_psock_zap_ingress(psock);
__sk_psock_purge_ingress_msg_backlog(psock);
mutex_destroy(&psock->work_mutex);
mutex_destroy(&psock->work_backlog_mutex);

psock_progs_drop(&psock->progs);

sk_psock_link_destroy(psock);
Expand Down