From: Akinobu Mita Subject: Re: [PATCH v3 2/5] lib: introduce crc_t10dif_update() Date: Wed, 29 Apr 2015 09:39:17 +0900 Message-ID: References: <1429972410-7146-1-git-send-email-akinobu.mita@gmail.com> <1429972410-7146-3-git-send-email-akinobu.mita@gmail.com> <1430242716.660.70.camel@schen9-desk2.jf.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" To: Tim Chen Return-path: In-Reply-To: <1430242716.660.70.camel@schen9-desk2.jf.intel.com> Sender: target-devel-owner@vger.kernel.org List-Id: linux-crypto.vger.kernel.org 2015-04-29 2:38 GMT+09:00 Tim Chen : > 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: Looks good. I'll take this code. > 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); > > > Thanks. > > Tim >