mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-05-03 05:56:57 +00:00
1c526e6d16
Add this vcpu_affinity[] for each VM to indicate the assignment policy. With it, pcpu_bitmap is not needed, so remove it from vm_config. Instead, vcpu_affinity is a must for each VM. This patch also add some sanitize check of vcpu_affinity[]. Here are some rules: 1) only one bit can be set for each vcpu_affinity of vcpu. 2) two vcpus in same VM cannot be set with same vcpu_affinity. 3) vcpu_affinity cannot be set to the pcpu which used by pre-launched VM. v4: config SDC with CONFIG_MAX_KATA_VM_NUM v5: config SDC with CONFIG_MAX_PCPU_NUM Tracked-On: #3663 Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com> Signed-off-by: Yu Wang <yu1.wang@intel.com> Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
67 lines
2.2 KiB
C
67 lines
2.2 KiB
C
/*
|
|
* Copyright (C) 2019 Intel Corporation. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#ifndef VM_CONFIGURATIONS_H
|
|
#define VM_CONFIGURATIONS_H
|
|
|
|
#include <pci_devices.h>
|
|
#include <misc_cfg.h>
|
|
|
|
/* Bits mask of guest flags that can be programmed by device model. Other bits are set by hypervisor only */
|
|
#define DM_OWNED_GUEST_FLAG_MASK 0UL
|
|
|
|
#define CONFIG_MAX_VM_NUM 2U
|
|
|
|
/* The VM CONFIGs like:
|
|
* VMX_CONFIG_VCPU_AFFINITY
|
|
* VMX_CONFIG_MEM_START_HPA
|
|
* VMX_CONFIG_MEM_SIZE
|
|
* VMX_CONFIG_OS_BOOTARG_ROOT
|
|
* VMX_CONFIG_OS_BOOTARG_MAX_CPUS
|
|
* VMX_CONFIG_OS_BOOTARG_CONSOLE
|
|
* might be different on your board, please modify them per your needs.
|
|
*/
|
|
|
|
#define VM0_CONFIG_VCPU_AFFINITY {AFFINITY_CPU(0U), AFFINITY_CPU(2U)}
|
|
#define VM0_CONFIG_MEM_START_HPA 0x100000000UL
|
|
#define VM0_CONFIG_MEM_SIZE 0x20000000UL
|
|
#define VM0_CONFIG_OS_BOOTARG_ROOT ROOTFS_0
|
|
#define VM0_CONFIG_OS_BOOTARG_MAXCPUS "maxcpus=2 "
|
|
#define VM0_CONFIG_OS_BOOTARG_CONSOLE "console=ttyS0 "
|
|
|
|
#define VM1_CONFIG_VCPU_AFFINITY {AFFINITY_CPU(1U), AFFINITY_CPU(3U)}
|
|
#define VM1_CONFIG_MEM_START_HPA 0x120000000UL
|
|
#define VM1_CONFIG_MEM_SIZE 0x20000000UL
|
|
#define VM1_CONFIG_OS_BOOTARG_ROOT ROOTFS_0
|
|
#define VM1_CONFIG_OS_BOOTARG_MAXCPUS "maxcpus=2 "
|
|
#define VM1_CONFIG_OS_BOOTARG_CONSOLE "console=ttyS0 "
|
|
|
|
/* VM pass-through devices assign policy:
|
|
* VM0: one Mass Storage controller, one Network controller;
|
|
* VM1: one Mass Storage controller, one Network controller(if a secondary Network controller class device exist);
|
|
*/
|
|
#define VM0_STORAGE_CONTROLLER SATA_CONTROLLER_0
|
|
#define VM0_NETWORK_CONTROLLER ETHERNET_CONTROLLER_0
|
|
#define VM0_CONFIG_PCI_DEV_NUM 3U
|
|
|
|
#define VM1_STORAGE_CONTROLLER USB_CONTROLLER_0
|
|
#if defined(ETHERNET_CONTROLLER_1)
|
|
/* if a secondary Ethernet controller subclass exist, assign to VM1 */
|
|
#define VM1_NETWORK_CONTROLLER ETHERNET_CONTROLLER_1
|
|
#elif defined(NETWORK_CONTROLLER_0)
|
|
/* if a Network controller subclass exist(usually it is a wireless network card), assign to VM1 */
|
|
#define VM1_NETWORK_CONTROLLER NETWORK_CONTROLLER_0
|
|
#endif
|
|
|
|
#if defined(VM1_NETWORK_CONTROLLER)
|
|
#define VM1_CONFIG_PCI_DEV_NUM 3U
|
|
#else
|
|
/* no network controller could be assigned to VM1 */
|
|
#define VM1_CONFIG_PCI_DEV_NUM 2U
|
|
#endif
|
|
|
|
#endif /* VM_CONFIGURATIONS_H */
|