From nobody Sun Sep 17 15:04:16 2023 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 4RpWRN3zd3z4t1Lx; Sun, 17 Sep 2023 15:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RpWRN2lzqz4F5g; Sun, 17 Sep 2023 15:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hnmd6kUEYPx0ckyE1CvqNwYlFS2l2qcFqKwttoZ0nZs=; b=FUIQRmBmDyrtKnXUZSKEYPkmz247ULCvr0DGaahyx/DNr5dQ23kcq7TNLjw++nU0paH/+O Nb06IFAwf4PNyzZj8OyxVfMCd8/8K+rTqz5/Q0DANDYlTDm+UDSjs4fMwBhYQXQxeO6wKn 4iyb8VbxlgNQKH6a+b0nMKkVHGneMRAUPQx1hlNSoMihfhYR23gb8n0do+MXs3t8zh/jro 8JigC7zNW8G9RAVPxCCOSFjqoSmada5pKqk4pdATaeOs5TaAAWJlFFS9uQO7S+3Kurm9ci n66akoeFtN4cfxL2i2LrbQ2CYzdpwe6RMYoPgMnO8VDyKArUZRoq/F2fAvAEhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694963056; a=rsa-sha256; cv=none; b=tHhc+bcMBpOuCSjoZI6J5+HWUplJEI4dXdhDpSZ8FGSYZ6IDuRjtMvXLyT5KrcGhJD6LqX +GYF5esT+UFkSuVUCipt6tJRMaq4Lfjasw/S7zZJxQos23LrzMcjk6z1jBo25ynavyk4Z8 eVuoZopvqNzsnObNeIJ7jkx49r9Vf81k9Foo0y84Dd79qsSZsCF8V0lDpufAplNf0sr2Zs FY/wBMdoqwG70RceliEiUdIH9v6cibk5ivxaBerS2Xe2KOJAFfHuSpfDRB4VsNlj60CTZ3 C9PNx0TZrBdd1vrzHcxlYcnaakonFJcQhYl0GpSZN4+Y06hD8jRx24vZMRHodw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694963056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hnmd6kUEYPx0ckyE1CvqNwYlFS2l2qcFqKwttoZ0nZs=; b=kRWi5tJ8M/PdKcip2TEaNot34xBJRdwlCbJXm+YUMwl4xZpkhVSs/wnUNOMGGIK2Bi8/Sr N43dInwRuqAcDK+1uQnhKzN45T5cHoocS8/EW7ZFON0WKfNU+63E3sgsNr6wqKGFgWhagV 0IynsS8fFzEZwhb94FpWzy8ZLE42TSI4PyqzdwgmXFauFn/afcU318QqhxcnvG/C+J+B9E /yF8ObOx40cqSPU0CFlMl8vmwNUiQxy0JTsAFH/dM/unF9yAzLVMFzo/V6Z1u8E8WdLNLK +jsIHzIldbc6PkGMKzWk3Z/PWR39NKwjlizLnSgiwvySEFY3XR5OSQyqHH41/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RpWRN1kQMzt5C; Sun, 17 Sep 2023 15:04:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HF4GEP072202; Sun, 17 Sep 2023 15:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HF4G6T072197; Sun, 17 Sep 2023 15:04:16 GMT (envelope-from git) Date: Sun, 17 Sep 2023 15:04:16 GMT Message-Id: <202309171504.38HF4G6T072197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a87dddf39e86 - stable/14 - timerfd: convert timerfd_list_lock from sx to mtx 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a87dddf39e866015341003eeac76d736d993514a Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a87dddf39e866015341003eeac76d736d993514a commit a87dddf39e866015341003eeac76d736d993514a Author: Mateusz Guzik AuthorDate: 2023-09-17 15:01:33 +0000 Commit: Warner Losh CommitDate: 2023-09-17 15:01:33 +0000 timerfd: convert timerfd_list_lock from sx to mtx There was no good reason to use the former. This should prevent some head-scratching by an interested and qualified reader. (cherry picked from commit f4296cfb409a48de00bfa60e76f686c2b031876f) --- sys/kern/sys_timerfd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index c8b45a926b02..e4d2f10f28ef 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -61,9 +61,9 @@ static MALLOC_DEFINE(M_TIMERFD, "timerfd", "timerfd structures"); -static struct sx timerfd_list_lock; +static struct mtx timerfd_list_lock; static LIST_HEAD(, timerfd) timerfd_list; -SX_SYSINIT(timerfd, &timerfd_list_lock, "timerfd_list_lock"); +MTX_SYSINIT(timerfd, &timerfd_list_lock, "timerfd_list_lock", MTX_DEF); static struct unrhdr64 tfdino_unr; @@ -133,7 +133,7 @@ timerfd_jumped(void) return; timerfd_getboottime(&boottime); - sx_xlock(&timerfd_list_lock); + mtx_lock(&timerfd_list_lock); LIST_FOREACH(tfd, &timerfd_list, entry) { mtx_lock(&tfd->tfd_lock); if (tfd->tfd_clockid != CLOCK_REALTIME || @@ -169,7 +169,7 @@ timerfd_jumped(void) tfd->tfd_boottim = boottime; mtx_unlock(&tfd->tfd_lock); } - sx_xunlock(&timerfd_list_lock); + mtx_unlock(&timerfd_list_lock); } static int @@ -324,9 +324,9 @@ timerfd_close(struct file *fp, struct thread *td) { struct timerfd *tfd = fp->f_data; - sx_xlock(&timerfd_list_lock); + mtx_lock(&timerfd_list_lock); LIST_REMOVE(tfd, entry); - sx_xunlock(&timerfd_list_lock); + mtx_unlock(&timerfd_list_lock); callout_drain(&tfd->tfd_callout); seldrain(&tfd->tfd_sel); @@ -450,9 +450,9 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) knlist_init_mtx(&tfd->tfd_sel.si_note, &tfd->tfd_lock); timerfd_getboottime(&tfd->tfd_boottim); getnanotime(&tfd->tfd_birthtim); - sx_xlock(&timerfd_list_lock); + mtx_lock(&timerfd_list_lock); LIST_INSERT_HEAD(&timerfd_list, tfd, entry); - sx_xunlock(&timerfd_list_lock); + mtx_unlock(&timerfd_list_lock); finit(fp, fflags, DTYPE_TIMERFD, tfd, &timerfdops);