From patchwork Thu Nov 16 14:50:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Gompa X-Patchwork-Id: 13458005 Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABE8DD57 for ; Thu, 16 Nov 2023 06:59:54 -0800 (PST) Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-66d0ceba445so4871346d6.0 for ; Thu, 16 Nov 2023 06:59:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700146793; x=1700751593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gzn6gpBv9OleWUEhEJCmZq93KrA6r6P5N/PbiyoQ8dg=; b=kyp79kVpZyMpI5N6NsY0dNyGrfW4P9G/ibYoOu1Yk4ffiic3lyjcJnKTQKaLIbaAk7 CPAVm8ZX0Rb2O+lpozdHZqOUx2z5rZbfl+6K2qBxdNp7ElDEI+YQTqf3JhCP8T6l3YoW 4a9khTVHKoPmgg9x8n5N6PM83DZCGfcCVfHcdMKd0t8lDctUNn/dsPS8lo+DA3tjWsfS tlxo2ry1X0F6Ic1uNzsfkBFfNmchFUbpiS1qYX0xZFoLFa3kagKnioNykehM8PGXnJwZ +MtstVqHXyRxCtIEDVIMPstLXJ3/UJiK8u00gYqvjblppvHowngF47oWDH/YDcl4PZb2 04NQ== X-Gm-Message-State: AOJu0YyclnKuQ5KUS1ntrCTTh4UZa0vsYponuPDVYz2jgULy0DwsuukE QO3b6WowI0Og32/peDfgfRPIJWAitiJsOJMn+bM= X-Google-Smtp-Source: AGHT+IFsc1L7dZLVky6JG27YWbZMZdmCmdpQOIwkKx4Dtr268ZSra5TL6Kvaylf0pKgV6UgF5wmZgQ== X-Received: by 2002:ad4:550e:0:b0:66d:3716:4e14 with SMTP id pz14-20020ad4550e000000b0066d37164e14mr8164645qvb.4.1700146792870; Thu, 16 Nov 2023 06:59:52 -0800 (PST) Received: from Belldandy-Slimbook.infra.opensuse.org (ool-18e49371.dyn.optonline.net. [24.228.147.113]) by smtp.gmail.com with ESMTPSA id m1-20020ad44d41000000b00670c7fd09cbsm1430642qvm.95.2023.11.16.06.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 06:59:52 -0800 (PST) From: Neal Gompa To: Linux BTRFS Development Cc: Neal Gompa , Anand Jain , Qu Wenruo , Qu Wenruo , David Sterba , Hector Martin , Sven Peter , Davide Cavalca , Jens Axboe , Asahi Lina , Asahi Linux , Josef Bacik Subject: [PATCH v3] btrfs-progs: mkfs: Enforce 4k sectorsize by default Date: Thu, 16 Nov 2023 09:50:59 -0500 Message-ID: <20231116145933.2707486-2-neal@gompa.dev> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231116145933.2707486-1-neal@gompa.dev> References: <20231116145933.2707486-1-neal@gompa.dev> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We have had working subpage support in Btrfs for many cycles now. Generally, we do not want people creating filesystems by default with non-4k sectorsizes since it creates portability problems. Signed-off-by: Neal Gompa Reviewed-by: Anand Jain Reviewed-by: Qu Wenruo Reviewed-by: Josef Bacik --- Documentation/Subpage.rst | 17 +++++++++-------- Documentation/mkfs.btrfs.rst | 13 +++++++++---- mkfs/main.c | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst index c762b6a3..1655ae7e 100644 --- a/Documentation/Subpage.rst +++ b/Documentation/Subpage.rst @@ -9,18 +9,19 @@ to the exactly same size of the block and page. On x86_64 this is typically pages, like 64KiB on 64bit ARM or PowerPC. This means filesystems created with 64KiB sector size cannot be mounted on a system with 4KiB page size. -While with subpage support systems with 64KiB page size can create -and mount filesystems with 4KiB sectorsize. This still needs to use option "-s -4k" option for :command:`mkfs.btrfs`. +Since v6.7, filesystems are created with a 4KiB sectorsize by default, +though it remains possible to create filesystems with other page sizes +(such as 64KiB with the "-s 64k" option for :command:`mkfs.btrfs`). This +ensures that new filesystems are compatible across other architecture +variants using larger page sizes. Requirements, limitations ------------------------- -The initial subpage support has been added in v5.15, although it's still -considered as experimental, most features are already working without problems. -On a 64KiB page system filesystem with 4KiB sectorsize can be mounted and used -as usual as long as the initial mount succeeds. There are cases a mount will be -rejected when verifying compatible features. +The initial subpage support has been added in v5.15. Most features are +already working without problems. On a 64KiB page system, a filesystem with +4KiB sectorsize can be mounted and used as long as the initial mount succeeds. +Subpage support is used by default for systems with a non-4KiB page size since v6.7. Please refer to status page of :ref:`status-subpage-block-size` for compatibility. diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst index 7e23b9f6..be4f49cb 100644 --- a/Documentation/mkfs.btrfs.rst +++ b/Documentation/mkfs.btrfs.rst @@ -122,10 +122,15 @@ OPTIONS -s|--sectorsize Specify the sectorsize, the minimum data block allocation unit. - The default value is the page size and is autodetected. If the sectorsize - differs from the page size, the created filesystem may not be mountable by the - running kernel. Therefore it is not recommended to use this option unless you - are going to mount it on a system with the appropriate page size. + By default, the value is 4KiB, but it can be manually set to match the + system page size. However, if the sector size is different from the page + size, the resulting filesystem may not be mountable by the current + kernel, apart from the default 4KiB. Hence, using this option is not + advised unless you intend to mount it on a system with the suitable + page size. + + .. note:: + Versions prior to 6.7 set the sectorsize matching to the page size. -L|--label Specify a label for the filesystem. The *string* should be less than 256 diff --git a/mkfs/main.c b/mkfs/main.c index d984c995..0570c8f8 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1384,7 +1384,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv) } if (!sectorsize) - sectorsize = (u32)sysconf(_SC_PAGESIZE); + sectorsize = (u32)SZ_4K; if (btrfs_check_sectorsize(sectorsize)) goto error;