#include "iovec-util.h"
#include "list.h"
#include "mkdir.h"
+#include "notify-recv.h"
#include "process-util.h"
#include "selinux-util.h"
#include "signal-util.h"
event_queue_cleanup(manager, EVENT_UNDEF);
safe_close(manager->inotify_fd);
- safe_close(manager->worker_notify_fd);
+
+ free(manager->worker_notify_socket_path);
sd_device_monitor_unref(manager->monitor);
udev_ctrl_unref(manager->ctrl);
.monitor = TAKE_PTR(worker_monitor),
.properties = TAKE_PTR(manager->properties),
.rules = TAKE_PTR(manager->rules),
- .pipe_fd = TAKE_FD(manager->worker_notify_fd),
.inotify_fd = TAKE_FD(manager->inotify_fd),
.config = manager->config,
};
+ if (setenv("NOTIFY_SOCKET", manager->worker_notify_socket_path, /* overwrite = */ true) < 0) {
+ log_error_errno(errno, "Failed to set $NOTIFY_SOCKET: %m");
+ _exit(EXIT_FAILURE);
+ }
+
/* Worker process */
r = udev_worker_main(&w, event->dev);
log_close();
return 1;
}
-static int on_worker(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+static int on_worker_notify(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
Manager *manager = ASSERT_PTR(userdata);
+ int r;
- for (;;) {
- EventResult result;
- struct iovec iovec = IOVEC_MAKE(&result, sizeof(result));
- CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred))) control;
- struct msghdr msghdr = {
- .msg_iov = &iovec,
- .msg_iovlen = 1,
- .msg_control = &control,
- .msg_controllen = sizeof(control),
- };
- ssize_t size;
- struct ucred *ucred;
- Worker *worker;
-
- size = recvmsg_safe(fd, &msghdr, MSG_DONTWAIT);
- if (size == -EINTR)
- continue;
- if (size == -EAGAIN)
- /* nothing more to read */
- break;
- if (size < 0)
- return log_error_errno(size, "Failed to receive message: %m");
-
- cmsg_close_all(&msghdr);
-
- if (size != sizeof(result)) {
- log_warning("Ignoring worker message with invalid size %zi bytes", size);
- continue;
- }
+ assert(fd >= 0);
- ucred = CMSG_FIND_DATA(&msghdr, SOL_SOCKET, SCM_CREDENTIALS, struct ucred);
- if (!ucred || ucred->pid <= 0) {
- log_warning("Ignoring worker message without valid PID");
- continue;
- }
+ _cleanup_(pidref_done) PidRef sender = PIDREF_NULL;
+ _cleanup_strv_free_ char **l = NULL;
+ r = notify_recv_strv(fd, &l, /* ret_ucred= */ NULL, &sender);
+ if (r == -EAGAIN)
+ return 0;
+ if (r < 0)
+ return r;
- /* lookup worker who sent the signal */
- worker = hashmap_get(manager->workers, PID_TO_PTR(ucred->pid));
- if (!worker) {
- log_debug("Worker ["PID_FMT"] returned, but is no longer tracked", ucred->pid);
- continue;
- }
+ /* lookup worker who sent the signal */
+ Worker *worker = hashmap_get(manager->workers, PID_TO_PTR(sender.pid));
+ if (!worker) {
+ log_warning("Received notify datagram of unknown process ["PID_FMT"], ignoring.", sender.pid);
+ return 0;
+ }
- if (worker->state == WORKER_KILLING) {
- worker->state = WORKER_KILLED;
- (void) kill(worker->pid, SIGTERM);
- } else if (worker->state != WORKER_KILLED)
- worker->state = WORKER_IDLE;
+ if (strv_contains(l, "TRY_AGAIN=1"))
+ /* Worker cannot lock the device. Requeue the event. */
+ event_requeue(worker->event);
+ else
+ event_free(worker->event);
- if (result == EVENT_RESULT_TRY_AGAIN)
- event_requeue(worker->event);
- else
- event_free(worker->event);
- }
+ /* Update the state of the worker. */
+ if (worker->state == WORKER_KILLING) {
+ worker->state = WORKER_KILLED;
+ (void) kill(worker->pid, SIGTERM);
+ } else if (worker->state != WORKER_KILLED)
+ worker->state = WORKER_IDLE;
- return 1;
+ return 0;
}
static int synthesize_change_one(sd_device *dev, sd_device *target) {
*manager = (Manager) {
.inotify_fd = -EBADF,
- .worker_notify_fd = -EBADF,
.config_by_udev_conf = UDEV_CONFIG_INIT,
.config_by_command = UDEV_CONFIG_INIT,
.config_by_kernel = UDEV_CONFIG_INIT,
return 0;
}
-static int manager_start_worker_event(Manager *manager) {
- _cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
- _cleanup_close_pair_ int pair[2] = EBADF_PAIR;
+static int manager_start_worker_notify(Manager *manager) {
int r;
assert(manager);
assert(manager->event);
- /* unnamed socket from workers to the main daemon */
- r = socketpair(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0, pair);
- if (r < 0)
- return log_error_errno(errno, "Failed to create socketpair for communicating with workers: %m");
-
- r = setsockopt_int(pair[READ_END], SOL_SOCKET, SO_PASSCRED, true);
- if (r < 0)
- return log_error_errno(r, "Failed to enable SO_PASSCRED: %m");
-
- r = sd_event_add_io(manager->event, &s, pair[READ_END], EPOLLIN, on_worker, manager);
- if (r < 0)
- return log_error_errno(r, "Failed to create worker event source: %m");
-
- (void) sd_event_source_set_description(s, "manager-worker-event");
-
- r = sd_event_source_set_io_fd_own(s, true);
- if (r < 0)
- return log_error_errno(r, "Failed to make worker event source own file descriptor: %m");
-
- TAKE_FD(pair[READ_END]);
-
- r = sd_event_source_set_floating(s, true);
+ r = notify_socket_prepare(
+ manager->event,
+ SD_EVENT_PRIORITY_NORMAL,
+ on_worker_notify,
+ manager,
+ &manager->worker_notify_socket_path);
if (r < 0)
- return log_error_errno(r, "Failed to make worker event source floating: %m");
+ return log_error_errno(r, "Failed to prepare worker notification socket: %m");
- manager->worker_notify_fd = TAKE_FD(pair[WRITE_END]);
return 0;
}
if (r < 0)
return r;
- r = manager_start_worker_event(manager);
+ r = manager_start_worker_notify(manager);
if (r < 0)
return r;
#include <sys/ioctl.h>
#include <sys/mount.h>
+#include "sd-daemon.h"
+
#include "alloc-util.h"
#include "blockdev-util.h"
#include "common-signal.h"
#include "device-util.h"
#include "errno-util.h"
#include "fd-util.h"
-#include "io-util.h"
#include "path-util.h"
#include "process-util.h"
#include "signal-util.h"
sd_device_monitor_unref(worker->monitor);
hashmap_free(worker->properties);
udev_rules_free(worker->rules);
- safe_close(worker->pipe_fd);
}
int udev_get_whole_disk(sd_device *dev, sd_device **ret_device, const char **ret_devname) {
*
* The user-facing side of this: https://systemd.io/BLOCK_DEVICE_LOCKING */
r = worker_lock_whole_disk(dev, &fd_lock);
- if (r == -EAGAIN)
- return EVENT_RESULT_TRY_AGAIN;
+ if (r == -EAGAIN) {
+ log_device_debug(dev, "Block device is currently locked, requeueing the event.");
+
+ r = sd_notify(/* unset_environment = */ false, "TRY_AGAIN=1");
+ if (r < 0) {
+ log_device_warning_errno(dev, r, "Failed to send notification message to manager process: %m");
+ (void) sd_event_exit(worker->event, r);
+ }
+
+ return 0;
+ }
if (r < 0)
return r;
}
log_device_uevent(dev, "Device processed");
- return 0;
-}
-static int worker_send_result(UdevWorker *worker, EventResult result) {
- assert(worker);
- assert(worker->pipe_fd >= 0);
+ /* send processed event to libudev listeners */
+ r = device_monitor_send(worker->monitor, NULL, dev);
+ if (r < 0) {
+ log_device_warning_errno(dev, r, "Failed to broadcast event to libudev listeners: %m");
+ (void) sd_event_exit(worker->event, r);
+ return 0;
+ }
- return loop_write(worker->pipe_fd, &result, sizeof(result));
+ r = sd_notify(/* unset_environment = */ false, "PROCESSED=1");
+ if (r < 0) {
+ log_device_warning_errno(dev, r, "Failed to send notification message to manager process: %m");
+ (void) sd_event_exit(worker->event, r);
+ }
+
+ return 0;
}
static int worker_device_monitor_handler(sd_device_monitor *monitor, sd_device *dev, void *userdata) {
UdevWorker *worker = ASSERT_PTR(userdata);
int r;
+ assert(monitor);
assert(dev);
r = worker_process_device(worker, dev);
- if (r == EVENT_RESULT_TRY_AGAIN)
- /* if we couldn't acquire the flock(), then requeue the event */
- log_device_debug(dev, "Block device is currently locked, requeueing the event.");
- else {
- if (r < 0) {
- log_device_warning_errno(dev, r, "Failed to process device, ignoring: %m");
- (void) device_add_errno(dev, r);
- }
+ if (r < 0) {
+ log_device_warning_errno(dev, r, "Failed to process device, ignoring: %m");
+ (void) device_add_errno(dev, r);
- /* send processed event back to libudev listeners */
+ /* broadcast (possibly partially processed) event to libudev listeners */
int k = device_monitor_send(monitor, NULL, dev);
- if (k < 0)
- log_device_warning_errno(dev, k, "Failed to broadcast event to libudev listeners, ignoring: %m");
- }
+ if (k < 0) {
+ log_device_warning_errno(dev, k, "Failed to broadcast event to libudev listeners: %m");
+ (void) sd_event_exit(worker->event, k);
+ return 0;
+ }
- /* send udevd the result of the event execution */
- r = worker_send_result(worker, r);
- if (r < 0)
- log_device_warning_errno(dev, r, "Failed to send signal to main daemon, ignoring: %m");
+ const char *e = errno_to_name(r);
+ r = sd_notifyf(/* unset_environment = */ false, "ERRNO=%i%s%s", -r, e ? "\nERRNO_NAME=" : "", strempty(e));
+ if (r < 0) {
+ log_device_warning_errno(dev, r, "Failed to send notification message to manager process, ignoring: %m");
+ (void) sd_event_exit(worker->event, r);
+ return 0;
+ }
+ }
/* Reset the log level, as it might be changed by "OPTIONS=log_level=". */
log_set_max_level(worker->config.log_level);
projects / thirdparty / systemd.git / commitdiff
