OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm: Use new memory management ioctls 

struct vm_memmap	->	struct acrn_vm_memmap
VM_MEMMAP_SYSMEM	->	ACRN_MEMMAP_RAM
VM_MMIO			->	ACRN_MEMMAP_MMIO
PROT_ALL		->	ACRN_MEM_ACCESS_RWX

Tracked-On: #6282
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Shuo A Liu 2021-07-07 16:06:42 +08:00 committed by wenlingz
parent 9c910bae44
commit 7e01d90b87
3 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
devicemodel/core/vmmapi.c
View File

@ -362,16 +362,15 @@ int
vm_map_memseg_vma(struct vmctx *ctx, size_t len, vm_paddr_t gpa,
uint64_t vma, int prot)
{
struct vm_memmap memmap;
struct acrn_vm_memmap memmap;
bzero(&memmap, sizeof(struct vm_memmap));
memmap.type = VM_MEMMAP_SYSMEM;
memmap.using_vma = 1;
bzero(&memmap, sizeof(struct acrn_vm_memmap));
memmap.type = ACRN_MEMMAP_RAM;
memmap.vma_base = vma;
memmap.len = len;
memmap.gpa = gpa;
memmap.prot = prot;
return ioctl(ctx->fd, IC_SET_MEMSEG, &memmap);
memmap.user_vm_pa = gpa;
memmap.attr = prot;
return ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap);
}
int
@ -568,32 +567,32 @@ int
vm_map_ptdev_mmio(struct vmctx *ctx, int bus, int slot, int func,
vm_paddr_t gpa, size_t len, vm_paddr_t hpa)
{
struct vm_memmap memmap;
struct acrn_vm_memmap memmap;
bzero(&memmap, sizeof(struct vm_memmap));
memmap.type = VM_MMIO;
bzero(&memmap, sizeof(struct acrn_vm_memmap));
memmap.type = ACRN_MEMMAP_MMIO;
memmap.len = len;
memmap.gpa = gpa;
memmap.hpa = hpa;
memmap.prot = PROT_ALL;
memmap.user_vm_pa = gpa;
memmap.service_vm_pa = hpa;
memmap.attr = ACRN_MEM_ACCESS_RWX;
return ioctl(ctx->fd, IC_SET_MEMSEG, &memmap);
return ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap);
}
int
vm_unmap_ptdev_mmio(struct vmctx *ctx, int bus, int slot, int func,
vm_paddr_t gpa, size_t len, vm_paddr_t hpa)
{
struct vm_memmap memmap;
struct acrn_vm_memmap memmap;
bzero(&memmap, sizeof(struct vm_memmap));
memmap.type = VM_MMIO;
bzero(&memmap, sizeof(struct acrn_vm_memmap));
memmap.type = ACRN_MEMMAP_MMIO;
memmap.len = len;
memmap.gpa = gpa;
memmap.hpa = hpa;
memmap.prot = PROT_ALL;
memmap.user_vm_pa = gpa;
memmap.service_vm_pa = hpa;
memmap.attr = ACRN_MEM_ACCESS_RWX;
return ioctl(ctx->fd, IC_UNSET_MEMSEG, &memmap);
return ioctl(ctx->fd, ACRN_IOCTL_UNSET_MEMSEG, &memmap);
}
int

16
devicemodel/hw/platform/acpi/acpi.c
View File

@ -1171,12 +1171,12 @@ int create_and_inject_vrtct(struct vmctx *ctx)
size_t vrtct_len;
uint8_t *buf;
uint8_t *vrtct;
struct vm_memmap memmap = {
.type = VM_MMIO,
struct acrn_vm_memmap memmap = {
.type = ACRN_MEMMAP_MMIO,
/* HPA base and size of Software SRAM shall be parsed from vRTCT. */
.hpa = 0,
.service_vm_pa = 0,
.len = 0,
.prot = PROT_ALL
.attr = ACRN_MEM_ACCESS_RWX
};
/* Name of native RTCT table is "PTCT"(v1) or "RTCT"(v2) */
@ -1218,11 +1218,11 @@ int create_and_inject_vrtct(struct vmctx *ctx)
free(vrtct);
free(buf);
memmap.hpa = get_software_sram_base_hpa();
memmap.gpa = get_software_sram_base_gpa();
memmap.service_vm_pa = get_software_sram_base_hpa();
memmap.user_vm_pa = get_software_sram_base_gpa();
memmap.len = get_software_sram_size();
ioctl(ctx->fd, IC_UNSET_MEMSEG, &memmap);
return ioctl(ctx->fd, IC_SET_MEMSEG, &memmap);
ioctl(ctx->fd, ACRN_IOCTL_UNSET_MEMSEG, &memmap);
return ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap);
};
void

