This patch series adds support for Inline Encryption to the block layer, fscrypt and f2fs. Inline Encryption hardware allows software to specify an encryption context (an encryption key, crypto algorithm, data unit num, data unit size, etc.) along with a data transfer request to a storage device, and the inline encryption hardware will use that context to en/decrypt the data. The inline encryption hardware is part of the storage device, and it conceptually sits on the data path between system memory and the storage device. Inline Encryption hardware has become increasingly common, and we want to support it in the kernel. Inline Encryption hardware implementations often function around the concept of a limited number of "keyslots", which can hold an encryption context each. The storage device can be directed to en/decrypt any particular request with the encryption context stored in any particular keyslot. Patch 1 introduces a Keyslot Manager to efficiently manage keyslots. The keyslot manager also functions as the interface that upper layers will use to program keys into inline encryption hardware. For more information on the Keyslot Manager, refer to documentation found in block/keyslot-manager.c and linux/keyslot-manager.h. We also want to be able to make use of inline encryption hardware with layered devices like device mapper. To this end, Patch 1 also introduces blk-crypto. Blk-crypto delegates crypto operations to inline encryption hardware when available, and also contains a software fallback to the kernel crypto API. Given that blk-crypto works as a software fallback, we are considering removing file content en/decryption from fscrypt and simply using blk-crypto in a future patch. For more details on blk-crypto, refer to Documentation/block/blk-crypto.txt. Patch 2 adds support for inline encryption into the UFS driver according to the JEDEC UFS HCI v2.1 specification. Inline encryption support for other drivers (like eMMC) may be added in the same way - the device driver should set up a Keyslot Manager in the device's request_queue (refer to the UFS crypto additions in ufshcd-crypto.c for an example). Patches 3 and 4 add support to fscrypt and f2fs, so that we have a complete stack that can make use of inline encryption. There have been a few patch sets addressing Inline Encryption Support in the past. Briefly, this patch set differs from those as follows: 1) https://lkml.org/lkml/2018/10/17/1022 "crypto: qce: ice: Add support for Inline Crypto Engine" is specific to certain hardware, while our patch set's Inline Encryption support for UFS is implemented according to the JEDEC UFS specification. 2) https://lkml.org/lkml/2018/5/28/1187 "scsi: ufs: UFS Host Controller crypto changes" registers inline encryption support as a kernel crypto algorithm. Our patch set views inline encryption as being fundamentally different from a generic crypto provider (in that inline encryption is tied to a device), and so does not use the kernel crypto API to represent inline encryption hardware. 3) https://lkml.org/lkml/2018/12/11/190 "scsi: ufs: add real time/inline crypto support to UFS HCD" requires the device mapper to work - our patch does not. Satya Tangirala (4): block: Block Layer changes for Inline Encryption Support scsi: ufs: UFS driver v2.1 crypto support fscrypt: wire up fscrypt to use blk-crypto f2fs: Wire up f2fs to use inline encryption via fscrypt Documentation/block/blk-crypto.txt | 185 ++++++++++ block/Kconfig | 16 + block/Makefile | 3 + block/bio.c | 45 +++ block/blk-core.c | 14 +- block/blk-crypto.c | 572 +++++++++++++++++++++++++++++ block/blk-merge.c | 87 ++++- block/bounce.c | 1 + block/keyslot-manager.c | 314 ++++++++++++++++ drivers/scsi/ufs/Kconfig | 10 + drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufshcd-crypto.c | 449 ++++++++++++++++++++++ drivers/scsi/ufs/ufshcd-crypto.h | 92 +++++ drivers/scsi/ufs/ufshcd.c | 85 ++++- drivers/scsi/ufs/ufshcd.h | 23 ++ drivers/scsi/ufs/ufshci.h | 67 +++- fs/crypto/Kconfig | 7 + fs/crypto/bio.c | 156 ++++++-- fs/crypto/crypto.c | 9 + fs/crypto/fscrypt_private.h | 10 + fs/crypto/keyinfo.c | 69 ++-- fs/crypto/policy.c | 10 + fs/f2fs/data.c | 69 +++- fs/f2fs/super.c | 1 + include/linux/bio.h | 166 +++++++++ include/linux/blk-crypto.h | 40 ++ include/linux/blk_types.h | 49 +++ include/linux/blkdev.h | 9 + include/linux/fscrypt.h | 58 +++ include/linux/keyslot-manager.h | 131 +++++++ include/uapi/linux/fs.h | 12 +- 31 files changed, 2701 insertions(+), 59 deletions(-) create mode 100644 Documentation/block/blk-crypto.txt create mode 100644 block/blk-crypto.c create mode 100644 block/keyslot-manager.c create mode 100644 drivers/scsi/ufs/ufshcd-crypto.c create mode 100644 drivers/scsi/ufs/ufshcd-crypto.h create mode 100644 include/linux/blk-crypto.h create mode 100644 include/linux/keyslot-manager.h -- 2.21.0.1020.gf2820cf01a-goog