From e9a1da25b0775bfbce9e4dc26b00114fe5ac6569 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 17 Feb 2021 17:21:24 +0800 Subject: [PATCH] kernel: riscv: mark address_available() as `false` when shared When a page is shared, only report an address as being available when we receive a `BadAddress` error when doing the translation. Otherwise, assume it is in use. Signed-off-by: Sean Cross --- kernel/src/arch/riscv/mem.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/src/arch/riscv/mem.rs b/kernel/src/arch/riscv/mem.rs index 6951478cf..b26a75ccd 100644 --- a/kernel/src/arch/riscv/mem.rs +++ b/kernel/src/arch/riscv/mem.rs @@ -597,5 +597,12 @@ pub fn virt_to_phys(virt: usize) -> Result { /// Determine whether a virtual address has been mapped pub fn address_available(virt: usize) -> bool { - virt_to_phys(virt).is_err() + if let Err(e) = virt_to_phys(virt) { + // If the value is a `BadAddress`, then that means that address is not valid + // and is therefore available + e == xous_kernel::Error::BadAddress + } else { + // If the address is not an error, then it is not available and shouldn't be used. + false + } }