git: ccda3e7069b4 - stable/13 - ntb_transport(4): Mark callouts MP-safe.
Alexander Motin
mav at FreeBSD.org
Tue Aug 24 02:29:54 UTC 2021
The branch stable/13 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=ccda3e7069b42dfda39358af64cbc4e2c52cd32d
commit ccda3e7069b42dfda39358af64cbc4e2c52cd32d
Author: Alexander Motin <mav at FreeBSD.org>
AuthorDate: 2021-08-10 20:30:12 +0000
Commit: Alexander Motin <mav at FreeBSD.org>
CommitDate: 2021-08-24 02:29:46 +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
(cherry picked from commit c6902e7796bc78df011131a2b8b024faed884b8f)
---
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 d6bccfb0f08c..3977be6db7cf 100644
--- a/sys/dev/ntb/ntb_transport.c
+++ b/sys/dev/ntb/ntb_transport.c
@@ -492,8 +492,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);
More information about the dev-commits-src-all
mailing list