bhyve: make code to handle non-backed memory accesses MD

PR:	286467
Reviewed by:	markj (previous version)
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D50116
This commit is contained in:
Konstantin Belousov
2025-05-01 10:11:00 +03:00
parent 13e520658e
commit e8b9d839b1
6 changed files with 69 additions and 8 deletions
+1
View File
@@ -1,5 +1,6 @@
SRCS+= \
fdt.c \
mem_md.c \
rtc_pl031.c \
uart_pl011.c
+1
View File
@@ -7,6 +7,7 @@ SRCS+= \
inout.c \
ioapic.c \
kernemu_dev.c \
mem_md.c \
mptbl.c \
pci_fbuf.c \
pci_gvt-d.c \
+19 -7
View File
@@ -33,6 +33,7 @@
*/
#include <sys/types.h>
#define _WANT_KERNEL_ERRNO 1
#include <sys/errno.h>
#include <sys/tree.h>
#include <machine/vmm.h>
@@ -167,10 +168,13 @@ static int
access_memory(struct vcpu *vcpu, uint64_t paddr, mem_cb_t *cb, void *arg)
{
struct mmio_rb_range *entry;
struct mem_range *mr;
int err, perror, immutable, vcpuid;
vcpuid = vcpu_id(vcpu);
mr = NULL;
pthread_rwlock_rdlock(&mmio_rwlock);
/*
* First check the per-vCPU cache
*/
@@ -185,14 +189,22 @@ access_memory(struct vcpu *vcpu, uint64_t paddr, mem_cb_t *cb, void *arg)
if (mmio_rb_lookup(&mmio_rb_root, paddr, &entry) == 0) {
/* Update the per-vCPU cache */
mmio_hint[vcpuid] = entry;
} else if (mmio_rb_lookup(&mmio_rb_fallback, paddr, &entry)) {
perror = pthread_rwlock_unlock(&mmio_rwlock);
assert(perror == 0);
return (ESRCH);
} else if (mmio_rb_lookup(&mmio_rb_fallback, paddr,
&entry) == 0) {
} else {
err = mmio_handle_non_backed_mem(vcpu, paddr, &mr);
if (err != 0) {
perror = pthread_rwlock_unlock(&mmio_rwlock);
assert(perror == 0);
return (err == EJUSTRETURN ? 0 : err);
}
}
}
assert(entry != NULL);
if (mr == NULL) {
assert(entry != NULL);
mr = &entry->mr_param;
}
/*
* An 'immutable' memory range is guaranteed to be never removed
@@ -205,13 +217,13 @@ access_memory(struct vcpu *vcpu, uint64_t paddr, mem_cb_t *cb, void *arg)
* deadlock on 'mmio_rwlock'. However by registering the extended
* config space window as 'immutable' the deadlock can be avoided.
*/
immutable = (entry->mr_param.flags & MEM_F_IMMUTABLE);
immutable = (mr->flags & MEM_F_IMMUTABLE) != 0;
if (immutable) {
perror = pthread_rwlock_unlock(&mmio_rwlock);
assert(perror == 0);
}
err = cb(vcpu, paddr, &entry->mr_param, arg);
err = cb(vcpu, paddr, mr, arg);
if (!immutable) {
perror = pthread_rwlock_unlock(&mmio_rwlock);
+2
View File
@@ -53,6 +53,8 @@ struct mem_range {
void init_mem(int ncpu);
int emulate_mem(struct vcpu *vcpu, uint64_t paddr, struct vie *vie,
struct vm_guest_paging *paging);
int mmio_handle_non_backed_mem(struct vcpu *vcpu __unused, uint64_t paddr,
struct mem_range **mr_paramp);
int read_mem(struct vcpu *vpu, uint64_t gpa, uint64_t *rval, int size);
int register_mem(struct mem_range *memp);
+44
View File
@@ -0,0 +1,44 @@
/*-
* 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>
#include <sys/errno.h>
#include <sys/tree.h>
#include <machine/vmm.h>
#include <machine/vmm_instruction_emul.h>
#include "mem.h"
int
mmio_handle_non_backed_mem(struct vcpu *vcpu __unused, uint64_t paddr __unused,
struct mem_range **mr_paramp __unused)
{
return (ESRCH);
}
+2 -1
View File
@@ -1,5 +1,6 @@
SRCS+= \
fdt.c
fdt.c \
mem_md.c
.PATH: ${BHYVE_SYSDIR}/sys/riscv/vmm
SRCS+= vmm_instruction_emul.c