X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsckd%2Ffsckd.c;h=0fac1531ee3c210aaea50e1a3553f696df6347ba;hp=3abf962eebbfc1faa54cecc23ba174018db93d58;hb=0b02c7c36dbb6f2ec7434eb8d18e0410ee1cc74c;hpb=a922c18bce8d25f23c3614d3508f80658958a285 diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c index 3abf962ee..0fac1531e 100644 --- a/src/fsckd/fsckd.c +++ b/src/fsckd/fsckd.c @@ -34,16 +34,16 @@ #include #include +#include "sd-daemon.h" #include "build.h" #include "def.h" #include "event-util.h" -#include "fsckd.h" #include "log.h" #include "list.h" #include "macro.h" -#include "sd-daemon.h" #include "socket-util.h" #include "util.h" +#include "fsckd.h" #define IDLE_TIME_SECONDS 30 #define PLYMOUTH_REQUEST_KEY "K\2\2\3" @@ -54,10 +54,13 @@ typedef struct Client { struct Manager *manager; int fd; dev_t devnum; + size_t cur; size_t max; int pass; + double percent; + size_t buflen; bool cancelled; @@ -66,14 +69,20 @@ typedef struct Client { typedef struct Manager { sd_event *event; - Client *clients; + + LIST_HEAD(Client, clients); + int clear; int connection_fd; + FILE *console; double percent; int numdevices; + int plymouth_fd; + sd_event_source *plymouth_event_source; bool plymouth_cancel_sent; + bool cancel_requested; } Manager; @@ -101,27 +110,44 @@ static double compute_percent(int pass, size_t cur, size_t max) { (double) cur / max; } -static int request_cancel_client(Client *current) { - FsckdMessage cancel_msg; +static int client_request_cancel(Client *c) { + FsckdMessage cancel_msg = { + .cancel = 1, + }; + ssize_t n; - cancel_msg.cancel = 1; - - n = send(current->fd, &cancel_msg, sizeof(FsckdMessage), 0); - if (n < 0 || (size_t) n < sizeof(FsckdMessage)) - return log_warning_errno(n, "Cannot send cancel to fsck on (%u, %u): %m", - major(current->devnum), minor(current->devnum)); - else - current->cancelled = true; - return 0; + + assert(c); + + if (c->cancelled) + return 0; + + n = send(c->fd, &cancel_msg, sizeof(FsckdMessage), 0); + if (n < 0) + return log_warning_errno(errno, "Cannot send cancel to fsck on (%u:%u): %m", major(c->devnum), minor(c->devnum)); + if ((size_t) n < sizeof(FsckdMessage)) { + log_warning("Short send when sending cancel to fsck on (%u:%u).", major(c->devnum), minor(c->devnum)); + return -EIO; + } + + c->cancelled = true; + return 1; } -static void remove_client(Client **first, Client *item) { - LIST_REMOVE(clients, *first, item); - safe_close(item->fd); - free(item); +static void client_free(Client *c) { + assert(c); + + if (c->manager) + LIST_REMOVE(clients, c->manager->clients, c); + + safe_close(c->fd); + free(c); } -static void on_plymouth_disconnect(Manager *m) { +static void plymouth_disconnect(Manager *m) { + assert(m); + + m->plymouth_event_source = sd_event_source_unref(m->plymouth_event_source); m->plymouth_fd = safe_close(m->plymouth_fd); m->plymouth_cancel_sent = false; } @@ -130,24 +156,31 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent Manager *m = userdata; Client *current; char buffer[6]; - int r; + ssize_t l; assert(m); - r = read(m->plymouth_fd, buffer, sizeof(buffer)); - if (r <= 0) - on_plymouth_disconnect(m); - else { - if (buffer[0] == '\15') - log_error("Message update to plymouth wasn't delivered successfully"); - - /* the only answer support type we requested is a key interruption */ - if (buffer[0] == '\2' && buffer[5] == '\3') { - m->cancel_requested = true; - /* cancel all connected clients */ - LIST_FOREACH(clients, current, m->clients) - request_cancel_client(current); - } + l = read(m->plymouth_fd, buffer, sizeof(buffer)); + if (l < 0) { + log_warning_errno(errno, "Got error while reading from plymouth: %m"); + plymouth_disconnect(m); + return -errno; + } + if (l == 0) { + plymouth_disconnect(m); + return 0; + } + + if (buffer[0] == '\15') + log_error("Message update to plymouth wasn't delivered successfully"); + + /* the only answer support type we requested is a key interruption */ + if (buffer[0] == '\2' && buffer[5] == '\3') { + m->cancel_requested = true; + + /* cancel all connected clients */ + LIST_FOREACH(clients, current, m->clients) + client_request_cancel(current); } return 0; @@ -155,7 +188,7 @@ static int plymouth_feedback_handler(sd_event_source *s, int fd, uint32_t revent static int send_message_plymouth_socket(int plymouth_fd, const char *message, bool update) { _cleanup_free_ char *packet = NULL; - int r, n; + int n; char mode = 'M'; if (update) @@ -163,31 +196,37 @@ static int send_message_plymouth_socket(int plymouth_fd, const char *message, bo if (asprintf(&packet, "%c\002%c%s%n", mode, (int) (strlen(message) + 1), message, &n) < 0) return log_oom(); - r = loop_write(plymouth_fd, packet, n + 1, true); - return r; -} + return loop_write(plymouth_fd, packet, n + 1, true); +} static int send_message_plymouth(Manager *m, const char *message) { - int r; const char *plymouth_cancel_message = NULL; + int r; r = connect_plymouth(m); if (r < 0) return r; if (!m->plymouth_cancel_sent) { - /* indicate to plymouth that we listen to Ctrl+C */ + + /* Indicate to plymouth that we listen to Ctrl+C */ r = loop_write(m->plymouth_fd, PLYMOUTH_REQUEST_KEY, sizeof(PLYMOUTH_REQUEST_KEY), true); if (r < 0) - return log_warning_errno(errno, "Can't send to plymouth cancel key: %m"); + return log_warning_errno(r, "Can't send to plymouth cancel key: %m"); + m->plymouth_cancel_sent = true; + plymouth_cancel_message = strjoina("fsckd-cancel-msg:", _("Press Ctrl+C to cancel all filesystem checks in progress")); + r = send_message_plymouth_socket(m->plymouth_fd, plymouth_cancel_message, false); if (r < 0) log_warning_errno(r, "Can't send filesystem cancel message to plymouth: %m"); + } else if (m->numdevices == 0) { + m->plymouth_cancel_sent = false; + r = send_message_plymouth_socket(m->plymouth_fd, "", false); if (r < 0) log_warning_errno(r, "Can't clear plymouth filesystem cancel message: %m"); @@ -195,7 +234,7 @@ static int send_message_plymouth(Manager *m, const char *message) { r = send_message_plymouth_socket(m->plymouth_fd, message, true); if (r < 0) - return log_warning_errno(errno, "Couldn't send \"%s\" to plymouth: %m", message); + return log_warning_errno(r, "Couldn't send \"%s\" to plymouth: %m", message); return 0; } @@ -227,6 +266,7 @@ static int update_global_progress(Manager *m) { "Checking in progress on %d disks (%3.1f%% complete)", m->numdevices), m->numdevices, m->percent) < 0) return -ENOMEM; + if (asprintf(&fsck_message, "fsckd:%d:%3.1f:%s", m->numdevices, m->percent, console_message) < 0) return -ENOMEM; @@ -260,17 +300,21 @@ static int connect_plymouth(Manager *m) { return log_warning_errno(errno, "Connection to plymouth socket failed: %m"); if (connect(m->plymouth_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1)) < 0) { - on_plymouth_disconnect(m); - return log_warning_errno(errno, "Couldn't connect to plymouth: %m"); + r = log_warning_errno(errno, "Couldn't connect to plymouth: %m"); + goto fail; } - r = sd_event_add_io(m->event, NULL, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m); + r = sd_event_add_io(m->event, &m->plymouth_event_source, m->plymouth_fd, EPOLLIN, plymouth_feedback_handler, m); if (r < 0) { - on_plymouth_disconnect(m); - return log_warning_errno(r, "Can't listen to plymouth socket: %m"); + log_warning_errno(r, "Can't listen to plymouth socket: %m"); + goto fail; } return 0; + +fail: + plymouth_disconnect(m); + return r; } static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) { @@ -284,10 +328,8 @@ static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void * m = client->manager; /* check first if we need to cancel this client */ - if (m->cancel_requested) { - if (!client->cancelled) - request_cancel_client(client); - } + if (m->cancel_requested) + client_request_cancel(client); /* ensure we have enough data to read */ r = ioctl(fd, FIONREAD, &buflen); @@ -297,7 +339,7 @@ static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void * /* we got twice the same size from a bad behaving client, kick it off the list */ else { log_warning("Closing bad behaving fsck client connection at fd %d", client->fd); - remove_client(&(m->clients), client); + client_free(client); r = update_global_progress(m); if (r < 0) log_warning_errno(r, "Couldn't update global progress: %m"); @@ -309,7 +351,7 @@ static int progress_handler(sd_event_source *s, int fd, uint32_t revents, void * r = recv(fd, &fsck_data, sizeof(FsckProgress), 0); if (r == 0) { log_debug("Fsck client connected to fd %d disconnected", client->fd); - remove_client(&(m->clients), client); + client_free(client); } else if (r > 0 && r != sizeof(FsckProgress)) log_warning("Unexpected data structure sent to fsckd socket from fd: %d. Ignoring", client->fd); else if (r > 0 && r == sizeof(FsckProgress)) { @@ -353,18 +395,17 @@ static int new_connection_handler(sd_event_source *s, int fd, uint32_t revents, LIST_PREPEND(clients, m->clients, client); r = sd_event_add_io(m->event, NULL, client->fd, EPOLLIN, progress_handler, client); if (r < 0) { - remove_client(&(m->clients), client); + client_free(client); return r; } /* only request the client to cancel now in case the request is dropped by the client (chance to recancel) */ if (m->cancel_requested) - request_cancel_client(client); + client_request_cancel(client); return 0; } static void manager_free(Manager *m) { - Client *current = NULL, *l = NULL; if (!m) return; @@ -379,13 +420,15 @@ static void manager_free(Manager *m) { fflush(m->console); } + plymouth_disconnect(m); + safe_close(m->connection_fd); - safe_close(m->plymouth_fd); + if (m->console) fclose(m->console); - LIST_FOREACH_SAFE(clients, current, l, m->clients) - remove_client(&(m->clients), current); + while (m->clients) + client_free(m->clients); sd_event_unref(m->event);