Imported Upstream version 0.8.9
[platform/upstream/multipath-tools.git] / libmultipath / uevent.c
index 80bf1dd..29e2557 100644 (file)
@@ -41,9 +41,7 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <libudev.h>
-#include <errno.h>
 
-#include "memory.h"
 #include "debug.h"
 #include "list.h"
 #include "uevent.h"
@@ -52,6 +50,7 @@
 #include "util.h"
 #include "config.h"
 #include "blacklist.h"
+#include "devmapper.h"
 
 #define MAX_ACCUMULATION_COUNT 2048
 #define MAX_ACCUMULATION_TIME 30*1000
 
 typedef int (uev_trigger)(struct uevent *, void * trigger_data);
 
-LIST_HEAD(uevq);
-pthread_mutex_t uevq_lock = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t *uevq_lockp = &uevq_lock;
-pthread_cond_t uev_cond = PTHREAD_COND_INITIALIZER;
-pthread_cond_t *uev_condp = &uev_cond;
-uev_trigger *my_uev_trigger;
-void * my_trigger_data;
-int servicing_uev;
+static LIST_HEAD(uevq);
+static pthread_mutex_t uevq_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t *uevq_lockp = &uevq_lock;
+static pthread_cond_t uev_cond = PTHREAD_COND_INITIALIZER;
+static pthread_cond_t *uev_condp = &uev_cond;
+static uev_trigger *my_uev_trigger;
+static void *my_trigger_data;
+static int servicing_uev;
 
 int is_uevent_busy(void)
 {
@@ -80,7 +79,7 @@ int is_uevent_busy(void)
 
 struct uevent * alloc_uevent (void)
 {
-       struct uevent *uev = MALLOC(sizeof(struct uevent));
+       struct uevent *uev = calloc(1, sizeof(struct uevent));
 
        if (uev) {
                INIT_LIST_HEAD(&uev->node);
@@ -90,62 +89,111 @@ struct uevent * alloc_uevent (void)
        return uev;
 }
 
-void
-uevq_cleanup(struct list_head *tmpq)
+static void uevq_cleanup(struct list_head *tmpq);
+
+static void cleanup_uev(void *arg)
+{
+       struct uevent *uev = arg;
+
+       uevq_cleanup(&uev->merge_node);
+       if (uev->udev)
+               udev_device_unref(uev->udev);
+       free(uev);
+}
+
+static void uevq_cleanup(struct list_head *tmpq)
 {
        struct uevent *uev, *tmp;
 
        list_for_each_entry_safe(uev, tmp, tmpq, node) {
                list_del_init(&uev->node);
-
-               if (uev->udev)
-                       udev_device_unref(uev->udev);
-               FREE(uev);
+               cleanup_uev(uev);
        }
 }
 
-void
-uevent_get_wwid(struct uevent *uev)
+static const char* uevent_get_env_var(const struct uevent *uev,
+                                     const char *attr)
 {
        int i;
-       char *uid_attribute;
-       struct config * conf;
+       size_t len;
+       const char *p = NULL;
 
-       conf = get_multipath_config();
-       uid_attribute = parse_uid_attribute_by_attrs(conf->uid_attrs, uev->kernel);
-       put_multipath_config(conf);
+       if (attr == NULL)
+               goto invalid;
 
-       if (!uid_attribute)
-               return;
+       len = strlen(attr);
+       if (len == 0)
+               goto invalid;
 
        for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], uid_attribute, strlen(uid_attribute)) &&
-                   strlen(uev->envp[i]) > strlen(uid_attribute) &&
-                   uev->envp[i][strlen(uid_attribute)] == '=') {
-                       uev->wwid = uev->envp[i] + strlen(uid_attribute) + 1;
+               const char *var = uev->envp[i];
+
+               if (strlen(var) > len &&
+                   !memcmp(var, attr, len) && var[len] == '=') {
+                       p = var + len + 1;
                        break;
                }
        }
