diff --git a/src/common/buf.rs b/src/common/buf.rs
new file mode 100644
index 00000000..59aaa5c6
--- /dev/null
+++ b/src/common/buf.rs
@@ -0,0 +1,91 @@
+use hyper::body::Buf;
+use std::sync::Arc;
+use tokio::sync::Notify;
+
+/// Signaler returned as part of [`NotifyOnEos::new`] that can be polled to receive information,
+/// when the buffer gets advanced to the end.
+// Cannot be Clone due to usage of `Notify::notify_one` in `NotifyOnEos::advance`,
+// revisit once `Notify::notify_all` stabilizes.
+pub struct EosSignaler {
+    notifier: Arc<Notify>,
+}
+
+impl EosSignaler {
+    pub async fn wait_till_eos(self) {
+        self.notifier.notified().await;
+    }
+}
+
+/// Wrapper for [`Buf`] that returns an [`EosSignaler`] that can be polled to receive information,
+/// when the buffer gets advanced to the end.
+///
+/// NOTE: For the notification to work, caller must ensure that [`Buf::advance`] gets called
+/// enough times to advance to the end of the buffer (so that [`Buf::has_remaining`] afterwards returns `0`).
+pub struct NotifyOnEos<B> {
+    inner: B,
+    notifier: Option<Arc<Notify>>,
+}
+
+impl<B> NotifyOnEos<B> {
+    pub fn new(inner: B) -> (Self, EosSignaler) {
+        let notifier = Arc::new(Notify::new());
+        let this = Self {
+            inner,
+            notifier: Some(notifier.clone()),
+        };
+        let signal = EosSignaler { notifier };
+        (this, signal)
+    }
+}
+
+impl<B: Buf> Buf for NotifyOnEos<B> {
+    fn remaining(&self) -> usize {
+        self.inner.remaining()
+    }
+
+    fn chunk(&self) -> &[u8] {
+        self.inner.chunk()
+    }
+
+    fn advance(&mut self, cnt: usize) {
+        self.inner.advance(cnt);
+        if !self.inner.has_remaining() {
+            // consume the notifier to ensure we only notify once
+            if let Some(notifier) = self.notifier.take() {
+                // tokio::sync::Notify has private method `notify_all` that, once stabilized,
+                // would allow us to make `EosSignaler` Cloneable with better ergonomics
+                // to await EOS from multiple places.
+                notifier.notify_one();
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::common::buf::NotifyOnEos;
+    use hyper::body::{Buf, Bytes};
+    use std::time::Duration;
+
+    #[cfg(not(miri))]
+    #[tokio::test]
+    async fn test_get_notified_immediately() {
+        let buf = Bytes::from_static(b"abc");
+        let (mut buf, signaler) = NotifyOnEos::new(buf);
+        buf.advance(3);
+        signaler.wait_till_eos().await;
+    }
+
+    #[cfg(not(miri))]
+    #[tokio::test]
+    /// Test against the foot-gun of using [`tokio::sync::Notify::notify_waiters`] instead of `notify_one`.
+    async fn test_get_notified_after_1ms() {
+        let buf = Bytes::from_static(b"abc");
+        let (mut buf, signaler) = NotifyOnEos::new(buf);
+        tokio::spawn(async move {
+            tokio::time::sleep(Duration::from_millis(1)).await;
+            buf.advance(3);
+        });
+        signaler.wait_till_eos().await;
+    }
+}
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 52b99174..3b7fbe8c 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -10,6 +10,7 @@ macro_rules! ready {
 }
 
 pub(crate) use ready;
+pub mod buf;
 pub(crate) mod exec;
 pub(crate) mod never;