tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: virt: gunyah: Respect nosync reclaims in memextent_donate

Browse Source 
This diff was found during testing and is going in future revision of
upstream Gunyah patches. When reclaiming all the VM's memory when
tearing down the virtual machine, we can avoid synchronization and batch
the sync on the last reclaim (see gunyah_vm_reclaim_range()). The flag
was correctly passed to gunyah_hypercall_addrspace_unmap(), but was
missed for the gunyah_hypercall_memextent_donate(). Add it.

Bug: 338347082
Change-Id: I809650b8c6e102a760b6cc589c23aaa18b7bfa2e
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
Signed-off-by: Elliot Berman <elliot.berman@oss.qualcomm.com>
This commit is contained in:
Elliot Berman
2024-05-08 10:38:48 -07:00
committed by Treehugger Robot
parent c47ab53e5d
commit b9b7abe6f8
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/virt/gunyah/vm_mgr_mem.c
+19 -13
View File
@@ -88,14 +88,22 @@ static inline u32 donate_flags(bool share)
GUNYAH_MEMEXTENT_DONATE_TO_PROTECTED);
}
static inline u32 reclaim_flags(bool share)
static inline u32 reclaim_flags(bool share, bool sync)
{
u32 flags = 0;
if (share)
return FIELD_PREP_CONST(GUNYAH_MEMEXTENT_OPTION_TYPE_MASK,
GUNYAH_MEMEXTENT_DONATE_TO_SIBLING);
flags |= FIELD_PREP_CONST(GUNYAH_MEMEXTENT_OPTION_TYPE_MASK,
GUNYAH_MEMEXTENT_DONATE_TO_SIBLING);
else
return FIELD_PREP_CONST(GUNYAH_MEMEXTENT_OPTION_TYPE_MASK,
GUNYAH_MEMEXTENT_DONATE_FROM_PROTECTED);
flags |= FIELD_PREP_CONST(
GUNYAH_MEMEXTENT_OPTION_TYPE_MASK,
GUNYAH_MEMEXTENT_DONATE_FROM_PROTECTED);
if (!sync)
flags |= GUNYAH_MEMEXTENT_OPTION_NOSYNC;
return flags;
}
int gunyah_vm_provide_folio(struct gunyah_vm *ghvm, struct folio *folio,
@@ -188,10 +196,9 @@ int gunyah_vm_provide_folio(struct gunyah_vm *ghvm, struct folio *folio,
folio_get(folio);
return 0;
memextent_reclaim:
gunyah_error = gunyah_hypercall_memextent_donate(reclaim_flags(share),
guest_extent->capid,
host_extent->capid, pa,
size);
gunyah_error = gunyah_hypercall_memextent_donate(
reclaim_flags(share, true), guest_extent->capid,
host_extent->capid, pa, size);
if (gunyah_error != GUNYAH_ERROR_OK)
pr_err("Failed to reclaim memory donation for guest address 0x%016llx: %d\n",
gpa, gunyah_error);
@@ -260,10 +267,9 @@ static int __gunyah_vm_reclaim_folio_locked(struct gunyah_vm *ghvm, void *entry,
goto err;
}
gunyah_error = gunyah_hypercall_memextent_donate(reclaim_flags(share),
guest_extent->capid,
host_extent->capid, pa,
size);
gunyah_error = gunyah_hypercall_memextent_donate(
reclaim_flags(share, sync), guest_extent->capid,
host_extent->capid, pa, size);
if (gunyah_error != GUNYAH_ERROR_OK) {
pr_err_ratelimited(
"Failed to reclaim memory donation for guest address 0x%016llx: %d\n",