* [PATCH] ceph: truncate page cache when doing DIO in encrypted inodes
@ 2022-04-01 11:38 Luís Henriques
2022-04-01 11:56 ` Jeff Layton
0 siblings, 1 reply; 3+ messages in thread
From: Luís Henriques @ 2022-04-01 11:38 UTC (permalink / raw)
To: Jeff Layton, Xiubo Li, Ilya Dryomov
Cc: ceph-devel, linux-kernel, Luís Henriques
When doing DIO on an encrypted node, we need to truncate the page cache in
the range being written to, otherwise the cache will include invalid data.
Signed-off-by: Luís Henriques <lhenriques@suse.de>
---
fs/ceph/file.c | 5 +++++
1 file changed, 5 insertions(+)
This patch should fix generic/647 fstest when run with test_dummy_encryption.
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 5072570c2203..0f31c4d352a4 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1895,6 +1895,11 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
req->r_inode = inode;
req->r_mtime = mtime;
+ if (IS_ENCRYPTED(inode) && (iocb->ki_flags & IOCB_DIRECT))
+ truncate_inode_pages_range(
+ inode->i_mapping, write_pos,
+ PAGE_ALIGN(write_pos + write_len) - 1);
+
/* Set up the assertion */
if (rmw) {
/*
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ceph: truncate page cache when doing DIO in encrypted inodes
2022-04-01 11:38 [PATCH] ceph: truncate page cache when doing DIO in encrypted inodes Luís Henriques
@ 2022-04-01 11:56 ` Jeff Layton
2022-04-01 12:15 ` Luís Henriques
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Layton @ 2022-04-01 11:56 UTC (permalink / raw)
To: Luís Henriques, Xiubo Li, Ilya Dryomov; +Cc: ceph-devel, linux-kernel
On Fri, 2022-04-01 at 12:38 +0100, Luís Henriques wrote:
> When doing DIO on an encrypted node, we need to truncate the page cache in
> the range being written to, otherwise the cache will include invalid data.
>
> Signed-off-by: Luís Henriques <lhenriques@suse.de>
> ---
> fs/ceph/file.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> This patch should fix generic/647 fstest when run with test_dummy_encryption.
>
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 5072570c2203..0f31c4d352a4 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -1895,6 +1895,11 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
> req->r_inode = inode;
> req->r_mtime = mtime;
>
> + if (IS_ENCRYPTED(inode) && (iocb->ki_flags & IOCB_DIRECT))
> + truncate_inode_pages_range(
> + inode->i_mapping, write_pos,
> + PAGE_ALIGN(write_pos + write_len) - 1);
> +
> /* Set up the assertion */
> if (rmw) {
> /*
Truncating the pagecache like this could cause dirty data to be
discarded. I know we're planning to overwrite this range, but you are
having to invalidate more than the written range here. We could
potentially lose a write to that region.
Have you tried using something like invalidate_inode_pages2_range ?
That's more of what we'd want here, as it's a bit more cautious about
tossing out dirty pages. I see too that that is what
ceph_direct_read_write calls in the write case as well.
--
Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ceph: truncate page cache when doing DIO in encrypted inodes
2022-04-01 11:56 ` Jeff Layton
@ 2022-04-01 12:15 ` Luís Henriques
0 siblings, 0 replies; 3+ messages in thread
From: Luís Henriques @ 2022-04-01 12:15 UTC (permalink / raw)
To: Jeff Layton; +Cc: Xiubo Li, Ilya Dryomov, ceph-devel, linux-kernel
Jeff Layton <jlayton@kernel.org> writes:
> On Fri, 2022-04-01 at 12:38 +0100, Luís Henriques wrote:
>> When doing DIO on an encrypted node, we need to truncate the page cache in
>> the range being written to, otherwise the cache will include invalid data.
>>
>> Signed-off-by: Luís Henriques <lhenriques@suse.de>
>> ---
>> fs/ceph/file.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> This patch should fix generic/647 fstest when run with test_dummy_encryption.
>>
>> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
>> index 5072570c2203..0f31c4d352a4 100644
>> --- a/fs/ceph/file.c
>> +++ b/fs/ceph/file.c
>> @@ -1895,6 +1895,11 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
>> req->r_inode = inode;
>> req->r_mtime = mtime;
>>
>> + if (IS_ENCRYPTED(inode) && (iocb->ki_flags & IOCB_DIRECT))
>> + truncate_inode_pages_range(
>> + inode->i_mapping, write_pos,
>> + PAGE_ALIGN(write_pos + write_len) - 1);
>> +
>> /* Set up the assertion */
>> if (rmw) {
>> /*
>
> Truncating the pagecache like this could cause dirty data to be
> discarded. I know we're planning to overwrite this range, but you are
> having to invalidate more than the written range here. We could
> potentially lose a write to that region.
>
> Have you tried using something like invalidate_inode_pages2_range ?
> That's more of what we'd want here, as it's a bit more cautious about
> tossing out dirty pages. I see too that that is what
> ceph_direct_read_write calls in the write case as well.
OK, let me try that instead. Yeah, I've used what the usual direct path
was using (the truncate_inode_pages_range()), but if
invalidate_inode_pages2_range works here I guess that's better. I'll test
that and send out v2.
Cheers,
--
Luís
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-01 12:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-01 11:38 [PATCH] ceph: truncate page cache when doing DIO in encrypted inodes Luís Henriques
2022-04-01 11:56 ` Jeff Layton
2022-04-01 12:15 ` Luís Henriques
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).