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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C892BCA9EAC for ; Sat, 19 Oct 2019 09:58:37 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2DDC2082C for ; Sat, 19 Oct 2019 09:58:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IO0ueq1Y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2DDC2082C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46wJJB0hN3zDqS1 for ; Sat, 19 Oct 2019 20:58:34 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=pratikshinde320@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IO0ueq1Y"; dkim-atps=neutral Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 46wJJ34qnbzDqPK for ; Sat, 19 Oct 2019 20:58:24 +1100 (AEDT) Received: by mail-pf1-x442.google.com with SMTP id q7so5356338pfh.8 for ; Sat, 19 Oct 2019 02:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=BObdq/Z6kzvXQ3UbMDnD/ZCL+Pm1d826GKkmSE2E89E=; b=IO0ueq1YM7ijEnPzLW2m5MUVwTk7KJRvH4kew71oNm4UgNY76EBCKbD80rvogp4VEz Hq32dVHc0YH+V7IR9rZI7dceJeWtVeYe5t6HJj7lzQuBWGHBCxDy5c4mnTk8serIoG8f G2Fb2F3FQ2xRRfpfcsm63wnmeLA7KzS25j3Bae23PyZ7RFPnwjaaM7F8AXSHufTuwpm1 TcB9vcPVoN0MqEV6eBh7W1I5O0MV/EXu1tVcE1fuy5XvtISK5Jr99d8JgheHeqKFDbHQ C4ZHodqf6I9pJ4ApkWPqFLFo7USGvIZCZP+c5T6LVv2aCMnOJQCh0u5Fx0SWj/Rexsek Micg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BObdq/Z6kzvXQ3UbMDnD/ZCL+Pm1d826GKkmSE2E89E=; b=Ui+5dP9yAFj++yE9ida7q7J1oVZDLX4CULWDF3vOaXydHUazora2l7NmSiRlHNGcRx q+alXZXg1xgKhB/0O2n2HSM/KSVR9xxrAgTcpzQ1/MWoBQiqWfCsHS5e7mqp4GissVwz XHivWcwaAwCUODLJFngunH/6cD59CFYpDJ2ZHsDEMrZBlruMQEdpNph7ypQQ5nzrJqFa Ab7ZJaUVt17rFRDc7GR701E9QxVCsUXd/cbGKfARE+vie8La2TEclduIxd1Xp4P7JsbH Iz6GM+P7aZq0QztfrmAlORhIIwzValEP9Vmhv1etF2VaSJjXYmhV5Mo/SuyZ+hV6pyKm Flqg== X-Gm-Message-State: APjAAAX9+ocAJV6z2IPMP0wEa5fUs42mRUqrYhYBw5iobs2UDyTnzfPS Z3x8CDtbD1bAjkl8ms52xGSTBPBc X-Google-Smtp-Source: APXvYqxUT8B/TtuRB/fs5dgyrKKi2wPdDhEUCp6nRPrJ20Pg5lcPYCnjE49bAjP/lzw1v2aS5kTEnA== X-Received: by 2002:a63:d754:: with SMTP id w20mr14475020pgi.156.1571479098274; Sat, 19 Oct 2019 02:58:18 -0700 (PDT) Received: from localhost.localdomain ([42.108.243.191]) by smtp.gmail.com with ESMTPSA id s141sm10619136pfs.13.2019.10.19.02.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Oct 2019 02:58:17 -0700 (PDT) From: Pratik Shinde To: linux-erofs@lists.ozlabs.org, bluce.liguifu@huawei.com, miaoxie@huawei.com, fangwei1@huawei.com Subject: [PATCH-v4] erofs-utils:code for calculating crc checksum of erofs blocks Date: Sat, 19 Oct 2019 15:28:02 +0530 Message-Id: <20191019095802.30958-1-pratikshinde320@gmail.com> X-Mailer: git-send-email 2.9.3 X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" Added code for calculating crc of erofs blocks (4K size).for now it calculates checksum of first block. but can modified to calculate crc for any no. of blocks Fill 'feature_compat' field of erofs_super_block so that it can be used on kernel side. . Signed-off-by: Pratik Shinde --- include/erofs/internal.h | 1 + include/erofs/io.h | 8 ++++++ include/erofs_fs.h | 5 ++-- lib/io.c | 27 ++++++++++++++++++ mkfs/main.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+), 2 deletions(-) diff --git a/include/erofs/internal.h b/include/erofs/internal.h index 5384946..53335bc 100644 --- a/include/erofs/internal.h +++ b/include/erofs/internal.h @@ -55,6 +55,7 @@ struct erofs_sb_info { u32 feature_incompat; u64 build_time; u32 build_time_nsec; + u32 feature; }; /* global sbi */ diff --git a/include/erofs/io.h b/include/erofs/io.h index 9775047..e0ca8d9 100644 --- a/include/erofs/io.h +++ b/include/erofs/io.h @@ -19,6 +19,7 @@ int dev_open(const char *devname); void dev_close(void); int dev_write(const void *buf, u64 offset, size_t len); +int dev_read(void *buf, u64 offset, size_t len); int dev_fillzero(u64 offset, size_t len, bool padding); int dev_fsync(void); int dev_resize(erofs_blk_t nblocks); @@ -31,5 +32,12 @@ static inline int blk_write(const void *buf, erofs_blk_t blkaddr, blknr_to_addr(nblocks)); } +static inline int blk_read(void *buf, erofs_blk_t start, + u32 nblocks) +{ + return dev_read(buf, blknr_to_addr(start), + blknr_to_addr(nblocks)); +} + #endif diff --git a/include/erofs_fs.h b/include/erofs_fs.h index f29aa25..9eda6c2 100644 --- a/include/erofs_fs.h +++ b/include/erofs_fs.h @@ -19,6 +19,7 @@ */ #define EROFS_FEATURE_INCOMPAT_LZ4_0PADDING 0x00000001 #define EROFS_ALL_FEATURE_INCOMPAT EROFS_FEATURE_INCOMPAT_LZ4_0PADDING +#define EROFS_FEATURE_SB_CHKSUM 0x0001 /* 128-byte erofs on-disk super block */ struct erofs_super_block { @@ -39,8 +40,8 @@ struct erofs_super_block { __u8 uuid[16]; /* 128-bit uuid for volume */ __u8 volume_name[16]; /* volume name */ __le32 feature_incompat; - - __u8 reserved2[44]; + __le32 chksum_blocks; /* number of blocks used for checksum */ + __u8 reserved2[40]; }; /* diff --git a/lib/io.c b/lib/io.c index 7f5f94d..52f9424 100644 --- a/lib/io.c +++ b/lib/io.c @@ -207,3 +207,30 @@ int dev_resize(unsigned int blocks) return dev_fillzero(st.st_size, length, true); } +int dev_read(void *buf, u64 offset, size_t len) +{ + int ret; + + if (cfg.c_dry_run) + return 0; + + if (!buf) { + erofs_err("buf is NULL"); + return -EINVAL; + } + if (offset >= erofs_devsz || len > erofs_devsz || + offset > erofs_devsz - len) { + erofs_err("read posion[%" PRIu64 ", %zd] is too large beyond" + "the end of device(%" PRIu64 ").", + offset, len, erofs_devsz); + return -EINVAL; + } + + ret = pread64(erofs_devfd, buf, len, (off64_t)offset); + if (ret != (int)len) { + erofs_err("Failed to read data from device - %s:[%" PRIu64 ", %zd].", + erofs_devname, offset, len); + return -errno; + } + return 0; +} diff --git a/mkfs/main.c b/mkfs/main.c index 91a018f..fa793a9 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -22,6 +22,9 @@ #define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block)) +/* number of blocks for calculating checksum */ +#define EROFS_CKSUM_BLOCKS 1 + static void usage(void) { fprintf(stderr, "usage: [options] FILE DIRECTORY\n\n"); @@ -85,6 +88,10 @@ static int parse_extended_opts(const char *opts) return -EINVAL; cfg.c_force_inodeversion = FORCE_INODE_EXTENDED; } + + if (MATCH_EXTENTED_OPT("nocrc", token, keylen)) { + sbi.feature &= ~EROFS_FEATURE_SB_CHKSUM; + } } return 0; } @@ -180,6 +187,9 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh, .meta_blkaddr = sbi.meta_blkaddr, .xattr_blkaddr = 0, .feature_incompat = cpu_to_le32(sbi.feature_incompat), + .feature_compat = cpu_to_le32(sb.feature), + .checksum = 0, + .chksum_blocks = cpu_to_le32(EROFS_CKSUM_BLOCKS) }; const unsigned int sb_blksize = round_up(EROFS_SUPER_END, EROFS_BLKSIZ); @@ -202,6 +212,64 @@ int erofs_mkfs_update_super_block(struct erofs_buffer_head *bh, return 0; } +#define CRCPOLY 0x82F63B78 +static inline u32 crc32c(u32 seed, unsigned char const *in, size_t len) +{ + int i; + u32 crc = seed; + + while (len--) { + crc ^= *in++; + for (i = 0; i < 8; i++) { + crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY : 0); + } + } + return crc; +} + +/* calculate checksum for first n blocks */ +u32 erofs_calc_blk_checksum(erofs_blk_t nblks, u32 *crc) +{ + char *buf; + int err = 0; + + buf = malloc(nblks * EROFS_BLKSIZ); + err = blk_read(buf, 0, nblks); + if (err) { + return err; + } + *crc = crc32c(0, (const unsigned char *)buf, nblks * EROFS_BLKSIZ); + free(buf); + return 0; +} + +void erofs_write_sb_checksum() +{ + struct erofs_super_block *sb; + char buf[EROFS_BLKSIZ]; + int ret = 0; + u32 crc; + + ret = erofs_calc_blk_checksum(EROFS_CKSUM_BLOCKS, &crc); + if (ret) { + return; + } + ret = blk_read(buf, 0, 1); + if (ret) { + return; + } + + sb = (struct erofs_super_block *)((u8 *)buf + EROFS_SUPER_OFFSET); + if (le32_to_cpu(sb->magic) != EROFS_SUPER_MAGIC_V1) { + return; + } + sb->checksum = cpu_to_le32(crc); + ret = blk_write(buf, 0, 1); + if (ret) { + return; + } +} + int main(int argc, char **argv) { int err = 0; @@ -217,6 +285,7 @@ int main(int argc, char **argv) cfg.c_legacy_compress = false; sbi.feature_incompat = EROFS_FEATURE_INCOMPAT_LZ4_0PADDING; + sbi.feature = EROFS_FEATURE_SB_CHKSUM; err = mkfs_parse_options_cfg(argc, argv); if (err) { @@ -301,6 +370,8 @@ int main(int argc, char **argv) err = -EIO; else err = dev_resize(nblocks); + if (sbi.feature & EROFS_FEATURE_SB_CHKSUM) + erofs_write_sb_checksum(); exit: z_erofs_compress_exit(); dev_close(); -- 2.9.3