Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp4522020imw; Tue, 19 Jul 2022 08:09:23 -0700 (PDT) X-Google-Smtp-Source: AGRyM1taoAHYL0le4m0rVFW+gImyydi6sBoAEHEvmp5cY9kwTs3KvASM3EtoqPKZZkahq+10eeql X-Received: by 2002:a05:620a:2a0e:b0:6b4:68a0:39fe with SMTP id o14-20020a05620a2a0e00b006b468a039femr21189331qkp.3.1658243363439; Tue, 19 Jul 2022 08:09:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658243363; cv=none; d=google.com; s=arc-20160816; b=Qa2r99teTyBDmTvZlQ0lOCss//IqVGF1mhjGX14eapSj69mnHe+hFDjFFjhuAuFKSS MbZq7iLUiSjgfVziJIv2x57G7qC5c6ItCE0z0HoyuY7xtlBbyUNJHVhR9jGwwK0u3q4C qniRrtVrCgYgMQYX57757t3HdRQodrGEIaAXbkyLOo+OQN/lELBjyzG17zkJfPKkyd1i +cKB1q3FhDJZVWi93MPr3QtxCGDXPPSdVvAwVyGPW93rKVQlh//fc4mRZNvJuiSXDpn+ lh8Uylf53oS0pBhzrtyo7jmGG9KRCE1Z2o3ibbBHTT/CIvPHBnP4I4LQAhyjx/yXxh/i Gmxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=G5KDGj5X+fkRJzkV8mcGR6oQob24wJqLhg0RMJoQZNk=; b=glHh2N4JPVc+naUGd4dt9PG3Cxa2ragLWXY+MY6Q1DBILtnprIllVsopj98t7lwSTX ylGxaEAyuNuA0rmYClkWcoVHpy7GwjEKvNfxkpj6Ct2gY0avjDv7/CR7q2KT5trGZPQG aNlmDXXrDC5x5vGKATABv/irD++hlWMFPqQR6gzW9r6CKsCxyXxgN1I9augthEfDiko7 9reALuZDhVXeO+mjecOVWPGRT/8O/8YYiJ/LjmC8t7TgBN+HS6HDtvVvZzv2ayz2dgTG L4qgP+hwkz9KdaqTCnZpYehFQT1z5QvmBKKs6fCAfWHo50DO+0HxIVUz1KWo2ekhxX9T 4Qew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kZCeAoTS; 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=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w22-20020a05620a0e9600b006b5eec387a6si2271696qkm.179.2022.07.19.08.09.03; Tue, 19 Jul 2022 08:09:23 -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=@kernel.org header.s=k20201202 header.b=kZCeAoTS; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbiGSO4o (ORCPT + 99 others); Tue, 19 Jul 2022 10:56:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238281AbiGSO4l (ORCPT ); Tue, 19 Jul 2022 10:56:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E43D849B66; Tue, 19 Jul 2022 07:56:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 616F361879; Tue, 19 Jul 2022 14:56:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A06BDC341C6; Tue, 19 Jul 2022 14:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1658242598; bh=REXpzai3NQJRg1G1Spk9o0RHprrMn/zArsK/ESwkfpM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kZCeAoTSUbMNuqBeI4deRkamdCh5cFkHduyjO50afRR3WeTEy53efu2VORl2pUDr2 dxJqXQGG0HsXq9vSxJdtalLXAyTJCWk147gU5QEJde181qG4A4tF1zxJECPieqBoHS YTxzzHrauQ/PI53h4ingcmQlVKlcGhchwuSSSEbn9jsg8uB5CcxaCOEsby1AWyqQX6 FzwXVKjdbyrBXdVmuJ4z3NJdEq/QhjoTgN7BAgHawg0+tLVUKHI3F8lwsUTWwOcIwz dueFIG0KwLmZsYu934sJ069FEGAzNNd4ycOOkC+G8oAoAZhzVJ5zh98I3bHmBCD7Ue ZN0Ak32bUTvig== Date: Tue, 19 Jul 2022 07:56:38 -0700 From: "Darrick J. Wong" To: Jeremy Bongio Cc: Ted Tso , linux-ext4@vger.kernel.org, fstests@vger.kernel.org Subject: Re: [PATCH v4] ext4/056: add a check to make sure ext4 uuid ioctls get/set during fsstress. Message-ID: References: <20220719064853.152501-1-bongiojp@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220719064853.152501-1-bongiojp@gmail.com> X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 On Mon, Jul 18, 2022 at 11:48:53PM -0700, Jeremy Bongio wrote: > 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=$! LGTM now, so Reviewed-by: Darrick J. Wong --D > + > +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 >