Source-Changes-HG archive

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

[src/trunk]: src/sys - Shuffle some items around in struct lwp to save space....



details:   https://anonhg.NetBSD.org/src/rev/68a3a4d293f5
branches:  trunk
changeset: 847961:68a3a4d293f5
user:      ad <ad%NetBSD.org@localhost>
date:      Sun Jan 12 18:37:10 2020 +0000

description:
- Shuffle some items around in struct lwp to save space.  Remove an unused
  item or two.

- For lockstat, get a useful callsite for vnode locks (caller to vn_lock()).

diffstat:

 sys/kern/kern_rwlock.c |  17 +++++++++++------
 sys/kern/vfs_vnops.c   |  12 ++++++++++--
 sys/sys/lwp.h          |  32 +++++++++++++++-----------------
 3 files changed, 36 insertions(+), 25 deletions(-)

diffs (188 lines):

diff -r 92a1a444d64a -r 68a3a4d293f5 sys/kern/kern_rwlock.c
--- a/sys/kern/kern_rwlock.c    Sun Jan 12 18:36:55 2020 +0000
+++ b/sys/kern/kern_rwlock.c    Sun Jan 12 18:37:10 2020 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: kern_rwlock.c,v 1.59 2019/12/09 21:02:10 ad Exp $      */
+/*     $NetBSD: kern_rwlock.c,v 1.60 2020/01/12 18:37:10 ad Exp $      */
 
 /*-
- * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2019, 2020
+ *     The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -38,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.59 2019/12/09 21:02:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.60 2020/01/12 18:37:10 ad Exp $");
 
 #define        __RWLOCK_PRIVATE
 
@@ -420,9 +421,13 @@
        }
        KPREEMPT_ENABLE(curlwp);
 
-       LOCKSTAT_EVENT(lsflag, rw, LB_RWLOCK |
-           (op == RW_WRITER ? LB_SLEEP1 : LB_SLEEP2), slpcnt, slptime);
-       LOCKSTAT_EVENT(lsflag, rw, LB_RWLOCK | LB_SPIN, spincnt, spintime);
+       LOCKSTAT_EVENT_RA(lsflag, rw, LB_RWLOCK |
+           (op == RW_WRITER ? LB_SLEEP1 : LB_SLEEP2), slpcnt, slptime,
+           (l->l_rwcallsite != 0 ? l->l_rwcallsite :
+             (uintptr_t)__builtin_return_address(0)));
+       LOCKSTAT_EVENT_RA(lsflag, rw, LB_RWLOCK | LB_SPIN, spincnt, spintime,
+           (l->l_rwcallsite != 0 ? l->l_rwcallsite :
+             (uintptr_t)__builtin_return_address(0)));
        LOCKSTAT_EXIT(lsflag);
 
        RW_DASSERT(rw, (op != RW_READER && RW_OWNER(rw) == curthread) ||
diff -r 92a1a444d64a -r 68a3a4d293f5 sys/kern/vfs_vnops.c
--- a/sys/kern/vfs_vnops.c      Sun Jan 12 18:36:55 2020 +0000
+++ b/sys/kern/vfs_vnops.c      Sun Jan 12 18:37:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_vnops.c,v 1.204 2019/12/16 22:47:54 ad Exp $       */
+/*     $NetBSD: vfs_vnops.c,v 1.205 2020/01/12 18:37:10 ad Exp $       */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.204 2019/12/16 22:47:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.205 2020/01/12 18:37:10 ad Exp $");
 
 #include "veriexec.h"
 
