Author: davidcs
Date: Fri Sep 30 18:08:16 2016
New Revision: 306515
URL: https://svnweb.freebsd.org/changeset/base/306515
Log:
Revert commit
r306284 - Fixes for issues under high workloads
Will fix and recommit patch
Modified:
head/sys/dev/bxe/bxe.c
head/sys/dev/bxe/bxe.h
head/sys/dev/bxe/bxe_stats.h
Modified: head/sys/dev/bxe/bxe.c
==============================================================================
--- head/sys/dev/bxe/bxe.c Fri Sep 30 17:49:04 2016 (r306514)
+++ head/sys/dev/bxe/bxe.c Fri Sep 30 18:08:16 2016 (r306515)
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#define BXE_DRIVER_VERSION "1.78.89"
+#define BXE_DRIVER_VERSION "1.78.81"
#include "bxe.h"
#include "ecore_sp.h"
@@ -489,16 +489,7 @@ static const struct {
{ STATS_OFFSET32(mbuf_alloc_tpa),
4, STATS_FLAGS_FUNC, "mbuf_alloc_tpa"},
{ STATS_OFFSET32(tx_queue_full_return),
- 4, STATS_FLAGS_FUNC, "tx_queue_full_return"},
- { STATS_OFFSET32(bxe_tx_mq_start_lock_failures),
- 4, STATS_FLAGS_FUNC, "bxe_tx_mq_start_lock_failures"},
- { STATS_OFFSET32(tx_request_link_down_failures),
- 4, STATS_FLAGS_FUNC, "tx_request_link_down_failures"},
- { STATS_OFFSET32(bd_avail_too_less_failures),
- 4, STATS_FLAGS_FUNC, "bd_avail_too_less_failures"},
- { STATS_OFFSET32(tx_mq_not_empty),
- 4, STATS_FLAGS_FUNC, "tx_mq_not_empty"}
-
+ 4, STATS_FLAGS_FUNC, "tx_queue_full_return"}
};
static const struct {
@@ -611,15 +602,7 @@ static const struct {
{ Q_STATS_OFFSET32(mbuf_alloc_tpa),
4, "mbuf_alloc_tpa"},
{ Q_STATS_OFFSET32(tx_queue_full_return),
- 4, "tx_queue_full_return"},
- { Q_STATS_OFFSET32(bxe_tx_mq_start_lock_failures),
- 4, "bxe_tx_mq_start_lock_failures"},
- { Q_STATS_OFFSET32(tx_request_link_down_failures),
- 4, "tx_request_link_down_failures"},
- { Q_STATS_OFFSET32(bd_avail_too_less_failures),
- 4, "bd_avail_too_less_failures"},
- { Q_STATS_OFFSET32(tx_mq_not_empty),
- 4, "tx_mq_not_empty"}
+ 4, "tx_queue_full_return"}
};
#define BXE_NUM_ETH_STATS ARRAY_SIZE(bxe_eth_stats_arr)
@@ -5638,18 +5621,11 @@ bxe_tx_mq_start_locked(struct bxe_softc
return (EINVAL);
}
- if (m != NULL) {
- rc = drbr_enqueue(ifp, tx_br, m);
- if (rc != 0) {
- fp->eth_q_stats.tx_soft_errors++;
- goto bxe_tx_mq_start_locked_exit;
- }
- }
-
if (!sc->link_vars.link_up ||
(if_getdrvflags(ifp) &
(IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != IFF_DRV_RUNNING) {
- fp->eth_q_stats.tx_request_link_down_failures++;
+ if (m != NULL)
+ rc = drbr_enqueue(ifp, tx_br, m);
goto bxe_tx_mq_start_locked_exit;
}
@@ -5659,22 +5635,24 @@ bxe_tx_mq_start_locked(struct bxe_softc
fp->eth_q_stats.tx_max_drbr_queue_depth = depth;
}
- /* keep adding entries while there are frames to send */
- while ((next = drbr_peek(ifp, tx_br)) != NULL) {
- /* handle any completions if we're running low */
- tx_bd_avail = bxe_tx_avail(sc, fp);
- if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
- /* bxe_txeof will set IFF_DRV_OACTIVE appropriately */
- bxe_txeof(sc, fp);
- tx_bd_avail = bxe_tx_avail(sc, fp);
- if (tx_bd_avail < (BXE_TSO_MAX_SEGMENTS + 1)) {
- fp->eth_q_stats.bd_avail_too_less_failures++;
- m_freem(next);
- drbr_advance(ifp, tx_br);
- rc = ENOBUFS;
- break;
- }
+ if (m == NULL) {
+ /* no new work, check for pending frames */
+ next = drbr_dequeue_drv(ifp, tx_br);
+ } else if (drbr_needs_enqueue_drv(ifp, tx_br)) {
+ /* have both new and pending work, maintain packet order */
+ rc = drbr_enqueue(ifp, tx_br, m);
+ if (rc != 0) {
+ fp->eth_q_stats.tx_soft_errors++;
+ goto bxe_tx_mq_start_locked_exit;
}
+ next = drbr_dequeue_drv(ifp, tx_br);
+ } else {
+ /* new work only and nothing pending */
+ next = m;
+ }
+
+ /* keep adding entries while there are frames to send */
+ while (next != NULL) {
/* the mbuf now belongs to us */
fp->eth_q_stats.mbuf_alloc_tx++;
@@ -5689,12 +5667,12 @@ bxe_tx_mq_start_locked(struct bxe_softc
fp->eth_q_stats.tx_encap_failures++;
if (next != NULL) {
/* mark the TX queue as full and save the frame */
- ifp->if_drv_flags |= IFF_DRV_OACTIVE;
- drbr_putback(ifp, tx_br, next);
+ if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
+ /* XXX this may reorder the frame */
+ rc = drbr_enqueue(ifp, tx_br, next);
fp->eth_q_stats.mbuf_alloc_tx--;
fp->eth_q_stats.tx_frames_deferred++;
- } else
- drbr_advance(ifp, tx_br);
+ }
/* stop looking for more work */
break;
@@ -5704,9 +5682,20 @@ bxe_tx_mq_start_locked(struct bxe_softc
tx_count++;
/* send a copy of the frame to any BPF listeners */
- BPF_MTAP(ifp, next);
+ if_etherbpfmtap(ifp, next);
+
+ tx_bd_avail = bxe_tx_avail(sc, fp);
- drbr_advance(ifp, tx_br);
+ /* handle any completions if we're running low */
+ if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
+ /* bxe_txeof will set IFF_DRV_OACTIVE appropriately */
+ bxe_txeof(sc, fp);
+ if (if_getdrvflags(ifp) & IFF_DRV_OACTIVE) {
+ break;
+ }
+ }
+
+ next = drbr_dequeue_drv(ifp, tx_br);
}
/* all TX packets were dequeued and/or the tx ring is full */
@@ -5716,32 +5705,10 @@ bxe_tx_mq_start_locked(struct bxe_softc
}
bxe_tx_mq_start_locked_exit:
- /* If we didn't drain the drbr, enqueue a task in the future to do it. */
- if (!drbr_empty(ifp, tx_br)) {
- fp->eth_q_stats.tx_mq_not_empty++;
- taskqueue_enqueue_timeout(fp->tq, &fp->tx_timeout_task, 1);
- }
return (rc);
}
-static void
-bxe_tx_mq_start_deferred(void *arg,
- int pending)
-{
- struct bxe_fastpath *fp = (struct bxe_fastpath *)arg;
- struct bxe_softc *sc = fp->sc;
-#if __FreeBSD_version >= 800000
- if_t ifp = sc->ifp;
-#else
- struct ifnet *ifp = sc->ifnet;
-#endif /* #if __FreeBSD_version >= 800000 */
-
- BXE_FP_TX_LOCK(fp);
- bxe_tx_mq_start_locked(sc, ifp, fp, NULL);
- BXE_FP_TX_UNLOCK(fp);
-}
-
/* Multiqueue (TSS) dispatch routine. */
static int
bxe_tx_mq_start(struct ifnet *ifp,
@@ -5763,10 +5730,8 @@ bxe_tx_mq_start(struct ifnet *ifp,
if (BXE_FP_TX_TRYLOCK(fp)) {
rc = bxe_tx_mq_start_locked(sc, ifp, fp, m);
BXE_FP_TX_UNLOCK(fp);
- } else {
+ } else
rc = drbr_enqueue(ifp, fp->tx_br, m);
- taskqueue_enqueue(fp->tq, &fp->tx_task);
- }
return (rc);
}
@@ -6988,8 +6953,6 @@ bxe_link_attn(struct bxe_softc *sc)
uint32_t pause_enabled = 0;
struct host_port_stats *pstats;
int cmng_fns;
- struct bxe_fastpath *fp;
- int i;
/* Make sure that we are synced with the current statistics */
bxe_stats_handle(sc, STATS_EVENT_STOP);
@@ -7021,12 +6984,6 @@ bxe_link_attn(struct bxe_softc *sc)
if (sc->state == BXE_STATE_OPEN) {
bxe_stats_handle(sc, STATS_EVENT_LINK_UP);
}
-
- /* Restart tx when the link comes back. */
- FOR_EACH_ETH_QUEUE(sc, i) {
- fp = &sc->fp[i];
- taskqueue_enqueue(fp->tq, &fp->tx_task);
- }
}
if (sc->link_vars.link_up && sc->link_vars.line_speed) {
@@ -8636,6 +8593,11 @@ bxe_handle_fp_tq(void *context,
* we need to add a "process/continue" flag here that the driver
* can use to tell the task here not to do anything.
*/
+#if 0
+ if (!(if_getdrvflags(sc->ifp) & IFF_DRV_RUNNING)) {
+ return;
+ }
+#endif
/* update the fastpath index */
bxe_update_fp_sb_idx(fp);
@@ -9073,10 +9035,6 @@ bxe_interrupt_detach(struct bxe_softc *s
fp = &sc->fp[i];
if (fp->tq) {
taskqueue_drain(fp->tq, &fp->tq_task);
- taskqueue_drain(fp->tq, &fp->tx_task);
- while (taskqueue_cancel_timeout(fp->tq, &fp->tx_timeout_task,
- NULL))
- taskqueue_drain_timeout(fp->tq, &fp->tx_timeout_task);
taskqueue_free(fp->tq);
fp->tq = NULL;
}
@@ -9121,12 +9079,9 @@ bxe_interrupt_attach(struct bxe_softc *s
snprintf(fp->tq_name, sizeof(fp->tq_name),
"bxe%d_fp%d_tq", sc->unit, i);
TASK_INIT(&fp->tq_task, 0, bxe_handle_fp_tq, fp);
- TASK_INIT(&fp->tx_task, 0, bxe_tx_mq_start_deferred, fp);
fp->tq = taskqueue_create_fast(fp->tq_name, M_NOWAIT,
taskqueue_thread_enqueue,
&fp->tq);
- TIMEOUT_TASK_INIT(fp->tq, &fp->tx_timeout_task, 0,
- bxe_tx_mq_start_deferred, fp);
taskqueue_start_threads(&fp->tq, 1, PI_NET, /* higher priority */
"%s", fp->tq_name);
}
@@ -12159,12 +12114,9 @@ static void
bxe_periodic_callout_func(void *xsc)
{
struct bxe_softc *sc = (struct bxe_softc *)xsc;
- int i;
-
-#if __FreeBSD_version < 800000
struct bxe_fastpath *fp;
uint16_t tx_bd_avail;
-#endif
+ int i;
if (!BXE_CORE_TRYLOCK(sc)) {
/* just bail and try again next time */
@@ -12186,7 +12138,28 @@ bxe_periodic_callout_func(void *xsc)
return;
}
-#if __FreeBSD_version < 800000
+#if __FreeBSD_version >= 800000
+
+ FOR_EACH_QUEUE(sc, i) {
+ fp = &sc->fp[i];
+
+ if (BXE_FP_TX_TRYLOCK(fp)) {
+ if_t ifp = sc->ifp;
+ /*
+ * If interface was stopped due to unavailable
+ * bds, try to process some tx completions
+ */
+ (void) bxe_txeof(sc, fp);
+
+ tx_bd_avail = bxe_tx_avail(sc, fp);
+ if (tx_bd_avail >= BXE_TX_CLEANUP_THRESHOLD) {
+ bxe_tx_mq_start_locked(sc, ifp, fp, NULL);
+ }
+ BXE_FP_TX_UNLOCK(fp);
+ }
+ }
+
+#else
fp = &sc->fp[0];
if (BXE_FP_TX_TRYLOCK(fp)) {
@@ -12204,7 +12177,7 @@ bxe_periodic_callout_func(void *xsc)
BXE_FP_TX_UNLOCK(fp);
}
-
+
#endif /* #if __FreeBSD_version >= 800000 */
/* Check for TX timeouts on any fastpath. */
Modified: head/sys/dev/bxe/bxe.h
==============================================================================
--- head/sys/dev/bxe/bxe.h Fri Sep 30 17:49:04 2016 (r306514)
+++ head/sys/dev/bxe/bxe.h Fri Sep 30 18:08:16 2016 (r306515)
@@ -644,9 +644,6 @@ struct bxe_fastpath {
struct taskqueue *tq;
char tq_name[32];
- struct task tx_task;
- struct timeout_task tx_timeout_task;
-
/* ethernet client ID (each fastpath set of RX/TX/CQE is a client) */
uint8_t cl_id;
#define FP_CL_ID(fp) (fp->cl_id)
@@ -2303,7 +2300,7 @@ void bxe_dump_mbuf_data(struct bxe_softc
extern int bxe_grc_dump(struct bxe_softc *sc);
#if __FreeBSD_version >= 800000
-#if (__FreeBSD_version >= 1001513 && __FreeBSD_version < 1100000) ||
__FreeBSD_version >= 1100048
+#if __FreeBSD_version >= 1000000
#define BXE_SET_FLOWID(m) M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE)
#define BXE_VALID_FLOWID(m) (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
#else
Modified: head/sys/dev/bxe/bxe_stats.h
==============================================================================
--- head/sys/dev/bxe/bxe_stats.h Fri Sep 30 17:49:04 2016
(r306514)
+++ head/sys/dev/bxe/bxe_stats.h Fri Sep 30 18:08:16 2016
(r306515)
@@ -266,12 +266,6 @@ struct bxe_eth_stats {
/* num. of times tx queue full occurred */
uint32_t tx_queue_full_return;
-
- /* debug stats */
- uint32_t bxe_tx_mq_start_lock_failures;
- uint32_t tx_request_link_down_failures;
- uint32_t bd_avail_too_less_failures;
- uint32_t tx_mq_not_empty;
};
@@ -378,12 +372,6 @@ struct bxe_eth_q_stats {
/* num. of times tx queue full occurred */
uint32_t tx_queue_full_return;
-
- /* debug stats */
- uint32_t bxe_tx_mq_start_lock_failures;
- uint32_t tx_request_link_down_failures;
- uint32_t bd_avail_too_less_failures;
- uint32_t tx_mq_not_empty;
};
struct bxe_eth_stats_old {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
