On 04/24, Chandan Rajendra wrote: > On Wednesday, April 24, 2019 2:01:26 PM IST Jaegeuk Kim wrote: > > Hi Chandan, > > > > On 04/24, Chandan Rajendra wrote: > > > The post read processing code is used by both Ext4 and F2FS. Hence to > > > remove duplicity, this commit moves the code into > > > include/linux/post_read_process.h and fs/post_read_process.c. > > > > > > The corresponding decrypt and verity "work" functions have been moved > > > inside fscrypt and fsverity sources. With these in place, the post > > > processing code now has to just invoke enqueue functions provided by > > > fscrypt and fsverity. > > > > > > Signed-off-by: Chandan Rajendra <chan...@linux.ibm.com> > > > --- > > > fs/Makefile | 4 + > > > fs/crypto/bio.c | 23 ++-- > > > fs/crypto/crypto.c | 17 +-- > > > fs/crypto/fscrypt_private.h | 3 + > > > fs/ext4/ext4.h | 2 - > > > fs/ext4/readpage.c | 175 ++++-------------------------- > > > fs/ext4/super.c | 9 +- > > > fs/f2fs/data.c | 146 ++++--------------------- > > > fs/f2fs/super.c | 9 +- > > > fs/post_read_process.c | 136 +++++++++++++++++++++++ > > > fs/verity/verify.c | 12 ++ > > > include/linux/fscrypt.h | 20 +--- > > > include/linux/post_read_process.h | 21 ++++ > > > 13 files changed, 240 insertions(+), 337 deletions(-) > > > create mode 100644 fs/post_read_process.c > > > create mode 100644 include/linux/post_read_process.h > > > > > > diff --git a/fs/Makefile b/fs/Makefile > > > index 9dd2186e74b5..f9abc3f71d3c 100644 > > > --- a/fs/Makefile > > > +++ b/fs/Makefile > > > @@ -21,6 +21,10 @@ else > > > obj-y += no-block.o > > > endif > > > > > > +ifeq (y, $(firstword $(filter y,$(CONFIG_FS_ENCRYPTION) > > > $(CONFIG_FS_VERITY)))) > > > +obj-y += post_read_process.o > > > +endif > > > + > > > obj-$(CONFIG_PROC_FS) += proc_namespace.o > > > > > > obj-y += notify/ > > > diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c > > > index 5759bcd018cd..3e40d65ae6a8 100644 > > > --- a/fs/crypto/bio.c > > > +++ b/fs/crypto/bio.c > > > @@ -24,6 +24,8 @@ > > > #include <linux/module.h> > > > #include <linux/bio.h> > > > #include <linux/namei.h> > > > +#include <linux/post_read_process.h> > > > + > > > #include "fscrypt_private.h" > > > > > > static void __fscrypt_decrypt_bio(struct bio *bio, bool done) > > > @@ -54,24 +56,15 @@ void fscrypt_decrypt_bio(struct bio *bio) > > > } > > > EXPORT_SYMBOL(fscrypt_decrypt_bio); > > > > > > -static void completion_pages(struct work_struct *work) > > > +void fscrypt_decrypt_work(struct work_struct *work) > > > { > > > - struct fscrypt_ctx *ctx = > > > - container_of(work, struct fscrypt_ctx, r.work); > > > - struct bio *bio = ctx->r.bio; > > > + struct bio_post_read_ctx *ctx = > > > + container_of(work, struct bio_post_read_ctx, work); > > > > > > - __fscrypt_decrypt_bio(bio, true); > > > - fscrypt_release_ctx(ctx); > > > - bio_put(bio); > > > -} > > > + fscrypt_decrypt_bio(ctx->bio); > > > > > > -void fscrypt_enqueue_decrypt_bio(struct fscrypt_ctx *ctx, struct bio > > > *bio) > > > -{ > > > - INIT_WORK(&ctx->r.work, completion_pages); > > > - ctx->r.bio = bio; > > > - fscrypt_enqueue_decrypt_work(&ctx->r.work); > > > + bio_post_read_processing(ctx); > > > } > > > -EXPORT_SYMBOL(fscrypt_enqueue_decrypt_bio); > > > > > > void fscrypt_pullback_bio_page(struct page **page, bool restore) > > > { > > > @@ -87,7 +80,7 @@ void fscrypt_pullback_bio_page(struct page **page, bool > > > restore) > > > ctx = (struct fscrypt_ctx *)page_private(bounce_page); > > > > > > /* restore control page */ > > > - *page = ctx->w.control_page; > > > + *page = ctx->control_page; > > > > > > if (restore) > > > fscrypt_restore_control_page(bounce_page); > > > diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c > > > index 3fc84bf2b1e5..ffa9302a7351 100644 > > > --- a/fs/crypto/crypto.c > > > +++ b/fs/crypto/crypto.c > > > @@ -53,6 +53,7 @@ struct kmem_cache *fscrypt_info_cachep; > > > > > > void fscrypt_enqueue_decrypt_work(struct work_struct *work) > > > { > > > + INIT_WORK(work, fscrypt_decrypt_work); > > > queue_work(fscrypt_read_workqueue, work); > > > } > > > EXPORT_SYMBOL(fscrypt_enqueue_decrypt_work); > > > @@ -70,11 +71,11 @@ void fscrypt_release_ctx(struct fscrypt_ctx *ctx) > > > { > > > unsigned long flags; > > > > > > - if (ctx->flags & FS_CTX_HAS_BOUNCE_BUFFER_FL && ctx->w.bounce_page) { > > > - mempool_free(ctx->w.bounce_page, fscrypt_bounce_page_pool); > > > - ctx->w.bounce_page = NULL; > > > + if (ctx->flags & FS_CTX_HAS_BOUNCE_BUFFER_FL && ctx->bounce_page) { > > > + mempool_free(ctx->bounce_page, fscrypt_bounce_page_pool); > > > + ctx->bounce_page = NULL; > > > } > > > - ctx->w.control_page = NULL; > > > + ctx->control_page = NULL; > > > if (ctx->flags & FS_CTX_REQUIRES_FREE_ENCRYPT_FL) { > > > kmem_cache_free(fscrypt_ctx_cachep, ctx); > > > } else { > > > @@ -194,11 +195,11 @@ int fscrypt_do_page_crypto(const struct inode > > > *inode, fscrypt_direction_t rw, > > > struct page *fscrypt_alloc_bounce_page(struct fscrypt_ctx *ctx, > > > gfp_t gfp_flags) > > > { > > > - ctx->w.bounce_page = mempool_alloc(fscrypt_bounce_page_pool, gfp_flags); > > > - if (ctx->w.bounce_page == NULL) > > > + ctx->bounce_page = mempool_alloc(fscrypt_bounce_page_pool, gfp_flags); > > > + if (ctx->bounce_page == NULL) > > > return ERR_PTR(-ENOMEM); > > > ctx->flags |= FS_CTX_HAS_BOUNCE_BUFFER_FL; > > > - return ctx->w.bounce_page; > > > + return ctx->bounce_page; > > > } > > > > > > /** > > > @@ -267,7 +268,7 @@ struct page *fscrypt_encrypt_page(const struct inode > > > *inode, > > > if (IS_ERR(ciphertext_page)) > > > goto errout; > > > > > > - ctx->w.control_page = page; > > > + ctx->control_page = page; > > > err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num, > > > page, ciphertext_page, len, offs, > > > gfp_flags); > > > diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h > > > index 7da276159593..412a3bcf9efd 100644 > > > --- a/fs/crypto/fscrypt_private.h > > > +++ b/fs/crypto/fscrypt_private.h > > > @@ -114,6 +114,9 @@ static inline bool fscrypt_valid_enc_modes(u32 > > > contents_mode, > > > return false; > > > } > > > > > > +/* bio.c */ > > > +void fscrypt_decrypt_work(struct work_struct *work); > > > + > > > /* crypto.c */ > > > extern struct kmem_cache *fscrypt_info_cachep; > > > extern int fscrypt_initialize(unsigned int cop_flags); > > > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > > > index f2b0e628ff7b..23f8568c9b53 100644 > > > --- a/fs/ext4/ext4.h > > > +++ b/fs/ext4/ext4.h > > > @@ -3127,8 +3127,6 @@ static inline void ext4_set_de_type(struct > > > super_block *sb, > > > extern int ext4_mpage_readpages(struct address_space *mapping, > > > struct list_head *pages, struct page *page, > > > unsigned nr_pages, bool is_readahead); > > > -extern int __init ext4_init_post_read_processing(void); > > > -extern void ext4_exit_post_read_processing(void); > > > > > > /* symlink.c */ > > > extern const struct inode_operations > > > ext4_encrypted_symlink_inode_operations; > > > diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c > > > index 0169e3809da3..319deffbc105 100644 > > > --- a/fs/ext4/readpage.c > > > +++ b/fs/ext4/readpage.c > > > @@ -44,14 +44,10 @@ > > > #include <linux/backing-dev.h> > > > #include <linux/pagevec.h> > > > #include <linux/cleancache.h> > > > +#include <linux/post_read_process.h> > > > > > > #include "ext4.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 inline bool ext4_bio_encrypted(struct bio *bio) > > > { > > > #ifdef CONFIG_FS_ENCRYPTION > > > @@ -61,125 +57,6 @@ static inline bool ext4_bio_encrypted(struct bio *bio) > > > #endif > > > } > > > > > > -/* postprocessing steps for read bios */ > > > -enum bio_post_read_step { > > > - STEP_INITIAL = 0, > > > - STEP_DECRYPT, > > > - STEP_VERITY, > > > -}; > > > - > > > -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) > > > -{ > > > - struct page *page; > > > - struct bio_vec *bv; > > > - int i; > > > - struct bvec_iter_all iter_all; > > > - > > > - bio_for_each_segment_all(bv, bio, i, iter_all) { > > > - page = bv->bv_page; > > > - > > > - /* PG_error was set if any post_read step failed */ > > > - if (bio->bi_status || 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 verity_work(struct work_struct *work) > > > -{ > > > - struct bio_post_read_ctx *ctx = > > > - container_of(work, struct bio_post_read_ctx, work); > > > - > > > - fsverity_verify_bio(ctx->bio); > > > - > > > - bio_post_read_processing(ctx); > > > -} > > > - > > > -static void bio_post_read_processing(struct bio_post_read_ctx *ctx) > > > -{ > > > - /* > > > - * We use different work queues for decryption and for verity because > > > - * verity may require reading metadata pages that need decryption, and > > > - * we shouldn't recurse to the same workqueue. > > > - */ > > > - 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 */ > > > - case STEP_VERITY: > > > - if (ctx->enabled_steps & (1 << STEP_VERITY)) { > > > - INIT_WORK(&ctx->work, verity_work); > > > - fsverity_enqueue_verify_work(&ctx->work); > > > - return; > > > - } > > > - ctx->cur_step++; > > > - /* fall-through */ > > > - default: > > > - __read_end_io(ctx->bio); > > > - } > > > -} > > > - > > > -static struct bio_post_read_ctx *get_bio_post_read_ctx(struct inode > > > *inode, > > > - struct bio *bio, > > > - pgoff_t index) > > > -{ > > > - unsigned int post_read_steps = 0; > > > - struct bio_post_read_ctx *ctx = NULL; > > > - > > > - if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) > > > - post_read_steps |= 1 << STEP_DECRYPT; > > > -#ifdef CONFIG_FS_VERITY > > > - if (inode->i_verity_info != NULL && > > > - (index < ((i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT))) > > > - post_read_steps |= 1 << STEP_VERITY; > > > -#endif > > > - if (post_read_steps) { > > > - ctx = mempool_alloc(bio_post_read_ctx_pool, GFP_NOFS); > > > - if (!ctx) > > > - return ERR_PTR(-ENOMEM); > > > - ctx->bio = bio; > > > - ctx->enabled_steps = post_read_steps; > > > - bio->bi_private = ctx; > > > - } > > > - return ctx; > > > -} > > > - > > > -static bool bio_post_read_required(struct bio *bio) > > > -{ > > > - return bio->bi_private && !bio->bi_status; > > > -} > > > - > > > /* > > > * I/O completion handler for multipage BIOs. > > > * > > > @@ -194,14 +71,30 @@ static bool bio_post_read_required(struct bio *bio) > > > */ > > > static void mpage_end_io(struct bio *bio) > > > { > > > + struct bio_vec *bv; > > > + int i; > > > + struct bvec_iter_all iter_all; > > > +#if defined(CONFIG_FS_ENCRYPTION) || defined(CONFIG_FS_VERITY) > > > if (bio_post_read_required(bio)) { > > > struct bio_post_read_ctx *ctx = bio->bi_private; > > > > > > - ctx->cur_step = STEP_INITIAL; > > > bio_post_read_processing(ctx); > > > return; > > > } > > > - __read_end_io(bio); > > > +#endif > > > + bio_for_each_segment_all(bv, bio, i, iter_all) { > > > + struct page *page = bv->bv_page; > > > + > > > + if (!bio->bi_status) { > > > + SetPageUptodate(page); > > > + } else { > > > + ClearPageUptodate(page); > > > + SetPageError(page); > > > + } > > > + unlock_page(page); > > > + } > > > + > > > + bio_put(bio); > > > } > > > > > > static inline loff_t ext4_readpage_limit(struct inode *inode) > > > @@ -368,17 +261,19 @@ int ext4_mpage_readpages(struct address_space > > > *mapping, > > > bio = NULL; > > > } > > > if (bio == NULL) { > > > - struct bio_post_read_ctx *ctx; > > > + struct bio_post_read_ctx *ctx = NULL; > > > > > > bio = bio_alloc(GFP_KERNEL, > > > min_t(int, nr_pages, BIO_MAX_PAGES)); > > > if (!bio) > > > goto set_error_page; > > > +#if defined(CONFIG_FS_ENCRYPTION) || defined(CONFIG_FS_VERITY) > > > ctx = get_bio_post_read_ctx(inode, bio, page->index); > > > if (IS_ERR(ctx)) { > > > bio_put(bio); > > > goto set_error_page; > > > } > > > +#endif > > > bio_set_dev(bio, bdev); > > > bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9); > > > bio->bi_end_io = mpage_end_io; > > > @@ -417,29 +312,3 @@ int ext4_mpage_readpages(struct address_space > > > *mapping, > > > submit_bio(bio); > > > return 0; > > > } > > > - > > > -int __init ext4_init_post_read_processing(void) > > > -{ > > > - bio_post_read_ctx_cache = > > > - kmem_cache_create("ext4_bio_post_read_ctx", > > > - sizeof(struct bio_post_read_ctx), 0, 0, NULL); > > > - 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 ext4_exit_post_read_processing(void) > > > -{ > > > - mempool_destroy(bio_post_read_ctx_pool); > > > - kmem_cache_destroy(bio_post_read_ctx_cache); > > > -} > > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > > > index 4ae6f5849caa..aba724f82cc3 100644 > > > --- a/fs/ext4/super.c > > > +++ b/fs/ext4/super.c > > > @@ -6101,10 +6101,6 @@ static int __init ext4_init_fs(void) > > > return err; > > > > > > err = ext4_init_pending(); > > > - if (err) > > > - goto out7; > > > - > > > - err = ext4_init_post_read_processing(); > > > if (err) > > > goto out6; > > > > > > @@ -6146,10 +6142,8 @@ static int __init ext4_init_fs(void) > > > out4: > > > ext4_exit_pageio(); > > > out5: > > > - ext4_exit_post_read_processing(); > > > -out6: > > > ext4_exit_pending(); > > > -out7: > > > +out6: > > > ext4_exit_es(); > > > > > > return err; > > > @@ -6166,7 +6160,6 @@ static void __exit ext4_exit_fs(void) > > > ext4_exit_sysfs(); > > > ext4_exit_system_zone(); > > > ext4_exit_pageio(); > > > - ext4_exit_post_read_processing(); > > > ext4_exit_es(); > > > ext4_exit_pending(); > > > } > > > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > > > index 038b958d0fa9..2f62244f6d24 100644 > > > --- a/fs/f2fs/data.c > > > +++ b/fs/f2fs/data.c > > > @@ -18,6 +18,7 @@ > > > #include <linux/uio.h> > > > #include <linux/cleancache.h> > > > #include <linux/sched/signal.h> > > > +#include <linux/post_read_process.h> > > > > > > #include "f2fs.h" > > > #include "node.h" > > > @@ -25,11 +26,6 @@ > > > #include "trace.h" > > > #include <trace/events/f2fs.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; > > > @@ -69,20 +65,6 @@ static enum count_type __read_io_type(struct page > > > *page) > > > return F2FS_RD_DATA; > > > } > > > > > > -/* postprocessing steps for read bios */ > > > -enum bio_post_read_step { > > > - STEP_INITIAL = 0, > > > - STEP_DECRYPT, > > > - STEP_VERITY, > > > > Could you let filesystems handle this separately? > > Since we're going to add one more postprocessing, compression, which is not > > in ext4. > > > > Hi Jaegeuk Kim, > > For compression, I think it would be good to follow the pattern set by > Encryption and Verity features i.e. The inodes associated with compressed > files should have S_COMPRESSED flag set and this information can later be used > inside "post read processing" code to enable STEP_DECOMPRESS. During endio > execution, we then invoke a function to perform the decompression.
Thanks, yes, we have that implementation. > > Since Ext4 does not have the compression feature, the code corresponding to > STEP_DECOMPRESS will not be executed. The problem is the data sturcture for de-compression would not be general at all. In addition, do you think it makes sense to put the processing routine in fs/crypto? > > IMHO, it would be impossible for "post read processing" code to implement the > state machine without knowing the complete list of possible states. > > -- > chandan > > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel