upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-24 07:37:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gve: Fix qpl_buf_head being initialized improperly

Browse source 
Currently, for DQO QPL our MPASS assertion on qpl_buf_head for available
pending_pkts (i.e. not holding a packet) fails due to incorrect
initialization. The MPASS fails on the first run of packets through the
ring when INVARIANTS is on, and when INVARIANTS is off, things work
without a bug.

The MPASS guards against improper reaping of "pending_pkt" objects,
and thus was failing for the first run through the ring. By correctly
initializing the objects in this patch we make the MPASS not fail on the
first run too.

Signed-off-by: Vee Agarwal <veethebee@google.com>
Signed-off-by: Jasper Tran O'Leary <jtranoleary@google.com>

Reviewed by:	delphij, markj
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D48968

(cherry picked from commit 73c3fe4db3ebc2bd6cb732aae77ea017fd376d22)
This commit is contained in:
Jasper Tran O'Leary 2025-02-14 15:05:46 +00:00 committed by Mark Johnston
parent 28ba212a95
commit 875ec35c06
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sys/dev/gve/gve_tx_dqo.c
View file

@ -43,6 +43,13 @@ gve_unmap_packet(struct gve_tx_ring *tx,
bus_dmamap_unload(tx->dqo.buf_dmatag, pending_pkt->dmamap);
}
static void
gve_clear_qpl_pending_pkt(struct gve_tx_pending_pkt_dqo *pending_pkt)
{
pending_pkt->qpl_buf_head = -1;
pending_pkt->num_qpl_bufs = 0;
}
static void
gve_free_tx_mbufs_dqo(struct gve_tx_ring *tx)
{
@ -54,10 +61,9 @@ gve_free_tx_mbufs_dqo(struct gve_tx_ring *tx)
if (!pending_pkt->mbuf)
continue;
if (gve_is_qpl(tx->com.priv)) {
pending_pkt->qpl_buf_head = -1;
pending_pkt->num_qpl_bufs = 0;
} else
if (gve_is_qpl(tx->com.priv))
gve_clear_qpl_pending_pkt(pending_pkt);
else
gve_unmap_packet(tx, pending_pkt);
m_freem(pending_pkt->mbuf);
@ -880,8 +886,7 @@ gve_reap_qpl_bufs_dqo(struct gve_tx_ring *tx,
*/
atomic_add_rel_32(&tx->dqo.qpl_bufs_produced, pkt->num_qpl_bufs);
pkt->qpl_buf_head = -1;
pkt->num_qpl_bufs = 0;
gve_clear_qpl_pending_pkt(pkt);
}
static uint64_t
@ -981,11 +986,13 @@ gve_clear_tx_ring_dqo(struct gve_priv *priv, int i)
gve_free_tx_mbufs_dqo(tx);
for (j = 0; j < tx->dqo.num_pending_pkts - 1; j++) {
tx->dqo.pending_pkts[j].next = j + 1;
for (j = 0; j < tx->dqo.num_pending_pkts; j++) {
if (gve_is_qpl(tx->com.priv))
gve_clear_qpl_pending_pkt(&tx->dqo.pending_pkts[j]);
tx->dqo.pending_pkts[j].next =
(j == tx->dqo.num_pending_pkts - 1) ? -1 : j + 1;
tx->dqo.pending_pkts[j].state = GVE_PACKET_STATE_FREE;
}
tx->dqo.pending_pkts[tx->dqo.num_pending_pkts - 1].next = -1;
tx->dqo.free_pending_pkts_csm = 0;
atomic_store_rel_32(&tx->dqo.free_pending_pkts_prd, -1);