UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: annotate data-races around sk->sk_tx_queue_mapping 

[ Upstream commit 0bb4d124d34044179b42a769a0c76f389ae973b6 ]

This field can be read or written without socket lock being held.

Add annotations to avoid load-store tearing.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric Dumazet 2023-09-21 20:28:17 +00:00 committed by Greg Kroah-Hartman
parent b521d90864
commit 224f68c507
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/net/sock.h
View File

@ -2006,21 +2006,33 @@ static inline void sk_tx_queue_set(struct sock *sk, int tx_queue)
/* sk_tx_queue_mapping accept only upto a 16-bit value */ /* sk_tx_queue_mapping accept only upto a 16-bit value */
if (WARN_ON_ONCE((unsigned short)tx_queue >= USHRT_MAX)) if (WARN_ON_ONCE((unsigned short)tx_queue >= USHRT_MAX))
return; return;
sk->sk_tx_queue_mapping = tx_queue; /* Paired with READ_ONCE() in sk_tx_queue_get() and
* other WRITE_ONCE() because socket lock might be not held.
*/
WRITE_ONCE(sk->sk_tx_queue_mapping, tx_queue);
} }
#define NO_QUEUE_MAPPING USHRT_MAX #define NO_QUEUE_MAPPING USHRT_MAX
static inline void sk_tx_queue_clear(struct sock *sk) static inline void sk_tx_queue_clear(struct sock *sk)
{ {
sk->sk_tx_queue_mapping = NO_QUEUE_MAPPING; /* Paired with READ_ONCE() in sk_tx_queue_get() and
* other WRITE_ONCE() because socket lock might be not held.
*/
WRITE_ONCE(sk->sk_tx_queue_mapping, NO_QUEUE_MAPPING);
} }
static inline int sk_tx_queue_get(const struct sock *sk) static inline int sk_tx_queue_get(const struct sock *sk)
{ {
if (sk && sk->sk_tx_queue_mapping != NO_QUEUE_MAPPING) if (sk) {
return sk->sk_tx_queue_mapping; /* Paired with WRITE_ONCE() in sk_tx_queue_clear()
* and sk_tx_queue_set().
*/
int val = READ_ONCE(sk->sk_tx_queue_mapping);
if (val != NO_QUEUE_MAPPING)
return val;
}
return -1; return -1;
} }