-       free(uid_attribute);
+
+       condlog(4, "%s: %s -> '%s'", __func__, attr, p ?: "(null)");
+       return p;
+
+invalid:
+       condlog(2, "%s: empty variable name", __func__);
+       return NULL;
 }
 
-bool
-uevent_need_merge(void)
+int uevent_get_env_positive_int(const struct uevent *uev,
+                                      const char *attr)
+{
+       const char *p = uevent_get_env_var(uev, attr);
+       char *q;
+       int ret;
+
+       if (p == NULL || *p == '\0')
+               return -1;
+
+       ret = strtoul(p, &q, 10);
+       if (*q != '\0' || ret < 0) {
+               condlog(2, "%s: invalid %s: '%s'", __func__, attr, p);
+               return -1;
+       }
+       return ret;
+}
+
+void
+uevent_get_wwid(struct uevent *uev)
+{
+       char *uid_attribute;
+       const char *val;
+       struct config * conf;
+
+       conf = get_multipath_config();
+       pthread_cleanup_push(put_multipath_config, conf);
+       uid_attribute = get_uid_attribute_by_attrs(conf, uev->kernel);
+       pthread_cleanup_pop(1);
+
+       val = uevent_get_env_var(uev, uid_attribute);
+       if (val)
+               uev->wwid = val;
+}
+
+static bool uevent_need_merge(void)
 {
        struct config * conf;
        bool need_merge = false;
 
        conf = get_multipath_config();
-       if (conf->uid_attrs)
+       if (VECTOR_SIZE(&conf->uid_attrs) > 0)
                need_merge = true;
        put_multipath_config(conf);
 
        return need_merge;
 }
 
-bool
-uevent_can_discard(struct uevent *uev)
+static bool uevent_can_discard(struct uevent *uev)
 {
+       int invalid = 0;
        struct config * conf;
 
        /*
@@ -157,17 +205,18 @@ uevent_can_discard(struct uevent *uev)
         * filter paths devices by devnode
         */
        conf = get_multipath_config();
+       pthread_cleanup_push(put_multipath_config, conf);
        if (filter_devnode(conf->blist_devnode, conf->elist_devnode,
-                          uev->kernel) > 0) {
-               put_multipath_config(conf);
-               return true;
-       }
-       put_multipath_config(conf);
+                          uev->kernel) > 0)
+               invalid = 1;
+       pthread_cleanup_pop(1);
 
+       if (invalid)
+               return true;
        return false;
 }
 
-bool
+static bool
 uevent_can_filter(struct uevent *earlier, struct uevent *later)
 {
 
@@ -201,7 +250,7 @@ uevent_can_filter(struct uevent *earlier, struct uevent *later)
        return false;
 }
 
-bool
+static bool
 merge_need_stop(struct uevent *earlier, struct uevent *later)
 {
        /*
@@ -217,7 +266,7 @@ merge_need_stop(struct uevent *earlier, struct uevent *later)
        if (!earlier->wwid || !later->wwid)
                return true;
        /*
-        * uevents merging stoped
+        * uevents merging stopped
         * when we meet an opposite action uevent from the same LUN to AVOID
         * "add path1 |remove path1 |add path2 |remove path2 |add path3"
         * to merge as "remove path1, path2" and "add path1, path2, path3"
@@ -238,11 +287,11 @@ merge_need_stop(struct uevent *earlier, struct uevent *later)
        return false;
 }
 
-bool
+static bool
 uevent_can_merge(struct uevent *earlier, struct uevent *later)
 {
        /* merge paths uevents
-        * whose wwids exsit and are same
+        * whose wwids exist and are same
         * and actions are same,
         * and actions are addition or deletion
         */
@@ -257,7 +306,7 @@ uevent_can_merge(struct uevent *earlier, struct uevent *later)
        return false;
 }
 
