Skip to content

Commit 48fa1a4

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 d436ff5 commit 48fa1a4

File tree

3 files changed

+123
-0
lines changed

3 files changed

+123
-0
lines changed

rust/bindings/bindings_helper.h

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <linux/mdio.h>
2121
#include <linux/phy.h>
2222
#include <linux/pid_namespace.h>
23+
#include <linux/poll.h>
2324
#include <linux/refcount.h>
2425
#include <linux/sched.h>
2526
#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

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

0 commit comments

Comments
 (0)