Skip to contentSkip to conversation

PATCH: Fix SVM MSR indexes for 32bit kernel

PATCH H. J. Lu 2 participants 2 messages Jun 29, 2007

lore
Share & tools
lore

H. J. Lu

author
#0 lore raw

Hi,

MSR index is 32bit not 64bit. All other MSR indexes are defined without the ULL suffix. Otherwise, you will get

[hjl@gnu-5 tmp]$ cat foo.c
typedef unsigned long long u64;

int is_disabled(void)
{
u64 vm_cr;

do { unsigned long l__,h__; __asm__ __volatile__("rdmsr" : "=a" (l__),
"=d" (h__) : "c" (0xc0010114ULL)); vm_cr = l__; vm_cr |= ((u64)h__<<32); } while(0);
if (vm_cr & (1 << 4))
return 1;

return 0;
}
[hjl@gnu-5 tmp]$ gcc -m32 -S foo.c
foo.c: In function â_disabledâfoo.c:7: error: impossible register constraint in âmâoo.c:12: confused by earlier errors, bailing out [hjl@gnu-5 tmp]$

on 32bit. This patch removes the ULL suffix in SVM MSR indexes.

H.J.

drivers/kvm/svm.h renamed from drivers/kvm/svm.h.msr +2 -2
@@ -175,8 +175,8 @@ struct __attribute__ ((__packed__)) vmcb
 #define SVM_CPUID_FUNC 0x8000000a
 
 #define MSR_EFER_SVME_MASK (1ULL << 12)
-#define MSR_VM_CR       0xc0010114ULL
-#define MSR_VM_HSAVE_PA 0xc0010117ULL
+#define MSR_VM_CR       0xc0010114
+#define MSR_VM_HSAVE_PA 0xc0010117
 
 #define SVM_VM_CR_SVM_DISABLE 4
 
#1 lore raw
Quoted 13 lines · H. J. Lu

}
[hjl@gnu-5 tmp]$ gcc -m32 -S foo.c
foo.c: In function â_disabledâfoo.c:7: error: impossible register constraint in âmâoo.c:12: confused by earlier errors, bailing out [hjl@gnu-5 tmp]$

on 32bit. This patch removes the ULL suffix in SVM MSR indexes.

H.J.

drivers/kvm/svm.h struct __attribute__ ((__packed__)) vmcb · line 180

Quoted 8 lines
drivers/kvm/svm.h renamed from drivers/kvm/svm.h.msr +2 -2
@@ -175,8 +175,8 @@ struct __attribute__ ((__packed__)) vmcb
 #define SVM_CPUID_FUNC 0x8000000a
 
 #define MSR_EFER_SVME_MASK (1ULL << 12)
-#define MSR_VM_CR       0xc0010114ULL
-#define MSR_VM_HSAVE_PA 0xc0010117ULL
+#define MSR_VM_CR       0xc0010114
+#define MSR_VM_HSAVE_PA 0xc0010117
 

Please take the MSR indicies out of this file and move them to include/asm-i386/msr-index.h.

-hpa