52
devicemodel/include/public/hsm_ioctl_defs.h
View File

@ -106,11 +106,10 @@
_IO(ACRN_IOCTL_TYPE, 0x35)
/* Guest memory management */
#define IC_ID_MEM_BASE 0x40UL
/* IC_ALLOC_MEMSEG not used */
#define IC_ALLOC_MEMSEG _IC_ID(IC_ID, IC_ID_MEM_BASE + 0x00)
#define IC_SET_MEMSEG _IC_ID(IC_ID, IC_ID_MEM_BASE + 0x01)
#define IC_UNSET_MEMSEG _IC_ID(IC_ID, IC_ID_MEM_BASE + 0x02)
#define ACRN_IOCTL_SET_MEMSEG \
_IOW(ACRN_IOCTL_TYPE, 0x41, struct acrn_vm_memmap)
#define ACRN_IOCTL_UNSET_MEMSEG \
_IOW(ACRN_IOCTL_TYPE, 0x42, struct acrn_vm_memmap)
/* PCI assignment*/
#define IC_ID_PCI_BASE 0x50UL
@ -130,41 +129,54 @@
#define IC_ID_PM_BASE 0x60UL
#define IC_PM_GET_CPU_STATE _IC_ID(IC_ID, IC_ID_PM_BASE + 0x00)
#define VM_MEMMAP_SYSMEM 0
#define VM_MMIO 1
/* VHM eventfd */
#define IC_ID_EVENT_BASE 0x70UL
#define IC_EVENT_IOEVENTFD _IC_ID(IC_ID, IC_ID_EVENT_BASE + 0x00)
#define IC_EVENT_IRQFD _IC_ID(IC_ID, IC_ID_EVENT_BASE + 0x01)
#define ACRN_MEM_ACCESS_RIGHT_MASK 0x00000007U
#define ACRN_MEM_ACCESS_READ 0x00000001U
#define ACRN_MEM_ACCESS_WRITE 0x00000002U
#define ACRN_MEM_ACCESS_EXEC 0x00000004U
#define ACRN_MEM_ACCESS_RWX (ACRN_MEM_ACCESS_READ | \
ACRN_MEM_ACCESS_WRITE | \
ACRN_MEM_ACCESS_EXEC)
#define ACRN_MEM_TYPE_MASK 0x000007C0U
#define ACRN_MEM_TYPE_WB 0x00000040U
#define ACRN_MEM_TYPE_WT 0x00000080U
#define ACRN_MEM_TYPE_UC 0x00000100U
#define ACRN_MEM_TYPE_WC 0x00000200U
#define ACRN_MEM_TYPE_WP 0x00000400U
/* Memory mapping types */
#define ACRN_MEMMAP_RAM 0
#define ACRN_MEMMAP_MMIO 1
/**
* @brief EPT memory mapping info for guest
*/
struct vm_memmap {
struct acrn_vm_memmap {
/** memory mapping type */
uint32_t type;
/** using vma_base to get sos_vm_gpa,
* only for type == VM_MEMMAP_SYSMEM
*/
uint32_t using_vma;
__u32 type;
/** memory mapping attribute */
__u32 attr;
/** user OS guest physical start address of memory mapping */
uint64_t gpa;
__u64 user_vm_pa;
union {
/** host physical start address of memory,
* only for type == VM_MMIO
*/
uint64_t hpa;
__u64 service_vm_pa;
/** service OS user virtual start address of
* memory, only for type == VM_MEMMAP_SYSMEM &&
* using_vma == true
*/
uint64_t vma_base;
__u64 vma_base;
};
/** the length of memory range mapped */
uint64_t len; /* mmap length */
/** memory mapping attribute */
uint32_t prot; /* RWX */
__u64 len;
};
/**