#include <linux/loop.h>
#include <pthread.h>
#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mount.h>
#include "alloc-util.h"
+#include "capability-util.h"
#include "dissect-image.h"
#include "fd-util.h"
#include "fileio.h"
#include "mount-util.h"
#include "namespace-util.h"
#include "parse-util.h"
+#include "path-util.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
#if HAVE_BLKID
static usec_t end = 0;
+static void verify_dissected_image(DissectedImage *dissected) {
+ assert_se(dissected->partitions[PARTITION_ESP].found);
+ assert_se(dissected->partitions[PARTITION_ESP].node);
+ assert_se(dissected->partitions[PARTITION_XBOOTLDR].found);
+ assert_se(dissected->partitions[PARTITION_XBOOTLDR].node);
+ assert_se(dissected->partitions[PARTITION_ROOT].found);
+ assert_se(dissected->partitions[PARTITION_ROOT].node);
+ assert_se(dissected->partitions[PARTITION_HOME].found);
+ assert_se(dissected->partitions[PARTITION_HOME].node);
+}
+
+static void verify_dissected_image_harder(DissectedImage *dissected) {
+ verify_dissected_image(dissected);
+
+ ASSERT_STREQ(dissected->partitions[PARTITION_ESP].fstype, "vfat");
+ ASSERT_STREQ(dissected->partitions[PARTITION_XBOOTLDR].fstype, "vfat");
+ ASSERT_STREQ(dissected->partitions[PARTITION_ROOT].fstype, "ext4");
+ ASSERT_STREQ(dissected->partitions[PARTITION_HOME].fstype, "ext4");
+}
+
static void* thread_func(void *ptr) {
int fd = PTR_TO_FD(ptr);
int r;
assert_se(mkdtemp_malloc(NULL, &mounted) >= 0);
- r = loop_device_make(fd, O_RDONLY, 0, UINT64_MAX, LO_FLAGS_PARTSCAN, LOCK_SH, &loop);
+ r = loop_device_make(fd, O_RDONLY, 0, UINT64_MAX, 0, LO_FLAGS_PARTSCAN, LOCK_SH, &loop);
if (r < 0)
log_error_errno(r, "Failed to allocate loopback device: %m");
assert_se(r >= 0);
log_notice("Acquired loop device %s, will mount on %s", loop->node, mounted);
- r = dissect_loop_device(loop, NULL, NULL, DISSECT_IMAGE_READ_ONLY, &dissected);
+ r = dissect_loop_device(loop, NULL, NULL, NULL, DISSECT_IMAGE_READ_ONLY|DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected);
if (r < 0)
log_error_errno(r, "Failed dissect loopback device %s: %m", loop->node);
assert_se(r >= 0);
partition_designator_to_string(d));
}
- assert_se(dissected->partitions[PARTITION_ESP].found);
- assert_se(dissected->partitions[PARTITION_ESP].node);
- assert_se(dissected->partitions[PARTITION_XBOOTLDR].found);
- assert_se(dissected->partitions[PARTITION_XBOOTLDR].node);
- assert_se(dissected->partitions[PARTITION_ROOT].found);
- assert_se(dissected->partitions[PARTITION_ROOT].node);
- assert_se(dissected->partitions[PARTITION_HOME].found);
- assert_se(dissected->partitions[PARTITION_HOME].node);
+ verify_dissected_image(dissected);
- r = dissected_image_mount(dissected, mounted, UID_INVALID, UID_INVALID, DISSECT_IMAGE_READ_ONLY);
+ r = dissected_image_mount(
+ dissected,
+ mounted,
+ /* uid_shift= */ UID_INVALID,
+ /* uid_range= */ UID_INVALID,
+ /* userns_fd= */ -EBADF,
+ DISSECT_IMAGE_READ_ONLY);
log_notice_errno(r, "Mounted %s → %s: %m", loop->node, mounted);
assert_se(r >= 0);
}
static int run(int argc, char *argv[]) {
+#if HAVE_BLKID
+ _cleanup_(dissected_image_unrefp) DissectedImage *dissected = NULL;
+ _cleanup_(umount_and_rmdir_and_freep) char *mounted = NULL;
+ pthread_t threads[arg_n_threads];
+ sd_id128_t id;
+#endif
_cleanup_free_ char *p = NULL, *cmd = NULL;
- _cleanup_(pclosep) FILE *sfdisk = NULL;
+ _cleanup_pclose_ FILE *sfdisk = NULL;
_cleanup_(loop_device_unrefp) LoopDevice *loop = NULL;
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
int r;
test_setup_logging(LOG_DEBUG);
if (argc >= 5)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Too many arguments (expected 3 at max).");
- if (!have_root_gpt_type()) {
- log_tests_skipped("No root partition GPT defined for this architecture, exiting.");
- return EXIT_TEST_SKIP;
- }
+ if (!have_root_gpt_type())
+ return log_tests_skipped("No root partition GPT defined for this architecture");
- if (detect_container() > 0) {
- log_tests_skipped("Test not supported in a container, requires udev/uevent notifications.");
- return EXIT_TEST_SKIP;
- }
-
- /* This is a test for the loopback block device setup code and it's use by the image dissection
- * logic: since the kernel APIs are hard use and prone to races, let's test this in a heavy duty
- * test: we open a bunch of threads and repeatedly allocate and deallocate loopback block devices in
- * them in parallel, with an image file with a number of partitions. */
-
- r = detach_mount_namespace();
- if (ERRNO_IS_PRIVILEGE(r)) {
- log_tests_skipped("Lacking privileges");
- return EXIT_TEST_SKIP;
- }
-
- FOREACH_STRING(fs, "vfat", "ext4") {
- r = mkfs_exists(fs);
- assert_se(r >= 0);
- if (!r) {
- log_tests_skipped("mkfs.{vfat|ext4} not installed");
- return EXIT_TEST_SKIP;
- }
- }
-
- assert_se(r >= 0);
+ r = find_executable("sfdisk", NULL);
+ if (r < 0)
+ return log_tests_skipped_errno(r, "Could not find sfdisk command");
assert_se(tempfn_random_child("/var/tmp", "sfdisk", &p) >= 0);
fd = open(p, O_CREAT|O_EXCL|O_RDWR|O_CLOEXEC|O_NOFOLLOW, 0666);
assert_se(pclose(sfdisk) == 0);
sfdisk = NULL;
- assert_se(loop_device_make(fd, O_RDWR, 0, UINT64_MAX, LO_FLAGS_PARTSCAN, LOCK_EX, &loop) >= 0);
-
#if HAVE_BLKID
- _cleanup_(dissected_image_unrefp) DissectedImage *dissected = NULL;
- _cleanup_(umount_and_rmdir_and_freep) char *mounted = NULL;
- pthread_t threads[arg_n_threads];
- sd_id128_t id;
+ assert_se(dissect_image_file(p, NULL, NULL, NULL, 0, &dissected) >= 0);
+ verify_dissected_image(dissected);
+ dissected = dissected_image_unref(dissected);
+#endif
- assert_se(dissect_loop_device(loop, NULL, NULL, 0, &dissected) >= 0);
+ if (geteuid() != 0 || have_effective_cap(CAP_SYS_ADMIN) <= 0) {
+ log_tests_skipped("not running privileged");
+ return 0;
+ }
- assert_se(dissected->partitions[PARTITION_ESP].found);
- assert_se(dissected->partitions[PARTITION_ESP].node);
- assert_se(dissected->partitions[PARTITION_XBOOTLDR].found);
- assert_se(dissected->partitions[PARTITION_XBOOTLDR].node);
- assert_se(dissected->partitions[PARTITION_ROOT].found);
- assert_se(dissected->partitions[PARTITION_ROOT].node);
- assert_se(dissected->partitions[PARTITION_HOME].found);
- assert_se(dissected->partitions[PARTITION_HOME].node);
+ if (detect_container() > 0) {
+ log_tests_skipped("Test not supported in a container, requires udev/uevent notifications");
+ return 0;
+ }
+
+ assert_se(loop_device_make(fd, O_RDWR, 0, UINT64_MAX, 0, LO_FLAGS_PARTSCAN, LOCK_EX, &loop) >= 0);
+
+#if HAVE_BLKID
+ assert_se(dissect_loop_device(loop, NULL, NULL, NULL, DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected) >= 0);
+ verify_dissected_image(dissected);
+
+ FOREACH_STRING(fs, "vfat", "ext4") {
+ r = mkfs_exists(fs);
+ assert_se(r >= 0);
+ if (!r) {
+ log_tests_skipped("mkfs.{vfat|ext4} not installed");
+ return 0;
+ }
+ }
+ assert_se(r >= 0);
assert_se(sd_id128_randomize(&id) >= 0);
- assert_se(make_filesystem(dissected->partitions[PARTITION_ESP].node, "vfat", "EFI", NULL, id, true) >= 0);
+ assert_se(make_filesystem(dissected->partitions[PARTITION_ESP].node, "vfat", "EFI", NULL, id, true, false, 0, NULL) >= 0);
assert_se(sd_id128_randomize(&id) >= 0);
- assert_se(make_filesystem(dissected->partitions[PARTITION_XBOOTLDR].node, "vfat", "xbootldr", NULL, id, true) >= 0);
+ assert_se(make_filesystem(dissected->partitions[PARTITION_XBOOTLDR].node, "vfat", "xbootldr", NULL, id, true, false, 0, NULL) >= 0);
assert_se(sd_id128_randomize(&id) >= 0);
- assert_se(make_filesystem(dissected->partitions[PARTITION_ROOT].node, "ext4", "root", NULL, id, true) >= 0);
+ assert_se(make_filesystem(dissected->partitions[PARTITION_ROOT].node, "ext4", "root", NULL, id, true, false, 0, NULL) >= 0);
assert_se(sd_id128_randomize(&id) >= 0);
- assert_se(make_filesystem(dissected->partitions[PARTITION_HOME].node, "ext4", "home", NULL, id, true) >= 0);
+ assert_se(make_filesystem(dissected->partitions[PARTITION_HOME].node, "ext4", "home", NULL, id, true, false, 0, NULL) >= 0);
dissected = dissected_image_unref(dissected);
- assert_se(dissect_loop_device(loop, NULL, NULL, 0, &dissected) >= 0);
+
+ /* We created the file systems now via the per-partition block devices. But the dissection code might
+ * probe them via the whole block device. These block devices have separate buffer caches though,
+ * hence what was written via the partition device might not appear on the whole block device
+ * yet. Let's hence explicitly flush the whole block device, so that the read-back definitely
+ * works. */
+ assert_se(ioctl(loop->fd, BLKFLSBUF, 0) >= 0);
+
+ /* Try to read once, without pinning or adding partitions, i.e. by only accessing the whole block
+ * device. */
+ assert_se(dissect_loop_device(loop, NULL, NULL, NULL, 0, &dissected) >= 0);
+ verify_dissected_image_harder(dissected);
+ dissected = dissected_image_unref(dissected);
+
+ /* Now go via the loopback device after all, but this time add/pin, because now we want to mount it. */
+ assert_se(dissect_loop_device(loop, NULL, NULL, NULL, DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected) >= 0);
+ verify_dissected_image_harder(dissected);
assert_se(mkdtemp_malloc(NULL, &mounted) >= 0);
* it. */
assert_se(loop_device_flock(loop, LOCK_SH) >= 0);
+ /* This is a test for the loopback block device setup code and it's use by the image dissection
+ * logic: since the kernel APIs are hard use and prone to races, let's test this in a heavy duty
+ * test: we open a bunch of threads and repeatedly allocate and deallocate loopback block devices in
+ * them in parallel, with an image file with a number of partitions. */
+ assert_se(detach_mount_namespace() >= 0);
+
/* This first (writable) mount will initialize the mount point dirs, so that the subsequent read-only ones can work */
- assert_se(dissected_image_mount(dissected, mounted, UID_INVALID, UID_INVALID, 0) >= 0);
+ assert_se(dissected_image_mount(
+ dissected,
+ mounted,
+ /* uid_shift= */ UID_INVALID,
+ /* uid_range= */ UID_INVALID,
+ /* usernfs_fd= */ -EBADF,
+ 0) >= 0);
/* Now we mounted everything, the partitions are pinned. Now it's fine to release the lock
* fully. This means udev could now issue BLKRRPART again, but that's OK given this will fail because
log_notice("All threads started now.");
if (arg_n_threads == 1)
- assert_se(thread_func(FD_TO_PTR(fd)) == NULL);
+ ASSERT_NULL(thread_func(FD_TO_PTR(fd)));
else
for (unsigned i = 0; i < arg_n_threads; i++) {
log_notice("Joining thread #%u.", i);
void *k;
assert_se(pthread_join(threads[i], &k) == 0);
- assert_se(k == NULL);
+ assert_se(!k);
log_notice("Joined thread #%u.", i);
}
#else
log_notice("Cutting test short, since we do not have libblkid.");
#endif
-
return 0;
}
projects / thirdparty / systemd.git / blobdiff