Commit 3c7eaa77 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Eric Biggers
Browse files

fscrypt: pass a byte offset to fscrypt_set_bio_crypt_ctx 



Logical offsets into an inode are usually expressed as bytes in the VFS.
Switch fscrypt_set_bio_crypt_ctx to that convention.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20260302141922.370070-9-hch@lst.de


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 22be86a2

fs/buffer.c

+2 −5
Original line number Diff line number Diff line
@@ -2778,8 +2778,6 @@ static void buffer_set_crypto_ctx(struct bio *bio, const struct buffer_head *bh, 
				  gfp_t gfp_mask)

{

	const struct address_space *mapping = folio_mapping(bh->b_folio);

	const struct inode *inode;

	u64 lblk;



	/*

	 * The ext4 journal (jbd2) can submit a buffer_head it directly created
@@ -2787,9 +2785,8 @@ static void buffer_set_crypto_ctx(struct bio *bio, const struct buffer_head *bh, 
	 */

	if (!mapping)

		return;

	inode = mapping->host;

	lblk = (folio_pos(bh->b_folio) + bh_offset(bh)) >> inode->i_blkbits;

	fscrypt_set_bio_crypt_ctx(bio, inode, lblk, gfp_mask);

	fscrypt_set_bio_crypt_ctx(bio, mapping->host,

			folio_pos(bh->b_folio) + bh_offset(bh), gfp_mask);

}



static void submit_bh_wbc(blk_opf_t opf, struct buffer_head *bh,

fs/crypto/bio.c

+4 −4
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, 
{

	const unsigned int blockbits = inode->i_blkbits;

	const unsigned int blocks_per_page = 1 << (PAGE_SHIFT - blockbits);

	loff_t pos = (loff_t)lblk << blockbits;

	struct fscrypt_zero_done done = {

		.pending	= ATOMIC_INIT(1),

		.done		= COMPLETION_INITIALIZER_ONSTACK(done.done),
@@ -89,7 +90,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, 
		bio->bi_iter.bi_sector = sector;

		bio->bi_private = &done;

		bio->bi_end_io = fscrypt_zeroout_range_end_io;

		fscrypt_set_bio_crypt_ctx(bio, inode, lblk, GFP_NOFS);

		fscrypt_set_bio_crypt_ctx(bio, inode, pos, GFP_NOFS);



		for (n = 0; n < BIO_MAX_VECS; n++) {

			unsigned int blocks_this_page =
@@ -98,10 +99,9 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, 


			__bio_add_page(bio, ZERO_PAGE(0), bytes_this_page, 0);

			len -= blocks_this_page;

			lblk += blocks_this_page;

			pos += bytes_this_page;

			sector += (bytes_this_page >> SECTOR_SHIFT);

			if (!len || !fscrypt_mergeable_bio(bio, inode,

					(loff_t)lblk << blockbits))

			if (!len || !fscrypt_mergeable_bio(bio, inode, pos))

				break;

		}

fs/crypto/inline_crypt.c

+3 −3
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void fscrypt_generate_dun(const struct fscrypt_inode_info *ci, 
 * fscrypt_set_bio_crypt_ctx() - prepare a file contents bio for inline crypto

 * @bio: a bio which will eventually be submitted to the file

 * @inode: the file's inode

 * @first_lblk: the first file logical block number in the I/O

 * @pos: the first file position (in bytes) in the I/O

 * @gfp_mask: memory allocation flags - these must be a waiting mask so that

 *					bio_crypt_set_ctx can't fail.

 *
@@ -298,7 +298,7 @@ static void fscrypt_generate_dun(const struct fscrypt_inode_info *ci, 
 * The encryption context will be freed automatically when the bio is freed.

 */

void fscrypt_set_bio_crypt_ctx(struct bio *bio, const struct inode *inode,

			       u64 first_lblk, gfp_t gfp_mask)

			       loff_t pos, gfp_t gfp_mask)

{

	const struct fscrypt_inode_info *ci;

	u64 dun[BLK_CRYPTO_DUN_ARRAY_SIZE];
@@ -307,7 +307,7 @@ void fscrypt_set_bio_crypt_ctx(struct bio *bio, const struct inode *inode, 
		return;

	ci = fscrypt_get_inode_info_raw(inode);



	fscrypt_generate_dun(ci, first_lblk << inode->i_blkbits, dun);

	fscrypt_generate_dun(ci, pos, dun);

	bio_crypt_set_ctx(bio, ci->ci_enc_key.blk_key, dun, gfp_mask);

}

EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx);

fs/ext4/page-io.c

+2 −3
Original line number Diff line number Diff line
@@ -427,8 +427,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(bh->b_bdev, BIO_MAX_VECS, REQ_OP_WRITE, GFP_NOIO);

	fscrypt_set_bio_crypt_ctx(bio, inode,

			(folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits,

	fscrypt_set_bio_crypt_ctx(bio, inode, folio_pos(folio) + bh_offset(bh),

				  GFP_NOIO);

	bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);

	bio->bi_end_io = ext4_end_bio;

fs/ext4/readpage.c

+2 −2
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ static int ext4_mpage_readpages(struct inode *inode, struct fsverity_info *vi, 
			 */

			bio = bio_alloc(bdev, bio_max_segs(nr_pages),

					REQ_OP_READ, GFP_KERNEL);

			fscrypt_set_bio_crypt_ctx(bio, inode, next_block,

						  GFP_KERNEL);

			fscrypt_set_bio_crypt_ctx(bio, inode,

					(loff_t)next_block << blkbits, GFP_KERNEL);

			ext4_set_bio_post_read_ctx(bio, inode, vi);

			bio->bi_iter.bi_sector = first_block << (blkbits - 9);

			bio->bi_end_io = mpage_end_io;