daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
36e8a3
From 1bb734a44952a51285057409ba7b1c3e7a162cea Mon Sep 17 00:00:00 2001
36e8a3
From: Michal Sekletar <msekleta@redhat.com>
36e8a3
Date: Thu, 2 Aug 2018 13:16:49 +0200
36e8a3
Subject: [PATCH] Revert "udev: remove WAIT_FOR key"
36e8a3
36e8a3
This reverts commit f2b8052fb648b788936dd3e85be6a9aca90fbb2f.
36e8a3
36e8a3
Resolves: #1523213
36e8a3
---
36e8a3
 man/udev.xml              |  9 +++++++
36e8a3
 src/udev/udev-rules.c     | 50 +++++++++++++++++++++++++++++++++++++++
36e8a3
 test/rule-syntax-check.py |  2 +-
36e8a3
 3 files changed, 60 insertions(+), 1 deletion(-)
36e8a3
36e8a3
diff --git a/man/udev.xml b/man/udev.xml
4bff0a
index 15e6d8eae1..bdf901a8f0 100644
36e8a3
--- a/man/udev.xml
36e8a3
+++ b/man/udev.xml
36e8a3
@@ -515,6 +515,15 @@
36e8a3
           </listitem>
36e8a3
         </varlistentry>
36e8a3
 
36e8a3
+        <varlistentry>
36e8a3
+          <term><varname>WAIT_FOR</varname></term>
36e8a3
+          <listitem>
36e8a3
+            <para>Wait for a file to become available or until a timeout of
36e8a3
+            10 seconds expires. The path is relative to the sysfs device;
36e8a3
+            if no path is specified, this waits for an attribute to appear.</para>
36e8a3
+          </listitem>
36e8a3
+        </varlistentry>
36e8a3
+
36e8a3
         <varlistentry>
36e8a3
           <term><varname>OPTIONS</varname></term>
36e8a3
           <listitem>
36e8a3
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
4bff0a
index f029395884..58af863f3d 100644
36e8a3
--- a/src/udev/udev-rules.c
36e8a3
+++ b/src/udev/udev-rules.c
36e8a3
@@ -676,6 +676,41 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
36e8a3
         return 0;
36e8a3
 }
36e8a3
 
36e8a3
+#define WAIT_LOOP_PER_SECOND                50
36e8a3
+static int wait_for_file(struct udev_device *dev, const char *file, int timeout) {
36e8a3
+        char filepath[UTIL_PATH_SIZE];
36e8a3
+        char devicepath[UTIL_PATH_SIZE];
36e8a3
+        struct stat stats;
36e8a3
+        int loop = timeout * WAIT_LOOP_PER_SECOND;
36e8a3
+
36e8a3
+        /* a relative path is a device attribute */
36e8a3
+        devicepath[0] = '\0';
36e8a3
+        if (file[0] != '/') {
36e8a3
+                strscpyl(devicepath, sizeof(devicepath), udev_device_get_syspath(dev), NULL);
36e8a3
+                strscpyl(filepath, sizeof(filepath), devicepath, "/", file, NULL);
36e8a3
+                file = filepath;
36e8a3
+        }
36e8a3
+
36e8a3
+        while (--loop) {
36e8a3
+                const struct timespec duration = { 0, 1000 * 1000 * 1000 / WAIT_LOOP_PER_SECOND };
36e8a3
+
36e8a3
+                /* lookup file */
36e8a3
+                if (stat(file, &stats) == 0) {
36e8a3
+                        log_debug("file '%s' appeared after %i loops", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
36e8a3
+                        return 0;
36e8a3
+                }
36e8a3
+                /* make sure, the device did not disappear in the meantime */
36e8a3
+                if (devicepath[0] != '\0' && stat(devicepath, &stats) != 0) {
36e8a3
+                        log_debug("device disappeared while waiting for '%s'", file);
36e8a3
+                        return -2;
36e8a3
+                }
36e8a3
+                log_debug("wait for '%s' for %i mseconds", file, 1000 / WAIT_LOOP_PER_SECOND);
36e8a3
+                nanosleep(&duration, NULL);
36e8a3
+        }
36e8a3
+        log_debug("waiting for '%s' failed", file);
36e8a3
+        return -1;
36e8a3
+}
36e8a3
+
36e8a3
 static void attr_subst_subdir(char *attr, size_t len) {
36e8a3
         const char *pos, *tail, *path;
36e8a3
         _cleanup_closedir_ DIR *dir = NULL;
36e8a3
@@ -1284,7 +1319,12 @@ static void add_rule(struct udev_rules *rules, char *line,
36e8a3
                                 rule_add_key(&rule_tmp, TK_A_RUN_PROGRAM, op, value, &cmd);
36e8a3
                         } else
36e8a3
                                 LOG_RULE_ERROR("ignoring unknown %s{} type '%s'", "RUN", attr);
36e8a3
+                } else if (streq(key, "WAIT_FOR") || streq(key, "WAIT_FOR_SYSFS")) {
36e8a3
+                        if (op == OP_REMOVE)
36e8a3
+                                LOG_AND_RETURN("invalid %s operation", key);
36e8a3
 
36e8a3
+                        rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
36e8a3
+                        continue;
36e8a3
                 } else if (streq(key, "LABEL")) {
36e8a3
                         if (op == OP_REMOVE)
36e8a3
                                 LOG_AND_RETURN("invalid %s operation", key);
36e8a3
@@ -1838,6 +1878,16 @@ void udev_rules_apply_to_event(struct udev_rules *rules,
36e8a3
                         if (match_key(rules, cur, udev_device_get_driver(event->dev)) != 0)
36e8a3
                                 goto nomatch;
36e8a3
                         break;
36e8a3
+                case TK_M_WAITFOR: {
36e8a3
+                        char filename[UTIL_PATH_SIZE];
36e8a3
+                        int found;
36e8a3
+
36e8a3
+                        udev_event_apply_format(event, rules_str(rules, cur->key.value_off), filename, sizeof(filename), false);
36e8a3
+                        found = (wait_for_file(event->dev, filename, 10) == 0);
36e8a3
+                        if (!found && (cur->key.op != OP_NOMATCH))
36e8a3
+                                goto nomatch;
36e8a3
+                        break;
36e8a3
+                }
36e8a3
                 case TK_M_ATTR:
36e8a3
                         if (match_attr(rules, event->dev, event, cur) != 0)
36e8a3
                                 goto nomatch;
36e8a3
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
4bff0a
index dfb06d9ed9..706d93632e 100755
36e8a3
--- a/test/rule-syntax-check.py
36e8a3
+++ b/test/rule-syntax-check.py
36e8a3
@@ -18,7 +18,7 @@ if not rules_files:
36e8a3
 quoted_string_re = r'"(?:[^\\"]|\\.)*"'
36e8a3
 no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|PROGRAM|RESULT|TEST)\s*(?:=|!)=\s*' + quoted_string_re + '$')
36e8a3
 args_tests = re.compile(r'(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*' + quoted_string_re + '$')
36e8a3
-no_args_assign = re.compile(r'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|RUN|LABEL|GOTO|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*' + quoted_string_re + '$')
36e8a3
+no_args_assign = re.compile(r'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*' + quoted_string_re + '$')
36e8a3
 args_assign = re.compile(r'(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*' + quoted_string_re + '$')
36e8a3
 # Find comma-separated groups, but allow commas that are inside quoted strings.
36e8a3
 # Using quoted_string_re + '?' so that strings missing the last double quote