crypto: remove physical address support in skcipher_walk
cover crypto: remove physical address support in skcipher_walk
This series removes the unnecessary physical address support in skcipher_walk and the single obsolete driver that was using it.
Eric Biggers (2):
crypto: drivers - remove Niagara2 SPU driver
crypto: skcipher - remove support for physical address walks
crypto/skcipher.c | 187 +-- drivers/crypto/Kconfig | 17 - drivers/crypto/Makefile | 2 - drivers/crypto/n2_asm.S | 96 -- drivers/crypto/n2_core.c | 2168 ---------------------------- drivers/crypto/n2_core.h | 232 --- include/crypto/internal/skcipher.h | 12 - 7 files changed, 26 insertions(+), 2688 deletions(-) delete mode 100644 drivers/crypto/n2_asm.S delete mode 100644 drivers/crypto/n2_core.c delete mode 100644 drivers/crypto/n2_core.h
base-commit: b5f217084ab3ddd4bdd03cd437f8e3b7e2d1f5b6
Signature · 1 line
2.47.1
PATCH 1/2 crypto: drivers - remove Niagara2 SPU driver
From: Eric Biggers <[email protected]>
Remove the driver for the Stream Processing Unit (SPU) on the Niagara 2.
Removing this driver allows removing the support for physical address walks in skcipher_walk. That is a misfeature that is used only by this driver and increases the overhead of the crypto API for everyone else.
There is little evidence that anyone cares about this driver. The Niagara 2, a.k.a. the UltraSPARC T2, is a server CPU released in 2007. The SPU is also present on the SPARC T3, released in 2010. However, the SPU went away in SPARC T4, released in 2012, which replaced it with proper cryptographic instructions instead. These newer instructions are supported by the kernel in arch/sparc/crypto/.
This driver was completely broken from (at least) 2015 to 2022, from commit 8996eafdcbad ("crypto: ahash - ensure statesize is non-zero") to commit 76a4e8745935 ("crypto: n2 - add missing hash statesize"), since its probe function always returned an error before registering any algorithms. Though, even with that obvious issue fixed, it is unclear whether the driver now works correctly. E.g., there are no indications that anyone has run the self-tests recently.
One bug report for this driver in 2017
(https://lore.kernel.org/r/[email protected])
complained that it crashed the kernel while being loaded. The reporter didn't seem to care about the functionality of the driver, but rather just the fact that loading it crashed the kernel. In fact not until 2022 was the driver fixed to maybe actually register its algorithms with the crypto API. The 2022 fix does have a Reported-by and Tested-by, but that may similarly have been just about making the error messages go away as opposed to someone actually wanting to use the driver.
As such, it seems appropriate to retire this driver in mainline.
--- drivers/crypto/Kconfig | 17 - drivers/crypto/Makefile | 2 - drivers/crypto/n2_asm.S | 96 -- drivers/crypto/n2_core.c | 2168 -------------------------------------- drivers/crypto/n2_core.h | 232 ---- 5 files changed, 2515 deletions(-) delete mode 100644 drivers/crypto/n2_asm.S delete mode 100644 drivers/crypto/n2_core.c delete mode 100644 drivers/crypto/n2_core.h
drivers/crypto/Kconfig +0 -17
@@ -198,27 +198,10 @@ config S390_PRNG ANSI X9.17 standard. User-space programs access the pseudo-random-number device through the char device /dev/prandom. It is available as of z9. -config CRYPTO_DEV_NIAGARA2 - tristate "Niagara2 Stream Processing Unit driver" - select CRYPTO_LIB_DES - select CRYPTO_SKCIPHER - select CRYPTO_HASH - select CRYPTO_MD5 - select CRYPTO_SHA1 - select CRYPTO_SHA256 - depends on SPARC64 - help - Each core of a Niagara2 processor contains a Stream - Processing Unit, which itself contains several cryptographic - sub-units. One set provides the Modular Arithmetic Unit, - used for SSL offload. The other set provides the Cipher - Group, which can perform encryption, decryption, hashing, - checksumming, and raw copies. - config CRYPTO_DEV_SL3516 tristate "Storlink SL3516 crypto offloader" depends on ARCH_GEMINI || COMPILE_TEST depends on HAS_IOMEM && PM select CRYPTO_SKCIPHER
drivers/crypto/Makefile +0 -2
@@ -19,12 +19,10 @@ obj-$(CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON) += caam/ obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o obj-$(CONFIG_CRYPTO_DEV_IMGTEC_HASH) += img-hash.o obj-$(CONFIG_CRYPTO_DEV_MARVELL) += marvell/ obj-$(CONFIG_CRYPTO_DEV_MXS_DCP) += mxs-dcp.o -obj-$(CONFIG_CRYPTO_DEV_NIAGARA2) += n2_crypto.o -n2_crypto-y := n2_core.o n2_asm.o obj-$(CONFIG_CRYPTO_DEV_NX) += nx/ obj-$(CONFIG_CRYPTO_DEV_OMAP) += omap-crypto.o obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes-driver.o omap-aes-driver-objs := omap-aes.o omap-aes-gcm.o obj-$(CONFIG_CRYPTO_DEV_OMAP_DES) += omap-des.o
drivers/crypto/n2_asm.S deleted +0 -96
96 lines not on this page · raw message
drivers/crypto/n2_core.c deleted +0 -2168
2,168 lines not on this page · raw message
drivers/crypto/n2_core.h deleted +0 -232
232 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH 2/2 crypto: skcipher - remove support for physical address walks
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Since the physical address support in skcipher_walk is not used anymore, remove all the code associated with it. This includes:
- The skcipher_walk_async() and skcipher_walk_complete() functions;
- The SKCIPHER_WALK_PHYS flag and everything conditional on it;
- The buffers, phys, and virt.page fields in struct skcipher_walk;
- struct skcipher_walk_buffer.
As a result, skcipher_walk now just supports virtual addresses. Physical address support in skcipher_walk is unneeded because drivers that need physical addresses just use the scatterlists directly.
--- crypto/skcipher.c | 187 ++++------------------------- include/crypto/internal/skcipher.h | 12 -- 2 files changed, 26 insertions(+), 173 deletions(-)
crypto/skcipher.c +26 -161
@@ -15,11 +15,10 @@#include <crypto/scatterwalk.h> #include <linux/bug.h> #include <linux/cryptouser.h> #include <linux/err.h> #include <linux/kernel.h> -#include <linux/list.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/string.h>
@@ -27,23 +26,14 @@#include "skcipher.h" #define CRYPTO_ALG_TYPE_SKCIPHER_MASK 0x0000000eenum { -SKCIPHER_WALK_PHYS =1 <<0 , -SKCIPHER_WALK_SLOW =1 <<1 , -SKCIPHER_WALK_COPY =1 <<2 , -SKCIPHER_WALK_DIFF =1 <<3 , -SKCIPHER_WALK_SLEEP =1 <<4 , -}; - -struct skcipher_walk_buffer { -struct list_head entry; -struct scatter_walk dst; -unsigned int len; -u8 *data; -u8 buffer[]; +SKCIPHER_WALK_SLOW =1 <<0 , +SKCIPHER_WALK_COPY =1 <<1 , +SKCIPHER_WALK_DIFF =1 <<2 , +SKCIPHER_WALK_SLEEP =1 <<3 , };static const struct crypto_type crypto_skcipher_type;static int skcipher_walk_next (struct skcipher_walk *walk);
@@ -93,12 +83,11 @@ static int skcipher_done_slow(struct skcipher_walk *walk, unsigned int bsize) {u8 *addr; addr = (u8 *)ALIGN ((unsigned long )walk->buffer, walk->alignmask +1 ); addr =skcipher_get_spot (addr, bsize); -scatterwalk_copychunks (addr, &walk->out, bsize, - (walk->flags &SKCIPHER_WALK_PHYS ) ?2 :1 ); +scatterwalk_copychunks (addr, &walk->out, bsize,1 );return 0 ; }int skcipher_walk_done (struct skcipher_walk *walk,int err) {
@@ -111,12 +100,11 @@ int skcipher_walk_done(struct skcipher_walk *walk, int err)if (likely (err >=0 )) { n -= err; nbytes = walk->total - n; } -if (likely (!(walk->flags & (SKCIPHER_WALK_PHYS | -SKCIPHER_WALK_SLOW | +if (likely (!(walk->flags & (SKCIPHER_WALK_SLOW |SKCIPHER_WALK_COPY |SKCIPHER_WALK_DIFF )))) { unmap_src:skcipher_unmap_src (walk); }else if (walk->flags &SKCIPHER_WALK_DIFF ) {
@@ -160,13 +148,10 @@ int skcipher_walk_done(struct skcipher_walk *walk, int err) finish:/* Short-circuit for the common/fast path. */ if (!((unsigned long )walk->buffer | (unsigned long )walk->page)) goto out; -if (walk->flags &SKCIPHER_WALK_PHYS ) - goto out; -if (walk->iv != walk->oiv)memcpy (walk->oiv, walk->iv, walk->ivsize);if (walk->buffer != walk->page)kfree (walk->buffer);if (walk->page)
@@ -175,101 +160,37 @@ int skcipher_walk_done(struct skcipher_walk *walk, int err) out:return err; }EXPORT_SYMBOL_GPL (skcipher_walk_done); -void skcipher_walk_complete (struct skcipher_walk *walk,int err) -{ -struct skcipher_walk_buffer *p, *tmp; - -list_for_each_entry_safe (p, tmp, &walk->buffers, entry) { -u8 *data; - -if (err) - goto done; - - data = p->data; -if (!data) { - data =PTR_ALIGN (&p->buffer[0 ], walk->alignmask +1 ); - data =skcipher_get_spot (data, walk->stride); - } - -scatterwalk_copychunks (data, &p->dst, p->len,1 ); - -if (offset_in_page (p->data) + p->len + walk->stride > -PAGE_SIZE ) -free_page ((unsigned long )p->data); - -done: -list_del (&p->entry); -kfree (p); - } - -if (!err && walk->iv != walk->oiv) -memcpy (walk->oiv, walk->iv, walk->ivsize); -if (walk->buffer != walk->page) -kfree (walk->buffer); -if (walk->page) -free_page ((unsigned long )walk->page); -} -EXPORT_SYMBOL_GPL (skcipher_walk_complete); - -static void skcipher_queue_write (struct skcipher_walk *walk, -struct skcipher_walk_buffer *p) -{ - p->dst = walk->out; -list_add_tail (&p->entry, &walk->buffers); -} -static int skcipher_next_slow (struct skcipher_walk *walk,unsigned int bsize) { -bool phys = walk->flags &SKCIPHER_WALK_PHYS ;unsigned alignmask = walk->alignmask; -struct skcipher_walk_buffer *p;unsigned a;unsigned n;u8 *buffer; -void *v; - -if (!phys) { -if (!walk->buffer) - walk->buffer = walk->page; - buffer = walk->buffer; -if (buffer) - goto ok; - } + +if (!walk->buffer) + walk->buffer = walk->page; + buffer = walk->buffer; +if (buffer) + goto ok;/* Start with the minimum alignment of kmalloc. */ a =crypto_tfm_ctx_alignment () -1 ; n = bsize; -if (phys) { -/* Calculate the minimum alignment of p->buffer. */ - a &= (sizeof (*p) ^ (sizeof (*p) -1 )) >>1 ; - n +=sizeof (*p); - } - -/* Minimum size to align p->buffer by alignmask. */ +/* Minimum size to align buffer by alignmask. */ n += alignmask & ~a; -/* Minimum size to ensure p->buffer does not straddle a page. */ +/* Minimum size to ensure buffer does not straddle a page. */ n += (bsize -1 ) & ~(alignmask | a); - v =kzalloc (n,skcipher_walk_gfp (walk)); -if (!v) + buffer =kzalloc (n,skcipher_walk_gfp (walk)); +if (!buffer)return skcipher_walk_done (walk, -ENOMEM ); - -if (phys) { - p = v; - p->len = bsize; -skcipher_queue_write (walk, p); - buffer = p->buffer; - }else { - walk->buffer = v; - buffer = v; - } - + walk->buffer = buffer; ok: walk->dst.virt.addr =PTR_ALIGN (buffer, alignmask +1 ); walk->dst.virt.addr =skcipher_get_spot (walk->dst.virt.addr, bsize); walk->src.virt.addr = walk->dst.virt.addr;
@@ -281,54 +202,29 @@ static int skcipher_next_slow(struct skcipher_walk *walk, unsigned int bsize)return 0 ; }static int skcipher_next_copy (struct skcipher_walk *walk) { -struct skcipher_walk_buffer *p;u8 *tmp = walk->page;skcipher_map_src (walk);memcpy (tmp, walk->src.virt.addr, walk->nbytes);skcipher_unmap_src (walk); walk->src.virt.addr = tmp; walk->dst.virt.addr = tmp; - -if (!(walk->flags &SKCIPHER_WALK_PHYS )) -return 0 ; - - p =kmalloc (sizeof (*p),skcipher_walk_gfp (walk)); -if (!p) -return -ENOMEM ; - - p->data = walk->page; - p->len = walk->nbytes; -skcipher_queue_write (walk, p); - -if (offset_in_page (walk->page) + walk->nbytes + walk->stride > -PAGE_SIZE ) - walk->page =NULL ; -else - walk->page += walk->nbytes; -return 0 ; }static int skcipher_next_fast (struct skcipher_walk *walk) {unsigned long diff; - walk->src.phys.page =scatterwalk_page (&walk->in); - walk->src.phys.offset =offset_in_page (walk->in.offset); - walk->dst.phys.page =scatterwalk_page (&walk->out); - walk->dst.phys.offset =offset_in_page (walk->out.offset); - -if (walk->flags &SKCIPHER_WALK_PHYS ) -return 0 ; - - diff = walk->src.phys.offset - walk->dst.phys.offset; - diff |= walk->src.virt.page - walk->dst.virt.page; + diff =offset_in_page (walk->in.offset) - +offset_in_page (walk->out.offset); + diff |= (u8 *)scatterwalk_page (&walk->in) - + (u8 *)scatterwalk_page (&walk->out);skcipher_map_src (walk); walk->dst.virt.addr = walk->src.virt.addr;if (diff) {
@@ -341,11 +237,10 @@ static int skcipher_next_fast(struct skcipher_walk *walk)static int skcipher_walk_next (struct skcipher_walk *walk) {unsigned int bsize;unsigned int n; -int err; walk->flags &= ~(SKCIPHER_WALK_SLOW |SKCIPHER_WALK_COPY |SKCIPHER_WALK_DIFF ); n = walk->total;
@@ -356,12 +251,11 @@ static int skcipher_walk_next(struct skcipher_walk *walk)if (unlikely (n < bsize)) {if (unlikely (walk->total < walk->blocksize))return skcipher_walk_done (walk, -EINVAL ); slow_path: - err =skcipher_next_slow (walk, bsize); - goto set_phys_lowmem; +return skcipher_next_slow (walk, bsize); }if (unlikely ((walk->in.offset | walk->out.offset) & walk->alignmask)) {if (!walk->page) {gfp_t gfp =skcipher_walk_gfp (walk);
@@ -372,26 +266,16 @@ static int skcipher_walk_next(struct skcipher_walk *walk) } walk->nbytes =min_t (unsigned, n,PAGE_SIZE -offset_in_page (walk->page)); walk->flags |=SKCIPHER_WALK_COPY ; - err =skcipher_next_copy (walk); - goto set_phys_lowmem; +return skcipher_next_copy (walk); } walk->nbytes = n;return skcipher_next_fast (walk); - -set_phys_lowmem: -if (!err && (walk->flags &SKCIPHER_WALK_PHYS )) { - walk->src.phys.page =virt_to_page (walk->src.virt.addr); - walk->dst.phys.page =virt_to_page (walk->dst.virt.addr); - walk->src.phys.offset &=PAGE_SIZE -1 ; - walk->dst.phys.offset &=PAGE_SIZE -1 ; - } -return err; }static int skcipher_copy_iv (struct skcipher_walk *walk) {unsigned a =crypto_tfm_ctx_alignment () -1 ;
@@ -405,18 +289,14 @@ static int skcipher_copy_iv(struct skcipher_walk *walk) aligned_bs =ALIGN (bs, alignmask +1 );/* Minimum size to align buffer by alignmask. */ size = alignmask & ~a; -if (walk->flags &SKCIPHER_WALK_PHYS ) - size += ivsize; -else { - size += aligned_bs + ivsize; + size += aligned_bs + ivsize; -/* Minimum size to ensure buffer does not straddle a page. */ - size += (bs -1 ) & ~(alignmask | a); - } +/* Minimum size to ensure buffer does not straddle a page. */ + size += (bs -1 ) & ~(alignmask | a); walk->buffer =kmalloc (size,skcipher_walk_gfp (walk));if (!walk->buffer)return -ENOMEM ;
@@ -482,31 +362,18 @@ int skcipher_walk_virt(struct skcipher_walk *walk, {int err;might_sleep_if (req->base.flags &CRYPTO_TFM_REQ_MAY_SLEEP ); - walk->flags &= ~SKCIPHER_WALK_PHYS ; - err =skcipher_walk_skcipher (walk, req); walk->flags &= atomic ? ~SKCIPHER_WALK_SLEEP : ~0 ;return err; }EXPORT_SYMBOL_GPL (skcipher_walk_virt); -int skcipher_walk_async (struct skcipher_walk *walk, -struct skcipher_request *req) -{ - walk->flags |=SKCIPHER_WALK_PHYS ; - -INIT_LIST_HEAD (&walk->buffers); - -return skcipher_walk_skcipher (walk, req); -} -EXPORT_SYMBOL_GPL (skcipher_walk_async); -static int skcipher_walk_aead_common (struct skcipher_walk *walk,struct aead_request *req,bool atomic) {struct crypto_aead *tfm =crypto_aead_reqtfm (req);int err;
@@ -516,12 +383,10 @@ static int skcipher_walk_aead_common(struct skcipher_walk *walk, walk->oiv = req->iv;if (unlikely (!walk->total))return 0 ; - walk->flags &= ~SKCIPHER_WALK_PHYS ; -scatterwalk_start (&walk->in, req->src);scatterwalk_start (&walk->out, req->dst);scatterwalk_copychunks (NULL , &walk->in, req->assoclen,2 );scatterwalk_copychunks (NULL , &walk->out, req->assoclen,2 );
include/crypto/internal/skcipher.h +0 -12
@@ -9,11 +9,10 @@#define _CRYPTO_INTERNAL_SKCIPHER_H#include <crypto/algapi.h> #include <crypto/internal/cipher.h> #include <crypto/skcipher.h> -#include <linux/list.h> #include <linux/types.h> /* * Set this if your algorithm is sync but needs a reqsize larger * than MAX_SYNC_SKCIPHER_REQSIZE.
@@ -56,28 +55,20 @@ struct crypto_lskcipher_spawn { };struct skcipher_walk {union {struct { -struct page *page; -unsigned long offset; - } phys; - -struct { -u8 *page;void *addr; } virt; } src, dst;struct scatter_walk in;unsigned int nbytes;struct scatter_walk out;unsigned int total; -struct list_head buffers; -u8 *page;u8 *buffer;u8 *oiv;void *iv;
@@ -207,17 +198,14 @@ int lskcipher_register_instance(struct crypto_template *tmpl,int skcipher_walk_done (struct skcipher_walk *walk,int err);int skcipher_walk_virt (struct skcipher_walk *walk,struct skcipher_request *req,bool atomic); -int skcipher_walk_async (struct skcipher_walk *walk, -struct skcipher_request *req);int skcipher_walk_aead_encrypt (struct skcipher_walk *walk,struct aead_request *req,bool atomic);int skcipher_walk_aead_decrypt (struct skcipher_walk *walk,struct aead_request *req,bool atomic); -void skcipher_walk_complete (struct skcipher_walk *walk,int err);static inline void skcipher_walk_abort (struct skcipher_walk *walk) {skcipher_walk_done (walk, -ECANCELED ); }
Signature · 1 line
2.47.1
Quoted 8 lines · Eric Biggers
This series removes the unnecessary physical address support in
skcipher_walkand the single obsolete driver that was using it.Eric Biggers (2):
crypto: drivers - remove Niagara2 SPU driver
crypto: skcipher - remove support for physical address walks
Quoted 18 lines
crypto/skcipher.c | 187 +-- drivers/crypto/Kconfig | 17 - drivers/crypto/Makefile | 2 - drivers/crypto/n2_asm.S | 96 -- drivers/crypto/n2_core.c | 2168 ---------------------------- drivers/crypto/n2_core.h | 232 --- include/crypto/internal/skcipher.h | 12 - 7 files changed, 26 insertions(+), 2688 deletions(-) delete mode 100644 drivers/crypto/n2_asm.S delete mode 100644 drivers/crypto/n2_core.c delete mode 100644 drivers/crypto/n2_core.hbase-commit:
b5f217084ab3ddd4bdd03cd437f8e3b7e2d1f5b6--
2.47.1
Herbert Xu
maintainerQuoted 20 lines · Eric Biggers
This series removes the unnecessary physical address support in
skcipher_walkand the single obsolete driver that was using it.Eric Biggers (2):
crypto: drivers - remove Niagara2 SPU driver
crypto: skcipher - remove support for physical address walkscrypto/skcipher.c | 187 +-- drivers/crypto/Kconfig | 17 - drivers/crypto/Makefile | 2 - drivers/crypto/n2_asm.S | 96 -- drivers/crypto/n2_core.c | 2168 ---------------------------- drivers/crypto/n2_core.h | 232 --- include/crypto/internal/skcipher.h | 12 - 7 files changed, 26 insertions(+), 2688 deletions(-) delete mode 100644 drivers/crypto/n2_asm.S delete mode 100644 drivers/crypto/n2_core.c delete mode 100644 drivers/crypto/n2_core.h
Quoted 3 lines
base-commit:
b5f217084ab3ddd4bdd03cd437f8e3b7e2d1f5b6Signature · 1 line
2.47.1
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt