History

Merge branch 'vfs-6.14.poll' into vfs.fixes

Bring in the fixes for __pollwait() and waitqueue_active() interactions.

Christian Brauner committed 1 year ago

Commit 1623bc22 parents 17a4fde 67cd2e23 files · +23 −29Browse files

Showing the changes to include/net (1 of 3 files). Show all

Unified · Split

include/net/sock.h+7−10
@@ -2297,7 +2297,7 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq) · 2296 unmodified lines
2297}2297}
2298 2298
2299/**2299/**
2300 * sock_poll_wait - place memory barrier behind the poll_wait call.2300 * sock_poll_wait - wrapper for the poll_wait call.
2301 * @filp: file2301 * @filp: file
2302 * @sock: socket to wait on2302 * @sock: socket to wait on
2303 * @p: poll_table2303 * @p: poll_table
@@ -2307,15 +2307,12 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq) · 3 unmodified lines
2307static inline void sock_poll_wait(struct file *filp, struct socket *sock,2307static inline void sock_poll_wait(struct file *filp, struct socket *sock,
2308 poll_table *p)2308 poll_table *p)
2309{2309{
2310 if (!poll_does_not_wait(p)) {2310 /* Provides a barrier we need to be sure we are in sync
2311 poll_wait(filp, &sock->wq.wait, p);2311 * with the socket flags modification.
2312 /* We need to be sure we are in sync with the2312 *
2313 * socket flags modification.2313 * This memory barrier is paired in the wq_has_sleeper.
2314 *2314 */
2315 * This memory barrier is paired in the wq_has_sleeper.2315 poll_wait(filp, &sock->wq.wait, p);
2316 */
2317 smp_mb();
2318 }
2319}2316}
2320 2317
2321static inline void skb_set_hash_from_sk(struct sk_buff *skb, struct sock *sk)2318static inline void skb_set_hash_from_sk(struct sk_buff *skb, struct sock *sk)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t