Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp2253087pxb; Thu, 3 Feb 2022 02:46:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2QHhC8eyocrXqKy/PRwp9cvliMD3PqNcc8dHV09Jp33E94rE96tpEogHifWpT9cyH7Li7 X-Received: by 2002:a17:90b:2243:: with SMTP id hk3mr13158071pjb.181.1643885207821; Thu, 03 Feb 2022 02:46:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643885207; cv=none; d=google.com; s=arc-20160816; b=aPzRpgsnqdF0OOikIVbqK2n0um49ikoZoqnxIdA6Y5hp43BtS5Of7putQ95tn+wjVG Oy7is7v19zTVxq2mH7cV+8/bRSlQ2IM78qjMxNg0kqXIPKC38S6H4bQ6/soOJFaGBCm5 zIVSaQNTjKsiMc1Lvm74JxhDr91Q1Qq2tNPFrXbPok0i5OlQMos41f8yRGraOHuQGjL3 UKZqaXO6Lec4XiyRHLPVJO770qe99HQkR1qbSGojDFWlVsPT6S73tRhBFzjybE9QKFUC ld8Cf/dx1vzIqSR99Jdy2spnuUL+k2piImLMvGNokBWu3G6RbDOOxlAY9YC/g6+F7c0U /aEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gO2HHcwdGyTevXNR5OcTUBWkTY9YfvlBvRvxz6UzZ4I=; b=RSFCTBl07DPhd6EKLFjcxqm71SkFKuMcs5l+XRpUX94l0dFQzLCLIpUFx2Hx0RzPgY iXzGsR2Ue0BFIq3i3EM14vgnKwps4SWqr7ot7H8II9eux4Jh6FtPW6v70rM6/Lf9n9Dj RFwlg5vEzmOSckCSvx7vUQYi/LMFFGuLYsju6rR/DNUdP2HUqETO/se407t78OPG5/Z1 XZVPFmTKy67Amvvh0+HfQ9Oa1ITCxLJ3qiKr/thgwumyacv3oYY1I6EgTpLT4ZDiKGdQ YyCn5s1kUkhqhfbFVu0a2RWVPb6gCEes8DGyNWaqU+reUHB2GQb+7VIMZwTkAbr7dVcb H3Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hlE6jUFX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g10si21656485pgc.517.2022.02.03.02.46.35; Thu, 03 Feb 2022 02:46:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hlE6jUFX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242259AbiBATBk (ORCPT + 99 others); Tue, 1 Feb 2022 14:01:40 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:40942 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242236AbiBATBh (ORCPT ); Tue, 1 Feb 2022 14:01:37 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4A5C5B82F74; Tue, 1 Feb 2022 19:01:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEDE6C340ED; Tue, 1 Feb 2022 19:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643742095; bh=cwL3Yb4NVpj+ob2OmpLnPEK7lctKEkyo+6WsvIqLm5s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hlE6jUFXela4nAgKZuQVJve3sMcSgy6npH2+MSEYxrOtxTjEW+utcSCOEcrnnzq/r 7KUUUNWSNqaPMF9qFCmtay/jZINrNbLQtsaqqx7/r13h1nl1sA0JnDxos3WLfs99bX v8/Wsse/9U+hsLTfUZQt0WVZSdFzIV6AdXHMc6Y2HkyjsAmf9+mDSz8KMs+MBYYCB7 Kuo768495Rp1NO1l39QSAJv8MAQwvoAXUCfZHqNxs+rePcRDACMpE6MPF2wAxX9aZF mxA2iW+a/jOuzJOMbXdVgcoNRuIjxWrxYjzh4u51RDkAgJiNlebfXULalhS/Ip7Ehe aWKyYT7duIX7g== From: Keith Busch To: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: axboe@kernel.dk, hch@lst.de, martin.petersen@oracle.com, colyli@suse.de, Keith Busch , Eric Biggers Subject: [PATCHv2 3/7] lib: add rocksoft model crc64 Date: Tue, 1 Feb 2022 11:01:24 -0800 Message-Id: <20220201190128.3075065-4-kbusch@kernel.org> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20220201190128.3075065-1-kbusch@kernel.org> References: <20220201190128.3075065-1-kbusch@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The NVM Express specification extended data integrity fields to 64 bits using the Rocksoft^TM parameters. Add the poly to the crc64 table generation, and provide a library routine implementing the algorithm. The Rocksoft 64-bit CRC model parameters are as follows: Poly: 0xAD93D23594C93659 Initial value: 0xFFFFFFFFFFFFFFFF Reflected Input: True Reflected Output: True Xor Final: 0xFFFFFFFFFFFFFFFF Since this model used reflected bits, the implementation generates the reflected table so the result is ordered consistently. Cc: Eric Biggers Signed-off-by: Keith Busch --- v1->v2: Generate a reflected table for the polynomial so that the inputs and outputs don't need to be reflected during calculating the CRC include/linux/crc64.h | 2 ++ lib/crc64.c | 26 ++++++++++++++++++++++ lib/gen_crc64table.c | 51 +++++++++++++++++++++++++++++++++---------- 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/include/linux/crc64.h b/include/linux/crc64.h index c756e65a1b58..9f2f20216503 100644 --- a/include/linux/crc64.h +++ b/include/linux/crc64.h @@ -8,4 +8,6 @@ #include u64 __pure crc64_be(u64 crc, const void *p, size_t len); +u64 __pure crc64_rocksoft(u64 crc, const void *p, size_t len); + #endif /* _LINUX_CRC64_H */ diff --git a/lib/crc64.c b/lib/crc64.c index 9f852a89ee2a..e223e72be44d 100644 --- a/lib/crc64.c +++ b/lib/crc64.c @@ -22,6 +22,13 @@ * x^24 + x^23 + x^22 + x^21 + x^19 + x^17 + x^13 + x^12 + x^10 + x^9 + * x^7 + x^4 + x + 1 * + * crc64rocksoft[256] table is from the Rocksoft specification polynomial + * defined as, + * + * x^64 + x^63 + x^61 + x^59 + x^58 + x^56 + x^55 + x^52 + x^49 + x^48 + x^47 + + * x^46 + x^44 + x^41 + x^37 + x^36 + x^34 + x^32 + x^31 + x^28 + x^26 + x^23 + + * x^22 + x^19 + x^16 + x^13 + x^12 + x^10 + x^9 + x^6 + x^4 + x^3 + 1 + * * Copyright 2018 SUSE Linux. * Author: Coly Li */ @@ -55,3 +62,22 @@ u64 __pure crc64_be(u64 crc, const void *p, size_t len) return crc; } EXPORT_SYMBOL_GPL(crc64_be); + +/** + * crc64_rocksoft - Calculate bitwise Rocksoft CRC64 + * @crc: seed value for computation. (u64)~0 for a new CRC calculation, or the + * previous crc64 value if computing incrementally. + * @p: pointer to buffer over which CRC64 is run + * @len: length of buffer @p + */ +u64 __pure crc64_rocksoft(u64 crc, const void *p, size_t len) +{ + const unsigned char *_p = p; + size_t i; + + for (i = 0; i < len; i++) + crc = (crc >> 8) ^ crc64rocksofttable[(crc & 0xff) ^ *_p++]; + + return crc ^ (u64)~0; +} +EXPORT_SYMBOL_GPL(crc64_rocksoft); diff --git a/lib/gen_crc64table.c b/lib/gen_crc64table.c index 094b43aef8db..55e222acd0b8 100644 --- a/lib/gen_crc64table.c +++ b/lib/gen_crc64table.c @@ -17,10 +17,30 @@ #include #define CRC64_ECMA182_POLY 0x42F0E1EBA9EA3693ULL +#define CRC64_ROCKSOFT_POLY 0x9A6C9329AC4BC9B5ULL static uint64_t crc64_table[256] = {0}; +static uint64_t crc64_rocksoft_table[256] = {0}; -static void generate_crc64_table(void) +static void generate_reflected_crc64_table(uint64_t table[256], uint64_t poly) +{ + uint64_t i, j, c, crc; + + for (i = 0; i < 256; i++) { + crc = 0ULL; + c = i; + + for (j = 0; j < 8; j++) { + if ((crc ^ (c >> j)) & 1) + crc = (crc >> 1) ^ poly; + else + crc >>= 1; + } + table[i] = crc; + } +} + +static void generate_crc64_table(uint64_t table[256], uint64_t poly) { uint64_t i, j, c, crc; @@ -30,26 +50,22 @@ static void generate_crc64_table(void) for (j = 0; j < 8; j++) { if ((crc ^ c) & 0x8000000000000000ULL) - crc = (crc << 1) ^ CRC64_ECMA182_POLY; + crc = (crc << 1) ^ poly; else crc <<= 1; c <<= 1; } - crc64_table[i] = crc; + table[i] = crc; } } -static void print_crc64_table(void) +static void output_table(uint64_t table[256]) { int i; - printf("/* this file is generated - do not edit */\n\n"); - printf("#include \n"); - printf("#include \n\n"); - printf("static const u64 ____cacheline_aligned crc64table[256] = {\n"); for (i = 0; i < 256; i++) { - printf("\t0x%016" PRIx64 "ULL", crc64_table[i]); + printf("\t0x%016" PRIx64 "ULL", table[i]); if (i & 0x1) printf(",\n"); else @@ -58,9 +74,22 @@ static void print_crc64_table(void) printf("};\n"); } +static void print_crc64_tables(void) +{ + printf("/* this file is generated - do not edit */\n\n"); + printf("#include \n"); + printf("#include \n\n"); + printf("static const u64 ____cacheline_aligned crc64table[256] = {\n"); + output_table(crc64_table); + + printf("\nstatic const u64 ____cacheline_aligned crc64rocksofttable[256] = {\n"); + output_table(crc64_rocksoft_table); +} + int main(int argc, char *argv[]) { - generate_crc64_table(); - print_crc64_table(); + generate_crc64_table(crc64_table, CRC64_ECMA182_POLY); + generate_reflected_crc64_table(crc64_rocksoft_table, CRC64_ROCKSOFT_POLY); + print_crc64_tables(); return 0; } -- 2.25.4