diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2015-05-01 02:23:50 -0400 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-05-31 01:42:24 -0400 |
| commit | 10081fb532a2a2216b7d8e4ad585c985075b6f60 (patch) | |
| tree | dd411d2d81331e2ac002c5d5389d2cd3bb201389 | |
| parent | 5835812f13e56483f2c4907664bb43b0a78546b6 (diff) | |
lib: introduce crc_t10dif_update()
This introduces crc_t10dif_update() which enables to calculate CRC
for a block which straddles multiple SG elements by calling multiple
times. This also converts crc_t10dif() to use crc_t10dif_update() as
they are almost same.
(remove extra function call in crc_t10dif() and crc_t10dif_update -
Tim + Herbert)
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: target-devel@vger.kernel.org
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
| -rw-r--r-- | include/linux/crc-t10dif.h | 1 | ||||
| -rw-r--r-- | lib/crc-t10dif.c | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/crc-t10dif.h b/include/linux/crc-t10dif.h index cf53d0773ce3..d81961e9e37d 100644 --- a/include/linux/crc-t10dif.h +++ b/include/linux/crc-t10dif.h | |||
| @@ -9,5 +9,6 @@ | |||
| 9 | extern __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, | 9 | extern __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, |
| 10 | size_t len); | 10 | size_t len); |
| 11 | extern __u16 crc_t10dif(unsigned char const *, size_t); | 11 | extern __u16 crc_t10dif(unsigned char const *, size_t); |
| 12 | extern __u16 crc_t10dif_update(__u16 crc, unsigned char const *, size_t); | ||
| 12 | 13 | ||
| 13 | #endif | 14 | #endif |
diff --git a/lib/crc-t10dif.c b/lib/crc-t10dif.c index dfe6ec17c0a5..1ad33e555805 100644 --- a/lib/crc-t10dif.c +++ b/lib/crc-t10dif.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | static struct crypto_shash *crct10dif_tfm; | 19 | static struct crypto_shash *crct10dif_tfm; |
| 20 | static struct static_key crct10dif_fallback __read_mostly; | 20 | static struct static_key crct10dif_fallback __read_mostly; |
| 21 | 21 | ||
| 22 | __u16 crc_t10dif(const unsigned char *buffer, size_t len) | 22 | __u16 crc_t10dif_update(__u16 crc, const unsigned char *buffer, size_t len) |
| 23 | { | 23 | { |
| 24 | struct { | 24 | struct { |
| 25 | struct shash_desc shash; | 25 | struct shash_desc shash; |
| @@ -28,17 +28,23 @@ __u16 crc_t10dif(const unsigned char *buffer, size_t len) | |||
| 28 | int err; | 28 | int err; |
| 29 | 29 | ||
| 30 | if (static_key_false(&crct10dif_fallback)) | 30 | if (static_key_false(&crct10dif_fallback)) |
| 31 | return crc_t10dif_generic(0, buffer, len); | 31 | return crc_t10dif_generic(crc, buffer, len); |
| 32 | 32 | ||
| 33 | desc.shash.tfm = crct10dif_tfm; | 33 | desc.shash.tfm = crct10dif_tfm; |
| 34 | desc.shash.flags = 0; | 34 | desc.shash.flags = 0; |
| 35 | *(__u16 *)desc.ctx = 0; | 35 | *(__u16 *)desc.ctx = crc; |
| 36 | 36 | ||
| 37 | err = crypto_shash_update(&desc.shash, buffer, len); | 37 | err = crypto_shash_update(&desc.shash, buffer, len); |
| 38 | BUG_ON(err); | 38 | BUG_ON(err); |
| 39 | 39 | ||
| 40 | return *(__u16 *)desc.ctx; | 40 | return *(__u16 *)desc.ctx; |
| 41 | } | 41 | } |
| 42 | EXPORT_SYMBOL(crc_t10dif_update); | ||
| 43 | |||
| 44 | __u16 crc_t10dif(const unsigned char *buffer, size_t len) | ||
| 45 | { | ||
| 46 | return crc_t10dif_update(0, buffer, len); | ||
| 47 | } | ||
| 42 | EXPORT_SYMBOL(crc_t10dif); | 48 | EXPORT_SYMBOL(crc_t10dif); |
| 43 | 49 | ||
| 44 | static int __init crc_t10dif_mod_init(void) | 50 | static int __init crc_t10dif_mod_init(void) |
