From nobody Thu Jul 20 22:48:16 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 4R6SX05Ks6z4nMCy; Thu, 20 Jul 2023 22:48:16 +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 4R6SX04RFkz4JRF; Thu, 20 Jul 2023 22:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689893296; 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=hS8tBplio4u4/blk02KWGHgVtjPTeIURkTcPkiMHtew=; b=aeXcjPsW9CqPLHcPVkL9d1YtDmb6UwZ4JZtJrXPa2XjQjUV2o4dU9jnWeM/hOzY4fihd9G xmwpXB2hSHbY/40aIHDZ/JoJ79CAYfsuFoHmBLW/gBZ1mbHW/HYz5x3OTX9LycE4wZBy7n J/W7k6jFU1TDj96nagc+mYq1vueNE7MWr/ypRNxHQgTdAQxQ1PWr3rPJMO+dtu2JBTLO2p WhIWwpgKB/ujKsvC7v+QmPooKFC98wvaUUJkprx6e1Z6oqcqfV+gOZmOatclSJlVFdcbTb YfLprs6s+1dlOHFRPFGhEfHbGpoTspXTzsPrIJiRXSmOY/n7qk20gfrW6ZYVTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689893296; 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=hS8tBplio4u4/blk02KWGHgVtjPTeIURkTcPkiMHtew=; b=Uke/J0KNHGluN/KAygTjZ8t//SJmZNJNLkBgY9ijGHQxAM5IITJwiPaTvsJC76lHSYerVy ShS2nQF29Hcgu0W/3/qRKOL/V21j0i8rwsD905hUe183HpzQJgHZLyYMOdZtu0076EluQp qm1zeeaSlIbrdrGLTMfR9tFGMcB4BZUuxiHIRpKU/h52AJvyWEW/ysF49ni0VdBWr+ZLsw PpBqYTK2UAhSnGkAOMfoL/ZGd5332aDomCrOJfwm9gPBNR6tmeBz1IQM9/NiqI4sg+LFkV e5fO/G0lGVCfrKrgUl3LMepXp+L92Zgmh+zvj4cPtJOq7XroyyMTvSWCFjSs/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689893296; a=rsa-sha256; cv=none; b=OWsO4j37ygs7/WqlzQC1DouUFbn5NFD1oKp9iwDhWvdvku7BQvIRodLsGjNyc3HZHV3nLg nwNSW3mXf/j7Aknw3o3F1czU/TokNnEejW/5sTBESlYYHGNPMEXzmdlqAg958zM7kNCGb1 ndZTFvlxNMRA4H/22kOjWFD5Zwwzkgcx8Q1cTsDDbV82R7bvOYarMrAfPGjH3+cfexS/EB p1LEwRSWu7KHU9W1HCzcnrw2kdY80dpOArE0M7RAIziDyuDYK4FQIj4W2xF55DDSdFNpTs pbbOO7Gir/PS9iowny/S/14Q0ZLCL1jbQuVKi1CqTATU7ICStqraI8A9OW0QTA== 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 4R6SX03Pg7zpQ7; Thu, 20 Jul 2023 22:48:16 +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 36KMmGcZ035257; Thu, 20 Jul 2023 22:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KMmGEW035256; Thu, 20 Jul 2023 22:48:16 GMT (envelope-from git) Date: Thu, 20 Jul 2023 22:48:16 GMT Message-Id: <202307202248.36KMmGEW035256@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: 93f39b467586 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 93f39b4675865094b298e1fca5bcfa788348dd36 Auto-Submitted: auto-generated The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=93f39b4675865094b298e1fca5bcfa788348dd36 commit 93f39b4675865094b298e1fca5bcfa788348dd36 Author: Przemyslaw Lewandowski AuthorDate: 2023-07-19 22:40:46 +0000 Commit: Eric Joyner CommitDate: 2023-07-20 22:42:22 +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 748970a58f3f..cba931f1b2a7 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5349,7 +5349,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.octet); + CTX_LOCK(ctx); if ((err = IFDI_ATTACH_POST(ctx)) != 0) { device_printf(dev, "IFDI_ATTACH_POST failed %d\n", err);