github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-10 04:28:31 +00:00
Code Issues Projects Releases Wiki Activity

dm: fix SSRAM region unmap failure issue

Browse Source 
In ACRN HSM driver, only MMIO type is supported
 when doing EPT unmap.

 This patch walk around above issue to unmap
 SSRAM region before doing EPT mapping.

Tracked-On: #7563
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Yonghua Huang 2022-05-07 11:21:19 +03:00 committed by acrnsi-robot
parent b88642ec7f
commit 360e2db440
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devicemodel/hw/platform/vssram/vssram.c
View File

@ -449,7 +449,6 @@ static void *vssram_mmap_buffer(int fd, size_t size)
static int vssram_ept_map_buffer(struct vmctx *ctx, struct vssram_buf *buf_desc) static int vssram_ept_map_buffer(struct vmctx *ctx, struct vssram_buf *buf_desc)
{ {
struct acrn_vm_memmap memmap = { struct acrn_vm_memmap memmap = {
.type = ACRN_MEMMAP_RAM,
.vma_base = 0, .vma_base = 0,
.len = 0, .len = 0,
.attr = ACRN_MEM_ACCESS_RWX .attr = ACRN_MEM_ACCESS_RWX
@ -458,10 +457,19 @@ static int vssram_ept_map_buffer(struct vmctx *ctx, struct vssram_buf *buf_desc)
memmap.vma_base = buf_desc->vma_base; memmap.vma_base = buf_desc->vma_base;
memmap.user_vm_pa = buf_desc->gpa_base; memmap.user_vm_pa = buf_desc->gpa_base;
memmap.len = buf_desc->size; memmap.len = buf_desc->size;
/*
* This is a Walk-around:
* - As only MMIO type can be supported when doing EPT unmap in HSM driver,
* so hardcoding of 'type' to be MMIO type.
*/
memmap.type = ACRN_MEMMAP_MMIO;
error = ioctl(ctx->fd, ACRN_IOCTL_UNSET_MEMSEG, &memmap); error = ioctl(ctx->fd, ACRN_IOCTL_UNSET_MEMSEG, &memmap);
if (error) { if (error) {
pr_err("ACRN_IOCTL_UNSET_MEMSEG ioctl() returned an error: %s\n", errormsg(errno)); pr_err("ACRN_IOCTL_UNSET_MEMSEG ioctl() returned an error: %s\n", errormsg(errno));
} }
memmap.type = ACRN_MEMMAP_RAM;
error = ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap); error = ioctl(ctx->fd, ACRN_IOCTL_SET_MEMSEG, &memmap);
if (error) { if (error) {
pr_err("ACRN_IOCTL_SET_MEMSEG ioctl() returned an error: %s\n", errormsg(errno)); pr_err("ACRN_IOCTL_SET_MEMSEG ioctl() returned an error: %s\n", errormsg(errno));