@@ -1030,6 +1030,7 @@
 int
 vn_lock(struct vnode *vp, int flags)
 {
+       struct lwp *l;
        int error;
 
 #if 0
@@ -1044,10 +1045,17 @@
                WAPBL_JUNLOCK_ASSERT(wapbl_vptomp(vp));
 #endif
 
+       /* Get a more useful report for lockstat. */
+       l = curlwp;
+       KASSERT(l->l_rwcallsite == 0);
+       l->l_rwcallsite = (uintptr_t)__builtin_return_address(0);       
+
        error = VOP_LOCK(vp, flags);
        if ((flags & LK_RETRY) != 0 && error == ENOENT)
                error = VOP_LOCK(vp, flags);
 
+       l->l_rwcallsite = 0;
+
        KASSERT((flags & LK_RETRY) == 0 || (flags & LK_NOWAIT) != 0 ||
            error == 0);
 
diff -r 92a1a444d64a -r 68a3a4d293f5 sys/sys/lwp.h
--- a/sys/sys/lwp.h     Sun Jan 12 18:36:55 2020 +0000
+++ b/sys/sys/lwp.h     Sun Jan 12 18:37:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lwp.h,v 1.193 2020/01/08 17:38:43 ad Exp $     */
+/*     $NetBSD: lwp.h,v 1.194 2020/01/12 18:37:10 ad Exp $     */
 
 /*
  * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010, 2019
@@ -92,17 +92,17 @@
        kmutex_t * volatile l_mutex;    /* l: ptr to mutex on sched state */
        void            *l_addr;        /* l: PCB address; use lwp_getpcb() */
        struct mdlwp    l_md;           /* l: machine-dependent fields. */
-       int             l_flag;         /* l: misc flag values */
-       int             l_stat;         /* l: overall LWP status */
        struct bintime  l_rtime;        /* l: real time */
        struct bintime  l_stime;        /* l: start time (while ONPROC) */
+       int             l_flag;         /* l: misc flag values */
        u_int           l_swtime;       /* l: time swapped in or out */
        u_int           l_rticks;       /* l: Saved start time of run */
        u_int           l_rticksum;     /* l: Sum of ticks spent running */
        u_int           l_slpticks;     /* l: Saved start time of sleep */
        u_int           l_slpticksum;   /* l: Sum of ticks spent sleeping */
        int             l_biglocks;     /* l: biglock count before sleep */
-       int             l_class;        /* l: scheduling class */
+       short           l_stat;         /* l: overall LWP status */
+       short           l_class;        /* l: scheduling class */
        int             l_kpriority;    /* !: has kernel priority boost */
        pri_t           l_kpribase;     /* !: kernel priority base level */
        pri_t           l_priority;     /* l: scheduler priority */
@@ -110,13 +110,13 @@
        pri_t           l_protectprio;  /* l: for PTHREAD_PRIO_PROTECT */
        pri_t           l_auxprio;      /* l: max(inherit,protect) priority */
        int             l_protectdepth; /* l: for PTHREAD_PRIO_PROTECT */
-       SLIST_HEAD(, turnstile) l_pi_lenders; /* l: ts lending us priority */
+       u_int           l_cpticks;      /* (: Ticks of CPU time */
+       psetid_t        l_psid;         /* l: assigned processor-set ID */
+       fixpt_t         l_pctcpu;       /* p: %cpu during l_swtime */
+       fixpt_t         l_estcpu;       /* l: cpu time for SCHED_4BSD */
        volatile uint64_t l_ncsw;       /* l: total context switches */
        volatile uint64_t l_nivcsw;     /* l: involuntary context switches */
-       u_int           l_cpticks;      /* (: Ticks of CPU time */
-       fixpt_t         l_pctcpu;       /* p: %cpu during l_swtime */
-       fixpt_t         l_estcpu;       /* l: cpu time for SCHED_4BSD */
-       psetid_t        l_psid;         /* l: assigned processor-set ID */
+       SLIST_HEAD(, turnstile) l_pi_lenders; /* l: ts lending us priority */
        struct cpu_info *l_target_cpu;  /* l: target CPU to migrate */
        struct lwpctl   *l_lwpctl;      /* p: lwpctl block kernel address */
        struct lcpage   *l_lcpage;      /* p: lwpctl containing page */
@@ -129,11 +129,9 @@
        wchan_t         l_wchan;        /* l: sleep address */
        const char      *l_wmesg;       /* l: reason for sleep */
        struct sleepq   *l_sleepq;      /* l: current sleep queue */
-       int             l_sleeperr;     /* !: error before unblock */
+       callout_t       l_timeout_ch;   /* !: callout for tsleep */
+       kcondvar_t      l_waitcv;       /* a: vfork() wait */
        u_int           l_slptime;      /* l: time since last blocked */
-       callout_t       l_timeout_ch;   /* !: callout for tsleep */
-       u_int           l_emap_gen;     /* !: emap generation number */
-       kcondvar_t      l_waitcv;       /* a: vfork() wait */
        bool            l_vforkwaiting; /* a: vfork() waiting */
 
 #if PCU_UNIT_COUNT > 0
@@ -142,21 +140,21 @@
 #endif
 
        /* Process level and global state, misc. */
+       lwpid_t         l_lid;          /* (: LWP identifier; local to proc */
        LIST_ENTRY(lwp) l_list;         /* a: entry on list of all LWPs */
        void            *l_ctxlink;     /* p: uc_link {get,set}context */
        struct proc     *l_proc;        /* p: parent process */
        LIST_ENTRY(lwp) l_sibling;      /* p: entry on proc's list of LWPs */
+       char            *l_name;        /* (: name, optional */
        lwpid_t         l_waiter;       /* p: first LWP waiting on us */
        lwpid_t         l_waitingfor;   /* p: specific LWP we are waiting on */
        int             l_prflag;       /* p: process level flags */
        u_int           l_refcnt;       /* p: reference count on this LWP */
-       lwpid_t         l_lid;          /* (: LWP identifier; local to proc */
-       char            *l_name;        /* (: name, optional */
 
        /* State of select() or poll(). */
        int             l_selflag;      /* S: polling state flags */
+       int             l_selret;       /* S: return value of select/poll */
        SLIST_HEAD(,selinfo) l_selwait; /* S: descriptors waited on */
-       int             l_selret;       /* S: return value of select/poll */
        uintptr_t       l_selrec;       /* !: argument for selrecord() */
        struct selcluster *l_selcluster;/* !: associated cluster data */
        void *          l_selbits;      /* (: select() bit-field */
@@ -184,7 +182,6 @@
        struct filedesc *l_fd;          /* !: cached copy of proc::p_fd */
        void            *l_emuldata;    /* !: kernel lwp-private data */
        struct fstrans_lwp_info *l_fstrans; /* (: fstrans private data */
-       u_int           l_cv_signalled; /* c: restarted by cv_signal() */
        u_short         l_shlocks;      /* !: lockdebug: shared locks held */
        u_short         l_exlocks;      /* !: lockdebug: excl. locks held */
        u_short         l_psrefs;       /* !: count of psref held */
@@ -199,6 +196,7 @@
        uintptr_t       l_pfailaddr;    /* !: for kernel preemption */
        uintptr_t       l_pfaillock;    /* !: for kernel preemption */
        _TAILQ_HEAD(,struct lockdebug,volatile) l_ld_locks;/* !: locks held by LWP */
+       uintptr_t       l_rwcallsite;   /* !: rwlock actual callsite */
        int             l_tcgen;        /* !: for timecounter removal */
 
        /* These are only used by 'options SYSCALL_TIMES'. */



Home | Main Index | Thread Index | Old Index