Module Name: src
Committed By: mrg
Date: Tue Apr 16 10:00:04 UTC 2019
Modified Files:
src/sys/external/bsd/common/include/linux: err.h errno.h
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_drm.c
nouveau_fence.c
src/sys/external/bsd/drm2/drm: drm_cdevsw.c
src/sys/external/bsd/drm2/include/drm: drm_wait_netbsd.h
src/sys/external/bsd/drm2/linux: linux_fence.c linux_ww_mutex.c
Log Message:
fix various problems i've seen where cv_*wait*() return ERESTART,
which is -3 in netbsd, which we have mapped linux ERESTARTSYS to.
this has a problem because linux code often returns errors and
pointers in the same value, and pointer values between -4095 and
-1 are considered as error returns, but -3 ends up as 3 and thus
is not considered an error, and mayhem ensues.
with this in place my kabylake system seems actually stable, i
have not triggered any of my prior issues in almost 4 weeks now.
Taylor asked me to write up a description and then wrote most of
the text below for me :-)
In Linux code, we always work with ERESTARTSYS so the code meaning
start over is a positive NetBSD errno safe for PTR_ERR/ERR_PTR.
To achieve this:
1. adapt all cv_waits that return to Linux so they map ERESTART to
ERESTARTSYS, and
2. adapt all returns to userland so they convert ERESTARTSYS to
ERESTART.
Leave EINTR and all other error codes alone.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/common/include/linux/err.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/common/include/linux/errno.h
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/linux/linux_fence.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/linux_ww_mutex.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/external/bsd/common/include/linux/err.h
diff -u src/sys/external/bsd/common/include/linux/err.h:1.2 src/sys/external/bsd/common/include/linux/err.h:1.3
--- src/sys/external/bsd/common/include/linux/err.h:1.2 Mon Aug 27 07:20:25 2018
+++ src/sys/external/bsd/common/include/linux/err.h Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: err.h,v 1.2 2018/08/27 07:20:25 riastradh Exp $ */
+/* $NetBSD: err.h,v 1.3 2019/04/16 10:00:04 mrg Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/errno.h>
#include <sys/systm.h>
-#define MAX_ERRNO ELAST
+#define MAX_ERRNO 4095
static inline bool
IS_ERR_VALUE(uintptr_t n)
Index: src/sys/external/bsd/common/include/linux/errno.h
diff -u src/sys/external/bsd/common/include/linux/errno.h:1.3 src/sys/external/bsd/common/include/linux/errno.h:1.4
--- src/sys/external/bsd/common/include/linux/errno.h:1.3 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/common/include/linux/errno.h Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: errno.h,v 1.3 2014/07/16 20:56:24 riastradh Exp $ */
+/* $NetBSD: errno.h,v 1.4 2019/04/16 10:00:04 mrg Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,7 +35,10 @@
* - Linux consistently passes around negative errno values. NetBSD
* consistently passes around positive ones, except the special magic
* in-kernel ones (EJUSTRETURN, ERESTART, &c.) which should not be
- * exposed to userland. Be careful!
+ * exposed to userland *or* linux-only code using the negative pointer
+ * means error return pattern. Be careful! If Using ERESTARTSYS from
+ * Linux code, be sure it is remapped back to ERESTART before NetBSD
+ * code sees it.
*/
#ifndef _LINUX_ERRNO_H_
@@ -43,7 +46,7 @@
#include <sys/errno.h>
-#define ERESTARTSYS ERESTART
+#define ERESTARTSYS (ELAST+1) /* XXX */
#define ENOTSUPP ENOTSUP /* XXX ??? */
#define EREMOTEIO EIO /* XXX Urk... */
#define ECHRNG ERANGE /* XXX ??? */
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.16 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.17
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c:1.16 Fri Dec 21 07:51:17 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_drm.c,v 1.16 2018/12/21 07:51:17 maya Exp $ */
+/* $NetBSD: nouveau_drm.c,v 1.17 2019/04/16 10:00:04 mrg Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.16 2018/12/21 07:51:17 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_drm.c,v 1.17 2019/04/16 10:00:04 mrg Exp $");
#include <linux/console.h>
#include <linux/delay.h>
@@ -966,11 +966,12 @@ nouveau_ioctl_override(struct file *fp,
ret = pm_runtime_get_sync(dev->dev);
if (ret < 0 && ret != -EACCES)
- return ret;
+ /* XXX errno Linux->NetBSD */
+ return -ret;
switch (DRM_IOCTL_NR(cmd) - DRM_COMMAND_BASE) {
case DRM_NOUVEAU_NVIF:
- /* XXX errno NetBSD->Linux */
+ /* XXX errno Linux->NetBSD */
ret = -usif_ioctl(file, data, IOCPARM_LEN(cmd));
break;
default:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.13 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c:1.13 Tue Aug 28 20:59:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_fence.c,v 1.13 2018/08/28 20:59:21 mrg Exp $ */
+/* $NetBSD: nouveau_fence.c,v 1.14 2019/04/16 10:00:04 mrg Exp $ */
/*
* Copyright (C) 2007 Ben Skeggs.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.13 2018/08/28 20:59:21 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_fence.c,v 1.14 2019/04/16 10:00:04 mrg Exp $");
#include <drm/drmP.h>
@@ -334,8 +334,11 @@ nouveau_fence_wait_legacy(struct fence *
/* XXX what lock? */
/* XXX errno NetBSD->Linux */
ret = -kpause("nvfencel", intr, 1, NULL);
- if (ret)
+ if (ret) {
+ if (ret == -ERESTART)
+ ret = -ERESTARTSYS;
return ret;
+ }
t = jiffies;
if (t >= timeout)
return 0;
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.13 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.14
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.13 Fri Dec 21 07:51:18 2018
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.13 2018/12/21 07:51:18 maya Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.14 2019/04/16 10:00:04 mrg Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.13 2018/12/21 07:51:18 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.14 2019/04/16 10:00:04 mrg Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -184,6 +184,8 @@ fail2: mutex_lock(&drm_global_mutex);
(void)drm_lastclose(dev);
fail1: drm_minor_release(dminor);
fail0: KASSERT(error);
+ if (error == ERESTARTSYS)
+ error = ERESTART;
return error;
}
@@ -299,6 +301,8 @@ drm_read(struct file *fp, off_t *off, st
}
/* Success! */
+ if (error == ERESTARTSYS)
+ error = ERESTART;
return error;
}
@@ -345,11 +349,16 @@ drm_ioctl_shim(struct file *fp, unsigned
{
struct drm_file *file = fp->f_data;
struct drm_driver *driver = file->minor->dev->driver;
+ int error;
if (driver->ioctl_override)
- return driver->ioctl_override(fp, cmd, data);
+ error = driver->ioctl_override(fp, cmd, data);
else
- return drm_ioctl(fp, cmd, data);
+ error = drm_ioctl(fp, cmd, data);
+ if (error == ERESTARTSYS)
+ error = ERESTART;
+
+ return error;
}
static int
@@ -475,11 +484,14 @@ drm_fop_mmap(struct file *fp, off_t *off
int error;
KASSERT(fp == file->filp);
- error = (*dev->driver->mmap_object)(dev, *offp, len, prot, uobjp,
+ /* XXX errno Linux->NetBSD */
+ error = -(*dev->driver->mmap_object)(dev, *offp, len, prot, uobjp,
offp, file->filp);
*maxprotp = prot;
*advicep = UVM_ADV_RANDOM;
- return -error;
+ if (error == ERESTARTSYS)
+ error = ERESTART;
+ return error;
}
static paddr_t
Index: src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h:1.14 src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h:1.15
--- src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h:1.14 Fri May 13 15:25:57 2016
+++ src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_wait_netbsd.h,v 1.14 2016/05/13 15:25:57 christos Exp $ */
+/* $NetBSD: drm_wait_netbsd.h,v 1.15 2019/04/16 10:00:04 mrg Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -114,10 +114,13 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
* Like the legacy DRM_WAIT_ON, DRM_SPIN_WAIT_ON returns
*
* . -EBUSY if timed out (yes, -EBUSY, not -ETIMEDOUT or -EWOULDBLOCK),
- * . -EINTR/-ERESTART if interrupted by a signal, or
+ * . -EINTR/-ERESTARTSYS if interrupted by a signal, or
* . 0 if the condition was true before or just after the timeout.
*
* Note that cv_timedwait* return -EWOULDBLOCK, not -EBUSY, on timeout.
+ *
+ * Note that ERESTARTSYS is actually ELAST+1 and only used in Linux
+ * code and must be converted for use in NetBSD code (user or kernel.)
*/
#define DRM_SPIN_WAIT_ON(RET, Q, INTERLOCK, TICKS, CONDITION) do \
@@ -148,6 +151,8 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
else \
_dswo_ticks = 0; \
if (RET) { \
+ if ((RET) == -ERESTART) \
+ (RET) = -ERESTARTSYS; \
if ((RET) == -EWOULDBLOCK) \
/* Waited only one tick. */ \
continue; \
@@ -165,26 +170,29 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
*
* The untimed DRM_*WAIT*_UNTIL macros return
*
- * . -EINTR/-ERESTART if interrupted by a signal, or
+ * . -EINTR/-ERESTARTSYS if interrupted by a signal, or
* . zero if the condition evaluated
*
* The timed DRM_*TIMED_WAIT*_UNTIL macros return
*
- * . -EINTR/-ERESTART if interrupted by a signal,
+ * . -EINTR/-ERESTARTSYS if interrupted by a signal,
* . 0 if the condition was false after the timeout,
* . 1 if the condition was true just after the timeout, or
* . the number of ticks remaining if the condition was true before the
* timeout.
*
- * Contrast DRM_SPIN_WAIT_ON which returns -EINTR/-ERESTART on signal,
+ * Contrast DRM_SPIN_WAIT_ON which returns -EINTR/-ERESTARTSYS on signal,
* -EBUSY on timeout, and zero on success; and cv_*wait*, which return
- * -EINTR/-ERESTART on signal, -EWOULDBLOCK on timeout, and zero on
+ * -EINTR/-ERESTARTSYS on signal, -EWOULDBLOCK on timeout, and zero on
* success.
*
* XXX In retrospect, giving the timed and untimed macros a different
* return convention from one another to match Linux may have been a
* bad idea. All of this inconsistent timeout return convention logic
* has been a consistent source of bugs.
+ *
+ * Note that ERESTARTSYS is actually ELAST+1 and only used in Linux
+ * code and must be converted for use in NetBSD code (user or kernel.)
*/
#define _DRM_WAIT_UNTIL(RET, WAIT, Q, INTERLOCK, CONDITION) do \
@@ -199,8 +207,11 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
} \
/* XXX errno NetBSD->Linux */ \
(RET) = -WAIT((Q), &(INTERLOCK)->mtx_lock); \
- if (RET) \
+ if (RET) { \
+ if ((RET) == -ERESTART) \
+ (RET) = -ERESTARTSYS; \
break; \
+ } \
} \
} while (0)
@@ -240,6 +251,8 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
else \
_dtwu_ticks = 0; \
if (RET) { \
+ if ((RET) == -ERESTART) \
+ (RET) = -ERESTARTSYS; \
if ((RET) == -EWOULDBLOCK) \
(RET) = (CONDITION) ? 1 : 0; \
break; \
@@ -270,6 +283,8 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
while (!(CONDITION)) { \
/* XXX errno NetBSD->Linux */ \
(RET) = -WAIT((Q), &(INTERLOCK)->sl_lock); \
+ if ((RET) == -ERESTART) \
+ (RET) = -ERESTARTSYS; \
if (RET) \
break; \
} \
@@ -311,6 +326,8 @@ DRM_SPIN_WAKEUP_ALL(drm_waitqueue_t *q,
else \
_dstwu_ticks = 0; \
if (RET) { \
+ if ((RET) == -ERESTART) \
+ (RET) = -ERESTARTSYS; \
if ((RET) == -EWOULDBLOCK) \
(RET) = (CONDITION) ? 1 : 0; \
break; \
Index: src/sys/external/bsd/drm2/linux/linux_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_fence.c:1.14 src/sys/external/bsd/drm2/linux/linux_fence.c:1.15
--- src/sys/external/bsd/drm2/linux/linux_fence.c:1.14 Sat Jan 5 22:24:24 2019
+++ src/sys/external/bsd/drm2/linux/linux_fence.c Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_fence.c,v 1.14 2019/01/05 22:24:24 tnn Exp $ */
+/* $NetBSD: linux_fence.c,v 1.15 2019/04/16 10:00:04 mrg Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_fence.c,v 1.14 2019/01/05 22:24:24 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_fence.c,v 1.15 2019/04/16 10:00:04 mrg Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -565,8 +565,11 @@ fence_wait_any_timeout(struct fence **fe
}
end = hardclock_ticks;
__insn_barrier();
- if (ret)
+ if (ret) {
+ if (ret == -ERESTART)
+ ret = -ERESTARTSYS;
break;
+ }
timeout -= MIN(timeout, (unsigned)end - (unsigned)start);
}
mutex_exit(&common.lock);
@@ -709,8 +712,11 @@ fence_default_wait(struct fence *fence,
}
}
/* If the wait failed, give up. */
- if (ret)
+ if (ret) {
+ if (ret == -ERESTART)
+ ret = -ERESTARTSYS;
break;
+ }
}
out:
Index: src/sys/external/bsd/drm2/linux/linux_ww_mutex.c
diff -u src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.5 src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.6
--- src/sys/external/bsd/drm2/linux/linux_ww_mutex.c:1.5 Mon Aug 27 15:11:32 2018
+++ src/sys/external/bsd/drm2/linux/linux_ww_mutex.c Tue Apr 16 10:00:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ww_mutex.c,v 1.5 2018/08/27 15:11:32 riastradh Exp $ */
+/* $NetBSD: linux_ww_mutex.c,v 1.6 2019/04/16 10:00:04 mrg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.5 2018/08/27 15:11:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ww_mutex.c,v 1.6 2019/04/16 10:00:04 mrg Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_ww_mut
#include <sys/rbtree.h>
#include <linux/ww_mutex.h>
+#include <linux/errno.h>
#define WW_WANTLOCK(WW) \
LOCKDEBUG_WANTLOCK((WW)->wwm_debug, (WW), \
@@ -250,6 +251,8 @@ ww_mutex_state_wait_sig(struct ww_mutex
do {
/* XXX errno NetBSD->Linux */
ret = -cv_wait_sig(&mutex->wwm_cv, &mutex->wwm_lock);
+ if (ret == -ERESTART)
+ ret = -ERESTARTSYS;
if (ret)
break;
} while (mutex->wwm_state == state);
@@ -315,6 +318,8 @@ ww_mutex_lock_wait_sig(struct ww_mutex *
do {
/* XXX errno NetBSD->Linux */
ret = -cv_wait_sig(&mutex->wwm_cv, &mutex->wwm_lock);
+ if (ret == -ERESTART)
+ ret = -ERESTARTSYS;
if (ret)
goto out;
} while (!(((mutex->wwm_state == WW_CTX) ||
