Skip to content

Commit

Permalink
Add a pipe-based notifier to epoll
Browse files Browse the repository at this point in the history
In some containers, eventfd is not available as it cannot be implemented
securely in some hosts. This commit adds a fallback notifier that uses
a pipe instead of eventfd.

Closes #122

Signed-off-by: John Nunley <[email protected]>
  • Loading branch information
notgull committed Aug 10, 2023
1 parent c6a0890 commit b026f53
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 16 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ jobs:
# Note: This cfg is intended to make it easy for polling developers to test
# the backend that uses poll, and is not a public API.
RUSTFLAGS: ${{ env.RUSTFLAGS }} --cfg polling_test_poll_backend
- run: cargo test
env:
# Note: This cfg is intended to make it easy for polling developers to test
# the backend that uses pipes, and is not a public API.
RUSTFLAGS: ${{ env.RUSTFLAGS }} --cfg polling_test_epoll_pipe
if: startsWith(matrix.os, 'ubuntu')
- run: cargo hack build --feature-powerset --no-dev-deps
- name: Add rust-src
Expand Down
128 changes: 112 additions & 16 deletions src/epoll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ use std::time::Duration;

use rustix::event::{epoll, eventfd, EventfdFlags};
use rustix::fd::OwnedFd;
use rustix::io::{read, write};
use rustix::fs::{fcntl_getfl, fcntl_setfl, OFlags};
use rustix::io::{fcntl_getfd, fcntl_setfd, read, write, FdFlags};
use rustix::pipe::{pipe, pipe_with, PipeFlags};
use rustix::time::{
timerfd_create, timerfd_settime, Itimerspec, TimerfdClockId, TimerfdFlags, TimerfdTimerFlags,
Timespec,
Expand All @@ -20,8 +22,10 @@ use crate::{Event, PollMode};
pub struct Poller {
/// File descriptor for the epoll instance.
epoll_fd: OwnedFd,
/// File descriptor for the eventfd that produces notifications.
event_fd: OwnedFd,

/// Notifier used to wake up epoll.
notifier: Notifier,

/// File descriptor for the timerfd that produces timeouts.
timer_fd: Option<OwnedFd>,
}
Expand All @@ -34,8 +38,8 @@ impl Poller {
// Use `epoll_create1` with `EPOLL_CLOEXEC`.
let epoll_fd = epoll::create(epoll::CreateFlags::CLOEXEC)?;

// Set up eventfd and timerfd.
let event_fd = eventfd(0, EventfdFlags::CLOEXEC | EventfdFlags::NONBLOCK)?;
// Set up notifier and timerfd.
let notifier = Notifier::new()?;
let timer_fd = timerfd_create(
TimerfdClockId::Monotonic,
TimerfdFlags::CLOEXEC | TimerfdFlags::NONBLOCK,
Expand All @@ -44,7 +48,7 @@ impl Poller {

let poller = Poller {
epoll_fd,
event_fd,
notifier,
timer_fd,
};

Expand All @@ -58,7 +62,7 @@ impl Poller {
}

poller.add(
poller.event_fd.as_raw_fd(),
poller.notifier.as_fd().as_raw_fd(),
Event {
key: crate::NOTIFY_KEY,
readable: true,
Expand All @@ -70,7 +74,7 @@ impl Poller {

tracing::trace!(
epoll_fd = ?poller.epoll_fd.as_raw_fd(),
event_fd = ?poller.event_fd.as_raw_fd(),
notifier = ?poller.notifier,
timer_fd = ?poller.timer_fd,
"new",
);
Expand Down Expand Up @@ -209,10 +213,9 @@ impl Poller {
);

// Clear the notification (if received) and re-register interest in it.
let mut buf = [0u8; 8];
let _ = read(&self.event_fd, &mut buf);
self.notifier.clear();
self.modify(
self.event_fd.as_fd(),
self.notifier.as_fd(),
Event {
key: crate::NOTIFY_KEY,
readable: true,
Expand All @@ -228,12 +231,11 @@ impl Poller {
let span = tracing::trace_span!(
"notify",
epoll_fd = ?self.epoll_fd.as_raw_fd(),
event_fd = ?self.event_fd.as_raw_fd(),
notifier = ?self.notifier,
);
let _enter = span.enter();

let buf: [u8; 8] = 1u64.to_ne_bytes();
let _ = write(&self.event_fd, &buf);
self.notifier.notify();
Ok(())
}
}
Expand All @@ -255,15 +257,15 @@ impl Drop for Poller {
let span = tracing::trace_span!(
"drop",
epoll_fd = ?self.epoll_fd.as_raw_fd(),
event_fd = ?self.event_fd.as_raw_fd(),
notifier = ?self.notifier,
timer_fd = ?self.timer_fd
);
let _enter = span.enter();

if let Some(timer_fd) = self.timer_fd.take() {
let _ = self.delete(timer_fd.as_fd());
}
let _ = self.delete(self.event_fd.as_fd());
let _ = self.delete(self.notifier.as_fd());
}
}

Expand Down Expand Up @@ -326,3 +328,97 @@ impl Events {
})
}
}

/// The notifier for Linux.
///
/// Certain container runtimes do not expose eventfd to the client, as it relies on the host and
/// can be used to "escape" the container under certain conditions. Gramine is the prime example,
/// see [here](gramine). In this case, fall back to using a pipe.
///
/// [gramine]: https://gramine.readthedocs.io/en/stable/manifest-syntax.html#allowing-eventfd
#[derive(Debug)]
enum Notifier {
/// The primary notifier, using eventfd.
EventFd(OwnedFd),

/// The fallback notifier, using a pipe.
Pipe {
/// The read end of the pipe.
read_pipe: OwnedFd,

/// The write end of the pipe.
write_pipe: OwnedFd,
},
}

impl Notifier {
/// Create a new notifier.
fn new() -> io::Result<Self> {
// Skip eventfd for testing if necessary.
if !cfg!(polling_test_epoll_pipe) {
// Try to create an eventfd.
match eventfd(0, EventfdFlags::CLOEXEC | EventfdFlags::NONBLOCK) {
Ok(fd) => {
tracing::trace!("created eventfd for notifier");
return Ok(Notifier::EventFd(fd));
}

Err(err) => {
tracing::warn!(
"eventfd() failed with error ({}), falling back to pipe",
err
);
}
}
}

let (read, write) = pipe_with(PipeFlags::CLOEXEC).or_else(|_| {
let (read, write) = pipe()?;
fcntl_setfd(&read, fcntl_getfd(&read)? | FdFlags::CLOEXEC)?;
fcntl_setfd(&write, fcntl_getfd(&write)? | FdFlags::CLOEXEC)?;
io::Result::Ok((read, write))
})?;

fcntl_setfl(&read, fcntl_getfl(&read)? | OFlags::NONBLOCK)?;
Ok(Notifier::Pipe {
read_pipe: read,
write_pipe: write,
})
}

/// The file descriptor to register in the poller.
fn as_fd(&self) -> BorrowedFd<'_> {
match self {
Notifier::EventFd(fd) => fd.as_fd(),
Notifier::Pipe {
read_pipe: read, ..
} => read.as_fd(),
}
}

/// Notify the poller.
fn notify(&self) {
match self {
Self::EventFd(fd) => {
let buf: [u8; 8] = 1u64.to_ne_bytes();
let _ = write(fd, &buf);
}

Self::Pipe { write_pipe, .. } => {
write(write_pipe, &[0; 1]).ok();
}
}
}

/// Clear the notification.
fn clear(&self) {
match self {
Self::EventFd(fd) => {
let mut buf = [0u8; 8];
let _ = read(fd, &mut buf);
}

Self::Pipe { read_pipe, .. } => while read(read_pipe, &mut [0u8; 1024]).is_ok() {},
}
}
}

0 comments on commit b026f53

Please sign in to comment.