* [PATCH] crypto: sha1-mb - remove HASH_FIRST flag
@ 2018-01-25 3:10 Eric Biggers
2018-01-25 21:58 ` Tim Chen
2018-02-15 15:42 ` Herbert Xu
0 siblings, 2 replies; 5+ messages in thread
From: Eric Biggers @ 2018-01-25 3:10 UTC (permalink / raw)
To: linux-crypto, Herbert Xu; +Cc: David S . Miller, Tim Chen, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
The HASH_FIRST flag is never set. Remove it.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
arch/x86/crypto/sha1-mb/sha1_mb.c | 28 +++-------------------------
arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 8 +++-----
2 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
index acf9fdf01671..e17655ffde79 100644
--- a/arch/x86/crypto/sha1-mb/sha1_mb.c
+++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
@@ -106,13 +106,6 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)
static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)
(struct sha1_mb_mgr *state);
-static inline void sha1_init_digest(uint32_t *digest)
-{
- static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
- SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
- memcpy(digest, initial_digest, sizeof(initial_digest));
-}
-
static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
uint64_t total_len)
{
@@ -244,11 +237,8 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
uint32_t len,
int flags)
{
- if (flags & (~HASH_ENTIRE)) {
- /*
- * User should not pass anything other than FIRST, UPDATE, or
- * LAST
- */
+ if (flags & ~(HASH_UPDATE | HASH_LAST)) {
+ /* User should not pass anything other than UPDATE or LAST */
ctx->error = HASH_CTX_ERROR_INVALID_FLAGS;
return ctx;
}
@@ -259,24 +249,12 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
return ctx;
}
- if ((ctx->status & HASH_CTX_STS_COMPLETE) && !(flags & HASH_FIRST)) {
+ if (ctx->status & HASH_CTX_STS_COMPLETE) {
/* Cannot update a finished job. */
ctx->error = HASH_CTX_ERROR_ALREADY_COMPLETED;
return ctx;
}
-
- if (flags & HASH_FIRST) {
- /* Init digest */
- sha1_init_digest(ctx->job.result_digest);
-
- /* Reset byte counter */
- ctx->total_length = 0;
-
- /* Clear extra blocks */
- ctx->partial_block_buffer_length = 0;
- }
-
/*
* If we made it here, there were no errors during this call to
* submit
diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
index 13590ccf965c..9454bd16f9f8 100644
--- a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
+++ b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
@@ -57,11 +57,9 @@
#include "sha1_mb_mgr.h"
#define HASH_UPDATE 0x00
-#define HASH_FIRST 0x01
-#define HASH_LAST 0x02
-#define HASH_ENTIRE 0x03
-#define HASH_DONE 0x04
-#define HASH_FINAL 0x08
+#define HASH_LAST 0x01
+#define HASH_DONE 0x02
+#define HASH_FINAL 0x04
#define HASH_CTX_STS_IDLE 0x00
#define HASH_CTX_STS_PROCESSING 0x01
--
2.16.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] crypto: sha1-mb - remove HASH_FIRST flag
2018-01-25 3:10 [PATCH] crypto: sha1-mb - remove HASH_FIRST flag Eric Biggers
@ 2018-01-25 21:58 ` Tim Chen
2018-01-25 22:03 ` Eric Biggers
2018-02-15 15:42 ` Herbert Xu
1 sibling, 1 reply; 5+ messages in thread
From: Tim Chen @ 2018-01-25 21:58 UTC (permalink / raw)
To: Eric Biggers, linux-crypto, Herbert Xu
Cc: David S . Miller, Eric Biggers, Megha Dey
On 01/24/2018 07:10 PM, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> The HASH_FIRST flag is never set. Remove it.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> arch/x86/crypto/sha1-mb/sha1_mb.c | 28 +++-------------------------
> arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 8 +++-----
> 2 files changed, 6 insertions(+), 30 deletions(-)
>
> diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
> index acf9fdf01671..e17655ffde79 100644
> --- a/arch/x86/crypto/sha1-mb/sha1_mb.c
> +++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
> @@ -106,13 +106,6 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)
> static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)
> (struct sha1_mb_mgr *state);
>
> -static inline void sha1_init_digest(uint32_t *digest)
> -{
> - static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
> - SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
> - memcpy(digest, initial_digest, sizeof(initial_digest));
> -}
> -
> static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
> uint64_t total_len)
> {
> @@ -244,11 +237,8 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
> uint32_t len,
> int flags)
> {
> - if (flags & (~HASH_ENTIRE)) {
> - /*
> - * User should not pass anything other than FIRST, UPDATE, or
> - * LAST
> - */
> + if (flags & ~(HASH_UPDATE | HASH_LAST)) {
> + /* User should not pass anything other than UPDATE or LAST */
> ctx->error = HASH_CTX_ERROR_INVALID_FLAGS;
> return ctx;
> }
> @@ -259,24 +249,12 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
> return ctx;
> }
>
> - if ((ctx->status & HASH_CTX_STS_COMPLETE) && !(flags & HASH_FIRST)) {
> + if (ctx->status & HASH_CTX_STS_COMPLETE) {
> /* Cannot update a finished job. */
> ctx->error = HASH_CTX_ERROR_ALREADY_COMPLETED;
> return ctx;
> }
>
> -
> - if (flags & HASH_FIRST) {
> - /* Init digest */
> - sha1_init_digest(ctx->job.result_digest);
> -
> - /* Reset byte counter */
> - ctx->total_length = 0;
> -
> - /* Clear extra blocks */
> - ctx->partial_block_buffer_length = 0;
> - }
> -
I suppose this will be okay as we are really doing the initialization in
sha1_mb_init. Megha is now maintaining this code. Copying her
so she can do some verification of this change.
Tim
> /*
> * If we made it here, there were no errors during this call to
> * submit
> diff --git a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
> index 13590ccf965c..9454bd16f9f8 100644
> --- a/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
> +++ b/arch/x86/crypto/sha1-mb/sha1_mb_ctx.h
> @@ -57,11 +57,9 @@
> #include "sha1_mb_mgr.h"
>
> #define HASH_UPDATE 0x00
> -#define HASH_FIRST 0x01
> -#define HASH_LAST 0x02
> -#define HASH_ENTIRE 0x03
> -#define HASH_DONE 0x04
> -#define HASH_FINAL 0x08
> +#define HASH_LAST 0x01
> +#define HASH_DONE 0x02
> +#define HASH_FINAL 0x04
>
> #define HASH_CTX_STS_IDLE 0x00
> #define HASH_CTX_STS_PROCESSING 0x01
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] crypto: sha1-mb - remove HASH_FIRST flag
2018-01-25 21:58 ` Tim Chen
@ 2018-01-25 22:03 ` Eric Biggers
2018-01-30 1:09 ` Tim Chen
0 siblings, 1 reply; 5+ messages in thread
From: Eric Biggers @ 2018-01-25 22:03 UTC (permalink / raw)
To: Tim Chen
Cc: linux-crypto, Herbert Xu, David S . Miller, Eric Biggers,
Megha Dey
On Thu, Jan 25, 2018 at 01:58:38PM -0800, Tim Chen wrote:
> On 01/24/2018 07:10 PM, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> >
> > The HASH_FIRST flag is never set. Remove it.
> >
> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> > arch/x86/crypto/sha1-mb/sha1_mb.c | 28 +++-------------------------
> > arch/x86/crypto/sha1-mb/sha1_mb_ctx.h | 8 +++-----
> > 2 files changed, 6 insertions(+), 30 deletions(-)
> >
> > diff --git a/arch/x86/crypto/sha1-mb/sha1_mb.c b/arch/x86/crypto/sha1-mb/sha1_mb.c
> > index acf9fdf01671..e17655ffde79 100644
> > --- a/arch/x86/crypto/sha1-mb/sha1_mb.c
> > +++ b/arch/x86/crypto/sha1-mb/sha1_mb.c
> > @@ -106,13 +106,6 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)
> > static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)
> > (struct sha1_mb_mgr *state);
> >
> > -static inline void sha1_init_digest(uint32_t *digest)
> > -{
> > - static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
> > - SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
> > - memcpy(digest, initial_digest, sizeof(initial_digest));
> > -}
> > -
> > static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
> > uint64_t total_len)
> > {
> > @@ -244,11 +237,8 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
> > uint32_t len,
> > int flags)
> > {
> > - if (flags & (~HASH_ENTIRE)) {
> > - /*
> > - * User should not pass anything other than FIRST, UPDATE, or
> > - * LAST
> > - */
> > + if (flags & ~(HASH_UPDATE | HASH_LAST)) {
> > + /* User should not pass anything other than UPDATE or LAST */
> > ctx->error = HASH_CTX_ERROR_INVALID_FLAGS;
> > return ctx;
> > }
> > @@ -259,24 +249,12 @@ static struct sha1_hash_ctx *sha1_ctx_mgr_submit(struct sha1_ctx_mgr *mgr,
> > return ctx;
> > }
> >
> > - if ((ctx->status & HASH_CTX_STS_COMPLETE) && !(flags & HASH_FIRST)) {
> > + if (ctx->status & HASH_CTX_STS_COMPLETE) {
> > /* Cannot update a finished job. */
> > ctx->error = HASH_CTX_ERROR_ALREADY_COMPLETED;
> > return ctx;
> > }
> >
> > -
> > - if (flags & HASH_FIRST) {
> > - /* Init digest */
> > - sha1_init_digest(ctx->job.result_digest);
> > -
> > - /* Reset byte counter */
> > - ctx->total_length = 0;
> > -
> > - /* Clear extra blocks */
> > - ctx->partial_block_buffer_length = 0;
> > - }
> > -
>
> I suppose this will be okay as we are really doing the initialization in
> sha1_mb_init. Megha is now maintaining this code. Copying her
> so she can do some verification of this change.
>
Please update the MAINTAINERS file so that people know who to Cc on patches.
Eric
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] crypto: sha1-mb - remove HASH_FIRST flag
2018-01-25 22:03 ` Eric Biggers
@ 2018-01-30 1:09 ` Tim Chen
0 siblings, 0 replies; 5+ messages in thread
From: Tim Chen @ 2018-01-30 1:09 UTC (permalink / raw)
To: Eric Biggers
Cc: linux-crypto, Herbert Xu, David S . Miller, Eric Biggers,
Megha Dey
>>
>> I suppose this will be okay as we are really doing the initialization in
>> sha1_mb_init. Megha is now maintaining this code. Copying her
>> so she can do some verification of this change.
>>
>
> Please update the MAINTAINERS file so that people know who to Cc on patches.
>
> Eric
>
Herbert,
Can you pull in the patch below to update MAINTAINERS for sha multibuffer?
Tim
>From 884095fccd36d2de8c6edfe6f4d60ab4a1b9339b Mon Sep 17 00:00:00 2001
From: Tim Chen <tim.c.chen@linux.intel.com>
Date: Mon, 29 Jan 2018 09:22:41 -0800
Subject: [PATCH] x86/crypto: Designate maintainer for SHA-1/256/512
multibuffer driver
Even though I created the original implementation of SHA1 multibuffer
driver, Megha extended it to SHA256 and SHA512 and she is now maintaining
the code for SHA1/SHA256/SHA512 multi-buffer driver.
Add the entry in the MAINTAINERS file so any update patch can find
its way properly to Megha.
Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
---
MAINTAINERS | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2811a21..2085171 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7064,6 +7064,14 @@ L: linux-rdma@vger.kernel.org
S: Supported
F: drivers/infiniband/hw/i40iw/
+INTEL SHA MULTIBUFFER DRIVER
+M: Megha Dey <megha.dey@linux.intel.com>
+R: Tim Chen <tim.c.chen@linux.intel.com>
+L: linux-crypto@vger.kernel.org
+S: Supported
+F: arch/x86/crypto/sha*-mb
+F: crypto/mcryptd.c
+
INTEL TELEMETRY DRIVER
M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
L: platform-driver-x86@vger.kernel.org
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] crypto: sha1-mb - remove HASH_FIRST flag
2018-01-25 3:10 [PATCH] crypto: sha1-mb - remove HASH_FIRST flag Eric Biggers
2018-01-25 21:58 ` Tim Chen
@ 2018-02-15 15:42 ` Herbert Xu
1 sibling, 0 replies; 5+ messages in thread
From: Herbert Xu @ 2018-02-15 15:42 UTC (permalink / raw)
To: Eric Biggers; +Cc: linux-crypto, David S . Miller, Tim Chen, Eric Biggers
On Wed, Jan 24, 2018 at 07:10:08PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> The HASH_FIRST flag is never set. Remove it.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-15 15:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-25 3:10 [PATCH] crypto: sha1-mb - remove HASH_FIRST flag Eric Biggers
2018-01-25 21:58 ` Tim Chen
2018-01-25 22:03 ` Eric Biggers
2018-01-30 1:09 ` Tim Chen
2018-02-15 15:42 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).