From owner-svn-src-head@freebsd.org Thu May 17 19:40:20 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 9CEBAEDE839 for ; Thu, 17 May 2018 19:40:20 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E7CB73147 for ; Thu, 17 May 2018 19:40:20 +0000 (UTC) (envelope-from mpp302@gmail.com) Received: by mail-lf0-f54.google.com with SMTP id y72-v6so10498861lfd.2 for ; Thu, 17 May 2018 12:40:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QIGIAXh8T/Th3iuWEH+k9JiIBgNVzSN8yrESCPvA4ak=; b=o9MmESqCJmJgInjoYEB+OPBKN49J6M64aIKOcbR75nb7G+hcMxoFPyP9WwjdxN9bNz vzzZMeOPllHyJKeTwNvxwYnD/yE7pftoqoHcNrVRptqozm19WT6HT8CzWRxL5mhzXnU8 /hObOwKWoQG6z8lY4mO6T41f1btUHdjScq1LyoJXaRI0RHdNSBQeVbdpg+IHPJPxF1Db 4qRT4cRtvpW+uLqyidkfA9dHDe0JGkwYD4qvDckGXem3dlefGfoIQMRJuqC8FE1PnvDU Uvj/UzP7BSMsYsO2QUStjGQa4sqq4qDi2wcMF32p8eVzXhNZdlygkhKTdKkdSEoUL5hd UEYg== X-Gm-Message-State: ALKqPwd3oD+cLPO8e6SfQRjUGzkYxtrjfHJe0ZoGdF5UlqCCpgXQIzWF AVsjsdUXh+VJvYxr+wgNI+2tizCh/OY= X-Google-Smtp-Source: AB8JxZqLukid19RAdZ7TktCq9R+1Vj6zNO9m4X8f2ck9NO0oPGgzdo7eQiZ+44SJlG6aSZnOZwIw/g== X-Received: by 2002:a2e:944d:: with SMTP id o13-v6mr4039303ljh.65.1526586018119; Thu, 17 May 2018 12:40:18 -0700 (PDT) Received: from oxy (customs.hackerspace.pl. [185.236.240.5]) by smtp.gmail.com with ESMTPSA id h23-v6sm1382524lfj.94.2018.05.17.12.40.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 12:40:17 -0700 (PDT) Date: Thu, 17 May 2018 21:41:20 +0200 From: Mateusz Piotrowski <0mp@FreeBSD.org> To: svn-src-head@freebsd.org Subject: Re: svn commit: r333755 - head/sys/kern Message-ID: <20180517214120.3c054527@oxy> In-Reply-To: <20180517212628.0ae99535@thor.intern.walstatt.dynvpn.de> References: <201805171908.w4HJ8SHO007826@repo.freebsd.org> <20180517212628.0ae99535@thor.intern.walstatt.dynvpn.de> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; amd64-portbld-freebsd12.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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:40:20 -0000 On Thu, 17 May 2018 21:26:01 +0200 "O. Hartmann" wrote: >-----BEGIN PGP SIGNED MESSAGE----- >Hash: SHA512 > >Am Thu, 17 May 2018 19:08:28 +0000 (UTC) >Matt Macy schrieb: > >> 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(); >> } > > >Failure in recent kernel build due to: > >[...] >===> acpi/aibs (all) >- --- subr_epoch.o --- >/usr/src/sys/kern/subr_epoch.c:293:6: error: no member named 'td_pre_epoch_prio' in >'struct thread' td->td_pre_epoch_prio = td->td_priority; > ~~ ^ >/usr/src/sys/kern/subr_epoch.c:330:26: error: no member named 'td_pre_epoch_prio' in >'struct thread' if (__predict_false(td->td_pre_epoch_prio != td->td_priority)) { > ~~ ^ >/usr/src/sys/sys/cdefs.h:455:51: note: expanded from macro '__predict_false' >#define __predict_false(exp) __builtin_expect((exp), 0) > ^~~ >/usr/src/sys/kern/subr_epoch.c:332:22: error: no member named 'td_pre_epoch_prio' in >'struct thread' sched_prio(td, td->td_pre_epoch_prio); > ~~ ^ >3 errors generated. >*** [subr_epoch.o] Error code 1 I've encountered the same issue.