From nobody Fri Oct 09 10:12:46 2026 X-Original-To: dev-commits-src-main@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 4j1N331nqlz6vRQ0 for ; Fri, 09 Oct 2026 10:12:47 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1N330GZDz4Y5V for ; Fri, 09 Oct 2026 10:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791540767; 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=vQSbjvX4/cyHh1P2cJdScYUKBbE/OCDEEq1m8mNOdL8=; b=q9CGDc82EOZMq/4JlRPUDxapQHzx31ztj//BjmwOZEnkFG00CVhnviNeP4sAy5qEx8uAQY Ki2OFDgNL5PpVkpcPa4Tx1zl0BRIbawt/YMACHBxdNOiEwtSfZeqCtLOOg63ChIHClyYtN XBgkR1aOjw2QuugAFVBoYcqjPzBCrqKSrfZaYAHu8hGK3gUy0PFmVAZY3172mUdndBHCSm rWOISXZOm+Ua2hcBz0i9kiDJbY/YB4ODZk5fMUr+okMe4Pg4DPlYwPo/PwwQL3ROGYlCID Weu3ihoBcia5r817kNVr2AQljY3GJs2ujpqmCLgZhxISasOQWZouVPzwjLL9Rg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791540767; b=HUiEVn06ESMc7GbfErXsG/mAiSmuVeGs175lcLPc3QUa6UzaD3ymFoFPStWinPF2hBI+Ra TXWctrKoK+nLnYYK2h+gmPTrwwbV0rnUeTy+U3W12OsK6g5einGZlroA5vbmuab00DCZP4 Dg+VqS+ddsDQSWWaWxBmhXb8pc4DQKJDTg73ggHIJgDBpPaKfKGxZhBE1SHblJtweQYEdd mfg1L520vaG/y9h139J6rBCsBYmuocTDhjknL6289pOJvE/9QjPaogvYZVzCXfV01f8VY2 c5/lI3QI2DpCTZWr6nXJRH+SjWGnfwcZJYutU4u9SZLA4t4eDrrYM/pqXT4cbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791540767; 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=vQSbjvX4/cyHh1P2cJdScYUKBbE/OCDEEq1m8mNOdL8=; b=vX6BIjfDbMgcI8ZmuaFdBKRxMqqe/EHWg4CrrTtqxashHyGPQTYHk2uYfSBTbD3et9xf7y JJbuBl47/D1DhufvQHaXU34R21nlyEmWsw9Jn9wOZVoTf7KpxfxnpG7pqzAjXT7gC6rcOE sbn+xYiQ2FSBvHYKNDHaYtM8S+ig5WNKC+ZpQ/GcX4btgosXqBTf0y5IS6JOECvd7O2b+0 ewfzOT4V57R6cS5YpiSdEyV9owPeK3wfbWAGdP5w3lGaesvFo1sjGxbWsbS1am0zAAx3Wd iAWCJPNmEE6G9AO09t3OhUM0rzrFDaFkfe9vh6RdfsxpAO3AsJ5jG8ZPdv+glA== 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 4j1N326SHrz1LHs for ; Fri, 09 Oct 2026 10:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42a22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 10:12:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sumit Saxena From: Sumit Saxena Subject: git: 0aa3e15900d3 - main - bnxt_re: Fix witness reported calltrace while unloading driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0aa3e15900d31a08680e2307cbc550715d727191 Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 10:12:46 +0000 Message-Id: <6ac8be1e.42a22.3a0f0aed@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa3e15900d31a08680e2307cbc550715d727191 commit 0aa3e15900d31a08680e2307cbc550715d727191 Author: Sumit Saxena AuthorDate: 2026-07-31 15:51:01 +0000 Commit: Sumit Saxena CommitDate: 2026-10-09 08:24:44 +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 MFC after: 2 weeks Sponsored by: Broadcom Inc. Differential Revision: https://reviews.freebsd.org/D58611 --- 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 7f25b50bddf4..cd6df3b17d63 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);