* [PATCH 0/2] libblkid: recognize Micron mpool formatted devices @ 2017-11-14 0:45 jgroves 2017-11-14 0:45 ` [PATCH 1/2] Add simple crc32c() function jgroves 2017-11-14 0:45 ` [PATCH 2/2] Add support for Micron mpool formatted drives jgroves 0 siblings, 2 replies; 4+ messages in thread From: jgroves @ 2017-11-14 0:45 UTC (permalink / raw) To: Karel Zak; +Cc: util-linux, John, John Groves From: John Groves <jgroves@micron.com> This patch adds libblkid recognition of Micron mpool formatted devices. It also adds a very simple crc32c() function, for use by probe_mpool(). If there are objections to adding crc32c, I can re-submit without it, or make it static for probe_mpool(). I would prefer not to go without crc32c validation, because the only remaining check would be the magic number. Review comments and/or questions welcome. Thanks, John Groves (2): Add simple crc32c() function Add support for Micron mpool formatted drives include/crc32c.h | 9 +++ lib/Makemodule.am | 1 + lib/crc32c.c | 102 +++++++++++++++++++++++++++++++++ libblkid/src/Makemodule.am | 1 + libblkid/src/superblocks/mpool.c | 74 ++++++++++++++++++++++++ libblkid/src/superblocks/superblocks.c | 3 +- libblkid/src/superblocks/superblocks.h | 1 + 7 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 include/crc32c.h create mode 100644 lib/crc32c.c create mode 100644 libblkid/src/superblocks/mpool.c -- 2.9.3 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] Add simple crc32c() function 2017-11-14 0:45 [PATCH 0/2] libblkid: recognize Micron mpool formatted devices jgroves @ 2017-11-14 0:45 ` jgroves 2017-11-14 0:45 ` [PATCH 2/2] Add support for Micron mpool formatted drives jgroves 1 sibling, 0 replies; 4+ messages in thread From: jgroves @ 2017-11-14 0:45 UTC (permalink / raw) To: Karel Zak; +Cc: util-linux, John, John Groves From: John Groves <jgroves@micron.com> Source: freebsd/sys/libkern/crc32.c --- include/crc32c.h | 9 +++++ lib/Makemodule.am | 1 + lib/crc32c.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 include/crc32c.h create mode 100644 lib/crc32c.c diff --git a/include/crc32c.h b/include/crc32c.h new file mode 100644 index 0000000..1c50839 --- /dev/null +++ b/include/crc32c.h @@ -0,0 +1,9 @@ +#ifndef UL_NG_CRC32C_H +#define UL_NG_CRC32C_H + +#include <sys/types.h> +#include <stdint.h> + +extern uint32_t crc32c(uint32_t crc, const void *buf, size_t size); + +#endif /* UL_NG_CRC32C_H */ diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 704a16e..f79e647 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -5,6 +5,7 @@ libcommon_la_SOURCES = \ lib/blkdev.c \ lib/canonicalize.c \ lib/crc32.c \ + lib/crc32c.c \ lib/env.c \ lib/idcache.c \ lib/fileutils.c \ diff --git a/lib/crc32c.c b/lib/crc32c.c new file mode 100644 index 0000000..49e7543 --- /dev/null +++ b/lib/crc32c.c @@ -0,0 +1,102 @@ +/* + * This code is from freebsd/sys/libkern/crc32.c + * + * Simplest table-based crc32c. Performance is not important + * for checking crcs on superblocks + */ + +/*- + * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or + * code or tables extracted from it, as desired without restriction. + */ + +#include "crc32c.h" + +static const uint32_t crc32Table[256] = { + 0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L, + 0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL, + 0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL, + 0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L, + 0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL, + 0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L, + 0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L, + 0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL, + 0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL, + 0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L, + 0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L, + 0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL, + 0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L, + 0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL, + 0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL, + 0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L, + 0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L, + 0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L, + 0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L, + 0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L, + 0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L, + 0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L, + 0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L, + 0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L, + 0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L, + 0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L, + 0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L, + 0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L, + 0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L, + 0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L, + 0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L, + 0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L, + 0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL, + 0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L, + 0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L, + 0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL, + 0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L, + 0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL, + 0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL, + 0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L, + 0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L, + 0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL, + 0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL, + 0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L, + 0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL, + 0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L, + 0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L, + 0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL, + 0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L, + 0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL, + 0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL, + 0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L, + 0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL, + 0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L, + 0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L, + 0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL, + 0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL, + 0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L, + 0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L, + 0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL, + 0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L, + 0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL, + 0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL, + 0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L +}; + +/* + *This was singletable_crc32c() in bsd + * + * If you will not be passing crc back into this function to process more bytes, + * the answer is: + * + * crc = crc32c(~0L, buf, size); + * [ crc = crc32c(crc, buf, size); ] + * crc ^= ~0L + * + */ +uint32_t +crc32c(uint32_t crc, const void *buf, size_t size) +{ + const uint8_t *p = buf; + + while (size--) + crc = crc32Table[(crc ^ *p++) & 0xff] ^ (crc >> 8); + + return crc; +} -- 2.9.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Add support for Micron mpool formatted drives 2017-11-14 0:45 [PATCH 0/2] libblkid: recognize Micron mpool formatted devices jgroves 2017-11-14 0:45 ` [PATCH 1/2] Add simple crc32c() function jgroves @ 2017-11-14 0:45 ` jgroves 2017-11-14 10:02 ` Karel Zak 1 sibling, 1 reply; 4+ messages in thread From: jgroves @ 2017-11-14 0:45 UTC (permalink / raw) To: Karel Zak; +Cc: util-linux, John, John Groves From: John Groves <jgroves@micron.com> --- libblkid/src/Makemodule.am | 1 + libblkid/src/superblocks/mpool.c | 74 ++++++++++++++++++++++++++++++++++ libblkid/src/superblocks/superblocks.c | 3 +- libblkid/src/superblocks/superblocks.h | 1 + 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 libblkid/src/superblocks/mpool.c diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 1fa00e9..ceece42 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -70,6 +70,7 @@ libblkid_la_SOURCES = \ libblkid/src/superblocks/luks.c \ libblkid/src/superblocks/lvm.c \ libblkid/src/superblocks/minix.c \ + libblkid/src/superblocks/mpool.c \ libblkid/src/superblocks/netware.c \ libblkid/src/superblocks/nilfs.c \ libblkid/src/superblocks/ntfs.c \ diff --git a/libblkid/src/superblocks/mpool.c b/libblkid/src/superblocks/mpool.c new file mode 100644 index 0000000..8688121 --- /dev/null +++ b/libblkid/src/superblocks/mpool.c @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2016-2017 Micron Technology, Inc. + * + * This file may be redistributed under the terms of the + * GNU Lesser General Public License. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <stdint.h> +#include "crc32c.h" +#include "superblocks.h" + +#include <uuid.h> + +#define MAX_MPOOL_NAME_LEN 32 + +struct omf_sb_descriptor { + uint64_t osb_magic; + uint8_t osb_name[MAX_MPOOL_NAME_LEN]; + uuid_t osb_poolid; /* UUID of pool this drive belongs to */ + uint16_t osb_vers; + uint32_t osb_gen; + uint32_t osb_cksum1; /* crc32c of the preceding fields */ +} __attribute__((packed)); + +const char *no = "no"; +const char *yes = "yes"; + +static int probe_mpool(blkid_probe pr, const struct blkid_idmag *mag) +{ + struct omf_sb_descriptor *osd; + uint32_t sb_crc; + + osd = blkid_probe_get_sb(pr, mag, struct omf_sb_descriptor); + if (!osd) + return errno ? -errno : 1; + + sb_crc = crc32c(~0L, (const void *)osd, + offsetof(struct omf_sb_descriptor, osb_cksum1)); + sb_crc ^= ~0L; + + if (!blkid_probe_verify_csum(pr, sb_crc, osd->osb_cksum1)) { + blkid_probe_set_value(pr, "VALID", + (unsigned char *)no, strlen(no) + 1); + return -EINVAL; + } + + blkid_probe_set_value(pr, "VALID", + (unsigned char *)yes, strlen(yes) + 1); + blkid_probe_set_label(pr, osd->osb_name, sizeof(osd->osb_name)); + blkid_probe_set_uuid(pr, osd->osb_poolid); + + return 0; +} + +/** + * Superblock (sb) -- magic = ASCII "mpoolDev" + */ +#define MPOOL_SB_MAGIC "\x6D\x70\x6f\x6f\x6c\x44\x65\x76" + +const struct blkid_idinfo mpool_idinfo = +{ + .name = "mpool", + .usage = BLKID_USAGE_FILESYSTEM, + .probefunc = probe_mpool, + .magics = + { + { .magic = MPOOL_SB_MAGIC, .len = 8}, + { NULL } + } +}; diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c index 341cd8a..3123d53 100644 --- a/libblkid/src/superblocks/superblocks.c +++ b/libblkid/src/superblocks/superblocks.c @@ -156,7 +156,8 @@ static const struct blkid_idinfo *idinfos[] = &befs_idinfo, &nilfs2_idinfo, &exfat_idinfo, - &f2fs_idinfo + &f2fs_idinfo, + &mpool_idinfo }; /* diff --git a/libblkid/src/superblocks/superblocks.h b/libblkid/src/superblocks/superblocks.h index 79dba1a..5b5c6c2 100644 --- a/libblkid/src/superblocks/superblocks.h +++ b/libblkid/src/superblocks/superblocks.h @@ -75,6 +75,7 @@ extern const struct blkid_idinfo nilfs2_idinfo; extern const struct blkid_idinfo exfat_idinfo; extern const struct blkid_idinfo f2fs_idinfo; extern const struct blkid_idinfo bcache_idinfo; +extern const struct blkid_idinfo mpool_idinfo; /* * superblock functions -- 2.9.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] Add support for Micron mpool formatted drives 2017-11-14 0:45 ` [PATCH 2/2] Add support for Micron mpool formatted drives jgroves @ 2017-11-14 10:02 ` Karel Zak 0 siblings, 0 replies; 4+ messages in thread From: Karel Zak @ 2017-11-14 10:02 UTC (permalink / raw) To: jgroves; +Cc: util-linux, John On Mon, Nov 13, 2017 at 06:45:13PM -0600, jgroves@micron.com wrote: > +const char *no = "no"; > +const char *yes = "yes"; > + > +static int probe_mpool(blkid_probe pr, const struct blkid_idmag *mag) > +{ > + struct omf_sb_descriptor *osd; > + uint32_t sb_crc; > + > + osd = blkid_probe_get_sb(pr, mag, struct omf_sb_descriptor); > + if (!osd) > + return errno ? -errno : 1; > + > + sb_crc = crc32c(~0L, (const void *)osd, > + offsetof(struct omf_sb_descriptor, osb_cksum1)); > + sb_crc ^= ~0L; > + > + if (!blkid_probe_verify_csum(pr, sb_crc, osd->osb_cksum1)) { > + blkid_probe_set_value(pr, "VALID", > + (unsigned char *)no, strlen(no) + 1); > + return -EINVAL; > + } The function blkid_probe_verify_csum() defines SBBADCSUM variable if the checksum is invalid and the application cares about such things (used BLKID_SUBLKS_BADCSUM probing flag). The return code should be "1" rather than -EINVAL. Why we need "VALID"? See for example libblkid/src/superblocks/lvm.c. > + > + blkid_probe_set_value(pr, "VALID", > + (unsigned char *)yes, strlen(yes) + 1); > + blkid_probe_set_label(pr, osd->osb_name, sizeof(osd->osb_name)); > + blkid_probe_set_uuid(pr, osd->osb_poolid); > + > + return 0; > +} > + > +/** > + * Superblock (sb) -- magic = ASCII "mpoolDev" > + */ > +#define MPOOL_SB_MAGIC "\x6D\x70\x6f\x6f\x6c\x44\x65\x76" > + > +const struct blkid_idinfo mpool_idinfo = > +{ > + .name = "mpool", > + .usage = BLKID_USAGE_FILESYSTEM, > + .probefunc = probe_mpool, > + .magics = > + { > + { .magic = MPOOL_SB_MAGIC, .len = 8}, > + { NULL } > + } > +}; It would be nice to have some reference (e.g. URL to docs) about Micron mpool in code or in commit message ;-) Karel -- Karel Zak <kzak@redhat.com> http://karelzak.blogspot.com ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-14 10:02 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-11-14 0:45 [PATCH 0/2] libblkid: recognize Micron mpool formatted devices jgroves 2017-11-14 0:45 ` [PATCH 1/2] Add simple crc32c() function jgroves 2017-11-14 0:45 ` [PATCH 2/2] Add support for Micron mpool formatted drives jgroves 2017-11-14 10:02 ` Karel Zak
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).