From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,T_DKIMWL_WL_MED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham 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 70A92C04A6B for ; Mon, 6 May 2019 22:42:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34DA72082F for ; Mon, 6 May 2019 22:42:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S1yBDfff" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726691AbfEFWmm (ORCPT ); Mon, 6 May 2019 18:42:42 -0400 Received: from mail-pl1-f201.google.com ([209.85.214.201]:54461 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726481AbfEFWmm (ORCPT ); Mon, 6 May 2019 18:42:42 -0400 Received: by mail-pl1-f201.google.com with SMTP id x2so7976846plr.21 for ; Mon, 06 May 2019 15:42:41 -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=ipw+LMcfEDjJ+AA2+yx8vQdoGWoNvZJDgj4O5eaPy48=; b=S1yBDfff9buckZcEiJxBRkUjcgtNAPoOHcbr4h6qmmtAE4OvAYHwqGl2iQ2ZcVPVMU yB6fv5QZb/10blblZIwslNDvVNcCnd8ezvGn+vUIORUwfkwxodIfHSA/+OJ7k2NUUiwP a8hfoNb8PTz08RasQK//dfPx7MEwRaT2yqg5cVJcxcdFPJMsc+xe9H4Ef3K0EPMLet4n O70bba9261xVQ8cJo4kUpKBkrrz3+n1EGZDx+oHc3V9WMjfyCaGMExQN/YTd2Yz3O9Sy wTNQ1276oIS2dJ/YURK6XMEy0d8KCAIUuiUSKQ9OGTlDYk1KpCCYgh3H4A7pypx1o8BD xcCw== 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=ipw+LMcfEDjJ+AA2+yx8vQdoGWoNvZJDgj4O5eaPy48=; b=qm2rJIyxtuZxrCLvFyPno+CrLexqjInB6h4yIkbXqyHbLJNKmyayEA/UWhMETpgM26 H7yd1sn3TaqZyAO3WgREQic1AyhTfavklrF9ZV+8HlDKo9dKOOgfemlGL91TaoxjemN4 44w/43lAlrJZZxx6CzwifEWcBsiPNtSzLjXPZXDMIuZ1YnrILcY16d38mJ1JyX7qvUuJ 3GVAkgDePcZz8y3VaEQJVjJPuMavA9ZwIDQ2VSdE5Jx38vRqPmIBrJRPGya/kphZOf7j hpF5XXKB9ffbrKOohlXm05BeUOpmccUMR4OeqEx+qeom/iSA2bP2O5sT2WIkk5Hxg8Bl Vqdw== X-Gm-Message-State: APjAAAWu6/j26glX95+4Wo6Axyo+kdPZfXyBdGXM04sXCiZE67QTIbRN +KFb4gR0qBrU14dlQEOI2gfhz1d4wT5Pikkfy80+raaG1UxvYTdLXPPYG+S4TNMinttRbDnrOp5 BdN81au2YQaOetuFJP9xyk0iPVjHmciMVwKTEKdr542BlrLpH2j6AuVz/4Ve17b8FVgKj X-Google-Smtp-Source: APXvYqxIH+MnjuhsHaj8L0248uwqZ8fzbJ1KTD7utVUEd0u/SAgCR7YoMJxT1E67epSkPA6O4rcT88ZCZ5Y= X-Received: by 2002:a63:d615:: with SMTP id q21mr16154733pgg.401.1557182561147; Mon, 06 May 2019 15:42:41 -0700 (PDT) Date: Mon, 6 May 2019 15:35:44 -0700 In-Reply-To: <20190506223544.195371-1-satyat@google.com> Message-Id: <20190506223544.195371-5-satyat@google.com> Mime-Version: 1.0 References: <20190506223544.195371-1-satyat@google.com> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog Subject: [RFC PATCH 4/4] f2fs: Wire up f2fs to use inline encryption via fscrypt From: Satya Tangirala To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Parshuram Raju Thombare , Ladvine D Almeida , Barani Muthukumaran , Kuohong Wang , Satya Tangirala Content-Type: text/plain; charset="UTF-8" Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Signed-off-by: Satya Tangirala --- fs/f2fs/data.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++--- fs/f2fs/super.c | 1 + 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 9727944139f2..7ac6768a52a5 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -279,9 +279,18 @@ static struct bio *__bio_alloc(struct f2fs_sb_info *sbi, block_t blk_addr, return bio; } +static inline u64 hw_crypt_dun(struct inode *inode, struct page *page) +{ + return (((u64)inode->i_ino) << 32) | (page->index & 0xFFFFFFFF); +} + static inline void __submit_bio(struct f2fs_sb_info *sbi, struct bio *bio, enum page_type type) { + struct page *page; + struct inode *inode; + int err = 0; + if (!is_read_io(bio_op(bio))) { unsigned int start; @@ -323,7 +332,21 @@ static inline void __submit_bio(struct f2fs_sb_info *sbi, trace_f2fs_submit_read_bio(sbi->sb, type, bio); else trace_f2fs_submit_write_bio(sbi->sb, type, bio); - submit_bio(bio); + + if (bio_has_data(bio)) { + page = bio_page(bio); + if (page && page->mapping && page->mapping->host) { + inode = page->mapping->host; + err = fscrypt_set_bio_crypt_ctx(inode, bio, + hw_crypt_dun(inode, page)); + } + } + if (err) { + bio->bi_status = BLK_STS_IOERR; + bio_endio(bio); + } else { + submit_bio(bio); + } } static void __submit_merged_bio(struct f2fs_bio_info *io) @@ -484,6 +507,9 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) enum page_type btype = PAGE_TYPE_OF_BIO(fio->type); struct f2fs_bio_info *io = sbi->write_io[btype] + fio->temp; struct page *bio_page; + struct inode *fio_inode, *bio_inode; + struct page *first_page; + u64 next_dun = 0; f2fs_bug_on(sbi, is_read_io(fio->op)); @@ -512,10 +538,29 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) inc_page_count(sbi, WB_DATA_TYPE(bio_page)); + fio_inode = fio->page->mapping->host; + bio_inode = NULL; + first_page = NULL; + next_dun = 0; + if (io->bio) { + first_page = bio_page(io->bio); + if (first_page->mapping) { + bio_inode = first_page->mapping->host; + if (fscrypt_inode_is_hw_encrypted(bio_inode)) { + next_dun = + hw_crypt_dun(bio_inode, first_page) + + (io->bio->bi_iter.bi_size >> PAGE_SHIFT); + } + } + } if (io->bio && (io->last_block_in_bio != fio->new_blkaddr - 1 || (io->fio.op != fio->op || io->fio.op_flags != fio->op_flags) || - !__same_bdev(sbi, fio->new_blkaddr, io->bio))) + !__same_bdev(sbi, fio->new_blkaddr, io->bio) || + !fscrypt_inode_crypt_mergeable(bio_inode, fio_inode) || + (fscrypt_inode_is_hw_encrypted(bio_inode) && + next_dun != hw_crypt_dun(fio_inode, fio->page)))) __submit_merged_bio(io); + alloc_new: if (io->bio == NULL) { if ((fio->type == DATA || fio->type == NODE) && @@ -570,7 +615,7 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, bio->bi_end_io = f2fs_read_end_io; bio_set_op_attrs(bio, REQ_OP_READ, op_flag); - if (f2fs_encrypted_file(inode)) + if (f2fs_encrypted_file(inode) && !fscrypt_inode_is_hw_encrypted(inode)) post_read_steps |= 1 << STEP_DECRYPT; if (post_read_steps) { ctx = mempool_alloc(bio_post_read_ctx_pool, GFP_NOFS); @@ -1525,6 +1570,7 @@ static int f2fs_mpage_readpages(struct address_space *mapping, sector_t last_block_in_file; sector_t block_nr; struct f2fs_map_blocks map; + u64 next_dun = 0; map.m_pblk = 0; map.m_lblk = 0; @@ -1606,6 +1652,13 @@ static int f2fs_mpage_readpages(struct address_space *mapping, __submit_bio(F2FS_I_SB(inode), bio, DATA); bio = NULL; } + + if (bio && fscrypt_inode_is_hw_encrypted(inode) && + next_dun != hw_crypt_dun(inode, page)) { + __submit_bio(F2FS_I_SB(inode), bio, DATA); + bio = NULL; + } + if (bio == NULL) { bio = f2fs_grab_read_bio(inode, block_nr, nr_pages, is_readahead ? REQ_RAHEAD : 0); @@ -1624,6 +1677,9 @@ static int f2fs_mpage_readpages(struct address_space *mapping, if (bio_add_page(bio, page, blocksize, 0) < blocksize) goto submit_and_realloc; + if (fscrypt_inode_is_hw_encrypted(inode)) + next_dun = hw_crypt_dun(inode, page) + 1; + inc_page_count(F2FS_I_SB(inode), F2FS_RD_DATA); ClearPageError(page); last_block_in_bio = block_nr; @@ -2591,12 +2647,19 @@ static void f2fs_dio_submit_bio(struct bio *bio, struct inode *inode, { struct f2fs_private_dio *dio; bool write = (bio_op(bio) == REQ_OP_WRITE); + u64 data_unit_num = (((u64)inode->i_ino) << 32) | + ((file_offset >> PAGE_SHIFT) & 0xFFFFFFFF); dio = f2fs_kzalloc(F2FS_I_SB(inode), sizeof(struct f2fs_private_dio), GFP_NOFS); if (!dio) goto out; + if (fscrypt_set_bio_crypt_ctx(inode, bio, data_unit_num) != 0) { + kvfree(dio); + goto out; + } + dio->inode = inode; dio->orig_end_io = bio->bi_end_io; dio->orig_private = bio->bi_private; diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index f2aaa2cc6b3e..e98c85d42e8d 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2225,6 +2225,7 @@ static const struct fscrypt_operations f2fs_cryptops = { .dummy_context = f2fs_dummy_context, .empty_dir = f2fs_empty_dir, .max_namelen = F2FS_NAME_LEN, + .hw_crypt_supp = true, }; #endif -- 2.21.0.1020.gf2820cf01a-goog