From nobody Sat Jul 05 08:36:42 2025 X-Original-To: dev-commits-src-main@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 4bZ3ky5MbGz61NLq; Sat, 05 Jul 2025 08:36:42 +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 4bZ3ky2rmjz3pfC; Sat, 05 Jul 2025 08:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751704602; 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=fxdafYMt4+EeJ/JDKBbRks3fjZBTzDJiNCQBEjKmpH8=; b=EB1cmxw/IjYCMt2t9TyOBkibQ+1OmgjCBAenW8wGnAop1npBfnKTcWhyFUyqFuQBnu0LCl SADGpsHw5rRx9eyw+x19hewLQ55Mht/unlKDrB+DONLDDeNovZS6a441z+Syw4kveb3t6o 59zyvO4oYWd3u3gNaKKfytkdcnOdWhfAkCpqmVErym8A8oMDO4buvicFuYS26xnyRAcVe7 NB8ycguv39HAYyb1x/HZ717eoEqCBPmKtDLeIZmW+yR3fKdc/S30MaiEcZ4vWPyAbx3HnN g7Xb22bpUEgi6VM6ARkDpzifrgZ+XPPeJfK3AroTOCPMXGZfq+LGs8iOi9F5Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751704602; 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=fxdafYMt4+EeJ/JDKBbRks3fjZBTzDJiNCQBEjKmpH8=; b=U+7S/P6/jRkpB4NP3ny+2DQuTXhTFJ5IcGaNAbX7iLm6elPMF8HFzOlb5B8RpK8plUSJj4 0qaGjXLpCakIdEVIJq4IMRXXDyUFhcJEK0BFpO66ZtIqci8MoYm7QnN8sFYYZHUMt1fALE eKIh7bB6gO+KxoAJcuHOgCXVJ+kT5RNzBvE5V0Fp47xFQkMTQLtdk/IaKxTS/QsZfyCz1n iBLwAw/XkQMNqDQPRRi5AKboMtZ4MPvjUNCyU6szksSsaupgCsrrWyiWGyXLNzCbnx8PbB HtsUUYRaMmBlARFj4JkZYZMuKLCnfajU1wnYH70vPfIYzW9ff5P3vrhNEQ9FeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751704602; a=rsa-sha256; cv=none; b=w4XRk3fpChCloQX/VX6IOh4HC4xduyhUM8N6T0Nma81hMit8d4zdKol/RNlkHkwEm+4JUe fb2no818CNvTv7AvhCh5Zg3DfRQhKIJKCDUskq2bO1H2EdTJkwdPxdXkkwAk9c21Z/3lz7 /WCF39Po3mUsqrZBgt4igBMR0xcISXgr6FA9zqVWhDGLUyPFKqtfF2PjIoQmPx/+U1VGNA wTykE23tRfy03HkLByqAiTpwMpBuN5AN71uAwnB7IsWCE5TWPSBIIQyriWppsfA2HHDvmK /l4qA2MLeO9W0nDLLNVlSnlsWAjmgylZev+I5RQXeUqccLrn+TxrvKqBIwmDdQ== 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 4bZ3ky24WyzCWs; Sat, 05 Jul 2025 08:36:42 +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 5658agrJ067971; Sat, 5 Jul 2025 08:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5658agwx067968; Sat, 5 Jul 2025 08:36:42 GMT (envelope-from git) Date: Sat, 5 Jul 2025 08:36:42 GMT Message-Id: <202507050836.5658agwx067968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ca554a7dea3f - main - dev/mem: use sx instead of rw lock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ca554a7dea3f90f39fc2b7d25813d0be944e12e2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ca554a7dea3f90f39fc2b7d25813d0be944e12e2 commit ca554a7dea3f90f39fc2b7d25813d0be944e12e2 Author: Konstantin Belousov AuthorDate: 2025-06-22 16:35:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-05 08:35:53 +0000 dev/mem: use sx instead of rw lock Some ops require sleepable context to success, like DMAP demotion. Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50970 --- sys/dev/mem/memutil.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c index cf9714d6ec8f..20ce337df0ab 100644 --- a/sys/dev/mem/memutil.c +++ b/sys/dev/mem/memutil.c @@ -26,15 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#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 @@ -46,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); } @@ -56,7 +55,7 @@ mem_range_destroy(void) if (mem_range_softc.mr_op == NULL) return; - rw_destroy(&mr_lock); + sx_destroy(&mr_lock); } int @@ -67,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); } @@ -83,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); }