From owner-svn-src-head@freebsd.org Fri May 18 18:27:18 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55BF2EB10DB; Fri, 18 May 2018 18:27:18 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 08E5D83183; Fri, 18 May 2018 18:27:18 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA36E1BC44; Fri, 18 May 2018 18:27:17 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4IIRHjq023541; Fri, 18 May 2018 18:27:17 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4IIRHum023540; Fri, 18 May 2018 18:27:17 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805181827.w4IIRHum023540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Fri, 18 May 2018 18:27:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333808 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 333808 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 18:27:18 -0000 Author: mmacy Date: Fri May 18 18:27:17 2018 New Revision: 333808 URL: https://svnweb.freebsd.org/changeset/base/333808 Log: epoch(9): assert that epoch is allocated post-configure Modified: head/sys/kern/subr_epoch.c Modified: head/sys/kern/subr_epoch.c ============================================================================== --- head/sys/kern/subr_epoch.c Fri May 18 17:58:15 2018 (r333807) +++ head/sys/kern/subr_epoch.c Fri May 18 18:27:17 2018 (r333808) @@ -267,8 +267,9 @@ epoch_enter_preempt_internal(epoch_t epoch, struct thr { struct epoch_pcpu_state *eps; - MPASS(epoch->e_flags & EPOCH_PREEMPT); + MPASS(cold || epoch != NULL); INIT_CHECK(epoch); + MPASS(epoch->e_flags & EPOCH_PREEMPT); critical_enter(); td->td_pre_epoch_prio = td->td_priority; eps = epoch->e_pcpu[curcpu]; @@ -300,6 +301,7 @@ epoch_enter(epoch_t epoch) ck_epoch_section_t *section; struct thread *td; + MPASS(cold || epoch != NULL); section = NULL; td = curthread; critical_enter(); @@ -495,6 +497,8 @@ epoch_wait_preempt(epoch_t epoch) locks = curthread->td_locks; #endif + + MPASS(cold || epoch != NULL); INIT_CHECK(epoch); MPASS(epoch->e_flags & EPOCH_PREEMPT); @@ -548,6 +552,8 @@ void epoch_wait(epoch_t epoch) { + MPASS(cold || epoch != NULL); + INIT_CHECK(epoch); MPASS(epoch->e_flags == 0); critical_enter(); ck_epoch_synchronize_wait(&epoch->e_epoch, epoch_block_handler, NULL);