Skip to contentSkip to conversation

mce: use safe MSR accesses

PATCH Applied [email protected] 4 participants 4 messages Mar 13, 2015 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mce: use safe MSR accesses

From: Jesse Larrew <[email protected]>

Certain MSRs are only relevant to a kernel in host mode, and kvm had chosen not to implement these MSRs at all for guests. If a guest kernel ever tried to access these MSRs, the result was a general protection fault.

KVM will be separately patched to return 0 when these MSRs are read, and this patch ensures that MSR accesses are tolerant of exceptions.

---
 arch/x86/kernel/cpu/mcheck/mce.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +3 -8
index 61a9668ce..2737ced 100644
@@ -1540,7 +1540,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 		 if (c->x86 == 0x15 &&
 		     (c->x86_model >= 0x10 && c->x86_model <= 0x1f)) {
 			 int i;
-			 u64 val, hwcr;
+			 u64 hwcr;
 			 bool need_toggle;
 			 u32 msrs[] = {
 				0x00000413, /* MC4_MISC0 */
@@ -1556,13 +1556,8 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 				 wrmsrl(MSR_K7_HWCR, hwcr | BIT(18));
 
 			 for (i = 0; i < ARRAY_SIZE(msrs); i++) {
-				 rdmsrl(msrs[i], val);
-
-				 /* CntP bit set? */
-				 if (val & BIT_64(62)) {
-					val &= ~BIT_64(62);
-					wrmsrl(msrs[i], val);
-				 }
+				 /* Clear CntP bit safely */
+				 msr_clear_bit(msrs[i], 62);
 			 }
 
 			 /* restore old settings */
Signature · 1 line
1.9.1
Acked-by on v2 1/1
#1 lore raw

- rdmsrl(msrs[i], val);
-
- /* CntP bit set? */
- if (val & BIT_64(62)) {
- val &= ~BIT_64(62);
- wrmsrl(msrs[i], val);
- }
+ /* Clear CntP bit safely */
+ msr_clear_bit(msrs[i], 62);

Very nice! Clean solution with less lines of code than the original.

Reviewed-by on v2 1/1
#2 lore raw
In reply to [email protected]
Quoted 34 lines · On 03/13/2015 11:03 AM, [email protected] wrote:

From: Jesse Larrew <[email protected]>

Certain MSRs are only relevant to a kernel in host mode, and kvm had chosen not to implement these MSRs at all for guests. If a guest kernel ever tried to access these MSRs, the result was a general protection fault.

KVM will be separately patched to return 0 when these MSRs are read, and this patch ensures that MSR accesses are tolerant of exceptions.

---
 arch/x86/kernel/cpu/mcheck/mce.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +1 -3
index 61a9668ce..2737ced 100644
@@ -1540,7 +1540,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 		 if (c->x86 == 0x15 &&
 		     (c->x86_model >= 0x10 && c->x86_model <= 0x1f)) {
 			 int i;
-			 u64 val, hwcr;
+			 u64 hwcr;
 			 bool need_toggle;
 			 u32 msrs[] = {
 				0x00000413, /* MC4_MISC0 */
@@ -1556,13 +1556,8 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 				 wrmsrl(MSR_K7_HWCR, hwcr | BIT(18));
 
 			 for (i = 0; i < ARRAY_SIZE(msrs); i++) {
-				 rdmsrl(msrs[i], val);
-

arch/x86/kernel/cpu/mcheck/mce.c static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) · line 1563

Quoted 10 lines
arch/x86/kernel/cpu/mcheck/mce.c +2 -5
-				 /* CntP bit set? */
-				 if (val & BIT_64(62)) {
-					val &= ~BIT_64(62);
-					wrmsrl(msrs[i], val);
-				 }
+				 /* Clear CntP bit safely */
+				 msr_clear_bit(msrs[i], 62);
 			 }
 
 			 /* restore old settings */

I like it.

maintainer Applied
#3 lore raw
In reply to [email protected]
Quoted 7 lines · On Fri, Mar 13, 2015 at 11:03:39AM -0500, [email protected] wrote:

From: Jesse Larrew <[email protected]>

Certain MSRs are only relevant to a kernel in host mode, and kvm had chosen not to implement these MSRs at all for guests. If a guest kernel ever tried to access these MSRs, the result was a general protection fault.

Quoted 7 lines

KVM will be separately patched to return 0 when these MSRs are read, and this patch ensures that MSR accesses are tolerant of exceptions.

---
 arch/x86/kernel/cpu/mcheck/mce.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Applied, thanks.

Signature · 5 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--