From nobody Sat Oct 31 20:24:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jH8Zg2cnSz6xFC7 for ; Sat, 31 Oct 2026 20:24:27 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jH8Zg1Chrz4P5f for ; Sat, 31 Oct 2026 20:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793478267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsCQq5mCWXpL+X7d0rdfl4Iujpldw9tcWDyerzwfY3c=; b=BxG9h3QtPHIvTRH4owXaFtS/j0ysPIDRgFjLu74b6UWJtFk9K7AE2DW+GWRvtrnyk8yJq7 eps5W5uuG7sAD+/meIk2BPa+eglCNVUO8KBcPSJLetqS6AIjv3BCLfdil4GDm5p2yk63zt /4vU6P+zrUhEXJ6g26plha45TmDqL77xJ0tDv4Br1e01xS4z/t1solqVHuictxX07Qb7DP lfmou11pstfS0866Y6W+esGvli+8JwIylyPxqPhmHyepdfhDSWPbKOMy1WgTNM50t2Xtn6 4Gk+1/jSCz4JvnXhdgGFqiClSvQokuEleRe25nODyQ1lxhir9pTtjmliaQVGrg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793478267; b=vneujvSy7ZTxFMjJJwsnjjpp0sb5gT6pZejTqEXhFvx/4+G+j3T16xJFcIg17BeFqvPfjd Z9oWDmcLuPbDJ/hNDRAP10aincjAHvhnh4O+xdegWKw/5sfPPwoOCzsr1aSYVUPq06SCCU d2ecKzZx47mZLiOmMX9LYCH2y5Lo73a8ajWsF0EUWP2dPHkte0zYgUkJzvQwIDBbHSjct9 alE8mtZ4NJnrLELp7aujKlF+yN9cE0fo1InJxP0j9bQzHRgsbfKqWEG1jbH9Hv5bYI0FDS SgBl64qJlpQV2eLMMtmYkOtBoW4dnntLAp1v/H1FYS85gbpmHvC1L3oS45VEoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793478267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BsCQq5mCWXpL+X7d0rdfl4Iujpldw9tcWDyerzwfY3c=; b=S4BbuiR7up5MSdo7rv1x6Y9yVYPOdZY3lxjUx+jUIQwRANSBdG0GdvkdNF+S0acMIyu6Xl 3/gv429UGyJpJJJTPYhIG/y2x4OG1Msqx4XFGSxBei3Qn7FuiW0dX+6ODGmSNAcswa+c7m 1vA3C9uqqpiWJlKgNPUZEnA56GyR9JCuwmH0G9x7EnrvOz8rlkPtVlxpNDrk3nv6wxT6xu 3lsOk8h9GtU1Ev4KAOCJaQbbV2GURmLnQqaWcXwqiaRwJJzQj1MmWm97I2fEOuMD71y8Ee YNBBA/Pbn1BgP74tetZfcvUN2Ys3VJgE04ManvediePGRQzuvPCUFkkk4ogfUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jH8Zg0tLczR33 for ; Sat, 31 Oct 2026 20:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 330f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 20:24:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John From: Adrian Chadd Subject: git: 9c67ab24b0e9 - stable/15 - rge: correctly free busdma memory / zero things out only if allocated List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c67ab24b0e947a527206d02dd4262897610858c Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 20:24:27 +0000 Message-Id: <6ae64e7b.330f0.151e2fdd@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=9c67ab24b0e947a527206d02dd4262897610858c commit 9c67ab24b0e947a527206d02dd4262897610858c Author: John AuthorDate: 2026-02-22 18:06:44 +0000 Commit: Adrian Chadd CommitDate: 2026-10-31 20:15:04 +0000 rge: correctly free busdma memory / zero things out only if allocated * Only free busdma memory that was allocated * Don't free tx/rx rings until their buffers have also been freed PR: kern/293307 Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D55420 (cherry picked from commit d1947d0a1a55f905e5ed076d46d4f75a00c6f823) --- sys/dev/rge/if_rge.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index 5daede0ac95d..dfa6cd1325e5 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -1762,13 +1762,6 @@ rge_freemem(struct rge_softc *sc) RGE_ASSERT_UNLOCKED(sc); - /* TX desc */ - bus_dmamap_unload(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list_map); - if (q->q_tx.rge_tx_list != NULL) - bus_dmamem_free(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list, - q->q_tx.rge_tx_list_map); - memset(&q->q_tx, 0, sizeof(q->q_tx)); - /* TX buf */ for (i = 0; i < RGE_TX_LIST_CNT; i++) { struct rge_txq *tx = &q->q_tx.rge_txq[i]; @@ -1800,12 +1793,13 @@ rge_freemem(struct rge_softc *sc) } } - /* RX desc */ - bus_dmamap_unload(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list_map); - if (q->q_rx.rge_rx_list != 0) - bus_dmamem_free(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list, - q->q_rx.rge_rx_list_map); - memset(&q->q_rx, 0, sizeof(q->q_tx)); + /* TX desc */ + if (q->q_tx.rge_tx_list != NULL) { + bus_dmamap_unload(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list_map); + bus_dmamem_free(sc->sc_dmat_tx_desc, q->q_tx.rge_tx_list, + q->q_tx.rge_tx_list_map); + } + memset(&q->q_tx, 0, sizeof(q->q_tx)); /* RX buf */ for (i = 0; i < RGE_RX_LIST_CNT; i++) { @@ -1830,6 +1824,14 @@ rge_freemem(struct rge_softc *sc) } } + /* RX desc */ + if (q->q_rx.rge_rx_list != NULL) { + bus_dmamap_unload(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list_map); + bus_dmamem_free(sc->sc_dmat_rx_desc, q->q_rx.rge_rx_list, + q->q_rx.rge_rx_list_map); + } + memset(&q->q_rx, 0, sizeof(q->q_tx)); + return (0); } @@ -1845,9 +1847,10 @@ rge_free_stats_mem(struct rge_softc *sc) RGE_ASSERT_UNLOCKED(sc); - bus_dmamap_unload(sc->sc_dmat_stats_buf, ss->map); - if (ss->stats != NULL) + if (ss->stats != NULL) { + bus_dmamap_unload(sc->sc_dmat_stats_buf, ss->map); bus_dmamem_free(sc->sc_dmat_stats_buf, ss->stats, ss->map); + } memset(ss, 0, sizeof(*ss)); return (0); }