Skip to content

Commit 7353005

Browse files
mingqiangchilijinxia
mingqiangchi
authored and
lijinxia
committed
hv:Replace dynamic memory with static for port io
-- Add emulated port io index -- Add emulated pio array in vm structure -- Remove port list in vm structure -- Remove free_io_emulation_resource/register_io_handler/ create_io_handler APIs v2-->v3: -- not add 'is_emulated', check len == 0U -- Check if io_read/io_write handler is NULL before calling -- Replace ENUM with MACRO for emulated pio index to avoid MISRA-C violations v1-->v2: -- Remove EMUL_PIO_NUM in Kconfig, add emulated pio index for PIC/PCI/UART/RTC/PM Tracked-On: #861 Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com> Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent 5a1f244 commit 7353005

File tree

11 files changed

+61
-130
lines changed

11 files changed

+61
-130
lines changed

‎doc/developer-guides/hld/hv-io-emulation.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,6 @@ I/O bitmaps and register or unregister I/O handlers:
316316
.. doxygenfunction:: allow_guest_pio_access
317317
:project: Project ACRN
318318

319-
.. doxygenfunction:: free_io_emulation_resource
320-
:project: Project ACRN
321-
322319
.. doxygenfunction:: register_io_emulation_handler
323320
:project: Project ACRN
324321

‎hypervisor/arch/x86/guest/pm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static void pm1ab_io_write(__unused struct acrn_vm *vm, uint16_t addr, size_t wi
187187
}
188188

