X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=5df070073b4d298c8a49a5488010434b73ff4f32;hp=5d9f98892eb792db789de351fb750bb95cd0e3f9;hb=f155a58a64c660e46e74123293482561b816a39a;hpb=900412ec49f30fbb7872a5ff38538a19c17e20a2

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 5d9f988..5df0700 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -26,6 +26,7 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "devmapper.h"
 #include "user-event.h"
 #include "platform.h"
 #include "event.h"
@@ -40,8 +41,7 @@
 
 enum default_priority {
 	DEFAULT_PRIORITY_REMOTE		= 1,
-	DEFAULT_PRIORITY_LOCAL_UUID	= 2,
-	DEFAULT_PRIORITY_LOCAL_FIRST	= 3,
+	DEFAULT_PRIORITY_LOCAL_FIRST	= 2,
 	DEFAULT_PRIORITY_LOCAL_LAST	= 0xfe,
 	DEFAULT_PRIORITY_DISABLED	= 0xff,
 };
@@ -57,6 +57,9 @@ struct device_handler {
 	struct discover_device	**devices;
 	unsigned int		n_devices;
 
+	struct ramdisk_device	**ramdisks;
+	unsigned int		n_ramdisks;
+
 	struct waitset		*waitset;
 	struct waiter		*timeout_waiter;
 	bool			autoboot_enabled;
@@ -320,6 +323,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 void device_handler_reinit(struct device_handler *handler)
 {
 	struct discover_boot_option *opt, *tmp;
+	struct ramdisk_device *ramdisk;
 	unsigned int i;
 
 	device_handler_cancel_default(handler);
@@ -331,13 +335,20 @@ void device_handler_reinit(struct device_handler *handler)
 	list_init(&handler->unresolved_boot_options);
 
 	/* drop all devices */
-	for (i = 0; i < handler->n_devices; i++)
+	for (i = 0; i < handler->n_devices; i++) {
 		discover_server_notify_device_remove(handler->server,
 				handler->devices[i]->device);
+		ramdisk = handler->devices[i]->ramdisk;
+		talloc_free(handler->devices[i]);
+		talloc_free(ramdisk);
+	}
 
 	talloc_free(handler->devices);
 	handler->devices = NULL;
 	handler->n_devices = 0;
+	talloc_free(handler->ramdisks);
+	handler->ramdisks = NULL;
+	handler->n_ramdisks = 0;
 
 	device_handler_reinit_sources(handler);
 }
@@ -446,6 +457,7 @@ struct {
 } device_type_map[] = {
 	{ IPMI_BOOTDEV_NETWORK, DEVICE_TYPE_NETWORK },
 	{ IPMI_BOOTDEV_DISK, DEVICE_TYPE_DISK },
+	{ IPMI_BOOTDEV_DISK, DEVICE_TYPE_USB },
 	{ IPMI_BOOTDEV_CDROM, DEVICE_TYPE_OPTICAL },
 };
 
@@ -462,11 +474,27 @@ static bool ipmi_device_type_matches(enum ipmi_bootdev ipmi_type,
 	return false;
 }
 
-static bool priority_matches(struct boot_priority *prio,
-		struct discover_boot_option *opt)
+static int autoboot_option_priority(const struct config *config,
+				struct discover_boot_option *opt)
 {
-	return prio->type == opt->device->device->type ||
-		prio->type == DEVICE_TYPE_ANY;
+	enum device_type type = opt->device->device->type;
+	const char *uuid = opt->device->uuid;
+	struct autoboot_option *auto_opt;
+	unsigned int i;
+
+	for (i = 0; i < config->n_autoboot_opts; i++) {
+		auto_opt = &config->autoboot_opts[i];
+		if (auto_opt->boot_type == BOOT_DEVICE_UUID)
+			if (!strcmp(auto_opt->uuid, uuid))
+				return DEFAULT_PRIORITY_LOCAL_FIRST + i;
+
+		if (auto_opt->boot_type == BOOT_DEVICE_TYPE)
+			if (auto_opt->type == type ||
+			    auto_opt->type == DEVICE_TYPE_ANY)
+				return DEFAULT_PRIORITY_LOCAL_FIRST + i;
+	}
+
+	return -1;
 }
 
 /*
@@ -478,8 +506,6 @@ static enum default_priority default_option_priority(
 		struct discover_boot_option *opt)
 {
 	const struct config *config;
-	const char *dev_str;
-	unsigned int i;
 
 	config = config_get();
 
@@ -498,25 +524,17 @@ static enum default_priority default_option_priority(
 		return DEFAULT_PRIORITY_DISABLED;
 	}
 
-	/* Next, allow matching by device UUID. If we have one set but it
-	 * doesn't match, disallow the default entirely */
-	dev_str = config->boot_device;
-	if (dev_str && dev_str[0]) {
-		if (!strcmp(opt->device->uuid, dev_str))
-			return DEFAULT_PRIORITY_LOCAL_UUID;
-
-		pb_debug("handler: disabled default priority due to "
-				"non-matching UUID\n");
-		return DEFAULT_PRIORITY_DISABLED;
-	}
-
-	/* Lastly, use the local priorities */
-	for (i = 0; i < config->n_boot_priorities; i++) {
-		struct boot_priority *prio = &config->boot_priorities[i];
-		if (priority_matches(prio, opt))
-			return DEFAULT_PRIORITY_LOCAL_FIRST + prio->priority;
+	/* Next, try to match the option against the user-defined autoboot
+	 * options, either by device UUID or type. */
+	if (config->n_autoboot_opts) {
+		int boot_match = autoboot_option_priority(config, opt);
+		if (boot_match > 0)
+			return boot_match;
 	}
 
+	/* If the option didn't match any entry in the array, it is disabled */
+	pb_debug("handler: disabled default priority due to "
+			"non-matching UUID or type\n");
 	return DEFAULT_PRIORITY_DISABLED;
 }
 
@@ -743,6 +761,95 @@ void device_handler_add_device(struct device_handler *handler,
 		network_register_device(handler->network, device);
 }
 
+void device_handler_add_ramdisk(struct device_handler *handler,
+		const char *path)
+{
+	struct ramdisk_device *dev;
+	unsigned int i;
+
+	if (!path)
+		return;
+
+	for (i = 0; i < handler->n_ramdisks; i++)
+		if (!strcmp(handler->ramdisks[i]->path, path))
+			return;
+
+	dev = talloc_zero(handler, struct ramdisk_device);
+	if (!dev) {
+		pb_log("Failed to allocate memory to track %s\n", path);
+		return;
+	}
+
+	dev->path = talloc_strdup(handler, path);
+
+	handler->ramdisks = talloc_realloc(handler, handler->ramdisks,
+				struct ramdisk_device *,
+				handler->n_ramdisks + 1);
+	if (!handler->ramdisks) {
+		pb_log("Failed to reallocate memory"
+		       "- ramdisk tracking inconsistent!\n");
+		return;
+	}
+
+	handler->ramdisks[i] = dev;
+	i = handler->n_ramdisks++;
+}
+
+struct ramdisk_device *device_handler_get_ramdisk(
+		struct device_handler *handler)
+{
+	unsigned int i;
+	char *name;
+	dev_t id;
+
+	/* Check if free ramdisk exists */
+	for (i = 0; i < handler->n_ramdisks; i++)
+		if (!handler->ramdisks[i]->snapshot &&
+		    !handler->ramdisks[i]->origin &&
+		    !handler->ramdisks[i]->base)
+			return handler->ramdisks[i];
+
+	/* Otherwise create a new one */
+	name = talloc_asprintf(handler, "/dev/ram%d",
+			handler->n_ramdisks);
+	if (!name) {
+		pb_debug("Failed to allocate memory to name /dev/ram%d",
+			handler->n_ramdisks);
+		return NULL;
+	}
+
+	id = makedev(1, handler->n_ramdisks);
+	if (mknod(name, S_IFBLK, id)) {
+		if (errno == EEXIST) {
+			/* We haven't yet received updates for existing
+			 * ramdisks - add and use this one */
+			pb_debug("Using untracked ramdisk %s\n", name);
+		} else {
+			pb_log("Failed to create new ramdisk %s: %s\n",
+			       name, strerror(errno));
+			return NULL;
+		}
+	}
+	device_handler_add_ramdisk(handler, name);
+	talloc_free(name);
+
+	return handler->ramdisks[i];
+}
+
+void device_handler_release_ramdisk(struct discover_device *device)
+{
+	struct ramdisk_device *ramdisk = device->ramdisk;
+
+	talloc_free(ramdisk->snapshot);
+	talloc_free(ramdisk->origin);
+	talloc_free(ramdisk->base);
+
+	ramdisk->snapshot = ramdisk->origin = ramdisk->base = NULL;
+	ramdisk->sectors = 0;
+
+	device->ramdisk = NULL;
+}
+
 /* Start discovery on a hotplugged device. The device will be in our devices
  * array, but has only just been initialised by the hotplug source.
  */
@@ -750,8 +857,22 @@ int device_handler_discover(struct device_handler *handler,
 		struct discover_device *dev)
 {
 	struct discover_context *ctx;
+	struct boot_status *status;
 	int rc;
 
+	status = talloc_zero(handler, struct boot_status);
+	status->type = BOOT_STATUS_INFO;
+	/*
+	 * TRANSLATORS: this string will be passed the type and identifier
+	 * of the device. For example, the first parameter could be "Disk",
+	 * (which will be translated accordingly) and the second a Linux device
+	 * identifier like 'sda1' (which will not be translated)
+	 */
+	status->message = talloc_asprintf(status, _("Processing %s device %s"),
+				device_type_display_name(dev->device->type),
+				dev->device->id);
+	boot_status(handler, status);
+
 	process_boot_option_queue(handler);
 
 	/* create our context */
@@ -772,6 +893,15 @@ int device_handler_discover(struct device_handler *handler,
 	device_handler_discover_context_commit(handler, ctx);
 
 out:
+	/*
+	 * TRANSLATORS: the format specifier in this string is a Linux
+	 * device identifier, like 'sda1'
+	 */
+	status->message = talloc_asprintf(status,_("Processing %s complete"),
+				dev->device->id);
+	boot_status(handler, status);
+
+	talloc_free(status);
 	talloc_free(ctx);
 
 	return 0;
@@ -782,6 +912,17 @@ int device_handler_dhcp(struct device_handler *handler,
 		struct discover_device *dev, struct event *event)
 {
 	struct discover_context *ctx;
+	struct boot_status *status;
+
+	status = talloc_zero(handler, struct boot_status);
+	status->type = BOOT_STATUS_INFO;
+	/*
+	 * TRANSLATORS: this format specifier will be the name of a network
+	 * device, like 'eth0'.
+	 */
+	status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
+				dev->device->id);
+	boot_status(handler, status);
 
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
@@ -791,6 +932,15 @@ int device_handler_dhcp(struct device_handler *handler,
 
 	device_handler_discover_context_commit(handler, ctx);
 
+	/*
+	 * TRANSLATORS: this format specifier will be the name of a network
+	 * device, like 'eth0'.
+	 */
+	status->message = talloc_asprintf(status,_("Processing %s complete"),
+				dev->device->id);
+	boot_status(handler, status);
+
+	talloc_free(status);
 	talloc_free(ctx);
 
 	return 0;
@@ -800,19 +950,30 @@ int device_handler_dhcp(struct device_handler *handler,
 int device_handler_conf(struct device_handler *handler,
 		struct discover_device *dev, struct pb_url *url)
 {
-        struct discover_context *ctx;
+	struct discover_context *ctx;
+	struct boot_status *status;
+
+	status = talloc_zero(handler, struct boot_status);
+	status->type = BOOT_STATUS_INFO;
+	status->message = talloc_asprintf(status, _("Processing user config"));
+	boot_status(handler, status);
+
+	/* create our context */
+	ctx = device_handler_discover_context_create(handler, dev);
+	ctx->conf_url = url;
 
-        /* create our context */
-        ctx = device_handler_discover_context_create(handler, dev);
-        ctx->conf_url = url;
+	iterate_parsers(ctx);
 
-        iterate_parsers(ctx);
+	device_handler_discover_context_commit(handler, ctx);
 
-        device_handler_discover_context_commit(handler, ctx);
+	status->message = talloc_asprintf(status,
+				_("Processing user config complete"));
+	boot_status(handler, status);
 
-        talloc_free(ctx);
+	talloc_free(status);
+	talloc_free(ctx);
 
-        return 0;
+	return 0;
 }
 
 static struct discover_boot_option *find_boot_option_by_id(
@@ -964,9 +1125,8 @@ static char *device_from_addr(void *ctx, struct pb_url *url)
 	return dev;
 }
 
-
 void device_handler_process_url(struct device_handler *handler,
-		const char *url)
+		const char *url, const char *mac, const char *ip)
 {
 	struct discover_context *ctx;
 	struct discover_device *dev;
@@ -992,11 +1152,25 @@ void device_handler_process_url(struct device_handler *handler,
 	event->type = EVENT_TYPE_USER;
 	event->action = EVENT_ACTION_CONF;
 
-	event->params = talloc_array(event, struct param, 1);
-	param = &event->params[0];
-	param->name = talloc_strdup(event, "pxeconffile");
-	param->value = talloc_strdup(event, url);
-	event->n_params = 1;
+	if (url[strlen(url) - 1] == '/') {
+		event->params = talloc_array(event, struct param, 3);
+		param = &event->params[0];
+		param->name = talloc_strdup(event, "pxepathprefix");
+		param->value = talloc_strdup(event, url);
+		param = &event->params[1];
+		param->name = talloc_strdup(event, "mac");
+		param->value = talloc_strdup(event, mac);
+		param = &event->params[2];
+		param->name = talloc_strdup(event, "ip");
+		param->value = talloc_strdup(event, ip);
+		event->n_params = 3;
+	} else {
+		event->params = talloc_array(event, struct param, 1);
+		param = &event->params[0];
+		param->name = talloc_strdup(event, "pxeconffile");
+		param->value = talloc_strdup(event, url);
+		event->n_params = 1;
+	}
 
 	pb_url = pb_url_parse(event, event->params->value);
 	if (!pb_url || !pb_url->host) {
@@ -1082,14 +1256,46 @@ static void device_handler_reinit_sources(struct device_handler *handler)
 			handler->dry_run);
 }
 
+static const char *fs_parameters(struct discover_device *dev,
+				 unsigned int rw_flags)
+{
+	const char *fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+
+	/* XFS journals are not cross-endian compatible; don't try recovery
+	 * even if we have a snapshot */
+	if (!strncmp(fstype, "xfs", strlen("xfs")))
+		return "norecovery";
+
+	/* If we have a snapshot available allow touching the filesystem */
+	if (dev->ramdisk)
+		return "";
+
+	if ((rw_flags | MS_RDONLY) != MS_RDONLY)
+		return "";
+
+	/* Avoid writes due to journal replay if we don't have a snapshot */
+	if (!strncmp(fstype, "ext4", strlen("ext4")))
+		return "norecovery";
+
+	return "";
+}
+
+static inline const char *get_device_path(struct discover_device *dev)
+{
+	return dev->ramdisk ? dev->ramdisk->snapshot : dev->device_path;
+}
+
 static bool check_existing_mount(struct discover_device *dev)
 {
 	struct stat devstat, mntstat;
+	const char *device_path;
 	struct mntent *mnt;
 	FILE *fp;
 	int rc;
 
-	rc = stat(dev->device_path, &devstat);
+	device_path = get_device_path(dev);
+
+	rc = stat(device_path, &devstat);
 	if (rc) {
 		pb_debug("%s: stat failed: %s\n", __func__, strerror(errno));
 		return false;
@@ -1139,7 +1345,7 @@ static bool check_existing_mount(struct discover_device *dev)
 
 static int mount_device(struct discover_device *dev)
 {
-	const char *fstype;
+	const char *fstype, *device_path;
 	int rc;
 
 	if (!dev->device_path)
@@ -1155,6 +1361,13 @@ static int mount_device(struct discover_device *dev)
 	if (!fstype)
 		return 0;
 
+	/* ext3 treats the norecovery option as an error, so mount the device
+	 * as an ext4 filesystem instead */
+	if (!strncmp(fstype, "ext3", strlen("ext3"))) {
+		pb_debug("Mounting ext3 filesystem as ext4\n");
+		fstype = talloc_asprintf(dev, "ext4");
+	}
+
 	dev->mount_path = join_paths(dev, mount_base(),
 					dev->device_path);
 
@@ -1164,10 +1377,13 @@ static int mount_device(struct discover_device *dev)
 		goto err_free;
 	}
 
+	device_path = get_device_path(dev);
+
 	pb_log("mounting device %s read-only\n", dev->device_path);
 	errno = 0;
-	rc = mount(dev->device_path, dev->mount_path, fstype,
-			MS_RDONLY | MS_SILENT, "");
+	rc = mount(device_path, dev->mount_path, fstype,
+			MS_RDONLY | MS_SILENT,
+			fs_parameters(dev, MS_RDONLY));
 	if (!rc) {
 		dev->mounted = true;
 		dev->mounted_rw = false;
@@ -1176,7 +1392,10 @@ static int mount_device(struct discover_device *dev)
 	}
 
 	pb_log("couldn't mount device %s: mount failed: %s\n",
-			dev->device_path, strerror(errno));
+			device_path, strerror(errno));
+
+	/* If mount fails clean up any snapshot */
+	devmapper_destroy_snapshot(dev);
 
 	pb_rmdir_recursive(mount_base(), dev->mount_path);
 err_free:
@@ -1187,17 +1406,21 @@ err_free:
 
 static int umount_device(struct discover_device *dev)
 {
+	const char *device_path;
 	int rc;
 
 	if (!dev->mounted || !dev->unmount)
 		return 0;
 
-	pb_log("unmounting device %s\n", dev->device_path);
+	device_path = get_device_path(dev);
+
+	pb_log("unmounting device %s\n", device_path);
 	rc = umount(dev->mount_path);
 	if (rc)
 		return -1;
 
 	dev->mounted = false;
+	devmapper_destroy_snapshot(dev);
 
 	pb_rmdir_recursive(mount_base(), dev->mount_path);
 
@@ -1209,36 +1432,88 @@ static int umount_device(struct discover_device *dev)
 
 int device_request_write(struct discover_device *dev, bool *release)
 {
+	const char *fstype, *device_path;
+	const struct config *config;
 	int rc;
 
 	*release = false;
 
+	config = config_get();
+	if (!config->allow_writes)
+		return -1;
+
 	if (!dev->mounted)
 		return -1;
 
 	if (dev->mounted_rw)
 		return 0;
 
-	pb_log("remounting device %s read-write\n", dev->device_path);
-	rc = mount(dev->device_path, dev->mount_path, "",
-			MS_REMOUNT | MS_SILENT, "");
-	if (rc)
+	fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+
+	device_path = get_device_path(dev);
+
+	pb_log("remounting device %s read-write\n", device_path);
+
+	rc = umount(dev->mount_path);
+	if (rc) {
+		pb_log("Failed to unmount %s: %s\n",
+		       dev->mount_path, strerror(errno));
 		return -1;
+	}
+
+	rc = mount(device_path, dev->mount_path, fstype,
+			MS_SILENT,
+			fs_parameters(dev, MS_REMOUNT));
+	if (rc)
+		goto mount_ro;
 
 	dev->mounted_rw = true;
 	*release = true;
 	return 0;
+
+mount_ro:
+	pb_log("Unable to remount device %s read-write: %s\n",
+	       device_path, strerror(errno));
+	if (mount(device_path, dev->mount_path, fstype,
+			MS_RDONLY | MS_SILENT,
+			fs_parameters(dev, MS_RDONLY)))
+		pb_log("Unable to recover mount for %s: %s\n",
+		       device_path, strerror(errno));
+	return -1;
 }
 
 void device_release_write(struct discover_device *dev, bool release)
 {
+	const char *fstype, *device_path;
+
 	if (!release)
 		return;
 
-	pb_log("remounting device %s read-only\n", dev->device_path);
-	mount(dev->device_path, dev->mount_path, "",
-			MS_REMOUNT | MS_RDONLY | MS_SILENT, "");
-	dev->mounted_rw = false;
+	device_path = get_device_path(dev);
+
+	fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+
+	pb_log("remounting device %s read-only\n", device_path);
+
+	if (umount(dev->mount_path)) {
+		pb_log("Failed to unmount %s\n", dev->mount_path);
+		return;
+	}
+	dev->mounted_rw = dev->mounted = false;
+
+	if (dev->ramdisk) {
+		devmapper_merge_snapshot(dev);
+		/* device_path becomes stale after merge */
+		device_path = get_device_path(dev);
+	}
+
+	if (mount(device_path, dev->mount_path, fstype,
+			MS_RDONLY | MS_SILENT,
+			fs_parameters(dev, MS_RDONLY)))
+		pb_log("Failed to remount %s read-only: %s\n",
+		       device_path, strerror(errno));
+	else
+		dev->mounted = true;
 }
 
 #else