Skip to content

crypto: convert h/w accelerator drivers to skcipher API

Ard Biesheuvel linux-arm-kernel linux-crypto linux-mediatek linux-omap 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest29 patches 3 repliesIn review
  2. v329 patches 10 repliesSuperseded

Changes in v4 from the cover letter

- add acks from Tudor, Gilad and Eric
- incorporate updated version of the QAT patch from Giovanni
- rebased onto latest cryptodev/master
- updated wording in commit logs to refer to ablkcipher not blkcipher [which has already been removed]

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/29crypto: virtio - implement missing support for output IVsdrivers/crypto/virtio/virtio_crypto_algs.c+9 -00 replies
2/29crypto: virtio - deal with unsupported input sizesdrivers/crypto/virtio/virtio_crypto_algs.c+10 -20 replies
3/29crypto: virtio - switch to skcipher APIdrivers/crypto/virtio/virtio_crypto_algs.c drivers/crypto/virtio/virtio_crypto_common.h+92 -970 replies
4/29crypto: ccp - switch from ablkcipher to skcipherdrivers/crypto/ccp/ccp-crypto-aes-galois.c drivers/crypto/ccp/ccp-crypto-aes-xts.c drivers/crypto/ccp/ccp-crypto-aes.c +3 more+186 -2110 replies
5/29crypto: omap - switch to skcipher APIdrivers/crypto/omap-aes.c drivers/crypto/omap-aes.h drivers/crypto/omap-des.c+207 -2380 replies
6/29crypto: ux500 - switch to skcipher APIdrivers/crypto/ux500/cryp/cryp_core.c+156 -2150 replies
7/29crypto: s5p - switch to skcipher APIdrivers/crypto/s5p-sss.c+89 -980 replies
8/29crypto: atmel-aes - switch to skcipher APIdrivers/crypto/atmel-aes.c+245 -2641 reply
9/29crypto: atmel-tdes - switch to skcipher APIdrivers/crypto/atmel-tdes.c+207 -2261 reply
10/29crypto: bcm-spu - switch to skcipher APIdrivers/crypto/Kconfig drivers/crypto/bcm/cipher.c drivers/crypto/bcm/cipher.h +1 more+186 -2050 replies
11/29crypto: nitrox - remove cra_type reference to ablkcipherdrivers/crypto/cavium/nitrox/nitrox_skcipher.c+0 -10 replies
12/29crypto: cavium/cpt - switch to skcipher APIdrivers/crypto/cavium/cpt/cptvf_algs.c+134 -1580 replies
13/29crypto: chelsio - switch to skcipher APIdrivers/crypto/chelsio/chcr_algo.c drivers/crypto/chelsio/chcr_algo.h drivers/crypto/chelsio/chcr_crypto.h+173 -1790 replies
14/29crypto: hifn - switch to skcipher APIdrivers/crypto/hifn_795x.c+92 -910 replies
15/29crypto: ixp4xx - switch to skcipher APIdrivers/crypto/ixp4xx_crypto.c+108 -1200 replies
16/29crypto: mxs - switch to skcipher APIdrivers/crypto/mxs-dcp.c+65 -750 replies
17/29crypto: mediatek - switch to skcipher APIdrivers/crypto/mediatek/mtk-aes.c+116 -1320 replies
18/29crypto: sahara - switch to skcipher APIdrivers/crypto/sahara.c+75 -810 replies
19/29crypto: picoxcell - switch to skcipher APIdrivers/crypto/picoxcell_crypto.c+184 -2020 replies
20/29crypto: qce - switch to skcipher APIdrivers/crypto/qce/Makefile drivers/crypto/qce/cipher.h drivers/crypto/qce/common.c +3 more+100 -990 replies
21/29crypto: stm32 - switch to skcipher APIdrivers/crypto/stm32/stm32-cryp.c+159 -1790 replies
22/29crypto: niagara2 - switch to skcipher APIdrivers/crypto/n2_core.c+96 -980 replies
23/29crypto: rockchip - switch to skcipher APIdrivers/crypto/rockchip/Makefile drivers/crypto/rockchip/rk3288_crypto.c drivers/crypto/rockchip/rk3288_crypto.h +2 more+545 -5620 replies
24/29crypto: talitos - switch to skcipher APIdrivers/crypto/talitos.c+143 -1650 replies
25/29crypto: qat - switch to skcipher APIdrivers/crypto/qat/qat_common/qat_algs.c drivers/crypto/qat/qat_common/qat_crypto.h+146 -1620 replies
26/29crypto: marvell/cesa - rename blkcipher to skcipherdrivers/crypto/marvell/cesa.h drivers/crypto/marvell/cipher.c+10 -100 replies
27/29crypto: nx - remove stale comment referring to the blkcipher walk APIdrivers/crypto/nx/nx-aes-ccm.c drivers/crypto/nx/nx-aes-gcm.c+0 -100 replies
28/29crypto: remove deprecated and unused ablkcipher supportDocumentation/crypto/api-skcipher.rst Documentation/crypto/architecture.rst Documentation/crypto/crypto_engine.rst +13 more+4 -11500 replies
29/29crypto: ccree - update a stale reference to ablkcipherdrivers/crypto/ccree/cc_cipher.c+2 -20 replies

