Module Name: src
Committed By: rin
Date: Thu Apr 15 00:32:50 UTC 2021
Modified Files:
src/sys/dev: dksubr.c
Log Message:
dk_start(): retry device-dependent start() routine later, also when it
returns ENOMEM in addition to EAGAIN.
Device-dependent start() routine may allocate buffer directly, or via
bus_dma(9) API (some implementations for bus_dma(9) like alpha allocate
memory internally).
If these attempts fail with ENOMEM, this is not a disk error, therefore
we must retry later, as already done for EAGAIN.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/dksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.112 src/sys/dev/dksubr.c:1.113
--- src/sys/dev/dksubr.c:1.112 Sun Mar 1 03:21:54 2020
+++ src/sys/dev/dksubr.c Thu Apr 15 00:32:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.112 2020/03/01 03:21:54 riastradh Exp $ */
+/* $NetBSD: dksubr.c,v 1.113 2021/04/15 00:32:50 rin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.112 2020/03/01 03:21:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.113 2021/04/15 00:32:50 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -428,7 +428,10 @@ dk_start(struct dk_softc *dksc, struct b
mutex_exit(&dksc->sc_iolock);
error = dkd->d_diskstart(dksc->sc_dev, bp);
mutex_enter(&dksc->sc_iolock);
- if (error == EAGAIN) {
+ if (error == EAGAIN || error == ENOMEM) {
+ /*
+ * Not a disk error. Retry later.
+ */
KASSERT(dksc->sc_deferred == NULL);
dksc->sc_deferred = bp;
disk_unbusy(&dksc->sc_dkdev, 0, (bp->b_flags & B_READ));
