Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/sys PR kern/54922: 9.99.45@20200202 panic: diagnostic as...



details:   https://anonhg.NetBSD.org/src/rev/bf19cbe8f583
branches:  trunk
changeset: 1007361:bf19cbe8f583
user:      ad <ad%NetBSD.org@localhost>
date:      Sat Feb 15 17:13:55 2020 +0000

description:
PR kern/54922: 9.99.45@20200202 panic: diagnostic assertion linux ldconfig triggers vpp != NULL in exit1()->radixtree.c line 674

Create an lwp_renumber() from the code in emulexec() and use in
linux_e_proc_exec() and linux_e_proc_fork() too.

diffstat:

 sys/compat/linux/common/linux_exec.c |  14 ++++++------
 sys/kern/kern_exec.c                 |  33 ++++--------------------------
 sys/kern/kern_lwp.c                  |  38 ++++++++++++++++++++++++++++++++++-
 sys/sys/lwp.h                        |   3 +-
 4 files changed, 50 insertions(+), 38 deletions(-)

diffs (178 lines):

diff -r fa4bd0c15707 -r bf19cbe8f583 sys/compat/linux/common/linux_exec.c
--- a/sys/compat/linux/common/linux_exec.c      Sat Feb 15 17:09:24 2020 +0000
+++ b/sys/compat/linux/common/linux_exec.c      Sat Feb 15 17:13:55 2020 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: linux_exec.c,v 1.120 2018/08/10 21:44:58 pgoyette Exp $        */
+/*     $NetBSD: linux_exec.c,v 1.121 2020/02/15 17:13:55 ad Exp $      */
 
 /*-
- * Copyright (c) 1994, 1995, 1998, 2000, 2007, 2008 The NetBSD Foundation, Inc.
+ * Copyright (c) 1994, 1995, 1998, 2000, 2007, 2008, 2020
+ *     The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -31,11 +32,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.120 2018/08/10 21:44:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.121 2020/02/15 17:13:55 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
@@ -129,9 +131,7 @@
 
        KASSERT(p->p_nlwps == 1);
        l = LIST_FIRST(&p->p_lwps);
-       mutex_enter(p->p_lock);
-       l->l_lid = p->p_pid;
-       mutex_exit(p->p_lock);
+       lwp_renumber(l, p->p_pid);
 }
 
 void
@@ -152,7 +152,7 @@
 
        KASSERT(p2->p_nlwps == 1);
        l2 = LIST_FIRST(&p2->p_lwps);
-       l2->l_lid = p2->p_pid;
+       lwp_renumber(l2, p2->p_pid);
        led1 = l1->l_emuldata;
        led2 = l2->l_emuldata;
        led2->led_child_tidptr = led1->led_child_tidptr;
diff -r fa4bd0c15707 -r bf19cbe8f583 sys/kern/kern_exec.c
--- a/sys/kern/kern_exec.c      Sat Feb 15 17:09:24 2020 +0000
+++ b/sys/kern/kern_exec.c      Sat Feb 15 17:13:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_exec.c,v 1.491 2020/02/10 22:13:01 christos Exp $ */
+/*     $NetBSD: kern_exec.c,v 1.492 2020/02/15 17:13:55 ad Exp $       */
 
 /*-
  * Copyright (c) 2008, 2019 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.491 2020/02/10 22:13:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.492 2020/02/15 17:13:55 ad Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1148,32 +1148,9 @@
            && p->p_emul != epp->ep_esch->es_emul)
                (*p->p_emul->e_proc_exit)(p);
 
-       /*
-        * This is now LWP 1.  Re-number the LWP if needed.  Don't bother
-        * with p_treelock here as this is the only live LWP in the proc
-        * right now.
-        */
-       while (__predict_false(l->l_lid != 1)) {
-               lwp_t *l2 __diagused;
-               int error;
-
-               mutex_enter(p->p_lock);
-               error = radix_tree_insert_node(&p->p_lwptree, 1 - 1, l);
-               if (error == 0) {
-                       l2 = radix_tree_remove_node(&p->p_lwptree,
-                           (uint64_t)(l->l_lid - 1));
-                       KASSERT(l2 == l);
-                       p->p_nlwpid = 2;
-                       l->l_lid = 1;
-               }
-               mutex_exit(p->p_lock);
-
-               if (error == 0)
-                       break;
-
-               KASSERT(error == ENOMEM);
-               radix_tree_await_memory();
-       }
+       /* This is now LWP 1.  Re-number the LWP if needed. */
+       if (l->l_lid != 1)
+               lwp_renumber(l, 1);
 
        /*
         * Call exec hook. Emulation code may NOT store reference to anything
diff -r fa4bd0c15707 -r bf19cbe8f583 sys/kern/kern_lwp.c
--- a/sys/kern/kern_lwp.c       Sat Feb 15 17:09:24 2020 +0000
+++ b/sys/kern/kern_lwp.c       Sat Feb 15 17:13:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_lwp.c,v 1.225 2020/02/11 06:09:48 dogcow Exp $    */
+/*     $NetBSD: kern_lwp.c,v 1.226 2020/02/15 17:13:55 ad Exp $        */
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020
@@ -211,7 +211,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.225 2020/02/11 06:09:48 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.226 2020/02/15 17:13:55 ad Exp $");
 
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
@@ -2025,6 +2025,40 @@
        return error;
 }
 
+/*
+ * Renumber the first and only LWP in a process on exec() or fork().
+ * Don't bother with p_treelock here as this is the only live LWP in
+ * the proc right now.
+ */
+void
+lwp_renumber(lwp_t *l, lwpid_t lid)
+{
+       lwp_t *l2 __diagused;
+       proc_t *p = l->l_proc;
+       int error;
+
+       KASSERT(p->p_nlwps == 1);
+
+       while (l->l_lid != lid) {
+               mutex_enter(p->p_lock);
+               error = radix_tree_insert_node(&p->p_lwptree, lid - 1, l);
+               if (error == 0) {
+                       l2 = radix_tree_remove_node(&p->p_lwptree,
+                           (uint64_t)(l->l_lid - 1));
+                       KASSERT(l2 == l);
+                       p->p_nlwpid = lid + 1;
+                       l->l_lid = lid;
+               }
+               mutex_exit(p->p_lock);
+
+               if (error == 0)
+                       break;
+
+               KASSERT(error == ENOMEM);
+               radix_tree_await_memory();
+       }
+}
+
 #if defined(DDB)
 #include <machine/pcb.h>
 
diff -r fa4bd0c15707 -r bf19cbe8f583 sys/sys/lwp.h
--- a/sys/sys/lwp.h     Sat Feb 15 17:09:24 2020 +0000
+++ b/sys/sys/lwp.h     Sat Feb 15 17:13:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lwp.h,v 1.200 2020/01/29 15:47:52 ad Exp $     */
+/*     $NetBSD: lwp.h,v 1.201 2020/02/15 17:13:55 ad Exp $     */
 
 /*
  * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010, 2019, 2020
@@ -334,6 +334,7 @@
 bool   lwp_alive(lwp_t *);
 lwp_t  *lwp_find_first(proc_t *);
 
+void   lwp_renumber(lwp_t *, lwpid_t);
 int    lwp_wait(lwp_t *, lwpid_t, lwpid_t *, bool);
 void   lwp_continue(lwp_t *);
 void   lwp_unsleep(lwp_t *, bool);



Home | Main Index | Thread Index | Old Index