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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 188C3C433F5 for ; Thu, 10 Mar 2022 15:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241941AbiCJPlM (ORCPT ); Thu, 10 Mar 2022 10:41:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237833AbiCJPlG (ORCPT ); Thu, 10 Mar 2022 10:41:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEC74182D89; Thu, 10 Mar 2022 07:40:04 -0800 (PST) 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 9676AB81FE1; Thu, 10 Mar 2022 15:40:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0164C340F4; Thu, 10 Mar 2022 15:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646926802; bh=cahBW4asS7o8MJX61wLf9y+Vbrl7xpiX2UzUluQj068=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bV6P7OEKz9RqdRT5K1aiRe0ithJo1T4P2oAHJa/2szOqFfjjMr+IV+Wu54dzoRCHb Ol5TE6ygAHhNT8vCpk7kQqrPbdNbiF2P7JexDmKAhy/G81s7PgGyGdVcbQYqmjFSBQ m3I8G2j6F/95D1/4f7dUCcJ3zk85IrsH6I76tfVJms6vNuPSePkjF1YSNK7E3twKnM JcBmhkrL4VZu07r/8y+n+csGTnLd/fmMOEzMIZkDXpnWEo5ckiuHibMRN2s0qD4hGG /3JXwueNtGLsJqCh5r+zplsUxmvr8GIOwusVHyIeTa8IcrEGy4m9X7Fa8/wIKOT4M8 tmy7HfBg2SiMQ== Date: Thu, 10 Mar 2022 07:39:59 -0800 From: Keith Busch To: Eric Biggers Cc: Vasily Gorbik , linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@kernel.dk, hch@lst.de, martin.petersen@oracle.com, Herbert Xu Subject: Re: [PATCHv4 6/8] crypto: add rocksoft 64b crc guard tag framework Message-ID: <20220310153959.GB329710@dhcp-10-100-145-180.wdc.com> References: <20220303201312.3255347-1-kbusch@kernel.org> <20220303201312.3255347-7-kbusch@kernel.org> <20220308202747.GA3502158@dhcp-10-100-145-180.wdc.com> <20220309193126.GA3950874@dhcp-10-100-145-180.wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 09, 2022 at 07:49:07PM +0000, Eric Biggers wrote: > The issue is that every other "shash" algorithm besides crct10dif, including > crc32 and crc32c, follow the convention of treating the digest as bytes. Doing > otherwise is unusual for the crypto API. So I have a slight preference for > treating it as bytes. Perhaps see what Herbert Xu (maintainer of the crypto > API, Cc'ed) recommends? I'm okay either way, they're both simple enough. Here is an update atop this series to match the other shash conventions if this is preferred over my previous fix: --- diff --git a/block/t10-pi.c b/block/t10-pi.c index 914d8cddd43a..f9eb45571bc7 100644 --- a/block/t10-pi.c +++ b/block/t10-pi.c @@ -282,7 +282,7 @@ EXPORT_SYMBOL(t10_pi_type3_ip); static __be64 ext_pi_crc64(void *data, unsigned int len) { - return cpu_to_be64(crc64_rocksoft(data, len)); + return cpu_to_be64(le64_to_cpu(crc64_rocksoft(data, len))); } static blk_status_t ext_pi_crc64_generate(struct blk_integrity_iter *iter, diff --git a/crypto/testmgr.h b/crypto/testmgr.h index f1a22794c404..f9e5f601c657 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -3686,11 +3686,11 @@ static const struct hash_testvec crc64_rocksoft_tv_template[] = { { .plaintext = zeroes, .psize = 4096, - .digest = (u8 *)(u64[]){ 0x6482d367eb22b64eull }, + .digest = "\x4e\xb6\x22\xeb\x67\xd3\x82\x64", }, { .plaintext = ones, .psize = 4096, - .digest = (u8 *)(u64[]){ 0xc0ddba7302eca3acull }, + .digest = "\xac\xa3\xec\x02\x73\xba\xdd\xc0", } }; diff --git a/include/linux/crc64.h b/include/linux/crc64.h index e044c60d1e61..5319f9a9fc19 100644 --- a/include/linux/crc64.h +++ b/include/linux/crc64.h @@ -12,7 +12,7 @@ u64 __pure crc64_be(u64 crc, const void *p, size_t len); u64 __pure crc64_rocksoft_generic(u64 crc, const void *p, size_t len); -u64 crc64_rocksoft(const unsigned char *buffer, size_t len); -u64 crc64_rocksoft_update(u64 crc, const unsigned char *buffer, size_t len); +__le64 crc64_rocksoft(const unsigned char *buffer, size_t len); +__le64 crc64_rocksoft_update(u64 crc, const unsigned char *buffer, size_t len); #endif /* _LINUX_CRC64_H */ diff --git a/lib/crc64-rocksoft.c b/lib/crc64-rocksoft.c index fc9ae0da5df7..215acb79a15d 100644 --- a/lib/crc64-rocksoft.c +++ b/lib/crc64-rocksoft.c @@ -54,16 +54,16 @@ static struct notifier_block crc64_rocksoft_nb = { .notifier_call = crc64_rocksoft_notify, }; -u64 crc64_rocksoft_update(u64 crc, const unsigned char *buffer, size_t len) +__le64 crc64_rocksoft_update(u64 crc, const unsigned char *buffer, size_t len) { struct { struct shash_desc shash; - u64 crc; + __le64 crc; } desc; int err; if (static_branch_unlikely(&crc64_rocksoft_fallback)) - return crc64_rocksoft_generic(crc, buffer, len); + return cpu_to_le64(crc64_rocksoft_generic(crc, buffer, len)); rcu_read_lock(); desc.shash.tfm = rcu_dereference(crc64_rocksoft_tfm); @@ -77,7 +77,7 @@ u64 crc64_rocksoft_update(u64 crc, const unsigned char *buffer, size_t len) } EXPORT_SYMBOL_GPL(crc64_rocksoft_update); -u64 crc64_rocksoft(const unsigned char *buffer, size_t len) +__le64 crc64_rocksoft(const unsigned char *buffer, size_t len) { return crc64_rocksoft_update(0, buffer, len); } --