-void
+static void
 uevent_prepare(struct list_head *tmpq)
 {
        struct uevent *uev, *tmp;
@@ -267,7 +316,7 @@ uevent_prepare(struct list_head *tmpq)
                        list_del_init(&uev->node);
                        if (uev->udev)
                                udev_device_unref(uev->udev);
-                       FREE(uev);
+                       free(uev);
                        continue;
                }
 
@@ -277,7 +326,7 @@ uevent_prepare(struct list_head *tmpq)
        }
 }
 
-void
+static void
 uevent_filter(struct uevent *later, struct list_head *tmpq)
 {
        struct uevent *earlier, *tmp;
@@ -288,19 +337,19 @@ uevent_filter(struct uevent *later, struct list_head *tmpq)
                 * by the later uevent
                 */
                if (uevent_can_filter(earlier, later)) {
-                       condlog(2, "uevent: %s-%s has filtered by uevent: %s-%s",
+                       condlog(3, "uevent: %s-%s has filtered by uevent: %s-%s",
                                earlier->kernel, earlier->action,
                                later->kernel, later->action);
 
                        list_del_init(&earlier->node);
                        if (earlier->udev)
                                udev_device_unref(earlier->udev);
-                       FREE(earlier);
+                       free(earlier);
                }
        }
 }
 
-void
+static void
 uevent_merge(struct uevent *later, struct list_head *tmpq)
 {
        struct uevent *earlier, *tmp;
@@ -312,7 +361,7 @@ uevent_merge(struct uevent *later, struct list_head *tmpq)
                 * merge earlier uevents to the later uevent
                 */
                if (uevent_can_merge(earlier, later)) {
-                       condlog(2, "merged uevent: %s-%s-%s with uevent: %s-%s-%s",
+                       condlog(3, "merged uevent: %s-%s-%s with uevent: %s-%s-%s",
                                earlier->action, earlier->kernel, earlier->wwid,
                                later->action, later->kernel, later->wwid);
 
@@ -321,7 +370,7 @@ uevent_merge(struct uevent *later, struct list_head *tmpq)
        }
 }
 
-void
+static void
 merge_uevq(struct list_head *tmpq)
 {
        struct uevent *later;
@@ -334,7 +383,7 @@ merge_uevq(struct list_head *tmpq)
        }
 }
 
-void
+static void
 service_uevq(struct list_head *tmpq)
 {
        struct uevent *uev, *tmp;
@@ -342,14 +391,10 @@ service_uevq(struct list_head *tmpq)
        list_for_each_entry_safe(uev, tmp, tmpq, node) {
                list_del_init(&uev->node);
 
+               pthread_cleanup_push(cleanup_uev, uev);
                if (my_uev_trigger && my_uev_trigger(uev, my_trigger_data))
                        condlog(0, "uevent trigger error");
-
-               uevq_cleanup(&uev->merge_node);
-
-               if (uev->udev)
-                       udev_device_unref(uev->udev);
-               FREE(uev);
+               pthread_cleanup_pop(1);
        }
 }
 
@@ -369,6 +414,18 @@ static void monitor_cleanup(void *arg)
        udev_monitor_unref(monitor);
 }
 
+static void cleanup_uevq(void *arg)
+{
+       uevq_cleanup(arg);
+}
+
+static void cleanup_global_uevq(void *arg __attribute__((unused)))
+{
+       pthread_mutex_lock(uevq_lockp);
+       uevq_cleanup(&uevq);
+       pthread_mutex_unlock(uevq_lockp);
+}
+
 /*
  * Service the uevent queue.
  */
