stratovirt: enable net mq

astro · Jan 9, 2024 · d3d617b · d3d617b
1 parent f1d7053
commit d3d617b
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/lib/runners/stratovirt.nix b/lib/runners/stratovirt.nix
@@ -12,6 +12,8 @@ let
     kernel initrdPath
     storeOnDisk storeDisk;
 
+  tapMultiQueue = vcpu > 1;
+
   inherit (import ../. { nixpkgs-lib = pkgs.lib; }) withDriveLetters;
   volumes = withDriveLetters microvmConfig;
 
@@ -63,6 +65,8 @@ let
     echo '${builtins.toJSON data}' | nc -U "${socket}"
   '';
 in {
+  inherit tapMultiQueue;
+
   command = lib.escapeShellArgs (
     [
       "${pkgs.stratovirt}/bin/stratovirt"
@@ -112,6 +116,7 @@ in {
             [
               (if type == "macvtap" then "tap" else "${type}")
               "id=${id}"
+              "queues=${toString (lib.min 16 vcpu)}"
             ]
             ++ lib.optionals (type == "user" && forwardPortsOptions != []) forwardPortsOptions
             ++ lib.optionals (type == "bridge") [
@@ -126,7 +131,15 @@ in {
           )
         )
         # TODO: devType (0x10 + i)
-        "-device" "virtio-net-${devType 30},id=net_${id},netdev=${id},mac=${mac}"
+        "-device" (
+          lib.concatStringsSep "," [
+            "virtio-net-${devType 30}"
+            "id=net_${id}"
+            "netdev=${id}"
+            "mac=${mac}"
+            "mq=${if tapMultiQueue then "on" else "off"}"
+          ]
+        )
       ]) interfaces
     )
     ++