Module Name: src
Committed By: hannken
Date: Sat Mar 9 09:02:38 UTC 2019
Modified Files:
src/sys/rump/librump/rumpkern: emul.c lwproc.c
Log Message:
Rumpkernel has its own thread deallocation. Add missing fstrans_lwp_dtor()
to lwproc_freelwp().
PR bin/50350: rump/rumpkern/t_sp/stress_{long,short} fail on Core 2 Quad
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/rump/librump/rumpkern/emul.c
cvs rdiff -u -r1.40 -r1.41 src/sys/rump/librump/rumpkern/lwproc.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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.189 src/sys/rump/librump/rumpkern/emul.c:1.190
--- src/sys/rump/librump/rumpkern/emul.c:1.189 Wed Dec 5 19:56:49 2018
+++ src/sys/rump/librump/rumpkern/emul.c Sat Mar 9 09:02:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.189 2018/12/05 19:56:49 christos Exp $ */
+/* $NetBSD: emul.c,v 1.190 2019/03/09 09:02:38 hannken Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.189 2018/12/05 19:56:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.190 2019/03/09 09:02:38 hannken Exp $");
#include <sys/param.h>
#include <sys/cprng.h>
@@ -292,6 +292,15 @@ rump_fstrans_done(struct mount *mp)
}
__weak_alias(fstrans_done,rump_fstrans_done);
+
+void rump_fstrans_lwp_dtor(struct lwp *);
+void
+rump_fstrans_lwp_dtor(struct lwp *l)
+{
+
+}
+__weak_alias(fstrans_lwp_dtor,rump_fstrans_lwp_dtor);
+
/*
* Provide weak aliases for tty routines used by printf.
* They will be used unless the rumpkern_tty component is present.
Index: src/sys/rump/librump/rumpkern/lwproc.c
diff -u src/sys/rump/librump/rumpkern/lwproc.c:1.40 src/sys/rump/librump/rumpkern/lwproc.c:1.41
--- src/sys/rump/librump/rumpkern/lwproc.c:1.40 Sun Apr 24 07:45:10 2016
+++ src/sys/rump/librump/rumpkern/lwproc.c Sat Mar 9 09:02:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lwproc.c,v 1.40 2016/04/24 07:45:10 martin Exp $ */
+/* $NetBSD: lwproc.c,v 1.41 2019/03/09 09:02:38 hannken Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,11 +28,12 @@
#define RUMP__CURLWP_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.40 2016/04/24 07:45:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.41 2019/03/09 09:02:38 hannken Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
#include <sys/filedesc.h>
+#include <sys/fstrans.h>
#include <sys/kauth.h>
#include <sys/kmem.h>
#include <sys/lwp.h>
@@ -326,6 +327,7 @@ lwproc_freelwp(struct lwp *l)
if (l->l_name)
kmem_free(l->l_name, MAXCOMLEN);
+ fstrans_lwp_dtor(l);
lwp_finispecific(l);
lwproc_curlwpop(RUMPUSER_LWP_DESTROY, l);
