Skip to content

Commit

Permalink
net/hns3: fix next-to-use overflow in simple Tx
Browse files Browse the repository at this point in the history
[ upstream commit 76a9c98 ]

If txq's next-to-use plus nb_pkts equal txq's nb_tx_desc when using
simple xmit algorithm, the txq's next-to-use will equal nb_tx_desc
fter the xmit, this does not cause Tx exceptions, but may affect other
ops that depend on this field, such as tx_descriptor_status.

Fixes: 7ef9339 ("net/hns3: add simple Tx path")

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
  • Loading branch information
fengchengwen authored and kevintraynor committed Oct 20, 2022
1 parent 540c860 commit daf6edc
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/hns3/hns3_rxtx.c
Original file line number Diff line number Diff line change
Expand Up @@ -4137,14 +4137,16 @@ hns3_xmit_pkts_simple(void *tx_queue,
}

txq->tx_bd_ready -= nb_pkts;
if (txq->next_to_use + nb_pkts > txq->nb_tx_desc) {
if (txq->next_to_use + nb_pkts >= txq->nb_tx_desc) {
nb_tx = txq->nb_tx_desc - txq->next_to_use;
hns3_tx_fill_hw_ring(txq, tx_pkts, nb_tx);
txq->next_to_use = 0;
}

hns3_tx_fill_hw_ring(txq, tx_pkts + nb_tx, nb_pkts - nb_tx);
txq->next_to_use += nb_pkts - nb_tx;
if (nb_pkts > nb_tx) {
hns3_tx_fill_hw_ring(txq, tx_pkts + nb_tx, nb_pkts - nb_tx);
txq->next_to_use += nb_pkts - nb_tx;
}

hns3_write_txq_tail_reg(txq, nb_pkts);

Expand Down

0 comments on commit daf6edc

Please sign in to comment.