From patchwork Wed May 1 22:45:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10925637 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7CDB14DB for ; Wed, 1 May 2019 22:46:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B86E528F53 for ; Wed, 1 May 2019 22:46:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC66028F55; Wed, 1 May 2019 22:46:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SUSPICIOUS_RECIPS autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 523B828F53 for ; Wed, 1 May 2019 22:46:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726183AbfEAWqG (ORCPT ); Wed, 1 May 2019 18:46:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726126AbfEAWqG (ORCPT ); Wed, 1 May 2019 18:46:06 -0400 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA3792075E; Wed, 1 May 2019 22:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556750765; bh=oGYtn9WG6er+4eiwYl5cJh2irdpTYgDLIblN4GE18gE=; h=From:To:Cc:Subject:Date:From; b=fY4qq9BAopEMgbyNEunjj+aef9mfWckZY+TJ4tM2F9Yms7jKNXtspSCI4MTU8zXaG b7538Lqq4jiQWV0QrHpbaVi5BTg05KPbB0pix79PFbPT1Ve17AUnOmS6V4Qt4lmAqB G2UwnTy2ET1YrFL8yY0aMeRi7tzVGJLjHvgWyWxA= From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, Chandan Rajendra Subject: [PATCH 00/13] fscrypt, ext4: prepare for blocksize != PAGE_SIZE Date: Wed, 1 May 2019 15:45:02 -0700 Message-Id: <20190501224515.43059-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hello, This patch series prepares fs/crypto/, and partially ext4, for the 'blocksize != PAGE_SIZE' case. This basically contains the encryption changes from Chandan Rajendra's patch series "[V2,00/13] Consolidate FS read I/O callbacks code" (https://patchwork.kernel.org/project/linux-fscrypt/list/?series=111039) that don't require introducing the read_callbacks and don't depend on fsverity stuff. But they've been reworked to clean things up a lot. I propose that to move things forward for ext4 encryption with 'blocksize != PAGE_SIZE', we apply this series (or something similar) to the fscrypt tree for 5.3 on its own merits. Then the read_callbacks series on top of it will much smaller and easier to review. AFAIK, after this series the only thing stopping ext4 encryption from working with blocksize != PAGE_SIZE is the lack of encryption support in block_read_full_page(), which the read_callbacks will address. This series applies to the fscrypt tree, and it can also be retrieved from git at https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git branch "fscrypt-subpage-blocks-prep". Chandan Rajendra (3): ext4: clear BH_Uptodate flag on decryption error ext4: decrypt only the needed blocks in ext4_block_write_begin() ext4: decrypt only the needed block in __ext4_block_zero_page_range() Eric Biggers (10): fscrypt: simplify bounce page handling fscrypt: remove the "write" part of struct fscrypt_ctx fscrypt: rename fscrypt_do_page_crypto() to fscrypt_crypt_block() fscrypt: clean up some BUG_ON()s in block encryption/decryption fscrypt: introduce fscrypt_encrypt_block_inplace() fscrypt: support encrypting multiple filesystem blocks per page fscrypt: handle blocksize < PAGE_SIZE in fscrypt_zeroout_range() fscrypt: introduce fscrypt_decrypt_block_inplace() fscrypt: support decrypting multiple filesystem blocks per page ext4: encrypt only up to last block in ext4_bio_write_page() fs/crypto/bio.c | 73 +++------ fs/crypto/crypto.c | 299 ++++++++++++++++++++---------------- fs/crypto/fscrypt_private.h | 14 +- fs/ext4/inode.c | 35 +++-- fs/ext4/page-io.c | 44 +++--- fs/f2fs/data.c | 17 +- fs/ubifs/crypto.c | 19 +-- include/linux/fscrypt.h | 96 ++++++++---- 8 files changed, 319 insertions(+), 278 deletions(-)