From patchwork Tue Apr 28 17:38:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Chen X-Patchwork-Id: 6291201 Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70E3DBEEE1 for ; Tue, 28 Apr 2015 17:38:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 71A572024F for ; Tue, 28 Apr 2015 17:38:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1905F2024C for ; Tue, 28 Apr 2015 17:38:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030407AbbD1Rii (ORCPT ); Tue, 28 Apr 2015 13:38:38 -0400 Received: from mga11.intel.com ([192.55.52.93]:15815 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030455AbbD1Rii (ORCPT ); Tue, 28 Apr 2015 13:38:38 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 28 Apr 2015 10:38:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,665,1422950400"; d="scan'208";a="563197840" Received: from schen9-desk2.jf.intel.com (HELO [10.7.198.78]) ([10.7.198.78]) by orsmga003.jf.intel.com with ESMTP; 28 Apr 2015 10:38:36 -0700 Message-ID: <1430242716.660.70.camel@schen9-desk2.jf.intel.com> Subject: Re: [PATCH v3 2/5] lib: introduce crc_t10dif_update() From: Tim Chen To: Akinobu Mita Cc: target-devel@vger.kernel.org, Herbert Xu , "David S. Miller" , linux-crypto@vger.kernel.org, Nicholas Bellinger , Sagi Grimberg , "Martin K. Petersen" , Christoph Hellwig , "James E.J. Bottomley" Date: Tue, 28 Apr 2015 10:38:36 -0700 In-Reply-To: <1429972410-7146-3-git-send-email-akinobu.mita@gmail.com> References: <1429972410-7146-1-git-send-email-akinobu.mita@gmail.com> <1429972410-7146-3-git-send-email-akinobu.mita@gmail.com> X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) Mime-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Sat, 2015-04-25 at 23:33 +0900, Akinobu Mita wrote: > This introduces crc_t10dif_update() which enables to calculate CRC > for a block which straddles multiple SG elements by calling multiple > times. > > Signed-off-by: Akinobu Mita > Cc: Tim Chen > Cc: Herbert Xu > Cc: "David S. Miller" > Cc: linux-crypto@vger.kernel.org > Cc: Nicholas Bellinger > Cc: Sagi Grimberg > Cc: "Martin K. Petersen" > Cc: Christoph Hellwig > Cc: "James E.J. Bottomley" > Cc: target-devel@vger.kernel.org > --- > * New patch from v3 > > include/linux/crc-t10dif.h | 1 + > lib/crc-t10dif.c | 23 +++++++++++++++++++++++ > 2 files changed, 24 insertions(+) > > diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h > index cf53d07..d81961e 100644 > --- a/include/linux/crc-t10dif.h > +++ b/include/linux/crc-t10dif.h > @@ -9,5 +9,6 @@ > extern __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, > size_t len); > extern __u16 crc_t10dif(unsigned char const *, size_t); > +extern __u16 crc_t10dif_update(__u16 crc, unsigned char const *, size_t); > > #endif > diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c > index dfe6ec1..7cdbe2e 100644 > --- a/lib/crc-t10dif.c > +++ b/lib/crc-t10dif.c > @@ -19,6 +19,29 @@ > static struct crypto_shash *crct10dif_tfm; > static struct static_key crct10dif_fallback __read_mostly; > > +__u16 crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len) > +{ > + struct { > + struct shash_desc shash; > + char ctx[2]; > + } desc; > + int err; > + > + if (static_key_false(&crct10dif_fallback)) > + return crc_t10dif_generic(crc, buffer, len); > + > + desc.shash.tfm = crct10dif_tfm; > + desc.shash.flags = 0; > + > + err = crypto_shash_import(&desc.shash, &crc); > + BUG_ON(err); > + err = crypto_shash_update(&desc.shash, buffer, len); > + BUG_ON(err); > + > + return *(__u16 *)desc.ctx; > +} > +EXPORT_SYMBOL(crc_t10dif_update); > + > __u16 crc_t10dif(const unsigned char *buffer, size_t len) > { > struct { There are a lot of duplicated code between crc_t10dif_update and crc_t10dif. The only difference is for the update function we import the crc value. I will prefer that we consolidate the code into a local inline function that crc_t10dif_update and crc_t10dif invoke to get rid of all the duplication. Probably something like: Thanks. Tim --- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c index dfe6ec1..0248f78 100644 --- a/lib/crc-t10dif.c +++ b/lib/crc-t10dif.c @@ -19,7 +19,7 @@ static struct crypto_shash *crct10dif_tfm; static struct static_key crct10dif_fallback __read_mostly; -__u16 crc_t10dif(const unsigned char *buffer, size_t len) +static inline __u16 __crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len, bool update) { struct { struct shash_desc shash; @@ -28,17 +28,33 @@ __u16 crc_t10dif(const unsigned char *buffer, size_t len) int err; if (static_key_false(&crct10dif_fallback)) - return crc_t10dif_generic(0, buffer, len); + return crc_t10dif_generic(crc, buffer, len); desc.shash.tfm = crct10dif_tfm; desc.shash.flags = 0; - *(__u16 *)desc.ctx = 0; + + if (update) { + err = crypto_shash_import(&desc.shash, &crc); + BUG_ON(err); + } else + *(__u16 *)desc.ctx = 0; err = crypto_shash_update(&desc.shash, buffer, len); BUG_ON(err); return *(__u16 *)desc.ctx; } + +__u16 crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len) +{ + return __crc_t10dif_update(crc, buffer, len, true); +} +EXPORT_SYMBOL(crc_t10dif_update); + +__u16 crc_t10dif(const unsigned char *buffer, size_t len) +{ + return __crc_t10dif_update(0, buffer, len, false); +} EXPORT_SYMBOL(crc_t10dif);