liburing

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 
+### NEXT
+
+* Enable `liburing` usage for Linux (kernel versions >= 6) ([PR #1218](https://github.com/versatica/mediasoup/pull/1218)).
+
+
 ### 3.13.6
 
 * Replace make + Makefile with Python Invoke library + tasks.py (also fix installation under path with whitespaces) ([PR #1239](https://github.com/versatica/mediasoup/pull/1239)).

node/src/Worker.ts

@@ -192,6 +192,12 @@ export type WorkerDump =
 		channelRequestHandlers : string[];
 		channelNotificationHandlers : string[];
 	};
+	liburing? :
+	{
+		sqeProcessCount: number;
+		sqeMissCount: number;
+		userDataMissCount: number;
+	};
 };
 
 export type WorkerEvents =
@@ -814,7 +820,7 @@ export function parseWorkerDumpResponse(
 	binary: FbsWorker.DumpResponse
 ): WorkerDump
 {
-	return {
+	const dump: WorkerDump = {
 		pid                    : binary.pid()!,
 		webRtcServerIds        : parseVector(binary, 'webRtcServerIds'),
 		routerIds              : parseVector(binary, 'routerIds'),
@@ -824,4 +830,16 @@ export function parseWorkerDumpResponse(
 			channelNotificationHandlers : parseVector(binary.channelMessageHandlers()!, 'channelNotificationHandlers')
 		}
 	};
+
+	if (binary.liburing())
+	{
+		dump.liburing =
+		{
+			sqeProcessCount   : Number(binary.liburing()!.sqeProcessCount()),
+			sqeMissCount      : Number(binary.liburing()!.sqeMissCount()),
+			userDataMissCount : Number(binary.liburing()!.userDataMissCount())
+		};
+	}
+
+	return dump;
 }

node/src/tests/test-Router.ts

@@ -65,7 +65,7 @@ test('worker.createRouter() succeeds', async () =>
 
 	await expect(worker.dump())
 		.resolves
-		.toEqual(
+		.toMatchObject(
 			{
 				pid                    : worker.pid,
 				webRtcServerIds        : [],

node/src/tests/test-WebRtcServer.ts

@@ -46,7 +46,7 @@ test('worker.createWebRtcServer() succeeds', async () =>
 
 	await expect(worker.dump())
 		.resolves
-		.toEqual(
+		.toMatchObject(
 			{
 				pid                    : worker.pid,
 				webRtcServerIds        : [ webRtcServer.id ],
@@ -120,7 +120,7 @@ test('worker.createWebRtcServer() without specifying port succeeds', async () =>
 
 	await expect(worker.dump())
 		.resolves
-		.toEqual(
+		.toMatchObject(
 			{
 				pid                    : worker.pid,
 				webRtcServerIds        : [ webRtcServer.id ],
@@ -565,7 +565,7 @@ test('router.createWebRtcTransport() with webRtcServer succeeds and webRtcServer
 
 	await expect(worker.dump())
 		.resolves
-		.toEqual(
+		.toMatchObject(
 			{
 				pid                    : worker.pid,
 				webRtcServerIds        : [],

node/src/tests/test-Worker.ts

@@ -135,7 +135,7 @@ test('worker.dump() succeeds', async () =>
 
 	await expect(worker.dump())
 		.resolves
-		.toEqual(
+		.toMatchObject(
 			{
 				pid                    : worker.pid,
 				webRtcServerIds        : [],

rust/src/messages.rs

@@ -29,7 +29,7 @@ use crate::webrtc_server::{
 use crate::webrtc_transport::{
     WebRtcTransportListen, WebRtcTransportListenInfos, WebRtcTransportOptions,
 };
-use crate::worker::{ChannelMessageHandlers, WorkerDump, WorkerUpdateSettings};
+use crate::worker::{ChannelMessageHandlers, LibUringDump, WorkerDump, WorkerUpdateSettings};
 use mediasoup_sys::fbs::{
     active_speaker_observer, audio_level_observer, consumer, data_consumer, data_producer,
     direct_transport, message, notification, pipe_transport, plain_transport, producer, request,
@@ -165,6 +165,11 @@ impl Request for WorkerDumpRequest {
                     .map(|id| id.parse())
                     .collect::<Result<_, _>>()?,
             },
+            liburing: data.liburing.map(|liburing| LibUringDump {
+                sqe_process_count: liburing.sqe_process_count,
+                sqe_miss_count: liburing.sqe_miss_count,
+                user_data_miss_count: liburing.user_data_miss_count,
+            }),
         })
     }
 }

rust/src/worker.rs

@@ -278,6 +278,14 @@ pub struct ChannelMessageHandlers {
     pub channel_notification_handlers: Vec<Uuid>,
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize, Eq, PartialEq)]
+#[doc(hidden)]
+pub struct LibUringDump {
+    pub sqe_process_count: u64,
+    pub sqe_miss_count: u64,
+    pub user_data_miss_count: u64,
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 #[doc(hidden)]
@@ -288,6 +296,7 @@ pub struct WorkerDump {
     #[serde(rename = "webRtcServerIds")]
     pub webrtc_server_ids: Vec<WebRtcServerId>,
     pub channel_message_handlers: ChannelMessageHandlers,
+    pub liburing: Option<LibUringDump>,
 }
 
 /// Error that caused [`Worker::create_webrtc_server`] to fail.

worker/fbs/liburing.fbs

@@ -0,0 +1,8 @@
+namespace FBS.LibUring;
+
+table Dump {
+    sqe_process_count: uint64;
+    sqe_miss_count: uint64;
+    user_data_miss_count: uint64;
+}
+

worker/fbs/meson.build

@@ -6,6 +6,7 @@ flatbuffers_schemas = [
   'dataConsumer.fbs',
   'dataProducer.fbs',
   'directTransport.fbs',
+  'liburing.fbs',
   'log.fbs',
   'message.fbs',
   'notification.fbs',

worker/fbs/worker.fbs

@@ -1,3 +1,4 @@
+include "liburing.fbs";
 include "transport.fbs";
 
 namespace FBS.Worker;
@@ -12,6 +13,7 @@ table DumpResponse {
     web_rtc_server_ids: [string] (required);
     router_ids: [string] (required);
     channel_message_handlers: ChannelMessageHandlers (required);
+    liburing: FBS.LibUring.Dump;
 }
 
 table ResourceUsageResponse {

worker/include/DepLibUring.hpp

@@ -0,0 +1,104 @@
+#ifndef MS_DEP_LIBURING_HPP
+#define MS_DEP_LIBURING_HPP
+
+#include "DepLibUV.hpp"
+#include "FBS/liburing.h"
+#include <functional>
+#include <liburing.h>
+#include <queue>
+
+class DepLibUring
+{
+public:
+	using onSendCallback = const std::function<void(bool sent)>;
+
+	/* Struct for the user data field of SQE and CQE. */
+	struct UserData
+	{
+		uint8_t store[1500]{};
+		onSendCallback* cb{ nullptr };
+		size_t idx{ 0 };
+	};
+
+	/* Number of submission queue entries (SQE). */
+	static constexpr size_t QueueDepth{ 1024 * 4 };
+
+	static bool IsRuntimeSupported();
+	static void ClassInit();
+	static void ClassDestroy();
+	static flatbuffers::Offset<FBS::LibUring::Dump> FillBuffer(flatbuffers::FlatBufferBuilder& builder);
+	static void StartPollingCQEs();
+	static void StopPollingCQEs();
+	static bool PrepareSend(
+	  int sockfd, const void* data, size_t len, const struct sockaddr* addr, onSendCallback* cb);
+	static bool PrepareWrite(
+	  int sockfd, const void* data1, size_t len1, const void* data2, size_t len2, onSendCallback* cb);
+	static void Submit();
+	static void SetActive();
+	static bool IsActive();
+
+	class LibUring;
+
+	thread_local static LibUring* liburing;
+
+public:
+	class LibUring
+	{
+	public:
+		LibUring();
+		~LibUring();
+		flatbuffers::Offset<FBS::LibUring::Dump> FillBuffer(flatbuffers::FlatBufferBuilder& builder) const;
+		void StartPollingCQEs();
+		void StopPollingCQEs();
+		bool PrepareSend(
+		  int sockfd, const void* data, size_t len, const struct sockaddr* addr, onSendCallback* cb);
+		bool PrepareWrite(
+		  int sockfd, const void* data1, size_t len1, const void* data2, size_t len2, onSendCallback* cb);
+		void Submit();
+		void SetActive()
+		{
+			this->active = true;
+		}
+		bool IsActive() const
+		{
+			return this->active;
+		}
+		io_uring* GetRing()
+		{
+			return std::addressof(this->ring);
+		}
+		int GetEventFd() const
+		{
+			return this->efd;
+		}
+		void ReleaseUserDataEntry(size_t idx)
+		{
+			this->availableUserDataEntries.push(idx);
+		}
+
+	private:
+		UserData* GetUserData();
+
+	private:
+		// io_uring instance.
+		io_uring ring;
+		// Event file descriptor to watch for completions.
+		int efd;
+		// libuv handle used to poll io_uring completions.
+		uv_poll_t* uvHandle{ nullptr };
+		// Whether we are currently sending RTP over io_uring.
+		bool active{ false };
+		// Pre-allocated UserData entries.
+		UserData userDataBuffer[QueueDepth]{};
+		// Indexes of available UserData entries.
+		std::queue<size_t> availableUserDataEntries;
+		// Submission queue entry process count.
+		uint64_t sqeProcessCount{ 0u };
+		// Submission queue entry miss count.
+		uint64_t sqeMissCount{ 0u };
+		// User data miss count.
+		uint64_t userDataMissCount{ 0u };
+	};
+};
+
+#endif

worker/include/handles/TcpConnectionHandle.hpp

@@ -143,6 +143,10 @@ class TcpConnectionHandle
 	uv_tcp_t* uvHandle{ nullptr };
 	// Others.
 	struct sockaddr_storage* localAddr{ nullptr };
+#ifdef MS_LIBURING_SUPPORTED
+	// Local file descriptor for io_uring.
+	uv_os_fd_t fd{ 0u };
+#endif
 	bool closed{ false };
 	size_t recvBytes{ 0u };
 	size_t sentBytes{ 0u };

worker/include/handles/UdpSocketHandle.hpp

@@ -103,6 +103,10 @@ class UdpSocketHandle
 	// Allocated by this (may be passed by argument).
 	uv_udp_t* uvHandle{ nullptr };
 	// Others.
+#ifdef MS_LIBURING_SUPPORTED
+	// Local file descriptor for io_uring.
+	uv_os_fd_t fd{ 0u };
+#endif
 	bool closed{ false };
 	size_t recvBytes{ 0u };
 	size_t sentBytes{ 0u };

worker/meson.build

@@ -257,6 +257,28 @@ if host_machine.system() == 'windows'
   ]
 endif
 
+if host_machine.system() == 'linux'
+  kernel_version = run_command('uname', '-r').stdout().strip()
+
+  # Enable liburing for kernel versions greather than or equal to 6.
+  if kernel_version[0].to_int() >= 6
+    liburing_proj = subproject('liburing', default_options: ['default_library=static'], required: true)
+
+    dependencies += [
+      liburing_proj.get_variable('uring'),
+    ]
+    link_whole += [
+      liburing_proj.get_variable('liburing')
+    ]
+    common_sources += [
+      'src/DepLibUring.cpp',
+    ]
+    cpp_args += [
+      '-DMS_LIBURING_SUPPORTED',
+    ]
+  endif
+endif
+
 libmediasoup_worker = library(
   'libmediasoup-worker',
   name_prefix: '',