From patchwork Mon Sep 13 01:31:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 12487743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CBA7C433EF for ; Mon, 13 Sep 2021 01:35:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7808A610CB for ; Mon, 13 Sep 2021 01:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236731AbhIMBgm (ORCPT ); Sun, 12 Sep 2021 21:36:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:48350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233133AbhIMBgl (ORCPT ); Sun, 12 Sep 2021 21:36:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E0EB660FDA; Mon, 13 Sep 2021 01:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631496927; bh=mgWJDoM3z3cQEudIafZmHLOAdu7ULEXI+JcYrJjwpiU=; h=From:To:Cc:Subject:Date:From; b=PFUcFBQ3/btssDE7iEgpMLPk6x7vmw7PHATSeUYZ0g9i3ENs5PjLN6txy953GjTBE Hmg765VoEe+Pdcf/1q+DBdcR+zNN0GJI8Jx7NcSU+lAew++pNHaHxbR5YkR/FuBRzI 7JJDrLOZLH8qbXE4zoPSQIs9J723DX1ZFJ5hJuXWjPaFSNF4kMFa6FK47vRIuj8hxW 8aCChUAGr9AwSqU5M6oTuSptxRfc0aPEqbYqwrF8SFxvlIAhJtWrHtSpe6Estu1+Xo V3+ZM0QS/D+h4isfD7zLF5i7IXplTvkeCrjCwwOZbVp+ar4OEbmUzRsdhG4Pei3Yo/ CASX7DaAssPig== From: Eric Biggers To: linux-block@vger.kernel.org Cc: linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, dm-devel@redhat.com, Satya Tangirala Subject: [PATCH 0/5] blk-crypto cleanups Date: Sun, 12 Sep 2021 18:31:30 -0700 Message-Id: <20210913013135.102404-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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 v5.15-rc1. Eric Biggers (5): blk-crypto-fallback: properly prefix function and struct names blk-crypto-fallback: consolidate static variables 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 | 439 ++++++++-------- block/Makefile | 2 +- block/blk-crypto-fallback.c | 330 ++++++------ block/blk-crypto-profile.c | 564 +++++++++++++++++++++ block/blk-crypto.c | 27 +- block/blk-integrity.c | 2 +- block/keyslot-manager.c | 578 ---------------------- 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/blkdev.h | 18 +- include/linux/device-mapper.h | 4 +- include/linux/keyslot-manager.h | 120 ----- include/linux/mmc/host.h | 4 +- 21 files changed, 1310 insertions(+), 1219 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