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

net/dpaa2: set port in mbuf

Browse Source 
This patch sets the port in mbuf for event scenarios as well

Fixes: b677d4c6d281 ("net/dpaa2: add API for event Rx adapter")
Fixes: 2d3788631862 ("net/dpaa2: support atomic queues")
Fixes: 16c4a3c46ab7 ("bus/fslmc: add enqueue response read in qbman")
Cc: stable@dpdk.org

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Nipun Gupta 2019-10-09 16:43:23 +05:30 committed by Ferruh Yigit
parent 32113d352d
commit 005d943e57
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,8 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)
} }
static inline struct rte_mbuf *__attribute__((hot)) static inline struct rte_mbuf *__attribute__((hot))
eth_sg_fd_to_mbuf(const struct qbman_fd *fd) eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
int port_id)
{ {
struct qbman_sge *sgt, *sge; struct qbman_sge *sgt, *sge;
size_t sg_addr, fd_addr; size_t sg_addr, fd_addr;
@ -286,6 +287,7 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd)
first_seg->pkt_len = DPAA2_GET_FD_LEN(fd); first_seg->pkt_len = DPAA2_GET_FD_LEN(fd);
first_seg->nb_segs = 1; first_seg->nb_segs = 1;
first_seg->next = NULL; first_seg->next = NULL;
first_seg->port = port_id;
if (dpaa2_svr_family == SVR_LX2160A) if (dpaa2_svr_family == SVR_LX2160A)
dpaa2_dev_rx_parse_new(first_seg, fd); dpaa2_dev_rx_parse_new(first_seg, fd);
else else
@ -319,7 +321,8 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd)
} }
static inline struct rte_mbuf *__attribute__((hot)) static inline struct rte_mbuf *__attribute__((hot))
eth_fd_to_mbuf(const struct qbman_fd *fd) eth_fd_to_mbuf(const struct qbman_fd *fd,
int port_id)
{ {
struct rte_mbuf *mbuf = DPAA2_INLINE_MBUF_FROM_BUF( struct rte_mbuf *mbuf = DPAA2_INLINE_MBUF_FROM_BUF(
DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)), DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)),
@ -333,6 +336,7 @@ eth_fd_to_mbuf(const struct qbman_fd *fd)
mbuf->data_off = DPAA2_GET_FD_OFFSET(fd); mbuf->data_off = DPAA2_GET_FD_OFFSET(fd);
mbuf->data_len = DPAA2_GET_FD_LEN(fd); mbuf->data_len = DPAA2_GET_FD_LEN(fd);
mbuf->pkt_len = mbuf->data_len; mbuf->pkt_len = mbuf->data_len;
mbuf->port = port_id;
mbuf->next = NULL; mbuf->next = NULL;
rte_mbuf_refcnt_set(mbuf, 1); rte_mbuf_refcnt_set(mbuf, 1);
@ -621,10 +625,9 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
} }
if (unlikely(DPAA2_FD_GET_FORMAT(fd) == qbman_fd_sg)) if (unlikely(DPAA2_FD_GET_FORMAT(fd) == qbman_fd_sg))
bufs[num_rx] = eth_sg_fd_to_mbuf(fd); bufs[num_rx] = eth_sg_fd_to_mbuf(fd, eth_data->port_id);
else else
bufs[num_rx] = eth_fd_to_mbuf(fd); bufs[num_rx] = eth_fd_to_mbuf(fd, eth_data->port_id);
bufs[num_rx]->port = eth_data->port_id;
#if defined(RTE_LIBRTE_IEEE1588) #if defined(RTE_LIBRTE_IEEE1588)
priv->rx_timestamp = bufs[num_rx]->timestamp; priv->rx_timestamp = bufs[num_rx]->timestamp;
#endif #endif
@ -679,7 +682,7 @@ dpaa2_dev_process_parallel_event(struct qbman_swp *swp,
ev->queue_id = rxq->ev.queue_id; ev->queue_id = rxq->ev.queue_id;
ev->priority = rxq->ev.priority; ev->priority = rxq->ev.priority;
ev->mbuf = eth_fd_to_mbuf(fd); ev->mbuf = eth_fd_to_mbuf(fd, rxq->eth_data->port_id);
qbman_swp_dqrr_consume(swp, dq); qbman_swp_dqrr_consume(swp, dq);
} }
@ -704,7 +707,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __attribute__((unused)),
ev->queue_id = rxq->ev.queue_id; ev->queue_id = rxq->ev.queue_id;
ev->priority = rxq->ev.priority; ev->priority = rxq->ev.priority;
ev->mbuf = eth_fd_to_mbuf(fd); ev->mbuf = eth_fd_to_mbuf(fd, rxq->eth_data->port_id);
dqrr_index = qbman_get_dqrr_idx(dq); dqrr_index = qbman_get_dqrr_idx(dq);
ev->mbuf->seqn = dqrr_index + 1; ev->mbuf->seqn = dqrr_index + 1;
@ -731,7 +734,7 @@ dpaa2_dev_process_ordered_event(struct qbman_swp *swp,
ev->queue_id = rxq->ev.queue_id; ev->queue_id = rxq->ev.queue_id;
ev->priority = rxq->ev.priority; ev->priority = rxq->ev.priority;
ev->mbuf = eth_fd_to_mbuf(fd); ev->mbuf = eth_fd_to_mbuf(fd, rxq->eth_data->port_id);
ev->mbuf->seqn = DPAA2_ENQUEUE_FLAG_ORP; ev->mbuf->seqn = DPAA2_ENQUEUE_FLAG_ORP;
ev->mbuf->seqn |= qbman_result_DQ_odpid(dq) << DPAA2_EQCR_OPRID_SHIFT; ev->mbuf->seqn |= qbman_result_DQ_odpid(dq) << DPAA2_EQCR_OPRID_SHIFT;
@ -823,10 +826,11 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
+ DPAA2_FD_PTA_SIZE + 16)); + DPAA2_FD_PTA_SIZE + 16));
if (unlikely(DPAA2_FD_GET_FORMAT(fd) == qbman_fd_sg)) if (unlikely(DPAA2_FD_GET_FORMAT(fd) == qbman_fd_sg))
bufs[num_rx] = eth_sg_fd_to_mbuf(fd); bufs[num_rx] = eth_sg_fd_to_mbuf(fd,
eth_data->port_id);
else else
bufs[num_rx] = eth_fd_to_mbuf(fd); bufs[num_rx] = eth_fd_to_mbuf(fd,
bufs[num_rx]->port = eth_data->port_id; eth_data->port_id);
if (eth_data->dev_conf.rxmode.offloads & if (eth_data->dev_conf.rxmode.offloads &
DEV_RX_OFFLOAD_VLAN_STRIP) { DEV_RX_OFFLOAD_VLAN_STRIP) {
@ -1170,7 +1174,9 @@ dpaa2_dev_free_eqresp_buf(uint16_t eqresp_ci)
struct rte_mbuf *m; struct rte_mbuf *m;
fd = qbman_result_eqresp_fd(&dpio_dev->eqresp[eqresp_ci]); fd = qbman_result_eqresp_fd(&dpio_dev->eqresp[eqresp_ci]);
m = eth_fd_to_mbuf(fd);
/* Setting port id does not matter as we are to free the mbuf */
m = eth_fd_to_mbuf(fd, 0);
rte_pktmbuf_free(m); rte_pktmbuf_free(m);
} }