This is a note to let you know that I've just added the patch titled
block: Hold invalidate_lock in BLKZEROOUT ioctl
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
block-hold-invalidate_lock-in-blkzeroout-ioctl.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 35e4c6c1a2fc2eb11b9306e95cda1fa06a511948 Mon Sep 17 00:00:00 2001
From: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
Date: Tue, 9 Nov 2021 19:47:23 +0900
Subject: block: Hold invalidate_lock in BLKZEROOUT ioctl
From: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
commit 35e4c6c1a2fc2eb11b9306e95cda1fa06a511948 upstream.
When BLKZEROOUT ioctl and data read race, the data read leaves stale
page cache. To avoid the stale page cache, hold invalidate_lock of the
block device file mapping. The stale page cache is observed when
blktests test case block/009 is modified to call "blkdiscard -z" command
and repeated hundreds of times.
This patch can be applied back to the stable kernel version v5.15.y.
Rework is required for older stable kernels.
Fixes: 22dd6d356628 ("block: invalidate the page cache when issuing BLKZEROOUT")
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v5.15
Reviewed-by: Jan Kara <jack@xxxxxxx>
Link: https://lore.kernel.org/r/20211109104723.835533-3-shinichiro.kawasaki@xxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
block/ioctl.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -162,6 +162,7 @@ static int blk_ioctl_zeroout(struct bloc
{
uint64_t range[2];
uint64_t start, end, len;
+ struct inode *inode = bdev->bd_inode;
int err;
if (!(mode & FMODE_WRITE))
@@ -184,12 +185,17 @@ static int blk_ioctl_zeroout(struct bloc
return -EINVAL;
/* Invalidate the page cache, including dirty pages */
+ filemap_invalidate_lock(inode->i_mapping);
err = truncate_bdev_range(bdev, mode, start, end);
if (err)
- return err;
+ goto fail;
- return blkdev_issue_zeroout(bdev, start >> 9, len >> 9, GFP_KERNEL,
- BLKDEV_ZERO_NOUNMAP);
+ err = blkdev_issue_zeroout(bdev, start >> 9, len >> 9, GFP_KERNEL,
+ BLKDEV_ZERO_NOUNMAP);
+
+fail:
+ filemap_invalidate_unlock(inode->i_mapping);
+ return err;
}
static int put_ushort(unsigned short __user *argp, unsigned short val)
Patches currently in stable-queue which might be from shinichiro.kawasaki@xxxxxxx are
queue-5.10/block-hold-invalidate_lock-in-blkresetzone-ioctl.patch
queue-5.10/block-hold-invalidate_lock-in-blkzeroout-ioctl.patch
queue-5.10/block-hold-invalidate_lock-in-blkdiscard-ioctl.patch
