From patchwork Tue Mar 19 16:55:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13596925 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37E32107B2 for ; Tue, 19 Mar 2024 16:56:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867370; cv=none; b=YZqhSLXTUVMmLzT2OzkFWHDQbyHzM9eiARDZ/gunVQiPe5qExAZ9kIZtZKchoovgv3uRk22VrGOqQfTKoMtChaIbnr0vna5NCgP2AKcm+v+azn3O7VB2e0ht8kGKHooMBZ7o9PPZw2xCBwZnyw67hbgat6WDolColE0+EhNE++U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867370; c=relaxed/simple; bh=qA72Tz+8tuNZU/4QviNvrzVvbKhLu3y78NAdl4BMYFs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EMZOh0OMX5FuhrXOZBJHzIuHAJqQWjg4KEgztnrdM1nNC448nvejvye+wR0QfW4GI4FKqjEhYecmwAWCvbsq6vtqbPX7OuCbNP5Yeb8CcUKv1VqZq2tGpj2F/BsinKzm2t/ai7WQm4SyRzK2vnQGn1j+bwOIl8sTHooK3vT5lzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com; spf=none smtp.mailfrom=toxicpanda.com; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b=ylrLZbO1; arc=none smtp.client-ip=209.85.160.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b="ylrLZbO1" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-430c76fbf05so16833621cf.0 for ; Tue, 19 Mar 2024 09:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1710867366; x=1711472166; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cBbs+iA1l2yOBOmVBbjTGQGF+IQD6umOZ/ZP4nOCnC0=; b=ylrLZbO1RZn1P9HsswUoMKa55AXU8IVZgQp+63KB3YP2l8AxYz92P7fR9ElMjGJMxS +t+MJFE0Y+sg8cHlKHIS2QwBvjFEAkRd6siQdcfAE+OfkNcXJZPDh/m9DkY+4Tgply53 TZVPGDmv+XqTIiX1D9HK4gE7fEHT5WyOaT4Pf4cWfT27GhjHn8u9DzT/jGolMeMqbFNg yV7lfOFsI5aCk7NRrilz9sOpuy4DpY87ohv019+VAQd32taUEqdr7egp8ba0MslcY6oK kw+Ur/O7OsBOlOCOG39LbAhzahRlOpTkjHcr1pmUEzgY47BTtiUB0LaOO4xc7AJMuGRB X0MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710867366; x=1711472166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cBbs+iA1l2yOBOmVBbjTGQGF+IQD6umOZ/ZP4nOCnC0=; b=nk99IV+TiGgS76br7kkoH9LTOkldT1NNOogo4+FnDVv3BRiChdaDRJtGFHhar8EK2+ S6d/AyCF8fdffiRJ6/wIEUPngF4NJR1LyFyChcdMdN63v0NLLN3mQd2EvXATS8lsniki l/bdGlxyX8zI2Nh08B0VpNXHMXye7iFWr+2e8r+JxScfTgmALB6q9WtPY5fEdIVM6yUR T4eij7BDh17Pw8LNINQYUx+V3ohFLBoG6ulRLb0DtKKfI6nlHsBphvXrVCgnkqmoj76R 2VXvrGja+Fnk22DZk2qEm7X7cbYpxx/3z7a2s4hi1Y/S/fkESq7rl22L2Ir2vUVLCYiA ThTQ== X-Forwarded-Encrypted: i=1; AJvYcCVcv8BkaR10nXyZH21oe+jVEqvr7ayqSSg8Hoj+d2VJjJKUMNs6TK+CT4ay1ROBFlaUONjJYuw3faq5V7rq6dPZQAc3EIg71rA7Isc= X-Gm-Message-State: AOJu0YxkDZjlzFVP8fz6DGWgIWBWrxk7Vc3rmDVTMyNcLmPN6DBgFvgq Hvs2YMWbxkBRa2nHJKiHKEGFh/3FUkfQsZWi2KHzkHz9tNSDNfDJ+/Fx7YaXBoY= X-Google-Smtp-Source: AGHT+IHLbkAjOlEgHCvWBkN/yrjOXV5/P5CAREiswnR3MUxogQRQ6+dQkFpm/qDqUfx8MPm4hiI55Q== X-Received: by 2002:a05:622a:14cc:b0:430:a7c3:be9d with SMTP id u12-20020a05622a14cc00b00430a7c3be9dmr3190521qtx.3.1710867366063; Tue, 19 Mar 2024 09:56:06 -0700 (PDT) Received: from localhost (076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id fj5-20020a05622a550500b00430b423f06csm4837298qtb.86.2024.03.19.09.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 09:56:05 -0700 (PDT) From: Josef Bacik To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 1/3] fstests: check btrfs profile configs before allowing raid56 Date: Tue, 19 Mar 2024 12:55:56 -0400 Message-ID: <65177ca9d943c043f88d8ea034d1e625af3d0e58.1710867187.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 For some of our tests we have _require_btrfs_fs_feature raid56 to make sure the raid56 support is loaded in the kernel. However this isn't the only limiting factor, we can have only zoned devices which we already check for, but we could also have BTRFS_PROFILE_CONFIGS set without raid5 or raid6 as an option. Fix this by simply checking the profile as appropriate and skip running the test if we're missing raid5 or raid6 in our profile settings. Signed-off-by: Josef Bacik --- common/btrfs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/btrfs b/common/btrfs index b0f7f095..d9b01a48 100644 --- a/common/btrfs +++ b/common/btrfs @@ -111,8 +111,12 @@ _require_btrfs_fs_feature() _notrun "Feature $feat not supported by the available btrfs version" if [ $feat = "raid56" ]; then - # Zoned btrfs only supports SINGLE profile - _require_non_zoned_device "${SCRATCH_DEV}" + # Make sure it's in our supported configs as well + _btrfs_get_profile_configs + if [[ ! "${_btrfs_profile_configs[@]}" =~ "raid5" ]] || + [[ ! "${_btrfs_profile_configs[@]}" =~ "raid6" ]]; then + _notrun "raid56 excluded from profile configs" + fi fi } From patchwork Tue Mar 19 16:55:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13596924 Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D05810A0E for ; Tue, 19 Mar 2024 16:56:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867369; cv=none; b=Sl90WEihEVQmHF1XdFVYort2qy23Y/MzSmzx1T+gZrP/GnbFdPfR2L53gEKnA5PlIk10b7J4KLT3d/TdgGO4BVS2CsKHnU0nnxBZs27Gr6QT6FEAhjjJ+RpZu49QtMhvVojYnriXuabDtfydB4Rw9PvSHCszCmR2DpPzmIADITs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867369; c=relaxed/simple; bh=28rqPOzqrzU2xeKeaX/cB7xe1OCGgfzJP9tXmwdNDho=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z4aLfkNIyWT/eJ/pNGulCQ1vnO72hG4PBhONgD481uf68edSPUykVnUyxWGlC00tRf9n1vldAavBV3If9hPEX+Jt6G+PanGlqJ5cIojHmxZJahreCHBRUOYOlx70Yd/f6Qj6oI+mFVtMq8HHHtA0/Kr6Murh2UzAxGbl0T82t8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com; spf=none smtp.mailfrom=toxicpanda.com; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b=JRIu7jeD; arc=none smtp.client-ip=209.85.219.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b="JRIu7jeD" Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-690bd329df2so40035226d6.2 for ; Tue, 19 Mar 2024 09:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1710867367; x=1711472167; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nrknpnmmhSsDGdPuq/gQ6JDl7KQ3ZMmkGR/31N88j1s=; b=JRIu7jeDlPDSX+a8JeyjgGEO1t6Xo1tr6me6qswNClQ1yVYjVRGy6xAOu4fjDwthq/ 0Q60oK55Ok31DTXQhP6PYrl4l0JiAOUbbxdgEKNQKuE/Sd20t8s2Z4vuV9DfXGUcko2x d+Sl1QPyCpO8v0xEZqXB6VlHEm+MvdKANokn0W8z8eZY2UPhRy9gziX8qjDk9IhJAoKB +eCnkoXLfDd9BkuuZzAX977tCm7HTOl1enOC+cyCbZZVs1Fca6lwTVmhx3y156L/ryKn gzp2AqLfdzCBHXSbyRY9PvSIZyEuuurG/hxNTSvL7i15WEEyLYbayv99Wt0oFWcoJU/G Fhzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710867367; x=1711472167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nrknpnmmhSsDGdPuq/gQ6JDl7KQ3ZMmkGR/31N88j1s=; b=bhe3iLYh5MT267ssE58IhCohRs6DmgSgfsOxL6fKvD62SmjSDPptGeXTExtD/CcWkW ActGeeoedUw16cPKBd6nUx/kBevAgjbk1EayoKBFQ+hb4hobAHencFRUwiEsKaCF7Orz DmGDlioS0xhugZd4mHVES0gIDZBYPv/8DgOPzuB5XCMoLvKktvLk/pxPM24vuwj+paCL JFafTeFqBe0HsPxPl3xbJF/PbNpTfp5f2AOkRTgmqDWRAxP9IPkHtwwDbMRWY/ZgCXQN gFSqgcL+SAdXU+5DMkvQakinYE02l9gh2jrDhm+S8eC3YapHR5XSGnCGzrbhD6tb/ZZc nMSQ== X-Forwarded-Encrypted: i=1; AJvYcCU4bkvduGp2nj95EOp0NMt4mpRfh7kfOw9BZMXKOK6IWazARXsqm57AigL+5meFGEFQZpenIbqkULfvs55nTG2XTh/waaf30/niIys= X-Gm-Message-State: AOJu0YxLEonVQmumnEdjDSyXtmPg/RAn/QTq7WZX2QOkZF9ZRN/VlWif 60J7H6ydtnG3mFKkVVnsgKW/K96gDYL+jdpBsr/ss39eoJP8d+cZbF2Q4d38xEs= X-Google-Smtp-Source: AGHT+IFwH3KOQnVS99ANDSdHHQg7PS9aFQr53dY6vRcG7MYR/xNMzijOJJiHH6OsEwa9qfkSN7N01w== X-Received: by 2002:ad4:44b2:0:b0:690:4942:dd89 with SMTP id n18-20020ad444b2000000b006904942dd89mr3238946qvt.28.1710867367281; Tue, 19 Mar 2024 09:56:07 -0700 (PDT) Received: from localhost (076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 1-20020a05621420a100b006961c9a2ed8sm2552906qvd.47.2024.03.19.09.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 09:56:06 -0700 (PDT) From: Josef Bacik To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 2/3] fstests: btrfs/195: skip raid setups not in the profile configs Date: Tue, 19 Mar 2024 12:55:57 -0400 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 You can specify a custom BTRFS_PROFILE_CONFIGS to skip certain raid configurations in the tests, however btrfs/195 doesn't honor this currently. Fix this up by getting the profile configs and skipping any configurations that are not listed in BTRFS_PROFILE_CONFIGS. Signed-off-by: Josef Bacik Reviewed-by: Anand Jain --- tests/btrfs/195 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/btrfs/195 b/tests/btrfs/195 index 96cc4134..df8f5ed6 100755 --- a/tests/btrfs/195 +++ b/tests/btrfs/195 @@ -21,6 +21,9 @@ _require_scratch_dev_pool 4 # Zoned btrfs only supports SINGLE profile _require_non_zoned_device "${SCRATCH_DEV}" +# Load up the available configs +_btrfs_get_profile_configs + declare -a TEST_VECTORS=( # $nr_dev_min:$data:$metadata:$data_convert:$metadata_convert "4:single:raid1" @@ -38,6 +41,11 @@ run_testcase() { src_type=${args[1]} dst_type=${args[2]} + if [[ ! "${_btrfs_profile_configs[@]}" =~ "$dst_type" ]]; then + echo "=== Skipping test: $1 ===" >> $seqres.full + return + fi + _scratch_dev_pool_get $num_disks echo "=== Running test: $1 ===" >> $seqres.full From patchwork Tue Mar 19 16:55:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13596926 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 969EC18C05 for ; Tue, 19 Mar 2024 16:56:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867373; cv=none; b=ulU5SnsYPBg3lw9qSam9KnOOeKeHP+64c1HEwhlPtWSRnddtZ6jpaxObmUycNDscogp5cXWQfDyM+tdKVkTYg1Sm2TEBS8fHEf7QmT0AobRjXoNuUMcPruW6X/oElDH+X6q4K1N3mUGoq5hCkVDDM6ONeIwrKStZtL3jC1+3clU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710867373; c=relaxed/simple; bh=hsYvutvV8mZq4tJxDZlF8Y4bVOiUIuvjHFVje3QQG4E=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TGUv7GvesDfQLNd+lQ4ShBxq3IB5528HyuvqklczmIIHIRCjGls+39EdZE5Qn+9oOzDVYE6b6qfaQLuyRpRdigrycEgo2SP/qewy6prKW3+lOeJEOlZZE46SuNDN6QRUpBZ1Kjldt1oOqipshVBNgKRjuLag28O2dETXOpIlX0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com; spf=none smtp.mailfrom=toxicpanda.com; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b=vb1X+Tg7; arc=none smtp.client-ip=209.85.222.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=toxicpanda.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20230601.gappssmtp.com header.i=@toxicpanda-com.20230601.gappssmtp.com header.b="vb1X+Tg7" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-78a16114b69so6242285a.0 for ; Tue, 19 Mar 2024 09:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1710867370; x=1711472170; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6gDXQ3N6RtQpFHt8yWxl41S3QndLvHgv4UXULQuqMXs=; b=vb1X+Tg7WGH/pFXqde7NcO2rOGdRbPu4nYuMA066teC0c/iFSMFPFcTBSlQx7DkhIT ZAckckLQzTLsGPM72lbuA4dIiMFhJa31GlSbVYz7ia41AxjrHxcHjcpb03s1Zg0VXiuq CyU6AHIz1u4zAeytOpvG9qHdgussDOm3aSrzi3rEPPcniRk1Wg0Xmg0Jqn3u7atquIET Osar45gUGdKTtDKnZM8vaXWhf7uHAkFbI1OQeFhnTiqwfZYeiLBsYLuGfgVe4nS0rLQS QBTxjPj6bI+7Fd2Gsgw24pGT9fmkhopJxnj8g+hxTw8K3r8XOMHu7xEgvTnd6FM60R3r E8DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710867370; x=1711472170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6gDXQ3N6RtQpFHt8yWxl41S3QndLvHgv4UXULQuqMXs=; b=A5cFBch5FBCUjLv2b7X70quSXml60Icj2aGrZohePqvzh78ArAe4n6px0z3QrqAbJQ uD/Frjk1zhJvLjvf/xycyhRW9Qb1JpB/Gk+PpxYvwktHtAF1EQHZkKLnZRPhdbo38TSf qrCCUYdUgRGywBSbg4FF2UV5+/cJcvvvtXtOkHCI4inQTtrHQWksCj8odmf7RBZVROwo cKqbQGa3Y/uMI8thjzprPTboSL8rdhVbRectDaw+acnFuKjwcNe3ptcsL4lFBFQtNG69 CKgw9peT065Yfi9KXFeaafltKLJiPv3sKWZb6kUx+gjY95UsHqXnmLevuHhRNP5v0lKo yPug== X-Forwarded-Encrypted: i=1; AJvYcCX5OBrsz86sCj9ilKcq9riA/4rk5PA7ZOj/y2fDUzQ/NMmSg5UGSTWx2AHGAMLHrHl/It//Oby0YCR0M0QYmpVBbQRRSDuVeRZdbv8= X-Gm-Message-State: AOJu0Yyu+KZJpgKmd9POWp5J2A7ymn2cy1qpjelDMkv7ICXS7m567VJO W0HGDRJm1RmV+yvfmLmHxet8wK6JjumFyj5fl0z/ZIIdsVpkVoPGKyoH+LKSh6nOlKBsZHaGOTZ 7 X-Google-Smtp-Source: AGHT+IFTbbZANqwVDpPXm0qhhIO5T/inGJXfRHNivqf/EGirubaBEluOGNsGjwc/QjeOyXLop9kSog== X-Received: by 2002:a05:620a:4116:b0:78a:1b8d:e0e5 with SMTP id j22-20020a05620a411600b0078a1b8de0e5mr1613591qko.14.1710867370571; Tue, 19 Mar 2024 09:56:10 -0700 (PDT) Received: from localhost (076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id z1-20020ae9e601000000b00788287e3430sm5547220qkf.130.2024.03.19.09.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 09:56:10 -0700 (PDT) From: Josef Bacik To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 3/3] fstests: add _require_btrfs_fs_feature raid56 to a few tests Date: Tue, 19 Mar 2024 12:55:58 -0400 Message-ID: <13ca87a192f4eb8a8f10415ae1ff06682c3b40a0.1710867187.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are a few tests that don't have the required _require_btrfs_fs_feature raid56 check in them even tho they are raid5/6 related tests. Add this check in order to make sure environments that don't have raid5/6 support don't improperly fail them. Signed-off-by: Josef Bacik --- tests/btrfs/197 | 1 + tests/btrfs/198 | 1 + tests/btrfs/297 | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/btrfs/197 b/tests/btrfs/197 index d259fd99..8a034fdc 100755 --- a/tests/btrfs/197 +++ b/tests/btrfs/197 @@ -32,6 +32,7 @@ _require_scratch _require_scratch_dev_pool 5 # Zoned btrfs only supports SINGLE profile _require_non_zoned_device ${SCRATCH_DEV} +_require_btrfs_fs_feature raid56 workout() { diff --git a/tests/btrfs/198 b/tests/btrfs/198 index 7d23ffce..ecce81cd 100755 --- a/tests/btrfs/198 +++ b/tests/btrfs/198 @@ -20,6 +20,7 @@ _require_scratch _require_scratch_dev_pool 4 # Zoned btrfs only supports SINGLE profile _require_non_zoned_device ${SCRATCH_DEV} +_require_btrfs_fs_feature raid56 _fixed_by_kernel_commit 96c2e067ed3e3e \ "btrfs: skip devices without magic signature when mounting" diff --git a/tests/btrfs/297 b/tests/btrfs/297 index a0023861..990b83b1 100755 --- a/tests/btrfs/297 +++ b/tests/btrfs/297 @@ -15,6 +15,7 @@ _supported_fs btrfs _require_odirect _require_non_zoned_device "${SCRATCH_DEV}" _require_scratch_dev_pool 3 +_require_btrfs_fs_feature raid56 _fixed_by_kernel_commit 486c737f7fdc \ "btrfs: raid56: always verify the P/Q contents for scrub"