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 DB28CC10F14 for ; Tue, 15 Oct 2019 05:19:14 +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 83A162089C for ; Tue, 15 Oct 2019 05:19:14 +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="iCdpxvwc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 83A162089C 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 46skHh3vgfzDqyY for ; Tue, 15 Oct 2019 16:19:12 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::444; helo=mail-pf1-x444.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="iCdpxvwc"; dkim-atps=neutral Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) (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 46skHH3n5jzDqws for ; Tue, 15 Oct 2019 16:18:51 +1100 (AEDT) Received: by mail-pf1-x444.google.com with SMTP id b128so11705398pfa.1 for ; Mon, 14 Oct 2019 22:18:51 -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=ywuqNrf+tszwjJ2wbIJNH5enaQXYiZ8mvOhhqxK1dy0=; b=iCdpxvwcrVLIYE+CaVjpvHgpRlKrb5rMBaTTa5BgeglOpFij+Nblw3/FSfIG6XyQu8 764T5rq2BkyEg22ldwZl3aZ5o8xpXylLxF+kmMH2UE1QPc24La3muxxNxIm1fwt1KB2T xsZahxfVrbASgca+vFxV37HCvMFDIthppNlsB9aEav3SBVgow7AziA0vRwbMRJIpAOZq I9bfj8CEcYAD+bsqQks+4UR/t0ND1Ww3yBQOhRTITKavAsFXXJzYoG9PO36SnmH1TikV Sx/ZN4LOxl96XrPbYWa4HcumlEpJ2fbEGVD8QduS4cBLh2NgK6g64xQpdsrwNLsGvXzV 5uuQ== 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=ywuqNrf+tszwjJ2wbIJNH5enaQXYiZ8mvOhhqxK1dy0=; b=fxVG9YgRN54XscbmVtFmcn1dF40HUshYkaTiAbr/72z2Y73dW+UwgdveMKmb2DfVGA u6c2KyUjUMzNsN1geubQD51na2LM7RyCZjSGn/S20PA3BzKd341cRiHCbeQk7GQeZDBZ MXAk1E4dNZ9xrhbGDkslgXYf15aPHBrml6HBX44cZ0rbUaZ2g8mhgAe1wgtyPeZXOdnS ZYKpsYkN9YDH3rc2vRj+e/Usm1pzNjhVXOUiK3Gs2A+YuYpOWxnDlLD7nJqjbB9jroAn Hvz13TyARQSyLoa2eHf60SVl2fCwo2Rp3CvCefc3EbfVaOV6KTzt9aQWZDkWTaAnTnKN mCEw== X-Gm-Message-State: APjAAAWygyri/qWjJpBY+AS2NQP+mgRhSJnPymbYIeLVTjGqZceA5dhA wTpHjwaOFDwX7cRrmD1diys5rOMtTq0= X-Google-Smtp-Source: APXvYqxnb4/YqD+LGyn/l1dDFT4Yi0F+aRwTHQcA043fc6F/CMFn1b9Rb/8Fim2iFwKl+Hw3BwmVSQ== X-Received: by 2002:a17:90a:a604:: with SMTP id c4mr40302520pjq.48.1571116728537; Mon, 14 Oct 2019 22:18:48 -0700 (PDT) Received: from localhost.localdomain ([42.106.201.218]) by smtp.gmail.com with ESMTPSA id 18sm21237684pfp.100.2019.10.14.22.18.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Oct 2019 22:18:47 -0700 (PDT) From: Pratik Shinde To: linux-erofs@lists.ozlabs.org, bluce.liguifu@huawei.com, miaoxie@huawei.com, fangwei1@huawei.com Subject: [PATCH-v3] erofs-utils:code for calculating crc checksum of erofs blocks. Date: Tue, 15 Oct 2019 10:48:30 +0530 Message-Id: <20191015051830.7756-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 1) Added 'chksum_blocks' field to erofs_super_block 2) removed unnecessary prints 3) moved EROFS_FEATURE_SB_CHKSUM include/erofs_fs.h Signed-off-by: Pratik Shinde --- include/erofs/internal.h | 1 + include/erofs/io.h | 8 ++++++ include/erofs_fs.h | 3 ++- lib/io.c | 27 +++++++++++++++++++ mkfs/main.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 1 deletion(-) 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..8bd29d6 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,7 +40,7 @@ struct erofs_super_block { __u8 uuid[16]; /* 128-bit uuid for volume */ __u8 volume_name[16]; /* volume name */ __le32 feature_incompat; - + __le32 chksum_blocks; /* number of blocks used for checksum */ __u8 reserved2[44]; }; 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..0633e83 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,8 @@ 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), + .checksum = 0, + .chksum_blocks = cpu_to_le32(EROFS_CKSUM_BLOCKS) }; const unsigned int sb_blksize = round_up(EROFS_SUPER_END, EROFS_BLKSIZ); @@ -202,6 +211,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 +284,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 +369,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