Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp4140386imw; Mon, 18 Jul 2022 23:56:06 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sPjq4OycAYgpTIluHaI+yE/JXwnMe88HIYrULywGb9+PgLrDPsSh1Xa3/u1RAqxVdPpySX X-Received: by 2002:a17:902:8209:b0:16c:2da4:e734 with SMTP id x9-20020a170902820900b0016c2da4e734mr32285903pln.43.1658213766228; Mon, 18 Jul 2022 23:56:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658213766; cv=none; d=google.com; s=arc-20160816; b=yj8tRw0BA9KC3Z/5nseGFoc5UqTWhYdoqhExU0YQwW9ObJqnZdYmR6UqoPva/0PDIN dGIUQT5ltrXI/zwR2wNPhz1V2Z5l0R+gE4/A4mJ9KNxuj1aBW+/2JvjcrCPKz7fDK1p1 IS6JV3QNLS6F3zVIGRsLb7TmkQRNNI0/RqaFLvewTK/GMVHm2apQU1N/Ys9+Kzz6uUeN llJgj7BRgiRFwJqORBO/C+CikxUm53NBwvPVphMVg6HBfI/rtwuVZ0g9Ul44Pf8eP3+g 677YwGdka8XloPJTB1A6tUj3hITRXDsRXctwgGjxwb9rM90uy5t3Slph9pjM9QNzDv09 eeIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=BVe+gsphO/pyZ6w6Jqw5wT9M2Cob7vGGyX8DR5WOgOc=; b=e7vqLGcsy3qAjXhWH296oX6ofJEvhP7hYBPNavVhCoNG08LyLc44NWTR0+he4zWK8m oth0KVbrQ3YyjKrdybRVJULvn9h4rupZvSyXIIMiR+9W+IsKKsxqlk4IiG3/TrWMlzcc wa6lMXvIl4CJxeXI31s1VlkQh559JPF1NriZJL7rI1rnnzgkIsGJSp7vRvY3SbPm/Qtd WS0yXXE45ajyXuFgr/dMEJ7HEXd6VKm/S4Hg8Fr/2qz47hjTrKs7UErlDI32WiPmkiIm +W2vBV4uitl9cn7+1mcAwTovxpGs2LY+Akb56z2QfRTxkl97XSKwSfjx8GoNYrLJ2agT fWPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Hq+7E9Nl; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jz21-20020a17090b14d500b001f06deff0afsi19448384pjb.82.2022.07.18.23.55.44; Mon, 18 Jul 2022 23:56:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Hq+7E9Nl; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbiGSGtR (ORCPT + 99 others); Tue, 19 Jul 2022 02:49:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237082AbiGSGtO (ORCPT ); Tue, 19 Jul 2022 02:49:14 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64FB72B61C; Mon, 18 Jul 2022 23:49:09 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id z12-20020a17090a7b8c00b001ef84000b8bso20386405pjc.1; Mon, 18 Jul 2022 23:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BVe+gsphO/pyZ6w6Jqw5wT9M2Cob7vGGyX8DR5WOgOc=; b=Hq+7E9NlFj0eAgH5FeyoHJnlvP9IQl21eb6l3afzju96lPlk7sBsY7eVQScVIrZzBi l378ET4p4D32xlz3bWsWlpIPBg9vaYUE788xpcUD1lk6Nk5KKQ2DTjuz9uHucnZ/yq68 5Dq5zGhV9b3cBnctne9CouCKkKJezqUHyzqrOaH1bOCurGQxLsaO7G8Uq8TxWW4fDWsy hOfIyvJFsj59UtwQskDRjBj4HXFwxAA0sBAK/utSIh+WQiEzueybjcRd9iOCYFXsSlht Wm5M4O8byH9gmOHfdrei1Lr0gf6bUUoXiVziGTphg+xLNsgTPR7RNHuhtr4PkB7+u1JM ZX6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BVe+gsphO/pyZ6w6Jqw5wT9M2Cob7vGGyX8DR5WOgOc=; b=sQtOhmO2NqJRPs0oNxNXufeeIdiRx9StHlMs1WnLegSJ1z6k7CtEoXxZJb3aWMZ/xf 1fu1Oq8zFRDEMvRL5alJBMhJsUgetuFRcgIGYUkwfrAhSl949YlNrG1NPFIl1WAM+ay/ XZE7hKhSDadgUQXAeph2MWc3+FU2RmJl34+kCG2QvHrcA9pogYzbRDNQ6dj4XeZVzsc/ 6AvbBj9yFz2KxkM2bzuLpwPfkwKNize3uqlr9ostK3O9DGBSdKLi4V0PnFeDiCZCN7d3 zHAaeDsVkXMblqngbdIOxAFmUkGp9+pomt9uO6oP9Ec/ymodV+zDh+XmGPz5f+loyyZf 1Rcw== X-Gm-Message-State: AJIora9iWNsSEN9I7LNbf9hYjP9IuXtwi9VdyXpgV+tqfw2nnGvQqoM1 UALzvyesAheIfdeNzb4y0bs= X-Received: by 2002:a17:902:7209:b0:16b:fa09:5d6 with SMTP id ba9-20020a170902720900b0016bfa0905d6mr32134724plb.120.1658213348273; Mon, 18 Jul 2022 23:49:08 -0700 (PDT) Received: from jbongio9100214.roam.corp.google.com (cpe-104-173-199-31.socal.res.rr.com. [104.173.199.31]) by smtp.googlemail.com with ESMTPSA id nd2-20020a17090b4cc200b001e292e30129sm10514114pjb.22.2022.07.18.23.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 23:49:07 -0700 (PDT) From: Jeremy Bongio To: Ted Tso Cc: linux-ext4@vger.kernel.org, fstests@vger.kernel.org, Jeremy Bongio Subject: [PATCH v4] ext4/056: add a check to make sure ext4 uuid ioctls get/set during fsstress. Date: Mon, 18 Jul 2022 23:48:53 -0700 Message-Id: <20220719064853.152501-1-bongiojp@gmail.com> X-Mailer: git-send-email 2.37.0.170.g444d1eabd0-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Adds a utility to set/get uuid through ext4 ioctl. Executes the ioctls while running fsstress. These ioctls are used by tune2fs to safely change the uuid without racing other filesystem modifications. Signed-off-by: Jeremy Bongio --- Outstanding fsstress pid is killed in _cleanup(). Copyright added. Newline added to uuid_ioctl output. fu_* fields are now named fsu_*. .gitignore | 1 + src/Makefile | 4 +- src/uuid_ioctl.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ tests/ext4/056 | 63 +++++++++++++++++++++++++++ tests/ext4/056.out | 2 + 5 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 src/uuid_ioctl.c create mode 100755 tests/ext4/056 create mode 100644 tests/ext4/056.out diff --git a/.gitignore b/.gitignore index ba0c572b..dab24d68 100644 --- a/.gitignore +++ b/.gitignore @@ -169,6 +169,7 @@ tags /src/unwritten_mmap /src/unwritten_sync /src/usemem +/src/uuid_ioctl /src/writemod /src/writev_on_pagefault /src/xfsctl diff --git a/src/Makefile b/src/Makefile index 111ce1d9..e33e04de 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,14 +31,14 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ - detached_mounts_propagation ext4_resize + detached_mounts_propagation ext4_resize uuid_ioctl EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ btrfs_crc32c_forged_name.py SUBDIRS = log-writes perf -LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt +LLDLIBS = $(LIBHANDLE) $(LIBACL) -lpthread -lrt -luuid ifeq ($(HAVE_XLOG_ASSIGN_LSN), true) LINUX_TARGETS += loggen diff --git a/src/uuid_ioctl.c b/src/uuid_ioctl.c new file mode 100644 index 00000000..89a9b5d8 --- /dev/null +++ b/src/uuid_ioctl.c @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2022 Google, Inc. All Rights Reserved. + * + * Test program which uses the raw ext4 set_fsuuid ioctl directly. + * SYNOPSIS: + * $0 COMMAND MOUNT_POINT [UUID] + * + * COMMAND must be either "get" or "set". + * The UUID must be a 16 octet sequence represented as 32 hexadecimal digits in + * canonical textual representation, e.g. output from `uuidgen`. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct fsuuid { + __u32 fsu_len; + __u32 fsu_flags; + __u8 fsu_uuid[]; +}; + +#ifndef EXT4_IOC_GETFSUUID +#define EXT4_IOC_GETFSUUID _IOR('f', 44, struct fsuuid) +#endif + +#ifndef EXT4_IOC_SETFSUUID +#define EXT4_IOC_SETFSUUID _IOW('f', 44, struct fsuuid) +#endif + +int main(int argc, char **argv) +{ + int error, fd; + struct fsuuid *fsuuid = NULL; + + if (argc < 3) { + fprintf(stderr, "Invalid arguments\n"); + return 1; + } + + fd = open(argv[2], O_RDONLY); + if (!fd) { + perror(argv[2]); + return 1; + } + + fsuuid = malloc(sizeof(*fsuuid) + sizeof(uuid_t)); + if (!fsuuid) { + perror("malloc"); + return 1; + } + fsuuid->fsu_len = sizeof(uuid_t); + fsuuid->fsu_flags = 0; + + if (strcmp(argv[1], "get") == 0) { + uuid_t uuid; + char uuid_str[37]; + + if (ioctl(fd, EXT4_IOC_GETFSUUID, fsuuid)) { + fprintf(stderr, "%s while trying to get fs uuid\n", + strerror(errno)); + return 1; + } + + memcpy(&uuid, fsuuid->fsu_uuid, sizeof(uuid)); + uuid_unparse(uuid, uuid_str); + printf("%s\n", uuid_str); + } else if (strcmp(argv[1], "set") == 0) { + uuid_t uuid; + + if (argc != 4) { + fprintf(stderr, "UUID argument missing.\n"); + return 1; + } + + error = uuid_parse(argv[3], uuid); + if (error < 0) { + fprintf(stderr, "Invalid UUID. The UUID should be in " + "canonical format. Example: " + "8c628557-6987-42b2-ba16-b7cc79ddfb43\n"); + return 1; + } + + memcpy(&fsuuid->fsu_uuid, uuid, sizeof(uuid)); + if (ioctl(fd, EXT4_IOC_SETFSUUID, fsuuid)) { + fprintf(stderr, "%s while trying to set fs uuid\n", + strerror(errno)); + return 1; + } + } else { + fprintf(stderr, "Invalid command\n"); + return 1; + } + + return 0; +} diff --git a/tests/ext4/056 b/tests/ext4/056 new file mode 100755 index 00000000..7fa4ac18 --- /dev/null +++ b/tests/ext4/056 @@ -0,0 +1,63 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Google, Inc. All Rights Reserved. +# +# Test the set/get UUID ioctl. +# + +. ./common/preamble +_begin_fstest auto ioctl + +# Override the default cleanup function. +_cleanup() +{ + cd / + rm -r -f $tmp.* + kill -9 $fsstress_pid 2>/dev/null; +} + +# Import common functions. +. ./common/filter + +# real QA test starts here +_supported_fs ext4 +_require_scratch +_require_test_program uuid_ioctl +_require_command $UUIDGEN_PROG uuidgen + +UUID_IOCTL=$here/src/uuid_ioctl + +# If the ioctl is not supported by the kernel, then skip test. +current_uuid=$($UUID_IOCTL get $SCRATCH_MNT 2>&1) +if [[ "$current_uuid" =~ ^Inappropriate[[:space:]]ioctl ]]; then + _notrun "UUID ioctls are not supported by kernel." +fi + +# metadata_csum_seed must be set to decouple checksums from the uuid. +# Otherwise, checksums need to be recomputed when the uuid changes, which +# is not supported by the ioctl. +_scratch_mkfs_ext4 -O metadata_csum_seed >> $seqres.full 2>&1 +_scratch_mount >> $seqres.full + +# Begin fsstress while modifying UUID +fsstress_args=$(_scale_fsstress_args -d $SCRATCH_MNT -p 15 -n 999999) +$FSSTRESS_PROG $fsstress_args > /dev/null 2>&1 & +fsstress_pid=$! + +for n in $(seq 1 20); do + new_uuid=$($UUIDGEN_PROG) + + echo "Setting UUID to ${new_uuid}" >> $seqres.full 2>&1 + $UUID_IOCTL set $SCRATCH_MNT $new_uuid + + current_uuid=$($UUID_IOCTL get $SCRATCH_MNT) + echo "$UUID_IOCTL get $SCARTCH_MNT: $current_uuid" >> $seqres.full 2>&1 + if [[ "$current_uuid" != "$new_uuid" ]]; then + echo "Current UUID ($current_uuid) does not equal what was sent with the ioctl ($new_uuid)" + fi +done + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/ext4/056.out b/tests/ext4/056.out new file mode 100644 index 00000000..6142fcd2 --- /dev/null +++ b/tests/ext4/056.out @@ -0,0 +1,2 @@ +QA output created by 056 +Silence is golden -- 2.37.0.170.g444d1eabd0-goog