Merge pull request #41 from mewz-project/virtio-net-send-perf

virtio net: interrupt coalescing when sending packets
mewz-project · Feb 5, 2024 · 890de0e · 890de0e
2 parents d93a937 + 077e41b
commit 890de0e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/drivers/virtio/common.zig b/src/drivers/virtio/common.zig
@@ -530,6 +530,10 @@ pub fn VirtioMmioTransport(comptime DeviceConfigType: type) type {
         }
 
         pub fn notifyQueue(self: *Self, virtq: *Virtqueue) void {
+            if (virtq.not_notified_num_descs == 0) {
+                return;
+            }
+
             self.common_config.queue_select = virtq.index;
             @fence(std.builtin.AtomicOrder.SeqCst);
             const offset = self.notify_off_multiplier * self.common_config.queue_notify_off;

diff --git a/src/drivers/virtio/net.zig b/src/drivers/virtio/net.zig
@@ -129,17 +129,17 @@ const VirtioNet = struct {
         const buf = @as([*]u8, @ptrFromInt(base + @sizeOf(Header)));
         @memcpy(buf, data);
 
-        var desc_buf = [_]common.VirtqDescBuffer{ common.VirtqDescBuffer{
+        var desc_buf = [_]common.VirtqDescBuffer{common.VirtqDescBuffer{
             .addr = base,
-            .len = @sizeOf(Header),
+            .len = @sizeOf(Header) + @as(u32, @intCast(data.len)),
             .type = common.VirtqDescBufferType.ReadonlyFromDevice,
-        }, common.VirtqDescBuffer{
-            .addr = base + @sizeOf(Header),
-            .len = @as(u32, @intCast(data.len)),
-            .type = common.VirtqDescBufferType.ReadonlyFromDevice,
-        } };
-        self.transmitq().enqueue(desc_buf[0..2]);
-        self.virtio.transport.notifyQueue(self.transmitq());
+        }};
+
+        self.transmitq().enqueue(desc_buf[0..1]);
+
+        if (self.transmitq().not_notified_num_descs > self.transmitq().num_descs / 2) {
+            self.virtio.transport.notifyQueue(self.transmitq());
+        }
     }
 
     pub fn receive(self: *Self) void {
@@ -207,3 +207,7 @@ fn handleIrq(frame: *interrupt.InterruptFrame) void {
     log.debug.print("interrupt\n");
     virtio_net.receive();
 }
+
+pub fn flush() void {
+    virtio_net.virtio.transport.notifyQueue(virtio_net.transmitq());
+}
diff --git a/src/timer.zig b/src/timer.zig
@@ -2,6 +2,7 @@ const std = @import("std");
 const heap = @import("heap.zig");
 const interrupt = @import("interrupt.zig");
 const sync = @import("sync.zig");
+const net = @import("drivers/virtio/net.zig");
 
 const Allocator = std.mem.Allocator;
 const ArrayList = std.ArrayList;
@@ -58,6 +59,8 @@ pub fn handleIrq(frame: *interrupt.InterruptFrame) void {
         }
     }
     timers.release();
+
+    net.flush();
 }
 
 pub fn init() void {