commit c8d2dc9a14954787ac4e38d9a742ff8dd5b7c795
author Andrew Walbran <qwandor@google.com> Tue Feb 08 09:59:34 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 08 09:59:34 2022 +0000
tree acd959b333d5d0cb186a4ccd720ec774cf0b967b
parent 29de51719cc43e109ab158d40b9d75875c30be49
parent 0b5789f81c34dce2db3aed8dda41e33f9abaedbd

Merge "Allocate swiotlb buffer size based on number of virtio devices."

virtualizationservice/src/crosvm.rs

diff --git a/virtualizationservice/src/crosvm.rs b/virtualizationservice/src/crosvm.rs
index 2c50fed..df7a7d2 100644
--- a/virtualizationservice/src/crosvm.rs
+++ b/virtualizationservice/src/crosvm.rs
@@ -272,6 +272,13 @@
 
     if config.protected {
         command.arg("--protected-vm");
+
+        // 3 virtio-console devices + vsock = 4.
+        let virtio_pci_device_count = 4 + config.disks.len();
+        // crosvm virtio queue has 256 entries, so 2 MiB per device (2 pages per entry) should be
+        // enough.
+        let swiotlb_size_mib = 2 * virtio_pci_device_count;
+        command.arg("--swiotlb").arg(swiotlb_size_mib.to_string());
     }
 
     if let Some(memory_mib) = config.memory_mib {