Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de9600d authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

f2fs: refactor read path to allow multiple postprocessing steps 



Cherry-pick from origin/upstream-f2fs-stable-linux-3.18.y:
  967f45c7 ("f2fs: refactor read path to allow multiple postprocessing steps")

Currently f2fs's ->readpage() and ->readpages() assume that either the
data undergoes no postprocessing, or decryption only.  But with
fs-verity, there will be an additional authenticity verification step,
and it may be needed either by itself, or combined with decryption.

To support this, store a 'struct bio_post_read_ctx' in ->bi_private
which contains a work struct, a bitmask of postprocessing steps that are
enabled, and an indicator of the current step.  The bio completion
routine, if there was no I/O error, enqueues the first postprocessing
step.  When that completes, it continues to the next step.  Pages that
fail any postprocessing step have PageError set.  Once all steps have
completed, pages without PageError set are set Uptodate, and all pages
are unlocked.

Also replace f2fs_encrypted_file() with a new function
f2fs_post_read_required() in places like direct I/O and garbage
collection that really should be testing whether the file needs special
I/O processing, not whether it is encrypted specifically.

This may also be useful for other future f2fs features such as
compression.

Change-Id: Ic5d37fbecab10a0beef80c991b16d2b1b86e009e
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 49049b10

fs/f2fs/data.c

+127 −41
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
#include <trace/events/f2fs.h>

#include <trace/events/android_fs.h>



#define NUM_PREALLOC_POST_READ_CTXS	128



static struct kmem_cache *bio_post_read_ctx_cache;

static mempool_t *bio_post_read_ctx_pool;



static bool __is_cp_guaranteed(struct page *page)

{

	struct address_space *mapping = page->mapping;
@@ -51,11 +56,77 @@ static bool __is_cp_guaranteed(struct page *page) 
	return false;

}



static void f2fs_read_end_io(struct bio *bio, int err)

/* postprocessing steps for read bios */

enum bio_post_read_step {

	STEP_INITIAL = 0,

	STEP_DECRYPT,

};



struct bio_post_read_ctx {

	struct bio *bio;

	struct work_struct work;

	unsigned int cur_step;

	unsigned int enabled_steps;

};



static void __read_end_io(struct bio *bio, int err)

{

	struct bio_vec *bvec;

	struct page *page;

	struct bio_vec *bv;

	int i;



	bio_for_each_segment_all(bv, bio, i) {

		page = bv->bv_page;



		/* PG_error was set if any post_read step failed */

		if (err || PageError(page)) {

			ClearPageUptodate(page);

			SetPageError(page);

		} else {

			SetPageUptodate(page);

		}

		unlock_page(page);

	}

	if (bio->bi_private)

		mempool_free(bio->bi_private, bio_post_read_ctx_pool);

	bio_put(bio);

}



static void bio_post_read_processing(struct bio_post_read_ctx *ctx);



static void decrypt_work(struct work_struct *work)

{

	struct bio_post_read_ctx *ctx =

		container_of(work, struct bio_post_read_ctx, work);



	fscrypt_decrypt_bio(ctx->bio);



	bio_post_read_processing(ctx);

}



static void bio_post_read_processing(struct bio_post_read_ctx *ctx)

{

	switch (++ctx->cur_step) {

	case STEP_DECRYPT:

		if (ctx->enabled_steps & (1 << STEP_DECRYPT)) {

			INIT_WORK(&ctx->work, decrypt_work);

			fscrypt_enqueue_decrypt_work(&ctx->work);

			return;

		}

		ctx->cur_step++;

		/* fall-through */

	default:

		__read_end_io(ctx->bio, 0);

	}

}



static bool f2fs_bio_post_read_required(struct bio *bio, int err)

{

	return bio->bi_private && !err;

}



static void f2fs_read_end_io(struct bio *bio, int err)

{

#ifdef CONFIG_F2FS_FAULT_INJECTION

	if (time_to_inject(F2FS_P_SB(bio->bi_io_vec->bv_page), FAULT_IO)) {

		f2fs_show_injection_info(FAULT_IO);
@@ -63,28 +134,15 @@ static void f2fs_read_end_io(struct bio *bio, int err) 
	}

#endif



	if (f2fs_bio_encrypted(bio)) {

		if (err) {

			fscrypt_release_ctx(bio->bi_private);

		} else {

			fscrypt_enqueue_decrypt_bio(bio->bi_private, bio);

	if (f2fs_bio_post_read_required(bio, err)) {

		struct bio_post_read_ctx *ctx = bio->bi_private;



		ctx->cur_step = STEP_INITIAL;

		bio_post_read_processing(ctx);

		return;

	}

	}



	bio_for_each_segment_all(bvec, bio, i) {

		struct page *page = bvec->bv_page;



		if (!err) {

			if (!PageUptodate(page))

				SetPageUptodate(page);

		} else {

			ClearPageUptodate(page);

			SetPageError(page);

		}

		unlock_page(page);

	}

	bio_put(bio);

	__read_end_io(bio, err);

}



static void f2fs_write_end_io(struct bio *bio, int err)
@@ -481,29 +539,33 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, 
							 unsigned nr_pages)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct fscrypt_ctx *ctx = NULL;

	struct bio *bio;



	if (f2fs_encrypted_file(inode)) {

		ctx = fscrypt_get_ctx(inode, GFP_NOFS);

		if (IS_ERR(ctx))

			return ERR_CAST(ctx);



		/* wait the page to be moved by cleaning */

		f2fs_wait_on_block_writeback(sbi, blkaddr);

	}

	struct bio_post_read_ctx *ctx;

	unsigned int post_read_steps = 0;



	bio = f2fs_bio_alloc(sbi, min_t(int, nr_pages, BIO_MAX_PAGES), false);

	if (!bio) {

		if (ctx)

			fscrypt_release_ctx(ctx);

	if (!bio)

		return ERR_PTR(-ENOMEM);

	}

	f2fs_target_device(sbi, blkaddr, bio);

	bio->bi_end_io = f2fs_read_end_io;

	bio->bi_private = ctx;

	bio_set_op_attrs(bio, REQ_OP_READ, 0);



	if (f2fs_encrypted_file(inode))

		post_read_steps |= 1 << STEP_DECRYPT;

	if (post_read_steps) {

		ctx = mempool_alloc(bio_post_read_ctx_pool, GFP_NOFS);

		if (!ctx) {

			bio_put(bio);

			return ERR_PTR(-ENOMEM);

		}

		ctx->bio = bio;

		ctx->enabled_steps = post_read_steps;

		bio->bi_private = ctx;



		/* wait the page to be moved by cleaning */

		f2fs_wait_on_block_writeback(sbi, blkaddr);

	}



	return bio;

}
@@ -842,7 +904,7 @@ alloc: 


