android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm flakey: fix logic when corrupting a bio

Browse Source 
commit aa56b9b75996ff4c76a0a4181c2fa0206c3d91cc upstream.

If "corrupt_bio_byte" is set to corrupt reads and corrupt_bio_flags is
used, dm-flakey would erroneously return all writes as errors. Likewise,
if "corrupt_bio_byte" is set to corrupt writes, dm-flakey would return
errors for all reads.

Fix the logic so that if fc->corrupt_bio_byte is non-zero, dm-flakey
will not abort reads on writes with an error.

Cc: stable@vger.kernel.org
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mikulas Patocka 2023-01-22 14:03:56 -05:00 committed by Greg Kroah-Hartman
parent 17f81b1277
commit 07e375c18a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/md/dm-flakey.c
View File

@ -359,9 +359,11 @@ static int flakey_map(struct dm_target *ti, struct bio *bio)
/* /*
* Corrupt matching writes. * Corrupt matching writes.
*/ */
if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == WRITE)) { if (fc->corrupt_bio_byte) {
if (all_corrupt_bio_flags_match(bio, fc)) if (fc->corrupt_bio_rw == WRITE) {
corrupt_bio_data(bio, fc); if (all_corrupt_bio_flags_match(bio, fc))
corrupt_bio_data(bio, fc);
}
goto map_bio; goto map_bio;
} }
@ -387,13 +389,14 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio,
return DM_ENDIO_DONE; return DM_ENDIO_DONE;
if (!*error && pb->bio_submitted && (bio_data_dir(bio) == READ)) { if (!*error && pb->bio_submitted && (bio_data_dir(bio) == READ)) {
if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == READ) && if (fc->corrupt_bio_byte) {
all_corrupt_bio_flags_match(bio, fc)) { if ((fc->corrupt_bio_rw == READ) &&
/* all_corrupt_bio_flags_match(bio, fc)) {
* Corrupt successful matching READs while in down state. /*
*/ * Corrupt successful matching READs while in down state.
corrupt_bio_data(bio, fc); */
corrupt_bio_data(bio, fc);
}
} else if (!test_bit(DROP_WRITES, &fc->flags) && } else if (!test_bit(DROP_WRITES, &fc->flags) &&
!test_bit(ERROR_WRITES, &fc->flags)) { !test_bit(ERROR_WRITES, &fc->flags)) {
/* /*