Reviews trailers per patch

11 of 29 patches have a Reviewed-by or Acked-by.

PatchTero KristoGary R HookLinus WalleijKamil KoniecznyKrzysztof KozlowskiTudor AmbarusHoria GeantăStanimir VarbanovDavid S. MillerGilad Ben-YossefEric Biggers
1/29
2/29
3/29
4/29R-b T-b
5/29R-b T-b
6/29R-b
7/29R-b T-b A-b
8/29T-b R-b
9/29T-b R-b
10/29
11/29
12/29
13/29
14/29
15/29R-b
16/29T-b
17/29
18/29
19/29
20/29R-b
21/29
22/29A-b
23/29
24/29
25/29
26/29
27/29
28/29R-b
29/29A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 11 reviewers.

Read the v4 thread

Cover letter [PATCH v4 00/29] crypto: convert h/w accelerator drivers to skcipher API

This series converts all drivers for h/w accelerators that produce the ablkcipher API to the skcipher API, so that we can finally retire the long deprecated ablkcipher code.

Changes since v3:
- add acks from Tudor, Gilad and Eric
- incorporate updated version of the QAT patch from Giovanni
- rebased onto latest cryptodev/master
- updated wording in commit logs to refer to ablkcipher not blkcipher [which has already been removed]

Changes since v2:
- added a patch that removes the ablkcipher support code itself
- fix an issue in the talitos code
- add tero's ack to patch #5
- add stanimir's ack to patch #20

