From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A7E9BC71153 for ; Tue, 29 Aug 2023 01:06:04 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qanBD-0002a7-63; Tue, 29 Aug 2023 01:06:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from <3dETtZAYKAN8ESPTFOHPPHMF.DPN@flex--drosen.bounces.google.com>) id 1qanBC-0002Zu-Nn for linux-f2fs-devel@lists.sourceforge.net; Tue, 29 Aug 2023 01:06:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=swTw8rJMqLzo8IY07Egwiej6FCGj4oTrUcK7JA47ba8=; b=O12yhZSVWR8FzrSY+kPap4PmYP LMyd4r9+pFFs6jajP5YwpwJ5X6C1krbvBor43WWOwMBfxX7+rYAOP5P3zIzuXn39mbOAwVV9sxb7X dPBT2LcfN9mkcSu4irKJCUQc0TyBUz7X/Q4HCqK6AfagUTJxfVhUXNavtNcqN7AkGwuw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Cc:To:From:Subject:Message-ID:References:Mime-Version: In-Reply-To:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=swTw8rJMqLzo8IY07Egwiej6FCGj4oTrUcK7JA47ba8=; b=T+bnfioAEb31d+FiNw1cIAma0u QlaexbfQz0PPOSSe1tFxCmx7b2s6c8WeMPoNXnttwYJJTmN/7l/aV9W3fEaxFktXSi63BeMtTMTg3 Csz06P3T3jHgvy+wpKCQ0lhz2B3CQHgOO1MLhCeKuvxd+Kv+shfhx1m74sMKE1gv2Bi4=; Received: from mail-yw1-f201.google.com ([209.85.128.201]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qanBC-001Tm1-3V for linux-f2fs-devel@lists.sourceforge.net; Tue, 29 Aug 2023 01:06:02 +0000 Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-58f9db8bc1dso55185207b3.3 for ; Mon, 28 Aug 2023 18:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693271156; x=1693875956; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=swTw8rJMqLzo8IY07Egwiej6FCGj4oTrUcK7JA47ba8=; b=DWMbpGbeNa3POqBmYAItvMwH+Er3idJCx81/C7kZcMiR3moY4eX5wPviDPecqyrJtg U/k0AH+2RZ2PKw11hp+iZPOpgMpOLDDQnQpWCwI6xlwAl7vYCfGVjwU4SoL/cTGfvULi JULWRsHdcoD7OGFf1oATu7czdGsb9XYGJBaFKAEV5NK6xQ+Bht/zqvyClJJCqJ1v2nlS bHoljjjS0zkaPLLVB1lMfNLZLyzIVJYAz+fNXydl74I0JTOA/7eXBl5yG0zURzlSjlhS rYDAtFTj+OMG6yO1TIR9EI7RYosv0dBhjiuBkCRJLa0rWqA0T/f0AvO4Bu+xLAq0UlHL TiIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693271156; x=1693875956; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=swTw8rJMqLzo8IY07Egwiej6FCGj4oTrUcK7JA47ba8=; b=NrE1p0unqfRdjAfpBMDkky2vA2Q05nP6PgvGCJntjRfim0MBsiGt1IujEV+CR3sGId 0gRx0fwWYbpEzqfqupb+of0eQEBmwFMdNWADaryD/YWUa4JCpU2i6u2GQUT0GE0xenPc HfIT4cB3LSkE/I/oNWGn2lRXV5ghnJQnrrxtzlmSS/6dzm8x3mmYoUirGC18T159JweK Gj9LMHczsv0d/rFOdeDBJ/y/Snpe67ofoKfNXoeONP8GTvKIBdgFcqoJkrykZ98agpyu 3Ui3sx1o0AXMr6WwJt7g0rJ+IMz20CrwGC0NLuyeej+bLUrX7XNgXJx7QLiedNdrUqIj WeGg== X-Gm-Message-State: AOJu0YyZ8+T8V+zSNZ3EilvbDi94iE+n8GNpJXk0xzpvO8AbDVYe8K8x k7Fmz0lknoT6FSpW27QExN4SpOgywAonBqDyfvivSLjMITC+n8UUqXX6TozhiTvNRrkWGVzAn6G 7J+4ARyM/X8xrpG2YzVmaMSpu7P+pGSaue5BxNABanvQ6/sn36cbg+gz1sUUn7G4O/429Z53/QI qRALfA9bQ= X-Google-Smtp-Source: AGHT+IG88fCi150jIyQkqp9Vb40sYpaO6laVxCwdg871j7kW3i/7qVJxvdso3BD3eLOMa8lrm+hvvkhjtuo= X-Received: from drosen.mtv.corp.google.com ([2620:15c:211:201:d11f:7395:bc0b:a192]) (user=drosen job=sendgmr) by 2002:a25:664c:0:b0:d74:bd1c:2bc9 with SMTP id z12-20020a25664c000000b00d74bd1c2bc9mr879682ybm.13.1693271156406; Mon, 28 Aug 2023 18:05:56 -0700 (PDT) Date: Mon, 28 Aug 2023 18:05:36 -0700 In-Reply-To: <20230829010536.3044883-1-drosen@google.com> Mime-Version: 1.0 References: <20230829010536.3044883-1-drosen@google.com> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog Message-ID: <20230829010536.3044883-8-drosen@google.com> To: linux-f2fs-devel@lists.sourceforge.net X-Headers-End: 1qanBC-001Tm1-3V Subject: [f2fs-dev] [PATCH v3 7/7] f2fs-tools: Support different block sizes X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Daniel Rosenberg via Linux-f2fs-devel Reply-To: Daniel Rosenberg Cc: Jaegeuk Kim , kernel-team@android.com, Daniel Rosenberg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net This adds support for 4K and 16K block size using the same binary. mkfs can choose block size via the -b option, with other tools getting the blocksize from the superblock. On mount time, we can't rely on block size for the location for the superblock, since that information is in the superblock. If the first superblock is corrupt, we will attempt to find the second superblock at a 4K block offset, and then a 16K block offset if that fails. Signed-off-by: Daniel Rosenberg --- fsck/fsck.h | 3 --- fsck/mount.c | 25 ++++++++++++++++++++----- include/f2fs_fs.h | 10 +++++++--- lib/libf2fs.c | 2 ++ mkfs/f2fs_format_main.c | 12 +++++++++++- 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/fsck/fsck.h b/fsck/fsck.h index 89d0b22..091b5d8 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -127,9 +127,6 @@ struct f2fs_fsck { }; #define BLOCK_SZ F2FS_BLKSIZE -struct block { - unsigned char buf[BLOCK_SZ]; -}; enum NODE_TYPE { TYPE_INODE = 37, diff --git a/fsck/mount.c b/fsck/mount.c index 93373c6..e0a062b 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -994,11 +994,15 @@ int sanity_check_raw_super(struct f2fs_super_block *sb, enum SB_ADDR sb_addr) return -1; blocksize = 1 << get_sb(log_blocksize); - if (F2FS_BLKSIZE != blocksize) { - MSG(0, "Invalid blocksize (%u), supports only (%u)\n", - blocksize, F2FS_BLKSIZE); + if (blocksize < F2FS_MIN_BLKSIZE || blocksize > F2FS_MAX_BLKSIZE) { + MSG(0, "Invalid blocksize (%u), must be between 4KB and 16KB\n", + blocksize); return -1; } + c.blksize_bits = get_sb(log_blocksize); + c.blksize = blocksize; + c.sectors_per_blk = F2FS_BLKSIZE / c.sector_size; + check_block_struct_sizes(); /* check log blocks per segment */ if (get_sb(log_blocks_per_seg) != 9) { @@ -3854,9 +3858,20 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi) sbi->active_logs = NR_CURSEG_TYPE; ret = validate_super_block(sbi, SB0_ADDR); if (ret) { + /* Assuming 4K Block Size */ + c.blksize_bits = 12; + c.blksize = 1 << c.blksize_bits; + MSG(0, "Looking for secondary superblock assuming 4K Block Size\n"); ret = validate_super_block(sbi, SB1_ADDR); - if (ret) - return -1; + if (ret) { + /* Trying 16K Block Size */ + c.blksize_bits = 14; + c.blksize = 1 << c.blksize_bits; + MSG(0, "Looking for secondary superblock assuming 16K Block Size\n"); + ret = validate_super_block(sbi, SB1_ADDR); + if (ret) + return -1; + } } sb = F2FS_RAW_SUPER(sbi); diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h index edc2eaf..35eedc6 100644 --- a/include/f2fs_fs.h +++ b/include/f2fs_fs.h @@ -392,7 +392,7 @@ static inline uint64_t bswap_64(uint64_t val) #define MAX_DEVICES 8 #define F2FS_BYTES_TO_BLK(bytes) ((bytes) >> F2FS_BLKSIZE_BITS) -#define F2FS_BLKSIZE_BITS 12 /* 4KB block */ +#define F2FS_BLKSIZE_BITS c.blksize_bits /* for mkfs */ #define F2FS_NUMBER_OF_CHECKPOINT_PACK 2 @@ -400,6 +400,7 @@ static inline uint64_t bswap_64(uint64_t val) #define DEFAULT_SECTORS_PER_BLOCK (1 << (F2FS_BLKSIZE_BITS - SECTOR_SHIFT)) #define DEFAULT_BLOCKS_PER_SEGMENT 512 #define DEFAULT_SEGMENTS_PER_SECTION 1 +#define DEFAULT_BLKSIZE_BITS 12 /* 4096 */ #define VERSION_LEN 256 #define VERSION_TIMESTAMP_LEN 4 @@ -628,9 +629,10 @@ enum { */ #define F2FS_SUPER_OFFSET 1024 /* byte-size offset */ #define F2FS_MIN_LOG_SECTOR_SIZE 9 /* 9 bits for 512 bytes */ -#define F2FS_MAX_LOG_SECTOR_SIZE F2FS_BLKSIZE_BITS /* 12 bits for 4096 bytes */ -#define F2FS_BLKSIZE (1 << F2FS_BLKSIZE_BITS)/* support only 4KB block */ +#define F2FS_MAX_LOG_SECTOR_SIZE F2FS_BLKSIZE_BITS /* max sector size is block size */ +#define F2FS_MIN_BLKSIZE 4096 #define F2FS_MAX_BLKSIZE 16384 +#define F2FS_BLKSIZE c.blksize /* support configurable block size */ #define F2FS_MAX_EXTENSION 64 /* # of extension entries */ #define F2FS_EXTENSION_LEN 8 /* max size of extension */ #define F2FS_BLK_ALIGN(x) (((x) + F2FS_BLKSIZE - 1) / F2FS_BLKSIZE) @@ -1510,6 +1512,8 @@ struct f2fs_configuration { uint32_t lpf_ino; uint32_t root_uid; uint32_t root_gid; + uint32_t blksize; + uint32_t blksize_bits; /* defragmentation parameters */ int defrag_shrink; diff --git a/lib/libf2fs.c b/lib/libf2fs.c index 8f2cc3b..995e42d 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -686,6 +686,8 @@ void f2fs_init_configuration(void) memset(&c, 0, sizeof(struct f2fs_configuration)); c.ndevs = 1; + c.blksize = 1 << DEFAULT_BLKSIZE_BITS; + c.blksize_bits = DEFAULT_BLKSIZE_BITS; c.sectors_per_blk = DEFAULT_SECTORS_PER_BLOCK; c.blks_per_seg = DEFAULT_BLOCKS_PER_SEGMENT; c.wanted_total_sectors = -1; diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c index 3a4b18c..4de517a 100644 --- a/mkfs/f2fs_format_main.c +++ b/mkfs/f2fs_format_main.c @@ -50,6 +50,7 @@ static void mkfs_usage() MSG(0, "\nUsage: mkfs.f2fs [options] device [sectors]\n"); MSG(0, "[options]:\n"); MSG(0, " -a heap-based allocation [default:0]\n"); + MSG(0, " -b filesystem block size [default:4096]\n"); MSG(0, " -c device1[,device2,...] up to 7 additional devices, except meta device\n"); MSG(0, " -d debug level [default:0]\n"); MSG(0, " -e [cold file ext list] e.g. \"mp3,gif,mov\"\n"); @@ -175,7 +176,7 @@ static void add_default_options(void) static void f2fs_parse_options(int argc, char *argv[]) { - static const char *option_string = "qa:c:C:d:e:E:g:hil:mo:O:rR:s:S:z:t:T:U:Vfw:Z:"; + static const char *option_string = "qa:b:c:C:d:e:E:g:hil:mo:O:rR:s:S:z:t:T:U:Vfw:Z:"; static const struct option long_opts[] = { { .name = "help", .has_arg = 0, .flag = NULL, .val = 'h' }, { .name = NULL, .has_arg = 0, .flag = NULL, .val = 0 } @@ -192,6 +193,15 @@ static void f2fs_parse_options(int argc, char *argv[]) case 'a': c.heap = atoi(optarg); break; + case 'b': + c.blksize = atoi(optarg); + c.blksize_bits = log_base_2(c.blksize); + c.sectors_per_blk = DEFAULT_SECTORS_PER_BLOCK; + if ((1 << c.blksize_bits) != c.blksize) { + MSG(0, "Error: Block size must be power of 2"); + mkfs_usage(); + } + break; case 'c': if (c.ndevs >= MAX_DEVICES) { MSG(0, "Error: Too many devices\n"); -- 2.42.0.rc2.253.gd59a3bf2b4-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel