Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Avoid deadlock when removing L2ARC devices under I/O 

In case we have I/O and try to remove an L2ARC device a deadlock might
occur. arc_read()->zio_read()->zfs_blkptr_verify() waits for SCL_VDEV
to be dropped while holding the hash_lock. However, spa_l2cache_load()
holds SCL_ALL and waits for the hash_lock in l2arc_evict().

Fix this by moving zfs_blkptr_verify() to the top top arc_read() before
the hash_lock is taken. Verify the block pointer and return a checksum
error if damaged rather than halting the system, by using
BLK_VERIFY_LOG instead of BLK_VERIFY_HALT.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Mark Maybee <mark.maybee@delphix.com>
Signed-off-by: George Amanakis <gamanakis@gmail.com>
Closes #12054
This commit is contained in:
George Amanakis 2021-06-17 03:17:42 +03:00 committed by Tony Hutter
parent bd197378e7
commit 87d93731e7
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
module/zfs/arc.c
View File

@ -5835,6 +5835,12 @@ top:
* Embedded BP's have no DVA and require no I/O to "read". * Embedded BP's have no DVA and require no I/O to "read".
* Create an anonymous arc buf to back it. * Create an anonymous arc buf to back it.
*/ */
if (!zfs_blkptr_verify(spa, bp, zio_flags &
ZIO_FLAG_CONFIG_WRITER, BLK_VERIFY_LOG)) {
rc = SET_ERROR(ECKSUM);
goto out;
}
hdr = buf_hash_find(guid, bp, &hash_lock); hdr = buf_hash_find(guid, bp, &hash_lock);
} }
@ -6003,17 +6009,6 @@ top:
goto out; goto out;
} }
/*
* Gracefully handle a damaged logical block size as a
* checksum error.
*/
if (lsize > spa_maxblocksize(spa)) {
rc = SET_ERROR(ECKSUM);
if (hash_lock != NULL)
mutex_exit(hash_lock);
goto out;
}
if (hdr == NULL) { if (hdr == NULL) {
/* /*
* This block is not in the cache or it has * This block is not in the cache or it has

3
module/zfs/zio.c
View File

@ -1106,9 +1106,6 @@ zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
{ {
zio_t *zio; zio_t *zio;
(void) zfs_blkptr_verify(spa, bp, flags & ZIO_FLAG_CONFIG_WRITER,
BLK_VERIFY_HALT);
zio = zio_create(pio, spa, BP_PHYSICAL_BIRTH(bp), bp, zio = zio_create(pio, spa, BP_PHYSICAL_BIRTH(bp), bp,
data, size, size, done, private, data, size, size, done, private,
ZIO_TYPE_READ, priority, flags, NULL, 0, zb, ZIO_TYPE_READ, priority, flags, NULL, 0, zb,