Changes since v1:
- remove some more [cosmetic] references to [a]blkcipher (#26-#27)
- add back missing IV for cbc(aes) in the omap driver, fixing a crash
- add Gary's ack to #4
- add Linus's ack to #6 and #15
- add Kamil's and Krzysztof's acks to #7
- fixed a bug in the Atmel patch (#8)
- add Horia's tested-by to #16
- add Dave's ack to #22

Patches #1, #2 are fixes for the virtio driver, which need to be applied first so that they can be backported

Patches #3 and #4 have been tested by me on actual 'hardware' (given the virtual nature of the virtio driver). Patch #5 was tested by Tero. Patch #7 was tested successfully in kernelci. Patches #8 and #9 were tested by Tudor. Patch #16 was tested by Horia. Patch #25 was updated with changes proposed by Giovanni, so I assume he tested them as well. Patch #24 was fixed in v2 in response to a test failure report.

All other patches have been build tested *only*, and should preferably be tested on actual hardware before being merged. Note that patches can be merged piecemeal (with the exception of #1 .. #3 which should be taken as a set, and #28 which removes the ablkcipher support code) since there are no dependencies between them. However, deferring this series indefinitely until everyone has chimed in doesn't seem like a useful approach either, so I am leaving it up to the maintainers to decide when we have reached critical mass and the whole series can be taken.

Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Biggers <[email protected]>

Ard Biesheuvel (29):
crypto: virtio - implement missing support for output IVs
crypto: virtio - deal with unsupported input sizes
crypto: virtio - switch to skcipher API
crypto: ccp - switch from ablkcipher to skcipher
crypto: omap - switch to skcipher API
crypto: ux500 - switch to skcipher API
crypto: s5p - switch to skcipher API
crypto: atmel-aes - switch to skcipher API
crypto: atmel-tdes - switch to skcipher API
crypto: bcm-spu - switch to skcipher API
crypto: nitrox - remove cra_type reference to ablkcipher
crypto: cavium/cpt - switch to skcipher API
crypto: chelsio - switch to skcipher API
crypto: hifn - switch to skcipher API
crypto: ixp4xx - switch to skcipher API
crypto: mxs - switch to skcipher API
crypto: mediatek - switch to skcipher API
crypto: sahara - switch to skcipher API
crypto: picoxcell - switch to skcipher API
crypto: qce - switch to skcipher API
crypto: stm32 - switch to skcipher API
crypto: niagara2 - switch to skcipher API
crypto: rockchip - switch to skcipher API
crypto: talitos - switch to skcipher API
crypto: qat - switch to skcipher API
crypto: marvell/cesa - rename blkcipher to skcipher
crypto: nx - remove stale comment referring to the blkcipher walk API
crypto: remove deprecated and unused ablkcipher support
crypto: ccree - update a stale reference to ablkcipher

 Documentation/crypto/api-skcipher.rst         |  20 +-
 Documentation/crypto/architecture.rst         |   2 -
 Documentation/crypto/crypto_engine.rst        |   4 -
 crypto/Makefile                               |   4 +-
 crypto/ablkcipher.c                           | 407 -------------
 crypto/algapi.c                               |  26 -
 crypto/crypto_engine.c                        |  29 -
 crypto/skcipher.c                             | 106 ----
 drivers/crypto/Kconfig                        |   2 +-
 drivers/crypto/atmel-aes.c                    | 509 ++++++++--------
 drivers/crypto/atmel-tdes.c                   | 433 +++++++-------
 drivers/crypto/bcm/cipher.c                   | 373 ++++++------
 drivers/crypto/bcm/cipher.h                   |  10 +-
 drivers/crypto/bcm/spu2.c                     |   6 +-
 drivers/crypto/cavium/cpt/cptvf_algs.c        | 292 +++++----
 .../crypto/cavium/nitrox/nitrox_skcipher.c    |   1 -
 drivers/crypto/ccp/ccp-crypto-aes-galois.c    |   7 +-
 drivers/crypto/ccp/ccp-crypto-aes-xts.c       |  94 +--
 drivers/crypto/ccp/ccp-crypto-aes.c           | 169 +++---
 drivers/crypto/ccp/ccp-crypto-des3.c          | 100 ++--
 drivers/crypto/ccp/ccp-crypto-main.c          |  14 +-
 drivers/crypto/ccp/ccp-crypto.h               |  13 +-
 drivers/crypto/ccree/cc_cipher.c              |   4 +-
 drivers/crypto/chelsio/chcr_algo.c            | 334 ++++++-----
 drivers/crypto/chelsio/chcr_algo.h            |   2 +-
 drivers/crypto/chelsio/chcr_crypto.h          |  16 +-
 drivers/crypto/hifn_795x.c                    | 183 +++---
 drivers/crypto/ixp4xx_crypto.c                | 228 ++++---
 drivers/crypto/marvell/cesa.h                 |   6 +-
 drivers/crypto/marvell/cipher.c               |  14 +-
 drivers/crypto/mediatek/mtk-aes.c             | 248 ++++----
 drivers/crypto/mxs-dcp.c                      | 140 ++---
 drivers/crypto/n2_core.c                      | 194 +++---
 drivers/crypto/nx/nx-aes-ccm.c                |   5 -
 drivers/crypto/nx/nx-aes-gcm.c                |   5 -
 drivers/crypto/omap-aes.c                     | 209 ++++---
 drivers/crypto/omap-aes.h                     |   4 +-
 drivers/crypto/omap-des.c                     | 232 ++++----
 drivers/crypto/picoxcell_crypto.c             | 386 ++++++------
 drivers/crypto/qat/qat_common/qat_algs.c      | 304 +++++-----
 drivers/crypto/qat/qat_common/qat_crypto.h    |   4 +-
 drivers/crypto/qce/Makefile                   |   2 +-
 drivers/crypto/qce/cipher.h                   |   8 +-
 drivers/crypto/qce/common.c                   |  12 +-
 drivers/crypto/qce/common.h                   |   3 +-
 drivers/crypto/qce/core.c                     |   2 +-
 .../crypto/qce/{ablkcipher.c => skcipher.c}   | 172 +++---
 drivers/crypto/rockchip/Makefile              |   2 +-
 drivers/crypto/rockchip/rk3288_crypto.c       |   8 +-
 drivers/crypto/rockchip/rk3288_crypto.h       |   3 +-
 .../rockchip/rk3288_crypto_ablkcipher.c       | 556 ------------------
 .../crypto/rockchip/rk3288_crypto_skcipher.c  | 538 +++++++++++++++++
 drivers/crypto/s5p-sss.c                      | 187 +++---
 drivers/crypto/sahara.c                       | 156 +++--
 drivers/crypto/stm32/stm32-cryp.c             | 338 +++++------
 drivers/crypto/talitos.c                      | 308 +++++-----
 drivers/crypto/ux500/cryp/cryp_core.c         | 371 +++++-------
 drivers/crypto/virtio/virtio_crypto_algs.c    | 192 +++---
 drivers/crypto/virtio/virtio_crypto_common.h  |   2 +-
 include/crypto/aead.h                         |   2 +-
 include/crypto/algapi.h                       |  75 ---
 include/crypto/engine.h                       |   4 -
 include/crypto/hash.h                         |   2 +-
 include/crypto/internal/des.h                 |  12 -
 include/crypto/internal/skcipher.h            |  20 -
 include/crypto/skcipher.h                     |   6 -
 include/linux/crypto.h                        | 435 --------------
 67 files changed, 3531 insertions(+), 5024 deletions(-)
 delete mode 100644 crypto/ablkcipher.c
 rename drivers/crypto/qce/{ablkcipher.c => skcipher.c} (61%)
 delete mode 100644 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c
 create mode 100644 drivers/crypto/rockchip/rk3288_crypto_skcipher.c
Signature · 1 line
2.17.1