github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-01 20:05:30 +00:00
Code Issues Projects Releases Wiki Activity

HV: instr_emul: make integer conversion explicit

Browse Source 
This patch makes necessary integer narrowing and/or signedness conversion
explicit.

While some narrowing are expected behavior, the correctness of the others relies
on the specifications of some interfaces (e.g. the higher 32-bit of what
exec_vmread() returns is all 0s if the given field is 32-bit). Add a stub
for now to avoid missing them.

Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2018-07-04 23:32:05 +08:00 committed by lijinxia
parent 158242d507
commit ecce1e6ae4
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hypervisor/arch/x86/guest/instr_emul.c
View File

@ -291,9 +291,9 @@ vie_read_bytereg(struct vcpu *vcpu, struct vie *vie, uint8_t *rval)
* base register right by 8 bits (%ah = %rax >> 8).
*/
if (lhbr != 0)
*rval = val >> 8;
*rval = (uint8_t)(val >> 8);
else
*rval = val;
*rval = (uint8_t)val;
return error;
}
@ -440,7 +440,7 @@ emulate_mov(struct vcpu *vcpu, uint64_t gpa, struct vie *vie,
size = 1U; /* override for byte operation */
error = memread(vcpu, gpa, &val, size, arg);
if (error == 0)
error = vie_write_bytereg(vcpu, vie, val);
error = vie_write_bytereg(vcpu, vie, (uint8_t)val);
break;
case 0x8BU:
/*
@ -503,7 +503,7 @@ emulate_mov(struct vcpu *vcpu, uint64_t gpa, struct vie *vie,
* REX.W + C7/0 mov r/m64, imm32
* (sign-extended to 64-bits)
*/
val = vie->immediate & size2mask[size];
val = (uint64_t)vie->immediate & size2mask[size];
error = memwrite(vcpu, gpa, val, size, arg);
break;
default:
@ -1020,7 +1020,7 @@ emulate_or(struct vcpu *vcpu, uint64_t gpa, struct vie *vie,
* perform the operation with the pre-fetched immediate
* operand and write the result
*/
result = val1 | vie->immediate;
result = val1 | (uint64_t)vie->immediate;
error = memwrite(vcpu, gpa, result, size, arg);
break;
case 0x09U:
@ -1414,8 +1414,8 @@ emulate_bittest(struct vcpu *vcpu, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, __unused mem_region_write_t memwrite,
void *memarg)
{
uint64_t val, rflags;
int error, bitmask;
uint64_t val, rflags, bitmask;
int error;
uint32_t bitoff;
/*
@ -1438,8 +1438,8 @@ emulate_bittest(struct vcpu *vcpu, uint64_t gpa, struct vie *vie,
* Intel SDM, Vol 2, Table 3-2:
* "Range of Bit Positions Specified by Bit Offset Operands"
*/
bitmask = vie->opsize * 8 - 1;
bitoff = vie->immediate & bitmask;
bitmask = (uint64_t)vie->opsize * 8UL - 1UL;
bitoff = (uint64_t)vie->immediate & bitmask;
/* Copy the bit into the Carry flag in %rflags */
if ((val & (1UL << bitoff)) != 0U)
@ -1708,7 +1708,7 @@ vie_init(struct vie *vie, struct vcpu *vcpu)
return ret;
} else if (ret < 0)
return ret;
vie->num_valid = inst_len;
vie->num_valid = (uint8_t)inst_len;
}
return 0;
@ -2132,7 +2132,7 @@ decode_moffset(struct vie *vie)
u.buf[i] = x;
vie_advance(vie);
}
vie->displacement = u.u64;
vie->displacement = (int64_t)u.u64;
return 0;
}

6
hypervisor/arch/x86/guest/instr_emul_wrapper.c
View File

@ -114,8 +114,8 @@ int vm_get_seg_desc(struct vcpu *vcpu, enum cpu_reg_name seg,
return -EINVAL;
desc->base = exec_vmread(base);
desc->limit = exec_vmread(limit);
desc->access = exec_vmread(access);
desc->limit = (uint32_t)exec_vmread(limit);
desc->access = (uint32_t)exec_vmread(access);
return 0;
}
@ -313,7 +313,7 @@ int decode_instruction(struct vcpu *vcpu)
return retval;
}
csar = exec_vmread(VMX_GUEST_CS_ATTR);
csar = (uint32_t)exec_vmread(VMX_GUEST_CS_ATTR);
get_guest_paging_info(vcpu, emul_cnx, csar);
cpu_mode = get_vcpu_mode(vcpu);

11
hypervisor/include/arch/x86/vmx.h
View File

@ -402,7 +402,18 @@
/* External Interfaces */
int exec_vmxon_instr(uint16_t pcpu_id);
/**
* Read field from VMCS.
*
* Refer to Chapter 24, Vol. 3 in SDM for the width of VMCS fields.
*
* @return full contents in IA-32e mode for 64-bit fields.
* @return the lower 32-bit outside IA-32e mode for 64-bit fields.
* @return full contents for 32-bit fields, with higher 32-bit set to 0.
*/
uint64_t exec_vmread(uint32_t field);
uint64_t exec_vmread64(uint32_t field_full);
void exec_vmwrite(uint32_t field, uint64_t value);
void exec_vmwrite64(uint32_t field_full, uint64_t value);