From patchwork Tue May 14 00:51:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663728 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 028BF15A8 for ; Tue, 14 May 2024 00:52:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647929; cv=none; b=SeHqjV+I6u5h8odiVfWuIDT8I5KTJdXdTZU95AUPCljaR1Xy2cpQJKTZ+Fr5Wc8ak6IqCqKuA976VnwlPX8SR7t0HPKg13PZcCuNNIlWU6CvaegAyC2/kf8dpANzii4lPMTKOhVqF8cw7SwtwSza3SSmgWBT4oyTX2zqQkY6lGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647929; c=relaxed/simple; bh=/yT8wMJxRbKuXdUUiSqN185WDRu4xmSSBnB3+dzr//A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=thUpZhK0GuwuXj5Y9+WH5TDkp7Tv4yque/Y5nthx95N7AfZf9iViffizodxNz7yhLhBPP7ysRatV3glArVRVnMcMpT4LaXv6pdmpLfPzJ+/Z2unGtmtzYtAFhqiipsuUHCgq8FzILbbW/XfVTpiLAUDVZ/4Ym4bySQGY5anpF/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=buGFwCig; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="buGFwCig" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647926; x=1747183926; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/yT8wMJxRbKuXdUUiSqN185WDRu4xmSSBnB3+dzr//A=; b=buGFwCigW6ZgQ3A9lCWQvSedLSQxFJQ5M6sGoAHPYH8XUWwszoeZdtED fUzSOIN93iuzJZP/tSNYDFOaojUV+ozVifJI8Sz8mGC0mmLN1bylSGcd2 1QrA8hn4bBHaKQbj2yjv/pzhd0YPzsIAU6dohQ3tW/PshdXQPX9aqn7gf /CI/JlK0eEGwvKQKU/ZJ1k3m4sb3kSmt1nyoXY+5qacw91rm16mSW2Pkt E3yWOD3OJvem94WWlqCt1QATinkssMMzVW3AC0IIx1kT2YtXlHg5LEAgb Mxa1poVFVQHPDxtnfpXKXoxa3qIfreCloPd0J8zj/MaHaXvkJkVAdmHfJ g==; X-CSE-ConnectionGUID: YZxRfzc6TsuU8M5w0RyCWg== X-CSE-MsgGUID: vonCOAJ9TCGiJo2QAQOb9w== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252226" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:00 +0800 IronPort-SDR: 6642a81f_6WkMU4pws2K3oEccBWDmVG3QOAMmL/yMopQJoJKN8eCTaOb wpu+jvN3C48PE4TMxncZAKOMLqrjWcZZU//qgbw== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:07 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:51:59 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 1/7] btrfs-progs: rename block_count to byte_count Date: Mon, 13 May 2024 18:51:27 -0600 Message-ID: <20240514005133.44786-2-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 block_count and dev_block_count are counting the size in bytes. And, comparing them with e.g, "min_dev_size" is confusing. Rename them to represent the unit better. Signed-off-by: Naohiro Aota --- common/device-utils.c | 28 +++++++++++----------- mkfs/main.c | 56 +++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/common/device-utils.c b/common/device-utils.c index d086e9ea2564..86942e0c7041 100644 --- a/common/device-utils.c +++ b/common/device-utils.c @@ -222,11 +222,11 @@ out: * - reset zones * - delete end of the device */ -int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret, - u64 max_block_count, unsigned opflags) +int btrfs_prepare_device(int fd, const char *file, u64 *byte_count_ret, + u64 max_byte_count, unsigned opflags) { struct btrfs_zoned_device_info *zinfo = NULL; - u64 block_count; + u64 byte_count; struct stat st; int i, ret; @@ -236,13 +236,13 @@ int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret, return 1; } - block_count = device_get_partition_size_fd_stat(fd, &st); - if (block_count == 0) { + byte_count = device_get_partition_size_fd_stat(fd, &st); + if (byte_count == 0) { error("unable to determine size of %s", file); return 1; } - if (max_block_count) - block_count = min(block_count, max_block_count); + if (max_byte_count) + byte_count = min(byte_count, max_byte_count); if (opflags & PREP_DEVICE_ZONED) { ret = btrfs_get_zone_info(fd, file, &zinfo); @@ -276,18 +276,18 @@ int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret, if (discard_supported(file)) { if (opflags & PREP_DEVICE_VERBOSE) printf("Performing full device TRIM %s (%s) ...\n", - file, pretty_size(block_count)); - device_discard_blocks(fd, 0, block_count); + file, pretty_size(byte_count)); + device_discard_blocks(fd, 0, byte_count); } } - ret = zero_dev_clamped(fd, zinfo, 0, ZERO_DEV_BYTES, block_count); + ret = zero_dev_clamped(fd, zinfo, 0, ZERO_DEV_BYTES, byte_count); for (i = 0 ; !ret && i < BTRFS_SUPER_MIRROR_MAX; i++) ret = zero_dev_clamped(fd, zinfo, btrfs_sb_offset(i), - BTRFS_SUPER_INFO_SIZE, block_count); + BTRFS_SUPER_INFO_SIZE, byte_count); if (!ret && (opflags & PREP_DEVICE_ZERO_END)) - ret = zero_dev_clamped(fd, zinfo, block_count - ZERO_DEV_BYTES, - ZERO_DEV_BYTES, block_count); + ret = zero_dev_clamped(fd, zinfo, byte_count - ZERO_DEV_BYTES, + ZERO_DEV_BYTES, byte_count); if (ret < 0) { errno = -ret; @@ -302,7 +302,7 @@ int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret, } free(zinfo); - *block_count_ret = block_count; + *byte_count_ret = byte_count; return 0; err: diff --git a/mkfs/main.c b/mkfs/main.c index a467795d4428..950f76101058 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -80,8 +80,8 @@ static int opt_oflags = O_RDWR; struct prepare_device_progress { int fd; char *file; - u64 dev_block_count; - u64 block_count; + u64 dev_byte_count; + u64 byte_count; int ret; }; @@ -1159,8 +1159,8 @@ static void *prepare_one_device(void *ctx) } prepare_ctx->ret = btrfs_prepare_device(prepare_ctx->fd, prepare_ctx->file, - &prepare_ctx->dev_block_count, - prepare_ctx->block_count, + &prepare_ctx->dev_byte_count, + prepare_ctx->byte_count, (bconf.verbose ? PREP_DEVICE_VERBOSE : 0) | (opt_zero_end ? PREP_DEVICE_ZERO_END : 0) | (opt_discard ? PREP_DEVICE_DISCARD : 0) | @@ -1204,8 +1204,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv) bool metadata_profile_set = false; u64 data_profile = 0; bool data_profile_set = false; - u64 block_count = 0; - u64 dev_block_count = 0; + u64 byte_count = 0; + u64 dev_byte_count = 0; bool mixed = false; char *label = NULL; int nr_global_roots = sysconf(_SC_NPROCESSORS_ONLN); @@ -1347,7 +1347,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) sectorsize = arg_strtou64_with_suffix(optarg); break; case 'b': - block_count = arg_strtou64_with_suffix(optarg); + byte_count = arg_strtou64_with_suffix(optarg); opt_zero_end = false; break; case 'v': @@ -1623,34 +1623,34 @@ int BOX_MAIN(mkfs)(int argc, char **argv) * Block_count not specified, use file/device size first. * Or we will always use source_dir_size calculated for mkfs. */ - if (!block_count) - block_count = device_get_partition_size_fd_stat(fd, &statbuf); + if (!byte_count) + byte_count = device_get_partition_size_fd_stat(fd, &statbuf); source_dir_size = btrfs_mkfs_size_dir(source_dir, sectorsize, min_dev_size, metadata_profile, data_profile); - if (block_count < source_dir_size) { + if (byte_count < source_dir_size) { if (S_ISREG(statbuf.st_mode)) { - block_count = source_dir_size; + byte_count = source_dir_size; } else { warning( "the target device %llu (%s) is smaller than the calculated source directory size %llu (%s), mkfs may fail", - block_count, pretty_size(block_count), + byte_count, pretty_size(byte_count), source_dir_size, pretty_size(source_dir_size)); } } - ret = zero_output_file(fd, block_count); + ret = zero_output_file(fd, byte_count); if (ret) { error("unable to zero the output file"); close(fd); goto error; } /* our "device" is the new image file */ - dev_block_count = block_count; + dev_byte_count = byte_count; close(fd); } - /* Check device/block_count after the nodesize is determined */ - if (block_count && block_count < min_dev_size) { + /* Check device/byte_count after the nodesize is determined */ + if (byte_count && byte_count < min_dev_size) { error("size %llu is too small to make a usable filesystem", - block_count); + byte_count); error("minimum size for btrfs filesystem is %llu", min_dev_size); goto error; @@ -1661,9 +1661,9 @@ int BOX_MAIN(mkfs)(int argc, char **argv) * 1 zone for a metadata block group * 1 zone for a data block group */ - if (opt_zoned && block_count && block_count < 5 * zone_size(file)) { + if (opt_zoned && byte_count && byte_count < 5 * zone_size(file)) { error("size %llu is too small to make a usable filesystem", - block_count); + byte_count); error("minimum size for a zoned btrfs filesystem is %llu", min_dev_size); goto error; @@ -1741,8 +1741,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv) /* Start threads */ for (i = 0; i < device_count; i++) { prepare_ctx[i].file = argv[optind + i - 1]; - prepare_ctx[i].block_count = block_count; - prepare_ctx[i].dev_block_count = block_count; + prepare_ctx[i].byte_count = byte_count; + prepare_ctx[i].dev_byte_count = byte_count; ret = pthread_create(&t_prepare[i], NULL, prepare_one_device, &prepare_ctx[i]); if (ret) { @@ -1763,16 +1763,16 @@ int BOX_MAIN(mkfs)(int argc, char **argv) goto error; } - dev_block_count = prepare_ctx[0].dev_block_count; - if (block_count && block_count > dev_block_count) { + dev_byte_count = prepare_ctx[0].dev_byte_count; + if (byte_count && byte_count > dev_byte_count) { error("%s is smaller than requested size, expected %llu, found %llu", - file, block_count, dev_block_count); + file, byte_count, dev_byte_count); goto error; } /* To create the first block group and chunk 0 in make_btrfs */ system_group_size = (opt_zoned ? zone_size(file) : BTRFS_MKFS_SYSTEM_GROUP_SIZE); - if (dev_block_count < system_group_size) { + if (dev_byte_count < system_group_size) { error("device is too small to make filesystem, must be at least %llu", system_group_size); goto error; @@ -1794,7 +1794,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) mkfs_cfg.label = label; memcpy(mkfs_cfg.fs_uuid, fs_uuid, sizeof(mkfs_cfg.fs_uuid)); memcpy(mkfs_cfg.dev_uuid, dev_uuid, sizeof(mkfs_cfg.dev_uuid)); - mkfs_cfg.num_bytes = dev_block_count; + mkfs_cfg.num_bytes = dev_byte_count; mkfs_cfg.nodesize = nodesize; mkfs_cfg.sectorsize = sectorsize; mkfs_cfg.stripesize = stripesize; @@ -1889,7 +1889,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) file); continue; } - dev_block_count = prepare_ctx[i].dev_block_count; + dev_byte_count = prepare_ctx[i].dev_byte_count; if (prepare_ctx[i].ret) { errno = -prepare_ctx[i].ret; @@ -1898,7 +1898,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) } ret = btrfs_add_to_fsid(trans, root, prepare_ctx[i].fd, - prepare_ctx[i].file, dev_block_count, + prepare_ctx[i].file, dev_byte_count, sectorsize, sectorsize, sectorsize); if (ret) { error("unable to add %s to filesystem: %d", From patchwork Tue May 14 00:51:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663729 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D252D17C2 for ; Tue, 14 May 2024 00:52:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647929; cv=none; b=W1blJ2fTbiKibSPaJyR30RbdkG0GJ9OGWCXvfLukgKzT3WHC75QgTyeuyLGfWXx0XXtY4AdWWBBz88DCEIEOyj1Fic7PicKsop/CHphBODiD4c8iqWyurUDrzHASFHMKCBUFwrNuqfWUPDZs1/oBfzA9J5wH4MCJ+/Sz/JVa+jE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647929; c=relaxed/simple; bh=TBUYJ3c6BS0lMAzA+zRpFALc0P5qHwaGeFmjh/qbv/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HF4TWOL/geLWEjhkD+i3QIQUpeGL/rb7rfQ9WTkb7tfTayLSzVZZaeaUm6LRInQmfOOBBFVaVmQRtY5sOiux/Zii9YbHAPTpXcUa1hVLT/s4ItTdmI46pwntAIQf+2RUtfcP4QaV0Y7huNfMazxvJortCiRxLlobsg0UuAMkLiI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=SDSxORnx; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="SDSxORnx" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647927; x=1747183927; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TBUYJ3c6BS0lMAzA+zRpFALc0P5qHwaGeFmjh/qbv/o=; b=SDSxORnxYfE2MpiZRZvvpMop4JZTzfLgaLbKAiC0aTApdCyKFY3gTSaj s59toRoeQ0K8CK59i0hw/xIQ26LeLkAeq+FBgtTYM39yEDDTGASUkogzG CY03p+os+e8GIvSdaedXzkAS0upIwa+Re3d1gf/n/caWhlOy9KsiviNyJ gtat/ssGwO7HxoqnBxt4aJMolAwfF+d3vh+zFCZ3lP65E+0KESNL6RePL GMb51b+YNmNi+OprBxtyY9e6S0dYh9bdHKQhi8vNHtJUOITsa8amRETR8 LKJ+kKyffbejovPsf7hnPfXbgl915dL3xmSq/zepiTnLm0D96IEwo6/1+ g==; X-CSE-ConnectionGUID: EMOX+MtSRay9orDR7mZjSg== X-CSE-MsgGUID: rFta/bchQBWILjP1pkB05A== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252229" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:01 +0800 IronPort-SDR: 6642a820_JHgBEcEMwz/T8XVN2TvNofBVOpTheb1LRUALHGQijNzgiU8 HeEsyNTNv6lRSptegAmBVdx/fv6QHS5/ZHbdv7Q== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:08 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:52:01 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 2/7] btrfs-progs: mkfs: remove duplicated device size check Date: Mon, 13 May 2024 18:51:28 -0600 Message-ID: <20240514005133.44786-3-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 test_minimum_size() already checks if each device can host the initial block groups. There is no need to check if the first device can host the initial system chunk again. Signed-off-by: Naohiro Aota --- mkfs/main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mkfs/main.c b/mkfs/main.c index 950f76101058..f6f67abf3b0e 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1189,7 +1189,6 @@ int BOX_MAIN(mkfs)(int argc, char **argv) struct prepare_device_progress *prepare_ctx = NULL; struct mkfs_allocation allocation = { 0 }; struct btrfs_mkfs_config mkfs_cfg; - u64 system_group_size; /* Options */ bool force_overwrite = false; struct btrfs_mkfs_features features = btrfs_mkfs_default_features; @@ -1770,14 +1769,6 @@ int BOX_MAIN(mkfs)(int argc, char **argv) goto error; } - /* To create the first block group and chunk 0 in make_btrfs */ - system_group_size = (opt_zoned ? zone_size(file) : BTRFS_MKFS_SYSTEM_GROUP_SIZE); - if (dev_byte_count < system_group_size) { - error("device is too small to make filesystem, must be at least %llu", - system_group_size); - goto error; - } - if (btrfs_bg_type_to_tolerated_failures(metadata_profile) < btrfs_bg_type_to_tolerated_failures(data_profile)) warning("metadata has lower redundancy than data!\n"); From patchwork Tue May 14 00:51:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663730 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33E0EEC5 for ; Tue, 14 May 2024 00:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647930; cv=none; b=rMpdkVwgdF+Li0vitSPwEve9s00rrlpPf1FHH3NNOOjlEpKhrNQQQ18wdWFSG0hFmq0dKICH3icjr1zSXPykVrDzElLke8d9vmUhUETDof3yUqhuRJHrTCkKIhN+lXXYXj/fLSXVfBrYyrL+rJyCIVot1cbmhunpaGGRI0xNTr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647930; c=relaxed/simple; bh=Ek0WCq6b/0O2vdSWF3CqjsqnmxmWFaX6kUGKL3z2U+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPWhtZS+c/MFgjCthj5JP3XRiohemisujP26YFSGGWvoohHTmteRVP/7QF3N/ZFqZwV+q+1JFbd1bucL+SiHHKRHCQ8EDRwcbSTHRyIIeA5CVeZmLhLhvNwrSzxbtQk3nGzGlOV/XF/gHG/EL9QLub59l+QEfu9Fl7kYAvMTYjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=G9bzlbTn; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="G9bzlbTn" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647929; x=1747183929; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ek0WCq6b/0O2vdSWF3CqjsqnmxmWFaX6kUGKL3z2U+I=; b=G9bzlbTnK3c1ByHbMh9P/pBrJQalIG0E/KNxMtDdcohMeurNYK48XaFu v21vZfU+sAew+z0pXrLKLAsKCxv5EubrSJG5NdVGcKsfyFjPFQHyw1my4 njEaWXnadYULUkyTwO8NUvzir0nVbcu7kH7+s3X3M0LhMI4qY/yjwXHbQ JamJA/h9vKspcoNOpEHFftHQTtPTZGbzKeLp2Nm5X7BzQgr+95+XxpLp4 +AsojemFWdmA26zJ8IGcLKYMUM/uyRKDFMgelrXt+9w/zMd+ylQ6IWR1X fKzTD0/r8ghelltsUGPEOjHHeXNXc3KY/HLwbO4+xljOhyiPgUXo+1DWb A==; X-CSE-ConnectionGUID: smUgAIaaQqq/BBx9q0MEMQ== X-CSE-MsgGUID: d7i+b+fNSyKdvWwA06bpaQ== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252231" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:03 +0800 IronPort-SDR: 6642a822_KK4LH2uYuCqfIauIzbvIFNUwSCRiuy67I3LeGtQX74J5qzS DlWKYpehy97aL/5BgDaMgUhYegm3dlFtKYrcPCg== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:10 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:52:02 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 3/7] btrfs-progs: mkfs: unify zoned mode minimum size calc into btrfs_min_dev_size() Date: Mon, 13 May 2024 18:51:29 -0600 Message-ID: <20240514005133.44786-4-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We are going to implement a better minimum size calculation for the zoned mode. Move the current logic to btrfs_min_dev_size() and unify the size checking path. Also, convert "int mixed" to "bool mixed" while at it. Signed-off-by: Naohiro Aota --- mkfs/common.c | 11 ++++++++++- mkfs/common.h | 2 +- mkfs/main.c | 22 +++++----------------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/mkfs/common.c b/mkfs/common.c index 3c48a6c120e7..af54089654a0 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -811,13 +811,22 @@ static u64 btrfs_min_global_blk_rsv_size(u32 nodesize) return (u64)nodesize << 10; } -u64 btrfs_min_dev_size(u32 nodesize, int mixed, u64 meta_profile, +u64 btrfs_min_dev_size(u32 nodesize, bool mixed, u64 zone_size, u64 meta_profile, u64 data_profile) { u64 reserved = 0; u64 meta_size; u64 data_size; + /* + * 2 zones for the primary superblock + * 1 zone for the system block group + * 1 zone for a metadata block group + * 1 zone for a data block group + */ + if (zone_size) + return 5 * zone_size; + if (mixed) return 2 * (BTRFS_MKFS_SYSTEM_GROUP_SIZE + btrfs_min_global_blk_rsv_size(nodesize)); diff --git a/mkfs/common.h b/mkfs/common.h index d9183c997bb2..de0ff57beee8 100644 --- a/mkfs/common.h +++ b/mkfs/common.h @@ -105,7 +105,7 @@ struct btrfs_mkfs_config { int make_btrfs(int fd, struct btrfs_mkfs_config *cfg); int btrfs_make_root_dir(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid); -u64 btrfs_min_dev_size(u32 nodesize, int mixed, u64 meta_profile, +u64 btrfs_min_dev_size(u32 nodesize, bool mixed, u64 zone_size, u64 meta_profile, u64 data_profile); int test_minimum_size(const char *file, u64 min_dev_size); int is_vol_small(const char *file); diff --git a/mkfs/main.c b/mkfs/main.c index f6f67abf3b0e..a437ecc40c7f 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1588,8 +1588,9 @@ int BOX_MAIN(mkfs)(int argc, char **argv) goto error; } - min_dev_size = btrfs_min_dev_size(nodesize, mixed, metadata_profile, - data_profile); + min_dev_size = btrfs_min_dev_size(nodesize, mixed, + opt_zoned ? zone_size(file) : 0, + metadata_profile, data_profile); /* * Enlarge the destination file or create a new one, using the size * calculated from source dir. @@ -1650,21 +1651,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv) if (byte_count && byte_count < min_dev_size) { error("size %llu is too small to make a usable filesystem", byte_count); - error("minimum size for btrfs filesystem is %llu", - min_dev_size); - goto error; - } - /* - * 2 zones for the primary superblock - * 1 zone for the system block group - * 1 zone for a metadata block group - * 1 zone for a data block group - */ - if (opt_zoned && byte_count && byte_count < 5 * zone_size(file)) { - error("size %llu is too small to make a usable filesystem", - byte_count); - error("minimum size for a zoned btrfs filesystem is %llu", - min_dev_size); + error("minimum size for a %sbtrfs filesystem is %llu", + opt_zoned ? "zoned mode " : "", min_dev_size); goto error; } From patchwork Tue May 14 00:51:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663732 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C47E617F7 for ; Tue, 14 May 2024 00:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647931; cv=none; b=kiM2t62wmCJbFZnVf3puzZRQ/U/rCLFH59LBtRuaSBnFz1YtPMgpYIu5dcQ9FgybLBIr0Ii4Fx4cHuNg+MTSKQ9bY6NqHOnwuiNh9j/JmW+vKW5X+NJKzHlIxMTV6jyvEwQyY+suq4T00zg1U1vQ+k2nz4DCAxxyanbmRl3oiuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647931; c=relaxed/simple; bh=H7MQbFgVBsa/41MrMi9xW8AJFk6zCjEkOzRcEVn0po4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iDYxs8U5PVPYFbczcRV1N1TgN0r4C4dSs4Xk6KkmWoN/MkV2Q52MU6RhsppWtmp6/k17dNSxI8qv8jnLKB6e2GcBmnkAFf478zGLjxQd1p5cubPE/LWGMfwFBqTAx+0CKniCMs+sUJHz0M5LJhArn59pzZwXv1sNtQoG71SmCcE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=GIrBi8ON; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="GIrBi8ON" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647929; x=1747183929; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H7MQbFgVBsa/41MrMi9xW8AJFk6zCjEkOzRcEVn0po4=; b=GIrBi8ONtqwUYX8jnnx/V9IMB1WB+T443DsJMeGxnTKeWy/xKuud8LOp eDgj0g2QmbEavhybQxCytCFeM9jnKJxcRoOtUAabZXA/foqBuDlcUUwq1 Ys2JTt/NDTzr6qVAPjQZdB5JIIG8Crv97XwMDIQ7UG1GX4NaokFiJecLl qVoY4n0gf0elmvWFd/oPWlaGgwCEiiFMNj76UsEM6GSleE6s+kTy3BjoR lDc9pc8u/amSvnyIqx2gmTLL9QmR0O12MjxGEyNASqKUjLxYCZRhgGy+H pRo5RRmUBCP3uRB1z+tA+IZ4LsiMlJhfpjMwr+hJKFwgyNI02AtvYvKsh w==; X-CSE-ConnectionGUID: wwM/fWyuQJGRfsa/trV5Kg== X-CSE-MsgGUID: OJ6gJLq2Thqw4l4Z6Yi14w== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252234" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:05 +0800 IronPort-SDR: 6642a823_2/apwzdE8OWJfxVfG5KDZYYlQF381Ch1UDGUYxQkK5vpmCg R8vFBzEmmW77seS2dXNfzmh96YcaDbxzD1gOAyg== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:12 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:52:04 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 4/7] btrfs-progs: mkfs: fix minimum size calculation for zoned Date: Mon, 13 May 2024 18:51:30 -0600 Message-ID: <20240514005133.44786-5-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently, we check if a device is larger than 5 zones to determine we can create btrfs on the device or not. Actually, we need more zones to create DUP block groups, so it fails with "ERROR: not enough free space to allocate chunk". Implement proper support for non-SINGLE profile. Also, current code does not ensure we can create tree-log BG and data relocaiton BG, which are essential for the real usage. Count them as requirement too. Signed-off-by: Naohiro Aota --- mkfs/common.c | 53 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) -- 2.45.0 diff --git a/mkfs/common.c b/mkfs/common.c index af54089654a0..a5100b296f65 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -818,14 +818,51 @@ u64 btrfs_min_dev_size(u32 nodesize, bool mixed, u64 zone_size, u64 meta_profile u64 meta_size; u64 data_size; - /* - * 2 zones for the primary superblock - * 1 zone for the system block group - * 1 zone for a metadata block group - * 1 zone for a data block group - */ - if (zone_size) - return 5 * zone_size; + if (zone_size) { + /* 2 zones for the primary superblock. */ + reserved += 2 * zone_size; + + /* + * 1 zone each for the initial system, metadata, and data block + * group + */ + reserved += 3 * zone_size; + + /* + * non-SINGLE profile needs: + * 1 zone for system block group + * 1 zone for normal metadata block group + * 1 zone for tree-log block group + * + * SINGLE profile only need to add tree-log block group + */ + if (meta_profile & BTRFS_BLOCK_GROUP_PROFILE_MASK) + meta_size = 3 * zone_size; + else + meta_size = zone_size; + /* DUP profile needs two zones for each block group. */ + if (meta_profile & BTRFS_BLOCK_GROUP_DUP) + meta_size *= 2; + reserved += meta_size; + + /* + * non-SINGLE profile needs: + * 1 zone for data block group + * 1 zone for data relocation block group + * + * SINGLE profile only need to add data relocationblock group + */ + if (data_profile & BTRFS_BLOCK_GROUP_PROFILE_MASK) + data_size = 2 * zone_size; + else + data_size = zone_size; + /* DUP profile needs two zones for each block group. */ + if (data_profile & BTRFS_BLOCK_GROUP_DUP) + data_size *= 2; + reserved += data_size; + + return reserved; + } if (mixed) return 2 * (BTRFS_MKFS_SYSTEM_GROUP_SIZE + From patchwork Tue May 14 00:51:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663731 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABED417CD for ; Tue, 14 May 2024 00:52:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647931; cv=none; b=ZIu/mlAnqU69ThLfMCLvXBN4E07ULhPf7D2UdNPnNd1sntVpRu9TopnULGI66AB8bLnKODIArricDUWbR3us0Zz6rdSoaMcvhcGC1CyJIH/oy1gg0eYDtqUkubXmjyw+bk6C18aPju9fPNrt/q4Aij4ox4wk9Ta17UcceFw5l6c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647931; c=relaxed/simple; bh=291spckHOc/OndRzbUKt1knBk+0K4i7rEvJSmzcNZQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VT4hhgyn06EaMDDPOF5dQsNbruCsaOmRseLnUVkSbaN2OLUkjOs6nj7p50aIC2BBfz7xXH7CP13tNFuJ6Eff0O/R95wMwr0PsZ7DsVibNIH6Xd1R+OWHYPlI1QeDk6JF/JqJLWuIe5GYTQFwzJhUG6XlNNtNljNI6MQD3YSvknk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=QApmqN4q; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="QApmqN4q" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647929; x=1747183929; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=291spckHOc/OndRzbUKt1knBk+0K4i7rEvJSmzcNZQA=; b=QApmqN4qhHiOxT81n9/CppPwRiz+rmAYC1z+7CC4mNQ+LzcsUmcbauSH eYlw7Z7SSsRDme1/cwEVS9RKwdoznRq+BC815I9EcW/skiSwAP52HYqV6 AetdjMn9WjAvePgzrAEO05kv1KzJIFs2G5RwbWOJVyK2m5SoRNmGTqee1 d/wcvSJyB1G3+jPkmYHrEeVb2ysEBLk5piiQR5Ow2EPATTQdYjiOkIFhl 98kJaUSXYdL7Bb8EKRe/m2e0ku6l9tmxuKn3uAh0V4ZnvhCL3QmWSWAgw dKpKfXD+EoI8+n9gQxeZ7rhsjfY++LPzmzmUTsCbwGz2HjCMNVXjS8eRv Q==; X-CSE-ConnectionGUID: tSkwSaFORDCr1AS+b4NM1Q== X-CSE-MsgGUID: FFR+3gVqTmemFVTFfe885A== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252237" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:07 +0800 IronPort-SDR: 6642a825_nJwafmNaZYl1BIJnCkTUfoaFg/7GrAteDUpMlYHSXy9DE3y t5bQIilhJYdUrFIHRciWZdKKVAz2Jnh274xppOA== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:13 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:52:05 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 5/7] btrfs-progs: mkfs: check if byte_count is zone size aligned Date: Mon, 13 May 2024 18:51:31 -0600 Message-ID: <20240514005133.44786-6-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Creating a btrfs whose size is not aligned to the zone boundary is meaningless and allowing it can confuse users. Disallow creating it. Signed-off-by: Naohiro Aota --- mkfs/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mkfs/main.c b/mkfs/main.c index a437ecc40c7f..faf397848cc4 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1655,6 +1655,11 @@ int BOX_MAIN(mkfs)(int argc, char **argv) opt_zoned ? "zoned mode " : "", min_dev_size); goto error; } + if (byte_count && opt_zoned && !IS_ALIGNED(byte_count, zone_size(file))) { + error("size %llu is not aligned to zone size %llu", byte_count, + zone_size(file)); + goto error; + } for (i = saved_optind; i < saved_optind + device_count; i++) { char *path; From patchwork Tue May 14 00:51:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663733 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B4FD17C2 for ; Tue, 14 May 2024 00:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647932; cv=none; b=V1x5WppEUWKogqiqvXXj9PLu/fSAef7PKLt6nlL7NLJ0ZMSwaZcuxDZLRSsJMq6Iv1xUCe20hRedT9SQvK0MfPRgvJEA3MS4WkLx7O0Sebrb8sBHdbgJTqm6OBQlHQckOCX0QGHu8X4jr8beoTdmig0Dih2cTLE8y03/GpoBBMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647932; c=relaxed/simple; bh=lS/za6YRAtKHJKFODuWu5J4pzptbO4u+AJ15KGasgh4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PWLIWGGcLCmPnooi3LnFLgc3x4qzcq4AUoDQhE4C2Mc/nGFmuUNWmsEUPdb41pPbBSBJ7JxvpZLG1mko2KiQrpFEjjhNenE358kRPyMi7yYG0QqnVNjv62OTi+xuWZHVl9/2II/5Xkfj8byfwK3njFQqhGxVViDLvMl6URuCIhk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=FrZwbZJG; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="FrZwbZJG" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647930; x=1747183930; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lS/za6YRAtKHJKFODuWu5J4pzptbO4u+AJ15KGasgh4=; b=FrZwbZJGxYWP+pH37S5gx6+iYOls880FyYfYnjcUPQEsM1wexVZhW9ja pzuuPo+M7j8H5D23nubaFAbkGQggsHXvnF3OxoNlWTFoNfmR6C+q4KhLU Kq8np9nNARcYm/s1UYcImlI7Z4kTrkTSlMhy+ZOpGYMBeiLHI3N9xBQes 0JkmSi5kdq5roxALkHywY/SxafapxzLwOmzobaz+pBsOPqZM8UP7fsGlg UJX6DesJ01GSbaPCBqEG8g2qUriygIT8Qg6ky5zi54ilpafeg/68ShJW/ 7E/9la8i2BG0YpnkR6SW7k180q9s1OMPIiRjvUeV6aoiSWHwmPGuDsjFe g==; X-CSE-ConnectionGUID: HSCIEpMzTBqFEyL70KvPCg== X-CSE-MsgGUID: QpfbInihSAejf2aSYUZNIA== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252239" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:08 +0800 IronPort-SDR: 6642a827_/7XSvVrprHluTNDzWohjJc4ClHN+t39VA2QaR5PDIYASh3X uyv2c2x/oax8EQ1h/2v49MOAPJbyp0gbyFp506w== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:15 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:52:07 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 6/7] btrfs-progs: support byte length for zone resetting Date: Mon, 13 May 2024 18:51:32 -0600 Message-ID: <20240514005133.44786-7-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Even with "mkfs.btrfs -b", mkfs.btrfs resets all the zones on the device. Limit the reset target within the specified length. Also, we need to check that there is no active zone outside of the FS range. If there is one, btrfs fails to meet the active zone limit properly. Signed-off-by: Naohiro Aota --- common/device-utils.c | 17 ++++++++++++----- kernel-shared/zoned.c | 23 ++++++++++++++++++++++- kernel-shared/zoned.h | 2 +- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/common/device-utils.c b/common/device-utils.c index 86942e0c7041..7df7d9ce39d8 100644 --- a/common/device-utils.c +++ b/common/device-utils.c @@ -254,16 +254,23 @@ int btrfs_prepare_device(int fd, const char *file, u64 *byte_count_ret, if (!zinfo->emulated) { if (opflags & PREP_DEVICE_VERBOSE) - printf("Resetting device zones %s (%u zones) ...\n", - file, zinfo->nr_zones); + printf("Resetting device zones %s (%llu zones) ...\n", + file, byte_count / zinfo->zone_size); /* * We cannot ignore zone reset errors for a zoned block * device as this could result in the inability to write * to non-empty sequential zones of the device. */ - if (btrfs_reset_all_zones(fd, zinfo)) { - error("zoned: failed to reset device '%s' zones: %m", - file); + ret = btrfs_reset_zones(fd, zinfo, byte_count); + if (ret) { + if (ret == EBUSY) { + error("zoned: device '%s' contains an active zone outside of the FS range", + file); + error("zoned: btrfs needs full control of active zones"); + } else { + error("zoned: failed to reset device '%s' zones: %m", + file); + } goto err; } } diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c index fb1e1388804e..b4244966ca36 100644 --- a/kernel-shared/zoned.c +++ b/kernel-shared/zoned.c @@ -395,16 +395,24 @@ static int report_zones(int fd, const char *file, * Discard blocks in the zones of a zoned block device. Process this with zone * size granularity so that blocks in conventional zones are discarded using * discard_range and blocks in sequential zones are reset though a zone reset. + * + * We need to ensure that zones outside of the FS is not active, so that + * the FS can use all the active zones. Return EBUSY if there is an active + * zone. */ -int btrfs_reset_all_zones(int fd, struct btrfs_zoned_device_info *zinfo) +int btrfs_reset_zones(int fd, struct btrfs_zoned_device_info *zinfo, u64 byte_count) { unsigned int i; int ret = 0; ASSERT(zinfo); + ASSERT(IS_ALIGNED(byte_count, zinfo->zone_size)); /* Zone size granularity */ for (i = 0; i < zinfo->nr_zones; i++) { + if (byte_count == 0) + break; + if (zinfo->zones[i].type == BLK_ZONE_TYPE_CONVENTIONAL) { ret = device_discard_blocks(fd, zinfo->zones[i].start << SECTOR_SHIFT, @@ -419,7 +427,20 @@ int btrfs_reset_all_zones(int fd, struct btrfs_zoned_device_info *zinfo) if (ret) return ret; + + byte_count -= zinfo->zone_size; } + for (; i < zinfo->nr_zones; i++) { + const enum blk_zone_cond cond = zinfo->zones[i].cond; + + if (zinfo->zones[i].type == BLK_ZONE_TYPE_CONVENTIONAL) + continue; + if (cond == BLK_ZONE_COND_IMP_OPEN || + cond == BLK_ZONE_COND_EXP_OPEN || + cond == BLK_ZONE_COND_CLOSED) + return EBUSY; + } + return fsync(fd); } diff --git a/kernel-shared/zoned.h b/kernel-shared/zoned.h index 6eba86d266bf..104fb7b19490 100644 --- a/kernel-shared/zoned.h +++ b/kernel-shared/zoned.h @@ -149,7 +149,7 @@ bool btrfs_redirty_extent_buffer_for_zoned(struct btrfs_fs_info *fs_info, u64 start, u64 end); int btrfs_reset_chunk_zones(struct btrfs_fs_info *fs_info, u64 devid, u64 offset, u64 length); -int btrfs_reset_all_zones(int fd, struct btrfs_zoned_device_info *zinfo); +int btrfs_reset_zones(int fd, struct btrfs_zoned_device_info *zinfo, u64 byte_count); int zero_zone_blocks(int fd, struct btrfs_zoned_device_info *zinfo, off_t start, size_t len); int btrfs_wipe_temporary_sb(struct btrfs_fs_devices *fs_devices); From patchwork Tue May 14 00:51:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 13663734 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51F4F4687 for ; Tue, 14 May 2024 00:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.71.154.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647932; cv=none; b=GVMA/cstA8CgCC2f/jPTJ57AJeENw4KQOUr66uj74wc3LMf/94RTgRPTcBLnYFW6/ScUhUihnzKUY6a4xW+I16bopeQUelA3e/S3/f0+NhBxMZRTNm/BcSNBxWm1jmJqwercCok2ajmkt14ImrjfeSY4ZOLurElv3P8wA3dgNJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715647932; c=relaxed/simple; bh=mO5apShsF+TsSW1yIfO/kU2e6vCLLScBuhwJP12j/uo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cix/44aUgYD5/LS4vAw4Jx1+YefyiWW3/y7WBG1ZWa6/FvJ2DJpXaw4Dzy7yjC1AZXzNA1vF47JNCCgL9CWLG/0UbqNRIjsp5sNc8CH9Fvrnl09HSinOmnc5f+xrf4d7pOAZUH3w6fMU6j82PuPMNOEg35ScNm00iKN9u4Q1V4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com; spf=pass smtp.mailfrom=wdc.com; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b=SLlAldhy; arc=none smtp.client-ip=216.71.154.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wdc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wdc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="SLlAldhy" DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1715647931; x=1747183931; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mO5apShsF+TsSW1yIfO/kU2e6vCLLScBuhwJP12j/uo=; b=SLlAldhy+nEeTKMUxYgZR2gOCbrMIoAGnck87zZZ0R3qZXHzy2KAwkN5 sUHHsFA13S8opehLR9dJEKJZS94V+RLWiNIEZaPZ87ZWsIXO+E4+4P50a xRuHS4H80JgsNDvaFDIZ0+2Zo8xCIdCfmWRM5Yd2YcY7E2lJ3fPUhbQKD KCX3c0wVbNoZrBF+vxTLazscYvvlofrlo8dVbI8qcLzgdOj2nNzRsMSFH kxX9K6Q9sgpYGrpatoySui+/GBu+xxOmQc1NqVRg6uzeQPrxm+x6MbFPg mhufE5bXq4HtqlJAoZ9RQvx/jzMpR6r2/v+tksKNms+FLdOA62+PkPJDx g==; X-CSE-ConnectionGUID: iJ/iE7wISn+2EbZb+tKtTQ== X-CSE-MsgGUID: W2X7obgSTayrdc+H8nQbQg== X-IronPort-AV: E=Sophos;i="6.08,159,1712592000"; d="scan'208";a="16252245" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 14 May 2024 08:52:10 +0800 IronPort-SDR: 6642a829_WXyykLXvn82YpOS3ani38TBc7ALN4KFsmZM9cUSQQPghEZQ WIz25tuhj5qr3asGkrPoPgP3fJuOf9TSd/keczA== Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 13 May 2024 16:54:17 -0700 WDCIronportException: Internal Received: from unknown (HELO naota-x1.wdc.com) ([10.225.163.55]) by uls-op-cesaip02.wdc.com with ESMTP; 13 May 2024 17:52:09 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: Naohiro Aota Subject: [PATCH 7/7] btrfs-progs: add test for zone resetting Date: Mon, 13 May 2024 18:51:33 -0600 Message-ID: <20240514005133.44786-8-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514005133.44786-1-naohiro.aota@wdc.com> References: <20240514005133.44786-1-naohiro.aota@wdc.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add test for mkfs.btrfs's zone reset behavior to check if - it resets all the zones without "-b" option - it detects an active zone outside of the FS range - it does not reset a zone outside of the range Signed-off-by: Naohiro Aota --- tests/mkfs-tests/032-zoned-reset/test.sh | 62 ++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100755 tests/mkfs-tests/032-zoned-reset/test.sh -- 2.45.0 diff --git a/tests/mkfs-tests/032-zoned-reset/test.sh b/tests/mkfs-tests/032-zoned-reset/test.sh new file mode 100755 index 000000000000..6a599dd2874f --- /dev/null +++ b/tests/mkfs-tests/032-zoned-reset/test.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# Verify mkfs for zoned devices support block-group-tree feature + +source "$TEST_TOP/common" || exit + +setup_root_helper +prepare_test_dev + +nullb="$TEST_TOP/nullb" +# Create one 128M device with 4M zones, 32 of them +size=128 +zone=4 + +run_mayfail $SUDO_HELPER "$nullb" setup +if [ $? != 0 ]; then + _not_run "cannot setup nullb environment for zoned devices" +fi + +# Record any other pre-existing devices in case creation fails +run_check $SUDO_HELPER "$nullb" ls + +# Last line has the name of the device node path +out=$(run_check_stdout $SUDO_HELPER "$nullb" create -s "$size" -z "$zone") +if [ $? != 0 ]; then + _fail "cannot create nullb zoned device $i" +fi +dev=$(echo "$out" | tail -n 1) +name=$(basename "${dev}") + +run_check $SUDO_HELPER "$nullb" ls + +TEST_DEV="${dev}" +last_zone_sector=$(( 4 * 31 * 1024 * 1024 / 512 )) +# Write some data to the last zone +run_check $SUDO_HELPER dd if=/dev/urandom of="${dev}" bs=1M count=4 seek=$(( 4 * 31 )) +# Use single as it's supported on more kernels +run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f -m single -d single "${dev}" +# Check if the lat zone is empty +$SUDO_HELPER blkzone report -o ${last_zone_sector} -c 1 "${dev}" | grep -Fq '(em)' +if [ $? != 0 ]; then + _fail "last zone is not empty" +fi + +# Write some data to the last zone +run_check $SUDO_HELPER dd if=/dev/urandom of="${dev}" bs=1M count=1 seek=$(( 4 * 31 )) +# Create a FS excluding the last zone +run_mayfail $SUDO_HELPER "$TOP/mkfs.btrfs" -f -b $(( 4 * 31 ))M -m single -d single "${dev}" +if [ $? == 0 ]; then + _fail "mkfs.btrfs should detect active zone outside of FS range" +fi + +# Fill the last zone to finish it +run_check $SUDO_HELPER dd if=/dev/urandom of="${dev}" bs=1M count=3 seek=$(( 4 * 31 + 1 )) +# Create a FS excluding the last zone +run_mayfail $SUDO_HELPER "$TOP/mkfs.btrfs" -f -b $(( 4 * 31 ))M -m single -d single "${dev}" +# Check if the lat zone is not empty +$SUDO_HELPER blkzone report -o ${last_zone_sector} -c 1 "${dev}" | grep -Fq '(em)' +if [ $? == 0 ]; then + _fail "last zone is empty" +fi + +run_check $SUDO_HELPER "$nullb" rm "${name}"