static inline bool __force_buffered_io(struct inode *inode, int rw)

{

	return (f2fs_encrypted_file(inode) ||

	return (f2fs_post_read_required(inode) ||

			(rw == WRITE && test_opt(F2FS_I_SB(inode), LFS)) ||

			F2FS_I_SB(inode)->s_ndevs);

}
@@ -1507,7 +1569,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio) 
	if (!f2fs_encrypted_file(inode))

		return 0;



	/* wait for GCed encrypted page writeback */

	/* wait for GCed page writeback via META_MAPPING */

	f2fs_wait_on_block_writeback(fio->sbi, fio->old_blkaddr);



retry_encrypt:
@@ -2219,8 +2281,8 @@ repeat: 


	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_file(inode))

	/* wait for GCed page writeback via META_MAPPING */

	if (f2fs_post_read_required(inode))

		f2fs_wait_on_block_writeback(sbi, blkaddr);



	if (len == PAGE_SIZE || PageUptodate(page))
@@ -2564,3 +2626,27 @@ const struct address_space_operations f2fs_dblock_aops = { 
	.migratepage    = f2fs_migrate_page,

#endif

};



int __init f2fs_init_post_read_processing(void)

{

	bio_post_read_ctx_cache = KMEM_CACHE(bio_post_read_ctx, 0);

	if (!bio_post_read_ctx_cache)

		goto fail;

	bio_post_read_ctx_pool =

		mempool_create_slab_pool(NUM_PREALLOC_POST_READ_CTXS,

					 bio_post_read_ctx_cache);

	if (!bio_post_read_ctx_pool)

		goto fail_free_cache;

	return 0;



fail_free_cache:

	kmem_cache_destroy(bio_post_read_ctx_cache);

fail:

	return -ENOMEM;

}



void __exit f2fs_destroy_post_read_processing(void)

{

	mempool_destroy(bio_post_read_ctx_pool);

	kmem_cache_destroy(bio_post_read_ctx_cache);

}

fs/f2fs/f2fs.h

+8 −2
Original line number Diff line number Diff line
@@ -2989,6 +2989,8 @@ void destroy_checkpoint_caches(void); 
/*

 * data.c

 */

int f2fs_init_post_read_processing(void);

void f2fs_destroy_post_read_processing(void);

void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type);

void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,

				struct inode *inode, nid_t ino, pgoff_t idx,
@@ -3349,9 +3351,13 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode) 
#endif

}



static inline bool f2fs_bio_encrypted(struct bio *bio)

/*

 * Returns true if the reads of the inode's data need to undergo some

 * postprocessing step, like decryption or authenticity verification.

 */

static inline bool f2fs_post_read_required(struct inode *inode)

{

	return bio->bi_private != NULL;

	return f2fs_encrypted_file(inode);

}



#define F2FS_FEATURE_FUNCS(name, flagname) \

fs/f2fs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ mapped: 
	/* fill the page */

	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_file(inode))

	/* wait for GCed page writeback via META_MAPPING */

	if (f2fs_post_read_required(inode))

		f2fs_wait_on_block_writeback(sbi, dn.data_blkaddr);



out_sem:

fs/f2fs/gc.c

+3 −3
Original line number Diff line number Diff line
@@ -850,8 +850,8 @@ next_step: 
			if (IS_ERR(inode) || is_bad_inode(inode))

				continue;



			/* if encrypted inode, let's go phase 3 */

			if (f2fs_encrypted_file(inode)) {

			/* if inode uses special I/O path, let's go phase 3 */

			if (f2fs_post_read_required(inode)) {

				add_gc_inode(gc_list, inode);

				continue;

			}
@@ -899,7 +899,7 @@ next_step: 


			start_bidx = start_bidx_of_node(nofs, inode)

								+ ofs_in_node;

			if (f2fs_encrypted_file(inode))

			if (f2fs_post_read_required(inode))

				move_data_block(inode, start_bidx, segno, off);

			else

				move_data_page(inode, start_bidx, gc_type,

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ bool f2fs_may_inline_data(struct inode *inode) 
	if (i_size_read(inode) > MAX_INLINE_DATA(inode))

		return false;



	if (f2fs_encrypted_file(inode))

	if (f2fs_post_read_required(inode))

		return false;



	return true;