git: e877ef51e2b3 - stable/14 - bhyve: make code to handle non-backed memory accesses MD

The branch stable/14 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=e877ef51e2b3ff351d77e50810413983ec277785

commit e877ef51e2b3ff351d77e50810413983ec277785
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-05-01 07:11:00 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-05-22 03:25:30 +0000

    bhyve: make code to handle non-backed memory accesses MD
    
    PR:     286467
    
    (cherry picked from commit e8b9d839b1fae2913dc861341b9363d41cd45173)
---
 usr.sbin/bhyve/amd64/Makefile.inc |  1 +
 usr.sbin/bhyve/mem.c              | 26 ++++++++++++++++-------
 usr.sbin/bhyve/mem.h              |  2 ++
 usr.sbin/bhyve/mem_md.c           | 44 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc
index bc0ffa720d31..f8103ae1be32 100644
--- a/usr.sbin/bhyve/amd64/Makefile.inc
+++ b/usr.sbin/bhyve/amd64/Makefile.inc
@@ -7,6 +7,7 @@ SRCS+=	\
 	inout.c		\
 	ioapic.c	\
 	kernemu_dev.c	\
+	mem_md.c	\
 	mptbl.c		\
 	pci_ahci.c	\
 	pci_e82545.c	\
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index b4cb93a1cea4..e32d7bd571a8 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -34,6 +34,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#define _WANT_KERNEL_ERRNO 1
 #include <sys/errno.h>
 #include <sys/tree.h>
 #include <machine/vmm.h>
@@ -168,10 +169,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
 	 */
@@ -186,14 +190,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
@@ -206,13 +218,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);
diff --git a/usr.sbin/bhyve/mem.h b/usr.sbin/bhyve/mem.h
index 90172d1c9124..d7544a6bce30 100644
--- a/usr.sbin/bhyve/mem.h
+++ b/usr.sbin/bhyve/mem.h
@@ -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);
diff --git a/usr.sbin/bhyve/mem_md.c b/usr.sbin/bhyve/mem_md.c
new file mode 100644
index 000000000000..0e29ec0a9de9
--- /dev/null
+++ b/usr.sbin/bhyve/mem_md.c
@@ -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);
+}