From nobody Thu Jul 20 22:57:04 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 4R6Sk870KYz4nSMn; Thu, 20 Jul 2023 22:57:04 +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 4R6Sk85QVZz4MVZ; Thu, 20 Jul 2023 22:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689893824; 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=OSsIJ/Oxp3ejbjueSTSEByzC6kR5zpgkh0CD6dbFT0w=; b=AnrjmpAZ6NOk7HFfwWB9hvgK4r6J1fobSWYnRBUypr799QMZXFwma/iKNya2FYoSKf2VUs cOFHbSUEIIFX+GMLL5SDtRSvB1G1YV83DcO+Jo5D32f4VgLeC177/ym7ydvQkql83LvlA4 SZd1C9pLK1mxu6DeTm1QlFbx3lBERcewEcdzYvKU6u2H8n6dezFctv013x120QApQat85z N2/5Tnm9BRKgmk8TpyHka3kDR893VtLanWYVkFp6ouwxbEz2rCxWssRFyxNmBfcFoje0xG h5VXLLFp0x0WqpkyE1hxpJ/wtdscXlOTZU3kIvVeDZprOh5yoV4WNOVbcfyDmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689893824; 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=OSsIJ/Oxp3ejbjueSTSEByzC6kR5zpgkh0CD6dbFT0w=; b=JschjQPjlpVELdZFx+omD17avXmbZkMuW0Ykke/h/1F+HeO48qGbPvHlId8o7LlkHsiysO eXgVpWksfh+gfwoZOhqYUa15ibeRx7DyCf1MhRrsmssNvc7QKYyAn40eYqKQsZ4/kRtrls 5TF7yBLvU6zqtvU8R8GQ9Torusa9LPVK+lzet5ZkYbC4hZvORFTIu/ssDJTIOl1WNY6Uek WTBGrJ1oO6jGYgiuMjgauxIK4+Ib5v8343isuF4++5jE95yuDHuKJJXnbUcJUfjXDk/GY0 hd4TpXOJB7kDsBdzucYdRDp+DiEYGhQKH8IeMORrzQgKFSERFmr3ABDbtmSz0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689893824; a=rsa-sha256; cv=none; b=Ruf5wOpNMHpYOpmL93Dqo/HWZBNSylWG1/uhj89d0Ua5lpLP/QX9vtPd3ygOlkpjzQWNYM Y9fPsGcG3WfJUKJWuO5lmjCILwFNpq9Iu1B5eu7rx5VZTMo6BoUz+RfQrwiftmpTcqxaOh 2ivF82PsHYeiJyJCkJCwYh+rto9mxTkrOD7FZtbK3rkvJnO2et88POvb9e+tMP9CyXW8rr vT3+3nHUz+AqOm4MWvvUUv3x4wAtkdXhxHzqPnSSEnJuj+buAs6cUMCY2Lc2STKnpzbWZ5 UqDA+UK1U7r1ZOU5f+bDV/oU+90usUHJkBDBnfSv6KzyGnmxBPbh4wWKGArQ3w== 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 4R6Sk84VGDzpR6; Thu, 20 Jul 2023 22:57:04 +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 36KMv4Mw051042; Thu, 20 Jul 2023 22:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KMv4Aq051041; Thu, 20 Jul 2023 22:57:04 GMT (envelope-from git) Date: Thu, 20 Jul 2023 22:57:04 GMT Message-Id: <202307202257.36KMv4Aq051041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 2617bca5a8c9 - stable/12 - iflib: Unlock ctx lock around call to ether_ifattach() 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2617bca5a8c98e9e84fba3f2ebd9302e8e893b8f Auto-Submitted: auto-generated The branch stable/12 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=2617bca5a8c98e9e84fba3f2ebd9302e8e893b8f commit 2617bca5a8c98e9e84fba3f2ebd9302e8e893b8f Author: Przemyslaw Lewandowski AuthorDate: 2023-07-19 22:40:46 +0000 Commit: Eric Joyner CommitDate: 2023-07-20 22:56:41 +0000 iflib: Unlock ctx lock around call to ether_ifattach() Panic occurs during loading driver using kldload. It exists since netlink is enabled. There is problem with double locking ctx. This fix allows to call ether_ifattach() without locked ctx. Signed-off-by: Eric Joyner PR: 271768 Reviewed by: erj@, jhb@ Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D40557 (cherry picked from commit a52f23f4c49e4766fb9eb0bf460cc83c5f63f17d) --- sys/net/iflib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 3690be2b2a77..da4cc9addbe9 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5196,7 +5196,13 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct goto fail_queues; } + /* + * It prevents a double-locking panic with iflib_media_status when + * the driver loads. + */ + CTX_UNLOCK(ctx); ether_ifattach(ctx->ifc_ifp, ctx->ifc_mac); + CTX_LOCK(ctx); if ((err = IFDI_ATTACH_POST(ctx)) != 0) { device_printf(dev, "IFDI_ATTACH_POST failed %d\n", err);