Skip to content

Commit 38d1bcd

Browse files
authored
sync: avoid false sharing in mpsc channel (#5829)
1 parent 52e6510 commit 38d1bcd

File tree

3 files changed

+108
-10
lines changed

3 files changed

+108
-10
lines changed

tokio/src/sync/mpsc/chan.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::runtime::park::CachedParkThread;
66
use crate::sync::mpsc::error::TryRecvError;
77
use crate::sync::mpsc::{bounded, list, unbounded};
88
use crate::sync::notify::Notify;
9+
use crate::util::cacheline::CachePadded;
910

1011
use std::fmt;
1112
use std::process;
@@ -46,18 +47,18 @@ pub(crate) trait Semaphore {
4647
}
4748

4849
pub(super) struct Chan<T, S> {
50+
/// Handle to the push half of the lock-free list.
51+
tx: CachePadded<list::Tx<T>>,
52+
53+
/// Receiver waker. Notified when a value is pushed into the channel.
54+
rx_waker: CachePadded<AtomicWaker>,
55+
4956
/// Notifies all tasks listening for the receiver being dropped.
5057
notify_rx_closed: Notify,
5158

52-
/// Handle to the push half of the lock-free list.
53-
tx: list::Tx<T>,
54-
5559
/// Coordinates access to channel's capacity.
5660
semaphore: S,
5761

58-
/// Receiver waker. Notified when a value is pushed into the channel.
59-
rx_waker: AtomicWaker,
60-
6162
/// Tracks the number of outstanding sender handles.
6263
///
6364
/// When this drops to zero, the send half of the channel is closed.
@@ -73,9 +74,9 @@ where
7374
{
7475
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
7576
fmt.debug_struct("Chan")
76-
.field("tx", &self.tx)
77+
.field("tx", &*self.tx)
7778
.field("semaphore", &self.semaphore)
78-
.field("rx_waker", &self.rx_waker)
79+
.field("rx_waker", &*self.rx_waker)
7980
.field("tx_count", &self.tx_count)
8081
.field("rx_fields", &"...")
8182
.finish()
@@ -108,9 +109,9 @@ pub(crate) fn channel<T, S: Semaphore>(semaphore: S) -> (Tx<T, S>, Rx<T, S>) {
108109

109110
let chan = Arc::new(Chan {
110111
notify_rx_closed: Notify::new(),
111-
tx,
112+
tx: CachePadded::new(tx),
112113
semaphore,
113-
rx_waker: AtomicWaker::new(),
114+
rx_waker: CachePadded::new(AtomicWaker::new()),
114115
tx_count: AtomicUsize::new(1),
115116
rx_fields: UnsafeCell::new(RxFields {
116117
list: rx,

tokio/src/util/cacheline.rs

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
#![cfg_attr(not(feature = "sync"), allow(dead_code, unreachable_pub))]
2+
use std::ops::{Deref, DerefMut};
3+
4+
/// Pads and aligns a value to the length of a cache line.
5+
#[derive(Clone, Copy, Default, Hash, PartialEq, Eq)]
6+
// Starting from Intel's Sandy Bridge, spatial prefetcher is now pulling pairs of 64-byte cache
7+
// lines at a time, so we have to align to 128 bytes rather than 64.
8+
//
9+
// Sources:
10+
// - https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
11+
// - https://github.com/facebook/folly/blob/1b5288e6eea6df074758f877c849b6e73bbb9fbb/folly/lang/Align.h#L107
12+
//
13+
// ARM's big.LITTLE architecture has asymmetric cores and "big" cores have 128-byte cache line size.
14+
//
15+
// Sources:
16+
// - https://www.mono-project.com/news/2016/09/12/arm64-icache/
17+
//
18+
// powerpc64 has 128-byte cache line size.
19+
//
20+
// Sources:
21+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_ppc64x.go#L9
22+
#[cfg_attr(
23+
any(
24+
target_arch = "x86_64",
25+
target_arch = "aarch64",
26+
target_arch = "powerpc64",
27+
),
28+
repr(align(128))
29+
)]
30+
// arm, mips, mips64, and riscv64 have 32-byte cache line size.
31+
//
32+
// Sources:
33+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_arm.go#L7
34+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mips.go#L7
35+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mipsle.go#L7
36+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_mips64x.go#L9
37+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_riscv64.go#L7
38+
#[cfg_attr(
39+
any(
40+
target_arch = "arm",
41+
target_arch = "mips",
42+
target_arch = "mips64",
43+
target_arch = "riscv64",
44+
),
45+
repr(align(32))
46+
)]
47+
// s390x has 256-byte cache line size.
48+
//
49+
// Sources:
50+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_s390x.go#L7
51+
#[cfg_attr(target_arch = "s390x", repr(align(256)))]
52+
// x86 and wasm have 64-byte cache line size.
53+
//
54+
// Sources:
55+
// - https://github.com/golang/go/blob/dda2991c2ea0c5914714469c4defc2562a907230/src/internal/cpu/cpu_x86.go#L9
56+
// - https://github.com/golang/go/blob/3dd58676054223962cd915bb0934d1f9f489d4d2/src/internal/cpu/cpu_wasm.go#L7
57+
//
58+
// All others are assumed to have 64-byte cache line size.
59+
#[cfg_attr(
60+
not(any(
61+
target_arch = "x86_64",
62+
target_arch = "aarch64",
63+
target_arch = "powerpc64",
64+
target_arch = "arm",
65+
target_arch = "mips",
66+
target_arch = "mips64",
67+
target_arch = "riscv64",
68+
target_arch = "s390x",
69+
)),
70+
repr(align(64))
71+
)]
72+
pub(crate) struct CachePadded<T> {
73+
value: T,
74+
}
75+
76+
impl<T> CachePadded<T> {
77+
/// Pads and aligns a value to the length of a cache line.
78+
pub(crate) fn new(value: T) -> CachePadded<T> {
79+
CachePadded::<T> { value }
80+
}
81+
}
82+
83+
impl<T> Deref for CachePadded<T> {
84+
type Target = T;
85+
86+
fn deref(&self) -> &T {
87+
&self.value
88+
}
89+
}
90+
91+
impl<T> DerefMut for CachePadded<T> {
92+
fn deref_mut(&mut self) -> &mut T {
93+
&mut self.value
94+
}
95+
}

tokio/src/util/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,5 @@ pub(crate) mod error;
7575
pub(crate) mod memchr;
7676

7777
pub(crate) mod markers;
78+
79+
pub(crate) mod cacheline;

0 commit comments

Comments
 (0)