Commit 626ddb2f authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: powerpc - convert to use crypto_simd_usable() 



Replace all calls to in_interrupt() in the PowerPC crypto code with
!crypto_simd_usable().  This causes the crypto self-tests to test the
no-SIMD code paths when CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y.

The p8_ghash algorithm is currently failing and needs to be fixed, as it
produces the wrong digest when no-SIMD updates are mixed with SIMD ones.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0edf8593

arch/powerpc/crypto/crc32c-vpmsum_glue.c

+3 −1
Original line number Diff line number Diff line 
#include <linux/crc32.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/cpufeature.h>

#include <asm/simd.h>

#include <asm/switch_to.h>



#define CHKSUM_BLOCK_SIZE	1
@@ -22,7 +24,7 @@ static u32 crc32c_vpmsum(u32 crc, unsigned char const *p, size_t len) 
	unsigned int prealign;

	unsigned int tail;



	if (len < (VECTOR_BREAKPOINT + VMX_ALIGN) || in_interrupt())

	if (len < (VECTOR_BREAKPOINT + VMX_ALIGN) || !crypto_simd_usable())

		return __crc32c_le(crc, p, len);



	if ((unsigned long)p & VMX_ALIGN_MASK) {

arch/powerpc/crypto/crct10dif-vpmsum_glue.c

+3 −1
Original line number Diff line number Diff line
@@ -12,11 +12,13 @@ 


#include <linux/crc-t10dif.h>

#include <crypto/internal/hash.h>

#include <crypto/internal/simd.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/cpufeature.h>

#include <asm/simd.h>

#include <asm/switch_to.h>



#define VMX_ALIGN		16
@@ -32,7 +34,7 @@ static u16 crct10dif_vpmsum(u16 crci, unsigned char const *p, size_t len) 
	unsigned int tail;

	u32 crc = crci;



	if (len < (VECTOR_BREAKPOINT + VMX_ALIGN) || in_interrupt())

	if (len < (VECTOR_BREAKPOINT + VMX_ALIGN) || !crypto_simd_usable())

		return crc_t10dif_generic(crc, p, len);



	if ((unsigned long)p & VMX_ALIGN_MASK) {

arch/powerpc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ generic-y += preempt.h 
generic-y += rwsem.h

generic-y += vtime.h

generic-y += msi.h

generic-y += simd.h

drivers/crypto/vmx/aes.c

+4 −3
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ 
#include <linux/err.h>

#include <linux/crypto.h>

#include <linux/delay.h>

#include <linux/hardirq.h>

#include <asm/simd.h>

#include <asm/switch_to.h>

#include <crypto/aes.h>

#include <crypto/internal/simd.h>



#include "aesp8-ppc.h"
@@ -92,7 +93,7 @@ static void p8_aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 
{

	struct p8_aes_ctx *ctx = crypto_tfm_ctx(tfm);



	if (in_interrupt()) {

	if (!crypto_simd_usable()) {

		crypto_cipher_encrypt_one(ctx->fallback, dst, src);

	} else {

		preempt_disable();
@@ -109,7 +110,7 @@ static void p8_aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 
{

	struct p8_aes_ctx *ctx = crypto_tfm_ctx(tfm);



	if (in_interrupt()) {

	if (!crypto_simd_usable()) {

		crypto_cipher_decrypt_one(ctx->fallback, dst, src);

	} else {

		preempt_disable();

drivers/crypto/vmx/aes_cbc.c

+4 −3
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ 
#include <linux/err.h>

#include <linux/crypto.h>

#include <linux/delay.h>

#include <linux/hardirq.h>

#include <asm/simd.h>

#include <asm/switch_to.h>

#include <crypto/aes.h>

#include <crypto/internal/simd.h>

#include <crypto/scatterwalk.h>

#include <crypto/skcipher.h>
@@ -100,7 +101,7 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, 
	struct p8_aes_cbc_ctx *ctx =

		crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));



	if (in_interrupt()) {

	if (!crypto_simd_usable()) {

		SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);

		skcipher_request_set_sync_tfm(req, ctx->fallback);

		skcipher_request_set_callback(req, desc->flags, NULL, NULL);
@@ -139,7 +140,7 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc, 
	struct p8_aes_cbc_ctx *ctx =

		crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm));



	if (in_interrupt()) {

	if (!crypto_simd_usable()) {

		SYNC_SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback);

		skcipher_request_set_sync_tfm(req, ctx->fallback);

		skcipher_request_set_callback(req, desc->flags, NULL, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE