X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fvirt.c;h=f10baab40bc0ccbc0620930e467f0ffc6d4908b4;hp=1abd6863ea5aa5fb6d010113b8415eaed2a8e85d;hb=536bfdab4cca38916ec8b112a6f80b0c068cc806;hpb=7080ea16b5a0bfd71bfcdffc998e91f5273d47f9

diff --git a/src/shared/virt.c b/src/shared/virt.c
index 1abd6863e..f10baab40 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -27,28 +27,10 @@
 #include "virt.h"
 #include "fileio.h"
 
-/* Returns a short identifier for the various VM implementations */
-int detect_vm(const char **id) {
-
-#if defined(__i386__) || defined(__x86_64__)
+static int detect_vm_cpuid(const char **_id) {
 
         /* Both CPUID and DMI are x86 specific interfaces... */
-
-        static const char *const dmi_vendors[] = {
-                "/sys/class/dmi/id/sys_vendor",
-                "/sys/class/dmi/id/board_vendor",
-                "/sys/class/dmi/id/bios_vendor"
-        };
-
-        static const char dmi_vendor_table[] =
-                "QEMU\0"                  "qemu\0"
-                /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
-                "VMware\0"                "vmware\0"
-                "VMW\0"                   "vmware\0"
-                "Microsoft Corporation\0" "microsoft\0"
-                "innotek GmbH\0"          "oracle\0"
-                "Xen\0"                   "xen\0"
-                "Bochs\0"                 "bochs\0";
+#if defined(__i386__) || defined(__x86_64__)
 
         static const char cpuid_vendor_table[] =
                 "XenVMMXenVMM\0"          "xen\0"
@@ -63,26 +45,8 @@ int detect_vm(const char **id) {
                 uint32_t sig32[3];
                 char text[13];
         } sig = {};
-        unsigned i;
         const char *j, *k;
         bool hypervisor;
-        _cleanup_free_ char *hvtype = NULL;
-        _cleanup_free_ char *cpuinfo_contents = NULL;
-        int r;
-
-        /* Try high-level hypervisor sysfs file first:
-         *
-         * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */
-        r = read_one_line_file("/sys/hypervisor/type", &hvtype);
-        if (r >= 0) {
-                if (streq(hvtype, "xen")) {
-                        if (id)
-                                *id = "xen";
-
-                        return 1;
-                }
-        } else if (r != -ENOENT)
-                return r;
 
         /* http://lwn.net/Articles/301888/ */
 
@@ -125,17 +89,43 @@ int detect_vm(const char **id) {
 
                 NULSTR_FOREACH_PAIR(j, k, cpuid_vendor_table)
                         if (streq(sig.text, j)) {
-
-                                if (id)
-                                        *id = k;
-
+                                *_id = k;
                                 return 1;
                         }
+
+                *_id = "other";
+                return 0;
         }
+#endif
+
+        return 0;
+}
+
+static int detect_vm_dmi(const char **_id) {
+
+        /* Both CPUID and DMI are x86 specific interfaces... */
+#if defined(__i386__) || defined(__x86_64__)
+
+        static const char *const dmi_vendors[] = {
+                "/sys/class/dmi/id/sys_vendor",
+                "/sys/class/dmi/id/board_vendor",
+                "/sys/class/dmi/id/bios_vendor"
+        };
+
+        static const char dmi_vendor_table[] =
+                "QEMU\0"                  "qemu\0"
+                /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
+                "VMware\0"                "vmware\0"
+                "VMW\0"                   "vmware\0"
+                "innotek GmbH\0"          "oracle\0"
+                "Xen\0"                   "xen\0"
+                "Bochs\0"                 "bochs\0";
+        unsigned i;
 
         for (i = 0; i < ELEMENTSOF(dmi_vendors); i++) {
                 _cleanup_free_ char *s = NULL;
-                const char *found = NULL;
+                const char *j, *k;
+                int r;
 
                 r = read_one_line_file(dmi_vendors[i], &s);
                 if (r < 0) {
@@ -146,138 +136,230 @@ int detect_vm(const char **id) {
                 }
 
                 NULSTR_FOREACH_PAIR(j, k, dmi_vendor_table)
-                        if (startswith(s, j))
-                                found = k;
+                        if (startswith(s, j)) {
+                                *_id = k;
+                                return 1;
+                        }
+        }
+#endif
 
-                if (found) {
-                        if (id)
-                                *id = found;
+        return 0;
+}
 
-                        return 1;
-                }
-        }
+/* Returns a short identifier for the various VM implementations */
+int detect_vm(const char **id) {
+        _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL;
+        static thread_local int cached_found = -1;
+        static thread_local const char *cached_id = NULL;
+        const char *_id = NULL;
+        int r;
+
+        if (_likely_(cached_found >= 0)) {
 
-        if (hypervisor || hvtype) {
                 if (id)
-                        *id = "other";
+                        *id = cached_id;
 
-                return 1;
+                return cached_found;
         }
 
-#endif
+        /* Try xen capabilities file first, if not found try high-level hypervisor sysfs file:
+         *
+         * https://bugs.freedesktop.org/show_bug.cgi?id=77271 */
+        r = read_one_line_file("/proc/xen/capabilities", &domcap);
+        if (r >= 0) {
+                char *cap, *i = domcap;
+
+                while ((cap = strsep(&i, ",")))
+                        if (streq(cap, "control_d"))
+                                break;
+
+                if (!cap)  {
+                        _id = "xen";
+                        r = 1;
+                }
+
+                goto finish;
+
+        } else if (r == -ENOENT) {
+                _cleanup_free_ char *hvtype = NULL;
+
+                r = read_one_line_file("/sys/hypervisor/type", &hvtype);
+                if (r >= 0) {
+                        if (streq(hvtype, "xen")) {
+                                _id = "xen";
+                                r = 1;
+                                goto finish;
+                        }
+                } else if (r != -ENOENT)
+                        return r;
+        } else
+                return r;
+
+        /* this will set _id to "other" and return 0 for unknown hypervisors */
+        r = detect_vm_cpuid(&_id);
+        if (r != 0)
+                goto finish;
+
+        r = detect_vm_dmi(&_id);
+        if (r != 0)
+                goto finish;
+
+        if (_id) {
+                /* "other" */
+                r = 1;
+                goto finish;
+        }
 
         /* Detect User-Mode Linux by reading /proc/cpuinfo */
         r = read_full_file("/proc/cpuinfo", &cpuinfo_contents, NULL);
         if (r < 0)
                 return r;
         if (strstr(cpuinfo_contents, "\nvendor_id\t: User Mode Linux\n")) {
-                *id = "uml";
-                return 1;
+                _id = "uml";
+                r = 1;
+                goto finish;
         }
 
-        return 0;
+#if defined(__s390__)
+        {
+                _cleanup_free_ char *t = NULL;
+
+                r = get_status_field("/proc/sysinfo", "VM00 Control Program:", &t);
+                if (r >= 0) {
+                        if (streq(t, "z/VM"))
+                                _id = "zvm";
+                        else
+                                _id = "kvm";
+                        r = 1;
+
+                        goto finish;
+                }
+        }
+#endif
+
+        r = 0;
+
+finish:
+        cached_found = r;
+
+        cached_id = _id;
+        if (id)
+                *id = _id;
+
+        return r;
 }
 
 int detect_container(const char **id) {
-        _cleanup_free_ char *e = NULL;
-        int r;
 
-        /* Unfortunately many of these operations require root access
-         * in one way or another */
+        static thread_local int cached_found = -1;
+        static thread_local const char *cached_id = NULL;
 
-        r = running_in_chroot();
-        if (r < 0)
-                return r;
-        if (r > 0) {
+        _cleanup_free_ char *m = NULL;
+        const char *_id = NULL, *e = NULL;
+        int r;
+
+        if (_likely_(cached_found >= 0)) {
 
                 if (id)
-                        *id = "chroot";
+                        *id = cached_id;
 
-                return 1;
+                return cached_found;
         }
 
         /* /proc/vz exists in container and outside of the container,
          * /proc/bc only outside of the container. */
         if (access("/proc/vz", F_OK) >= 0 &&
             access("/proc/bc", F_OK) < 0) {
-
-                if (id)
-                        *id = "openvz";
-
-                return 1;
+                _id = "openvz";
+                r = 1;
+                goto finish;
         }
 
-        r = getenv_for_pid(1, "container", &e);
-        if (r <= 0)
-                return r;
+        if (getpid() == 1) {
+                /* If we are PID 1 we can just check our own
+                 * environment variable */
 
-        /* We only recognize a selected few here, since we want to
-         * enforce a redacted namespace */
-        if (streq(e, "lxc")) {
-                if (id)
-                        *id = "lxc";
-        } else if (streq(e, "lxc-libvirt")) {
-                if (id)
-                        *id = "lxc-libvirt";
-        } else if (streq(e, "systemd-nspawn")) {
-                if (id)
-                        *id = "systemd-nspawn";
+                e = getenv("container");
+                if (isempty(e)) {
+                        r = 0;
+                        goto finish;
+                }
         } else {
-                if (id)
-                        *id = "other";
-        }
 
-        return r;
-}
+                /* Otherwise, PID 1 dropped this information into a
+                 * file in /run. This is better than accessing
+                 * /proc/1/environ, since we don't need CAP_SYS_PTRACE
+                 * for that. */
 
-/* Returns a short identifier for the various VM/container implementations */
-Virtualization detect_virtualization(const char **id) {
+                r = read_one_line_file("/run/systemd/container", &m);
+                if (r == -ENOENT) {
 
-        static __thread Virtualization cached_virt = _VIRTUALIZATION_INVALID;
-        static __thread const char *cached_id = NULL;
+                        /* Fallback for cases where PID 1 was not
+                         * systemd (for example, cases where
+                         * init=/bin/sh is used. */
 
-        const char *_id;
-        int r;
-        Virtualization v;
+                        r = getenv_for_pid(1, "container", &m);
+                        if (r <= 0) {
 
-        if (_likely_(cached_virt >= 0)) {
+                                /* If that didn't work, give up,
+                                 * assume no container manager.
+                                 *
+                                 * Note: This means we still cannot
+                                 * detect containers if init=/bin/sh
+                                 * is passed but privileges dropped,
+                                 * as /proc/1/environ is only readable
+                                 * with privileges. */
 
-                if (id && cached_virt > 0)
-                        *id = cached_id;
+                                r = 0;
+                                goto finish;
+                        }
+                }
+                if (r < 0)
+                        return r;
 
-                return cached_virt;
+                e = m;
         }
 
-        r = detect_container(&_id);
-        if (r < 0) {
-                v = r;
-                goto finish;
-        } else if (r > 0) {
-                v = VIRTUALIZATION_CONTAINER;
-                goto finish;
-        }
+        /* We only recognize a selected few here, since we want to
+         * enforce a redacted namespace */
+        if (streq(e, "lxc"))
+                _id ="lxc";
+        else if (streq(e, "lxc-libvirt"))
+                _id = "lxc-libvirt";
+        else if (streq(e, "systemd-nspawn"))
+                _id = "systemd-nspawn";
+        else if (streq(e, "docker"))
+                _id = "docker";
+        else
+                _id = "other";
+
+        r = 1;
 
-        r = detect_vm(&_id);
-        if (r < 0) {
-                v = r;
-                goto finish;
-        } else if (r > 0) {
-                v = VIRTUALIZATION_VM;
-                goto finish;
-        }
+finish:
+        cached_found = r;
 
-        v = VIRTUALIZATION_NONE;
+        cached_id = _id;
+        if (id)
+                *id = _id;
 
-finish:
-        if (v > 0) {
-                cached_id = _id;
+        return r;
+}
 
-                if (id)
-                        *id = _id;
-        }
+/* Returns a short identifier for the various VM/container implementations */
+int detect_virtualization(const char **id) {
+        int r;
 
-        if (v >= 0)
-                cached_virt = v;
+        r = detect_container(id);
+        if (r < 0)
+                return r;
+        if (r > 0)
+                return VIRTUALIZATION_CONTAINER;
+
+        r = detect_vm(id);
+        if (r < 0)
+                return r;
+        if (r > 0)
+                return VIRTUALIZATION_VM;
 
-        return v;
+        return VIRTUALIZATION_NONE;
 }