d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa2: add retry and timeout in packet enqueue API

Browse Source 
In the packet transmit, if the QBMAN is not able to process the
packets, the Tx function loops infinitely to send the packet out.
This patch changes the logic retry for some time (count) and then
return.

Fixes: cd9935cec873 ("net/dpaa2: enable Rx and Tx operations")
Fixes: 16c4a3c46ab7 ("bus/fslmc: add enqueue response read in qbman")
Cc: stable@dpdk.org

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Signed-off-by: Radu Bulie <radu-andrei.bulie@nxp.com>
This commit is contained in:
Nipun Gupta 2019-11-05 19:53:16 +05:30 committed by Thomas Monjalon
parent c9d9825bea
commit ce4fd609b4
2 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
View File

@ -59,6 +59,8 @@
#define DPAA2_SWP_CINH_REGION 1
#define DPAA2_SWP_CENA_MEM_REGION 2
#define DPAA2_MAX_TX_RETRY_COUNT 10000
#define MC_PORTAL_INDEX 0
#define NUM_DPIO_REGIONS 2
#define NUM_DQS_PER_QUEUE 2

72
drivers/net/dpaa2/dpaa2_rxtx.c
View File

@ -1135,15 +1135,28 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
#endif
bufs++;
}
loop = 0;
retry_count = 0;
while (loop < frames_to_send) {
loop += qbman_swp_enqueue_multiple(swp, &eqdesc,
ret = qbman_swp_enqueue_multiple(swp, &eqdesc,
&fd_arr[loop], &flags[loop],
frames_to_send - loop);
if (unlikely(ret < 0)) {
retry_count++;
if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) {
num_tx += loop;
nb_pkts -= loop;
goto send_n_return;
}
} else {
loop += ret;
retry_count = 0;
}
}
num_tx += frames_to_send;
nb_pkts -= frames_to_send;
num_tx += loop;
nb_pkts -= loop;
}
dpaa2_q->tx_pkts += num_tx;
return num_tx;
@ -1153,13 +1166,22 @@ send_n_return:
if (loop) {
unsigned int i = 0;
retry_count = 0;
while (i < loop) {
i += qbman_swp_enqueue_multiple(swp, &eqdesc,
&fd_arr[i],
&flags[loop],
loop - i);
ret = qbman_swp_enqueue_multiple(swp, &eqdesc,
&fd_arr[i],
&flags[i],
loop - i);
if (unlikely(ret < 0)) {
retry_count++;
if (retry_count > DPAA2_MAX_TX_RETRY_COUNT)
break;
} else {
i += ret;
retry_count = 0;
}
}
num_tx += loop;
num_tx += i;
}
skip_tx:
dpaa2_q->tx_pkts += num_tx;
@ -1365,15 +1387,28 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
}
bufs++;
}
loop = 0;
retry_count = 0;
while (loop < frames_to_send) {
loop += qbman_swp_enqueue_multiple_desc(swp,
ret = qbman_swp_enqueue_multiple_desc(swp,
&eqdesc[loop], &fd_arr[loop],
frames_to_send - loop);
if (unlikely(ret < 0)) {
retry_count++;
if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) {
num_tx += loop;
nb_pkts -= loop;
goto send_n_return;
}
} else {
loop += ret;
retry_count = 0;
}
}
num_tx += frames_to_send;
nb_pkts -= frames_to_send;
num_tx += loop;
nb_pkts -= loop;
}
dpaa2_q->tx_pkts += num_tx;
return num_tx;
@ -1383,11 +1418,20 @@ send_n_return:
if (loop) {
unsigned int i = 0;
retry_count = 0;
while (i < loop) {
i += qbman_swp_enqueue_multiple_desc(swp, &eqdesc[loop],
&fd_arr[i], loop - i);
ret = qbman_swp_enqueue_multiple_desc(swp,
&eqdesc[loop], &fd_arr[i], loop - i);
if (unlikely(ret < 0)) {
retry_count++;
if (retry_count > DPAA2_MAX_TX_RETRY_COUNT)
break;
} else {
i += ret;
retry_count = 0;
}
}
num_tx += loop;
num_tx += i;
}
skip_tx:
dpaa2_q->tx_pkts += num_tx;