From nobody Mon Nov 06 20:09:27 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 4SPMrR5j0Vz4yxP4; Mon, 6 Nov 2023 20:09:27 +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 4SPMrR4yBNz3NdP; Mon, 6 Nov 2023 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301367; 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=sQbbZio6KgkdIrFQ4nF+9fp5UknRDR7n9ayq8a2GzwU=; b=cq6DYEQOnCeU4U5zkvZ7ztyvBYJoBzUaEeJWHb2Z4xBl23Zh4bGOGhucXvdeLv8IP38soI lBQCEPILn3C4qNIQoLLlBkO6s/i5Uun0UME20bt+TMW8hBn6Rv5cYKlXXldVL7DKXlG8IQ /cuPsIn8l0PnPXCkO7xRGx4x2PopZW+uct85R/FYyc6uWzHmYniyL7m1D4eg/JVQXzKhF2 19k1bSM/FZZwkcE142Xqttn/pOE7WgD3k0mwb4CkIlk4kJ+WMeMTTouF+roMn34xXhXz43 4FgeHHJQO2bgjK9ytRckp+KwUd+K0It6ng74ujXjrqW0IiGw1F8y0ktbERJFrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699301367; 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=sQbbZio6KgkdIrFQ4nF+9fp5UknRDR7n9ayq8a2GzwU=; b=iVxW1+IpdldNtr/Bw/MnvH/DJm1CiAmTm3Z7RhLBcW+acSLFCSyzrcl/9s7MSY1G4Cm66Q QwxWNTAx7xk3Kbll++4wgkK82UYnd/MVO5Kr+xYJU5r84bJ2nYUHPgaM+c6WiaVF5iwfsk vWC2KkxOyL8WVUwTARgBOyjtl36Bdx539gAxhNXcMi0dZ8PHg+foED/jz8O9UmjwaVT3Yj tFkw/RoJR4D2kgNNG11Wnm+rNkR4XfEyetjEi2gRrRAfb4+FOqR7NxJI3DOeve//zX/kpm Tq/XIuNPsBnbtBfqktJasvVRQyfDAr5OLk9kJE5xHMJOpwfryvWMWtU+Bn6D7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699301367; a=rsa-sha256; cv=none; b=ilHVyIkRkVVYsa2PaO2FR4II2qbqssK8wFvK92mGqT4YKAu3la2GWACSNxRXCCNUI+RX02 PI43PbmvAs2CDahBZ44lBiylwtNCi/nsPZBAksCxmJzK9q/DZY4EMu2iCL30xGgAmSoVOQ oBqkxJ2yju+m9y52QLKLFrPKeTJH+IrfjGoQta/kajveTmy5fPafV3dPKIDWx5l8fm0cyu gS3ViSd4mjyoVNfSDCHDdRkvYWBuuJ6dcC+H0l+KS1N0Aie+hObuhbTCFjYvCIOgoKSaUm Ob5EYotiNLf4dNkcBeFVrLDzpxBQ4L88AxCj7YjymxrcUrJVykCibl45tIVaBA== 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 4SPMrR3rbsz6HW; Mon, 6 Nov 2023 20:09:27 +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 3A6K9R7m094662; Mon, 6 Nov 2023 20:09:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6K9Rq4094659; Mon, 6 Nov 2023 20:09:27 GMT (envelope-from git) Date: Mon, 6 Nov 2023 20:09:27 GMT Message-Id: <202311062009.3A6K9Rq4094659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 725962a9f4c0 - main - e6000sw: Fix locking in miibus_{read,write}reg implementations 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 725962a9f4c050b21488edd58d317e87c76d6f66 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=725962a9f4c050b21488edd58d317e87c76d6f66 commit 725962a9f4c050b21488edd58d317e87c76d6f66 Author: Mark Johnston AuthorDate: 2023-11-06 19:57:56 +0000 Commit: Mark Johnston CommitDate: 2023-11-06 19:57:56 +0000 e6000sw: Fix locking in miibus_{read,write}reg implementations Commit 469290648005e13b819a19353032ca53dda4378f made e6000sw's implementation of miibus_(read|write)reg assume that the softc lock is held. I presume that is to avoid lock recursion in e6000sw_attach() -> e6000sw_attach_miibus() -> mii_attach() -> MIIBUS_READREG(). However, the lock assertion in e6000sw_readphy_locked() can fail if a different driver uses the interface to probe registers. Work around the problem by providing implementations which lock the softc if it is not already locked. PR: 274795 Fixes: 469290648005 ("e6000sw: add readphy and writephy wrappers") Reviewed by: kp, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42466 --- sys/dev/etherswitch/e6000sw/e6000sw.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c index 768d1b927e3e..95f1a2e96db6 100644 --- a/sys/dev/etherswitch/e6000sw/e6000sw.c +++ b/sys/dev/etherswitch/e6000sw/e6000sw.c @@ -66,6 +66,7 @@ MALLOC_DEFINE(M_E6000SW, "e6000sw", "e6000sw switch"); #define E6000SW_UNLOCK(_sc) sx_unlock(&(_sc)->sx) #define E6000SW_LOCK_ASSERT(_sc, _what) sx_assert(&(_sc)->sx, (_what)) #define E6000SW_TRYLOCK(_sc) sx_tryxlock(&(_sc)->sx) +#define E6000SW_LOCKED(_sc) sx_xlocked(&(_sc)->sx) #define E6000SW_WAITREADY(_sc, _reg, _bit) \ e6000sw_waitready((_sc), REG_GLOBAL, (_reg), (_bit)) #define E6000SW_WAITREADY2(_sc, _reg, _bit) \ @@ -169,8 +170,8 @@ static device_method_t e6000sw_methods[] = { DEVMETHOD(bus_add_child, device_add_child_ordered), /* mii interface */ - DEVMETHOD(miibus_readreg, e6000sw_readphy_locked), - DEVMETHOD(miibus_writereg, e6000sw_writephy_locked), + DEVMETHOD(miibus_readreg, e6000sw_readphy), + DEVMETHOD(miibus_writereg, e6000sw_writephy), /* etherswitch interface */ DEVMETHOD(etherswitch_getinfo, e6000sw_getinfo), @@ -744,17 +745,20 @@ e6000sw_write_xmdio(device_t dev, int phy, int devaddr, int devreg, int val) return (0); } -static int e6000sw_readphy(device_t dev, int phy, int reg) +static int +e6000sw_readphy(device_t dev, int phy, int reg) { e6000sw_softc_t *sc; - int ret; + int locked, ret; sc = device_get_softc(dev); - E6000SW_LOCK_ASSERT(sc, SA_UNLOCKED); - E6000SW_LOCK(sc); + locked = E6000SW_LOCKED(sc); + if (!locked) + E6000SW_LOCK(sc); ret = e6000sw_readphy_locked(dev, phy, reg); - E6000SW_UNLOCK(sc); + if (!locked) + E6000SW_UNLOCK(sc); return (ret); } @@ -795,17 +799,20 @@ e6000sw_readphy_locked(device_t dev, int phy, int reg) return (val & PHY_DATA_MASK); } -static int e6000sw_writephy(device_t dev, int phy, int reg, int data) +static int +e6000sw_writephy(device_t dev, int phy, int reg, int data) { e6000sw_softc_t *sc; - int ret; + int locked, ret; sc = device_get_softc(dev); - E6000SW_LOCK_ASSERT(sc, SA_UNLOCKED); - E6000SW_LOCK(sc); + locked = E6000SW_LOCKED(sc); + if (!locked) + E6000SW_LOCK(sc); ret = e6000sw_writephy_locked(dev, phy, reg, data); - E6000SW_UNLOCK(sc); + if (!locked) + E6000SW_UNLOCK(sc); return (ret); }