git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ice/base: add hook to send AdminQ command
[dpdk.git]
/
drivers
/
net
/
dpaa2
/
dpaa2_rxtx.c
diff --git
a/drivers/net/dpaa2/dpaa2_rxtx.c
b/drivers/net/dpaa2/dpaa2_rxtx.c
index
b7b2d86
..
703f054
100644
(file)
--- a/
drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/
drivers/net/dpaa2/dpaa2_rxtx.c
@@
-25,11
+25,11
@@
#include "dpaa2_ethdev.h"
#include "base/dpaa2_hw_dpni_annot.h"
#include "dpaa2_ethdev.h"
#include "base/dpaa2_hw_dpni_annot.h"
-static inline uint32_t __
attribute__((hot))
+static inline uint32_t __
rte_hot
dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
struct dpaa2_annot_hdr *annotation);
dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
struct dpaa2_annot_hdr *annotation);
-static void enable_tx_tstamp(struct qbman_fd *fd) __
attribute__((unused))
;
+static void enable_tx_tstamp(struct qbman_fd *fd) __
rte_unused
;
#define DPAA2_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) do { \
DPAA2_SET_FD_ADDR(_fd, DPAA2_MBUF_VADDR_TO_IOVA(_mbuf)); \
#define DPAA2_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) do { \
DPAA2_SET_FD_ADDR(_fd, DPAA2_MBUF_VADDR_TO_IOVA(_mbuf)); \
@@
-41,7
+41,7
@@
static void enable_tx_tstamp(struct qbman_fd *fd) __attribute__((unused));
DPAA2_RESET_FD_FLC(_fd); \
} while (0)
DPAA2_RESET_FD_FLC(_fd); \
} while (0)
-static inline void __
attribute__((hot))
+static inline void __
rte_hot
dpaa2_dev_rx_parse_new(struct rte_mbuf *m, const struct qbman_fd *fd)
{
struct dpaa2_annot_hdr *annotation;
dpaa2_dev_rx_parse_new(struct rte_mbuf *m, const struct qbman_fd *fd)
{
struct dpaa2_annot_hdr *annotation;
@@
-122,7
+122,7
@@
dpaa2_dev_rx_parse_new(struct rte_mbuf *m, const struct qbman_fd *fd)
frc, m->packet_type, m->ol_flags);
}
frc, m->packet_type, m->ol_flags);
}
-static inline uint32_t __
attribute__((hot))
+static inline uint32_t __
rte_hot
dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
struct dpaa2_annot_hdr *annotation)
{
dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
struct dpaa2_annot_hdr *annotation)
{
@@
-212,7
+212,7
@@
parse_done:
return pkt_type;
}
return pkt_type;
}
-static inline uint32_t __
attribute__((hot))
+static inline uint32_t __
rte_hot
dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
{
struct dpaa2_annot_hdr *annotation =
dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
{
struct dpaa2_annot_hdr *annotation =
@@
-259,7
+259,7
@@
dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
return dpaa2_dev_rx_parse_slow(mbuf, annotation);
}
return dpaa2_dev_rx_parse_slow(mbuf, annotation);
}
-static inline struct rte_mbuf *__
attribute__((hot))
+static inline struct rte_mbuf *__
rte_hot
eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
int port_id)
{
eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
int port_id)
{
@@
-320,7
+320,7
@@
eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
return (void *)first_seg;
}
return (void *)first_seg;
}
-static inline struct rte_mbuf *__
attribute__((hot))
+static inline struct rte_mbuf *__
rte_hot
eth_fd_to_mbuf(const struct qbman_fd *fd,
int port_id)
{
eth_fd_to_mbuf(const struct qbman_fd *fd,
int port_id)
{
@@
-363,7
+363,7
@@
eth_fd_to_mbuf(const struct qbman_fd *fd,
return mbuf;
}
return mbuf;
}
-static int __
attribute__ ((noinline)) __attribute__((hot))
+static int __
rte_noinline __rte_hot
eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
struct qbman_fd *fd, uint16_t bpid)
{
eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
struct qbman_fd *fd, uint16_t bpid)
{
@@
-432,9
+432,9
@@
eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
static void
eth_mbuf_to_fd(struct rte_mbuf *mbuf,
static void
eth_mbuf_to_fd(struct rte_mbuf *mbuf,
- struct qbman_fd *fd, uint16_t bpid) __
attribute__((unused))
;
+ struct qbman_fd *fd, uint16_t bpid) __
rte_unused
;
-static void __
attribute__ ((noinline)) __attribute__((hot))
+static void __
rte_noinline __rte_hot
eth_mbuf_to_fd(struct rte_mbuf *mbuf,
struct qbman_fd *fd, uint16_t bpid)
{
eth_mbuf_to_fd(struct rte_mbuf *mbuf,
struct qbman_fd *fd, uint16_t bpid)
{
@@
-463,7
+463,7
@@
eth_mbuf_to_fd(struct rte_mbuf *mbuf,
}
}
}
}
-static inline int __
attribute__((hot))
+static inline int __
rte_hot
eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
struct qbman_fd *fd, uint16_t bpid)
{
eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
struct qbman_fd *fd, uint16_t bpid)
{
@@
-664,7
+664,7
@@
dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
return num_rx;
}
return num_rx;
}
-void __
attribute__((hot))
+void __
rte_hot
dpaa2_dev_process_parallel_event(struct qbman_swp *swp,
const struct qbman_fd *fd,
const struct qbman_result *dq,
dpaa2_dev_process_parallel_event(struct qbman_swp *swp,
const struct qbman_fd *fd,
const struct qbman_result *dq,
@@
-687,8
+687,8
@@
dpaa2_dev_process_parallel_event(struct qbman_swp *swp,
qbman_swp_dqrr_consume(swp, dq);
}
qbman_swp_dqrr_consume(swp, dq);
}
-void __
attribute__((hot))
-dpaa2_dev_process_atomic_event(struct qbman_swp *swp __
attribute__((unused))
,
+void __
rte_hot
+dpaa2_dev_process_atomic_event(struct qbman_swp *swp __
rte_unused
,
const struct qbman_fd *fd,
const struct qbman_result *dq,
struct dpaa2_queue *rxq,
const struct qbman_fd *fd,
const struct qbman_result *dq,
struct dpaa2_queue *rxq,
@@
-716,7
+716,7
@@
dpaa2_dev_process_atomic_event(struct qbman_swp *swp __attribute__((unused)),
DPAA2_PER_LCORE_DQRR_MBUF(dqrr_index) = ev->mbuf;
}
DPAA2_PER_LCORE_DQRR_MBUF(dqrr_index) = ev->mbuf;
}
-void __
attribute__((hot))
+void __
rte_hot
dpaa2_dev_process_ordered_event(struct qbman_swp *swp,
const struct qbman_fd *fd,
const struct qbman_result *dq,
dpaa2_dev_process_ordered_event(struct qbman_swp *swp,
const struct qbman_fd *fd,
const struct qbman_result *dq,
@@
-1135,15
+1135,28
@@
dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
#endif
bufs++;
}
#endif
bufs++;
}
+
loop = 0;
loop = 0;
+ retry_count = 0;
while (loop < frames_to_send) {
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);
&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;
}
dpaa2_q->tx_pkts += num_tx;
return num_tx;
@@
-1153,13
+1166,22
@@
send_n_return:
if (loop) {
unsigned int i = 0;
if (loop) {
unsigned int i = 0;
+ retry_count = 0;
while (i < loop) {
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;
}
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++;
}
}
bufs++;
}
+
loop = 0;
loop = 0;
+ retry_count = 0;
while (loop < frames_to_send) {
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);
&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;
}
dpaa2_q->tx_pkts += num_tx;
return num_tx;
@@
-1383,11
+1418,20
@@
send_n_return:
if (loop) {
unsigned int i = 0;
if (loop) {
unsigned int i = 0;
+ retry_count = 0;
while (i < loop) {
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;
}
skip_tx:
dpaa2_q->tx_pkts += num_tx;