Date: Wed, 5 Feb 2020 00:08:01 +0300 From: Dmitry Chagin <dchagin@freebsd.org> To: Konstantin Belousov <kib@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r357530 - head/sys/kern Message-ID: <CAC0jpUD7yC0Yvh_bWKDcAHmW1e1PKaJzDvUMB=hhcdCLOWX%2BRQ@mail.gmail.com> In-Reply-To: <202002042102.014L28em011948@repo.freebsd.org> References: <202002042102.014L28em011948@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
=D1=81=D1=80, 5 =D1=84=D0=B5=D0=B2=D1=80. 2020 =D0=B3. =D0=B2 00:02, Konsta= ntin Belousov <kib@freebsd.org>: > Author: kib > Date: Tue Feb 4 21:02:08 2020 > New Revision: 357530 > URL: https://svnweb.freebsd.org/changeset/base/357530 > > Log: > Remove unneeded assert for curproc. Simplify. > > Reported by: syzkaller by markj > Sponsored by: The FreeBSD Foundation > > Modified: > head/sys/kern/kern_time.c > > Modified: head/sys/kern/kern_time.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/kern_time.c Tue Feb 4 20:40:45 2020 (r357529) > +++ head/sys/kern/kern_time.c Tue Feb 4 21:02:08 2020 (r357530) > @@ -254,11 +254,8 @@ void > kern_thread_cputime(struct thread *targettd, struct timespec *ats) > { > uint64_t runtime, curtime, switchtime; > - struct proc *p; > > if (targettd =3D=3D NULL) { /* current thread */ > - p =3D curthread->td_proc; > - PROC_LOCK_ASSERT(p, MA_OWNED); > critical_enter(); > switchtime =3D PCPU_GET(switchtime); > curtime =3D cpu_ticks(); > @@ -266,8 +263,7 @@ kern_thread_cputime(struct thread *targettd, struct t= i > critical_exit(); > runtime +=3D curtime - switchtime; > } else { > - p =3D targettd->td_proc; > - PROC_LOCK_ASSERT(p, MA_OWNED); > + PROC_LOCK_ASSERT(targettd->td_proc, MA_OWNED); > thread_lock(targettd); > runtime =3D targettd->td_runtime; > thread_unlock(targettd); > 10x
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAC0jpUD7yC0Yvh_bWKDcAHmW1e1PKaJzDvUMB=hhcdCLOWX%2BRQ>