From nobody Sat Jul 12 01:44:18 2025 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 4bfBFv1TLvz617qh; Sat, 12 Jul 2025 01:44:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBFt5kxlz3Fwv; Sat, 12 Jul 2025 01:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284658; 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=BE7K0fXIJZo2dxhER4D2QLrxVjP+Hqud/eOduSda3rg=; b=cuf1XsurA9VNRRs3Wn/+T8LTiur4bQy4UfQZANoRyoQYdzrjgK/XUDL22BtX9JyUjm/+Gs WzK2f/mDB/HJlpxv/IIr2Qg7aPytSz6LSmCWlkFafFCH/WhtGAEawniUt+cDlEr8yHqUFM 7rDU3EP8aI0ckKTdB5G5PpsX7Xw9Adh6UZJ3F4GAGf10Ft6WYoH5OE6YZpLUpAlZcwZpbM FRIMdaSdQgf/ZkMBgJEBZGnBThwzNsPYY14oc5qh1psztOrCli+OA2MB5Ml/YyZgFzePYc AjYzx6bClutjxO7+IDFuNKV7wHrfXVF4HAhSOC4UcH2CpflXtOjwN3+yJBY8aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284658; 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=BE7K0fXIJZo2dxhER4D2QLrxVjP+Hqud/eOduSda3rg=; b=cGf3T+Gg2+FU36fBoLjtnui0EX83aBzXYcCbjgWNPKKk5dhSRbvBku+r154W9ppcsfCraC Xcw03oDwfDCiDijaz26Na44askQNpQwdmW5d0eKUiVoJiugJ3yenm5xT+VLyWLmukrGqIk lW1gA4hyW5bP+kAc2JXnyMO1aDY3OrAcstM0zBXH5s7DvfKswQeV3L6SoYhURh3pVzOtzy SutTiIkloMBdpeBvMo+5x3crqSUkOtj35WeZZvzWeL0GCI2ng8e+jGUKAepTA3rw1dQ6Te TTH2EAx1qV0Xj/4liLqSVyH0rTmBQtr9Yn+2Y1FDksZIiK7NlNXEDw8G8LUvow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284658; a=rsa-sha256; cv=none; b=DS231XEhxRhiPuaPmvSoBx6i3NhWhMaT0H6r0iBL5w3giAIyFaANZggW40djDFSspi7M2I IczlDZwiXM8RM91UnA4VQvJg5Nrl/1NMfIuF+mSflfFBKlusy+aa7kuCJXia0kJegN64wK 5tWkdgxlle5I7Ghk+HSCeplvZOLwfg7GvEpEDwUYQ2CFDYaAtdYKrQa6Vyytal2KoxpD/q cJzDVEyk77lsPNZT2Kj2s5ypvZs6fpbMRvsipyDDZ8woY067ovK0dd9B3UjJ7/r+2X3E3F NZ/LQmlPRLPl05wbbSY47SOe8FOC3AS/10jNgq0SII52GZaySMP3CAkj8XNK0g== 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 4bfBFt4xzvz127C; Sat, 12 Jul 2025 01:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56C1iIjR050465; Sat, 12 Jul 2025 01:44:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iIEf050462; Sat, 12 Jul 2025 01:44:18 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:18 GMT Message-Id: <202507120144.56C1iIEf050462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4c82dff1082b - stable/14 - dev/mem: use sx instead of rw lock 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c82dff1082bc1f8e7d6ae69a3ecd2cc97c2e758 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c82dff1082bc1f8e7d6ae69a3ecd2cc97c2e758 commit 4c82dff1082bc1f8e7d6ae69a3ecd2cc97c2e758 Author: Konstantin Belousov AuthorDate: 2025-06-22 16:35:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:32 +0000 dev/mem: use sx instead of rw lock (cherry picked from commit ca554a7dea3f90f39fc2b7d25813d0be944e12e2) --- sys/dev/mem/memutil.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c index 8f296520c348..20ce337df0ab 100644 --- a/sys/dev/mem/memutil.c +++ b/sys/dev/mem/memutil.c @@ -26,16 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include #include #include #include #include -#include -#include +#include -static struct rwlock mr_lock; +static struct sx mr_lock; /* * Implementation-neutral, kernel-callable functions for manipulating @@ -47,7 +45,7 @@ mem_range_init(void) if (mem_range_softc.mr_op == NULL) return; - rw_init(&mr_lock, "memrange"); + sx_init(&mr_lock, "memrange"); mem_range_softc.mr_op->init(&mem_range_softc); } @@ -57,7 +55,7 @@ mem_range_destroy(void) if (mem_range_softc.mr_op == NULL) return; - rw_destroy(&mr_lock); + sx_destroy(&mr_lock); } int @@ -68,12 +66,12 @@ mem_range_attr_get(struct mem_range_desc *mrd, int *arg) if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); nd = *arg; - rw_rlock(&mr_lock); + sx_slock(&mr_lock); if (nd == 0) *arg = mem_range_softc.mr_ndesc; else bcopy(mem_range_softc.mr_desc, mrd, nd * sizeof(*mrd)); - rw_runlock(&mr_lock); + sx_sunlock(&mr_lock); return (0); } @@ -84,8 +82,8 @@ mem_range_attr_set(struct mem_range_desc *mrd, int *arg) if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); - rw_wlock(&mr_lock); + sx_xlock(&mr_lock); ret = mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg); - rw_wunlock(&mr_lock); + sx_xunlock(&mr_lock); return (ret); }