This is a fastpath on virtual vmentry/exit, and forcing guest_pat to be spilled to the stack is bad. Performing the shift in a register is far more efficient.
Drop the (IMO useless) log message. MSR_PAT only gets altered on boot, and a bad value will be entirely evident in the ensuing #GP backtrace. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Jan Beulich <[email protected]> CC: Roger Pau Monné <[email protected]> CC: Wei Liu <[email protected]> --- xen/arch/x86/hvm/hvm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d233550ae47b..e3c9b3794544 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -299,13 +299,13 @@ void hvm_get_guest_pat(struct vcpu *v, u64 *guest_pat) *guest_pat = v->arch.hvm.pat_cr; } -int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) +int hvm_set_guest_pat(struct vcpu *v, uint64_t guest_pat) { - int i; - uint8_t *value = (uint8_t *)&guest_pat; + unsigned int i; + uint64_t tmp; - for ( i = 0; i < 8; i++ ) - switch ( value[i] ) + for ( i = 0, tmp = guest_pat; i < 8; i++, tmp >>= 8 ) + switch ( tmp & 0xff ) { case PAT_TYPE_UC_MINUS: case PAT_TYPE_UNCACHABLE: @@ -313,10 +313,9 @@ int hvm_set_guest_pat(struct vcpu *v, u64 guest_pat) case PAT_TYPE_WRCOMB: case PAT_TYPE_WRPROT: case PAT_TYPE_WRTHROUGH: - break; + continue; + default: - HVM_DBG_LOG(DBG_LEVEL_MSR, "invalid guest PAT: %"PRIx64"\n", - guest_pat); return 0; } -- 2.11.0
