Date: Thu, 15 May 2025 14:01:50 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e9131d5545d5 - main - bhyve aarch64: generate SError exception when accessing non-backed gpa Message-ID: <202505151401.54FE1o4t018604@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9131d5545d56c7c9a2922bd745812ae2cd7426f commit e9131d5545d56c7c9a2922bd745812ae2cd7426f Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-05-09 09:08:46 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-05-15 14:01:40 +0000 bhyve aarch64: generate SError exception when accessing non-backed gpa Reviewed by: andrew Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50116 --- usr.sbin/bhyve/aarch64/Makefile.inc | 2 +- usr.sbin/bhyve/aarch64/mem_aarch64.c | 58 ++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/aarch64/Makefile.inc b/usr.sbin/bhyve/aarch64/Makefile.inc index 9f187a6e4db7..7c1417ec6956 100644 --- a/usr.sbin/bhyve/aarch64/Makefile.inc +++ b/usr.sbin/bhyve/aarch64/Makefile.inc @@ -1,6 +1,6 @@ SRCS+= \ fdt.c \ - mem_md.c \ + mem_aarch64.c \ rtc_pl031.c \ uart_pl011.c diff --git a/usr.sbin/bhyve/aarch64/mem_aarch64.c b/usr.sbin/bhyve/aarch64/mem_aarch64.c new file mode 100644 index 000000000000..902d16fa7c51 --- /dev/null +++ b/usr.sbin/bhyve/aarch64/mem_aarch64.c @@ -0,0 +1,58 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov <kib@FreeBSD.org> + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/types.h> +#define _WANT_KERNEL_ERRNO 1 +#include <sys/errno.h> +#include <sys/tree.h> +#include <machine/armreg.h> +#include <machine/vmm.h> +#include <machine/vmm_instruction_emul.h> +#include <vmmapi.h> + +#include "mem.h" + +int +mmio_handle_non_backed_mem(struct vcpu *vcpu, uint64_t paddr, + struct mem_range **mr_paramp __unused) +{ + int err; + uint64_t spsr, esr; + + if (vm_get_register(vcpu, VM_REG_GUEST_CPSR, &spsr) == -1) + return (errno); + if ((spsr & PSR_M_MASK) == PSR_M_EL0t) + esr = EXCP_DATA_ABORT_L << ESR_ELx_EC_SHIFT; + else + esr = EXCP_DATA_ABORT << ESR_ELx_EC_SHIFT; + esr |= ESR_ELx_IL | ISS_DATA_DFSC_EXT; + err = vm_inject_exception(vcpu, esr, paddr); + return (err != 0 ? err : EJUSTRETURN); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505151401.54FE1o4t018604>