@@ -383,6 +440,7 @@ int uevent_dispatch(int (*uev_trigger)(struct uevent *, void * trigger_data),
        while (1) {
                LIST_HEAD(uevq_tmp);
 
+               pthread_cleanup_push(cleanup_mutex, uevq_lockp);
                pthread_mutex_lock(uevq_lockp);
                servicing_uev = 0;
                /*
@@ -394,255 +452,21 @@ int uevent_dispatch(int (*uev_trigger)(struct uevent *, void * trigger_data),
                }
                servicing_uev = 1;
                list_splice_init(&uevq, &uevq_tmp);
-               pthread_mutex_unlock(uevq_lockp);
+               pthread_cleanup_pop(1);
+
                if (!my_uev_trigger)
                        break;
+
+               pthread_cleanup_push(cleanup_uevq, &uevq_tmp);
                merge_uevq(&uevq_tmp);
                service_uevq(&uevq_tmp);
+               pthread_cleanup_pop(1);
        }
        condlog(3, "Terminating uev service queue");
-       uevq_cleanup(&uevq);
        return 0;
 }
 
-struct uevent *uevent_from_buffer(char *buf, ssize_t buflen)
-{
-       struct uevent *uev;
-       char *buffer;
-       size_t bufpos;
-       int i;
-       char *pos;
-
-       uev = alloc_uevent();
-       if (!uev) {
-               condlog(1, "lost uevent, oom");
-               return NULL;
-       }
-
-       if ((size_t)buflen > sizeof(buf)-1)
-               buflen = sizeof(buf)-1;
-
-       /*
-        * Copy the shared receive buffer contents to buffer private
-        * to this uevent so we can immediately reuse the shared buffer.
-        */
-       memcpy(uev->buffer, buf, HOTPLUG_BUFFER_SIZE + OBJECT_SIZE);
-       buffer = uev->buffer;
-       buffer[buflen] = '\0';
-
-       /* save start of payload */
-       bufpos = strlen(buffer) + 1;
-
-       /* action string */
-       uev->action = buffer;
-       pos = strchr(buffer, '@');
-       if (!pos) {
-               condlog(3, "bad action string '%s'", buffer);
-               FREE(uev);
-               return NULL;
-       }
-       pos[0] = '\0';
-
-       /* sysfs path */
-       uev->devpath = &pos[1];
-
-       /* hotplug events have the environment attached - reconstruct envp[] */
-       for (i = 0; (bufpos < (size_t)buflen) && (i < HOTPLUG_NUM_ENVP-1); i++) {
-               int keylen;
-               char *key;
-
-               key = &buffer[bufpos];
-               keylen = strlen(key);
-               uev->envp[i] = key;
-               /* Filter out sequence number */
-               if (strncmp(key, "SEQNUM=", 7) == 0) {
-                       char *eptr;
-
-                       uev->seqnum = strtoul(key + 7, &eptr, 10);
-                       if (eptr == key + 7)
-                               uev->seqnum = -1;
-               }
-               bufpos += keylen + 1;
-       }
-       uev->envp[i] = NULL;
-
-       condlog(3, "uevent %ld '%s' from '%s'", uev->seqnum,
-               uev->action, uev->devpath);
-       uev->kernel = strrchr(uev->devpath, '/');
-       if (uev->kernel)
-               uev->kernel++;
-
-       /* print payload environment */
-       for (i = 0; uev->envp[i] != NULL; i++)
-               condlog(5, "%s", uev->envp[i]);
-
-       return uev;
-}
-
-int failback_listen(void)
-{
-       int sock;
-       struct sockaddr_nl snl;
-       struct sockaddr_un sun;
-       socklen_t addrlen;
-       int retval;
-       int rcvbufsz = 128*1024;
-       int rcvsz = 0;
-       int rcvszsz = sizeof(rcvsz);
-       unsigned int *prcvszsz = (unsigned int *)&rcvszsz;
-       const int feature_on = 1;
-       /*
-        * First check whether we have a udev socket
-        */
-       memset(&sun, 0x00, sizeof(struct sockaddr_un));
-       sun.sun_family = AF_LOCAL;
-       strcpy(&sun.sun_path[1], "/org/kernel/dm/multipath_event");
-       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(sun.sun_path+1) + 1;
-
-       sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
-       if (sock >= 0) {
-
-               condlog(3, "reading events from udev socket.");
-
-               /* the bind takes care of ensuring only one copy running */
-               retval = bind(sock, (struct sockaddr *) &sun, addrlen);
-               if (retval < 0) {
-                       condlog(0, "bind failed, exit");
-                       goto exit;
-               }
-
-               /* enable receiving of the sender credentials */
-               retval = setsockopt(sock, SOL_SOCKET, SO_PASSCRED,
-                                   &feature_on, sizeof(feature_on));
-               if (retval < 0) {
-                       condlog(0, "failed to enable credential passing, exit");
-                       goto exit;
-               }
-
-       } else {
-               /* Fallback to read kernel netlink events */
-               memset(&snl, 0x00, sizeof(struct sockaddr_nl));
-               snl.nl_family = AF_NETLINK;
-               snl.nl_pid = getpid();
-               snl.nl_groups = 0x01;
-
-               sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
-               if (sock == -1) {
-                       condlog(0, "error getting socket, exit");
-                       return 1;
-               }
-
-               condlog(3, "reading events from kernel.");
-
-               /*
-                * try to avoid dropping uevents, even so, this is not a guarantee,
-                * but it does help to change the netlink uevent socket's
-                * receive buffer threshold from the default value of 106,496 to
-                * the maximum value of 262,142.
-                */
-               retval = setsockopt(sock, SOL_SOCKET, SO_RCVBUF, &rcvbufsz,
-                                   sizeof(rcvbufsz));
-
-               if (retval < 0) {
-                       condlog(0, "error setting receive buffer size for socket, exit");
-                       exit(1);
-               }
-               retval = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, &rcvsz, prcvszsz);
-               if (retval < 0) {
-                       condlog(0, "error setting receive buffer size for socket, exit");
-                       exit(1);
-               }
-               condlog(3, "receive buffer size for socket is %u.", rcvsz);
-
-               /* enable receiving of the sender credentials */
-               if (setsockopt(sock, SOL_SOCKET, SO_PASSCRED,
-                              &feature_on, sizeof(feature_on)) < 0) {
-                       condlog(0, "error on enabling credential passing for socket");
-                       exit(1);
-               }
-
-               retval = bind(sock, (struct sockaddr *) &snl,
-                             sizeof(struct sockaddr_nl));
-               if (retval < 0) {
-                       condlog(0, "bind failed, exit");
-                       goto exit;
-               }
-       }
-
-       while (1) {
-               size_t bufpos;
-               ssize_t buflen;
-               struct uevent *uev;
-               struct msghdr smsg;
-               struct iovec iov;
-               char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
-               struct cmsghdr *cmsg;
-               struct ucred *cred;
-               static char buf[HOTPLUG_BUFFER_SIZE + OBJECT_SIZE];
-
-               memset(buf, 0x00, sizeof(buf));
-               iov.iov_base = &buf;
-               iov.iov_len = sizeof(buf);
-               memset (&smsg, 0x00, sizeof(struct msghdr));
-               smsg.msg_iov = &iov;
-               smsg.msg_iovlen = 1;
-               smsg.msg_control = cred_msg;
-               smsg.msg_controllen = sizeof(cred_msg);
-
-               buflen = recvmsg(sock, &smsg, 0);
-               if (buflen < 0) {
-                       if (errno != EINTR)
-                               condlog(0, "error receiving message, errno %d", errno);
-                       continue;
-               }
-
-               cmsg = CMSG_FIRSTHDR(&smsg);
-               if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
-                       condlog(3, "no sender credentials received, message ignored");
-                       continue;
-               }
-
-               cred = (struct ucred *)CMSG_DATA(cmsg);
-               if (cred->uid != 0) {
-                       condlog(3, "sender uid=%d, message ignored", cred->uid);
-                       continue;
-               }
-
-               /* skip header */
-               bufpos = strlen(buf) + 1;
-               if (bufpos < sizeof("a@/d") || bufpos >= sizeof(buf)) {
-                       condlog(3, "invalid message length");
-                       continue;
-               }
-
-               /* check message header */
-               if (strstr(buf, "@/") == NULL) {
-                       condlog(3, "unrecognized message header");
-                       continue;
-               }
-               if ((size_t)buflen > sizeof(buf)-1) {
-                       condlog(2, "buffer overflow for received uevent");
-                       buflen = sizeof(buf)-1;
-               }
-
-               uev = uevent_from_buffer(buf, buflen);
-               if (!uev)
-                       continue;
-               /*
-                * Queue uevent and poke service pthread.
-                */
-               pthread_mutex_lock(uevq_lockp);
-               list_add_tail(&uev->node, &uevq);
-               pthread_cond_signal(uev_condp);
-               pthread_mutex_unlock(uevq_lockp);
-       }
-
-exit:
-       close(sock);
-       return 1;
-}
-
-struct uevent *uevent_from_udev_device(struct udev_device *dev)
+static struct uevent *uevent_from_udev_device(struct udev_device *dev)
 {
        struct uevent *uev;
        int i = 0;
@@ -684,6 +508,12 @@ struct uevent *uevent_from_udev_device(struct udev_device *dev)
                if (i == HOTPLUG_NUM_ENVP - 1)
                        break;
        }
