Fix vhost xen mmio queue reset cleanup

MAINTAINERS.yml

@@ -5921,6 +5921,19 @@ West:
   labels:
     - "area: Rust"
 
+"West project: zephyr-xenlib":
+  status: maintained
+  maintainers:
+    - firscity
+  collaborators:
+    - lorc
+    - luca-fancellu
+    - soburi
+  files:
+    - modules/zephyr-xenlib/
+  labels:
+    - "area: Xen Platform"
+
 "West project: zscilib":
   status: maintained
   maintainers:

arch/arm64/core/xen/enlighten.c

@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <xen/public/xen.h>
+#include <xen/public/memory.h>
+
 #include <zephyr/arch/arm64/hypercall.h>
 #include <zephyr/xen/events.h>
 #include <zephyr/xen/generic.h>
-#include <zephyr/xen/public/xen.h>
-#include <zephyr/xen/public/memory.h>
 
 #include <zephyr/device.h>
 #include <zephyr/init.h>

arch/arm64/core/xen/hypercall.S

@@ -3,10 +3,11 @@
  * Copyright (c) 2021-2023 EPAM Systems
  */
 
+#include <xen/public/xen.h>
+#include <xen/public/arch-arm.h>
+
 #include <zephyr/toolchain.h>
 #include <zephyr/linker/sections.h>
-#include <zephyr/xen/public/arch-arm.h>
-#include <zephyr/xen/public/xen.h>
 
 #define HYPERCALL(hypercall)			\
 GTEXT(HYPERVISOR_##hypercall);			\
@@ -23,7 +24,10 @@ HYPERCALL(sched_op);
 HYPERCALL(event_channel_op);
 HYPERCALL(hvm_op);
 HYPERCALL(memory_op);
+HYPERCALL(dm_op);
+HYPERCALL(xen_version);
 
 #ifdef CONFIG_XEN_DOM0
 HYPERCALL(domctl);
+HYPERCALL(sysctl);
 #endif

drivers/CMakeLists.txt

@@ -92,6 +92,7 @@ add_subdirectory_ifdef(CONFIG_STEPPER stepper)
 add_subdirectory_ifdef(CONFIG_SYSCON syscon)
 add_subdirectory_ifdef(CONFIG_SYS_CLOCK_EXISTS timer)
 add_subdirectory_ifdef(CONFIG_TEE tee)
+add_subdirectory_ifdef(CONFIG_VHOST vhost)
 add_subdirectory_ifdef(CONFIG_VIDEO video)
 add_subdirectory_ifdef(CONFIG_VIRTIO virtio)
 add_subdirectory_ifdef(CONFIG_VIRTUALIZATION virtualization)

drivers/Kconfig

@@ -91,6 +91,7 @@ source "drivers/syscon/Kconfig"
 source "drivers/timer/Kconfig"
 source "drivers/usb/Kconfig"
 source "drivers/usb_c/Kconfig"
+source "drivers/vhost/Kconfig"
 source "drivers/video/Kconfig"
 source "drivers/virtio/Kconfig"
 source "drivers/virtualization/Kconfig"

drivers/serial/uart_hvc_xen.c

@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <xen/public/xen.h>
+#include <xen/public/io/console.h>
+#include <xen/public/sched.h>
+
 #include <zephyr/arch/arm64/hypercall.h>
 #include <zephyr/xen/console.h>
 #include <zephyr/xen/events.h>
 #include <zephyr/xen/generic.h>
 #include <zephyr/xen/hvm.h>
-#include <zephyr/xen/public/io/console.h>
-#include <zephyr/xen/public/sched.h>
-#include <zephyr/xen/public/xen.h>
 
 #include <zephyr/device.h>
 #include <zephyr/init.h>

drivers/serial/uart_hvc_xen_consoleio.c

@@ -9,8 +9,9 @@
  * should be used (uart_hvc_xen.c), this console will not be available.
  */
 
+#include <xen/public/xen.h>
+
 #include <zephyr/arch/arm64/hypercall.h>
-#include <zephyr/xen/public/xen.h>
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>

drivers/vhost/CMakeLists.txt

@@ -0,0 +1,7 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_sources_ifdef(CONFIG_VHOST vringh.c)
+zephyr_library_sources_ifdef(CONFIG_VHOST_XEN_MMIO vhost_xen_mmio.c)

drivers/vhost/Kconfig

@@ -0,0 +1,22 @@
+# Copyright (c) 2025 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+config VHOST
+	bool "support for VIRTIO"
+	help
+	  Enable options for VIRTIO
+
+if VHOST
+
+config VHOST_XEN_MMIO
+	bool "support for MMIO-based VIRTIO backend on Xen hypervisor"
+	default y
+	depends on DT_HAS_XEN_VHOST_MMIO_ENABLED
+	help
+	  Enable VIRTIO-MMIO backend on Xen hypervisor
+
+endif # VIRTIO
+
+module = VHOST
+module-str = VHOST
+source "subsys/logging/Kconfig.template.log_config"