Skip to content

blk-crypto cleanups

Eric Biggers dm-devel linux-block linux-mmc linux-scsi 6 versions – Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest4 patches 3 repliesApplied
  2. v54 patches 1 replySuperseded
  3. v44 patches 6 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v34 patches1 replySuperseded
v24 patches1 replySuperseded
v15 patches11 repliesSuperseded

Changes in v6 from the cover letter

- Rebased onto block/for-next yet again
- Added more Reviewed-by tags

Patches in v6 Applied

#Subject and filesSizeRepliesApplied
1/4blk-crypto-fallback: properly prefix function and struct namesblock/blk-crypto-fallback.c+30 -290 replies
2/4blk-crypto: rename keyslot-manager files to blk-crypto-profileblock/Makefile block/blk-crypto-fallback.c block/blk-crypto-profile.c +7 more+9 -90 replies
3/4blk-crypto: rename blk_keyslot_manager to blk_crypto_profileblock/blk-crypto-fallback.c block/blk-crypto-profile.c block/blk-crypto.c +15 more+555 -5220 replies
4/4blk-crypto: update inline encryption documentationDocumentation/block/inline-encryption.rst+245 -2060 replies

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchChristoph HellwigChaitanya KulkarniMike SnitzerMartin K. PetersenUlf Hansson
1/4R-b R-b R-b R-b
2/4R-b R-b R-b A-b
3/4R-b R-b A-b
4/4R-b R-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 5 reviewers.

Read the v6 thread

Cover letter [PATCH v6 0/4] blk-crypto cleanups

This series renames struct blk_keyslot_manager to struct blk_crypto_profile, as it is misnamed; it doesn't always manage keyslots. It's much more logical to think of it as the "blk-crypto profile" of a device, similar to blk_integrity_profile.

This series also improves the inline-encryption.rst documentation file, and cleans up blk-crypto-fallback a bit.

This series applies to block/for-next.

Changed v5 => v6:
- Rebased onto block/for-next yet again
- Added more Reviewed-by tags

Changed v4 => v5:
- Rebased onto block/for-next again
- Added Reviewed-by tags

Changed v3 => v4:
- Rebased onto block/for-next to resolve a conflict due to 'struct request' being moved.

Changed v2 => v3:
- Made some minor tweaks to patches 3 and 4, mostly comments and documentation.
- Clarified a commit message to mention no change in behavior.
- Added a Reviewed-by tag.

Changed v1 => v2:
- Fixed a build error in blk-integrity.c.
- Removed a mention of "ksm" from a comment.
- Dropped the patch "blk-crypto-fallback: consolidate static variables".
- Added Acked-by and Reviewed-by tags.

Eric Biggers (4):
blk-crypto-fallback: properly prefix function and struct names
blk-crypto: rename keyslot-manager files to blk-crypto-profile
blk-crypto: rename blk_keyslot_manager to blk_crypto_profile
blk-crypto: update inline encryption documentation

 Documentation/block/inline-encryption.rst | 451 +++++++++--------
 block/Makefile                            |   2 +-
 block/blk-crypto-fallback.c               | 118 ++---
 block/blk-crypto-profile.c                | 565 +++++++++++++++++++++
 block/blk-crypto.c                        |  29 +-
 block/blk-integrity.c                     |   4 +-
 block/keyslot-manager.c                   | 579 ----------------------
 drivers/md/dm-core.h                      |   4 +-
 drivers/md/dm-table.c                     | 168 +++----
 drivers/md/dm.c                           |  10 +-
 drivers/mmc/core/crypto.c                 |  11 +-
 drivers/mmc/host/cqhci-crypto.c           |  33 +-
 drivers/scsi/ufs/ufshcd-crypto.c          |  32 +-
 drivers/scsi/ufs/ufshcd-crypto.h          |   9 +-
 drivers/scsi/ufs/ufshcd.c                 |   2 +-
 drivers/scsi/ufs/ufshcd.h                 |   6 +-
 include/linux/blk-crypto-profile.h        | 166 +++++++
 include/linux/blk-mq.h                    |   2 +-
 include/linux/blkdev.h                    |  16 +-
 include/linux/device-mapper.h             |   4 +-
 include/linux/keyslot-manager.h           | 120 -----
 include/linux/mmc/host.h                  |   4 +-
 22 files changed, 1204 insertions(+), 1131 deletions(-)
 create mode 100644 block/blk-crypto-profile.c
 delete mode 100644 block/keyslot-manager.c
 create mode 100644 include/linux/blk-crypto-profile.h
 delete mode 100644 include/linux/keyslot-manager.h

base-commit: df300910c93e1a0e4ad9fe7a984c569dc118000c

Signature · 1 line
2.33.1