From nobody Tue Oct 19 21:28:10 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 17FE817EE902; Tue, 19 Oct 2021 21:28:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HYn0X6Tbkz3NmR; Tue, 19 Oct 2021 21:28:12 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id cnXem9nbQczbLcweamsgTT; Tue, 19 Oct 2021 21:28:12 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id cweZm64S4XoZRcweamaRiB; Tue, 19 Oct 2021 21:28:12 +0000 X-Authority-Analysis: v=2.4 cv=R8NgpfdX c=1 sm=1 tr=0 ts=616f386c a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=8gfv0ekSlNoA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=-Yqpzd8UySGSmqUZtDMA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 90C31573; Tue, 19 Oct 2021 14:28:10 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 19JLSAfC019369; Tue, 19 Oct 2021 14:28:10 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202110192128.19JLSAfC019369@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: John Baldwin cc: Cy Schubert , Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 7ae879b14a20 - main - kern_procctl(): convert the function to be table-driven In-reply-to: References: <202110192004.19JK4jN3069844@gitrepo.freebsd.org> <202110192035.19JKZDqM026085@slippy.cwsent.com> <91ebf9d8-5547-8570-18cb-26a58baf89ba@FreeBSD.org> <202110192051.19JKpV66059807@slippy.cwsent.com> Comments: In-reply-to John Baldwin message dated "Tue, 19 Oct 2021 14:04:15 -0700." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 19 Oct 2021 14:28:10 -0700 X-CMAE-Envelope: MS4xfKV1tNt4CAslWBPjlAMVrCsA+vWYTgDX6ezWBHMrYKTbxP8lkaUcLLt+v5r7LTfuBJQh5w9QppS+vmXhOc6mmORrNMVy46xSwr6KJZzflbPrvQU1x+qH GtVGhAVw9/NcsU4qgCWXP1bzWpCZnmhjApeuHOsp6n5hryoDgx9TBoCzjjmOmzI5uQ0DAN0WiCk5rkxlzdwQxAxG1X99NO4WDa0LKSmKfi4cGcu6d80Gv5rB B2d1LeL9reGbOZnNdrh2N/FAtSRwVWj8UyBLja5upa3batEMqK5b6EduifBC6kcBvED6CUxAGzUjQYW/KFlQ+TnEeMxXvTb4B46jXhbgcgUKNRO1rE4xuW6C +8QZKo3w X-Rspamd-Queue-Id: 4HYn0X6Tbkz3NmR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N In message , John Baldwin wri tes: > On 10/19/21 1:51 PM, Cy Schubert wrote: > > In message <91ebf9d8-5547-8570-18cb-26a58baf89ba@FreeBSD.org>, John Baldwin > > wri > > tes: > >> On 10/19/21 1:35 PM, Cy Schubert wrote: > >>> In message <202110192004.19JK4jN3069844@gitrepo.freebsd.org>, Konstantin > >>> Belous > >>> ov writes: > >>>> The branch main has been updated by kib: > >>>> > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=7ae879b14a2086df521c59c4a37 > 9d > >> 3a0 > >>>> 72e08bc6 > >>>> > >>>> commit 7ae879b14a2086df521c59c4a379d3a072e08bc6 > >>>> Author: Konstantin Belousov > >>>> AuthorDate: 2021-10-15 18:57:17 +0000 > >>>> Commit: Konstantin Belousov > >>>> CommitDate: 2021-10-19 20:04:34 +0000 > >>>> > >>>> kern_procctl(): convert the function to be table-driven > >>>> > >>>> Reviewed by: emaste, markj > >>>> Sponsored by: The FreeBSD Foundation > >>>> MFC after: 1 week > >>>> Differential revision: https://reviews.freebsd.org/D32513 > >>>> --- > >>>> sys/kern/kern_procctl.c | 123 +++++++++++++++++++++++++++------------ > --- > >> ---- > >>>> -- > >>>> 1 file changed, 69 insertions(+), 54 deletions(-) > >>>> > >>>> diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c > >>>> index eb36f0822938..90c5e63c7219 100644 > >>>> --- a/sys/kern/kern_procctl.c > >>>> +++ b/sys/kern/kern_procctl.c > >>>> @@ -949,7 +957,14 @@ kern_procctl(struct thread *td, idtype_t idtype, id > _t > >> id > >>>> , int com, void *data) > >>>> error = EINVAL; > >>>> break; > >>>> } > >>>> - if (tree_locked) > >>>> - sx_unlock(&proctree_lock); > >>>> + > >>>> + switch (cmd_info->lock_tree) { > >>>> + case SA_XLOCKED: > >>>> + sx_xunlock(&proctree_lock); > >>>> + break; > >>>> + case SA_SLOCKED: > >>>> + sx_sunlock(&proctree_lock); > >>>> + break; > >>>> + } > >>>> return (error); > >>>> } > >>>> > >>> > >>> Should SA_* in fact be LA_*? SA_* in sys/sx.h assumes INVARIANTS whereas > >>> LA_* in sys/lock.h has no such requirement. > >> > >> Both are for "assertions". The LA_* constants aren't really public but ar > e > >> the values used for witness_assert() that various foo_assert() routines in > >> locking APIs (mtx_assert/sx_assert, etc.) can use. For locking APIs, the > >> type-specific macros are the ones you use, e.g. SA_* with sx_assert(). > >> > >> Given that, SA_* is the closest match here. > > > > We'll need some #ifdefs for non-INVARIANTS built kernels, as it stands > > buildkernel is broken. > > So it is helpeful if your e-mail starts with "the build is broken". :) Sorry about that. Next time I will. > > That said, I think the issue is that SA_* (and LA_*) have to date only been > used for assertions and are thus only relevant when INVARIANTS is defined. > It's probably simplest to just expose SA_* always if that is what is > needed. Thinking the same thing. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.