mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-05-06 15:36:59 +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>
94 lines
2.6 KiB
C
94 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2018 Intel Corporation. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <vm_config.h>
|
|
#include <vuart.h>
|
|
|
|
extern struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM];
|
|
extern struct acrn_vm_pci_dev_config vm1_pci_devs[VM1_CONFIG_PCI_DEV_NUM];
|
|
|
|
struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
|
|
{ /* VM0 */
|
|
.load_order = PRE_LAUNCHED_VM,
|
|
.name = "ACRN PRE-LAUNCHED VM0",
|
|
.uuid = {0x26U, 0xc5U, 0xe0U, 0xd8U, 0x8fU, 0x8aU, 0x47U, 0xd8U, \
|
|
0x81U, 0x09U, 0xf2U, 0x01U, 0xebU, 0xd6U, 0x1aU, 0x5eU},
|
|
/* 26c5e0d8-8f8a-47d8-8109-f201ebd61a5e */
|
|
.vcpu_num = 2U,
|
|
.vcpu_affinity = VM0_CONFIG_VCPU_AFFINITY,
|
|
.clos = 0U,
|
|
.memory = {
|
|
.start_hpa = VM0_CONFIG_MEM_START_HPA,
|
|
.size = VM0_CONFIG_MEM_SIZE,
|
|
},
|
|
.os_config = {
|
|
.name = "ClearLinux",
|
|
.kernel_type = KERNEL_BZIMAGE,
|
|
.kernel_mod_tag = "Linux_bzImage",
|
|
.bootargs = VM0_CONFIG_OS_BOOTARG_CONSOLE \
|
|
VM0_CONFIG_OS_BOOTARG_MAXCPUS \
|
|
VM0_CONFIG_OS_BOOTARG_ROOT \
|
|
"rw rootwait noxsave nohpet console=hvc0 \
|
|
no_timer_check ignore_loglevel log_buf_len=16M \
|
|
consoleblank=0 tsc=reliable xapic_phys"
|
|
},
|
|
.vuart[0] = {
|
|
.type = VUART_LEGACY_PIO,
|
|
.addr.port_base = COM1_BASE,
|
|
.irq = COM1_IRQ,
|
|
},
|
|
.vuart[1] = {
|
|
.type = VUART_LEGACY_PIO,
|
|
.addr.port_base = COM2_BASE,
|
|
.irq = COM2_IRQ,
|
|
.t_vuart.vm_id = 1U,
|
|
.t_vuart.vuart_id = 1U,
|
|
},
|
|
.pci_dev_num = VM0_CONFIG_PCI_DEV_NUM,
|
|
.pci_devs = vm0_pci_devs,
|
|
},
|
|
{ /* VM1 */
|
|
.load_order = PRE_LAUNCHED_VM,
|
|
.name = "ACRN PRE-LAUNCHED VM1",
|
|
.uuid = {0xddU, 0x87U, 0xceU, 0x08U, 0x66U, 0xf9U, 0x47U, 0x3dU, \
|
|
0xbcU, 0x58U, 0x76U, 0x05U, 0x83U, 0x7fU, 0x93U, 0x5eU},
|
|
/* dd87ce08-66f9-473d-bc58-7605837f935e */
|
|
.vcpu_num = 2U,
|
|
.vcpu_affinity = VM1_CONFIG_VCPU_AFFINITY,
|
|
.guest_flags = (GUEST_FLAG_RT | GUEST_FLAG_LAPIC_PASSTHROUGH),
|
|
.clos = 0U,
|
|
.memory = {
|
|
.start_hpa = VM1_CONFIG_MEM_START_HPA,
|
|
.size = VM1_CONFIG_MEM_SIZE,
|
|
},
|
|
.os_config = {
|
|
.name = "ClearLinux",
|
|
.kernel_type = KERNEL_BZIMAGE,
|
|
.kernel_mod_tag = "Linux_bzImage",
|
|
.bootargs = VM1_CONFIG_OS_BOOTARG_CONSOLE \
|
|
VM1_CONFIG_OS_BOOTARG_MAXCPUS \
|
|
VM1_CONFIG_OS_BOOTARG_ROOT \
|
|
"rw rootwait noxsave nohpet console=hvc0 \
|
|
no_timer_check ignore_loglevel log_buf_len=16M \
|
|
consoleblank=0 tsc=reliable xapic_phys"
|
|
},
|
|
.vuart[0] = {
|
|
.type = VUART_LEGACY_PIO,
|
|
.addr.port_base = COM1_BASE,
|
|
.irq = COM1_IRQ,
|
|
},
|
|
.vuart[1] = {
|
|
.type = VUART_LEGACY_PIO,
|
|
.addr.port_base = COM2_BASE,
|
|
.irq = COM2_IRQ,
|
|
.t_vuart.vm_id = 0U,
|
|
.t_vuart.vuart_id = 1U,
|
|
},
|
|
.pci_dev_num = VM1_CONFIG_PCI_DEV_NUM,
|
|
.pci_devs = vm1_pci_devs,
|
|
},
|
|
};
|