HSM driver for ACRN hypervisor
Subsystems (3)
cover HSM driver for ACRN hypervisor
From: Shuo Liu <[email protected]>
ACRN is a Type 1 reference hypervisor stack, running directly on the bare-metal hardware, and is suitable for a variety of IoT and embedded device solutions.
ACRN implements a hybrid VMM architecture, using a privileged Service VM. The Service VM manages the system resources (CPU, memory, etc.) and I/O devices of User VMs. Multiple User VMs are supported, with each of them running Linux, Android OS or Windows. Both Service VM and User VMs are guest VM.
Below figure shows the architecture.
Service VM User VM
+----------------------------+ | +------------------+
| +--------------+ | | | |
| |ACRN userspace| | | | |
| +--------------+ | | | |
|-----------------ioctl------| | | | ...
|kernel space +----------+ | | | |
| | HSM | | | | Drivers |
| +----------+ | | | |
+--------------------|-------+ | +------------------+
+---------------------hypercall----------------------------------------+
| ACRN Hypervisor |
+----------------------------------------------------------------------+
| Hardware |
+----------------------------------------------------------------------+There is only one Service VM which could run Linux as OS.
In a typical case, the Service VM will be auto started when ACRN Hypervisor is booted. Then the ACRN userspace (an application running in Service VM) could be used to start/stop User VMs by communicating with ACRN Hypervisor Service Module (HSM).
ACRN Hypervisor Service Module (HSM) is a middle layer that allows the ACRN userspace and Service VM OS kernel to communicate with ACRN Hypervisor and manage different User VMs. This middle layer provides the following functionalities,
- Issues hypercalls to the hypervisor to manage User VMs:
* VM/vCPU management
* Memory management
* Device passthrough
* Interrupts injection
- I/O requests handling from User VMs.
- Exports ioctl through HSM char device.
- Exports function calls for other kernel modules
ACRN is focused on embedded system. So it doesn't support some features. E.g.,
- ACRN doesn't support VM migration.
- ACRN doesn't support vCPU migration.
This patch set adds the HSM to the Linux kernel.
The basic ARCN support was merged to upstream already.
https://lore.kernel.org/lkml/[email protected]/
Shuo Liu (16):
docs: acrn: Introduce ACRN
x86/acrn: Introduce acrn_{setup, remove}_intr_handler() x86/acrn: Introduce hypercall interfaces
virt: acrn: Introduce ACRN HSM basic driver
virt: acrn: Introduce VM management interfaces
virt: acrn: Introduce an ioctl to set vCPU registers state
virt: acrn: Introduce EPT mapping management
virt: acrn: Introduce I/O request management
virt: acrn: Introduce PCI configuration space PIO accesses combiner
virt: acrn: Introduce interfaces for PCI device passthrough
virt: acrn: Introduce interrupt injection interfaces
virt: acrn: Introduce interfaces to query C-states and P-states
allowed by hypervisor
virt: acrn: Introduce I/O ranges operation interfaces
virt: acrn: Introduce ioeventfd
virt: acrn: Introduce irqfd
virt: acrn: Introduce an interface for Service VM to control vCPU
Yin Fengwei (1):
x86/acrn: Introduce an API to check if a VM is privileged
.../userspace-api/ioctl/ioctl-number.rst | 1 + Documentation/virt/acrn/index.rst | 11 + Documentation/virt/acrn/introduction.rst | 40 ++ Documentation/virt/acrn/io-request.rst | 97 +++ Documentation/virt/index.rst | 1 + MAINTAINERS | 9 + arch/x86/include/asm/acrn.h | 74 ++ arch/x86/kernel/cpu/acrn.c | 38 +- drivers/virt/Kconfig | 2 + drivers/virt/Makefile | 1 + drivers/virt/acrn/Kconfig | 15 + drivers/virt/acrn/Makefile | 3 + drivers/virt/acrn/acrn_drv.h | 225 ++++++ drivers/virt/acrn/hsm.c | 439 ++++++++++++ drivers/virt/acrn/hypercall.h | 266 ++++++++ drivers/virt/acrn/ioeventfd.c | 275 ++++++++ drivers/virt/acrn/ioreq.c | 638 ++++++++++++++++++ drivers/virt/acrn/irqfd.c | 236 +++++++ drivers/virt/acrn/mm.c | 298 ++++++++ drivers/virt/acrn/vm.c | 120 ++++ include/uapi/linux/acrn.h | 499 ++++++++++++++ 21 files changed, 3287 insertions(+), 1 deletion(-) create mode 100644 Documentation/virt/acrn/index.rst create mode 100644 Documentation/virt/acrn/introduction.rst create mode 100644 Documentation/virt/acrn/io-request.rst create mode 100644 arch/x86/include/asm/acrn.h create mode 100644 drivers/virt/acrn/Kconfig create mode 100644 drivers/virt/acrn/Makefile create mode 100644 drivers/virt/acrn/acrn_drv.h create mode 100644 drivers/virt/acrn/hsm.c create mode 100644 drivers/virt/acrn/hypercall.h create mode 100644 drivers/virt/acrn/ioeventfd.c create mode 100644 drivers/virt/acrn/ioreq.c create mode 100644 drivers/virt/acrn/irqfd.c create mode 100644 drivers/virt/acrn/mm.c create mode 100644 drivers/virt/acrn/vm.c create mode 100644 include/uapi/linux/acrn.h
base-commit: 18445bf405cb331117bc98427b1ba6f12418ad17
Signature · 1 line
2.28.0
PATCH 1/17 docs: acrn: Introduce ACRN
From: Shuo Liu <[email protected]>
Add documentation on the following aspects of ACRN:
1) A brief introduction on the architecture of ACRN.
2) I/O request handling in ACRN.
To learn more about ACRN, please go to ACRN project website
https://projectacrn.org, or the documentation page
https://projectacrn.github.io/.
--- Documentation/virt/acrn/index.rst | 11 +++ Documentation/virt/acrn/introduction.rst | 40 ++++++++++ Documentation/virt/acrn/io-request.rst | 97 ++++++++++++++++++++++++ Documentation/virt/index.rst | 1 + MAINTAINERS | 7 ++ 5 files changed, 156 insertions(+) create mode 100644 Documentation/virt/acrn/index.rst create mode 100644 Documentation/virt/acrn/introduction.rst create mode 100644 Documentation/virt/acrn/io-request.rst
Documentation/virt/acrn/index.rst new file +11 -0
@@ -0,0 +1,11 @@ +.. SPDX-License-Identifier: GPL-2.0 + +=============== +ACRN Hypervisor +=============== + +.. toctree:: + :maxdepth: 1 + + introduction + io-request
Documentation/virt/acrn/introduction.rst new file +40 -0
@@ -0,0 +1,40 @@ +.. SPDX-License-Identifier: GPL-2.0 + +ACRN Hypervisor Introduction +============================ + +The ACRN Hypervisor is a Type 1 hypervisor, running directly on the bare-metal +hardware. It has a privileged management VM, called Service VM, to manage User +VMs and do I/O emulation. + +ACRN userspace is an application running in the Service VM that emulates +devices for a User VM based on command line configurations. ACRN Hypervisor +Service Module (HSM) is a kernel module in the Service VM which provides +hypervisor services to the ACRN userspace. + +Below figure shows the architecture. + +:: + + Service VM User VM + +----------------------------+ | +------------------+ + | +--------------+ | | | | + | |ACRN userspace| | | | | + | +--------------+ | | | | + |-----------------ioctl------| | | | ... + |kernel space +----------+ | | | | + | | HSM | | | | Drivers | + | +----------+ | | | | + +--------------------|-------+ | +------------------+ + +---------------------hypercall----------------------------------------+ + | ACRN Hypervisor | + +----------------------------------------------------------------------+ + | Hardware | + +----------------------------------------------------------------------+ + +ACRN userspace allocates memory for the User VM, configures and initializes the +devices used by the User VM, loads the virtual bootloader, initializes the +virtual CPU state and handles I/O request accesses from the User VM. It uses +ioctls to communicate with the HSM. HSM implements hypervisor services by +interacting with the ACRN Hypervisor via hypercalls. HSM exports a char device +interface (/dev/acrn_hsm) to userspace.
Documentation/virt/acrn/io-request.rst new file +97 -0
97 lines not on this page · raw message
Documentation/virt/index.rst +1 -0
@@ -11,6 +11,7 @@ Linux Virtualization Support uml/user_mode_linux paravirt_ops guest-halt-polling + acrn/index .. only:: html and subproject
MAINTAINERS +7 -0
@@ -436,6 +436,13 @@ S: Orphan F: drivers/platform/x86/wmi.c F: include/uapi/linux/wmi.h +ACRN HYPERVISOR SERVICE MODULE +M: Shuo Liu <[email protected]> +L: [email protected] +S: Supported +W: https://projectacrn.org +F: Documentation/virt/acrn/ + AD1889 ALSA SOUND DRIVER L: [email protected] S: Maintained
Signature · 1 line
2.28.0
PATCH 2/17 x86/acrn: Introduce acrn_{setup, remove}_intr_handler()
In reply to [email protected]From: Shuo Liu <[email protected]>
The ACRN Hypervisor builds an I/O request when a trapped I/O access happens in User VM. Then, ACRN Hypervisor issues an upcall by sending a notification interrupt to the Service VM. HSM in the Service VM needs to hook the notification interrupt to handle I/O requests.
Notification interrupts from ACRN Hypervisor are already supported and a, currently uninitialized, callback called.
Export two APIs for HSM to setup/remove its callback.
--- arch/x86/include/asm/acrn.h | 8 ++++++++ arch/x86/kernel/cpu/acrn.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 arch/x86/include/asm/acrn.h
arch/x86/include/asm/acrn.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_ACRN_H +#define _ASM_X86_ACRN_H + +void acrn_setup_intr_handler (void (*handler)(void )); +void acrn_remove_intr_handler (void ); + +#endif /* _ASM_X86_ACRN_H */
arch/x86/kernel/cpu/acrn.c +19 -0
@@ -9,7 +9,11 @@* */ +#define pr_fmt (fmt) "acrn: " fmt +#include <linux/interrupt.h> + +#include <asm/acrn.h> #include <asm/apic.h> #include <asm/cpufeatures.h> #include <asm/desc.h>
@@ -55,6 +59,21 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_acrn_hv_callback)set_irq_regs (old_regs); } +void acrn_setup_intr_handler (void (*handler)(void )) +{ +if (acrn_intr_handler) +pr_warn ("Overwrite the acrn_intr_handler.\n" ); + + acrn_intr_handler = handler; +} +EXPORT_SYMBOL_GPL (acrn_setup_intr_handler); + +void acrn_remove_intr_handler (void ) +{ + acrn_intr_handler =NULL ; +} +EXPORT_SYMBOL_GPL (acrn_remove_intr_handler); +const __initconst struct hypervisor_x86 x86_hyper_acrn = { .name ="ACRN" , .detect = acrn_detect,
Signature · 1 line
2.28.0
PATCH 3/17 x86/acrn: Introduce an API to check if a VM is privileged
In reply to [email protected]From: Yin Fengwei <[email protected]>
ACRN Hypervisor reports hypervisor features via CPUID leaf 0x40000001 which is similar to KVM. A VM can check if it's the privileged VM using the feature bits. The Service VM is the only privileged VM by design.
--- arch/x86/include/asm/acrn.h | 9 +++++++++ arch/x86/kernel/cpu/acrn.c | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)
arch/x86/include/asm/acrn.h +9 -0
@@ -2,7 +2,16 @@#ifndef _ASM_X86_ACRN_H#define _ASM_X86_ACRN_H +/* +* This CPUID returns feature bitmaps in EAX. +* Guest VM uses this to detect the appropriate feature bit. +*/ +#define ACRN_CPUID_FEATURES 0x40000001 +/* Bit 0 indicates whether guest VM is privileged */ +#define ACRN_FEATURE_PRIVILEGED_VM BIT(0) +void acrn_setup_intr_handler (void (*handler)(void ));void acrn_remove_intr_handler (void ); +bool acrn_is_privileged_vm (void );#endif /* _ASM_X86_ACRN_H */
arch/x86/kernel/cpu/acrn.c +18 -1
@@ -21,9 +21,26 @@#include <asm/idtentry.h> #include <asm/irq_regs.h> +static u32 acrn_cpuid_base (void ) +{ +static u32 acrn_cpuid_base; + +if (!acrn_cpuid_base &&boot_cpu_has (X86_FEATURE_HYPERVISOR )) + acrn_cpuid_base =hypervisor_cpuid_base ("ACRNACRNACRN" ,0 ); + +return acrn_cpuid_base; +} + +bool acrn_is_privileged_vm (void ) +{ +return cpuid_eax (acrn_cpuid_base () |ACRN_CPUID_FEATURES ) & +ACRN_FEATURE_PRIVILEGED_VM ; +} +EXPORT_SYMBOL_GPL (acrn_is_privileged_vm); +static u32 __init acrn_detect (void ) { -return hypervisor_cpuid_base ("ACRNACRNACRN" ,0 ); +return acrn_cpuid_base (); }static void __init acrn_init_platform (void )
Signature · 1 line
2.28.0
PATCH 4/17 x86/acrn: Introduce hypercall interfaces
In reply to [email protected]From: Shuo Liu <[email protected]>
The Service VM communicates with the hypervisor via conventional hypercalls. VMCALL instruction is used to make the hypercalls.
ACRN hypercall ABI:
* Hypercall number is in R8 register.
* Up to 2 parameters are in RDI and RSI registers.
* Return value is in RAX register.
Introduce the ACRN hypercall interfaces. Because GCC doesn't support R8 register as direct register constraints, here are two ways to use R8 in extended asm:
1) use explicit register variable as input
2) use supported constraint as input with a explicit MOV to R8 in beginning of asm
The number of instructions of above two ways are same. Asm code from 1)
38: 41 b8 00 00 00 80 mov $0x80000000,%r8d 3e: 48 89 c7 mov %rax,%rdi 41: 0f 01 c1 vmcall
Here, writes to the lower dword (%r8d) clear the upper dword of %r8 when the CPU is in 64-bit mode.
Asm code from 2)
38: 48 89 c7 mov %rax,%rdi 3b: 49 b8 00 00 00 80 00 movabs $0x80000000,%r8 42: 00 00 00 45: 0f 01 c1 vmcall
Choose 1) for code simplicity and a little bit of code size optimization.
--- arch/x86/include/asm/acrn.h | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
arch/x86/include/asm/acrn.h +57 -0
@@ -14,4 +14,61 @@ void acrn_setup_intr_handler(void (*handler)(void));void acrn_remove_intr_handler (void );bool acrn_is_privileged_vm (void ); +/* +* Hypercalls for ACRN +* +* - VMCALL instruction is used to implement ACRN hypercalls. +* - ACRN hypercall ABI: +* - Hypercall number is passed in R8 register. +* - Up to 2 arguments are passed in RDI, RSI. +* - Return value will be placed in RAX. +*/ +static inline long acrn_hypercall0 (unsigned long hcall_id) +{ + registerlong r8 asm("r8" ); +long result; + +/* Nothing can come between the r8 assignment and the asm: */ + r8 = hcall_id; + asmvolatile ("vmcall\n\t" + :"=a" (result) + :"r" (r8) + : ); + +return result; +} + +static inline long acrn_hypercall1 (unsigned long hcall_id, +unsigned long param1) +{ + registerlong r8 asm("r8" ); +long result; + +/* Nothing can come between the r8 assignment and the asm: */ + r8 = hcall_id; + asmvolatile ("vmcall\n\t" + :"=a" (result) + :"r" (r8),"D" (param1) + : ); + +return result; +} + +static inline long acrn_hypercall2 (unsigned long hcall_id, +unsigned long param1, +unsigned long param2) +{ + registerlong r8 asm("r8" ); +long result; + +/* Nothing can come between the r8 assignment and the asm: */ + r8 = hcall_id; + asmvolatile ("vmcall\n\t" + :"=a" (result) + :"r" (r8),"D" (param1),"S" (param2) + : ); + +return result; +} +#endif /* _ASM_X86_ACRN_H */
Signature · 1 line
2.28.0
PATCH 5/17 virt: acrn: Introduce ACRN HSM basic driver
In reply to [email protected]From: Shuo Liu <[email protected]>
ACRN Hypervisor Service Module (HSM) is a kernel module in Service VM which communicates with ACRN userspace through ioctls and talks to ACRN Hypervisor through hypercalls.
Add a basic HSM driver which allows Service VM userspace to communicate with ACRN. The following patches will add more ioctls, guest VM memory mapping caching, I/O request processing, ioeventfd and irqfd into this module. HSM exports a char device interface (/dev/acrn_hsm) to userspace.
--- .../userspace-api/ioctl/ioctl-number.rst | 1 + MAINTAINERS | 2 + drivers/virt/Kconfig | 2 + drivers/virt/Makefile | 1 + drivers/virt/acrn/Kconfig | 14 +++ drivers/virt/acrn/Makefile | 3 + drivers/virt/acrn/acrn_drv.h | 21 ++++ drivers/virt/acrn/hsm.c | 115 ++++++++++++++++++ drivers/virt/acrn/hypercall.h | 30 +++++ include/uapi/linux/acrn.h | 33 +++++ 10 files changed, 222 insertions(+) create mode 100644 drivers/virt/acrn/Kconfig create mode 100644 drivers/virt/acrn/Makefile create mode 100644 drivers/virt/acrn/acrn_drv.h create mode 100644 drivers/virt/acrn/hsm.c create mode 100644 drivers/virt/acrn/hypercall.h create mode 100644 include/uapi/linux/acrn.h
Documentation/userspace-api/ioctl/ioctl-number.rst +1 -0
@@ -319,6 +319,7 @@ Code Seq# Include File Comments 0xA0 all linux/sdp/sdp.h Industrial Device Project <mailto:[email protected]> 0xA1 0 linux/vtpm_proxy.h TPM Emulator Proxy Driver +0xA2 all uapi/linux/acrn.h ACRN hypervisor 0xA3 80-8F Port ACL in development: <mailto:[email protected]> 0xA3 90-9F linux/dtlk.h
MAINTAINERS +2 -0
@@ -442,6 +442,8 @@ L: [email protected] S: Supported W: https://projectacrn.org F: Documentation/virt/acrn/ +F: drivers/virt/acrn/ +F: include/uapi/linux/acrn.h AD1889 ALSA SOUND DRIVER L: [email protected]
drivers/virt/Kconfig +2 -0
@@ -32,4 +32,6 @@ config FSL_HV_MANAGER partition shuts down. source "drivers/virt/vboxguest/Kconfig" + +source "drivers/virt/acrn/Kconfig" endif
drivers/virt/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_FSL_HV_MANAGER) += fsl_hypervisor.o obj-y += vboxguest/ +obj-$(CONFIG_ACRN_HSM) += acrn/
drivers/virt/acrn/Kconfig new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0 +config ACRN_HSM + tristate "ACRN Hypervisor Service Module" + depends on ACRN_GUEST + help + ACRN Hypervisor Service Module (HSM) is a kernel module which + communicates with ACRN userspace through ioctls and talks to + the ACRN Hypervisor through hypercalls. HSM will only run in + a privileged management VM, called Service VM, to manage User + VMs and do I/O emulation. Not required for simply running + under ACRN as a User VM. + + To compile as a module, choose M, the module will be called + acrn. If unsure, say N.
drivers/virt/acrn/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_ACRN_HSM) := acrn.o +acrn-y := hsm.o
drivers/virt/acrn/acrn_drv.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ACRN_HSM_DRV_H +#define __ACRN_HSM_DRV_H + +#include <linux/acrn.h> +#include <linux/types.h> + +#include "hypercall.h" + +#define ACRN_INVALID_VMID (0xffffU) + +/** +* struct acrn_vm - Properties of ACRN User VM. +* @vmid: User VM ID +*/ +struct acrn_vm { +u16 vmid; +}; + +#endif /* __ACRN_HSM_DRV_H */
drivers/virt/acrn/hsm.c new file +115 -0
115 lines not on this page · raw message
drivers/virt/acrn/hypercall.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* ACRN HSM: hypercalls of ACRN Hypervisor +*/ +#ifndef __ACRN_HSM_HYPERCALL_H +#define __ACRN_HSM_HYPERCALL_H +#include <asm/acrn.h> + +/* +* Hypercall IDs of the ACRN Hypervisor +*/ +#define _HC_ID (x, y) (((x) << 24) | (y)) + +#define HC_ID 0x80UL + +#define HC_ID_GEN_BASE 0x0UL +#define HC_GET_API_VERSION _HC_ID(HC_ID, HC_ID_GEN_BASE + 0x00) + +/** +* hcall_get_api_version() - Get API version from hypervisor +* @api_version: Service VM GPA of version info +* +* Return: 0 on success, <0 on failure +*/ +static inline long hcall_get_api_version (u64 api_version) +{ +return acrn_hypercall1 (HC_GET_API_VERSION , api_version); +} + +#endif /* __ACRN_HSM_HYPERCALL_H */
include/uapi/linux/acrn.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* +* Userspace interface for /dev/acrn_hsm - ACRN Hypervisor Service Module +* +* This file can be used by applications that need to communicate with the HSM +* via the ioctl interface. +*/ + +#ifndef _UAPI_ACRN_H +#define _UAPI_ACRN_H + +#include <linux/types.h> + +/** +* struct acrn_api_version - ACRN Hypervisor API version. +* @major_version: Major version of ACRN Hypervisor API. +* @minor_version: Minor version of ACRN Hypervisor API. +*/ +struct acrn_api_version { +__u32 major_version; +__u32 minor_version; +} __attribute__((aligned (8 ))); + +/* The ioctl type, documented in ioctl-number.rst */ +#define ACRN_IOCTL_TYPE 0xA2 + +/* +* Common IOCTL IDs definition for ACRN userspace +*/ +#define ACRN_IOCTL_GET_API_VERSION \ + _IOR(ACRN_IOCTL_TYPE, 0, struct acrn_api_version) + +#endif /* _UAPI_ACRN_H */
Signature · 1 line
2.28.0
Re: [PATCH 05/17] virt: acrn: Introduce ACRN HSM basic driver
drivers/virt/acrn/hsm.c line 51
Quoted 7 lines · On Tue, Aug 25, 2020 at 10:45:05AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c new file +7
-0+static long acrn_dev_ioctl (struct file *filp,unsigned int cmd, +unsigned long ioctl_param) +{ +if (cmd ==ACRN_IOCTL_GET_API_VERSION ) { +if (copy_to_user ((void __user *)ioctl_param, + &api_version,sizeof (api_version))) +return -EFAULT ;
Why are you versioning your api? Shouldn't that not be a thing and you either support an ioctl or you do not?
Quoted 34 lines
drivers/virt/acrn/hsm.c new file +34
-0+ } + +return 0 ; +} + +static int acrn_dev_release (struct inode *inode,struct file *filp) +{ +struct acrn_vm *vm = filp->private_data; + +kfree (vm); +return 0 ; +} + +static const struct file_operations acrn_fops = { + .owner =THIS_MODULE , + .open = acrn_dev_open, + .release = acrn_dev_release, + .unlocked_ioctl = acrn_dev_ioctl, +}; + +static struct miscdevice acrn_dev = { + .minor =MISC_DYNAMIC_MINOR , + .name ="acrn_hsm" , + .fops = &acrn_fops, +}; + +static int __init hsm_init (void ) +{ +int ret; + +if (x86_hyper_type !=X86_HYPER_ACRN ) +return -ENODEV ; + +if (!acrn_is_privileged_vm ())
drivers/virt/acrn/hsm.c line 95
Quoted 10 lines
drivers/virt/acrn/hsm.c new file +10
-0+return -EPERM ; + + ret =hcall_get_api_version (slow_virt_to_phys (&api_version)); +if (ret <0 ) { +pr_err ("Failed to get API version from hypervisor!\n" ); +return ret; + } + +pr_info ("API version is %u.%u\n" , + api_version.major_version, api_version.minor_version);
Shouldn't drivers be quiet when they load and all goes well? pr_dbg()?
And can't you defer the "read the version" call until open happens? Does it have to happen at module load time, increasing boot time for no good reason if there is not a user?
thanks,
greg k-h
Re: [PATCH 05/17] virt: acrn: Introduce ACRN HSM basic driver
Hi Greg,
Quoted 11 lines · Greg Kroah-Hartman
drivers/virt/acrn/hsm.c line 51
Quoted 7 lines · On Tue, Aug 25, 2020 at 10:45:05AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c new file +7
-0+static long acrn_dev_ioctl (struct file *filp,unsigned int cmd, +unsigned long ioctl_param) +{ +if (cmd ==ACRN_IOCTL_GET_API_VERSION ) { +if (copy_to_user ((void __user *)ioctl_param, + &api_version,sizeof (api_version))) +return -EFAULT ;Why are you versioning your api? Shouldn't that not be a thing and you either support an ioctl or you do not?
The API version here is more for the hypercalls.
The hypercalls might evolve later and the version indicates which set of interfaces (include the paramters' format) should be used by user space tools. Currently, it's used rarely.
Quoted 49 lines
Quoted 36 lines
drivers/virt/acrn/hsm.c new file +34
-0+ } + +return 0 ; +} + +static int acrn_dev_release (struct inode *inode,struct file *filp) +{ +struct acrn_vm *vm = filp->private_data; + +kfree (vm); +return 0 ; +} + +static const struct file_operations acrn_fops = { + .owner =THIS_MODULE , + .open = acrn_dev_open, + .release = acrn_dev_release, + .unlocked_ioctl = acrn_dev_ioctl, +}; + +static struct miscdevice acrn_dev = { + .minor =MISC_DYNAMIC_MINOR , + .name ="acrn_hsm" , + .fops = &acrn_fops, +}; + +static int __init hsm_init (void ) +{ +int ret; + +if (x86_hyper_type !=X86_HYPER_ACRN ) +return -ENODEV ; + +if (!acrn_is_privileged_vm ())drivers/virt/acrn/hsm.c line 95
Quoted 10 lines
drivers/virt/acrn/hsm.c new file +10
-0+return -EPERM ; + + ret =hcall_get_api_version (slow_virt_to_phys (&api_version)); +if (ret <0 ) { +pr_err ("Failed to get API version from hypervisor!\n" ); +return ret; + } + +pr_info ("API version is %u.%u\n" , + api_version.major_version, api_version.minor_version);Shouldn't drivers be quiet when they load and all goes well?
pr_dbg()?
Quoted 3 lines
And can't you defer the "read the version" call until open happens? Does it have to happen at module load time, increasing boot time for no good reason if there is not a user?
OK. I can defer the version fetch and pr_dbg() until open.
Thanks
shuo
Re: [PATCH 05/17] virt: acrn: Introduce ACRN HSM basic driver
Quoted 13 lines · Shuo A Liu
Quoted 11 lines · Greg Kroah-Hartman
drivers/virt/acrn/hsm.c line 51
Quoted 7 lines · On Tue, Aug 25, 2020 at 10:45:05AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c new file +7
-0+static long acrn_dev_ioctl (struct file *filp,unsigned int cmd, + unsigned long ioctl_param) +{ + if (cmd == ACRN_IOCTL_GET_API_VERSION) { + if (copy_to_user((void __user *)ioctl_param, + &api_version, sizeof(api_version))) + return -EFAULT;Why are you versioning your api? Shouldn't that not be a thing and you either support an ioctl or you do not?
Quoted 2 lines
The API version here is more for the hypercalls.
The hypercalls might evolve later
They might evolve, but the old ones must always keep working. Right?
Quoted 3 lines
and the version indicates which set of interfaces (include the paramters' format) should be used by user space tools. Currently, it's used rarely.
Why do you need this when the core kernel doesn't? We add syscalls, ioctl()s and prctl()s all the time, but nothing is versioned.
This sounds like something you need to remove from the series.
Re: [PATCH 05/17] virt: acrn: Introduce ACRN HSM basic driver
Hi Dave,
Quoted 14 lines · Dave Hansen
Quoted 13 lines · Shuo A Liu
Quoted 11 lines · Greg Kroah-Hartman
drivers/virt/acrn/hsm.c line 51
Quoted 7 lines · On Tue, Aug 25, 2020 at 10:45:05AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c new file +7
-0+static long acrn_dev_ioctl (struct file *filp,unsigned int cmd, + unsigned long ioctl_param) +{ + if (cmd == ACRN_IOCTL_GET_API_VERSION) { + if (copy_to_user((void __user *)ioctl_param, + &api_version, sizeof(api_version))) + return -EFAULT;Why are you versioning your api? Shouldn't that not be a thing and you either support an ioctl or you do not?
Quoted 4 lines
Quoted 2 lines
The API version here is more for the hypercalls.
The hypercalls might evolve laterThey might evolve, but the old ones must always keep working. Right?
Yes, it's right.
Quoted 6 lines
Quoted 4 lines
and the version indicates which set of interfaces (include the paramters' format) should be used by user space tools. Currently, it's used rarely.
Why do you need this when the core kernel doesn't? We add syscalls, ioctl()s and prctl()s all the time, but nothing is versioned.
Indeed. It looks a bit odd.
Quoted 2 lines
This sounds like something you need to remove from the series.
OK. I will remove the api version related code.
Thanks
shuo
PATCH 6/17 virt: acrn: Introduce VM management interfaces
In reply to [email protected]From: Shuo Liu <[email protected]>
The VM management interfaces expose several VM operations to ACRN userspace via ioctls. For example, creating VM, starting VM, destroying VM and so on.
The ACRN Hypervisor needs to exchange data with the ACRN userspace during the VM operations. HSM provides VM operation ioctls to the ACRN userspace and communicates with the ACRN Hypervisor for VM operations via hypercalls.
HSM maintains a list of User VM. Each User VM will be bound to an existing file descriptor of /dev/acrn_hsm. The User VM will be destroyed when the file descriptor is closed.
--- drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 16 ++++++++- drivers/virt/acrn/hsm.c | 58 +++++++++++++++++++++++++++++- drivers/virt/acrn/hypercall.h | 62 ++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 66 +++++++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 36 +++++++++++++++++++ 6 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 drivers/virt/acrn/vm.c
drivers/virt/acrn/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o +acrn-y := hsm.o vm.o
drivers/virt/acrn/acrn_drv.h +15 -1
@@ -10,12 +10,26 @@#define ACRN_INVALID_VMID (0xffffU) +#define ACRN_VM_FLAG_DESTROYED 0U +extern struct list_head acrn_vm_list; +extern rwlock_t acrn_vm_list_lock;/** * struct acrn_vm - Properties of ACRN User VM. +* @list: Entry within global list of all VMs * @vmid: User VM ID +* @vcpu_num: Number of virtual CPUs in the VM +* @flags: Flags (ACRN_VM_FLAG_*) of the VM. This is VM flag management +* in HSM which is different from the &acrn_vm_creation.vm_flag. */ struct acrn_vm { -u16 vmid; +struct list_head list; +u16 vmid; +int vcpu_num; +unsigned long flags; }; +struct acrn_vm *acrn_vm_create (struct acrn_vm *vm, +struct acrn_vm_creation *vm_param); +int acrn_vm_destroy (struct acrn_vm *vm); +#endif /* __ACRN_HSM_DRV_H */
drivers/virt/acrn/hsm.c +57 -1
76 lines not on this page · raw message
drivers/virt/acrn/hypercall.h +62 -0
72 lines not on this page · raw message
drivers/virt/acrn/vm.c new file +66 -0
66 lines not on this page · raw message
include/uapi/linux/acrn.h +36 -0
@@ -21,6 +21,31 @@ struct acrn_api_version {__u32 minor_version; } __attribute__((aligned(8))); +/** +* struct acrn_vm_creation - Info to create a User VM +* @vmid: User VM ID returned from the hypervisor +* @reserved0: Reserved +* @vcpu_num: Number of vCPU in the VM. Return from hypervisor. +* @reserved1: Reserved +* @uuid: UUID of the VM. Pass to hypervisor directly. +* @vm_flag: Flag of the VM creating. Pass to hypervisor directly. +* @ioreq_buf: Service VM GPA of I/O request buffer. Pass to +* hypervisor directly. +* @cpu_affinity: CPU affinity of the VM. Pass to hypervisor directly. +* @reserved2: Reserved +*/ +struct acrn_vm_creation { +__u16 vmid; +__u16 reserved0; +__u16 vcpu_num; +__u16 reserved1; +__u8 uuid[16 ]; +__u64 vm_flag; +__u64 ioreq_buf; +__u64 cpu_affinity; +__u8 reserved2[8 ]; +} __attribute__((aligned (8 ))); +/* The ioctl type, documented in ioctl-number.rst */ #define ACRN_IOCTL_TYPE 0xA2
@@ -30,4 +55,15 @@ struct acrn_api_version {#define ACRN_IOCTL_GET_API_VERSION \ _IOR(ACRN_IOCTL_TYPE, 0, struct acrn_api_version) +#define ACRN_IOCTL_CREATE_VM \ + _IOWR(ACRN_IOCTL_TYPE, 0x10, struct acrn_vm_creation) +#define ACRN_IOCTL_DESTROY_VM \ + _IO(ACRN_IOCTL_TYPE, 0x11) +#define ACRN_IOCTL_START_VM \ + _IO(ACRN_IOCTL_TYPE, 0x12) +#define ACRN_IOCTL_PAUSE_VM \ + _IO(ACRN_IOCTL_TYPE, 0x13) +#define ACRN_IOCTL_RESET_VM \ + _IO(ACRN_IOCTL_TYPE, 0x15) +#endif /* _UAPI_ACRN_H */
Signature · 1 line
2.28.0
Re: [PATCH 06/17] virt: acrn: Introduce VM management interfaces
Quoted 85 lines · On Tue, Aug 25, 2020 at 10:45:06AM +0800, [email protected] wrote:
From: Shuo Liu <[email protected]>
The VM management interfaces expose several VM operations to ACRN userspace via ioctls. For example, creating VM, starting VM, destroying VM and so on.
The ACRN Hypervisor needs to exchange data with the ACRN userspace during the VM operations. HSM provides VM operation ioctls to the ACRN userspace and communicates with the ACRN Hypervisor for VM operations via hypercalls.
HSM maintains a list of User VM. Each User VM will be bound to an existing file descriptor of
/dev/acrn_hsm. The User VM will be destroyed when the file descriptor is closed.Signed-off-by Shuo Liu <[email protected]>Reviewed-by Zhi Wang <[email protected]>Reviewed-by Reinette Chatre <[email protected]>Cc Zhi Wang <[email protected]>Cc Zhenyu Wang <[email protected]>Cc Yu Wang <[email protected]>Cc Reinette Chatre <[email protected]>--- drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 16 ++++++++- drivers/virt/acrn/hsm.c | 58 +++++++++++++++++++++++++++++- drivers/virt/acrn/hypercall.h | 62 ++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 66 +++++++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 36 +++++++++++++++++++ 6 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 drivers/virt/acrn/vm.cdrivers/virt/acrn/Makefile +1
-1@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o +acrn-y := hsm.o vm.odrivers/virt/acrn/acrn_drv.h +15
-1@@ -10,12 +10,26 @@#define ACRN_INVALID_VMID (0xffffU) +#define ACRN_VM_FLAG_DESTROYED 0U +extern struct list_head acrn_vm_list; +extern rwlock_t acrn_vm_list_lock;/** * struct acrn_vm - Properties of ACRN User VM. +* @list: Entry within global list of all VMs * @vmid: User VM ID +* @vcpu_num: Number of virtual CPUs in the VM +* @flags: Flags (ACRN_VM_FLAG_*) of the VM. This is VM flag management +* in HSM which is different from the &acrn_vm_creation.vm_flag. */ struct acrn_vm { -u16 vmid; +struct list_head list; +u16 vmid; +int vcpu_num; +unsigned long flags; }; +struct acrn_vm *acrn_vm_create (struct acrn_vm *vm, +struct acrn_vm_creation *vm_param); +int acrn_vm_destroy (struct acrn_vm *vm); +#endif /* __ACRN_HSM_DRV_H */ drivers/virt/acrn/hsm.c +4
-0@@ -45,19 +45,75 @@ static int acrn_dev_open(struct inode *inode, struct file *filp)static long acrn_dev_ioctl (struct file *filp,unsigned int cmd,unsigned long ioctl_param) { +struct acrn_vm *vm = filp->private_data; +struct acrn_vm_creation *vm_param; +int ret =0 ; +
drivers/virt/acrn/hsm.c static int acrn_dev_open(struct inode *inode, struct file *filp) · line 60
Quoted 10 lines
drivers/virt/acrn/hsm.c +3
-1if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {if (copy_to_user ((void __user *)ioctl_param, &api_version,sizeof (api_version)))return -EFAULT ; +return 0 ; } -return 0 ; +if (vm->vmid ==ACRN_INVALID_VMID && cmd !=ACRN_IOCTL_CREATE_VM ) { +pr_err ("ioctl 0x%x: Invalid VM state!\n" , cmd);
For this whole driver, you have a real 'struct device' to use, please use it for all of these error messages everywhere. dev_err() gives you much more information than pr_err() does.
Same everywhere in this patch series.
thanks,
greg k-h
Re: [PATCH 06/17] virt: acrn: Introduce VM management interfaces
Hi Greg,
Quoted 93 lines · Greg Kroah-Hartman
Quoted 92 lines · On Tue, Aug 25, 2020 at 10:45:06AM +0800, [email protected] wrote:
From: Shuo Liu <[email protected]>
The VM management interfaces expose several VM operations to ACRN userspace via ioctls. For example, creating VM, starting VM, destroying VM and so on.
The ACRN Hypervisor needs to exchange data with the ACRN userspace during the VM operations. HSM provides VM operation ioctls to the ACRN userspace and communicates with the ACRN Hypervisor for VM operations via hypercalls.
HSM maintains a list of User VM. Each User VM will be bound to an existing file descriptor of
/dev/acrn_hsm. The User VM will be destroyed when the file descriptor is closed.Signed-off-by Shuo Liu <[email protected]>Reviewed-by Zhi Wang <[email protected]>Reviewed-by Reinette Chatre <[email protected]>Cc Zhi Wang <[email protected]>Cc Zhenyu Wang <[email protected]>Cc Yu Wang <[email protected]>Cc Reinette Chatre <[email protected]>--- drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 16 ++++++++- drivers/virt/acrn/hsm.c | 58 +++++++++++++++++++++++++++++- drivers/virt/acrn/hypercall.h | 62 ++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 66 +++++++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 36 +++++++++++++++++++ 6 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 drivers/virt/acrn/vm.cdrivers/virt/acrn/Makefile +1
-1@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o +acrn-y := hsm.o vm.odrivers/virt/acrn/acrn_drv.h +15
-1@@ -10,12 +10,26 @@#define ACRN_INVALID_VMID (0xffffU) +#define ACRN_VM_FLAG_DESTROYED 0U +extern struct list_head acrn_vm_list; +extern rwlock_t acrn_vm_list_lock;/** * struct acrn_vm - Properties of ACRN User VM. +* @list: Entry within global list of all VMs * @vmid: User VM ID +* @vcpu_num: Number of virtual CPUs in the VM +* @flags: Flags (ACRN_VM_FLAG_*) of the VM. This is VM flag management +* in HSM which is different from the &acrn_vm_creation.vm_flag. */ struct acrn_vm { -u16 vmid; +struct list_head list; +u16 vmid; +int vcpu_num; +unsigned long flags; }; +struct acrn_vm *acrn_vm_create (struct acrn_vm *vm, +struct acrn_vm_creation *vm_param); +int acrn_vm_destroy (struct acrn_vm *vm); +#endif /* __ACRN_HSM_DRV_H */ drivers/virt/acrn/hsm.c +5
-0@@ -45,19 +45,75 @@ static int acrn_dev_open(struct inode *inode, struct file *filp)static long acrn_dev_ioctl (struct file *filp,unsigned int cmd,unsigned long ioctl_param) { +struct acrn_vm *vm = filp->private_data; +struct acrn_vm_creation *vm_param; +int ret =0 ; +if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {if (copy_to_user ((void __user *)ioctl_param, &api_version,sizeof (api_version)))return -EFAULT ; +return 0 ; }
Quoted 7 lines
drivers/virt/acrn/hsm.c static int acrn_dev_open(struct inode *inode, struct file *filp) · line 60
Quoted 3 lines
drivers/virt/acrn/hsm.c +2
-1-return 0 ; +if (vm->vmid ==ACRN_INVALID_VMID && cmd !=ACRN_IOCTL_CREATE_VM ) { +pr_err ("ioctl 0x%x: Invalid VM state!\n" , cmd);For this whole driver, you have a real 'struct device' to use, please use it for all of these error messages everywhere.
dev_err()gives you much more information thanpr_err()does.
OK. I will use dev_err() instead.
Quoted 2 lines
Same everywhere in this patch series.
Sure.
Thanks
shuo
Re: [PATCH 06/17] virt: acrn: Introduce VM management interfaces
In reply to [email protected]drivers/virt/acrn/hsm.c static int acrn_dev_open(struct inode *inode, struct file *filp) · line 106
Quoted 3 lines · On Tue, Aug 25, 2020 at 10:45:06AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c +3
-0+default : +pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); + ret = -EINVAL ;
Wrong error value here, right?
And you just made a simple way to cause a DoS on the kernel log :(
thanks,
greg k-h
Re: [PATCH 06/17] virt: acrn: Introduce VM management interfaces
Hi Greg,
Quoted 6 lines · Greg Kroah-Hartman
drivers/virt/acrn/hsm.c static int acrn_dev_open(struct inode *inode, struct file *filp) · line 106
Quoted 3 lines · On Tue, Aug 25, 2020 at 10:45:06AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c +3
-0+default : +pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); + ret = -EINVAL ;Wrong error value here, right?
Right, it should be -ENOIOCTLCMD.
However, i found many instances in kernel drivers return -EINVAL for no ioctl command support. :)
Quoted 2 lines
And you just made a simple way to cause a DoS on the kernel log :(
Oh, let me remove the warn log.
Thanks
shuo
Re: [PATCH 06/17] virt: acrn: Introduce VM management interfaces
Quoted 11 lines · Shuo A Liu
Hi Greg,
Quoted 6 lines · Greg Kroah-Hartman
drivers/virt/acrn/hsm.c static int acrn_dev_open(struct inode *inode, struct file *filp) · line 106
Quoted 3 lines · On Tue, Aug 25, 2020 at 10:45:06AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c +3
-0+default : +pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); + ret = -EINVAL ;Wrong error value here, right?
Right, it should be
-ENOIOCTLCMD.
It could, but really, just return the correct error for this, to prevent the core from having to do the conversion.
The reviewers at Intel who should have read this before submitting it, know the correct value to return for an illegal ioctl, please go ask them.
Quoted 2 lines
However, i found many instances in kernel drivers return
-EINVALfor no ioctl command support. :)
Then they too are wrong. No need to add known bugs before the code is accepted.
See the comments above the is_unrecognized_ioctl() in block/ioctl.c for all of the details and why -EINVAL is not the correct thing to do here.
thanks,
greg k-h
Re: [PATCH 06/17] virt: acrn: Introduce VM management interfaces
Hi Greg,
Quoted 18 lines · Greg Kroah-Hartman
Quoted 9 lines · Shuo A Liu
Quoted 6 lines · Greg Kroah-Hartman
drivers/virt/acrn/hsm.c static int acrn_dev_open(struct inode *inode, struct file *filp) · line 106
Quoted 3 lines · On Tue, Aug 25, 2020 at 10:45:06AM +0800, [email protected] wrote:
drivers/virt/acrn/hsm.c +3
-0+default : +pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); + ret = -EINVAL ;Wrong error value here, right?
Right, it should be
-ENOIOCTLCMD.It could, but really, just return the correct error for this, to prevent the core from having to do the conversion.
The reviewers at Intel who should have read this before submitting it, know the correct value to return for an illegal ioctl, please go ask them.
Quoted 8 lines
Quoted 2 lines
However, i found many instances in kernel drivers return
-EINVALfor no ioctl command support. :)Then they too are wrong. No need to add known bugs before the code is accepted.
See the comments above the
is_unrecognized_ioctl()inblock/ioctl.cfor all of the details and why-EINVALis not the correct thing to do here.
Thanks for the information. -ENOTTY will be used.
Thanks
shuo
PATCH 7/17 virt: acrn: Introduce an ioctl to set vCPU registers state
In reply to [email protected]From: Shuo Liu <[email protected]>
A virtual CPU of User VM has different context due to the different registers state. ACRN userspace needs to set the virtual CPU registers state (e.g. giving a initial registers state to a virtual BSP of a User VM).
HSM provides an ioctl ACRN_IOCTL_SET_VCPU_REGS to do the virtual CPU registers state setting. The ioctl passes the registers state from ACRN userspace to the hypervisor directly.
--- drivers/virt/acrn/hsm.c | 13 +++++++ drivers/virt/acrn/hypercall.h | 13 +++++++ include/uapi/linux/acrn.h | 71 +++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+)
drivers/virt/acrn/hsm.c +13 -0
@@ -11,6 +11,7 @@#define pr_fmt (fmt) "acrn: " fmt +#include <linux/io.h> #include <linux/miscdevice.h> #include <linux/mm.h> #include <linux/module.h>
@@ -47,6 +48,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, {struct acrn_vm *vm = filp->private_data;struct acrn_vm_creation *vm_param; +struct acrn_vcpu_regs *cpu_regs;int ret =0 ;if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {
@@ -101,6 +103,17 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,case ACRN_IOCTL_DESTROY_VM : ret =acrn_vm_destroy (vm);break ; +case ACRN_IOCTL_SET_VCPU_REGS : + cpu_regs =memdup_user ((void __user *)ioctl_param, +sizeof (struct acrn_vcpu_regs )); +if (IS_ERR (cpu_regs)) +return PTR_ERR (cpu_regs); + + ret =hcall_set_vcpu_regs (vm->vmid,virt_to_phys (cpu_regs)); +if (ret <0 ) +pr_err ("Failed to set regs state of VM%u!\n" , vm->vmid); +kfree (cpu_regs); +break ;default :pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); ret = -EINVAL ;
drivers/virt/acrn/hypercall.h +13 -0
@@ -22,6 +22,7 @@#define HC_START_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x02)#define HC_PAUSE_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x03)#define HC_RESET_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x05) +#define HC_SET_VCPU_REGS _HC_ID(HC_ID, HC_ID_VM_BASE + 0x06)/** * hcall_get_api_version() - Get API version from hypervisor
@@ -89,4 +90,16 @@ static inline long hcall_reset_vm(u64 vmid) return acrn_hypercall1(HC_RESET_VM, vmid); } +/** +* hcall_set_vcpu_regs() - Set up registers of virtual CPU of a User VM +* @vmid: User VM ID +* @regs_state: Service VM GPA of registers state +* +* Return: 0 on success, <0 on failure +*/ +static inline long hcall_set_vcpu_regs (u64 vmid,u64 regs_state) +{ +return acrn_hypercall2 (HC_SET_VCPU_REGS , vmid, regs_state); +} +#endif /* __ACRN_HSM_HYPERCALL_H */
include/uapi/linux/acrn.h +71 -0
82 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 8/17 virt: acrn: Introduce EPT mapping management
In reply to [email protected]From: Shuo Liu <[email protected]>
The HSM provides hypervisor services to the ACRN userspace. While launching a User VM, ACRN userspace needs to allocate memory and request the ACRN Hypervisor to set up the EPT mapping for the VM.
A mapping cache is introduced for accelerating the translation between the Service VM kernel virtual address and User VM physical address.
From the perspective of the hypervisor, the types of GPA of User VM can be listed as following:
1) RAM region, which is used by User VM as system ram.
2) MMIO region, which is recognized by User VM as MMIO. MMIO region is used to be utilized for devices emulation.
Generally, User VM RAM regions mapping is set up before VM started and is released in the User VM destruction. MMIO regions mapping may be set and unset dynamically during User VM running.
To achieve this, ioctls ACRN_IOCTL_SET_MEMSEG and ACRN_IOCTL_UNSET_MEMSEG are introduced in HSM.
--- drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 98 ++++++++++- drivers/virt/acrn/hsm.c | 15 ++ drivers/virt/acrn/hypercall.h | 14 ++ drivers/virt/acrn/mm.c | 298 ++++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 4 + include/uapi/linux/acrn.h | 51 ++++++ 7 files changed, 472 insertions(+), 10 deletions(-) create mode 100644 drivers/virt/acrn/mm.c
drivers/virt/acrn/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o vm.o +acrn-y := hsm.o vm.o mm.o
drivers/virt/acrn/acrn_drv.h +89 -9
116 lines not on this page · raw message
drivers/virt/acrn/hsm.c +15 -0
@@ -49,6 +49,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_vm *vm = filp->private_data;struct acrn_vm_creation *vm_param;struct acrn_vcpu_regs *cpu_regs; +struct acrn_vm_memmap memmap;int ret =0 ;if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {
@@ -114,6 +115,20 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,pr_err ("Failed to set regs state of VM%u!\n" , vm->vmid);kfree (cpu_regs);break ; +case ACRN_IOCTL_SET_MEMSEG : +if (copy_from_user (&memmap, (void __user *)ioctl_param, +sizeof (memmap))) +return -EFAULT ; + + ret =acrn_vm_memseg_map (vm, &memmap); +break ; +case ACRN_IOCTL_UNSET_MEMSEG : +if (copy_from_user (&memmap, (void __user *)ioctl_param, +sizeof (memmap))) +return -EFAULT ; + + ret =acrn_vm_memseg_unmap (vm, &memmap); +break ;default :pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); ret = -EINVAL ;
drivers/virt/acrn/hypercall.h +14 -0
@@ -24,6 +24,9 @@#define HC_RESET_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x05)#define HC_SET_VCPU_REGS _HC_ID(HC_ID, HC_ID_VM_BASE + 0x06) +#define HC_ID_MEM_BASE 0x40UL +#define HC_VM_SET_MEMORY_REGIONS _HC_ID(HC_ID, HC_ID_MEM_BASE + 0x02) +/** * hcall_get_api_version() - Get API version from hypervisor * @api_version: Service VM GPA of version info
@@ -102,4 +105,15 @@ static inline long hcall_set_vcpu_regs(u64 vmid, u64 regs_state) return acrn_hypercall2(HC_SET_VCPU_REGS, vmid, regs_state); } +/** +* hcall_set_memory_regions() - Inform the hypervisor to set up EPT mappings +* @regions_pa: Service VM GPA of &struct vm_memory_region_batch +* +* Return: 0 on success, <0 on failure +*/ +static inline long hcall_set_memory_regions (u64 regions_pa) +{ +return acrn_hypercall1 (HC_VM_SET_MEMORY_REGIONS , regions_pa); +} +#endif /* __ACRN_HSM_HYPERCALL_H */
drivers/virt/acrn/mm.c new file +298 -0
298 lines not on this page · raw message
drivers/virt/acrn/vm.c +4 -0
@@ -30,6 +30,7 @@ struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,return NULL ; } +mutex_init (&vm->regions_mapping_lock); vm->vmid = vm_param->vmid; vm->vcpu_num = vm_param->vcpu_num;
@@ -60,6 +61,9 @@ int acrn_vm_destroy(struct acrn_vm *vm)clear_bit (ACRN_VM_FLAG_DESTROYED , &vm->flags);return ret; } + +acrn_vm_all_ram_unmap (vm); +pr_debug ("VM %u destroyed.\n" , vm->vmid); vm->vmid =ACRN_INVALID_VMID ;return 0 ;
include/uapi/linux/acrn.h +51 -0
61 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 9/17 virt: acrn: Introduce I/O request management
In reply to [email protected]From: Shuo Liu <[email protected]>
An I/O request of a User VM, which is constructed by the hypervisor, is distributed by the ACRN Hypervisor Service Module to an I/O client corresponding to the address range of the I/O request.
For each User VM, there is a shared 4-KByte memory region used for I/O requests communication between the hypervisor and Service VM. An I/O request is a 256-byte structure buffer, which is 'struct acrn_io_request', that is filled by an I/O handler of the hypervisor when a trapped I/O access happens in a User VM. ACRN userspace in the Service VM first allocates a 4-KByte page and passes the GPA (Guest Physical Address) of the buffer to the hypervisor. The buffer is used as an array of 16 I/O request slots with each I/O request slot being 256 bytes. This array is indexed by vCPU ID.
An I/O client, which is 'struct acrn_ioreq_client', is responsible for handling User VM I/O requests whose accessed GPA falls in a certain range. Multiple I/O clients can be associated with each User VM. There is a special client associated with each User VM, called the default client, that handles all I/O requests that do not fit into the range of any other I/O clients. The ACRN userspace acts as the default client for each User VM.
The state transitions of a ACRN I/O request are as follows.
FREE -> PENDING -> PROCESSING -> COMPLETE -> FREE -> ...
FREE: this I/O request slot is empty
PENDING: a valid I/O request is pending in this slot
PROCESSING: the I/O request is being processed
COMPLETE: the I/O request has been processed
An I/O request in COMPLETE or FREE state is owned by the hypervisor. HSM and ACRN userspace are in charge of processing the others.
The processing flow of I/O requests are listed as following:
a) The I/O handler of the hypervisor will fill an I/O request with PENDING state when a trapped I/O access happens in a User VM.
b) The hypervisor makes an upcall, which is a notification interrupt, to the Service VM.
c) The upcall handler schedules a tasklet to dispatch I/O requests.
d) The tasklet looks for the PENDING I/O requests, assigns them to different registered clients based on the address of the I/O accesses, updates their state to PROCESSING, and notifies the corresponding client to handle.
e) The notified client handles the assigned I/O requests.
f) The HSM updates I/O requests states to COMPLETE and notifies the hypervisor of the completion via hypercalls.
--- drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 80 ++++++ drivers/virt/acrn/hsm.c | 26 ++ drivers/virt/acrn/hypercall.h | 28 ++ drivers/virt/acrn/ioreq.c | 503 ++++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 10 + include/uapi/linux/acrn.h | 134 +++++++++ 7 files changed, 782 insertions(+), 1 deletion(-) create mode 100644 drivers/virt/acrn/ioreq.c
drivers/virt/acrn/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o vm.o mm.o +acrn-y := hsm.o vm.o mm.o ioreq.o
drivers/virt/acrn/acrn_drv.h +80 -0
115 lines not on this page · raw message
drivers/virt/acrn/hsm.c +26 -0
@@ -49,6 +49,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_vm *vm = filp->private_data;struct acrn_vm_creation *vm_param;struct acrn_vcpu_regs *cpu_regs; +struct acrn_ioreq_notify notify;struct acrn_vm_memmap memmap;int ret =0 ;
@@ -129,6 +130,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, ret =acrn_vm_memseg_unmap (vm, &memmap);break ; +case ACRN_IOCTL_CREATE_IOREQ_CLIENT : +if (vm->default_client) +return -EEXIST ; +if (!acrn_ioreq_client_create (vm,NULL ,NULL , true,"acrndm" )) + ret = -EFAULT ; +break ; +case ACRN_IOCTL_DESTROY_IOREQ_CLIENT : +if (vm->default_client) +acrn_ioreq_client_destroy (vm->default_client); +break ; +case ACRN_IOCTL_ATTACH_IOREQ_CLIENT : +if (vm->default_client) + ret =acrn_ioreq_client_wait (vm->default_client); +break ; +case ACRN_IOCTL_NOTIFY_REQUEST_FINISH : +if (copy_from_user (¬ify, (void __user *)ioctl_param, +sizeof (struct acrn_ioreq_notify ))) +return -EFAULT ; + ret =acrn_ioreq_request_default_complete (vm, notify.vcpu); +break ; +case ACRN_IOCTL_CLEAR_VM_IOREQ : +acrn_ioreq_request_clear (vm); +break ;default :pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); ret = -EINVAL ;
@@ -184,11 +208,13 @@ static int __init hsm_init(void)return ret; } +acrn_ioreq_intr_setup ();return 0 ; } static void __exit hsm_exit(void) { +acrn_ioreq_intr_remove ();misc_deregister (&acrn_dev); }module_init (hsm_init);
drivers/virt/acrn/hypercall.h +28 -0
@@ -24,6 +24,10 @@#define HC_RESET_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x05)#define HC_SET_VCPU_REGS _HC_ID(HC_ID, HC_ID_VM_BASE + 0x06) +#define HC_ID_IOREQ_BASE 0x30UL +#define HC_SET_IOREQ_BUFFER _HC_ID(HC_ID, HC_ID_IOREQ_BASE + 0x00) +#define HC_NOTIFY_REQUEST_FINISH _HC_ID(HC_ID, HC_ID_IOREQ_BASE + 0x01) +#define HC_ID_MEM_BASE 0x40UL#define HC_VM_SET_MEMORY_REGIONS _HC_ID(HC_ID, HC_ID_MEM_BASE + 0x02)
@@ -105,6 +109,30 @@ static inline long hcall_set_vcpu_regs(u64 vmid, u64 regs_state)return acrn_hypercall2 (HC_SET_VCPU_REGS , vmid, regs_state); } +/** +* hcall_set_ioreq_buffer() - Set up the shared buffer for I/O Requests. +* @vmid: User VM ID +* @buffer: Service VM GPA of the shared buffer +* +* Return: 0 on success, <0 on failure +*/ +static inline long hcall_set_ioreq_buffer (u64 vmid,u64 buffer) +{ +return acrn_hypercall2 (HC_SET_IOREQ_BUFFER , vmid, buffer); +} + +/** +* hcall_notify_req_finish() - Notify ACRN Hypervisor of I/O request completion. +* @vmid: User VM ID +* @vcpu: The vCPU which initiated the I/O request +* +* Return: 0 on success, <0 on failure +*/ +static inline long hcall_notify_req_finish (u64 vmid,u64 vcpu) +{ +return acrn_hypercall2 (HC_NOTIFY_REQUEST_FINISH , vmid, vcpu); +} +/** * hcall_set_memory_regions() - Inform the hypervisor to set up EPT mappings * @regions_pa: Service VM GPA of &struct vm_memory_region_batch
drivers/virt/acrn/ioreq.c new file +503 -0
503 lines not on this page · raw message
drivers/virt/acrn/vm.c +10 -0
@@ -31,9 +31,17 @@ struct acrn_vm *acrn_vm_create(struct acrn_vm *vm, }mutex_init (&vm->regions_mapping_lock); +INIT_LIST_HEAD (&vm->ioreq_clients); +spin_lock_init (&vm->ioreq_clients_lock); vm->vmid = vm_param->vmid; vm->vcpu_num = vm_param->vcpu_num; +if (acrn_ioreq_init (vm, vm_param->ioreq_buf) <0 ) { +hcall_destroy_vm (vm_param->vmid); + vm->vmid =ACRN_INVALID_VMID ; +return NULL ; + } +write_lock_bh (&acrn_vm_list_lock);list_add (&vm->list, &acrn_vm_list);write_unlock_bh (&acrn_vm_list_lock);
@@ -55,6 +63,8 @@ int acrn_vm_destroy(struct acrn_vm *vm)list_del_init (&vm->list);write_unlock_bh (&acrn_vm_list_lock); +acrn_ioreq_deinit (vm); + ret =hcall_destroy_vm (vm->vmid);if (ret <0 ) {pr_err ("Failed to destroy VM %u\n" , vm->vmid);
include/uapi/linux/acrn.h +134 -0
146 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 10/17 virt: acrn: Introduce PCI configuration space PIO accesses combiner
In reply to [email protected]From: Shuo Liu <[email protected]>
A User VM can access its virtual PCI configuration spaces via port IO approach, which has two following steps:
1) writes address into port 0xCF8
2) put/get data in/from port 0xCFC
To distribute a complete PCI configuration space access one time, HSM need to combine such two accesses together.
Combine two paired PIO I/O requests into one PCI I/O request and continue the I/O request distribution.
--- drivers/virt/acrn/acrn_drv.h | 2 + drivers/virt/acrn/ioreq.c | 76 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 15 +++++++ 3 files changed, 93 insertions(+)
drivers/virt/acrn/acrn_drv.h +2 -0
@@ -152,6 +152,7 @@ extern rwlock_t acrn_vm_list_lock;* @default_client: The default I/O request client * @ioreq_buf: I/O request shared buffer * @ioreq_page: The page of the I/O request shared buffer +* @pci_conf_addr: Address of a PCI configuration access emulation */ struct acrn_vm {struct list_head list;
@@ -166,6 +167,7 @@ struct acrn_vm {struct acrn_ioreq_client *default_client;struct acrn_io_request_buffer *ioreq_buf;struct page *ioreq_page; +u32 pci_conf_addr; }; struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,
drivers/virt/acrn/ioreq.c +76 -0
88 lines not on this page · raw message
include/uapi/linux/acrn.h +15 -0
@@ -20,6 +20,7 @@#define ACRN_IOREQ_TYPE_PORTIO 0#define ACRN_IOREQ_TYPE_MMIO 1 +#define ACRN_IOREQ_TYPE_PCICFG 2#define ACRN_IOREQ_DIR_READ 0#define ACRN_IOREQ_DIR_WRITE 1
@@ -40,6 +41,18 @@ struct acrn_pio_request {__u32 value; } __attribute__((aligned(8))); +/* Need keep same header fields with pio_request */ +struct acrn_pci_request { +__u32 direction; +__u32 reserved[3 ]; +__u64 size; +__u32 value; +__u32 bus; +__u32 dev; +__u32 func; +__u32 reg; +} __attribute__((aligned (8 ))); +/** * struct acrn_io_request - 256-byte ACRN I/O request * @type: Type of this request (ACRN_IOREQ_TYPE_*).
@@ -48,6 +61,7 @@ struct acrn_pio_request {* @reserved0: Reserved fields. * @reqs: Union of different types of request. Byte offset: 64. * @reqs.pio_request: PIO request data of the I/O request. +* @reqs.pci_request: PCI configuration space request data of the I/O request. * @reqs.mmio_request: MMIO request data of the I/O request. * @reqs.data: Raw data of the I/O request. * @reserved1: Reserved fields.
@@ -107,6 +121,7 @@ struct acrn_io_request {__u32 reserved0[14 ];union {struct acrn_pio_request pio_request; +struct acrn_pci_request pci_request;struct acrn_mmio_request mmio_request;__u64 data[8 ]; } reqs;
Signature · 1 line
2.28.0
PATCH 11/17 virt: acrn: Introduce interfaces for PCI device passthrough
In reply to [email protected]From: Shuo Liu <[email protected]>
PCI device passthrough enables an OS in a virtual machine to directly access a PCI device in the host. It promises almost the native performance, which is required in performance-critical scenarios of ACRN.
HSM provides the following ioctls:
- Assign - ACRN_IOCTL_ASSIGN_PCIDEV
Pass data struct acrn_pcidev from userspace to the hypervisor, and inform the hypervisor to assign a PCI device to a User VM.
- De-assign - ACRN_IOCTL_DEASSIGN_PCIDEV
Pass data struct acrn_pcidev from userspace to the hypervisor, and inform the hypervisor to de-assign a PCI device from a User VM.
- Set a interrupt of a passthrough device - ACRN_IOCTL_SET_PTDEV_INTR Pass data struct acrn_ptdev_irq from userspace to the hypervisor, and inform the hypervisor to map a INTx interrupt of passthrough device of User VM.
- Reset passthrough device interrupt - ACRN_IOCTL_RESET_PTDEV_INTR Pass data struct acrn_ptdev_irq from userspace to the hypervisor, and inform the hypervisor to unmap a INTx interrupt of passthrough device of User VM.
--- drivers/virt/acrn/hsm.c | 46 +++++++++++++++++++++++++ drivers/virt/acrn/hypercall.h | 54 ++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 63 +++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+)
drivers/virt/acrn/hsm.c +46 -0
@@ -50,7 +50,9 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_vm_creation *vm_param;struct acrn_vcpu_regs *cpu_regs;struct acrn_ioreq_notify notify; +struct acrn_ptdev_irq *irq_info;struct acrn_vm_memmap memmap; +struct acrn_pcidev *pcidev;int ret =0 ;if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {
@@ -130,6 +132,50 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, ret =acrn_vm_memseg_unmap (vm, &memmap);break ; +case ACRN_IOCTL_ASSIGN_PCIDEV : + pcidev =memdup_user ((void __user *)ioctl_param, +sizeof (struct acrn_pcidev )); +if (IS_ERR (pcidev)) +return PTR_ERR (pcidev); + + ret =hcall_assign_pcidev (vm->vmid,virt_to_phys (pcidev)); +if (ret <0 ) +pr_err ("Failed to assign pci device!\n" ); +kfree (pcidev); +break ; +case ACRN_IOCTL_DEASSIGN_PCIDEV : + pcidev =memdup_user ((void __user *)ioctl_param, +sizeof (struct acrn_pcidev )); +if (IS_ERR (pcidev)) +return PTR_ERR (pcidev); + + ret =hcall_deassign_pcidev (vm->vmid,virt_to_phys (pcidev)); +if (ret <0 ) +pr_err ("Failed to deassign pci device!\n" ); +kfree (pcidev); +break ; +case ACRN_IOCTL_SET_PTDEV_INTR : + irq_info =memdup_user ((void __user *)ioctl_param, +sizeof (struct acrn_ptdev_irq )); +if (IS_ERR (irq_info)) +return PTR_ERR (irq_info); + + ret =hcall_set_ptdev_intr (vm->vmid,virt_to_phys (irq_info)); +if (ret <0 ) +pr_err ("Failed to configure intr for ptdev!\n" ); +kfree (irq_info); +break ; +case ACRN_IOCTL_RESET_PTDEV_INTR : + irq_info =memdup_user ((void __user *)ioctl_param, +sizeof (struct acrn_ptdev_irq )); +if (IS_ERR (irq_info)) +return PTR_ERR (irq_info); + + ret =hcall_reset_ptdev_intr (vm->vmid,virt_to_phys (irq_info)); +if (ret <0 ) +pr_err ("Failed to reset intr for ptdev!\n" ); +kfree (irq_info); +break ;case ACRN_IOCTL_CREATE_IOREQ_CLIENT :if (vm->default_client)return -EEXIST ;
drivers/virt/acrn/hypercall.h +54 -0
64 lines not on this page · raw message
include/uapi/linux/acrn.h +63 -0
73 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 12/17 virt: acrn: Introduce interrupt injection interfaces
In reply to [email protected]From: Shuo Liu <[email protected]>
ACRN userspace need to inject virtual interrupts into a User VM in devices emulation.
HSM needs provide interfaces to do so.
Introduce following interrupt injection interfaces:
ioctl ACRN_IOCTL_SET_IRQLINE:
Pass data from userspace to the hypervisor, and inform the hypervisor to inject a virtual IOAPIC GSI interrupt to a User VM.
ioctl ACRN_IOCTL_INJECT_MSI:
Pass data struct acrn_msi_entry from userspace to the hypervisor, and inform the hypervisor to inject a virtual MSI to a User VM.
ioctl ACRN_IOCTL_VM_INTR_MONITOR:
Set a 4-Kbyte aligned shared page for statistics information of interrupts of a User VM.
--- drivers/virt/acrn/acrn_drv.h | 4 ++++ drivers/virt/acrn/hsm.c | 35 ++++++++++++++++++++++++++++++ drivers/virt/acrn/hypercall.h | 41 +++++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 35 ++++++++++++++++++++++++++++++ include/uapi/linux/acrn.h | 17 +++++++++++++++ 5 files changed, 132 insertions(+)
drivers/virt/acrn/acrn_drv.h +4 -0
@@ -153,6 +153,7 @@ extern rwlock_t acrn_vm_list_lock;* @ioreq_buf: I/O request shared buffer * @ioreq_page: The page of the I/O request shared buffer * @pci_conf_addr: Address of a PCI configuration access emulation +* @monitor_page: Page of interrupt statistics of User VM */ struct acrn_vm {struct list_head list;
@@ -168,6 +169,7 @@ struct acrn_vm {struct acrn_io_request_buffer *ioreq_buf;struct page *ioreq_page;u32 pci_conf_addr; +struct page *monitor_page; }; struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,
@@ -194,4 +196,6 @@ struct acrn_ioreq_client *acrn_ioreq_client_create(struct acrn_vm *vm, const char *name);void acrn_ioreq_client_destroy (struct acrn_ioreq_client *client); +int acrn_msi_inject (u16 vmid,u64 msi_addr,u64 msi_data); +#endif /* __ACRN_HSM_DRV_H */
drivers/virt/acrn/hsm.c +35 -0
@@ -52,7 +52,9 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_ioreq_notify notify;struct acrn_ptdev_irq *irq_info;struct acrn_vm_memmap memmap; +struct acrn_msi_entry *msi;struct acrn_pcidev *pcidev; +struct page *page;int ret =0 ;if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {
@@ -176,6 +178,39 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,pr_err ("Failed to reset intr for ptdev!\n" );kfree (irq_info);break ; +case ACRN_IOCTL_SET_IRQLINE : + ret =hcall_set_irqline (vm->vmid, ioctl_param); +if (ret <0 ) +pr_err ("Failed to set interrupt line!\n" ); +break ; +case ACRN_IOCTL_INJECT_MSI : + msi =memdup_user ((void __user *)ioctl_param, +sizeof (struct acrn_msi_entry )); +if (IS_ERR (msi)) +return PTR_ERR (msi); + + ret =hcall_inject_msi (vm->vmid,virt_to_phys (msi)); +if (ret <0 ) +pr_err ("Failed to inject MSI!\n" ); +kfree (msi); +break ; +case ACRN_IOCTL_VM_INTR_MONITOR : + ret =get_user_pages_fast (ioctl_param,1 ,FOLL_WRITE , &page); +if (unlikely (ret !=1 )) { +pr_err ("Failed to pin intr hdr buffer!\n" ); +return -ENOMEM ; + } + + ret =hcall_vm_intr_monitor (vm->vmid,page_to_phys (page)); +if (ret <0 ) { +put_page (page); +pr_err ("Failed to monitor intr data!\n" ); +return ret; + } +if (vm->monitor_page) +put_page (vm->monitor_page); + vm->monitor_page = page; +break ;case ACRN_IOCTL_CREATE_IOREQ_CLIENT :if (vm->default_client)return -EEXIST ;
drivers/virt/acrn/hypercall.h +41 -0
53 lines not on this page · raw message
drivers/virt/acrn/vm.c +35 -0
@@ -64,6 +64,10 @@ int acrn_vm_destroy(struct acrn_vm *vm)write_unlock_bh (&acrn_vm_list_lock);acrn_ioreq_deinit (vm); +if (vm->monitor_page) { +put_page (vm->monitor_page); + vm->monitor_page =NULL ; + } ret =hcall_destroy_vm (vm->vmid);if (ret <0 ) {
@@ -78,3 +82,34 @@ int acrn_vm_destroy(struct acrn_vm *vm) vm->vmid =ACRN_INVALID_VMID ;return 0 ; } + +/** +* acrn_inject_msi() - Inject a MSI interrupt into a User VM +* @vmid: User VM ID +* @msi_addr: The MSI address +* @msi_data: The MSI data +* +* Return: 0 on success, <0 on error +*/ +int acrn_msi_inject (u16 vmid,u64 msi_addr,u64 msi_data) +{ +struct acrn_msi_entry *msi; +int ret; + +/* might be used in interrupt context, so use GFP_ATOMIC */ + msi =kzalloc (sizeof (*msi),GFP_ATOMIC ); +if (!msi) +return -ENOMEM ; + +/* +* msi_addr: addr[19:12] with dest vcpu id +* msi_data: data[7:0] with vector +*/ + msi->msi_addr = msi_addr; + msi->msi_data = msi_data; + ret =hcall_inject_msi (vmid,virt_to_phys (msi)); +if (ret <0 ) +pr_err ("Failed to inject MSI to VM %u!\n" , vmid); +kfree (msi); +return ret; +}
include/uapi/linux/acrn.h +17 -0
@@ -353,6 +353,16 @@ struct acrn_pcidev {__u32 reserved[6 ]; } __attribute__((aligned(8))); +/** +* struct acrn_msi_entry - Info for injecting a MSI interrupt to a VM +* @msi_addr: MSI addr[19:12] with dest vCPU ID +* @msi_data: MSI data[7:0] with vector +*/ +struct acrn_msi_entry { +__u64 msi_addr; +__u64 msi_data; +}; +/* The ioctl type, documented in ioctl-number.rst */ #define ACRN_IOCTL_TYPE 0xA2
@@ -375,6 +385,13 @@ struct acrn_pcidev {#define ACRN_IOCTL_SET_VCPU_REGS \ _IOW(ACRN_IOCTL_TYPE, 0x16, struct acrn_vcpu_regs) +#define ACRN_IOCTL_INJECT_MSI \ + _IOW(ACRN_IOCTL_TYPE, 0x23, struct acrn_msi_entry) +#define ACRN_IOCTL_VM_INTR_MONITOR \ + _IOW(ACRN_IOCTL_TYPE, 0x24, unsigned long) +#define ACRN_IOCTL_SET_IRQLINE \ + _IOW(ACRN_IOCTL_TYPE, 0x25, __u64) +#define ACRN_IOCTL_NOTIFY_REQUEST_FINISH \ _IOW(ACRN_IOCTL_TYPE, 0x31, struct acrn_ioreq_notify)#define ACRN_IOCTL_CREATE_IOREQ_CLIENT \
Signature · 1 line
2.28.0
PATCH 13/17 virt: acrn: Introduce interfaces to query C-states and P-states allowed by hypervisor
In reply to [email protected]From: Shuo Liu <[email protected]>
The C-states and P-states data are used to support CPU power management. The hypervisor controls C-states and P-states for a User VM.
ACRN userspace need to query the data from the hypervisor to build ACPI tables for a User VM.
HSM provides ioctls for ACRN userspace to query C-states and P-states data obtained from the hypervisor.
--- drivers/virt/acrn/hsm.c | 69 +++++++++++++++++++++++++++++++++++ drivers/virt/acrn/hypercall.h | 12 ++++++ include/uapi/linux/acrn.h | 35 ++++++++++++++++++ 3 files changed, 116 insertions(+)
drivers/virt/acrn/hsm.c +69 -0
@@ -43,6 +43,67 @@ static int acrn_dev_open(struct inode *inode, struct file *filp)return 0 ; } +static int pmcmd_ioctl (u64 cmd,void __user *uptr) +{ +struct acrn_pstate_data *px_data; +struct acrn_cstate_data *cx_data; +u64 *pm_info; +int ret =0 ; + +switch (cmd &PMCMD_TYPE_MASK ) { +case ACRN_PMCMD_GET_PX_CNT : +case ACRN_PMCMD_GET_CX_CNT : + pm_info =kmalloc (sizeof (u64),GFP_KERNEL ); +if (!pm_info) +return -ENOMEM ; + + ret =hcall_get_cpu_state (cmd,virt_to_phys (pm_info)); +if (ret <0 ) { +kfree (pm_info); +break ; + } + +if (copy_to_user (uptr, pm_info,sizeof (u64))) + ret = -EFAULT ; +kfree (pm_info); +break ; +case ACRN_PMCMD_GET_PX_DATA : + px_data =kmalloc (sizeof (*px_data),GFP_KERNEL ); +if (!px_data) +return -ENOMEM ; + + ret =hcall_get_cpu_state (cmd,virt_to_phys (px_data)); +if (ret <0 ) { +kfree (px_data); +break ; + } + +if (copy_to_user (uptr, px_data,sizeof (*px_data))) + ret = -EFAULT ; +kfree (px_data); +break ; +case ACRN_PMCMD_GET_CX_DATA : + cx_data =kmalloc (sizeof (*cx_data),GFP_KERNEL ); +if (!cx_data) +return -ENOMEM ; + + ret =hcall_get_cpu_state (cmd,virt_to_phys (cx_data)); +if (ret <0 ) { +kfree (cx_data); +break ; + } + +if (copy_to_user (uptr, cx_data,sizeof (*cx_data))) + ret = -EFAULT ; +kfree (cx_data); +break ; +default : +break ; + } + +return ret; +} +static long acrn_dev_ioctl (struct file *filp,unsigned int cmd,unsigned long ioctl_param) {
@@ -55,6 +116,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_msi_entry *msi;struct acrn_pcidev *pcidev;struct page *page; +u64 cstate_cmd;int ret =0 ;if (cmd ==ACRN_IOCTL_GET_API_VERSION ) {
@@ -234,6 +296,13 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,case ACRN_IOCTL_CLEAR_VM_IOREQ :acrn_ioreq_request_clear (vm);break ; +case ACRN_IOCTL_PM_GET_CPU_STATE : +if (copy_from_user (&cstate_cmd, (void *)ioctl_param, +sizeof (cstate_cmd))) +return -EFAULT ; + + ret =pmcmd_ioctl (cstate_cmd, (void __user *)ioctl_param); +break ;default :pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); ret = -EINVAL ;
drivers/virt/acrn/hypercall.h +12 -0
@@ -42,6 +42,9 @@#define HC_ASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x05)#define HC_DEASSIGN_PCIDEV _HC_ID(HC_ID, HC_ID_PCI_BASE + 0x06) +#define HC_ID_PM_BASE 0x80UL +#define HC_PM_GET_CPU_STATE _HC_ID(HC_ID, HC_ID_PM_BASE + 0x00) +/** * hcall_get_api_version() - Get API version from hypervisor * @api_version: Service VM GPA of version info
@@ -239,4 +242,13 @@ static inline long hcall_reset_ptdev_intr(u64 vmid, u64 irq) return acrn_hypercall2(HC_RESET_PTDEV_INTR, vmid, irq); } +/* +* hcall_get_cpu_state() - Get P-states and C-states info from the hypervisor +* @state: Service VM GPA of buffer of P-states and C-states +*/ +static inline long hcall_get_cpu_state (u64 cmd,u64 state) +{ +return acrn_hypercall2 (HC_PM_GET_CPU_STATE , cmd, state); +} +#endif /* __ACRN_HSM_HYPERCALL_H */
include/uapi/linux/acrn.h +35 -0
@@ -363,6 +363,38 @@ struct acrn_msi_entry {__u64 msi_data; }; +struct acrn_acpi_generic_address { +__u8 space_id; +__u8 bit_width; +__u8 bit_offset; +__u8 access_size; +__u64 address; +} __attribute__ ((__packed__ )); + +struct acrn_cstate_data { +struct acrn_acpi_generic_address cx_reg; +__u8 type; +__u32 latency; +__u64 power; +} __attribute__((aligned (8 ))); + +struct acrn_pstate_data { +__u64 core_frequency; +__u64 power; +__u64 transition_latency; +__u64 bus_master_latency; +__u64 control; +__u64 status; +} __attribute__((aligned (8 ))); + +#define PMCMD_TYPE_MASK 0x000000ff +enum acrn_pm_cmd_type { +ACRN_PMCMD_GET_PX_CNT , +ACRN_PMCMD_GET_PX_DATA , +ACRN_PMCMD_GET_CX_CNT , +ACRN_PMCMD_GET_CX_DATA , +}; +/* The ioctl type, documented in ioctl-number.rst */ #define ACRN_IOCTL_TYPE 0xA2
@@ -417,4 +449,7 @@ struct acrn_msi_entry {#define ACRN_IOCTL_DEASSIGN_PCIDEV \ _IOW(ACRN_IOCTL_TYPE, 0x56, struct acrn_pcidev) +#define ACRN_IOCTL_PM_GET_CPU_STATE \ + _IOWR(ACRN_IOCTL_TYPE, 0x60, __u64) +#endif /* _UAPI_ACRN_H */
Signature · 1 line
2.28.0
PATCH 14/17 virt: acrn: Introduce I/O ranges operation interfaces
In reply to [email protected]From: Shuo Liu <[email protected]>
An I/O request of a User VM, which is constructed by hypervisor, is distributed by the ACRN Hypervisor Service Module to an I/O client corresponding to the address range of the I/O request.
I/O client maintains a list of address ranges. Introduce acrn_ioreq_range_{add,del}() to manage these address ranges.
--- drivers/virt/acrn/acrn_drv.h | 4 +++ drivers/virt/acrn/ioreq.c | 59 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+)
drivers/virt/acrn/acrn_drv.h +4 -0
@@ -195,6 +195,10 @@ struct acrn_ioreq_client *acrn_ioreq_client_create(struct acrn_vm *vm, void *data, bool is_default, const char *name);void acrn_ioreq_client_destroy (struct acrn_ioreq_client *client); +int acrn_ioreq_range_add (struct acrn_ioreq_client *client, +u32 type,u64 start,u64 end); +void acrn_ioreq_range_del (struct acrn_ioreq_client *client, +u32 type,u64 start,u64 end);int acrn_msi_inject (u16 vmid,u64 msi_addr,u64 msi_data);
drivers/virt/acrn/ioreq.c +59 -0
65 lines not on this page · raw message
Signature · 1 line
2.28.0
PATCH 15/17 virt: acrn: Introduce ioeventfd
In reply to [email protected]From: Shuo Liu <[email protected]>
ioeventfd is a mechanism to register PIO/MMIO regions to trigger an eventfd signal when written to by a User VM. ACRN userspace can register any arbitrary I/O address with a corresponding eventfd and then pass the eventfd to a specific end-point of interest for handling.
Vhost is a kernel-level virtio server which uses eventfd for signalling. To support vhost on ACRN, ioeventfd is introduced in HSM.
A new I/O client dedicated to ioeventfd is associated with a User VM during VM creation. HSM provides ioctls to associate an I/O region with a eventfd. The I/O client signals a eventfd once its corresponding I/O region is matched with an I/O request.
--- drivers/virt/acrn/Kconfig | 1 + drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 10 ++ drivers/virt/acrn/hsm.c | 8 + drivers/virt/acrn/ioeventfd.c | 275 ++++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 2 + include/uapi/linux/acrn.h | 29 ++++ 7 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 drivers/virt/acrn/ioeventfd.c
drivers/virt/acrn/Kconfig +1 -0
@@ -2,6 +2,7 @@ config ACRN_HSM tristate "ACRN Hypervisor Service Module" depends on ACRN_GUEST + select EVENTFD help ACRN Hypervisor Service Module (HSM) is a kernel module which communicates with ACRN userspace through ioctls and talks to
drivers/virt/acrn/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o vm.o mm.o ioreq.o +acrn-y := hsm.o vm.o mm.o ioreq.o ioeventfd.o
drivers/virt/acrn/acrn_drv.h +10 -0
@@ -154,6 +154,9 @@ extern rwlock_t acrn_vm_list_lock;* @ioreq_page: The page of the I/O request shared buffer * @pci_conf_addr: Address of a PCI configuration access emulation * @monitor_page: Page of interrupt statistics of User VM +* @ioeventfds_lock: Lock to protect ioeventfds list +* @ioeventfds: List to link all hsm_ioeventfd +* @ioeventfd_client: I/O client for ioeventfds of the VM */ struct acrn_vm {struct list_head list;
@@ -170,6 +173,9 @@ struct acrn_vm {struct page *ioreq_page;u32 pci_conf_addr;struct page *monitor_page; +struct mutex ioeventfds_lock; +struct list_head ioeventfds; +struct acrn_ioreq_client *ioeventfd_client; }; struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,
@@ -202,4 +208,8 @@ void acrn_ioreq_range_del(struct acrn_ioreq_client *client,int acrn_msi_inject (u16 vmid,u64 msi_addr,u64 msi_data); +int acrn_ioeventfd_init (struct acrn_vm *vm); +int acrn_ioeventfd_config (struct acrn_vm *vm,struct acrn_ioeventfd *args); +void acrn_ioeventfd_deinit (struct acrn_vm *vm); +#endif /* __ACRN_HSM_DRV_H */
drivers/virt/acrn/hsm.c +8 -0
@@ -112,6 +112,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_vcpu_regs *cpu_regs;struct acrn_ioreq_notify notify;struct acrn_ptdev_irq *irq_info; +struct acrn_ioeventfd ioeventfd;struct acrn_vm_memmap memmap;struct acrn_msi_entry *msi;struct acrn_pcidev *pcidev;
@@ -303,6 +304,13 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, ret =pmcmd_ioctl (cstate_cmd, (void __user *)ioctl_param);break ; +case ACRN_IOCTL_IOEVENTFD : +if (copy_from_user (&ioeventfd, (void __user *)ioctl_param, +sizeof (ioeventfd))) +return -EFAULT ; + + ret =acrn_ioeventfd_config (vm, &ioeventfd); +break ;default :pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); ret = -EINVAL ;
drivers/virt/acrn/ioeventfd.c new file +275 -0
275 lines not on this page · raw message
drivers/virt/acrn/vm.c +2 -0
@@ -46,6 +46,7 @@ struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,list_add (&vm->list, &acrn_vm_list);write_unlock_bh (&acrn_vm_list_lock); +acrn_ioeventfd_init (vm);pr_debug ("VM %u created.\n" , vm->vmid);return vm; }
@@ -63,6 +64,7 @@ int acrn_vm_destroy(struct acrn_vm *vm)list_del_init (&vm->list);write_unlock_bh (&acrn_vm_list_lock); +acrn_ioeventfd_deinit (vm);acrn_ioreq_deinit (vm);if (vm->monitor_page) {put_page (vm->monitor_page);
include/uapi/linux/acrn.h +29 -0
@@ -395,6 +395,32 @@ enum acrn_pm_cmd_type { ACRN_PMCMD_GET_CX_DATA, }; +#define ACRN_IOEVENTFD_FLAG_PIO 0x01 +#define ACRN_IOEVENTFD_FLAG_DATAMATCH 0x02 +#define ACRN_IOEVENTFD_FLAG_DEASSIGN 0x04 +/** +* struct acrn_ioeventfd - Data to operate a &struct hsm_ioeventfd +* @fd: The fd of eventfd associated with a hsm_ioeventfd +* @flags: Logical-OR of ACRN_IOEVENTFD_FLAG_* +* @addr: The start address of IO range of ioeventfd +* @len: The length of IO range of ioeventfd +* @reserved: Reserved +* @data: Data for data matching +* +* Without flag ACRN_IOEVENTFD_FLAG_DEASSIGN, ioctl ACRN_IOCTL_IOEVENTFD +* creates a &struct hsm_ioeventfd with properties originated from &struct +* acrn_ioeventfd. With flag ACRN_IOEVENTFD_FLAG_DEASSIGN, ioctl +* ACRN_IOCTL_IOEVENTFD destroys the &struct hsm_ioeventfd matching the fd. +*/ +struct acrn_ioeventfd { +__u32 fd; +__u32 flags; +__u64 addr; +__u32 len; +__u32 reserved; +__u64 data; +}; +/* The ioctl type, documented in ioctl-number.rst */ #define ACRN_IOCTL_TYPE 0xA2
@@ -452,4 +478,7 @@ enum acrn_pm_cmd_type {#define ACRN_IOCTL_PM_GET_CPU_STATE \ _IOWR(ACRN_IOCTL_TYPE, 0x60, __u64) +#define ACRN_IOCTL_IOEVENTFD \ + _IOW(ACRN_IOCTL_TYPE, 0x70, struct acrn_ioeventfd) +#endif /* _UAPI_ACRN_H */
Signature · 1 line
2.28.0
PATCH 16/17 virt: acrn: Introduce irqfd
In reply to [email protected]From: Shuo Liu <[email protected]>
irqfd is a mechanism to inject a specific interrupt to a User VM using a decoupled eventfd mechanism.
Vhost is a kernel-level virtio server which uses eventfd for interrupt injection. To support vhost on ACRN, irqfd is introduced in HSM.
HSM provides ioctls to associate a virtual Message Signaled Interrupt (MSI) with an eventfd. The corresponding virtual MSI will be injected into a User VM once the eventfd got signal.
--- drivers/virt/acrn/Makefile | 2 +- drivers/virt/acrn/acrn_drv.h | 10 ++ drivers/virt/acrn/hsm.c | 7 ++ drivers/virt/acrn/irqfd.c | 236 +++++++++++++++++++++++++++++++++++ drivers/virt/acrn/vm.c | 3 + include/uapi/linux/acrn.h | 15 +++ 6 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 drivers/virt/acrn/irqfd.c
drivers/virt/acrn/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ACRN_HSM) := acrn.o -acrn-y := hsm.o vm.o mm.o ioreq.o ioeventfd.o +acrn-y := hsm.o vm.o mm.o ioreq.o ioeventfd.o irqfd.o
drivers/virt/acrn/acrn_drv.h +10 -0
@@ -157,6 +157,9 @@ extern rwlock_t acrn_vm_list_lock;* @ioeventfds_lock: Lock to protect ioeventfds list * @ioeventfds: List to link all hsm_ioeventfd * @ioeventfd_client: I/O client for ioeventfds of the VM +* @irqfds_lock: Lock to protect irqfds list +* @irqfds: List to link all hsm_irqfd +* @irqfd_wq: Workqueue for irqfd async shutdown */ struct acrn_vm {struct list_head list;
@@ -176,6 +179,9 @@ struct acrn_vm {struct mutex ioeventfds_lock;struct list_head ioeventfds;struct acrn_ioreq_client *ioeventfd_client; +struct mutex irqfds_lock; +struct list_head irqfds; +struct workqueue_struct *irqfd_wq; }; struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,
@@ -212,4 +218,8 @@ int acrn_ioeventfd_init(struct acrn_vm *vm);int acrn_ioeventfd_config (struct acrn_vm *vm,struct acrn_ioeventfd *args);void acrn_ioeventfd_deinit (struct acrn_vm *vm); +int acrn_irqfd_init (struct acrn_vm *vm); +int acrn_irqfd_config (struct acrn_vm *vm,struct acrn_irqfd *args); +void acrn_irqfd_deinit (struct acrn_vm *vm); +#endif /* __ACRN_HSM_DRV_H */
drivers/virt/acrn/hsm.c +7 -0
@@ -116,6 +116,7 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,struct acrn_vm_memmap memmap;struct acrn_msi_entry *msi;struct acrn_pcidev *pcidev; +struct acrn_irqfd irqfd;struct page *page;u64 cstate_cmd;int ret =0 ;
@@ -311,6 +312,12 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd, ret =acrn_ioeventfd_config (vm, &ioeventfd);break ; +case ACRN_IOCTL_IRQFD : +if (copy_from_user (&irqfd, (void __user *)ioctl_param, +sizeof (irqfd))) +return -EFAULT ; + ret =acrn_irqfd_config (vm, &irqfd); +break ;default :pr_warn ("Unknown IOCTL 0x%x!\n" , cmd); ret = -EINVAL ;
drivers/virt/acrn/irqfd.c new file +236 -0
236 lines not on this page · raw message
drivers/virt/acrn/vm.c +3 -0
@@ -47,6 +47,7 @@ struct acrn_vm *acrn_vm_create(struct acrn_vm *vm,write_unlock_bh (&acrn_vm_list_lock);acrn_ioeventfd_init (vm); +acrn_irqfd_init (vm);pr_debug ("VM %u created.\n" , vm->vmid);return vm; }
@@ -65,7 +66,9 @@ int acrn_vm_destroy(struct acrn_vm *vm)write_unlock_bh (&acrn_vm_list_lock);acrn_ioeventfd_deinit (vm); +acrn_irqfd_deinit (vm);acrn_ioreq_deinit (vm); +if (vm->monitor_page) {put_page (vm->monitor_page); vm->monitor_page =NULL ;
include/uapi/linux/acrn.h +15 -0
@@ -421,6 +421,19 @@ struct acrn_ioeventfd {__u64 data; }; +#define ACRN_IRQFD_FLAG_DEASSIGN 0x01 +/** +* struct acrn_irqfd - Data to operate a &struct hsm_irqfd +* @fd: The fd of eventfd associated with a hsm_irqfd +* @flags: Logical-OR of ACRN_IRQFD_FLAG_* +* @msi: Info of MSI associated with the irqfd +*/ +struct acrn_irqfd { +__s32 fd; +__u32 flags; +struct acrn_msi_entry msi; +}; +/* The ioctl type, documented in ioctl-number.rst */ #define ACRN_IOCTL_TYPE 0xA2
@@ -480,5 +493,7 @@ struct acrn_ioeventfd {#define ACRN_IOCTL_IOEVENTFD \ _IOW(ACRN_IOCTL_TYPE, 0x70, struct acrn_ioeventfd) +#define ACRN_IOCTL_IRQFD \ + _IOW(ACRN_IOCTL_TYPE, 0x71, struct acrn_irqfd)#endif /* _UAPI_ACRN_H */
Signature · 1 line
2.28.0
PATCH 17/17 virt: acrn: Introduce an interface for Service VM to control vCPU
In reply to [email protected]From: Shuo Liu <[email protected]>
ACRN supports partition mode to achieve real-time requirements. In partition mode, a CPU core can be dedicated to a vCPU of User VM. The local APIC of the dedicated CPU core can be passthrough to the User VM. The Service VM controls the assignment of the CPU cores.
Introduce an interface for the Service VM to remove the control of CPU core from hypervisor perspective so that the CPU core can be a dedicated CPU core of User VM.
--- drivers/virt/acrn/hsm.c | 49 +++++++++++++++++++++++++++++++++++ drivers/virt/acrn/hypercall.h | 12 +++++++++ 2 files changed, 61 insertions(+)
drivers/virt/acrn/hsm.c +49 -0
@@ -11,6 +11,7 @@#define pr_fmt (fmt) "acrn: " fmt +#include <linux/cpu.h> #include <linux/io.h> #include <linux/miscdevice.h> #include <linux/mm.h>
@@ -348,6 +349,47 @@ static struct miscdevice acrn_dev = { .fops = &acrn_fops, }; +static ssize_t remove_cpu_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +u64 cpu, lapicid; +int ret; + +if (kstrtoull (buf,0 , &cpu) <0 ) +return -EINVAL ; + +if (cpu >=num_possible_cpus () || cpu ==0 || !cpu_is_hotpluggable (cpu)) +return -EINVAL ; + +if (cpu_online (cpu)) +remove_cpu (cpu); + + lapicid =cpu_data (cpu).apicid; +pr_debug ("Try to remove cpu %lld with lapicid %lld\n" , cpu, lapicid); + ret =hcall_sos_remove_cpu (lapicid); +if (ret <0 ) { +pr_err ("Failed to remove cpu %lld!\n" , cpu); + goto fail_remove; + } + +return count; + +fail_remove: +add_cpu (cpu); +return ret; +} +static DEVICE_ATTR_WO (remove_cpu); + +static struct attribute *acrn_attrs[] = { + &dev_attr_remove_cpu.attr, +NULL +}; + +static struct attribute_group acrn_attr_group = { + .attrs = acrn_attrs, +}; +static int __init hsm_init (void ) {int ret;
@@ -373,13 +415,20 @@ static int __init hsm_init(void)return ret; } +if (sysfs_create_group (&acrn_dev.this_device->kobj, &acrn_attr_group)) { +pr_warn ("sysfs create failed\n" ); +misc_deregister (&acrn_dev); +return -EINVAL ; + }acrn_ioreq_intr_setup (); +return 0 ; } static void __exit hsm_exit(void) {acrn_ioreq_intr_remove (); +sysfs_remove_group (&acrn_dev.this_device->kobj, &acrn_attr_group);misc_deregister (&acrn_dev); }module_init (hsm_init);
drivers/virt/acrn/hypercall.h +12 -0
@@ -15,6 +15,7 @@#define HC_ID_GEN_BASE 0x0UL#define HC_GET_API_VERSION _HC_ID(HC_ID, HC_ID_GEN_BASE + 0x00) +#define HC_SOS_REMOVE_CPU _HC_ID(HC_ID, HC_ID_GEN_BASE + 0x01)#define HC_ID_VM_BASE 0x10UL#define HC_CREATE_VM _HC_ID(HC_ID, HC_ID_VM_BASE + 0x00)
@@ -56,6 +57,17 @@ static inline long hcall_get_api_version(u64 api_version)return acrn_hypercall1 (HC_GET_API_VERSION , api_version); } +/** +* hcall_sos_remove_cpu() - Remove a vCPU of Service VM +* @cpu: The vCPU to be removed +* +* Return: 0 on success, <0 on failure +*/ +static inline long hcall_sos_remove_cpu (u64 cpu) +{ +return acrn_hypercall1 (HC_SOS_REMOVE_CPU , cpu); +} +/** * hcall_create_vm() - Create a User VM * @vminfo: Service VM GPA of info of User VM creation
Signature · 1 line
2.28.0