Attachment 219121 Details for Bug 248652 – Cleaned up netmap tx timer patch (no sysctl)

[patch] Cleaned up netmap tx timer patch (no sysctl)

txsync.diff (text/plain), 6.83 KB, created by Vincenzo Maffione on 2020-10-26 21:39:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincenzo Maffione

Created: 2020-10-26 21:39:17 UTC

Size: 6.83 KB

patch

obsolete

>diff --git a/sys/net/iflib.c b/sys/net/iflib.c
>index 85c29f850..29117f253 100644
>--- a/sys/net/iflib.c
>+++ b/sys/net/iflib.c
>@@ -346,6 +346,9 @@ struct iflib_txq {
> 	qidx_t		ift_size;
> 	uint16_t	ift_id;
> 	struct callout	ift_timer;
>+#ifdef DEV_NETMAP
>+	struct callout	ift_netmap_timer;
>+#endif /* DEV_NETMAP */
> 
> 	if_txsd_vec_t	ift_sds;
> 	uint8_t		ift_qstatus;
>@@ -753,6 +756,7 @@ iflib_num_tx_descs(if_ctx_t ctx)
> MODULE_DEPEND(iflib, netmap, 1, 1, 1);
> 
> static int netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, bool init);
>+static void iflib_netmap_timer(void *arg);
> 
> /*
>  * device-specific sysctl variables:
>@@ -918,6 +922,8 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, bool init)
> 	return (0);
> }
> 
>+#define NETMAP_TX_TIMER_US	90
>+
> /*
>  * Reconcile kernel and user view of the transmit ring.
>  *
>@@ -1058,11 +1064,13 @@ iflib_netmap_txsync(struct netmap_kring *kring, int flags)
> 			kring->nr_hwtail = nm_prev(netmap_idx_n2k(kring, nic_i), lim);
> 		}
> 	}
>+
> 	if (!(ctx->ifc_flags & IFC_NETMAP_TX_IRQ))
> 		if (kring->nr_hwtail != nm_prev(kring->nr_hwcur, lim)) {
>-			callout_reset_on(&txq->ift_timer, hz < 2000 ? 1 : hz / 1000,
>-			    iflib_timer, txq, txq->ift_timer.c_cpu);
>-	}
>+			callout_reset_sbt(&txq->ift_netmap_timer,
>+			    NETMAP_TX_TIMER_US * SBT_1US, SBT_1US,
>+			    iflib_netmap_timer, txq, txq->ift_netmap_timer.c_cpu);
>+		}
> 	return (0);
> }
> 
>@@ -1263,28 +1271,12 @@ iflib_netmap_rxq_init(if_ctx_t ctx, iflib_rxq_t rxq)
> }
> 
> static void
>-iflib_netmap_timer_adjust(if_ctx_t ctx, iflib_txq_t txq, uint32_t *reset_on)
>+iflib_netmap_timer(void *arg)
> {
>-	struct netmap_kring *kring;
>-	uint16_t txqid;
>-
>-	txqid = txq->ift_id;
>-	kring = netmap_kring_on(NA(ctx->ifc_ifp), txqid, NR_TX);
>-	if (kring == NULL)
>-		return;
>+	iflib_txq_t txq = arg;
>+	if_ctx_t ctx = txq->ift_ctx;
> 
>-	if (kring->nr_hwcur != nm_next(kring->nr_hwtail, kring->nkr_num_slots - 1)) {
>-		bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map,
>-		    BUS_DMASYNC_POSTREAD);
>-		if (ctx->isc_txd_credits_update(ctx->ifc_softc, txqid, false))
>-			netmap_tx_irq(ctx->ifc_ifp, txqid);
>-		if (!(ctx->ifc_flags & IFC_NETMAP_TX_IRQ)) {
>-			if (hz < 2000)
>-				*reset_on = 1;
>-			else
>-				*reset_on = hz / 1000;
>-		}
>-	}
>+	netmap_tx_irq(ctx->ifc_ifp, txq->ift_id);
> }
> 
> #define iflib_netmap_detach(ifp) netmap_detach(ifp)
>@@ -1296,8 +1288,6 @@ iflib_netmap_timer_adjust(if_ctx_t ctx, iflib_txq_t txq, uint32_t *reset_on)
> 
> #define iflib_netmap_attach(ctx) (0)
> #define netmap_rx_irq(ifp, qid, budget) (0)
>-#define netmap_tx_irq(ifp, qid) do {} while (0)
>-#define iflib_netmap_timer_adjust(ctx, txq, reset_on)
> #endif
> 
> #if defined(__i386__) || defined(__amd64__)
>@@ -2287,7 +2277,6 @@ iflib_timer(void *arg)
> 	if_ctx_t ctx = txq->ift_ctx;
> 	if_softc_ctx_t sctx = &ctx->ifc_softc_ctx;
> 	uint64_t this_tick = ticks;
>-	uint32_t reset_on = hz / 2;
> 
> 	if (!(if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_RUNNING))
> 		return;
>@@ -2312,17 +2301,13 @@ iflib_timer(void *arg)
> 		}
> 		txq->ift_cleaned_prev = txq->ift_cleaned;
> 	}
>-#ifdef DEV_NETMAP
>-	if (if_getcapenable(ctx->ifc_ifp) & IFCAP_NETMAP)
>-		iflib_netmap_timer_adjust(ctx, txq, &reset_on);
>-#endif
> 	/* handle any laggards */
> 	if (txq->ift_db_pending)
> 		GROUPTASK_ENQUEUE(&txq->ift_task);
> 
> 	sctx->isc_pause_frames = 0;
> 	if (if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_RUNNING) 
>-		callout_reset_on(&txq->ift_timer, reset_on, iflib_timer, txq, txq->ift_timer.c_cpu);
>+		callout_reset_on(&txq->ift_timer, hz / 2, iflib_timer, txq, txq->ift_timer.c_cpu);
> 	return;
> 
>  hung:
>@@ -2396,6 +2381,9 @@ iflib_init_locked(if_ctx_t ctx)
> 	for (i = 0, txq = ctx->ifc_txqs; i < sctx->isc_ntxqsets; i++, txq++) {
> 		CALLOUT_LOCK(txq);
> 		callout_stop(&txq->ift_timer);
>+#ifdef DEV_NETMAP
>+		callout_stop(&txq->ift_netmap_timer);
>+#endif /* DEV_NETMAP */
> 		CALLOUT_UNLOCK(txq);
> 		iflib_netmap_txq_init(ctx, txq);
> 	}
>@@ -2485,6 +2473,9 @@ iflib_stop(if_ctx_t ctx)
> 
> 		CALLOUT_LOCK(txq);
> 		callout_stop(&txq->ift_timer);
>+#ifdef DEV_NETMAP
>+		callout_stop(&txq->ift_netmap_timer);
>+#endif /* DEV_NETMAP */
> 		CALLOUT_UNLOCK(txq);
> 
> 		/* clean any enqueued buffers */
>@@ -3799,11 +3790,6 @@ _task_fn_tx(void *context)
> #endif
> 	if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING))
> 		return;
>-#ifdef DEV_NETMAP
>-	if ((if_getcapenable(ifp) & IFCAP_NETMAP) &&
>-	    netmap_tx_irq(ifp, txq->ift_id))
>-		goto skip_ifmp;
>-#endif
> #ifdef ALTQ
> 	if (ALTQ_IS_ENABLED(&ifp->if_snd))
> 		iflib_altq_if_start(ifp);
>@@ -3817,9 +3803,6 @@ _task_fn_tx(void *context)
> 	 */
> 	if (abdicate)
> 		ifmp_ring_check_drainage(txq->ift_br, TX_BATCH_SIZE);
>-#ifdef DEV_NETMAP
>-skip_ifmp:
>-#endif
> 	if (ctx->ifc_flags & IFC_LEGACY)
> 		IFDI_INTR_ENABLE(ctx);
> 	else
>@@ -3882,7 +3865,6 @@ _task_fn_admin(void *context)
> 	iflib_txq_t txq;
> 	int i;
> 	bool oactive, running, do_reset, do_watchdog, in_detach;
>-	uint32_t reset_on = hz / 2;
> 
> 	STATE_LOCK(ctx);
> 	running = (if_getdrvflags(ctx->ifc_ifp) & IFF_DRV_RUNNING);
>@@ -3910,12 +3892,8 @@ _task_fn_admin(void *context)
> 	}
> 	IFDI_UPDATE_ADMIN_STATUS(ctx);
> 	for (txq = ctx->ifc_txqs, i = 0; i < sctx->isc_ntxqsets; i++, txq++) {
>-#ifdef DEV_NETMAP
>-		reset_on = hz / 2;
>-		if (if_getcapenable(ctx->ifc_ifp) & IFCAP_NETMAP)
>-			iflib_netmap_timer_adjust(ctx, txq, &reset_on);
>-#endif
>-		callout_reset_on(&txq->ift_timer, reset_on, iflib_timer, txq, txq->ift_timer.c_cpu);
>+		callout_reset_on(&txq->ift_timer, hz / 2, iflib_timer, txq,
>+		    txq->ift_timer.c_cpu);
> 	}
> 	IFDI_LINK_INTR_ENABLE(ctx);
> 	if (do_reset)
>@@ -5088,6 +5066,9 @@ iflib_pseudo_deregister(if_ctx_t ctx)
> 	tqg = qgroup_if_io_tqg;
> 	for (txq = ctx->ifc_txqs, i = 0; i < NTXQSETS(ctx); i++, txq++) {
> 		callout_drain(&txq->ift_timer);
>+#ifdef DEV_NETMAP
>+		callout_drain(&txq->ift_netmap_timer);
>+#endif /* DEV_NETMAP */
> 		if (txq->ift_task.gt_uniq != NULL)
> 			taskqgroup_detach(tqg, &txq->ift_task);
> 	}
>@@ -5174,6 +5155,9 @@ iflib_device_deregister(if_ctx_t ctx)
> 	tqg = qgroup_if_io_tqg;
> 	for (txq = ctx->ifc_txqs, i = 0; i < NTXQSETS(ctx); i++, txq++) {
> 		callout_drain(&txq->ift_timer);
>+#ifdef DEV_NETMAP
>+		callout_drain(&txq->ift_netmap_timer);
>+#endif /* DEV_NETMAP */
> 		if (txq->ift_task.gt_uniq != NULL)
> 			taskqgroup_detach(tqg, &txq->ift_task);
> 	}
>@@ -5583,8 +5567,6 @@ iflib_queues_alloc(if_ctx_t ctx)
> 		} else {
> 			txq->ift_br_offset = 0;
> 		}
>-		/* XXX fix this */
>-		txq->ift_timer.c_cpu = cpu;
> 
> 		if (iflib_txsd_alloc(txq)) {
> 			device_printf(dev, "Critical Failure setting up TX buffers\n");
>@@ -5597,6 +5579,11 @@ iflib_queues_alloc(if_ctx_t ctx)
> 		    device_get_nameunit(dev), txq->ift_id);
> 		mtx_init(&txq->ift_mtx, txq->ift_mtx_name, NULL, MTX_DEF);
> 		callout_init_mtx(&txq->ift_timer, &txq->ift_mtx, 0);
>+		txq->ift_timer.c_cpu = cpu;
>+#ifdef DEV_NETMAP
>+		callout_init_mtx(&txq->ift_netmap_timer, &txq->ift_mtx, 0);
>+		txq->ift_netmap_timer.c_cpu = cpu;
>+#endif /* DEV_NETMAP */
> 
> 		err = ifmp_ring_alloc(&txq->ift_br, 2048, txq, iflib_txq_drain,
> 				      iflib_txq_can_drain, M_IFLIB, M_WAITOK);

Actions: View | Diff

Attachments on bug 248652: 218723 | 218866 | 218932 | 219062 | 219121 | 219179