Skip to content

Commit 9bdbf5d

Browse files
Darksonnfbq
authored andcommitted
rust: file: add abstraction for poll_table
The existing `CondVar` abstraction is a wrapper around `wait_queue_head`, but it does not support all use-cases of the C `wait_queue_head` type. To be specific, a `CondVar` cannot be registered with a `struct poll_table`. This limitation has the advantage that you do not need to call `synchronize_rcu` when destroying a `CondVar`. However, we need the ability to register a `poll_table` with a `wait_queue_head` in Rust Binder. To enable this, introduce a type called `PollCondVar`, which is like `CondVar` except that you can register a `poll_table`. We also introduce `PollTable`, which is a safe wrapper around `poll_table` that is intended to be used with `PollCondVar`. The destructor of `PollCondVar` unconditionally calls `synchronize_rcu` to ensure that the removal of epoll waiters has fully completed before the `wait_queue_head` is destroyed. That said, `synchronize_rcu` is rather expensive and is not needed in all cases: If we have never registered a `poll_table` with the `wait_queue_head`, then we don't need to call `synchronize_rcu`. (And this is a common case in Binder - not all processes use Binder with epoll.) The current implementation does not account for this, but if we find that it is necessary to improve this, a future patch could store a boolean next to the `wait_queue_head` to keep track of whether a `poll_table` has ever been registered. Signed-off-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/20240118-alice-file-v3-9-9694b6f9580c@google.com [boqun: Resolve wait_queue_head renaming]
1 parent 97db403 commit 9bdbf5d

File tree

3 files changed

+116
-0
lines changed

3 files changed

+116
-0
lines changed

rust/bindings/bindings_helper.h

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/jiffies.h>
1818
#include <linux/mdio.h>
1919
#include <linux/phy.h>
20+
#include <linux/poll.h>
2021
#include <linux/security.h>
2122
#include <linux/slab.h>
2223
#include <linux/refcount.h>

rust/kernel/sync.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ mod arc;
1111
mod condvar;
1212
pub mod lock;
1313
mod locked_by;
14+
pub mod poll;
1415

1516
pub use arc::{Arc, ArcBorrow, UniqueArc};
1617
pub use condvar::CondVar;

rust/kernel/sync/poll.rs

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
3+
//! Utilities for working with `struct poll_table`.
4+
5+
use crate::{
6+
bindings,
7+
file::File,
8+
prelude::*,
9+
sync::{CondVar, LockClassKey},
10+
types::Opaque,
11+
};
12+
use core::ops::Deref;
13+
14+
/// Creates a [`PollCondVar`] initialiser with the given name and a newly-created lock class.
15+
#[macro_export]
16+
macro_rules! new_poll_condvar {
17+
($($name:literal)?) => {
18+
$crate::sync::poll::PollCondVar::new($crate::optional_name!($($name)?), $crate::static_lock_class!())
19+
};
20+
}
21+
22+
/// Wraps the kernel's `struct poll_table`.
23+
///
24+
/// # Invariants
25+
///
26+
/// This struct contains a valid `struct poll_table`.
27+
///
28+
/// For a `struct poll_table` to be valid, its `_qproc` function must follow the safety
29+
/// requirements of `_qproc` functions. It must ensure that when the waiter is removed and a rcu
30+
/// grace period has passed, it must no longer access the `wait_queue_head`.
31+
#[repr(transparent)]
32+
pub struct PollTable(Opaque<bindings::poll_table>);
33+
34+
impl PollTable {
35+
/// Creates a reference to a [`PollTable`] from a valid pointer.
36+
///
37+
/// # Safety
38+
///
39+
/// The caller must ensure that for the duration of 'a, the pointer will point at a valid poll
40+
/// table (as defined in the type invariants).
41+
///
42+
/// The caller must also ensure that the `poll_table` is only accessed via the returned
43+
/// reference for the duration of 'a.
44+
pub unsafe fn from_ptr<'a>(ptr: *mut bindings::poll_table) -> &'a mut PollTable {
45+
// SAFETY: The safety requirements guarantee the validity of the dereference, while the
46+
// `PollTable` type being transparent makes the cast ok.
47+
unsafe { &mut *ptr.cast() }
48+
}
49+
50+
fn get_qproc(&self) -> bindings::poll_queue_proc {
51+
let ptr = self.0.get();
52+
// SAFETY: The `ptr` is valid because it originates from a reference, and the `_qproc`
53+
// field is not modified concurrently with this call since we have an immutable reference.
54+
unsafe { (*ptr)._qproc }
55+
}
56+
57+
/// Register this [`PollTable`] with the provided [`PollCondVar`], so that it can be notified
58+
/// using the condition variable.
59+
pub fn register_wait(&mut self, file: &File, cv: &PollCondVar) {
60+
if let Some(qproc) = self.get_qproc() {
61+
// SAFETY: The pointers to `file` and `self` need to be valid for the duration of this
62+
// call to `qproc`, which they are because they are references.
63+
//
64+
// The `cv.wait_queue_head` pointer must be valid until an rcu grace period after the
65+
// waiter is removed. The `PollCondVar` is pinned, so before `cv.wait_queue_head` can be
66+
// destroyed, the destructor must run. That destructor first removes all waiters, and
67+
// then waits for an rcu grace period. Therefore, `cv.wait_queue_head` is valid for long
68+
// enough.
69+
unsafe { qproc(file.as_ptr() as _, cv.wait_queue_head.get(), self.0.get()) };
70+
}
71+
}
72+
}
73+
74+
/// A wrapper around [`CondVar`] that makes it usable with [`PollTable`].
75+
///
76+
/// [`CondVar`]: crate::sync::CondVar
77+
#[pin_data(PinnedDrop)]
78+
pub struct PollCondVar {
79+
#[pin]
80+
inner: CondVar,
81+
}
82+
83+
impl PollCondVar {
84+
/// Constructs a new condvar initialiser.
85+
pub fn new(name: &'static CStr, key: &'static LockClassKey) -> impl PinInit<Self> {
86+
pin_init!(Self {
87+
inner <- CondVar::new(name, key),
88+
})
89+
}
90+
}
91+
92+
// Make the `CondVar` methods callable on `PollCondVar`.
93+
impl Deref for PollCondVar {
94+
type Target = CondVar;
95+
96+
fn deref(&self) -> &CondVar {
97+
&self.inner
98+
}
99+
}
100+
101+
#[pinned_drop]
102+
impl PinnedDrop for PollCondVar {
103+
fn drop(self: Pin<&mut Self>) {
104+
// Clear anything registered using `register_wait`.
105+
//
106+
// SAFETY: The pointer points at a valid `wait_queue_head`.
107+
unsafe { bindings::__wake_up_pollfree(self.inner.wait_queue_head.get()) };
108+
109+
// Wait for epoll items to be properly removed.
110+
//
111+
// SAFETY: Just an FFI call.
112+
unsafe { bindings::synchronize_rcu() };
113+
}
114+
}

0 commit comments

Comments
 (0)