Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9652029pxu; Tue, 29 Dec 2020 00:57:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJywnMjJOVSANB7R2drN6FCfE1x9+RGaDw7sBDY7AKrwlLz/+39gv7sAOqRDpWJToGBnMJBf X-Received: by 2002:a17:906:3513:: with SMTP id r19mr43969080eja.445.1609232274811; Tue, 29 Dec 2020 00:57:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609232274; cv=none; d=google.com; s=arc-20160816; b=HHdMT/EsWV3YorKbzfv4CwPs3AGgcQfkXDMposKYBlRJFnO8RIsuMxSTivDEsOcKrf rLpDvyIYLdI9Qb/jm2jphtYhTZb/DcPoK48+QIBy1XR8vxWDIkfdeac/k5iry/bY/ybz u+XXGjOk11aoZpyZel/UzJwzKEO/wokH54RKEFQy2EmHPEJJxNXzTz4q0nK7HLnZyLNP hsy4s0aYo5X6XS9bRcbIinyjgjiTgSrg3F/vvNlh2dF2w+RIEwGAOI3Hya+dqkiFttOS Ru8q8UapT647kI5SUioorQw0di1VKmPl4ZEGDIfszPl2fBHMlq3lYgePU2xNwNX3GWHg jqPw== 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=r1uNbK6vumQ2S39nZ29dwK/wuBEGW5LyLS9BAyhIDUk=; b=LS4JSw5Ej44HWg+uEI+UOjH8PlKC95/K/dHfDVRdp3Gb06LiZCClluu7uErroNgb0g TqFg4tfgjxqLzINYe73oOSZK66z2zVzR30O4X1NQmRLw50wpZASus9LF7q4e27C10+sV Df5ajLFHN404c9fCiM5T9SEtcXb1u7u560v5uTWUVT/A5yeGU9bDhga5V3SUKMKk9aZt ggg5A1vxZh3J6FoAz/4emcgFVWX66xnw9ZKUSuvII2K3l2E9hyx86/yYqBjE3zroxToM 6x1Ihl39zKd7IO5bjUJGRoa1z7MkDnH17aeTKBCGCLBTd/whEr3ILh06ZqVMFGyjj0Ky ynpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=CJKxr1tV; 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 d9si19867506ejd.681.2020.12.29.00.57.32; Tue, 29 Dec 2020 00:57:54 -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=CJKxr1tV; 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 S1726434AbgL2I4o (ORCPT + 99 others); Tue, 29 Dec 2020 03:56:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726350AbgL2I4m (ORCPT ); Tue, 29 Dec 2020 03:56:42 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2417FC0617A1 for ; Tue, 29 Dec 2020 00:55:38 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id o9so22698995yba.4 for ; Tue, 29 Dec 2020 00:55:38 -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=r1uNbK6vumQ2S39nZ29dwK/wuBEGW5LyLS9BAyhIDUk=; b=CJKxr1tVDbYCd2gmA9SkBlYMe/ogzmzQaqOpt1dUZGkoIDBPIu1TyahgJ7yLlRVXEI LVG0HbaYzdac4yPQ0G7ui2cqw5sX7rYggjiQqRykh65ZunCCnZyDAzGWeltD30dZhlnr LYa7svxRhbbIWLHyOdX7ITnNIGogLwGFr8srfk0KQfhLFA/n4ArBGyaXSVrXR0gDzcH6 lBL6XUo1JLCrndsuJfcsi/VGUEWbZMw7epOZDz1iVnkIC+kngniOvW8ZjOkezb8XPvKV w1/0aWTrOtjLGLST7ViOHYpgtbAjURTsyQtYnbECoCKcxDM4J7/vvMgVvziWklqD85JT XqKg== 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=r1uNbK6vumQ2S39nZ29dwK/wuBEGW5LyLS9BAyhIDUk=; b=KbzmE2RsuvIRnBDRLtX/mYKbtuvmc96nmE1sfCDkBZxvBGTmUPU4J5bv3553Udr6bV wVhCGX45AuvrN3G2KkIiFjJnVUhB0P8cjPBVs2s0bS7kGFwkKa8BHfb6w+FyC1ImCzmE vkAWVnEXon+5lpN/mxDTolk9WNU288Ydu43Z2WdTIE6Ot3z7SBnW4BaL1JJQxVZd8wBh KgY7ev/UqxbvFE7pbEBIlx6sOdZ0asSGRP9TjfCTlY7yazgulu5/0QByJOx3DLJWTO/f qQyRAzI33J3GGMszj6CgesJykplGhmHni/WGOfU9KMtt1EyMAqYoBce/Cd6bw0GdiOLL uy7g== X-Gm-Message-State: AOAM532s9iInZgYv5nT/1LLmq5DNO5ahlJHWpl5zV202hjND/MFDYxuG JFokeSHYajiLgZ8gIMqqTtqhbdhP4wA= 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:a25:aa91:: with SMTP id t17mr63938387ybi.394.1609232137422; Tue, 29 Dec 2020 00:55:37 -0800 (PST) Date: Tue, 29 Dec 2020 08:55:22 +0000 In-Reply-To: <20201229085524.2795331-1-satyat@google.com> Message-Id: <20201229085524.2795331-5-satyat@google.com> Mime-Version: 1.0 References: <20201229085524.2795331-1-satyat@google.com> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog Subject: [PATCH v3 4/6] 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 --- block/blk-crypto.c | 1 + drivers/md/dm.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.c b/drivers/md/dm.c index 13b9c8e2e21b..b8844171d8e4 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1949,6 +1949,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) @@ -1998,6 +2050,7 @@ dm_construct_keyslot_manager(struct mapped_device *md, 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.29.2.729.g45daf8777d-goog