From: Chandan Rajendra <chandan@linux.ibm.com> To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fscrypt@vger.kernel.org Cc: Chandan Rajendra <chandan@linux.ibm.com>, tytso@mit.edu, adilger.kernel@dilger.ca, ebiggers@kernel.org, jaegeuk@kernel.org, yuchao0@huawei.com, hch@infradead.org Subject: [PATCH V2 13/13] ext4: Enable encryption for subpage-sized blocks Date: Sun, 28 Apr 2019 10:01:21 +0530 [thread overview] Message-ID: <20190428043121.30925-14-chandan@linux.ibm.com> (raw) In-Reply-To: <20190428043121.30925-1-chandan@linux.ibm.com> Now that we have the code to support encryption for subpage-sized blocks, this commit removes the conditional check in filesystem mount code. The commit also changes the support statement in Documentation/filesystems/fscrypt.rst to reflect the fact that encryption of filesystems with blocksize less than page size now works. Signed-off-by: Chandan Rajendra <chandan@linux.ibm.com> --- Documentation/filesystems/fscrypt.rst | 4 ++-- fs/ext4/super.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst index 08c23b60e016..ff2fea121da9 100644 --- a/Documentation/filesystems/fscrypt.rst +++ b/Documentation/filesystems/fscrypt.rst @@ -213,8 +213,8 @@ Contents encryption ------------------- For file contents, each filesystem block is encrypted independently. -Currently, only the case where the filesystem block size is equal to -the system's page size (usually 4096 bytes) is supported. +Starting from Linux kernel 5.3, encryption of filesystems with block +size less than system's page size is supported. Each block's IV is set to the logical block number within the file as a little endian number, except that: diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 8e483afbaa2e..4acfefa98ec5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4432,13 +4432,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) } } - if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) && - (blocksize != PAGE_SIZE)) { - ext4_msg(sb, KERN_ERR, - "Unsupported blocksize for fs encryption"); - goto failed_mount_wq; - } - if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) && !ext4_has_feature_encrypt(sb)) { ext4_set_feature_encrypt(sb); -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Chandan Rajendra <chandan@linux.ibm.com> To: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fscrypt@vger.kernel.org Cc: hch@infradead.org, tytso@mit.edu, ebiggers@kernel.org, Chandan Rajendra <chandan@linux.ibm.com>, adilger.kernel@dilger.ca, jaegeuk@kernel.org Subject: [PATCH V2 13/13] ext4: Enable encryption for subpage-sized blocks Date: Sun, 28 Apr 2019 10:01:21 +0530 [thread overview] Message-ID: <20190428043121.30925-14-chandan@linux.ibm.com> (raw) In-Reply-To: <20190428043121.30925-1-chandan@linux.ibm.com> Now that we have the code to support encryption for subpage-sized blocks, this commit removes the conditional check in filesystem mount code. The commit also changes the support statement in Documentation/filesystems/fscrypt.rst to reflect the fact that encryption of filesystems with blocksize less than page size now works. Signed-off-by: Chandan Rajendra <chandan@linux.ibm.com> --- Documentation/filesystems/fscrypt.rst | 4 ++-- fs/ext4/super.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst index 08c23b60e016..ff2fea121da9 100644 --- a/Documentation/filesystems/fscrypt.rst +++ b/Documentation/filesystems/fscrypt.rst @@ -213,8 +213,8 @@ Contents encryption ------------------- For file contents, each filesystem block is encrypted independently. -Currently, only the case where the filesystem block size is equal to -the system's page size (usually 4096 bytes) is supported. +Starting from Linux kernel 5.3, encryption of filesystems with block +size less than system's page size is supported. Each block's IV is set to the logical block number within the file as a little endian number, except that: diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 8e483afbaa2e..4acfefa98ec5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4432,13 +4432,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) } } - if ((DUMMY_ENCRYPTION_ENABLED(sbi) || ext4_has_feature_encrypt(sb)) && - (blocksize != PAGE_SIZE)) { - ext4_msg(sb, KERN_ERR, - "Unsupported blocksize for fs encryption"); - goto failed_mount_wq; - } - if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) && !ext4_has_feature_encrypt(sb)) { ext4_set_feature_encrypt(sb); -- 2.19.1
next prev parent reply other threads:[~2019-04-28 4:31 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-28 4:31 [PATCH V2 00/13] Consolidate FS read I/O callbacks code Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 01/13] ext4: Clear BH_Uptodate flag on decryption error Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 02/13] Consolidate "read callbacks" into a new file Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-30 0:00 ` [f2fs-dev] " Eric Biggers 2019-04-30 0:00 ` Eric Biggers 2019-04-30 0:00 ` Eric Biggers 2019-05-01 12:30 ` Chandan Rajendra 2019-05-01 12:30 ` Chandan Rajendra 2019-04-30 1:37 ` Chao Yu 2019-04-30 1:37 ` Chao Yu 2019-04-30 1:37 ` Chao Yu 2019-05-01 12:31 ` Chandan Rajendra 2019-05-01 12:31 ` Chandan Rajendra 2019-04-30 18:05 ` [f2fs-dev] " Eric Biggers 2019-04-30 18:05 ` Eric Biggers 2019-04-30 18:05 ` Eric Biggers 2019-05-01 12:32 ` Chandan Rajendra 2019-05-01 12:32 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 03/13] fsverity: Add call back to decide if verity check has to be performed Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-30 21:10 ` Jeremy Sowden 2019-05-01 12:33 ` Chandan Rajendra 2019-05-01 12:33 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 04/13] fsverity: Add call back to determine readpage limit Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 05/13] fs/mpage.c: Integrate read callbacks Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 06/13] ext4: Wire up ext4_readpage[s] to use mpage_readpage[s] Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 07/13] Add decryption support for sub-pagesized blocks Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-30 0:38 ` [f2fs-dev] " Eric Biggers 2019-04-30 0:38 ` Eric Biggers 2019-04-30 0:38 ` Eric Biggers 2019-05-01 13:40 ` Chandan Rajendra 2019-05-01 13:40 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 08/13] ext4: Decrypt all boundary blocks when doing buffered write Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 09/13] ext4: Decrypt the block that needs to be partially zeroed Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 10/13] fscrypt_encrypt_page: Loop across all blocks mapped by a page range Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-30 17:11 ` [f2fs-dev] " Eric Biggers 2019-04-30 17:11 ` Eric Biggers 2019-04-30 17:11 ` Eric Biggers 2019-04-30 23:08 ` [f2fs-dev] " Eric Biggers 2019-04-30 23:08 ` Eric Biggers 2019-05-01 14:49 ` [f2fs-dev] " Chandan Rajendra 2019-05-01 14:49 ` Chandan Rajendra 2019-05-01 22:29 ` [f2fs-dev] " Eric Biggers 2019-05-01 22:29 ` Eric Biggers 2019-05-02 5:52 ` [f2fs-dev] " Chandan Rajendra 2019-05-02 5:52 ` Chandan Rajendra 2019-05-02 18:16 ` [f2fs-dev] " Eric Biggers 2019-05-02 18:16 ` Eric Biggers 2019-04-28 4:31 ` [PATCH V2 11/13] ext4: Compute logical block and the page range to be encrypted Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-30 17:01 ` Eric Biggers 2019-04-30 17:01 ` Eric Biggers 2019-05-01 14:11 ` Chandan Rajendra 2019-05-01 14:11 ` Chandan Rajendra 2019-04-28 4:31 ` [PATCH V2 12/13] fscrypt_zeroout_range: Encrypt all zeroed out blocks of a page Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra 2019-04-30 16:51 ` Eric Biggers 2019-04-30 16:51 ` Eric Biggers 2019-05-01 14:22 ` Chandan Rajendra 2019-05-01 14:22 ` Chandan Rajendra 2019-04-28 4:31 ` Chandan Rajendra [this message] 2019-04-28 4:31 ` [PATCH V2 13/13] ext4: Enable encryption for subpage-sized blocks Chandan Rajendra 2019-04-30 0:27 ` [PATCH V2 00/13] Consolidate FS read I/O callbacks code Matthew Wilcox 2019-04-30 0:27 ` Matthew Wilcox
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190428043121.30925-14-chandan@linux.ibm.com \ --to=chandan@linux.ibm.com \ --cc=adilger.kernel@dilger.ca \ --cc=ebiggers@kernel.org \ --cc=hch@infradead.org \ --cc=jaegeuk@kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=tytso@mit.edu \ --cc=yuchao0@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.