Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2524481pxb; Thu, 11 Feb 2021 14:59:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwOXRjYO6K3jqXOy1zpshp35zpPtYJlQ/YPYpzB4YXRnM0tZZdn8HpvBY3JoF+9ESlGKh4Q X-Received: by 2002:a05:6402:374:: with SMTP id s20mr443198edw.56.1613084393730; Thu, 11 Feb 2021 14:59:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613084393; cv=none; d=google.com; s=arc-20160816; b=el3l524XRNMES6COuXT74WaNQnUIn99AiJDByV7KVUZPA4gb+ij0lZHqb8vGvwWhHL diiUDxfGfS5uIB+iq3jMU+BYND3quVLzrxEZNN9EHPb3oyUc8PDqllwqEER5knCmC3aI AHI1DAi65vnwsyKE+mXp6j48Q3JjaiMp597kGukcfF5VwxDARyu8IqQmwp1AhobsOZUk oCs7/zikMXioBNOiJiEIzAKTps3H4fUNg1a89plU64Nslq7XkdRktcfybrzTie0qLSWo J5LGe8QR1oHmnUWQguC1z6Li8B0ZZWEQu2kV3Gi56fZ5Sh1Q998fXdi2fzCBobOJY+d2 xgDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:sender:dkim-signature; bh=PzZ3HqYXXMl4x2ko2AkyE6044tKsCbJJ6g3BR1Cqc4U=; b=WsN2c3mvVFgq7LDu3TB6Rsw2FK/NmdgbyyAmq11rb8yw9aaPYIlOw3oPs9uXohKHRg /9At+p80nZulVH6bUnlJzfQ8KvWbQRGHSXvHtAmC4/iEpFV8PwwD5yCLX1yHoA1ozZHV JQ1ajidaVLwbvjYA4dh/7aGzo1I70zrcDo5a7DSPnPXEirNmmqPxtgD2quFWUHNP/ewW JrZjfBwj8vhpur3RLRI+QowqA2aULvwoJD0lqZEmUrZFJ/JfLL6bFXHoBWMxBLAjeJ8j /29q29WUatUY0bDv/Ue/Hf85xjmUS7+OsHK2bStkvFr1lP0Qz57xfgtdtDhAPyurg02+ q4DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=VMR9fwBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w16si4439454edd.250.2021.02.11.14.59.30; Thu, 11 Feb 2021 14:59:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=VMR9fwBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230155AbhBKWz1 (ORCPT + 99 others); Thu, 11 Feb 2021 17:55:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229714AbhBKWzO (ORCPT ); Thu, 11 Feb 2021 17:55:14 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB740C061793 for ; Thu, 11 Feb 2021 14:53:56 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id g19so5466855pfo.19 for ; Thu, 11 Feb 2021 14:53:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=PzZ3HqYXXMl4x2ko2AkyE6044tKsCbJJ6g3BR1Cqc4U=; b=VMR9fwBw+N+vaWHcFXK3rnI3ZsKDRmCwOY3WpZeIPfakOWfkpzv6nTp2m4BxJougLu A2yAYOJhIUSD1hhs64JoQjmNyH5A7WJs05SQcL2sC+vkVM6hkRrlA7AC+xgoKHv9bKI8 YzAMCxey9+mHDKWIlO1Ctl660ve7MgD+1YLon2hGTuxrUayqc+WMtU4lDCROP4+wG+Lu YBoY5jq97Wl+F7sgPnG8xifCNHHNfTxsCaUrN+DvVeP/A9Rx+Zvmw3Km8fmcXLKK0kR2 WpbHlT9IroRY7+RWkcuqD5mrI5R3952W27wss+dOUNgkiPFSUFxYT3QoaJdsGeE56ahJ 4Qng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=PzZ3HqYXXMl4x2ko2AkyE6044tKsCbJJ6g3BR1Cqc4U=; b=W5KlTy7fyU/dwgTFb38ztbT3pBiKSVLAMy66RzFsBk0idzy9MLdIH/2+MxZSUqbHl6 XUb+cNnMEBhgJuCzASXluHmP3yG4sUzaePhCJVFoa5ZA8Br3ZTmnTY3WqRT/e4UjVM6D 5v+IErU8kpI5JyCKc47hlj50+6VXNtJPi5YSLJZQNJahFi98nZyveI41mHQeZBFJv22Q edqFHk7eocrbP57gFSa9KmHcF+LqsLMkQpBJ7+9m6b28gwvOltI8WGYzBV+rSBZTlHxZ l1VKEGr2bzYqygXN4Sfj1X4nzPQaR7rx9dWiogqF81dzz3UeiDVxMlVAP6jZj0+CWJSi AYVg== X-Gm-Message-State: AOAM530cP6oMcwP7YrL+c4s4LkpWcKGsBgPeQiuPr9ZNO3UReph0xLoh QTelRgR8MafoY0pcMHRiGl1xRCV2YEs= Sender: "satyat via sendgmr" X-Received: from satyaprateek.c.googlers.com ([fda3:e722:ac3:10:24:72f4:c0a8:1092]) (user=satyat job=sendgmr) by 2002:a17:90b:1217:: with SMTP id gl23mr5924163pjb.163.1613084036078; Thu, 11 Feb 2021 14:53:56 -0800 (PST) Date: Thu, 11 Feb 2021 22:53:42 +0000 In-Reply-To: <20210211225343.3145732-1-satyat@google.com> Message-Id: <20210211225343.3145732-5-satyat@google.com> Mime-Version: 1.0 References: <20210211225343.3145732-1-satyat@google.com> X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog Subject: [PATCH v5 4/5] dm: support key eviction from keyslot managers of underlying devices From: Satya Tangirala To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, dm-devel@redhat.com Cc: Jens Axboe , Alasdair Kergon , Mike Snitzer , Eric Biggers , Satya Tangirala Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that device mapper supports inline encryption, add the ability to evict keys from all underlying devices. When an upper layer requests a key eviction, we simply iterate through all underlying devices and evict that key from each device. Co-developed-by: Eric Biggers Signed-off-by: Eric Biggers Signed-off-by: Satya Tangirala Reviewed-by: Eric Biggers --- block/blk-crypto.c | 1 + drivers/md/dm-table.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/block/blk-crypto.c b/block/blk-crypto.c index 5da43f0973b4..c2be8f15006c 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -409,3 +409,4 @@ int blk_crypto_evict_key(struct request_queue *q, */ return blk_crypto_fallback_evict_key(key); } +EXPORT_SYMBOL_GPL(blk_crypto_evict_key); diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index fbaadfc6eed9..b036a349aaad 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1214,6 +1214,58 @@ struct dm_keyslot_manager { struct mapped_device *md; }; +struct dm_keyslot_evict_args { + const struct blk_crypto_key *key; + int err; +}; + +static int dm_keyslot_evict_callback(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) +{ + struct dm_keyslot_evict_args *args = data; + int err; + + err = blk_crypto_evict_key(bdev_get_queue(dev->bdev), args->key); + if (!args->err) + args->err = err; + /* Always try to evict the key from all devices. */ + return 0; +} + +/* + * When an inline encryption key is evicted from a device-mapper device, evict + * it from all the underlying devices. + */ +static int dm_keyslot_evict(struct blk_keyslot_manager *ksm, + const struct blk_crypto_key *key, unsigned int slot) +{ + struct dm_keyslot_manager *dksm = container_of(ksm, + struct dm_keyslot_manager, + ksm); + struct mapped_device *md = dksm->md; + struct dm_keyslot_evict_args args = { key }; + struct dm_table *t; + int srcu_idx; + int i; + struct dm_target *ti; + + t = dm_get_live_table(md, &srcu_idx); + if (!t) + return 0; + for (i = 0; i < dm_table_get_num_targets(t); i++) { + ti = dm_table_get_target(t, i); + if (!ti->type->iterate_devices) + continue; + ti->type->iterate_devices(ti, dm_keyslot_evict_callback, &args); + } + dm_put_live_table(md, srcu_idx); + return args.err; +} + +static struct blk_ksm_ll_ops dm_ksm_ll_ops = { + .keyslot_evict = dm_keyslot_evict, +}; + static int device_intersect_crypto_modes(struct dm_target *ti, struct dm_dev *dev, sector_t start, sector_t len, void *data) @@ -1271,6 +1323,7 @@ dm_table_construct_keyslot_manager(struct dm_table *t) ksm = &dksm->ksm; blk_ksm_init_passthrough(ksm); + ksm->ksm_ll_ops = dm_ksm_ll_ops; ksm->max_dun_bytes_supported = UINT_MAX; memset(ksm->crypto_modes_supported, 0xFF, sizeof(ksm->crypto_modes_supported)); -- 2.30.0.478.g8a0d178c01-goog