Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1432642

Re: [PATCH 2/2] crypto: tcrypt: Fix linkage error on ARM on division of s64

Show all headers | View raw

On Tue, Jun 28, 2016 at 09:23:07AM +0200, Krzysztof Kozlowski wrote:
> gcc 4.7.3 for ARM on Ubuntu couldn't link tcrypt module because of
> division of s64:
> 	ERROR: "__aeabi_ldivmod" [crypto/tcrypt.ko] undefined!
> 
> Fixes: 087bcd225c56 ("crypto: tcrypt - Add speed tests for SHA multibuffer algorithms")
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

I'd prefer to be consistent here and just use unsigned long like
every other speed test in tcrypt.  This code has some serious
issues, such as not waiting for completion in case of an error.

Let me try to fix them up.

Thanks!

---8<---
Subject: crypto: tcrypt - Use unsigned long for mb ahash cycle counter

For the timescales we are working against there is no need to
go beyond unsigned long.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 2f84583..1537a1c 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -415,7 +415,7 @@ char result[8][64];
 struct ahash_request *req[8];
 struct tcrypt_result tresult[8];
 char *xbuf[8][XBUFSIZE];
-cycles_t start[8], end[8], mid;
+unsigned long start[8], end[8], mid;
 
 static void test_mb_ahash_speed(const char *algo, unsigned int sec,
 					struct hash_speed *speed)
@@ -424,6 +424,7 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,
 	void *hash_buff;
 	int ret = -ENOMEM;
 	struct crypto_ahash *tfm;
+	unsigned long cycles;
 
 	tfm = crypto_alloc_ahash(algo, 0, 0);
 	if (IS_ERR(tfm)) {
@@ -498,10 +499,9 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,
 			end[k] = get_cycles();
 		}
 
-		printk("\nBlock: %lld cycles (%lld cycles/byte), %d bytes\n",
-			(s64) (end[7]-start[0])/1,
-			(s64) (end[7]-start[0])/(8*speed[i].blen),
-			8*speed[i].blen);
+		cycles = end[7] - start[0];
+		printk("\nBlock: %6lu cycles (%4lu cycles/byte)\n",
+		       cycles, cycles / (8 * speed[i].blen));
 	}
 	ret = 0;
 
-- 
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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] crypto: tcrypt: Fix mixing printk/pr_err and obvious  indentation issues Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-28 09:30 +0200
  [PATCH 2/2] crypto: tcrypt: Fix linkage error on ARM on division of s64 Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-28 09:30 +0200
    Re: [PATCH 2/2] crypto: tcrypt: Fix linkage error on ARM on division  of s64 Herbert Xu <herbert@gondor.apana.org.au> - 2016-06-28 10:50 +0200
      Re: [PATCH 2/2] crypto: tcrypt: Fix linkage error on ARM on division  of s64 Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-28 10:50 +0200
        crypto: tcrypt - Fix memory leaks/crashes in multibuffer hash speed  test Herbert Xu <herbert@gondor.apana.org.au> - 2016-06-28 12:00 +0200
          Re: crypto: tcrypt - Fix memory leaks/crashes in multibuffer hash  speed test Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-28 13:20 +0200
            [PATCH v2] crypto: tcrypt - Fix memory leaks/crashes in multibuffer  hash speed test Herbert Xu <herbert@gondor.apana.org.au> - 2016-06-28 14:40 +0200
              Re: [PATCH v2] crypto: tcrypt - Fix memory leaks/crashes in  multibuffer hash speed test Herbert Xu <herbert@gondor.apana.org.au> - 2016-06-29 10:20 +0200
                Re: [PATCH v2] crypto: tcrypt - Fix memory leaks/crashes in  multibuffer hash speed test Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-29 10:30 +0200
                Re: [PATCH v2] crypto: tcrypt - Fix memory leaks/crashes in  multibuffer hash speed test Megha Dey <megha.dey@linux.intel.com> - 2016-06-29 19:50 +0200
                crypto: tcrypt - Do not bail on EINPROGRESS in multibuffer hash test Herbert Xu <herbert@gondor.apana.org.au> - 2016-06-30 05:10 +0200
                Re: crypto: tcrypt - Do not bail on EINPROGRESS in multibuffer hash  test Megha Dey <megha.dey@linux.intel.com> - 2016-06-30 19:40 +0200
              Re: [PATCH v2] crypto: tcrypt - Fix memory leaks/crashes in  multibuffer hash speed test Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-29 10:20 +0200
  Re: [PATCH 1/2] crypto: tcrypt: Fix mixing printk/pr_err and obvious  indentation issues Herbert Xu <herbert@gondor.apana.org.au> - 2016-06-28 10:40 +0200

csiph-web