d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Commit r324290

Browse Source 
Add sanity checks in ql_hw_send() qla_send() to ensure that empty slots
  in Tx Ring map to empty slot in Tx_buf array before Transmits. If the
  checks fail further Transmission on that Tx Ring is prevented.
This commit is contained in:
David C Somayajulu 2017-10-10 20:45:45 +00:00
parent 6e71b3c3ed
commit 143ed053e9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=324504
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/qlxgbe/ql_hw.c
View File

@ -2374,16 +2374,6 @@ ql_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, int nsegs,
}
}
for (i = 0; i < num_tx_cmds; i++) {
if (NULL != ha->tx_ring[txr_idx].tx_buf[(tx_idx+i)].m_head) {
QL_ASSERT(ha, 0, \
("%s: txr_idx = %d tx_idx = %d mbuf = %p\n",\
__func__, txr_idx, (tx_idx+i),\
ha->tx_ring[txr_idx].tx_buf[(tx_idx+i)].m_head));
return (EINVAL);
}
}
tx_cmd = &hw->tx_cntxt[txr_idx].tx_ring_base[tx_idx];
if (!(mp->m_pkthdr.csum_flags & CSUM_TSO)) {

11
sys/dev/qlxgbe/ql_os.c
View File

@ -1232,17 +1232,6 @@ qla_send(qla_host_t *ha, struct mbuf **m_headp, uint32_t txr_idx,
QL_DPRINT8(ha, (ha->pci_dev, "%s: enter\n", __func__));
tx_idx = ha->hw.tx_cntxt[txr_idx].txr_next;
if (NULL != ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head) {
QL_ASSERT(ha, 0, ("%s: txr_idx = %d tx_idx = %d mbuf = %p\n",\
__func__, txr_idx, tx_idx,\
ha->tx_ring[txr_idx].tx_buf[tx_idx].m_head));
if (m_head)
m_freem(m_head);
*m_headp = NULL;
return (ret);
}
map = ha->tx_ring[txr_idx].tx_buf[tx_idx].map;
ret = bus_dmamap_load_mbuf_sg(ha->tx_tag, map, m_head, segs, &nsegs,