From 0d2a4830ed36b33daccd21ce5aa91f43e637098d Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 11 Jun 2019 15:00:54 +0930 Subject: [PATCH] ccan: update to faster and correct crc32c implementation. I decided to try a faster implementation, only to find our crc32c was not correct! Ouch. I removed the crc32c functions from ccan/crc, and added a new crc32c module which has the Mark Adler x86-64-optimized variants. We bump gossip_store version again, since csums have changed. Signed-off-by: Rusty Russell --- Makefile | 6 +- ccan/README | 2 +- ccan/ccan/compiler/compiler.h | 15 + ccan/ccan/crc/LICENSE | 1 - ccan/ccan/crc/crc.c | 307 ------------------ ccan/ccan/crc/crc.h | 107 ------- ccan/ccan/crc/test/api.c | 261 ---------------- ccan/ccan/crc32c/LICENSE | 1 + ccan/ccan/{crc => crc32c}/_info | 14 +- ccan/ccan/crc32c/benchmark/Makefile | 24 ++ ccan/ccan/crc32c/benchmark/bench.c | 57 ++++ ccan/ccan/crc32c/crc32c.c | 415 +++++++++++++++++++++++++ ccan/ccan/crc32c/crc32c.h | 48 +++ ccan/ccan/crc32c/test/api-crc32c.c | 109 +++++++ ccan/ccan/crc32c/test/run-crc32c.c | 111 +++++++ ccan/tools/configurator/configurator.c | 7 + common/gossip_store.c | 2 +- common/gossip_store.h | 2 +- devtools/create-gossipstore.c | 2 +- devtools/dump-gossipstore.c | 2 +- gossipd/gossip_store.c | 2 +- tests/test_gossip.py | 10 +- 22 files changed, 808 insertions(+), 697 deletions(-) delete mode 120000 ccan/ccan/crc/LICENSE delete mode 100644 ccan/ccan/crc/crc.c delete mode 100644 ccan/ccan/crc/crc.h delete mode 100644 ccan/ccan/crc/test/api.c create mode 120000 ccan/ccan/crc32c/LICENSE rename ccan/ccan/{crc => crc32c}/_info (72%) create mode 100644 ccan/ccan/crc32c/benchmark/Makefile create mode 100644 ccan/ccan/crc32c/benchmark/bench.c create mode 100644 ccan/ccan/crc32c/crc32c.c create mode 100644 ccan/ccan/crc32c/crc32c.h create mode 100644 ccan/ccan/crc32c/test/api-crc32c.c create mode 100644 ccan/ccan/crc32c/test/run-crc32c.c diff --git a/Makefile b/Makefile index 7c4ee411c..a2691e93e 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ CCAN_OBJS := \ ccan-bitmap.o \ ccan-bitops.o \ ccan-breakpoint.o \ - ccan-crc.o \ + ccan-crc32c.o \ ccan-crypto-hmac.o \ ccan-crypto-hkdf.o \ ccan-crypto-ripemd160.o \ @@ -123,7 +123,7 @@ CCAN_HEADERS := \ $(CCANDIR)/ccan/compiler/compiler.h \ $(CCANDIR)/ccan/container_of/container_of.h \ $(CCANDIR)/ccan/cppmagic/cppmagic.h \ - $(CCANDIR)/ccan/crc/crc.h \ + $(CCANDIR)/ccan/crc32c/crc32c.h \ $(CCANDIR)/ccan/crypto/hkdf_sha256/hkdf_sha256.h \ $(CCANDIR)/ccan/crypto/hmac_sha256/hmac_sha256.h \ $(CCANDIR)/ccan/crypto/ripemd160/ripemd160.h \ @@ -601,7 +601,7 @@ ccan-noerr.o: $(CCANDIR)/ccan/noerr/noerr.c $(CC) $(CFLAGS) -c -o $@ $< ccan-str-hex.o: $(CCANDIR)/ccan/str/hex/hex.c $(CC) $(CFLAGS) -c -o $@ $< -ccan-crc.o: $(CCANDIR)/ccan/crc/crc.c +ccan-crc32c.o: $(CCANDIR)/ccan/crc32c/crc32c.c $(CC) $(CFLAGS) -c -o $@ $< ccan-crypto-hmac.o: $(CCANDIR)/ccan/crypto/hmac_sha256/hmac_sha256.c $(CC) $(CFLAGS) -c -o $@ $< diff --git a/ccan/README b/ccan/README index 3ec79359c..8b70b90f2 100644 --- a/ccan/README +++ b/ccan/README @@ -1,3 +1,3 @@ CCAN imported from http://ccodearchive.net. -CCAN version: init-2473-g7623d082 +CCAN version: init-2481-gce4660aa diff --git a/ccan/ccan/compiler/compiler.h b/ccan/ccan/compiler/compiler.h index 624474b7e..1bbb3b8b6 100644 --- a/ccan/ccan/compiler/compiler.h +++ b/ccan/ccan/compiler/compiler.h @@ -286,4 +286,19 @@ #define LAST_ARG_NULL #endif +#if HAVE_BUILTIN_CPU_SUPPORTS +/** + * cpu_supports - test if current CPU supports the named feature. + * + * This takes a literal string, and currently only works on glibc platforms. + * + * Example: + * if (cpu_supports("mmx")) + * printf("MMX support engaged!\n"); + */ +#define cpu_supports(x) __builtin_cpu_supports(x) +#else +#define cpu_supports(x) 0 +#endif /* HAVE_BUILTIN_CPU_SUPPORTS */ + #endif /* CCAN_COMPILER_H */ diff --git a/ccan/ccan/crc/LICENSE b/ccan/ccan/crc/LICENSE deleted file mode 120000 index 9961ca9d9..000000000 --- a/ccan/ccan/crc/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../licenses/GPL-2 \ No newline at end of file diff --git a/ccan/ccan/crc/crc.c b/ccan/ccan/crc/crc.c deleted file mode 100644 index d2c8c3130..000000000 --- a/ccan/ccan/crc/crc.c +++ /dev/null @@ -1,307 +0,0 @@ -/* crc32_ieee code: - * COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or - * code or tables extracted from it, as desired without restriction. - */ - -/* crc32c code taken from 2.6.29 Linux kernel crypto/crc32c.c: - * Copyright (c) 2004 Cisco Systems, Inc. - * Copyright (c) 2008 Herbert Xu - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. */ - -/* crc64 code taken from Jacksum version 1.7.0 - checksum utility in Java - * E-mail: jonelo@jonelo.de - * Copyright (C) 2001-2006 Dipl.-Inf. (FH) Johann Nepomuk Loefflmann, - * All Rights Reserved, http://www.jonelo.de - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - */ - -#include "crc.h" -#include -#include -#include - -/* - * This is the CRC-32C table - * Generated with: - * width = 32 bits - * poly = 0x1EDC6F41 - * reflect input bytes = true - * reflect output bytes = true - */ -static const uint32_t crc32c_tab[] = { - 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, - 0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB, - 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B, - 0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24, - 0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B, - 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384, - 0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54, - 0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B, - 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A, - 0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35, - 0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5, - 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA, - 0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45, - 0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A, - 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A, - 0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595, - 0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48, - 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957, - 0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687, - 0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198, - 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927, - 0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38, - 0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8, - 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7, - 0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096, - 0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789, - 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859, - 0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46, - 0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9, - 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6, - 0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36, - 0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829, - 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C, - 0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93, - 0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043, - 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C, - 0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3, - 0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC, - 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C, - 0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033, - 0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652, - 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D, - 0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D, - 0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982, - 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D, - 0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622, - 0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2, - 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED, - 0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530, - 0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F, - 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF, - 0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0, - 0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F, - 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540, - 0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90, - 0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F, - 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE, - 0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1, - 0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321, - 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E, - 0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81, - 0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E, - 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E, - 0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351 -}; - -/* - * Steps through buffer one byte at at time, calculates reflected - * crc using table. - */ -uint32_t crc32c(uint32_t crc, const void *buf, size_t size) -{ - const uint8_t *p = buf; - - while (size--) - crc = crc32c_tab[(crc ^ *p++) & 0xFFL] ^ (crc >> 8); - - return crc; -} - -const uint32_t *crc32c_table(void) -{ - return crc32c_tab; -} - -static const uint32_t crc32_ieee_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -uint32_t crc32_ieee(uint32_t crc, const void *buf, size_t size) -{ - const uint8_t *p; - - p = buf; - crc ^= ~0U; - - while (size--) - crc = crc32_ieee_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - -const uint32_t *crc32_ieee_table(void) -{ - return crc32_ieee_tab; -} - -/* We only keep the upper 16 bits of the table: the lower 48 are always 0 */ -static uint16_t crc64_tab[] = { - 0x0000, 0x01b0, 0x0360, - 0x02d0, 0x06c0, 0x0770, - 0x05a0, 0x0410, 0x0d80, - 0x0c30, 0x0ee0, 0x0f50, - 0x0b40, 0x0af0, 0x0820, - 0x0990, 0x1b00, 0x1ab0, - 0x1860, 0x19d0, 0x1dc0, - 0x1c70, 0x1ea0, 0x1f10, - 0x1680, 0x1730, 0x15e0, - 0x1450, 0x1040, 0x11f0, - 0x1320, 0x1290, 0x3600, - 0x37b0, 0x3560, 0x34d0, - 0x30c0, 0x3170, 0x33a0, - 0x3210, 0x3b80, 0x3a30, - 0x38e0, 0x3950, 0x3d40, - 0x3cf0, 0x3e20, 0x3f90, - 0x2d00, 0x2cb0, 0x2e60, - 0x2fd0, 0x2bc0, 0x2a70, - 0x28a0, 0x2910, 0x2080, - 0x2130, 0x23e0, 0x2250, - 0x2640, 0x27f0, 0x2520, - 0x2490, 0x6c00, 0x6db0, - 0x6f60, 0x6ed0, 0x6ac0, - 0x6b70, 0x69a0, 0x6810, - 0x6180, 0x6030, 0x62e0, - 0x6350, 0x6740, 0x66f0, - 0x6420, 0x6590, 0x7700, - 0x76b0, 0x7460, 0x75d0, - 0x71c0, 0x7070, 0x72a0, - 0x7310, 0x7a80, 0x7b30, - 0x79e0, 0x7850, 0x7c40, - 0x7df0, 0x7f20, 0x7e90, - 0x5a00, 0x5bb0, 0x5960, - 0x58d0, 0x5cc0, 0x5d70, - 0x5fa0, 0x5e10, 0x5780, - 0x5630, 0x54e0, 0x5550, - 0x5140, 0x50f0, 0x5220, - 0x5390, 0x4100, 0x40b0, - 0x4260, 0x43d0, 0x47c0, - 0x4670, 0x44a0, 0x4510, - 0x4c80, 0x4d30, 0x4fe0, - 0x4e50, 0x4a40, 0x4bf0, - 0x4920, 0x4890, 0xd800, - 0xd9b0, 0xdb60, 0xdad0, - 0xdec0, 0xdf70, 0xdda0, - 0xdc10, 0xd580, 0xd430, - 0xd6e0, 0xd750, 0xd340, - 0xd2f0, 0xd020, 0xd190, - 0xc300, 0xc2b0, 0xc060, - 0xc1d0, 0xc5c0, 0xc470, - 0xc6a0, 0xc710, 0xce80, - 0xcf30, 0xcde0, 0xcc50, - 0xc840, 0xc9f0, 0xcb20, - 0xca90, 0xee00, 0xefb0, - 0xed60, 0xecd0, 0xe8c0, - 0xe970, 0xeba0, 0xea10, - 0xe380, 0xe230, 0xe0e0, - 0xe150, 0xe540, 0xe4f0, - 0xe620, 0xe790, 0xf500, - 0xf4b0, 0xf660, 0xf7d0, - 0xf3c0, 0xf270, 0xf0a0, - 0xf110, 0xf880, 0xf930, - 0xfbe0, 0xfa50, 0xfe40, - 0xfff0, 0xfd20, 0xfc90, - 0xb400, 0xb5b0, 0xb760, - 0xb6d0, 0xb2c0, 0xb370, - 0xb1a0, 0xb010, 0xb980, - 0xb830, 0xbae0, 0xbb50, - 0xbf40, 0xbef0, 0xbc20, - 0xbd90, 0xaf00, 0xaeb0, - 0xac60, 0xadd0, 0xa9c0, - 0xa870, 0xaaa0, 0xab10, - 0xa280, 0xa330, 0xa1e0, - 0xa050, 0xa440, 0xa5f0, - 0xa720, 0xa690, 0x8200, - 0x83b0, 0x8160, 0x80d0, - 0x84c0, 0x8570, 0x87a0, - 0x8610, 0x8f80, 0x8e30, - 0x8ce0, 0x8d50, 0x8940, - 0x88f0, 0x8a20, 0x8b90, - 0x9900, 0x98b0, 0x9a60, - 0x9bd0, 0x9fc0, 0x9e70, - 0x9ca0, 0x9d10, 0x9480, - 0x9530, 0x97e0, 0x9650, - 0x9240, 0x93f0, 0x9120, - 0x9090 -}; - -uint64_t crc64_iso(uint64_t crc, const void *buf, size_t size) -{ - const uint8_t *p = buf; - - while (size--) { - uint64_t tabval = crc64_tab[(crc ^ *p++) & 0xFFL]; - tabval <<= 48; - crc = tabval ^ (crc >> 8); - } - return crc; -} - -const uint64_t *crc64_iso_table(void) -{ - static uint64_t *fulltab = NULL; - unsigned int i; - - if (fulltab) - return fulltab; - - fulltab = malloc(sizeof(uint64_t)*ARRAY_SIZE(crc64_tab)); - if (!fulltab) - return NULL; - - for (i = 0; i < ARRAY_SIZE(crc64_tab); i++) - fulltab[i] = (uint64_t)crc64_tab[i] << 48; - - return fulltab; -} diff --git a/ccan/ccan/crc/crc.h b/ccan/ccan/crc/crc.h deleted file mode 100644 index 25789b771..000000000 --- a/ccan/ccan/crc/crc.h +++ /dev/null @@ -1,107 +0,0 @@ -/* Licensed under GPLv2+ - see LICENSE file for details */ -#ifndef CCAN_CRC_H -#define CCAN_CRC_H -#include -#include - -/** - * crc32c - Castagnoli 32 bit crc of string of bytes - * @start_crc: the initial crc (usually 0) - * @buf: pointer to bytes - * @size: length of buffer - * - * If you don't know what crc32 to use, use this one: it's the best. - * - * @Article{castagnoli-crc, - * author = { Guy Castagnoli and Stefan Braeuer and Martin Herrman}, - * title = {{Optimization of Cyclic Redundancy-Check Codes with 24 - * and 32 Parity Bits}}, - * journal = IEEE Transactions on Communication, - * year = {1993}, - * volume = {41}, - * number = {6}, - * pages = {}, - * month = {June}, - *} - * 32 bit CRC checksum using polynomial - * X^32+X^28+X^27+X^26+X^25+X^23+X^22+X^20+X^19+X^18+X^14+X^13+X^11+X^10+X^9+X^8+X^6+X^0. - * - * You can calculate the CRC of non-contiguous arrays by passing @start_crc - * as 0 the first time, and the current crc result from then on. - * - * Example: - * #include - * ... - * // Check that iovec has the crc we expect (Castagnoli version) - * static bool check_crc(uint32_t expected, const struct iovec *iov, int l) - * { - * uint32_t crc = 0; - * while (l >= 0) { - * crc = crc32c(crc, iov->iov_base, iov->iov_len); - * iov++; - * } - * return crc == expected; - * } - */ -uint32_t crc32c(uint32_t start_crc, const void *buf, size_t size); - -/** - * crc32c_table - Get the Castagnoli CRC table - * - * For special effects, you might want direct access to the table; this is - * the standard 256-entry table for this algorithm. - * - * In theory, this might need to malloc(), and thus return NULL. - * - * Example: - * // This dumb code only handles Castagnoli, so assert that here. - * static void check_user_crc_table(const uint32_t *usertab) - * { - * const uint32_t *ctab = crc32c_table(); - * if (!ctab || memcmp(ctab, usertab, 1024) != 0) - * abort(); - * } - */ -const uint32_t *crc32c_table(void); - -/** - * crc32_ieee - IEEE 802.3 32 bit crc of string of bytes - * @start_crc: the initial crc (usually 0) - * @buf: pointer to bytes - * @size: length of buffer - * - * 32 bit CRC checksum using polynomial - * X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0. - * - * See crc32c() for details. - */ -uint32_t crc32_ieee(uint32_t start_crc, const void *buf, size_t size); - -/** - * crc32_ieee_table - Get the IEEE 802.3 CRC table - * - * See crc32c_table() for details. - */ -const uint32_t *crc32_ieee_table(void); - -/** - * crc64_iso - ISO 3309 - * @start_crc: the initial crc (usually 0) - * @buf: pointer to bytes - * @size: length of buffer - * - * 64 bit CRC checksum using polynomial - * X^64 + X^4 + X^3 + X^1 + X^0 - * - * See crc32c() for details. - */ -uint64_t crc64_iso(uint64_t start_crc, const void *buf, size_t size); - -/** - * crc64_iso_table - Get the ISO 3309 CRC table - * - * See crc32c_table() for details. - */ -const uint64_t *crc64_iso_table(void); - -#endif /* CCAN_CRC_H */ diff --git a/ccan/ccan/crc/test/api.c b/ccan/ccan/crc/test/api.c deleted file mode 100644 index 1d56e3d29..000000000 --- a/ccan/ccan/crc/test/api.c +++ /dev/null @@ -1,261 +0,0 @@ -#include -#include -#include - -static const uint32_t crc32c_tab[] = { - 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, - 0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB, - 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B, - 0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24, - 0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B, - 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384, - 0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54, - 0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B, - 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A, - 0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35, - 0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5, - 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA, - 0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45, - 0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A, - 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A, - 0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595, - 0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48, - 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957, - 0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687, - 0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198, - 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927, - 0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38, - 0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8, - 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7, - 0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096, - 0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789, - 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859, - 0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46, - 0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9, - 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6, - 0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36, - 0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829, - 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C, - 0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93, - 0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043, - 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C, - 0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3, - 0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC, - 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C, - 0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033, - 0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652, - 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D, - 0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D, - 0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982, - 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D, - 0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622, - 0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2, - 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED, - 0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530, - 0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F, - 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF, - 0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0, - 0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F, - 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540, - 0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90, - 0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F, - 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE, - 0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1, - 0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321, - 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E, - 0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81, - 0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E, - 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E, - 0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351 -}; - -static const uint32_t crc32_ieee_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; -/* Expected CRCs of 4 of each char. */ -static uint32_t crcc_expect[] = { - 0x00000000, 0x99cd23b2, 0x36763195, 0xafbb1227, 0x6cec632a, 0xf5214098, - 0x5a9a52bf, 0xc357710d, 0xd9d8c654, 0x4015e5e6, 0xefaef7c1, 0x7663d473, - 0xb534a57e, 0x2cf986cc, 0x834294eb, 0x1a8fb759, 0xb65dfa59, 0x2f90d9eb, - 0x802bcbcc, 0x19e6e87e, 0xdab19973, 0x437cbac1, 0xecc7a8e6, 0x750a8b54, - 0x6f853c0d, 0xf6481fbf, 0x59f30d98, 0xc03e2e2a, 0x03695f27, 0x9aa47c95, - 0x351f6eb2, 0xacd24d00, 0x69578243, 0xf09aa1f1, 0x5f21b3d6, 0xc6ec9064, - 0x05bbe169, 0x9c76c2db, 0x33cdd0fc, 0xaa00f34e, 0xb08f4417, 0x294267a5, - 0x86f97582, 0x1f345630, 0xdc63273d, 0x45ae048f, 0xea1516a8, 0x73d8351a, - 0xdf0a781a, 0x46c75ba8, 0xe97c498f, 0x70b16a3d, 0xb3e61b30, 0x2a2b3882, - 0x85902aa5, 0x1c5d0917, 0x06d2be4e, 0x9f1f9dfc, 0x30a48fdb, 0xa969ac69, - 0x6a3edd64, 0xf3f3fed6, 0x5c48ecf1, 0xc585cf43, 0xd2af0486, 0x4b622734, - 0xe4d93513, 0x7d1416a1, 0xbe4367ac, 0x278e441e, 0x88355639, 0x11f8758b, - 0x0b77c2d2, 0x92bae160, 0x3d01f347, 0xa4ccd0f5, 0x679ba1f8, 0xfe56824a, - 0x51ed906d, 0xc820b3df, 0x64f2fedf, 0xfd3fdd6d, 0x5284cf4a, 0xcb49ecf8, - 0x081e9df5, 0x91d3be47, 0x3e68ac60, 0xa7a58fd2, 0xbd2a388b, 0x24e71b39, - 0x8b5c091e, 0x12912aac, 0xd1c65ba1, 0x480b7813, 0xe7b06a34, 0x7e7d4986, - 0xbbf886c5, 0x2235a577, 0x8d8eb750, 0x144394e2, 0xd714e5ef, 0x4ed9c65d, - 0xe162d47a, 0x78aff7c8, 0x62204091, 0xfbed6323, 0x54567104, 0xcd9b52b6, - 0x0ecc23bb, 0x97010009, 0x38ba122e, 0xa177319c, 0x0da57c9c, 0x94685f2e, - 0x3bd34d09, 0xa21e6ebb, 0x61491fb6, 0xf8843c04, 0x573f2e23, 0xcef20d91, - 0xd47dbac8, 0x4db0997a, 0xe20b8b5d, 0x7bc6a8ef, 0xb891d9e2, 0x215cfa50, - 0x8ee7e877, 0x172acbc5, 0xa0b27ffd, 0x397f5c4f, 0x96c44e68, 0x0f096dda, - 0xcc5e1cd7, 0x55933f65, 0xfa282d42, 0x63e50ef0, 0x796ab9a9, 0xe0a79a1b, - 0x4f1c883c, 0xd6d1ab8e, 0x1586da83, 0x8c4bf931, 0x23f0eb16, 0xba3dc8a4, - 0x16ef85a4, 0x8f22a616, 0x2099b431, 0xb9549783, 0x7a03e68e, 0xe3cec53c, - 0x4c75d71b, 0xd5b8f4a9, 0xcf3743f0, 0x56fa6042, 0xf9417265, 0x608c51d7, - 0xa3db20da, 0x3a160368, 0x95ad114f, 0x0c6032fd, 0xc9e5fdbe, 0x5028de0c, - 0xff93cc2b, 0x665eef99, 0xa5099e94, 0x3cc4bd26, 0x937faf01, 0x0ab28cb3, - 0x103d3bea, 0x89f01858, 0x264b0a7f, 0xbf8629cd, 0x7cd158c0, 0xe51c7b72, - 0x4aa76955, 0xd36a4ae7, 0x7fb807e7, 0xe6752455, 0x49ce3672, 0xd00315c0, - 0x135464cd, 0x8a99477f, 0x25225558, 0xbcef76ea, 0xa660c1b3, 0x3fade201, - 0x9016f026, 0x09dbd394, 0xca8ca299, 0x5341812b, 0xfcfa930c, 0x6537b0be, - 0x721d7b7b, 0xebd058c9, 0x446b4aee, 0xdda6695c, 0x1ef11851, 0x873c3be3, - 0x288729c4, 0xb14a0a76, 0xabc5bd2f, 0x32089e9d, 0x9db38cba, 0x047eaf08, - 0xc729de05, 0x5ee4fdb7, 0xf15fef90, 0x6892cc22, 0xc4408122, 0x5d8da290, - 0xf236b0b7, 0x6bfb9305, 0xa8ace208, 0x3161c1ba, 0x9edad39d, 0x0717f02f, - 0x1d984776, 0x845564c4, 0x2bee76e3, 0xb2235551, 0x7174245c, 0xe8b907ee, - 0x470215c9, 0xdecf367b, 0x1b4af938, 0x8287da8a, 0x2d3cc8ad, 0xb4f1eb1f, - 0x77a69a12, 0xee6bb9a0, 0x41d0ab87, 0xd81d8835, 0xc2923f6c, 0x5b5f1cde, - 0xf4e40ef9, 0x6d292d4b, 0xae7e5c46, 0x37b37ff4, 0x98086dd3, 0x01c54e61, - 0xad170361, 0x34da20d3, 0x9b6132f4, 0x02ac1146, 0xc1fb604b, 0x583643f9, - 0xf78d51de, 0x6e40726c, 0x74cfc535, 0xed02e687, 0x42b9f4a0, 0xdb74d712, - 0x1823a61f, 0x81ee85ad, 0x2e55978a, 0xb798b438 -}; - -static uint32_t crcc_zero_expect[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, -}; - -static uint32_t crc_ieee_expect[] = { - 0x2144df1c, 0xf626d399, 0x54f1c057, 0x8393ccd2, 0xca2ee18a, 0x1d4ced0f, - 0xbf9bfec1, 0x68f9f244, 0x2ce1a471, 0xfb83a8f4, 0x5954bb3a, 0x8e36b7bf, - 0xc78b9ae7, 0x10e99662, 0xb23e85ac, 0x655c8929, 0x3a0e29c6, 0xed6c2543, - 0x4fbb368d, 0x98d93a08, 0xd1641750, 0x06061bd5, 0xa4d1081b, 0x73b3049e, - 0x37ab52ab, 0xe0c95e2e, 0x421e4de0, 0x957c4165, 0xdcc16c3d, 0x0ba360b8, - 0xa9747376, 0x7e167ff3, 0x17d132a8, 0xc0b33e2d, 0x62642de3, 0xb5062166, - 0xfcbb0c3e, 0x2bd900bb, 0x890e1375, 0x5e6c1ff0, 0x1a7449c5, 0xcd164540, - 0x6fc1568e, 0xb8a35a0b, 0xf11e7753, 0x267c7bd6, 0x84ab6818, 0x53c9649d, - 0x0c9bc472, 0xdbf9c8f7, 0x792edb39, 0xae4cd7bc, 0xe7f1fae4, 0x3093f661, - 0x9244e5af, 0x4526e92a, 0x013ebf1f, 0xd65cb39a, 0x748ba054, 0xa3e9acd1, - 0xea548189, 0x3d368d0c, 0x9fe19ec2, 0x48839247, 0x4c6f0474, 0x9b0d08f1, - 0x39da1b3f, 0xeeb817ba, 0xa7053ae2, 0x70673667, 0xd2b025a9, 0x05d2292c, - 0x41ca7f19, 0x96a8739c, 0x347f6052, 0xe31d6cd7, 0xaaa0418f, 0x7dc24d0a, - 0xdf155ec4, 0x08775241, 0x5725f2ae, 0x8047fe2b, 0x2290ede5, 0xf5f2e160, - 0xbc4fcc38, 0x6b2dc0bd, 0xc9fad373, 0x1e98dff6, 0x5a8089c3, 0x8de28546, - 0x2f359688, 0xf8579a0d, 0xb1eab755, 0x6688bbd0, 0xc45fa81e, 0x133da49b, - 0x7afae9c0, 0xad98e545, 0x0f4ff68b, 0xd82dfa0e, 0x9190d756, 0x46f2dbd3, - 0xe425c81d, 0x3347c498, 0x775f92ad, 0xa03d9e28, 0x02ea8de6, 0xd5888163, - 0x9c35ac3b, 0x4b57a0be, 0xe980b370, 0x3ee2bff5, 0x61b01f1a, 0xb6d2139f, - 0x14050051, 0xc3670cd4, 0x8ada218c, 0x5db82d09, 0xff6f3ec7, 0x280d3242, - 0x6c156477, 0xbb7768f2, 0x19a07b3c, 0xcec277b9, 0x877f5ae1, 0x501d5664, - 0xf2ca45aa, 0x25a8492f, 0xfb1369cc, 0x2c716549, 0x8ea67687, 0x59c47a02, - 0x1079575a, 0xc71b5bdf, 0x65cc4811, 0xb2ae4494, 0xf6b612a1, 0x21d41e24, - 0x83030dea, 0x5461016f, 0x1ddc2c37, 0xcabe20b2, 0x6869337c, 0xbf0b3ff9, - 0xe0599f16, 0x373b9393, 0x95ec805d, 0x428e8cd8, 0x0b33a180, 0xdc51ad05, - 0x7e86becb, 0xa9e4b24e, 0xedfce47b, 0x3a9ee8fe, 0x9849fb30, 0x4f2bf7b5, - 0x0696daed, 0xd1f4d668, 0x7323c5a6, 0xa441c923, 0xcd868478, 0x1ae488fd, - 0xb8339b33, 0x6f5197b6, 0x26ecbaee, 0xf18eb66b, 0x5359a5a5, 0x843ba920, - 0xc023ff15, 0x1741f390, 0xb596e05e, 0x62f4ecdb, 0x2b49c183, 0xfc2bcd06, - 0x5efcdec8, 0x899ed24d, 0xd6cc72a2, 0x01ae7e27, 0xa3796de9, 0x741b616c, - 0x3da64c34, 0xeac440b1, 0x4813537f, 0x9f715ffa, 0xdb6909cf, 0x0c0b054a, - 0xaedc1684, 0x79be1a01, 0x30033759, 0xe7613bdc, 0x45b62812, 0x92d42497, - 0x9638b2a4, 0x415abe21, 0xe38dadef, 0x34efa16a, 0x7d528c32, 0xaa3080b7, - 0x08e79379, 0xdf859ffc, 0x9b9dc9c9, 0x4cffc54c, 0xee28d682, 0x394ada07, - 0x70f7f75f, 0xa795fbda, 0x0542e814, 0xd220e491, 0x8d72447e, 0x5a1048fb, - 0xf8c75b35, 0x2fa557b0, 0x66187ae8, 0xb17a766d, 0x13ad65a3, 0xc4cf6926, - 0x80d73f13, 0x57b53396, 0xf5622058, 0x22002cdd, 0x6bbd0185, 0xbcdf0d00, - 0x1e081ece, 0xc96a124b, 0xa0ad5f10, 0x77cf5395, 0xd518405b, 0x027a4cde, - 0x4bc76186, 0x9ca56d03, 0x3e727ecd, 0xe9107248, 0xad08247d, 0x7a6a28f8, - 0xd8bd3b36, 0x0fdf37b3, 0x46621aeb, 0x9100166e, 0x33d705a0, 0xe4b50925, - 0xbbe7a9ca, 0x6c85a54f, 0xce52b681, 0x1930ba04, 0x508d975c, 0x87ef9bd9, - 0x25388817, 0xf25a8492, 0xb642d2a7, 0x6120de22, 0xc3f7cdec, 0x1495c169, - 0x5d28ec31, 0x8a4ae0b4, 0x289df37a, 0xffffffff, -}; - -static uint32_t crc_ieee_zero_expect[] = { - 0x00000000, 0xd202ef8d, 0x41d912ff, 0xff41d912 -}; - -/* Runs 517 tests. */ -static void test_crc32(uint32_t (*crc)(uint32_t, const void *, size_t), - const uint32_t *(*crc_table)(void), - const uint32_t zero_expect[4], - const uint32_t four_char_expect[256], - const uint32_t *table_expect) -{ - unsigned int i; - char c[4] = { 0 }; - - for (i = 0; i < 4; i++) - ok1(crc(0, c, i) == zero_expect[i]); - - for (i = 0; i < 256; i++) { - memset(c, i, sizeof(c)); - ok1(crc(0, c, sizeof(c)) == four_char_expect[i]); - /* CRC in two parts should give same answer. */ - ok1(crc(crc(0, c, i%5), c+i%5, 4 - (i%5)) - == four_char_expect[i]); - } - ok1(memcmp(crc_table(), table_expect, 1024) == 0); -} - -static void test_crc64(void) -{ - /* according to http://swissknife.sourceforge.net/CRC64.html */ - ok1(crc64_iso(0, "IHATEMATH", strlen("IHATEMATH")) - == 0xE3DCADD69B01ADD1ULL); - - /* according to the CRC64 poly, http://sf.net/projects/jcrcgen */ - ok1(crc64_iso(0, "123456789", strlen("123456789")) - == 0x46A5A9388A5BEFFEULL); -} - -int main(int argc, char *argv[]) -{ - plan_tests(517 * 2 + 2); - test_crc32(crc32c, crc32c_table, - crcc_zero_expect, crcc_expect, crc32c_tab); - test_crc32(crc32_ieee, crc32_ieee_table, - crc_ieee_zero_expect, crc_ieee_expect, crc32_ieee_tab); - test_crc64(); - return exit_status(); -} diff --git a/ccan/ccan/crc32c/LICENSE b/ccan/ccan/crc32c/LICENSE new file mode 120000 index 000000000..2354d1294 --- /dev/null +++ b/ccan/ccan/crc32c/LICENSE @@ -0,0 +1 @@ +../../licenses/BSD-MIT \ No newline at end of file diff --git a/ccan/ccan/crc/_info b/ccan/ccan/crc32c/_info similarity index 72% rename from ccan/ccan/crc/_info rename to ccan/ccan/crc32c/_info index 8a47db969..5fe710eba 100644 --- a/ccan/ccan/crc/_info +++ b/ccan/ccan/crc32c/_info @@ -3,20 +3,20 @@ #include /** - * crc - routines for crc of bytes + * crc32c - routine for Castagnoli CRC (crc32c) of bytes * - * Cyclic Redundancy Check routines. These are reasonably fast + * Cyclic Redundancy Check routine, optimized for x86-64. Reasonably fast * checksum routines, but not suitable for cryptographic use. * * They are useful for simple error detection, eg. a 32-bit CRC will * detect a single error burst of up to 32 bits. * * Example: - * #include + * #include * #include * #include * - * // Given "IHATEMATH" outputs 0x98a3b8df + * // Given "123456789" outputs 0xe3069283 * int main(int argc, char *argv[]) * { * if (argc != 2) { @@ -28,8 +28,8 @@ * exit(0); * } * - * License: GPL (v2 or any later version) - * Author: Gary S. Brown, Clay Haapala + * License: MIT + * Author: Mark Adler * Maintainer: Rusty Russell */ int main(int argc, char *argv[]) @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) return 1; if (strcmp(argv[1], "depends") == 0) { - printf("ccan/array_size\n"); + printf("ccan/compiler\n"); return 0; } diff --git a/ccan/ccan/crc32c/benchmark/Makefile b/ccan/ccan/crc32c/benchmark/Makefile new file mode 100644 index 000000000..611275931 --- /dev/null +++ b/ccan/ccan/crc32c/benchmark/Makefile @@ -0,0 +1,24 @@ +CCANDIR=../../.. +CFLAGS=-Wall -Werror -O3 -I$(CCANDIR) -flto +#CFLAGS=-Wall -Werror -g3 -I$(CCANDIR) +LDFLAGS := -flto -O3 + +all: bench + +CCAN_OBJS:=ccan-tal.o ccan-tal-grab_file.o ccan-noerr.o ccan-take.o ccan-time.o + +bench: bench.o $(CCAN_OBJS) + +clean: + rm -f bench *.o + +ccan-time.o: $(CCANDIR)/ccan/time/time.c + $(CC) $(CFLAGS) -c -o $@ $< +ccan-tal.o: $(CCANDIR)/ccan/tal/tal.c + $(CC) $(CFLAGS) -c -o $@ $< +ccan-take.o: $(CCANDIR)/ccan/take/take.c + $(CC) $(CFLAGS) -c -o $@ $< +ccan-noerr.o: $(CCANDIR)/ccan/noerr/noerr.c + $(CC) $(CFLAGS) -c -o $@ $< +ccan-tal-grab_file.o: $(CCANDIR)/ccan/tal/grab_file/grab_file.c + $(CC) $(CFLAGS) -c -o $@ $< diff --git a/ccan/ccan/crc32c/benchmark/bench.c b/ccan/ccan/crc32c/benchmark/bench.c new file mode 100644 index 000000000..54b2d97aa --- /dev/null +++ b/ccan/ccan/crc32c/benchmark/bench.c @@ -0,0 +1,57 @@ +#include +#include +#include +#include +#include +#include + +#define RUNS 65536 + +int main(int argc, char *argv[]) +{ + void *p; + struct timeabs start, end; + size_t len, runs; + uint64_t sums = 0; + bool sw = false, hw = false; + + if (argv[1]) { + if (streq(argv[1], "--software")) { + sw = true; + argv++; + argc--; + + } else if (streq(argv[1], "--hardware")) { + hw = true; + argv++; + argc--; + } + } + + if (argc < 2 || (runs = atol(argv[1])) == 0) + errx(1, "Usage: bench []"); + + p = grab_file(NULL, argv[2]); + if (!p) + err(1, "Reading %s", argv[2] ? argv[2] : ""); + len = tal_count(p) - 1; + start = time_now(); + if (sw) { + for (size_t i = 0; i < runs; i++) + sums += crc32c_sw(0, p, len); + } else if (hw) { + for (size_t i = 0; i < runs; i++) + sums += crc32c_hw(0, p, len); + } else { + for (size_t i = 0; i < runs; i++) + sums += crc32c(0, p, len); + } + end = time_now(); + + assert(sums % runs == 0); + printf("%u usec for %zu bytes, sum=%08x\n", + (int)time_to_usec(time_divide(time_between(end, start), runs)), + len, + (unsigned int)(sums / runs)); + return 0; +} diff --git a/ccan/ccan/crc32c/crc32c.c b/ccan/ccan/crc32c/crc32c.c new file mode 100644 index 000000000..9eaec79b0 --- /dev/null +++ b/ccan/ccan/crc32c/crc32c.c @@ -0,0 +1,415 @@ +/* MIT (BSD) license - see LICENSE file for details */ +/* crc32c.c -- compute CRC-32C using the Intel crc32 instruction + * Copyright (C) 2013, 2015 Mark Adler + * Version 1.3 31 Dec 2015 Mark Adler + */ + +/* + This software is provided 'as-is', without any express or implied + warranty. In no event will the author be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Mark Adler + madler@alumni.caltech.edu + */ + +/* Use hardware CRC instruction on Intel SSE 4.2 processors. This computes a + CRC-32C, *not* the CRC-32 used by Ethernet and zip, gzip, etc. A software + version is provided as a fall-back, as well as for speed comparisons. */ + +/* Version history: + 1.0 10 Feb 2013 First version + 1.1 1 Aug 2013 Correct comments on why three crc instructions in parallel + 1.2 1 Nov 2015 Add const qualifier to avoid compiler warning + Load entire input into memory (test code) + Argument gives number of times to repeat (test code) + Argument < 0 forces software implementation (test code) + 1.3 31 Dec 2015 Check for Intel architecture using compiler macro + Support big-endian processors in software calculation + Add header for external use + */ + +#include "crc32c.h" +#include +#include + +static uint32_t crc32c_sw(uint32_t crc, void const *buf, size_t len); + +/* CRC-32C (iSCSI) polynomial in reversed bit order. */ +#define POLY 0x82f63b78 + +#ifdef __x86_64__ + +/* Hardware CRC-32C for Intel and compatible processors. */ + +/* Multiply a matrix times a vector over the Galois field of two elements, + GF(2). Each element is a bit in an unsigned integer. mat must have at + least as many entries as the power of two for most significant one bit in + vec. */ +static inline uint32_t gf2_matrix_times(uint32_t *mat, uint32_t vec) { + uint32_t sum = 0; + while (vec) { + if (vec & 1) + sum ^= *mat; + vec >>= 1; + mat++; + } + return sum; +} + +/* Multiply a matrix by itself over GF(2). Both mat and square must have 32 + rows. */ +static inline void gf2_matrix_square(uint32_t *square, uint32_t *mat) { + for (unsigned n = 0; n < 32; n++) + square[n] = gf2_matrix_times(mat, mat[n]); +} + +/* Construct an operator to apply len zeros to a crc. len must be a power of + two. If len is not a power of two, then the result is the same as for the + largest power of two less than len. The result for len == 0 is the same as + for len == 1. A version of this routine could be easily written for any + len, but that is not needed for this application. */ +static void crc32c_zeros_op(uint32_t *even, size_t len) { + uint32_t odd[32]; /* odd-power-of-two zeros operator */ + + /* put operator for one zero bit in odd */ + odd[0] = POLY; /* CRC-32C polynomial */ + uint32_t row = 1; + for (unsigned n = 1; n < 32; n++) { + odd[n] = row; + row <<= 1; + } + + /* put operator for two zero bits in even */ + gf2_matrix_square(even, odd); + + /* put operator for four zero bits in odd */ + gf2_matrix_square(odd, even); + + /* first square will put the operator for one zero byte (eight zero bits), + in even -- next square puts operator for two zero bytes in odd, and so + on, until len has been rotated down to zero */ + do { + gf2_matrix_square(even, odd); + len >>= 1; + if (len == 0) + return; + gf2_matrix_square(odd, even); + len >>= 1; + } while (len); + + /* answer ended up in odd -- copy to even */ + for (unsigned n = 0; n < 32; n++) + even[n] = odd[n]; +} + +/* Take a length and build four lookup tables for applying the zeros operator + for that length, byte-by-byte on the operand. */ +static void crc32c_zeros(uint32_t zeros[][256], size_t len) { + uint32_t op[32]; + + crc32c_zeros_op(op, len); + for (unsigned n = 0; n < 256; n++) { + zeros[0][n] = gf2_matrix_times(op, n); + zeros[1][n] = gf2_matrix_times(op, n << 8); + zeros[2][n] = gf2_matrix_times(op, n << 16); + zeros[3][n] = gf2_matrix_times(op, n << 24); + } +} + +/* Apply the zeros operator table to crc. */ +static inline uint32_t crc32c_shift(uint32_t zeros[][256], uint32_t crc) { + return zeros[0][crc & 0xff] ^ zeros[1][(crc >> 8) & 0xff] ^ + zeros[2][(crc >> 16) & 0xff] ^ zeros[3][crc >> 24]; +} + +/* Block sizes for three-way parallel crc computation. LONG and SHORT must + both be powers of two. The associated string constants must be set + accordingly, for use in constructing the assembler instructions. */ +#define LONG 8192 +#define LONGx1 "8192" +#define LONGx2 "16384" +#define SHORT 256 +#define SHORTx1 "256" +#define SHORTx2 "512" + +/* Tables for hardware crc that shift a crc by LONG and SHORT zeros. */ +static bool crc32c_once_hw; +static uint32_t crc32c_long[4][256]; +static uint32_t crc32c_short[4][256]; + +/* Initialize tables for shifting crcs. */ +static void crc32c_init_hw(void) { + crc32c_once_hw = true; + crc32c_zeros(crc32c_long, LONG); + crc32c_zeros(crc32c_short, SHORT); +} + +/* Compute CRC-32C using the Intel hardware instruction. */ +static uint32_t crc32c_hw(uint32_t crc, void const *buf, size_t len) { + /* populate shift tables the first time through */ + if (!crc32c_once_hw) + crc32c_init_hw(); + + /* pre-process the crc */ + crc = ~crc; + uint64_t crc0 = crc; /* 64-bits for crc32q instruction */ + + /* compute the crc for up to seven leading bytes to bring the data pointer + to an eight-byte boundary */ + unsigned char const *next = buf; + while (len && ((uintptr_t)next & 7) != 0) { + __asm__("crc32b\t" "(%1), %0" + : "=r"(crc0) + : "r"(next), "0"(crc0)); + next++; + len--; + } + + /* compute the crc on sets of LONG*3 bytes, executing three independent crc + instructions, each on LONG bytes -- this is optimized for the Nehalem, + Westmere, Sandy Bridge, and Ivy Bridge architectures, which have a + throughput of one crc per cycle, but a latency of three cycles */ + while (len >= LONG*3) { + uint64_t crc1 = 0; + uint64_t crc2 = 0; + unsigned char const * const end = next + LONG; + do { + __asm__("crc32q\t" "(%3), %0\n\t" + "crc32q\t" LONGx1 "(%3), %1\n\t" + "crc32q\t" LONGx2 "(%3), %2" + : "=r"(crc0), "=r"(crc1), "=r"(crc2) + : "r"(next), "0"(crc0), "1"(crc1), "2"(crc2)); + next += 8; + } while (next < end); + crc0 = crc32c_shift(crc32c_long, crc0) ^ crc1; + crc0 = crc32c_shift(crc32c_long, crc0) ^ crc2; + next += LONG*2; + len -= LONG*3; + } + + /* do the same thing, but now on SHORT*3 blocks for the remaining data less + than a LONG*3 block */ + while (len >= SHORT*3) { + uint64_t crc1 = 0; + uint64_t crc2 = 0; + unsigned char const * const end = next + SHORT; + do { + __asm__("crc32q\t" "(%3), %0\n\t" + "crc32q\t" SHORTx1 "(%3), %1\n\t" + "crc32q\t" SHORTx2 "(%3), %2" + : "=r"(crc0), "=r"(crc1), "=r"(crc2) + : "r"(next), "0"(crc0), "1"(crc1), "2"(crc2)); + next += 8; + } while (next < end); + crc0 = crc32c_shift(crc32c_short, crc0) ^ crc1; + crc0 = crc32c_shift(crc32c_short, crc0) ^ crc2; + next += SHORT*2; + len -= SHORT*3; + } + + /* compute the crc on the remaining eight-byte units less than a SHORT*3 + block */ + { + unsigned char const * const end = next + (len - (len & 7)); + while (next < end) { + __asm__("crc32q\t" "(%1), %0" + : "=r"(crc0) + : "r"(next), "0"(crc0)); + next += 8; + } + len &= 7; + } + + /* compute the crc for up to seven trailing bytes */ + while (len) { + __asm__("crc32b\t" "(%1), %0" + : "=r"(crc0) + : "r"(next), "0"(crc0)); + next++; + len--; + } + + /* return a post-processed crc */ + return ~crc0; +} + +/* Compute a CRC-32C. If the crc32 instruction is available, use the hardware + version. Otherwise, use the software version. */ +uint32_t crc32c(uint32_t crc, void const *buf, size_t len) { + + return cpu_supports("sse4.2") ? crc32c_hw(crc, buf, len) : crc32c_sw(crc, buf, len); +} + +#else /* !__x86_64__ */ + +uint32_t crc32c(uint32_t crc, void const *buf, size_t len) { + return crc32c_sw(crc, buf, len); +} + +#endif + +/* Construct table for software CRC-32C little-endian calculation. */ +static bool crc32c_once_little; +static uint32_t crc32c_table_little[8][256]; +static void crc32c_init_sw_little(void) { + for (unsigned n = 0; n < 256; n++) { + uint32_t crc = n; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc32c_table_little[0][n] = crc; + } + for (unsigned n = 0; n < 256; n++) { + uint32_t crc = crc32c_table_little[0][n]; + for (unsigned k = 1; k < 8; k++) { + crc = crc32c_table_little[0][crc & 0xff] ^ (crc >> 8); + crc32c_table_little[k][n] = crc; + } + } + crc32c_once_little = true; +} + +/* Compute a CRC-32C in software assuming a little-endian architecture, + constructing the required table if that hasn't already been done. */ +static uint32_t crc32c_sw_little(uint32_t crc, void const *buf, size_t len) { + unsigned char const *next = buf; + + if (!crc32c_once_little) + crc32c_init_sw_little(); + crc = ~crc; + while (len && ((uintptr_t)next & 7) != 0) { + crc = crc32c_table_little[0][(crc ^ *next++) & 0xff] ^ (crc >> 8); + len--; + } + if (len >= 8) { + uint64_t crcw = crc; + do { + crcw ^= *(uint64_t const *)next; + crcw = crc32c_table_little[7][crcw & 0xff] ^ + crc32c_table_little[6][(crcw >> 8) & 0xff] ^ + crc32c_table_little[5][(crcw >> 16) & 0xff] ^ + crc32c_table_little[4][(crcw >> 24) & 0xff] ^ + crc32c_table_little[3][(crcw >> 32) & 0xff] ^ + crc32c_table_little[2][(crcw >> 40) & 0xff] ^ + crc32c_table_little[1][(crcw >> 48) & 0xff] ^ + crc32c_table_little[0][crcw >> 56]; + next += 8; + len -= 8; + } while (len >= 8); + crc = crcw; + } + while (len) { + crc = crc32c_table_little[0][(crc ^ *next++) & 0xff] ^ (crc >> 8); + len--; + } + return ~crc; +} + +/* Swap the bytes in a uint64_t. (Only for big-endian.) */ +#if defined(__has_builtin) || (defined(__GNUC__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) +# define swap __builtin_bswap64 +#else +static inline uint64_t swap(uint64_t x) { + x = ((x << 8) & 0xff00ff00ff00ff00) | ((x >> 8) & 0xff00ff00ff00ff); + x = ((x << 16) & 0xffff0000ffff0000) | ((x >> 16) & 0xffff0000ffff); + return (x << 32) | (x >> 32); +} +#endif + +/* Construct tables for software CRC-32C big-endian calculation. */ +static bool crc32c_once_big; +static uint32_t crc32c_table_big_byte[256]; +static uint64_t crc32c_table_big[8][256]; +static void crc32c_init_sw_big(void) { + for (unsigned n = 0; n < 256; n++) { + uint32_t crc = n; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc = crc & 1 ? (crc >> 1) ^ POLY : crc >> 1; + crc32c_table_big_byte[n] = crc; + } + for (unsigned n = 0; n < 256; n++) { + uint32_t crc = crc32c_table_big_byte[n]; + crc32c_table_big[0][n] = swap(crc); + for (unsigned k = 1; k < 8; k++) { + crc = crc32c_table_big_byte[crc & 0xff] ^ (crc >> 8); + crc32c_table_big[k][n] = swap(crc); + } + } + crc32c_once_big = true; +} + +/* Compute a CRC-32C in software assuming a big-endian architecture, + constructing the required tables if that hasn't already been done. */ +static uint32_t crc32c_sw_big(uint32_t crc, void const *buf, size_t len) { + unsigned char const *next = buf; + + if (!crc32c_once_big) + crc32c_init_sw_big(); + crc = ~crc; + while (len && ((uintptr_t)next & 7) != 0) { + crc = crc32c_table_big_byte[(crc ^ *next++) & 0xff] ^ (crc >> 8); + len--; + } + if (len >= 8) { + uint64_t crcw = swap(crc); + do { + crcw ^= *(uint64_t const *)next; + crcw = crc32c_table_big[0][crcw & 0xff] ^ + crc32c_table_big[1][(crcw >> 8) & 0xff] ^ + crc32c_table_big[2][(crcw >> 16) & 0xff] ^ + crc32c_table_big[3][(crcw >> 24) & 0xff] ^ + crc32c_table_big[4][(crcw >> 32) & 0xff] ^ + crc32c_table_big[5][(crcw >> 40) & 0xff] ^ + crc32c_table_big[6][(crcw >> 48) & 0xff] ^ + crc32c_table_big[7][(crcw >> 56)]; + next += 8; + len -= 8; + } while (len >= 8); + crc = swap(crcw); + } + while (len) { + crc = crc32c_table_big_byte[(crc ^ *next++) & 0xff] ^ (crc >> 8); + len--; + } + return ~crc; +} + +/* Table-driven software CRC-32C. This is about 15 times slower than using the + hardware instructions. Determine the endianess of the processor and proceed + accordingly. Ideally the endianess will be determined at compile time, in + which case the unused functions and tables for the other endianess will be + removed by the optimizer. If not, then the proper routines and tables will + be used, even if the endianess is changed mid-stream. (Yes, there are + processors that permit that -- go figure.) */ +static uint32_t crc32c_sw(uint32_t crc, void const *buf, size_t len) { + static int const little = 1; + if (*(char const *)&little) + return crc32c_sw_little(crc, buf, len); + else + return crc32c_sw_big(crc, buf, len); +} diff --git a/ccan/ccan/crc32c/crc32c.h b/ccan/ccan/crc32c/crc32c.h new file mode 100644 index 000000000..49e3337f7 --- /dev/null +++ b/ccan/ccan/crc32c/crc32c.h @@ -0,0 +1,48 @@ +/* Licensed under MIT - see LICENSE file for details */ +#ifndef CCAN_CRC32C_H +#define CCAN_CRC32C_H +#include +#include + +/** + * crc32c - Castagnoli 32 bit crc of string of bytes + * @start_crc: the initial crc (usually 0) + * @buf: pointer to bytes + * @size: length of buffer + * + * If you don't know what crc32 to use, use this one: it's the best. + * + * @Article{castagnoli-crc, + * author = { Guy Castagnoli and Stefan Braeuer and Martin Herrman}, + * title = {{Optimization of Cyclic Redundancy-Check Codes with 24 + * and 32 Parity Bits}}, + * journal = IEEE Transactions on Communication, + * year = {1993}, + * volume = {41}, + * number = {6}, + * pages = {}, + * month = {June}, + *} + * 32 bit CRC checksum using polynomial + * X^32+X^28+X^27+X^26+X^25+X^23+X^22+X^20+X^19+X^18+X^14+X^13+X^11+X^10+X^9+X^8+X^6+X^0. + * + * You can calculate the CRC of non-contiguous arrays by passing @start_crc + * as 0 the first time, and the current crc result from then on. + * + * Example: + * #include + * ... + * // Check that iovec has the crc we expect (Castagnoli version) + * static bool check_crc(uint32_t expected, const struct iovec *iov, int l) + * { + * uint32_t crc = 0; + * while (l >= 0) { + * crc = crc32c(crc, iov->iov_base, iov->iov_len); + * iov++; + * } + * return crc == expected; + * } + */ +uint32_t crc32c(uint32_t start_crc, const void *buf, size_t size); + +#endif /* CCAN_CRC32C_H */ diff --git a/ccan/ccan/crc32c/test/api-crc32c.c b/ccan/ccan/crc32c/test/api-crc32c.c new file mode 100644 index 000000000..681a2f2df --- /dev/null +++ b/ccan/ccan/crc32c/test/api-crc32c.c @@ -0,0 +1,109 @@ +/* Test vectors from https://tools.ietf.org/html/rfc3720#appendix-B.4 */ +#include +#include +#include + +#define BSWAP_32(val) \ + ((((uint32_t)(val) & 0x000000ff) << 24) \ + | (((uint32_t)(val) & 0x0000ff00) << 8) \ + | (((uint32_t)(val) & 0x00ff0000) >> 8) \ + | (((uint32_t)(val) & 0xff000000) >> 24)) + +#if HAVE_LITTLE_ENDIAN +#define BE32_TO_CPU(le_val) BSWAP_32((uint32_t)le_val) +#else +#define BE32_TO_CPU(le_val) ((uint32_t)(le_val)) +#endif + +int main(void) +{ + unsigned char m[48]; + + plan_tests(5); + + /* 32 bytes of zeroes: + + Byte: 0 1 2 3 + + 0: 00 00 00 00 + ... + 28: 00 00 00 00 + + CRC: aa 36 91 8a + */ + + memset(m, 0, 32); + ok1(crc32c(0, m, 32) == BE32_TO_CPU(0xaa36918a)); + + /* 32 bytes of ones: + + Byte: 0 1 2 3 + + 0: ff ff ff ff + ... + 28: ff ff ff ff + + CRC: 43 ab a8 62 + */ + memset(m, 0xff, 32); + ok1(crc32c(0, m, 32) == BE32_TO_CPU(0x43aba862)); + + /* 32 bytes of incrementing 00..1f: + + Byte: 0 1 2 3 + + 0: 00 01 02 03 + ... + 28: 1c 1d 1e 1f + + CRC: 4e 79 dd 46 + */ + for (size_t i = 0; i < 32; i++) + m[i] = i; + ok1(crc32c(0, m, 32) == BE32_TO_CPU(0x4e79dd46)); + + /* 32 bytes of decrementing 1f..00: + + Byte: 0 1 2 3 + + 0: 1f 1e 1d 1c + ... + 28: 03 02 01 00 + + CRC: 5c db 3f 11 + */ + for (size_t i = 0; i < 32; i++) + m[i] = 31 - i; + ok1(crc32c(0, m, 32) == BE32_TO_CPU(0x5cdb3f11)); + + /* An iSCSI - SCSI Read (10) Command PDU + Byte: 0 1 2 3 + + 0: 01 c0 00 00 + 4: 00 00 00 00 + 8: 00 00 00 00 + 12: 00 00 00 00 + 16: 14 00 00 00 + 20: 00 00 04 00 + 24: 00 00 00 14 + 28: 00 00 00 18 + 32: 28 00 00 00 + 36: 00 00 00 00 + 40: 02 00 00 00 + 44: 00 00 00 00 + + CRC: 56 3a 96 d9 + */ + memset(m, 0, sizeof(m)); + m[0] = 0x01; + m[1] = 0xc0; + m[16] = 0x14; + m[22] = 0x04; + m[27] = 0x14; + m[31] = 0x18; + m[32] = 0x28; + m[40] = 0x02; + ok1(crc32c(0, m, sizeof(m)) == BE32_TO_CPU(0x563a96d9)); + + return exit_status(); +} diff --git a/ccan/ccan/crc32c/test/run-crc32c.c b/ccan/ccan/crc32c/test/run-crc32c.c new file mode 100644 index 000000000..304a3d2fb --- /dev/null +++ b/ccan/ccan/crc32c/test/run-crc32c.c @@ -0,0 +1,111 @@ +/* Test vectors from https://tools.ietf.org/html/rfc3720#appendix-B.4 */ + +/* Get access to sw version explicitly */ +#include +#include +#include + +#define BSWAP_32(val) \ + ((((uint32_t)(val) & 0x000000ff) << 24) \ + | (((uint32_t)(val) & 0x0000ff00) << 8) \ + | (((uint32_t)(val) & 0x00ff0000) >> 8) \ + | (((uint32_t)(val) & 0xff000000) >> 24)) + +#if HAVE_LITTLE_ENDIAN +#define BE32_TO_CPU(le_val) BSWAP_32((uint32_t)le_val) +#else +#define BE32_TO_CPU(le_val) ((uint32_t)(le_val)) +#endif + +int main(void) +{ + unsigned char m[48]; + + plan_tests(5); + + /* 32 bytes of zeroes: + + Byte: 0 1 2 3 + + 0: 00 00 00 00 + ... + 28: 00 00 00 00 + + CRC: aa 36 91 8a + */ + + memset(m, 0, 32); + ok1(crc32c_sw(0, m, 32) == BE32_TO_CPU(0xaa36918a)); + + /* 32 bytes of ones: + + Byte: 0 1 2 3 + + 0: ff ff ff ff + ... + 28: ff ff ff ff + + CRC: 43 ab a8 62 + */ + memset(m, 0xff, 32); + ok1(crc32c_sw(0, m, 32) == BE32_TO_CPU(0x43aba862)); + + /* 32 bytes of incrementing 00..1f: + + Byte: 0 1 2 3 + + 0: 00 01 02 03 + ... + 28: 1c 1d 1e 1f + + CRC: 4e 79 dd 46 + */ + for (size_t i = 0; i < 32; i++) + m[i] = i; + ok1(crc32c_sw(0, m, 32) == BE32_TO_CPU(0x4e79dd46)); + + /* 32 bytes of decrementing 1f..00: + + Byte: 0 1 2 3 + + 0: 1f 1e 1d 1c + ... + 28: 03 02 01 00 + + CRC: 5c db 3f 11 + */ + for (size_t i = 0; i < 32; i++) + m[i] = 31 - i; + ok1(crc32c_sw(0, m, 32) == BE32_TO_CPU(0x5cdb3f11)); + + /* An iSCSI - SCSI Read (10) Command PDU + Byte: 0 1 2 3 + + 0: 01 c0 00 00 + 4: 00 00 00 00 + 8: 00 00 00 00 + 12: 00 00 00 00 + 16: 14 00 00 00 + 20: 00 00 04 00 + 24: 00 00 00 14 + 28: 00 00 00 18 + 32: 28 00 00 00 + 36: 00 00 00 00 + 40: 02 00 00 00 + 44: 00 00 00 00 + + CRC: 56 3a 96 d9 + */ + memset(m, 0, sizeof(m)); + m[0] = 0x01; + m[1] = 0xc0; + m[16] = 0x14; + m[22] = 0x04; + m[27] = 0x14; + m[31] = 0x18; + m[32] = 0x28; + m[40] = 0x02; + ok1(crc32c_sw(0, m, sizeof(m)) == BE32_TO_CPU(0x563a96d9)); + + return exit_status(); +} diff --git a/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c index f15f34483..d676b8823 100644 --- a/ccan/tools/configurator/configurator.c +++ b/ccan/tools/configurator/configurator.c @@ -488,6 +488,13 @@ static const struct test base_tests[] = { " return worked ? 0 : 1;\n" "}\n" }, + { "HAVE_BUILTIN_CPU_SUPPORTS", "__builtin_cpu_supports()", + "DEFINES_FUNC", NULL, NULL, + "#include \n" + "static bool func(void) {\n" + " return __builtin_cpu_supports(\"mmx\");\n" + "}" + }, }; static void c12r_err(int eval, const char *fmt, ...) diff --git a/common/gossip_store.c b/common/gossip_store.c index 9ad62d3a1..363d74980 100644 --- a/common/gossip_store.c +++ b/common/gossip_store.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/common/gossip_store.h b/common/gossip_store.h index 81dc8f779..457f56774 100644 --- a/common/gossip_store.h +++ b/common/gossip_store.h @@ -10,7 +10,7 @@ struct per_peer_state; /** * gossip_store -- On-disk storage related information */ -#define GOSSIP_STORE_VERSION 6 +#define GOSSIP_STORE_VERSION 7 /** * Bit of length we use to mark a deleted record. diff --git a/devtools/create-gossipstore.c b/devtools/create-gossipstore.c index b4e9502fd..d6a38a310 100644 --- a/devtools/create-gossipstore.c +++ b/devtools/create-gossipstore.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/devtools/dump-gossipstore.c b/devtools/dump-gossipstore.c index 16245a119..82ea7a773 100644 --- a/devtools/dump-gossipstore.c +++ b/devtools/dump-gossipstore.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/gossipd/gossip_store.c b/gossipd/gossip_store.c index 9f14577c1..13fc23dc3 100644 --- a/gossipd/gossip_store.c +++ b/gossipd/gossip_store.c @@ -1,7 +1,7 @@ #include "gossip_store.h" #include -#include +#include #include #include #include diff --git a/tests/test_gossip.py b/tests/test_gossip.py index 867a44693..211ffe81b 100644 --- a/tests/test_gossip.py +++ b/tests/test_gossip.py @@ -861,24 +861,24 @@ def test_gossip_store_load(node_factory): """Make sure we can read canned gossip store""" l1 = node_factory.get_node(start=False) with open(os.path.join(l1.daemon.lightning_dir, 'gossip_store'), 'wb') as f: - f.write(bytearray.fromhex("06" # GOSSIP_STORE_VERSION + f.write(bytearray.fromhex("07" # GOSSIP_STORE_VERSION "000001b0" # len - "dc5bef89" # csum + "fea676e8" # csum "5b8d9b44" # timestamp "0100" # WIRE_CHANNEL_ANNOUNCEMENT "bb8d7b6998cca3c2b3ce12a6bd73a8872c808bb48de2a30c5ad9cdf835905d1e27505755087e675fb517bbac6beb227629b694ea68f49d357458327138978ebfd7adfde1c69d0d2f497154256f6d5567a5cf2317c589e0046c0cc2b3e986cf9b6d3b44742bd57bce32d72cd1180a7f657795976130b20508b239976d3d4cdc4d0d6e6fbb9ab6471f664a662972e406f519eab8bce87a8c0365646df5acbc04c91540b4c7c518cec680a4a6af14dae1aca0fd5525220f7f0e96fcd2adef3c803ac9427fe71034b55a50536638820ef21903d09ccddd38396675b598587fa886ca711415c813fc6d69f46552b9a0a539c18f265debd0e2e286980a118ba349c216000043497fd7f826957108f4a30fd9cec3aeba79972084e90ead01ea33090000000013a63c0000b50001021bf3de4e84e3d52f9a3e36fbdcd2c4e8dbf203b9ce4fc07c2f03be6c21d0c67503f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d203801fd8ab98032f11cc9e4916dd940417082727077609d5c7f8cc6e9a3ad25dd102517164b97ab46cee3826160841a36c46a2b7b9c74da37bdc070ed41ba172033a" "0000000a" # len - "7a0168df" # csum + "99dc98b4" # csum "00000000" # timestamp "1005" # WIRE_GOSSIP_STORE_CHANNEL_AMOUNT "0000000001000000" "00000082" # len - "389dc73e" # csum + "fd421aeb" # csum "5b8d9b44" # timestamp "0102" # WIRE_CHANNEL_UPDATE "1ea7c2eadf8a29eb8690511a519b5656e29aa0a853771c4e38e65c5abf43d907295a915e69e451f4c7a0c3dc13dd943cfbe3ae88c0b96667cd7d58955dbfedcf43497fd7f826957108f4a30fd9cec3aeba79972084e90ead01ea33090000000013a63c0000b500015b8d9b440000009000000000000003e8000003e800000001" "00000095" # len - "ba5693e3" # csum + "f036515e" # csum "5aab817c" # timestamp "0101" # WIRE_NODE_ANNOUNCEMENT "cf5d870bc7ecabcb7cd16898ef66891e5f0c6c5851bd85b670f03d325bc44d7544d367cd852e18ec03f7f4ff369b06860a3b12b07b29f36fb318ca11348bf8ec00005aab817c03f113414ebdc6c1fb0f33c99cd5a1d09dd79e7fdf2468cf1fe1af6674361695d23974b250757a7a6c6549544300000000000000000000000000000000000000000000000007010566933e2607"))