@@ -333,14 +333,58 @@ int get_msr_fd(int cpu)
return fd;
}
+/*
+ * Open a file, and exit on failure
+ */
+FILE *fopen_or_die(const char *path, const char *mode)
+{
+ FILE *filep = fopen(path, mode);
+
+ if (!filep)
+ err(1, "%s: open failed", path);
+ return filep;
+}
+
+void err_on_hypervisor(void)
+{
+ FILE *cpuinfo;
+ char *flags, *hypervisor;
+ char *buffer;
+
+ /* On VMs /proc/cpuinfo contains a "flags" entry for hypervisor */
+ cpuinfo = fopen_or_die("/proc/cpuinfo", "ro");
+
+ buffer = malloc(4096);
+ if (!buffer)
+ err(-ENOMEM, "buffer malloc fail");
+
+ fread(buffer, 1024, 1, cpuinfo);
+
+ flags = strstr(buffer, "flags");
+ rewind(cpuinfo);
+ fseek(cpuinfo, flags - buffer, SEEK_SET);
+ fgets(buffer, 4096, cpuinfo);
+ fclose(cpuinfo);
+
+ hypervisor = strstr(buffer, "hypervisor");
+
+ free(buffer);
+
+ if (hypervisor)
+ err(-1,
+ "turbostat is not supported on this virtual machine.");
+}
+
int get_msr(int cpu, off_t offset, unsigned long long *msr)
{
ssize_t retval;
retval = pread(get_msr_fd(cpu), msr, sizeof(*msr), offset);
- if (retval != sizeof *msr)
+ if (retval != sizeof *msr) {
+ err_on_hypervisor();
err(-1, "cpu%d: msr offset 0x%llx read failed", cpu, (unsigned long long)offset);
+ }
return 0;
}
@@ -1453,17 +1497,6 @@ static unsigned long long rdtsc(void)
}
/*
- * Open a file, and exit on failure
- */
-FILE *fopen_or_die(const char *path, const char *mode)
-{
- FILE *filep = fopen(path, mode);
-
- if (!filep)
- err(1, "%s: open failed", path);
- return filep;
-}
-/*
* snapshot_sysfs_counter()
*
* return snapshot of given counter
When running turbostat on a virtual machine the error turbostat: msr 0 offset 0xe2 read failed: Input/output error is output to the user. /dev/msr and perf do not work on a virtual machine. turbostat is dependent on that support so turbostat does not work either. When an error is returned from an msr read, turbostat must check to see if the system is a virtual machine and return an error to the user. [v2]: Only check for VM if msr read fails Signed-off-by: Prarit Bhargava <prarit@redhat.com> Cc: Len Brown <len.brown@intel.com> Cc: Len Brown <lenb@kernel.org> Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br> --- tools/power/x86/turbostat/turbostat.c | 57 +++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 12 deletions(-)