SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15378 from msekletar/udev-kill-signal

Browse Source 
udev:  make signal that we use to kill workers on timeout configurable
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-06-05 16:33:14 +02:00
committed by GitHub
parent 0ce8092109 3611ed7378
commit ea9f36ac83
18 changed files with 190 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-event.c
+12 -6
View File
@@ -41,6 +41,7 @@ typedef struct Spawn {
pid_t pid;
usec_t timeout_warn_usec;
usec_t timeout_usec;
int timeout_signal;
usec_t event_birth_usec;
bool accept_failure;
int fd_stdout;
@@ -596,7 +597,7 @@ static int on_spawn_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
assert(spawn);
kill_and_sigcont(spawn->pid, SIGKILL);
kill_and_sigcont(spawn->pid, spawn->timeout_signal);
log_device_error(spawn->device, "Spawned process '%s' ["PID_FMT"] timed out after %s, killing",
spawn->cmd, spawn->pid,
@@ -717,6 +718,7 @@ static int spawn_wait(Spawn *spawn) {
int udev_event_spawn(UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
bool accept_failure,
const char *cmd,
char *result, size_t ressize) {
@@ -793,6 +795,7 @@ int udev_event_spawn(UdevEvent *event,
.accept_failure = accept_failure,
.timeout_warn_usec = udev_warn_timeout(timeout_usec),
.timeout_usec = timeout_usec,
.timeout_signal = timeout_signal,
.event_birth_usec = event->birth_usec,
.fd_stdout = outpipe[READ_END],
.fd_stderr = errpipe[READ_END],
@@ -896,6 +899,7 @@ static int update_devnode(UdevEvent *event) {
static void event_execute_rules_on_remove(
UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list,
UdevRules *rules) {
@@ -917,7 +921,7 @@ static void event_execute_rules_on_remove(
if (sd_device_get_devnum(dev, NULL) >= 0)
(void) udev_watch_end(dev);
(void) udev_rules_apply_to_event(rules, event, timeout_usec, properties_list);
(void) udev_rules_apply_to_event(rules, event, timeout_usec, timeout_signal, properties_list);
if (sd_device_get_devnum(dev, NULL) >= 0)
(void) udev_node_remove(dev);
@@ -944,6 +948,7 @@ static int udev_event_on_move(UdevEvent *event) {
int udev_event_execute_rules(UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list,
UdevRules *rules) {
const char *subsystem;
@@ -965,7 +970,7 @@ int udev_event_execute_rules(UdevEvent *event,
return log_device_error_errno(dev, r, "Failed to get ACTION: %m");
if (action == DEVICE_ACTION_REMOVE) {
event_execute_rules_on_remove(event, timeout_usec, properties_list, rules);
event_execute_rules_on_remove(event, timeout_usec, timeout_signal, properties_list, rules);
return 0;
}
@@ -983,7 +988,7 @@ int udev_event_execute_rules(UdevEvent *event,
return r;
}
r = udev_rules_apply_to_event(rules, event, timeout_usec, properties_list);
r = udev_rules_apply_to_event(rules, event, timeout_usec, timeout_signal, properties_list);
if (r < 0)
return log_device_debug_errno(dev, r, "Failed to apply udev rules: %m");
@@ -1016,7 +1021,7 @@ int udev_event_execute_rules(UdevEvent *event,
return 0;
}
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec) {
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec, int timeout_signal) {
const char *command;
void *val;
Iterator i;
@@ -1040,7 +1045,8 @@ void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec) {
}
log_device_debug(event->dev, "Running command \"%s\"", command);
r = udev_event_spawn(event, timeout_usec, false, command, NULL, 0);
r = udev_event_spawn(event, timeout_usec, timeout_signal, false, command, NULL, 0);
if (r < 0)
log_device_warning_errno(event->dev, r, "Failed to execute '%s', ignoring: %m", command);
else if (r > 0) /* returned value is positive when program fails */
src/udev/udev-event.h
+3 -1
View File
@@ -54,13 +54,15 @@ ssize_t udev_event_apply_format(UdevEvent *event,
int udev_check_format(const char *value, size_t *offset, const char **hint);
int udev_event_spawn(UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
bool accept_failure,
const char *cmd, char *result, size_t ressize);
int udev_event_execute_rules(UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list,
UdevRules *rules);
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec);
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec, int timeout_signal);
static inline usec_t udev_warn_timeout(usec_t timeout_usec) {
return DIV_ROUND_UP(timeout_usec, 3);
src/udev/udev-rules.c
+11 -7
View File
@@ -1520,6 +1520,7 @@ static int udev_rule_apply_token_to_event(
sd_device *dev,
UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list) {
UdevRuleToken *token;
@@ -1662,7 +1663,7 @@ static int udev_rule_apply_token_to_event(
(void) udev_event_apply_format(event, token->value, buf, sizeof(buf), false);
log_rule_debug(dev, rules, "Running PROGRAM '%s'", buf);
r = udev_event_spawn(event, timeout_usec, true, buf, result, sizeof(result));
r = udev_event_spawn(event, timeout_usec, timeout_signal, true, buf, result, sizeof(result));
if (r != 0) {
if (r < 0)
log_rule_warning_errno(dev, rules, r, "Failed to execute '%s', ignoring: %m", buf);
@@ -1732,7 +1733,7 @@ static int udev_rule_apply_token_to_event(
(void) udev_event_apply_format(event, token->value, buf, sizeof(buf), false);
log_rule_debug(dev, rules, "Importing properties from results of '%s'", buf);
r = udev_event_spawn(event, timeout_usec, true, buf, result, sizeof result);
r = udev_event_spawn(event, timeout_usec, timeout_signal, true, buf, result, sizeof result);
if (r != 0) {
if (r < 0)
log_rule_warning_errno(dev, rules, r, "Failed to execute '%s', ignoring: %m", buf);
@@ -2162,7 +2163,8 @@ static bool token_is_for_parents(UdevRuleToken *token) {
static int udev_rule_apply_parent_token_to_event(
UdevRules *rules,
UdevEvent *event) {
UdevEvent *event,
int timeout_signal) {
UdevRuleLine *line;
UdevRuleToken *head;
@@ -2175,7 +2177,7 @@ static int udev_rule_apply_parent_token_to_event(
LIST_FOREACH(tokens, line->current_token, head) {
if (!token_is_for_parents(line->current_token))
return true; /* All parent tokens match. */
r = udev_rule_apply_token_to_event(rules, event->dev_parent, event, 0, NULL);
r = udev_rule_apply_token_to_event(rules, event->dev_parent, event, 0, timeout_signal, NULL);
if (r < 0)
return r;
if (r == 0)
@@ -2196,6 +2198,7 @@ static int udev_rule_apply_line_to_event(
UdevRules *rules,
UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list,
UdevRuleLine **next_line) {
@@ -2229,7 +2232,7 @@ static int udev_rule_apply_line_to_event(
if (parents_done)
continue;
r = udev_rule_apply_parent_token_to_event(rules, event);
r = udev_rule_apply_parent_token_to_event(rules, event, timeout_signal);
if (r <= 0)
return r;
@@ -2237,7 +2240,7 @@ static int udev_rule_apply_line_to_event(
continue;
}
r = udev_rule_apply_token_to_event(rules, event->dev, event, timeout_usec, properties_list);
r = udev_rule_apply_token_to_event(rules, event->dev, event, timeout_usec, timeout_signal, properties_list);
if (r <= 0)
return r;
}
@@ -2252,6 +2255,7 @@ int udev_rules_apply_to_event(
UdevRules *rules,
UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list) {
UdevRuleFile *file;
@@ -2264,7 +2268,7 @@ int udev_rules_apply_to_event(
LIST_FOREACH(rule_files, file, rules->rule_files) {
rules->current_file = file;
LIST_FOREACH_SAFE(rule_lines, file->current_line, next_line, file->rule_lines) {
r = udev_rule_apply_line_to_event(rules, event, timeout_usec, properties_list, &next_line);
r = udev_rule_apply_line_to_event(rules, event, timeout_usec, timeout_signal, properties_list, &next_line);
if (r < 0)
return r;
}
src/udev/udev-rules.h
+1
View File
@@ -23,5 +23,6 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(UdevRules*, udev_rules_free);
bool udev_rules_check_timestamp(UdevRules *rules);
int udev_rules_apply_to_event(UdevRules *rules, UdevEvent *event,
usec_t timeout_usec,
int timeout_signal,
Hashmap *properties_list);
int udev_rules_apply_static_dev_perms(UdevRules *rules);
src/udev/udev.conf
+1
View File
@@ -7,4 +7,5 @@
#children_max=
#exec_delay=
#event_timeout=180
#timeout_signal=SIGKILL
#resolve_names=early
src/udev/udevadm-test.c
+1 -1
View File
@@ -143,7 +143,7 @@ int test_main(int argc, char *argv[], void *userdata) {
assert_se(sigfillset(&mask) >= 0);
assert_se(sigprocmask(SIG_SETMASK, &mask, &sigmask_orig) >= 0);
udev_event_execute_rules(event, 60 * USEC_PER_SEC, NULL, rules);
udev_event_execute_rules(event, 60 * USEC_PER_SEC, SIGKILL, NULL, rules);
FOREACH_DEVICE_PROPERTY(dev, key, value)
printf("%s=%s\n", key, value);
src/udev/udevd.c
+33 -12
View File
@@ -75,6 +75,7 @@ static ResolveNameTiming arg_resolve_name_timing = RESOLVE_NAME_EARLY;
static unsigned arg_children_max = 0;
static usec_t arg_exec_delay_usec = 0;
static usec_t arg_event_timeout_usec = 180 * USEC_PER_SEC;
static int arg_timeout_signal = SIGKILL;
typedef struct Manager {
sd_event *event;
@@ -228,7 +229,7 @@ static int on_event_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
assert(event);
assert(event->worker);
kill_and_sigcont(event->worker->pid, SIGKILL);
kill_and_sigcont(event->worker->pid, arg_timeout_signal);
event->worker->state = WORKER_KILLED;
log_device_error(event->dev, "Worker ["PID_FMT"] processing SEQNUM=%"PRIu64" killed", event->worker->pid, event->seqnum);
@@ -412,11 +413,11 @@ static int worker_process_device(Manager *manager, sd_device *dev) {
return r;
/* apply rules, create node, symlinks */
r = udev_event_execute_rules(udev_event, arg_event_timeout_usec, manager->properties, manager->rules);
r = udev_event_execute_rules(udev_event, arg_event_timeout_usec, arg_timeout_signal, manager->properties, manager->rules);
if (r < 0)
return r;
udev_event_execute_run(udev_event, arg_event_timeout_usec);
udev_event_execute_run(udev_event, arg_event_timeout_usec, arg_timeout_signal);
if (!manager->rtnl)
/* in case rtnl was initialized */
@@ -1455,6 +1456,13 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
r = parse_sec(value, &arg_exec_delay_usec);
} else if (proc_cmdline_key_streq(key, "udev.timeout_signal")) {
if (proc_cmdline_value_missing(key, value))
return 0;
r = signal_from_string(value);
if (r > 0)
arg_timeout_signal = r;
} else if (startswith(key, "udev."))
log_warning("Unknown udev kernel command line option \"%s\", ignoring", key);
@@ -1492,15 +1500,20 @@ static int help(void) {
}
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_TIMEOUT_SIGNAL,
};
static const struct option options[] = {
{ "daemon", no_argument, NULL, 'd' },
{ "debug", no_argument, NULL, 'D' },
{ "children-max", required_argument, NULL, 'c' },
{ "exec-delay", required_argument, NULL, 'e' },
{ "event-timeout", required_argument, NULL, 't' },
{ "resolve-names", required_argument, NULL, 'N' },
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
{ "daemon", no_argument, NULL, 'd' },
{ "debug", no_argument, NULL, 'D' },
{ "children-max", required_argument, NULL, 'c' },
{ "exec-delay", required_argument, NULL, 'e' },
{ "event-timeout", required_argument, NULL, 't' },
{ "resolve-names", required_argument, NULL, 'N' },
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
{ "timeout-signal", required_argument, NULL, ARG_TIMEOUT_SIGNAL },
{}
};
@@ -1525,6 +1538,14 @@ static int parse_argv(int argc, char *argv[]) {
if (r < 0)
log_warning_errno(r, "Failed to parse --exec-delay= value '%s', ignoring: %m", optarg);
break;
case ARG_TIMEOUT_SIGNAL:
r = signal_from_string(optarg);
if (r <= 0)
log_warning_errno(r, "Failed to parse --timeout-signal= value '%s', ignoring: %m", optarg);
else
arg_timeout_signal = r;
break;
case 't':
r = parse_sec(optarg, &arg_event_timeout_usec);
if (r < 0)
@@ -1722,7 +1743,7 @@ int run_udevd(int argc, char *argv[]) {
log_set_target(LOG_TARGET_AUTO);
log_open();
udev_parse_config_full(&arg_children_max, &arg_exec_delay_usec, &arg_event_timeout_usec, &arg_resolve_name_timing);
udev_parse_config_full(&arg_children_max, &arg_exec_delay_usec, &arg_event_timeout_usec, &arg_resolve_name_timing, &arg_timeout_signal);
log_parse_environment();
log_open(); /* Done again to update after reading configuration. */