+       if (!uev->devpath || ! uev->action) {
+               udev_device_unref(dev);
+               condlog(1, "uevent missing necessary fields");
+               free(uev);
+               return NULL;
+       }
        uev->udev = dev;
        uev->envp[i] = NULL;
 
@@ -698,7 +528,7 @@ struct uevent *uevent_from_udev_device(struct udev_device *dev)
        return uev;
 }
 
-bool uevent_burst(struct timeval *start_time, int events)
+static bool uevent_burst(struct timeval *start_time, int events)
 {
        struct timeval diff_time, end_time;
        unsigned long speed;
@@ -735,7 +565,6 @@ int uevent_listen(struct udev *udev)
        struct udev_monitor *monitor = NULL;
        int fd, socket_flags, events;
        struct timeval start_time;
-       int need_failback = 1;
        int timeout = 30;
        LIST_HEAD(uevlisten_tmp);
 
@@ -755,11 +584,11 @@ int uevent_listen(struct udev *udev)
        monitor = udev_monitor_new_from_netlink(udev, "udev");
        if (!monitor) {
                condlog(2, "failed to create udev monitor");
-               goto out;
+               goto out_udev;
        }
        pthread_cleanup_push(monitor_cleanup, monitor);
 #ifdef LIBUDEV_API_RECVBUF
-       if (udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024))
+       if (udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024) < 0)
                condlog(2, "failed to increase buffer size");
 #endif
        fd = udev_monitor_get_fd(monitor);
