libavf: add API to configure swiotlb size
Test: TH
Bug: 382781129
Change-Id: I1b22a8e3fd6e3800f29c81cadbc47ba8c2e21b3b
diff --git a/libs/libavf/include/android/virtualization.h b/libs/libavf/include/android/virtualization.h
index 88571ac..7f07667 100644
--- a/libs/libavf/include/android/virtualization.h
+++ b/libs/libavf/include/android/virtualization.h
@@ -121,6 +121,9 @@
/**
* Set how much memory will be given to a virtual machine.
*
+ * When `AVirtualMachineRawConfig_setProtectedVm(..., true)` is set, the memory
+ * size provided here will be automatically augmented with the swiotlb size.
+ *
* \param config a virtual machine config object.
* \param memoryMiB the amount of RAM to give the virtual machine, in MiB. 0 or negative to use the
* default.
@@ -129,6 +132,21 @@
int32_t memoryMiB) __INTRODUCED_IN(36);
/**
+ * Set how much swiotlb will be given to a virtual machine.
+ *
+ * Only applicable when `AVirtualMachineRawConfig_setProtectedVm(..., true)` is
+ * set.
+ *
+ * For information on swiotlb, see https://docs.kernel.org/core-api/swiotlb.html.
+ *
+ * \param config a virtual machine config object.
+ * \param memoryMiB the amount of swiotlb to give the virtual machine, in MiB.
+ * 0 or negative to use the default.
+ */
+void AVirtualMachineRawConfig_setSwiotlbMiB(AVirtualMachineRawConfig* _Nonnull config,
+ int32_t swiotlbMiB) __INTRODUCED_IN(36);
+
+/**
* Set whether the virtual machine's memory will be protected from the host, so the host can't
* access its memory.
*
diff --git a/libs/libavf/libavf.map.txt b/libs/libavf/libavf.map.txt
index dab4adf..2935234 100644
--- a/libs/libavf/libavf.map.txt
+++ b/libs/libavf/libavf.map.txt
@@ -8,6 +8,7 @@
AVirtualMachineRawConfig_setInitRd; # apex llndk
AVirtualMachineRawConfig_addDisk; # apex llndk
AVirtualMachineRawConfig_setMemoryMiB; # apex llndk
+ AVirtualMachineRawConfig_setSwiotlbMiB; # apex llndk
AVirtualMachineRawConfig_setProtectedVm; # apex llndk
AVirtualMachineRawConfig_setHypervisorSpecificAuthMethod; # apex llndk
AVirtualMachineRawConfig_addCustomMemoryBackingFile; # apex llndk
diff --git a/libs/libavf/src/lib.rs b/libs/libavf/src/lib.rs
index 044c695..8d60f3c 100644
--- a/libs/libavf/src/lib.rs
+++ b/libs/libavf/src/lib.rs
@@ -190,6 +190,21 @@
config.memoryMib = memory_mib;
}
+/// Set how much swiotlb will be given to a virtual machine.
+///
+/// # Safety
+/// `config` must be a pointer returned by `AVirtualMachineRawConfig_create`.
+#[no_mangle]
+pub unsafe extern "C" fn AVirtualMachineRawConfig_setSwiotlbMiB(
+ config: *mut VirtualMachineRawConfig,
+ swiotlb_mib: i32,
+) {
+ // SAFETY: `config` is assumed to be a valid, non-null pointer returned by
+ // AVirtualMachineRawConfig_create. It's the only reference to the object.
+ let config = unsafe { &mut *config };
+ config.swiotlbMib = swiotlb_mib;
+}
+
/// Set whether a virtual machine is protected or not.
///
/// # Safety