Wed Oct 28 07:08:08 2020 UTC ()

 Add missing drain for pcq in wm_stop_locked(). OK'd by knakahara.

This change fixes two problems:
 1. If the pcq is full and watchdog timer is fired, the full state of the
    pcq is kept and wm_transmit() returns with ENOBUFS.
 2. ifconfig down doesn't free mbufs in the pcq.


(msaitoh)

diff -r1.691 -r1.692 src/sys/dev/pci/if_wm.c

--- src/sys/dev/pci/if_wm.c 2020/10/16 05:53:39	1.691
+++ src/sys/dev/pci/if_wm.c 2020/10/28 07:08:08	1.692

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.691 2020/10/16 05:53:39 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.692 2020/10/28 07:08:08 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -72,27 +72,27 @@
+ *
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet) for I354
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.691 2020/10/16 05:53:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.692 2020/10/28 07:08:08 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_wm.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 @@ -6513,36 +6513,41 @@ wm_stop_locked(struct ifnet *ifp, bool d
 	/* Stop the 82547 Tx FIFO stall check timer. */
 	if (sc->sc_type == WM_T_82547) {
 		if (wait)
 			callout_halt(&sc->sc_txfifo_ch, sc->sc_core_lock);
 		else
 			callout_stop(&sc->sc_txfifo_ch);
+	}
 	/* Release any queued transmit buffers. */
 	for (qidx = 0; qidx < sc->sc_nqueues; qidx++) {
 		struct wm_queue *wmq = &sc->sc_queue[qidx];
 		struct wm_txqueue *txq = &wmq->wmq_txq;
 		struct mbuf *m;
 		mutex_enter(txq->txq_lock);
 		txq->txq_sending = false; /* Ensure watchdog disabled */
 		for (i = 0; i < WM_TXQUEUELEN(txq); i++) {
 			txs = &txq->txq_soft[i];
 			if (txs->txs_mbuf != NULL) {
 				bus_dmamap_unload(sc->sc_dmat,txs->txs_dmamap);
 				m_freem(txs->txs_mbuf);
 				txs->txs_mbuf = NULL;
+			}
+		}
 		/* Drain txq_interq */
 		while ((m = pcq_get(txq->txq_interq)) != NULL)
 			m_freem(m);
 		mutex_exit(txq->txq_lock);
+	}
 	/* Mark the interface as down and cancel the watchdog timer. */
 	ifp->if_flags &= ~IFF_RUNNING;
 	if (disable) {
 		for (i = 0; i < sc->sc_nqueues; i++) {
 			struct wm_rxqueue *rxq = &sc->sc_queue[i].wmq_rxq;
 			mutex_enter(rxq->rxq_lock);
 			wm_rxdrain(rxq);
 			mutex_exit(rxq->rxq_lock);
+		}