@@ -790,6 +619,8 @@ int uevent_listen(struct udev *udev)
 
        events = 0;
        gettimeofday(&start_time, NULL);
+       pthread_cleanup_push(cleanup_global_uevq, NULL);
+       pthread_cleanup_push(cleanup_uevq, &uevlisten_tmp);
        while (1) {
                struct uevent *uev;
                struct udev_device *dev;
@@ -803,7 +634,7 @@ int uevent_listen(struct udev *udev)
                poll_timeout = timeout * 1000;
                errno = 0;
                fdcount = poll(&ev_poll, 1, poll_timeout);
-               if (fdcount && ev_poll.revents & POLLIN) {
+               if (fdcount > 0 && ev_poll.revents & POLLIN) {
                        timeout = uevent_burst(&start_time, events + 1) ? 1 : 0;
                        dev = udev_monitor_receive_device(monitor);
                        if (!dev) {
@@ -840,117 +671,31 @@ int uevent_listen(struct udev *udev)
                gettimeofday(&start_time, NULL);
                timeout = 30;
        }
-       need_failback = 0;
+       pthread_cleanup_pop(1);
+       pthread_cleanup_pop(1);
 out:
-       if (monitor)
-               pthread_cleanup_pop(1);
-       if (need_failback)
-               err = failback_listen();
+       pthread_cleanup_pop(1);
+out_udev:
        pthread_cleanup_pop(1);
        return err;
 }
 
-int uevent_get_major(struct uevent *uev)
+char *uevent_get_dm_str(const struct uevent *uev, char *attr)
 {
-       char *p, *q;
-       int i, major = -1;
+       const char *tmp = uevent_get_env_var(uev, attr);
 
-       for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], "MAJOR", 5) && strlen(uev->envp[i]) > 6) {
-                       p = uev->envp[i] + 6;
-                       major = strtoul(p, &q, 10);
-                       if (p == q) {
-                               condlog(2, "invalid major '%s'", p);
-                               major = -1;
-                       }
-                       break;
-               }
-       }
-       return major;
-}
-
-int uevent_get_minor(struct uevent *uev)
-{
-       char *p, *q;
-       int i, minor = -1;
-
-       for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], "MINOR", 5) && strlen(uev->envp[i]) > 6) {
-                       p = uev->envp[i] + 6;
-                       minor = strtoul(p, &q, 10);
-                       if (p == q) {
-                               condlog(2, "invalid minor '%s'", p);
-                               minor = -1;
-                       }
-                       break;
-               }
-       }
-       return minor;
-}
-
-int uevent_get_disk_ro(struct uevent *uev)
-{
-       char *p, *q;
-       int i, ro = -1;
-
-       for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], "DISK_RO", 7) && strlen(uev->envp[i]) > 8) {
-                       p = uev->envp[i] + 8;
-                       ro = strtoul(p, &q, 10);
-                       if (p == q) {
-                               condlog(2, "invalid read_only setting '%s'", p);
-                               ro = -1;
-                       }
-                       break;
-               }
-       }
-       return ro;
-}
-
-char *uevent_get_dm_name(struct uevent *uev)
-{
-       char *p = NULL;
-       int i;
-
-       for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], "DM_NAME", 7) &&
-                   strlen(uev->envp[i]) > 8) {
-                       p = MALLOC(strlen(uev->envp[i] + 8) + 1);
-                       strcpy(p, uev->envp[i] + 8);
-                       break;
-               }
-       }
-       return p;
-}
-
-char *uevent_get_dm_path(struct uevent *uev)
-{
-       char *p = NULL;
-       int i;
-
-       for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], "DM_PATH", 7) &&
-                   strlen(uev->envp[i]) > 8) {
-                       p = MALLOC(strlen(uev->envp[i] + 8) + 1);
-                       strcpy(p, uev->envp[i] + 8);
-                       break;
-               }
-       }
-       return p;
+       if (tmp == NULL)
+               return NULL;
+       return strdup(tmp);
 }
 
-char *uevent_get_dm_action(struct uevent *uev)
+bool uevent_is_mpath(const struct uevent *uev)
 {
-       char *p = NULL;
-       int i;
+       const char *uuid = uevent_get_env_var(uev, "DM_UUID");
 
-       for (i = 0; uev->envp[i] != NULL; i++) {
-               if (!strncmp(uev->envp[i], "DM_ACTION", 9) &&
-                   strlen(uev->envp[i]) > 10) {
-                       p = MALLOC(strlen(uev->envp[i] + 10) + 1);
-                       strcpy(p, uev->envp[i] + 10);
-                       break;
-               }
-       }
-       return p;
+       if (uuid == NULL)
+               return false;
+       if (strncmp(uuid, UUID_PREFIX, UUID_PREFIX_LEN))
+               return false;
+       return uuid[UUID_PREFIX_LEN] != '\0';
 }