Skip to content

Commit bb0094a

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. Reviewed-by: Benno Lossin <[email protected]> Reviewed-by: Martin Rodriguez Reboredo <[email protected]> Reviewed-by: Trevor Gross <[email protected]> Signed-off-by: Alice Ryhl <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent bcd126f commit bb0094a

File tree

3 files changed

+121
-0
lines changed

3 files changed

+121
-0
lines changed

rust/bindings/bindings_helper.h

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/mdio.h>
1717
#include <linux/phy.h>
1818
#include <linux/pid_namespace.h>
19+
#include <linux/poll.h>
1920
#include <linux/refcount.h>
2021
#include <linux/sched.h>
2122
#include <linux/security.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::{new_condvar, CondVar, CondVarTimeoutResult};

rust/kernel/sync/poll.rs

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

0 commit comments

Comments
 (0)