From: Eric Biggers <ebiggers@kernel.org> To: Chandan Rajendra <chandan@linux.ibm.com> Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fscrypt@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org Subject: Re: [f2fs-dev] [RFC PATCH 05/10] fsverity: Add call back to decide if verity check has to be performed Date: Tue, 19 Feb 2019 15:26:49 -0800 [thread overview] Message-ID: <20190219232649.GF12177@gmail.com> (raw) In-Reply-To: <20190218100433.20048-6-chandan@linux.ibm.com> Hi Chandan, On Mon, Feb 18, 2019 at 03:34:28PM +0530, Chandan Rajendra wrote: > Ext4 and F2FS store verity metadata in data extents (beyond > inode->i_size) associated with a file. But other filesystems might > choose alternative means to store verity metadata. Hence this commit > adds a callback function pointer to 'struct fsverity_operations' to help > in deciding if verity operation needs to performed against a page-cache > page holding file data. > > Signed-off-by: Chandan Rajendra <chandan@linux.ibm.com> > --- > fs/ext4/super.c | 9 +++++++++ > fs/post_read_process.c | 5 +++-- > include/linux/fsverity.h | 1 + > 3 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 9314dddfbf34..2d7781ab6824 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1428,10 +1428,19 @@ static struct page *ext4_read_verity_metadata_page(struct inode *inode, > return read_mapping_page(inode->i_mapping, index, NULL); > } > > +static bool ext4_verity_required(struct inode *inode, pgoff_t index) > +{ > + if (index < ((i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT)) > + return true; > + else > + return false; > +} This can be simplified to: return index < (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT; > + > static const struct fsverity_operations ext4_verityops = { > .set_verity = ext4_set_verity, > .get_metadata_end = ext4_get_verity_metadata_end, > .read_metadata_page = ext4_read_verity_metadata_page, > + .verity_required = ext4_verity_required, > }; > #endif /* CONFIG_FS_VERITY */ Doesn't f2fs need this too? This patch only changes ext4. > > diff --git a/fs/post_read_process.c b/fs/post_read_process.c > index 9720eeff0160..1f8663d70247 100644 > --- a/fs/post_read_process.c > +++ b/fs/post_read_process.c > @@ -79,8 +79,9 @@ struct bio_post_read_ctx *get_bio_post_read_ctx(struct inode *inode, > 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))) > + if (inode->i_verity_info != NULL > + && inode->i_sb->s_vop->verity_required > + && inode->i_sb->s_vop->verity_required(inode, index)) > post_read_steps |= 1 << STEP_VERITY; If ->verity_required is NULL, shouldn't that be equivalent to ->verity_required() returning true? > #endif > if (post_read_steps) { > diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h > index 7c33b42abf1b..b83712d6c79a 100644 > --- a/include/linux/fsverity.h > +++ b/include/linux/fsverity.h > @@ -18,6 +18,7 @@ struct fsverity_operations { > int (*set_verity)(struct inode *inode, loff_t data_i_size); > int (*get_metadata_end)(struct inode *inode, loff_t *metadata_end_ret); > struct page *(*read_metadata_page)(struct inode *inode, pgoff_t index); > + bool (*verity_required)(struct inode *inode, pgoff_t index); > }; > > #ifdef CONFIG_FS_VERITY > -- > 2.19.1 > - Eric
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: Chandan Rajendra <chandan@linux.ibm.com> Cc: tytso@mit.edu, linux-f2fs-devel@lists.sourceforge.net, linux-fscrypt@vger.kernel.org, adilger.kernel@dilger.ca, jaegeuk@kernel.org, linux-ext4@vger.kernel.org Subject: Re: [RFC PATCH 05/10] fsverity: Add call back to decide if verity check has to be performed Date: Tue, 19 Feb 2019 15:26:49 -0800 [thread overview] Message-ID: <20190219232649.GF12177@gmail.com> (raw) In-Reply-To: <20190218100433.20048-6-chandan@linux.ibm.com> Hi Chandan, On Mon, Feb 18, 2019 at 03:34:28PM +0530, Chandan Rajendra wrote: > Ext4 and F2FS store verity metadata in data extents (beyond > inode->i_size) associated with a file. But other filesystems might > choose alternative means to store verity metadata. Hence this commit > adds a callback function pointer to 'struct fsverity_operations' to help > in deciding if verity operation needs to performed against a page-cache > page holding file data. > > Signed-off-by: Chandan Rajendra <chandan@linux.ibm.com> > --- > fs/ext4/super.c | 9 +++++++++ > fs/post_read_process.c | 5 +++-- > include/linux/fsverity.h | 1 + > 3 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 9314dddfbf34..2d7781ab6824 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1428,10 +1428,19 @@ static struct page *ext4_read_verity_metadata_page(struct inode *inode, > return read_mapping_page(inode->i_mapping, index, NULL); > } > > +static bool ext4_verity_required(struct inode *inode, pgoff_t index) > +{ > + if (index < ((i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT)) > + return true; > + else > + return false; > +} This can be simplified to: return index < (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT; > + > static const struct fsverity_operations ext4_verityops = { > .set_verity = ext4_set_verity, > .get_metadata_end = ext4_get_verity_metadata_end, > .read_metadata_page = ext4_read_verity_metadata_page, > + .verity_required = ext4_verity_required, > }; > #endif /* CONFIG_FS_VERITY */ Doesn't f2fs need this too? This patch only changes ext4. > > diff --git a/fs/post_read_process.c b/fs/post_read_process.c > index 9720eeff0160..1f8663d70247 100644 > --- a/fs/post_read_process.c > +++ b/fs/post_read_process.c > @@ -79,8 +79,9 @@ struct bio_post_read_ctx *get_bio_post_read_ctx(struct inode *inode, > 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))) > + if (inode->i_verity_info != NULL > + && inode->i_sb->s_vop->verity_required > + && inode->i_sb->s_vop->verity_required(inode, index)) > post_read_steps |= 1 << STEP_VERITY; If ->verity_required is NULL, shouldn't that be equivalent to ->verity_required() returning true? > #endif > if (post_read_steps) { > diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h > index 7c33b42abf1b..b83712d6c79a 100644 > --- a/include/linux/fsverity.h > +++ b/include/linux/fsverity.h > @@ -18,6 +18,7 @@ struct fsverity_operations { > int (*set_verity)(struct inode *inode, loff_t data_i_size); > int (*get_metadata_end)(struct inode *inode, loff_t *metadata_end_ret); > struct page *(*read_metadata_page)(struct inode *inode, pgoff_t index); > + bool (*verity_required)(struct inode *inode, pgoff_t index); > }; > > #ifdef CONFIG_FS_VERITY > -- > 2.19.1 > - Eric
next prev parent reply other threads:[~2019-02-19 23:26 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-18 10:04 [RFC PATCH 00/10] Consolidate Post read processing code Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` [f2fs-dev] [RFC PATCH 01/10] ext4: use IS_ENCRYPTED() to check encryption status Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 02/10] f2fs: " Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 03/10] fscrypt: remove filesystem specific build config option Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 04/10] Consolidate "post read processing" into a new file Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-19 23:22 ` [f2fs-dev] " Eric Biggers 2019-02-19 23:22 ` Eric Biggers 2019-02-19 23:22 ` Eric Biggers 2019-02-21 12:51 ` Chandan Rajendra 2019-02-21 12:51 ` Chandan Rajendra 2019-02-18 10:04 ` [f2fs-dev] [RFC PATCH 05/10] fsverity: Add call back to decide if verity check has to be performed Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-19 23:26 ` Eric Biggers [this message] 2019-02-19 23:26 ` Eric Biggers 2019-02-21 12:54 ` [f2fs-dev] " Chandan Rajendra 2019-02-21 12:54 ` Chandan Rajendra 2019-02-18 10:04 ` [f2fs-dev] [RFC PATCH 06/10] Introduce REQ_POST_READ_PROC bio flag Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-20 0:21 ` [f2fs-dev] " Eric Biggers 2019-02-20 0:21 ` Eric Biggers 2019-02-21 13:03 ` [f2fs-dev] " Chandan Rajendra 2019-02-21 13:03 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 07/10] fsverity: Add call back to determine readpage limit Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 08/10] fsverity: Add call back to verify file holes Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-20 0:35 ` Eric Biggers 2019-02-20 0:35 ` Eric Biggers 2019-02-21 13:05 ` Chandan Rajendra 2019-02-21 13:05 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 09/10] fs/mpage.c: Integrate post read processing Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:04 ` [RFC PATCH 10/10] ext4: Wire up ext4_readpage[s] to use mpage_readpage[s] Chandan Rajendra 2019-02-18 10:04 ` Chandan Rajendra 2019-02-18 10:19 ` [RFC PATCH 00/10] Consolidate Post read processing code Chandan Rajendra 2019-02-18 10:19 ` Chandan Rajendra 2019-02-19 21:17 ` [f2fs-dev] " Eric Biggers 2019-02-19 21:17 ` Eric Biggers 2019-02-19 21:17 ` Eric Biggers 2019-02-21 13:29 ` Chandan Rajendra 2019-02-21 13:29 ` Chandan Rajendra 2019-02-20 0:41 ` Eric Biggers 2019-02-20 0:41 ` Eric Biggers 2019-02-21 13:32 ` Chandan Rajendra 2019-02-21 13:32 ` Chandan Rajendra 2019-02-21 18:38 ` Eric Biggers 2019-02-21 18:38 ` Eric Biggers 2019-02-22 4:29 ` Chandan Rajendra 2019-02-22 4:29 ` Chandan Rajendra
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=20190219232649.GF12177@gmail.com \ --to=ebiggers@kernel.org \ --cc=adilger.kernel@dilger.ca \ --cc=chandan@linux.ibm.com \ --cc=jaegeuk@kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ --cc=tytso@mit.edu \ /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.