github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

HV: Remove goto statement in guest.c

Browse Source 
To meet MISRA, remove some goto statements in guest.c

Tracked-On: #861
Signed-off-by: Chaohong guo <chaohong.guo@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Chaohong guo 2018-12-20 11:56:00 +08:00 committed by wenlingz
parent 2e01b4c8dc
commit 8e00180c9f
1 changed files with 111 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
hypervisor/arch/x86/guest/guest.c
View File

@ -78,144 +78,136 @@ static int32_t local_gva2gpa_common(struct acrn_vcpu *vcpu, const struct page_wa
uint64_t index; uint64_t index;
uint32_t shift; uint32_t shift;
void *base; void *base;
uint64_t entry; uint64_t entry = 0U;
uint64_t addr, page_size; uint64_t addr;
uint64_t page_size = PAGE_SIZE_4K;
int32_t ret = 0; int32_t ret = 0;
int32_t fault = 0; int32_t fault = 0;
bool is_user_mode_addr = true; bool is_user_mode_addr = true;
bool is_page_rw_flags_on = true; bool is_page_rw_flags_on = true;
if (pw_info->level < 1U) { if (pw_info->level < 1U) {
return -EINVAL; ret = -EINVAL;
} } else {
addr = pw_info->top_entry;
i = pw_info->level;
stac();
addr = pw_info->top_entry; while ((i != 0U) && (fault == 0)) {
i = pw_info->level; i--;
stac();
while (i != 0U) {
i--;
addr = addr & IA32E_REF_MASK; addr = addr & IA32E_REF_MASK;
base = gpa2hva(vcpu->vm, addr); base = gpa2hva(vcpu->vm, addr);
if (base == NULL) { if (base == NULL) {
ret = -EFAULT; fault = 1;
goto out; } else {
} shift = (i * pw_info->width) + 12U;
index = (gva >> shift) & ((1UL << pw_info->width) - 1UL);
page_size = 1UL << shift;
shift = (i * pw_info->width) + 12U; if (pw_info->width == 10U) {
index = (gva >> shift) & ((1UL << pw_info->width) - 1UL); uint32_t *base32 = (uint32_t *)base;
page_size = 1UL << shift; /* 32bit entry */
entry = (uint64_t)(*(base32 + index));
} else {
uint64_t *base64 = (uint64_t *)base;
entry = *(base64 + index);
}
if (pw_info->width == 10U) { /* check if the entry present */
uint32_t *base32 = (uint32_t *)base; if ((entry & PAGE_PRESENT) == 0U) {
/* 32bit entry */
entry = (uint64_t)(*(base32 + index));
} else {
uint64_t *base64 = (uint64_t *)base;
entry = *(base64 + index);
}
/* check if the entry present */
if ((entry & PAGE_PRESENT) == 0U) {
ret = -EFAULT;
goto out;
}
/* check for R/W */
if ((entry & PAGE_RW) == 0U) {
if (pw_info->is_write_access) {
/* Case1: Supermode and wp is 1
* Case2: Usermode */
if (pw_info->is_user_mode_access ||
pw_info->wp) {
fault = 1; fault = 1;
goto out; }
/* check for R/W */
if ((fault == 0) && (entry & PAGE_RW) == 0U) {
if ((pw_info->is_write_access) &&
(pw_info->is_user_mode_access || pw_info->wp)) {
/* Case1: Supermode and wp is 1
* Case2: Usermode */
fault = 1;
}
is_page_rw_flags_on = false;
} }
} }
is_page_rw_flags_on = false;
}
/* check for nx, since for 32-bit paing, the XD bit is /* check for nx, since for 32-bit paing, the XD bit is
* reserved(0), use the same logic as PAE/4-level paging */ * reserved(0), use the same logic as PAE/4-level paging */
if (pw_info->is_inst_fetch && pw_info->nxe && if ((fault == 0) && pw_info->is_inst_fetch && pw_info->nxe &&
((entry & PAGE_NX) != 0U)) { ((entry & PAGE_NX) != 0U)) {
fault = 1;
goto out;
}
/* check for U/S */
if ((entry & PAGE_USER) == 0U) {
is_user_mode_addr = false;
if (pw_info->is_user_mode_access) {
fault = 1; fault = 1;
goto out;
} }
/* check for U/S */
if ((fault == 0) && (entry & PAGE_USER) == 0U) {
is_user_mode_addr = false;
if (pw_info->is_user_mode_access) {
fault = 1;
}
}
if ((fault == 0) && pw_info->pse &&
((i > 0U) && ((entry & PAGE_PSE) != 0U))) {
break;
}
addr = entry;
} }
if (pw_info->pse && ((i > 0U) && ((entry & PAGE_PSE) != 0U))) { /* When SMAP/SMEP is on, we only need to apply check when address is
break; * user-mode address.
} * Also SMAP/SMEP only impact the supervisor-mode access.
addr = entry; */
} /* if smap is enabled and supervisor-mode access */
if ((fault == 0) && pw_info->is_smap_on && !pw_info->is_user_mode_access &&
/* When SMAP/SMEP is on, we only need to apply check when address is
* user-mode address.
* Also SMAP/SMEP only impact the supervisor-mode access.
*/
/* if smap is enabled and supervisor-mode access */
if (pw_info->is_smap_on && !pw_info->is_user_mode_access &&
is_user_mode_addr) { is_user_mode_addr) {
bool rflags_ac = ((vcpu_get_rflags(vcpu) & RFLAGS_AC) != 0UL); bool rflags_ac = ((vcpu_get_rflags(vcpu) & RFLAGS_AC) != 0UL);
/* read from user mode address, eflags.ac = 0 */ /* read from user mode address, eflags.ac = 0 */
if (!pw_info->is_write_access && !rflags_ac) { if (!pw_info->is_write_access && !rflags_ac) {
fault = 1;
goto out;
}
/* write to user mode address */
if (pw_info->is_write_access) {
/* cr0.wp = 0, eflags.ac = 0 */
if (!pw_info->wp && !rflags_ac) {
fault = 1; fault = 1;
goto out; } else if (pw_info->is_write_access) {
} /* write to user mode address */
/* cr0.wp = 1, eflags.ac = 1, r/w flag is 0 /* cr0.wp = 0, eflags.ac = 0 */
* on any paging structure entry if (!pw_info->wp && !rflags_ac) {
*/ fault = 1;
if (pw_info->wp && rflags_ac && !is_page_rw_flags_on) { }
fault = 1;
goto out;
}
/* cr0.wp = 1, eflags.ac = 0 */ /* cr0.wp = 1, eflags.ac = 1, r/w flag is 0
if (pw_info->wp && !rflags_ac) { * on any paging structure entry
fault = 1; */
goto out; if (pw_info->wp && rflags_ac && !is_page_rw_flags_on) {
fault = 1;
}
/* cr0.wp = 1, eflags.ac = 0 */
if (pw_info->wp && !rflags_ac) {
fault = 1;
}
} }
} }
}
/* instruction fetch from user-mode address, smep on */ /* instruction fetch from user-mode address, smep on */
if (pw_info->is_smep_on && !pw_info->is_user_mode_access && if ((fault == 0) && pw_info->is_smep_on && !pw_info->is_user_mode_access &&
is_user_mode_addr && pw_info->is_inst_fetch) { is_user_mode_addr && pw_info->is_inst_fetch) {
fault = 1; fault = 1;
goto out; }
}
entry >>= shift; if (fault == 0) {
/* shift left 12bit more and back to clear XD/Prot Key/Ignored bits */ entry >>= shift;
entry <<= (shift + 12U); /* shift left 12bit more and back to clear XD/Prot Key/Ignored bits */
entry >>= 12U; entry <<= (shift + 12U);
*gpa = entry | (gva & (page_size - 1UL)); entry >>= 12U;
out: *gpa = entry | (gva & (page_size - 1UL));
}
clac(); clac();
if (fault != 0) { if (fault != 0) {
ret = -EFAULT; ret = -EFAULT;
*err_code |= PAGE_FAULT_P_FLAG; *err_code |= PAGE_FAULT_P_FLAG;
}
} }
return ret; return ret;
} }
@ -227,28 +219,21 @@ static int32_t local_gva2gpa_pae(struct acrn_vcpu *vcpu, struct page_walk_info *
uint64_t *base; uint64_t *base;
uint64_t entry; uint64_t entry;
uint64_t addr; uint64_t addr;
int32_t ret; int32_t ret = -EFAULT;
addr = pw_info->top_entry & 0xFFFFFFF0U; addr = pw_info->top_entry & 0xFFFFFFF0U;
base = (uint64_t *)gpa2hva(vcpu->vm, addr); base = (uint64_t *)gpa2hva(vcpu->vm, addr);
if (base == NULL) { if (base != NULL) {
ret = -EFAULT; index = (gva >> 30U) & 0x3UL;
goto out; entry = base[index];
if ((entry & PAGE_PRESENT) != 0U) {
pw_info->level = 2U;
pw_info->top_entry = entry;
ret = local_gva2gpa_common(vcpu, pw_info, gva, gpa, err_code);
}
} }
index = (gva >> 30U) & 0x3UL;
entry = base[index];
if ((entry & PAGE_PRESENT) == 0U) {
ret = -EFAULT;
goto out;
}
pw_info->level = 2U;
pw_info->top_entry = entry;
ret = local_gva2gpa_common(vcpu, pw_info, gva, gpa, err_code);
out:
return ret; return ret;
} }