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

FreeBSD: Retry OCF ENOMEM errors. 

ZFS does not expect transient errors from crypto.  For read they are
counted as checksum errors, while for write end up in panic.  To not
panic on random low memory conditions retry ENOMEM errors in the OCF
wrapper function.

While there remove unneeded timeout and priority from msleep().

External-issue: https://reviews.freebsd.org/D30339
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Mark Maybee <mark.maybee@delphix.com>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Sponsored-By: iXsystems, Inc.
Closes #12077
This commit is contained in:
Alexander Motin 2021-05-24 16:42:45 -04:00 committed by Tony Hutter
parent abd0b59e48
commit 5d4f7e7566
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/os/freebsd/zfs/crypto_os.c
View File

@ -172,11 +172,13 @@ zfs_crypto_dispatch(freebsd_crypt_session_t *session, struct cryptop *crp)
break; break;
mtx_lock(&session->fs_lock); mtx_lock(&session->fs_lock);
while (session->fs_done == false) while (session->fs_done == false)
msleep(crp, &session->fs_lock, PRIBIO, msleep(crp, &session->fs_lock, 0,
"zfs_crypto", hz/5); "zfs_crypto", 0);
mtx_unlock(&session->fs_lock); mtx_unlock(&session->fs_lock);
if (crp->crp_etype != EAGAIN) { if (crp->crp_etype == ENOMEM) {
pause("zcrnomem", 1);
} else if (crp->crp_etype != EAGAIN) {
error = crp->crp_etype; error = crp->crp_etype;
break; break;
} }