From owner-dev-commits-src-main@freebsd.org  Tue Aug 10 20:37:28 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@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 579E366E448;
 Tue, 10 Aug 2021 20:37:28 +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 4GklBJ1CXFz535N;
 Tue, 10 Aug 2021 20:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 12B662213F;
 Tue, 10 Aug 2021 20:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
 by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17AKbRM7052195;
 Tue, 10 Aug 2021 20:37:27 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17AKbRbH052194;
 Tue, 10 Aug 2021 20:37:27 GMT (envelope-from git)
Date: Tue, 10 Aug 2021 20:37:27 GMT
Message-Id: <202108102037.17AKbRbH052194@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
 dev-commits-src-main@FreeBSD.org
From: Alexander Motin <mav@FreeBSD.org>
Subject: git: c6902e7796bc - main - ntb_transport(4): Mark callouts MP-safe.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mav
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: c6902e7796bc78df011131a2b8b024faed884b8f
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
 <dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>, 
 <mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>, 
 <mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Aug 2021 20:37:28 -0000

The branch main has been updated by mav:

URL: https://cgit.FreeBSD.org/src/commit/?id=c6902e7796bc78df011131a2b8b024faed884b8f

commit c6902e7796bc78df011131a2b8b024faed884b8f
Author:     Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-08-10 20:30:12 +0000
Commit:     Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-08-10 20:37:21 +0000

    ntb_transport(4): Mark callouts MP-safe.
    
    The only thing around NTB using Giant lock is NewBus, and these callouts
    have nothing to do with it.
    
    MFC after:      2 weeks
---
 sys/dev/ntb/ntb_transport.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/ntb/ntb_transport.c b/sys/dev/ntb/ntb_transport.c
index 90420db0b9aa..276fe604086e 100644
--- a/sys/dev/ntb/ntb_transport.c
+++ b/sys/dev/ntb/ntb_transport.c
@@ -493,8 +493,8 @@ ntb_transport_attach(device_t dev)
 	for (i = 0; i < nt->qp_count; i++)
 		ntb_transport_init_queue(nt, i);
 
-	callout_init(&nt->link_work, 0);
-	callout_init(&nt->link_watchdog, 0);
+	callout_init(&nt->link_work, 1);
+	callout_init(&nt->link_watchdog, 1);
 	TASK_INIT(&nt->link_cleanup, 0, ntb_transport_link_cleanup_work, nt);
 	nt->link_is_up = false;
 
@@ -639,7 +639,7 @@ ntb_transport_init_queue(struct ntb_transport_ctx *nt, unsigned int qp_num)
 	qp->tx_max_frame = qmin(transport_mtu, tx_size / 2);
 	qp->tx_max_entry = tx_size / qp->tx_max_frame;
 
-	callout_init(&qp->link_work, 0);
+	callout_init(&qp->link_work, 1);
 	callout_init(&qp->rx_full, 1);
 
 	mtx_init(&qp->ntb_rx_q_lock, "ntb rx q", NULL, MTX_SPIN);