From nobody Thu Oct 29 23:37:11 2026 X-Original-To: dev-commits-src-branches@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 4jG0y03p2Fz6xr29 for ; Thu, 29 Oct 2026 23:37:12 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jG0xz6Nt1z4snK for ; Thu, 29 Oct 2026 23:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793317031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLAh8mBaSBwF6vVa/5oJtD0eTL2tfqX7PQU8u7qE+jc=; b=RhSNAOJEiKk6SEz0mFzc03Ivg14rzlebdJbbseRIYKvSp0O/ZpH35i1cfmHdD/qn19bB7W 5fTjFVdJY4e7in6Aong2QHqvSieiXS0b99wcE4DC8UWUy3AblUD4RM7ptqo+BAR/0RuQ2U OyOAfpdo4mLHO5WdKS2Tq6HOe5kWVIdy/eSQIBTPs+jzlTgfC/oFkOkNynx1jZc55vx3fe B3NWr7DBOPYGUwz9gO29j20aABJEE1+W5U9MymIyNyApRb2G/SRADGFH1SIX2Aiex7SdIt WuGO4rSzZdU5eQ61BF+tLJhssZdmjGuT+KW1Pn38KJGQhAn8/1BFmLKhmtzBKQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793317031; b=aOmLgHhBU7KZctPLU+oqBlXdJJ4o0145kXngOnBttI6vMcSvwxLjFrKhiWJJRCNhKphQTn zyaftbNUR36v7Jhgin5IRAfCvQ3UAREMclaYUp+VePGbXBYjCXRvdM6kho4RzxqO6aPpsP EgQvP1/GhMWA8+MWKpHPeGZuVVD0swMC+QYXpZMA3aa7y3978xTEs69jcx+SmIIABusrAk iurNaiA7csCjvmnVpwhnVE8PYjWRnCTyTZh5OsoV/u51jfaIsON29ZNZZHwDQrkINrPyPg 3LZ+DpKyOKb3DkZFCUN07acpJROgs+YokbGDPvf8SSIJFIe+235ynX1aCjx0DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793317031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLAh8mBaSBwF6vVa/5oJtD0eTL2tfqX7PQU8u7qE+jc=; b=s2ychovsbNqOjSFyWuwAkQlL3QOArTaEvG0OWJ9iclxfHPVXyF1BU1SA1t8VuK6jLbmsB1 dUDQuupwE45P+a6qx5QG7NeauZ/94GtOjp3Pvdo1spQ3uTEEPlGxBYYwek31Uq7/BI7UoL 7AXRinq5zrmWrV8Ldxa475RnVt0hn3aDum7w/mSieqvDEkScvjK5z6vDbbKrmBb2PFRdVZ ga2SffqNVpCfYGCqvKpXbk0nzg2S2wkgPuByk7iIJtvfzxRoTmkeUwEnVOM4IiqmOYsoMR 6GezKk00IBJewgTwvcg4mLEzPphFwjtQEi67fnjPX6Ww0BBSWqsSJAODh0Q9+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jG0xz5MwJz12HV for ; Thu, 29 Oct 2026 23:37:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3adde by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 23:37:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sumit Saxena From: Kevin Bowling Subject: git: 7e546cdb6305 - stable/15 - bnxt_re: Fix witness reported calltrace while unloading driver List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7e546cdb63053a59ef83bad593aea792a1880846 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 23:37:11 +0000 Message-Id: <6ae3d8a7.3adde.31fa4ae3@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7e546cdb63053a59ef83bad593aea792a1880846 commit 7e546cdb63053a59ef83bad593aea792a1880846 Author: Sumit Saxena AuthorDate: 2026-07-31 15:51:01 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 23:15:19 +0000 bnxt_re: Fix witness reported calltrace while unloading driver bnxt_unregister_dev() called synchronize_rcu() while holding bp->en_ops_lock, which witness flags as a sleeping-while-locked violation on driver unload. Drop the lock around the RCU grace period and reacquire it afterward. Also gate the RoCE extended-stats hex dump in bnxt_qplib_qext_stat() behind bootverbose instead of printing it unconditionally. Reviewed by: gallatin Sponsored by: Broadcom Inc. Differential Revision: https://reviews.freebsd.org/D58611 (cherry picked from commit 0aa3e15900d31a08680e2307cbc550715d727191) --- sys/dev/bnxt/bnxt_en/bnxt_ulp.c | 7 ++++++- sys/dev/bnxt/bnxt_re/qplib_sp.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt_ulp.c b/sys/dev/bnxt/bnxt_en/bnxt_ulp.c index c38521abd17f..e2eb307814fd 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_ulp.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_ulp.c @@ -104,14 +104,19 @@ static int bnxt_unregister_dev(struct bnxt_en_dev *edev, int ulp_id) mtx_lock(&bp->en_ops_lock); RCU_INIT_POINTER(ulp->ulp_ops, NULL); + mtx_unlock(&bp->en_ops_lock); synchronize_rcu(); + mtx_lock(&bp->en_ops_lock); ulp->max_async_event_id = 0; ulp->async_events_bmap = NULL; + mtx_unlock(&bp->en_ops_lock); while (atomic_read(&ulp->ref_count) != 0 && i < 10) { msleep(100); i++; } - mtx_unlock(&bp->en_ops_lock); + /* Tell the caller a ULP consumer may still hold a reference into torn-down state. */ + if (atomic_read(&ulp->ref_count) != 0) + return ETIMEDOUT; return 0; } diff --git a/sys/dev/bnxt/bnxt_re/qplib_sp.c b/sys/dev/bnxt/bnxt_re/qplib_sp.c index f876573ce69f..71780211a2c1 100644 --- a/sys/dev/bnxt/bnxt_re/qplib_sp.c +++ b/sys/dev/bnxt/bnxt_re/qplib_sp.c @@ -1200,7 +1200,9 @@ int bnxt_qplib_qext_stat(struct bnxt_qplib_rcfw *rcfw, u32 fid, goto bail; /* dump when dyndbg is enabled */ - print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, sb, sizeof(*sb)); + if (bootverbose) + print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, sb, sizeof(*sb)); + estat->tx_atomic_req = le64_to_cpu(sb->tx_atomic_req_pkts); estat->tx_read_req = le64_to_cpu(sb->tx_read_req_pkts); estat->tx_read_res = le64_to_cpu(sb->tx_read_res_pkts);