linux-kernel - [PATCH 2/2] avoid mtrr warning message when running as VMware guest

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 8 Sep 2008 07:47:21 +0800
From:	Yan Li <elliot.li.tech@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	mingo@...e.hu, joerg.roedel@....com, elliot.li.tech@...il.com,
	rjmaomao@...il.com
Subject: [PATCH 2/2] avoid mtrr warning message when running as VMware guest

This patch depends on VMware detection.

Signed-off-by: Yan Li <elliot.li.tech@...il.com>
---
 arch/x86/kernel/cpu/mtrr/main.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index b117d7f..7e2bd23 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -45,6 +45,7 @@
 #include <asm/processor.h>
 #include <asm/msr.h>
 #include <asm/kvm_para.h>
+#include <asm/vmware.h>
 #include "mtrr.h"
 
 u32 num_var_ranges = 0;
@@ -1496,8 +1497,8 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)
 
 	/* kvm/qemu doesn't have mtrr set right, don't trim them all */
 	if (!highest_pfn) {
-		WARN(!kvm_para_available(), KERN_WARNING
-				"WARNING: strange, CPU MTRRs all blank?\n");
+		WARN(!(kvm_para_available() || (is_vmware_guest())),
+		     KERN_WARNING "WARNING: strange, CPU MTRRs all blank?\n");
 		return 0;
 	}
 
-- 
1.5.6.3


-- 
Li, Yan

"Everything that is really great and inspiring is created by the
individual who can labor in freedom."
              - Albert Einstein, in Out of My Later Years (1950)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/