Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp299409ybt; Wed, 17 Jun 2020 00:58:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4Knnbm2NZTEVoFJugoZR+Hdq0Ud1GDTCmmRiVURs4mq+MTGu+P7sVzsWvxmoqHasSu7qJ X-Received: by 2002:a50:cd56:: with SMTP id d22mr5933722edj.374.1592380728945; Wed, 17 Jun 2020 00:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592380728; cv=none; d=google.com; s=arc-20160816; b=TkPhsQjZPLO5a9Dt1KbEjm9YK0HxrJseQBrn3rnaaDEN6LkQsESVY0LVWxEiu+hvzW b7peIl69bNc9nDXUJ2+0jFCVHllOBc+xMlEvdTQW1DRWRpJ211VqFLMbKIK8k9tzLLGn wPzzt12Rk5eDjkwZULBJ4YAKSj83ewzFGEjYLKuNvYiEKqjs1shQ0f+KwiMSnYkhARW3 MbdLIhKXj79r+bAZ51qBqpcPf1vcw6+gTLmxYobPT+p4G4QoNHLP0+jmcJgUSKAA+1T3 WhukHw/vKMjhCI6bGZzdlaK34j16HlAF77vubUA/LHENuKv7nTGjTXRsRRXG3uHknB1Q Sf+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=CqZG97JVHZcBPtxJbWwZOYxEADxq6I0BjAv+AC5lBlY=; b=abjOKb8bPZggDaVIJgZvKd0Vi9VcVF+MiZWOZPtxLPHJglA9n2nzW+XGozD4Iz4Kka zLyUzSqZdo6b9W43w2tlRer0qL454JgMsKtuKkfgRzfmsP6RuxzNGCTHcMZ6pt3pyFmv Pkfmcc73om3p6jvjh9Ji2PoU3UO6ere+7OLVOnnhcAKmIDHel/xWKWgg/V6VNJ8wkdYA gyBjZRvPagPby4ngn4eCNPLczDuX7dRne7IFfeUi5SREFh8atonjDCRKa+Wn2Vd5qlAz F+n+gQS4fY0nnvmHOxVtnTLagGI1gC2BJjFAaKjCjiPKuTZiPMTI5aGjsvloKS2kHUcO d33A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="J/hdnoxs"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-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 n19si5878168ejb.704.2020.06.17.00.58.25; Wed, 17 Jun 2020 00:58:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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="J/hdnoxs"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-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 S1725941AbgFQH5v (ORCPT + 99 others); Wed, 17 Jun 2020 03:57:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726599AbgFQH5p (ORCPT ); Wed, 17 Jun 2020 03:57:45 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAA77C061573 for ; Wed, 17 Jun 2020 00:57:43 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id a188so1589653ybg.20 for ; Wed, 17 Jun 2020 00:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=CqZG97JVHZcBPtxJbWwZOYxEADxq6I0BjAv+AC5lBlY=; b=J/hdnoxs9y9itHtZ/Zj/omkvkVfJ4/7zn18/chvibBZzCuUDuvvN4cTK3E42pIRCHx GeouLThqV2lRZ0YdLZeUv5WnxmDiJZPwL7G9fiUKD8rSY6tPH1GXwICswkNXPQWPw0nj RKZurAG36NfWMoi+gJC46xosmSsEjuhWdgWgoWlgSd0/zfiXJDMOo3FOjmwa51CWSgza IC3fnfbWhYc3FkPrhOm2QQjbO1ILegp7sDurd6GH2lQeHT24AhkTEZJN2lZ9CrI/QOU/ LGJXngtvRRkxWH1MiTCt5EAWPqI6ZFRmU+/5unlCJrOzKQQlL+peR47DkPQLX2vNnpJE AT1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=CqZG97JVHZcBPtxJbWwZOYxEADxq6I0BjAv+AC5lBlY=; b=W85R5Nv0SSTHBojauxwyO38+G5tZKIr6rJMSo7nbAyf9qBTIYrIZk/k+zP4wdRt2sG xKPWO8WWCQhIIK9d8jJ5XyMM4AggoSwVXr9HdZjxiwrr450IV9H8DtR8Dr4bd6h0Ehm5 ADL9KoRUGZjOtENYlXC+z6Z67zaHBm2Z5yAGNllZiNiJ29RuCEG5Mdqq6fN+WKbQ1xAE aeoHHgbU0IYDcdxLOONu8WuH4s6chLZmLPYk1XM/x44AHa17hLvfGtXytO5SgjcUf3uw o0E2+4jYx+cNgiPgWL+CKjSLWkqDUhNL7WYtuQC1MM4N1o+yq2r4olNcf+fx/eUN28rj 9Qzg== X-Gm-Message-State: AOAM532SkVIqUE2juJdLPo9wsy5v7KwsZsDbTzmSi1fmMC2E5YM5Mxb+ CNgv8X1MWsjAaNW+jwz18WocSAd07sM= X-Received: by 2002:a25:4b87:: with SMTP id y129mr10300027yba.412.1592380663125; Wed, 17 Jun 2020 00:57:43 -0700 (PDT) Date: Wed, 17 Jun 2020 07:57:32 +0000 In-Reply-To: <20200617075732.213198-1-satyat@google.com> Message-Id: <20200617075732.213198-5-satyat@google.com> Mime-Version: 1.0 References: <20200617075732.213198-1-satyat@google.com> X-Mailer: git-send-email 2.27.0.290.gba653c62da-goog Subject: [PATCH 4/4] ext4: add inline encryption support From: Satya Tangirala To: linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-ext4@vger.kernel.org Cc: Eric Biggers , Satya Tangirala Content-Type: text/plain; charset="UTF-8" Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Eric Biggers Wire up ext4 to support inline encryption via the helper functions which fs/crypto/ now provides. This includes: - Adding a mount option 'inlinecrypt' which enables inline encryption on encrypted files where it can be used. - Setting the bio_crypt_ctx on bios that will be submitted to an inline-encrypted file. Note: submit_bh_wbc() in fs/buffer.c also needed to be patched for this part, since ext4 sometimes uses ll_rw_block() on file data. - Not adding logically discontiguous data to bios that will be submitted to an inline-encrypted file. - Not doing filesystem-layer crypto on inline-encrypted files. Signed-off-by: Eric Biggers Co-developed-by: Satya Tangirala Signed-off-by: Satya Tangirala --- Documentation/admin-guide/ext4.rst | 6 ++++++ fs/buffer.c | 7 ++++--- fs/ext4/inode.c | 4 ++-- fs/ext4/page-io.c | 6 ++++-- fs/ext4/readpage.c | 11 ++++++++--- fs/ext4/super.c | 9 +++++++++ 6 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Documentation/admin-guide/ext4.rst b/Documentation/admin-guide/ext4.rst index 9443fcef1876..ed997e376678 100644 --- a/Documentation/admin-guide/ext4.rst +++ b/Documentation/admin-guide/ext4.rst @@ -395,6 +395,12 @@ When mounting an ext4 filesystem, the following option are accepted: Documentation/filesystems/dax.txt. Note that this option is incompatible with data=journal. + inlinecrypt + Encrypt/decrypt the contents of encrypted files using the blk-crypto + framework rather than filesystem-layer encryption. This allows the use + of inline encryption hardware. The on-disk format is unaffected. For + more details, see Documentation/block/inline-encryption.rst. + Data Mode ========= There are 3 different data modes: diff --git a/fs/buffer.c b/fs/buffer.c index 64fe82ec65ff..dc5e05b47646 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -320,9 +320,8 @@ static void decrypt_bh(struct work_struct *work) static void end_buffer_async_read_io(struct buffer_head *bh, int uptodate) { /* Decrypt if needed */ - if (uptodate && IS_ENABLED(CONFIG_FS_ENCRYPTION) && - IS_ENCRYPTED(bh->b_page->mapping->host) && - S_ISREG(bh->b_page->mapping->host->i_mode)) { + if (uptodate && + fscrypt_inode_uses_fs_layer_crypto(bh->b_page->mapping->host)) { struct decrypt_bh_ctx *ctx = kmalloc(sizeof(*ctx), GFP_ATOMIC); if (ctx) { @@ -3046,6 +3045,8 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, */ bio = bio_alloc(GFP_NOIO, 1); + fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO); + bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio_set_dev(bio, bh->b_bdev); bio->bi_write_hint = write_hint; diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 40ec5c7ef0d3..54a027489c9c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1096,7 +1096,7 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, } if (unlikely(err)) { page_zero_new_buffers(page, from, to); - } else if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) { + } else if (fscrypt_inode_uses_fs_layer_crypto(inode)) { for (i = 0; i < nr_wait; i++) { int err2; @@ -3737,7 +3737,7 @@ static int __ext4_block_zero_page_range(handle_t *handle, /* Uhhuh. Read error. Complain and punt. */ if (!buffer_uptodate(bh)) goto unlock; - if (S_ISREG(inode->i_mode) && IS_ENCRYPTED(inode)) { + if (fscrypt_inode_uses_fs_layer_crypto(inode)) { /* We expect the key to be set. */ BUG_ON(!fscrypt_has_encryption_key(inode)); err = fscrypt_decrypt_pagecache_blocks(page, blocksize, diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index de6fe969f773..defd2e10dfd1 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -402,6 +402,7 @@ static void io_submit_init_bio(struct ext4_io_submit *io, * __GFP_DIRECT_RECLAIM is set, see comments for bio_alloc_bioset(). */ bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES); + fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO); bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9); bio_set_dev(bio, bh->b_bdev); bio->bi_end_io = ext4_end_bio; @@ -418,7 +419,8 @@ static void io_submit_add_bh(struct ext4_io_submit *io, { int ret; - if (io->io_bio && bh->b_blocknr != io->io_next_block) { + if (io->io_bio && (bh->b_blocknr != io->io_next_block || + !fscrypt_mergeable_bio_bh(io->io_bio, bh))) { submit_and_retry: ext4_io_submit(io); } @@ -506,7 +508,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, * (e.g. holes) to be unnecessarily encrypted, but this is rare and * can't happen in the common case of blocksize == PAGE_SIZE. */ - if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode) && nr_to_submit) { + if (fscrypt_inode_uses_fs_layer_crypto(inode) && nr_to_submit) { gfp_t gfp_flags = GFP_NOFS; unsigned int enc_bytes = round_up(len, i_blocksize(inode)); diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index 5761e9961682..f2df2db0786c 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -195,7 +195,7 @@ static void ext4_set_bio_post_read_ctx(struct bio *bio, { unsigned int post_read_steps = 0; - if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) + if (fscrypt_inode_uses_fs_layer_crypto(inode)) post_read_steps |= 1 << STEP_DECRYPT; if (ext4_need_verity(inode, first_idx)) @@ -230,6 +230,7 @@ int ext4_mpage_readpages(struct inode *inode, const unsigned blkbits = inode->i_blkbits; const unsigned blocks_per_page = PAGE_SIZE >> blkbits; const unsigned blocksize = 1 << blkbits; + sector_t next_block; sector_t block_in_file; sector_t last_block; sector_t last_block_in_file; @@ -258,7 +259,8 @@ int ext4_mpage_readpages(struct inode *inode, if (page_has_buffers(page)) goto confused; - block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits); + block_in_file = next_block = + (sector_t)page->index << (PAGE_SHIFT - blkbits); last_block = block_in_file + nr_pages * blocks_per_page; last_block_in_file = (ext4_readpage_limit(inode) + blocksize - 1) >> blkbits; @@ -358,7 +360,8 @@ int ext4_mpage_readpages(struct inode *inode, * This page will go to BIO. Do we need to send this * BIO off first? */ - if (bio && (last_block_in_bio != blocks[0] - 1)) { + if (bio && (last_block_in_bio != blocks[0] - 1 || + !fscrypt_mergeable_bio(bio, inode, next_block))) { submit_and_realloc: submit_bio(bio); bio = NULL; @@ -370,6 +373,8 @@ int ext4_mpage_readpages(struct inode *inode, */ bio = bio_alloc(GFP_KERNEL, min_t(int, nr_pages, BIO_MAX_PAGES)); + fscrypt_set_bio_crypt_ctx(bio, inode, next_block, + GFP_KERNEL); ext4_set_bio_post_read_ctx(bio, inode, page->index); bio_set_dev(bio, bdev); bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index c668f6b42374..faf9e5eaa029 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1511,6 +1511,7 @@ enum { Opt_journal_path, Opt_journal_checksum, Opt_journal_async_commit, Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, Opt_data_err_abort, Opt_data_err_ignore, Opt_test_dummy_encryption, + Opt_inlinecrypt, Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, @@ -1609,6 +1610,7 @@ static const match_table_t tokens = { {Opt_max_dir_size_kb, "max_dir_size_kb=%u"}, {Opt_test_dummy_encryption, "test_dummy_encryption=%s"}, {Opt_test_dummy_encryption, "test_dummy_encryption"}, + {Opt_inlinecrypt, "inlinecrypt"}, {Opt_nombcache, "nombcache"}, {Opt_nombcache, "no_mbcache"}, /* for backward compatibility */ {Opt_removed, "check=none"}, /* mount option from ext2/3 */ @@ -1938,6 +1940,13 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, case Opt_nolazytime: sb->s_flags &= ~SB_LAZYTIME; return 1; + case Opt_inlinecrypt: +#ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT + sb->s_flags |= SB_INLINECRYPT; +#else + ext4_msg(sb, KERN_ERR, "inline encryption not supported"); +#endif + return 1; } for (m = ext4_mount_opts; m->token != Opt_err; m++) -- 2.27.0.290.gba653c62da-goog