From owner-svn-src-head@freebsd.org Sat Dec 19 11:00:11 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 912CB4C39A0; Sat, 19 Dec 2020 11:00:11 +0000 (UTC) (envelope-from hselasky@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CyjSC3m5qz3JHy; Sat, 19 Dec 2020 11:00:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73D271C234; Sat, 19 Dec 2020 11:00:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJB0B1f051961; Sat, 19 Dec 2020 11:00:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJB0BIa051960; Sat, 19 Dec 2020 11:00:11 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202012191100.0BJB0BIa051960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 19 Dec 2020 11:00:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368799 - head/sys/dev/usb/net X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/dev/usb/net X-SVN-Commit-Revision: 368799 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2020 11:00:11 -0000 Author: hselasky Date: Sat Dec 19 11:00:11 2020 New Revision: 368799 URL: https://svnweb.freebsd.org/changeset/base/368799 Log: Move SYSCTL_ADD_PROC() to unlocked context in if_ure to avoid lock order reversal. MFC after: 1 week Reported by: Mark Millard Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/sys/dev/usb/net/if_ure.c Modified: head/sys/dev/usb/net/if_ure.c ============================================================================== --- head/sys/dev/usb/net/if_ure.c Sat Dec 19 10:31:25 2020 (r368798) +++ head/sys/dev/usb/net/if_ure.c Sat Dec 19 11:00:11 2020 (r368799) @@ -959,8 +959,6 @@ static void ure_attach_post(struct usb_ether *ue) { struct ure_softc *sc = uether_getsc(ue); - struct sysctl_ctx_list *sctx; - struct sysctl_oid *soid; sc->sc_rxstarted = 0; sc->sc_phyno = 0; @@ -988,18 +986,13 @@ ure_attach_post(struct usb_ether *ue) sc->sc_ue.ue_eaddr[0] &= ~0x01; /* unicast */ sc->sc_ue.ue_eaddr[0] |= 0x02; /* locally administered */ } - - sctx = device_get_sysctl_ctx(sc->sc_ue.ue_dev); - soid = device_get_sysctl_tree(sc->sc_ue.ue_dev); - SYSCTL_ADD_PROC(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "chipver", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, - ure_sysctl_chipver, "A", - "Return string with chip version."); } static int ure_attach_post_sub(struct usb_ether *ue) { + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; struct ure_softc *sc; struct ifnet *ifp; int error; @@ -1032,6 +1025,13 @@ ure_attach_post_sub(struct usb_ether *ue) uether_ifmedia_upd, ue->ue_methods->ue_mii_sts, BMSR_DEFCAPMASK, sc->sc_phyno, MII_OFFSET_ANY, 0); mtx_unlock(&Giant); + + sctx = device_get_sysctl_ctx(sc->sc_ue.ue_dev); + soid = device_get_sysctl_tree(sc->sc_ue.ue_dev); + SYSCTL_ADD_PROC(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "chipver", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + ure_sysctl_chipver, "A", + "Return string with chip version."); return (error); }