From owner-svn-src-head@freebsd.org Thu May 17 19:08:29 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 75743EDDA41; Thu, 17 May 2018 19:08:29 +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 2320C71A17; Thu, 17 May 2018 19:08:29 +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 F1A395801; Thu, 17 May 2018 19:08:28 +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 w4HJ8SeX007827; Thu, 17 May 2018 19:08:28 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4HJ8SHO007826; Thu, 17 May 2018 19:08:28 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805171908.w4HJ8SHO007826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Thu, 17 May 2018 19:08:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333755 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 333755 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: Thu, 17 May 2018 19:08:29 -0000 Author: mmacy Date: Thu May 17 19:08:28 2018 New Revision: 333755 URL: https://svnweb.freebsd.org/changeset/base/333755 Log: epoch(9): restore thread priority on exit if it was changed by a waiter Reported by: markj Approved by: sbruno Modified: head/sys/kern/subr_epoch.c Modified: head/sys/kern/subr_epoch.c ============================================================================== --- head/sys/kern/subr_epoch.c Thu May 17 19:06:44 2018 (r333754) +++ head/sys/kern/subr_epoch.c Thu May 17 19:08:28 2018 (r333755) @@ -290,6 +290,7 @@ epoch_enter_internal(epoch_t epoch, struct thread *td) INIT_CHECK(epoch); critical_enter(); + td->td_pre_epoch_prio = td->td_priority; eps = epoch->e_pcpu[curcpu]; #ifdef INVARIANTS MPASS(td->td_epochnest < UCHAR_MAX - 2); @@ -326,6 +327,11 @@ epoch_exit_internal(epoch_t epoch, struct thread *td) TAILQ_REMOVE(&eps->eps_record.er_tdlist, td, td_epochq); eps->eps_record.er_gen++; sched_unpin(); + if (__predict_false(td->td_pre_epoch_prio != td->td_priority)) { + thread_lock(td); + sched_prio(td, td->td_pre_epoch_prio); + thread_unlock(td); + } critical_exit(); }