189189
static void
190-
register_gas_io_handler(struct acrn_vm *vm, const struct acpi_generic_address *gas)
190+
register_gas_io_handler(struct acrn_vm *vm, uint32_t pio_idx, const struct acpi_generic_address *gas)
191191
{
192192
uint8_t io_len[5] = {0, 1, 2, 4, 8};
193193
struct vm_io_range gas_io;
@@ -203,7 +203,7 @@ register_gas_io_handler(struct acrn_vm *vm, const struct acpi_generic_address *g
203203
gas_io.base = (uint16_t)gas->address;
204204
gas_io.len = io_len[gas->access_size];
205205

206-
register_io_emulation_handler(vm, &gas_io,
206+
register_io_emulation_handler(vm, pio_idx, &gas_io,
207207
&pm1ab_io_read, &pm1ab_io_write);
208208

209209
pr_dbg("Enable PM1A trap for VM %d, port 0x%x, size %d\n",
@@ -214,8 +214,8 @@ void register_pm1ab_handler(struct acrn_vm *vm)
214214
{
215215
struct pm_s_state_data *sx_data = vm->pm.sx_state_data;
216216

217-
register_gas_io_handler(vm, &(sx_data->pm1a_evt));
218-
register_gas_io_handler(vm, &(sx_data->pm1b_evt));
219-
register_gas_io_handler(vm, &(sx_data->pm1a_cnt));
220-
register_gas_io_handler(vm, &(sx_data->pm1b_cnt));
217+
register_gas_io_handler(vm, PM1A_EVT_PIO_IDX, &(sx_data->pm1a_evt));
218+
register_gas_io_handler(vm, PM1B_EVT_PIO_IDX, &(sx_data->pm1b_evt));
219+
register_gas_io_handler(vm, PM1A_CNT_PIO_IDX, &(sx_data->pm1a_cnt));
220+
register_gas_io_handler(vm, PM1B_CNT_PIO_IDX, &(sx_data->pm1b_cnt));
221221
}

‎hypervisor/arch/x86/guest/vm.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ int shutdown_vm(struct acrn_vm *vm)
211211
/* Free EPT allocated resources assigned to VM */
212212
destroy_ept(vm);
213213

214-
/* TODO: De-initialize I/O Emulation */
215-
free_io_emulation_resource(vm);
216-
217214
/* Free iommu */
218215
if (vm->iommu != NULL) {
219216
destroy_iommu_domain(vm->iommu);

‎hypervisor/arch/x86/io.c

Lines changed: 28 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -196,39 +196,40 @@ hv_emulate_pio(const struct acrn_vcpu *vcpu, struct io_request *io_req)
196196
int32_t status = -ENODEV;
197197
uint16_t port, size;
198198
uint32_t mask;
199+
uint32_t idx;
199200
struct acrn_vm *vm = vcpu->vm;
200201
struct pio_request *pio_req = &io_req->reqs.pio;
201-
struct vm_io_handler *handler;
202+
struct vm_io_handler_desc *handler;
202203

203204
port = (uint16_t)pio_req->address;
204205
size = (uint16_t)pio_req->size;
205206
mask = 0xFFFFFFFFU >> (32U - 8U * size);
206207

207-
for (handler = vm->arch_vm.io_handler;
208-
handler != NULL; handler = handler->next) {
209-
uint16_t base = handler->desc.addr;
210-
uint16_t end = base + (uint16_t)handler->desc.len;
208+
for (idx = 0U; idx < EMUL_PIO_IDX_MAX; idx++) {
209+
handler = &(vm->arch_vm.emul_pio[idx]);
210+
if (handler->len == 0U) {
211+
continue;
212+
}
213+
uint16_t base = handler->addr;
214+
uint16_t end = base + (uint16_t)handler->len;
211215

212216
if ((port >= end) || (port + size <= base)) {
213217
continue;
214218
} else if (!((port >= base) && ((port + size) <= end))) {
215-
pr_fatal("Err:IO, port 0x%04x, size=%hu spans devices",
216-
port, size);
219+
pr_fatal("Err:IO, port 0x%04x, size=%hu spans devices", port, size);
217220
status = -EIO;
218221
break;
219222
} else {
220223
if (pio_req->direction == REQUEST_WRITE) {
221-
handler->desc.io_write(vm, port, size,
222-
pio_req->value & mask);
223-
224-
pr_dbg("IO write on port %04x, data %08x", port,
225-
pio_req->value & mask);
224+
if (handler->io_write) {
225+
handler->io_write(vm, port, size, pio_req->value & mask);
226+
}
227+
pr_dbg("IO write on port %04x, data %08x", port, pio_req->value & mask);
226228
} else {
227-
pio_req->value = handler->desc.io_read(vm, port,
228-
size);
229-
230-
pr_dbg("IO read on port %04x, data %08x",
231-
port, pio_req->value);
229+
if (handler->io_read) {
230+
pio_req->value = handler->io_read(vm, port, size);
231+
}
232+
pr_dbg("IO read on port %04x, data %08x", port, pio_req->value);
232233
}
233234
status = 0;
234235
break;
@@ -394,37 +395,6 @@ int32_t pio_instr_vmexit_handler(struct acrn_vcpu *vcpu)
394395
return status;
395396
}
396397

397-
static void register_io_handler(struct acrn_vm *vm, struct vm_io_handler *hdlr)
398-
{
399-
if (vm->arch_vm.io_handler != NULL) {
400-
hdlr->next = vm->arch_vm.io_handler;
401-
}
402-
403-
vm->arch_vm.io_handler = hdlr;
404-
}
405-
406-
static void empty_io_handler_list(struct acrn_vm *vm)
407-
{
408-
struct vm_io_handler *handler = vm->arch_vm.io_handler;
409-
struct vm_io_handler *tmp;
410-
411-
while (handler != NULL) {
412-
tmp = handler;
413-
handler = tmp->next;
414-
free(tmp);
415-
}
416-
vm->arch_vm.io_handler = NULL;
417-
}
418-
419-
/**
420-
* @brief Free I/O bitmaps and port I/O handlers of \p vm
421-
*
422-
* @param vm The VM whose I/O bitmaps and handlers are to be freed
423-
*/
424-
void free_io_emulation_resource(struct acrn_vm *vm)
425-
{
426-
empty_io_handler_list(vm);
427-
}
428398

429399
/**
430400
* @brief Allow a VM to access a port I/O range
@@ -464,27 +434,6 @@ static void deny_guest_pio_access(struct acrn_vm *vm, uint16_t port_address,
464434
}
465435
}
466436

467-
static struct vm_io_handler *create_io_handler(uint32_t port, uint32_t len,
468-
io_read_fn_t io_read_fn_ptr,
469-
io_write_fn_t io_write_fn_ptr)
470-
{
471-
472-
struct vm_io_handler *handler;
473-
474-
handler = calloc(1U, sizeof(struct vm_io_handler));
475-
476-
if (handler != NULL) {
477-
handler->desc.addr = port;
478-
handler->desc.len = len;
479-
handler->desc.io_read = io_read_fn_ptr;
480-
handler->desc.io_write = io_write_fn_ptr;
481-
} else {
482-
pr_err("Error: out of memory");
483-
}
484-
485-
return handler;
486-
}
487-
488437
/**
489438
* @brief Initialize the I/O bitmap for \p vm
490439
*
@@ -503,30 +452,23 @@ void setup_io_bitmap(struct acrn_vm *vm)
503452
/**
504453
* @brief Register a port I/O handler
505454
*
506-
* @param vm The VM to which the port I/O handlers are registered
507-
* @param range The port I/O range that the given handlers can emulate
455+
* @param vm The VM to which the port I/O handlers are registered
456+
* @param pio_idx The emulated port io index
457+
* @param range The emulated port io range
508458
* @param io_read_fn_ptr The handler for emulating reads from the given range
509459
* @param io_write_fn_ptr The handler for emulating writes to the given range
460+
* @pre pio_idx < EMUL_PIO_IDX_MAX
510461
*/
511-
void register_io_emulation_handler(struct acrn_vm *vm, const struct vm_io_range *range,
512-
io_read_fn_t io_read_fn_ptr,
513-
io_write_fn_t io_write_fn_ptr)
462+
void register_io_emulation_handler(struct acrn_vm *vm, uint32_t pio_idx,
463+
const struct vm_io_range *range, io_read_fn_t io_read_fn_ptr, io_write_fn_t io_write_fn_ptr)
514464
{
515-
struct vm_io_handler *handler = NULL;
516-
517-
if ((io_read_fn_ptr == NULL) || (io_write_fn_ptr == NULL)) {
518-
pr_err("Invalid IO handler.");
519-
return;
520-
}
521-
522465
if (is_vm0(vm)) {
523466
deny_guest_pio_access(vm, range->base, range->len);
524467
}
525-
526-
handler = create_io_handler(range->base,
527-
range->len, io_read_fn_ptr, io_write_fn_ptr);
528-
529-
register_io_handler(vm, handler);
468+
vm->arch_vm.emul_pio[pio_idx].addr = range->base;
469+
vm->arch_vm.emul_pio[pio_idx].len = range->len;
470+
vm->arch_vm.emul_pio[pio_idx].io_read = io_read_fn_ptr;
471+
vm->arch_vm.emul_pio[pio_idx].io_write = io_write_fn_ptr;
530472
}
531473

532474
/**

‎hypervisor/debug/vuart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ static void vuart_register_io_handler(struct acrn_vm *vm)
327327
.len = 8U
328328
};
329329

330-
register_io_emulation_handler(vm, &range, vuart_read, vuart_write);
330+
register_io_emulation_handler(vm, UART_PIO_IDX, &range, vuart_read, vuart_write);
331331
}
332332

333333
/**

‎hypervisor/dm/vpci/vpci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void vpci_init(struct acrn_vm *vm)
131131
#endif
132132

133133
if ((vpci->ops->init != NULL) && (vpci->ops->init(vm) == 0)) {
134-
register_io_emulation_handler(vm, &pci_cfg_range,
134+
register_io_emulation_handler(vm, PCI_PIO_IDX, &pci_cfg_range,
135135
&pci_cfg_io_read, &pci_cfg_io_write);
136136
/* This is a tmp solution to avoid sos reboot failure, it need pass-thru IO port CF9 for Reset Control
137137
* register.

‎hypervisor/dm/vpic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -866,11 +866,11 @@ static void vpic_register_io_handler(struct acrn_vm *vm)
866866
.len = 2U
867867
};
868868

869-
register_io_emulation_handler(vm, &master_range,
869+
register_io_emulation_handler(vm, PIC_MASTER_PIO_IDX, &master_range,
870870
&vpic_master_io_read, &vpic_master_io_write);
871-
register_io_emulation_handler(vm, &slave_range,
871+
register_io_emulation_handler(vm, PIC_SLAVE_PIO_IDX, &slave_range,
872872
&vpic_slave_io_read, &vpic_slave_io_write);
873-
register_io_emulation_handler(vm, &elcr_range,
873+
register_io_emulation_handler(vm, PIC_ELC_PIO_IDX, &elcr_range,
874874
&vpic_elc_io_read, &vpic_elc_io_write);
875875
}
876876

‎hypervisor/dm/vrtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ void vrtc_init(struct acrn_vm *vm)
7777
/* Initializing the CMOS RAM offset to 0U */
7878
vm->vrtc_offset = 0U;
7979

80-
register_io_emulation_handler(vm, &range, vrtc_read, vrtc_write);
80+
register_io_emulation_handler(vm, RTC_PIO_IDX, &range, vrtc_read, vrtc_write);
8181
}

‎hypervisor/include/arch/x86/guest/vm.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,7 @@ struct vm_arch {
103103
void *tmp_pg_array; /* Page array for tmp guest paging struct */
104104
struct acrn_vioapic vioapic; /* Virtual IOAPIC base address */
105105
struct acrn_vpic vpic; /* Virtual PIC */
106-
/**
107-
* A link to the IO handler of this VM.
108-
* We only register io handle to this link
109-
* when create VM on sequences and ungister it when
110-
* destory VM. So there no need lock to prevent preempt.
111-
* Besides, there only a few io handlers now, we don't
112-
* need binary search temporary.
113-
*/
114-
struct vm_io_handler *io_handler;
106+
struct vm_io_handler_desc emul_pio[EMUL_PIO_IDX_MAX];
115107

116108
/* reference to virtual platform to come here (as needed) */
117109
} __aligned(CPU_PAGE_SIZE);

‎hypervisor/include/arch/x86/io.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,19 @@
99

1010
#include <types.h>
1111

12+
/* Define emulated port IO index */
13+
#define PIC_MASTER_PIO_IDX 0U
14+
#define PIC_SLAVE_PIO_IDX (PIC_MASTER_PIO_IDX + 1U)
15+
#define PIC_ELC_PIO_IDX (PIC_SLAVE_PIO_IDX + 1U)
16+
#define PCI_PIO_IDX (PIC_ELC_PIO_IDX + 1U)
17+
#define UART_PIO_IDX (PCI_PIO_IDX + 1U)
18+
#define PM1A_EVT_PIO_IDX (UART_PIO_IDX + 1U)
19+
#define PM1A_CNT_PIO_IDX (PM1A_EVT_PIO_IDX + 1U)
20+
#define PM1B_EVT_PIO_IDX (PM1A_CNT_PIO_IDX + 1U)
21+
#define PM1B_CNT_PIO_IDX (PM1B_EVT_PIO_IDX + 1U)
22+
#define RTC_PIO_IDX (PM1B_CNT_PIO_IDX + 1U)
23+
#define EMUL_PIO_IDX_MAX (RTC_PIO_IDX + 1U)
24+
1225
/* Write 1 byte to specified I/O port */
1326
static inline void pio_write8(uint8_t value, uint16_t port)
1427
{

0 commit comments

Comments
 (0)