Message ID | 20200507104645.31990-6-hemant.agrawal@nxp.com |
---|---|
State | Superseded |
Headers | show |
Series | NXP DPAAx fixes and enhancements | expand |
On 5/7/2020 11:46 AM, Hemant Agrawal wrote: > From: Nipun Gupta <nipun.gupta@nxp.com> > > The change adds printing the thread id when portal allocation > failure occurs Not just adds the tid, also changes the log itself. > > Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> > --- > drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 ++++++-- > drivers/event/dpaa2/dpaa2_eventdev.c | 8 ++++++-- > drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 12 +++++++++--- > drivers/net/dpaa2/dpaa2_ethdev.c | 4 +++- > drivers/net/dpaa2/dpaa2_rxtx.c | 16 ++++++++++++---- > drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 8 ++++++-- > drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 12 +++++++++--- > 7 files changed, 51 insertions(+), 17 deletions(-) > > diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c > index 0919f3bf47..256a9a1955 100644 > --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c > +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c > @@ -1459,7 +1459,9 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, > if (!DPAA2_PER_LCORE_DPIO) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_SEC_ERR("Failure in affining portal"); > + DPAA2_SEC_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -1641,7 +1643,9 @@ dpaa2_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops, > if (!DPAA2_PER_LCORE_DPIO) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_SEC_ERR("Failure in affining portal"); > + DPAA2_SEC_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c > index 2be6e12f66..a196ad4c64 100644 > --- a/drivers/event/dpaa2/dpaa2_eventdev.c > +++ b/drivers/event/dpaa2/dpaa2_eventdev.c > @@ -74,7 +74,9 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], > /* Affine current thread context to a qman portal */ > ret = dpaa2_affine_qbman_swp(); > if (ret < 0) { > - DPAA2_EVENTDEV_ERR("Failure in affining portal"); > + DPAA2_EVENTDEV_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -273,7 +275,9 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[], > /* Affine current thread context to a qman portal */ > ret = dpaa2_affine_qbman_swp(); > if (ret < 0) { > - DPAA2_EVENTDEV_ERR("Failure in affining portal"); > + DPAA2_EVENTDEV_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c > index 48887beb7e..fa9b53e64d 100644 > --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c > +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c > @@ -69,7 +69,9 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp) > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_MEMPOOL_ERR("Failure in affining portal"); > + DPAA2_MEMPOOL_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > goto err1; > } > } > @@ -198,7 +200,9 @@ rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused, > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret != 0) { > - DPAA2_MEMPOOL_ERR("Failed to allocate IO portal"); > + DPAA2_MEMPOOL_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return; > } > } > @@ -317,7 +321,9 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret != 0) { > - DPAA2_MEMPOOL_ERR("Failed to allocate IO portal"); > + DPAA2_MEMPOOL_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return ret; > } > } > diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c > index b70a2ac01c..817e9e0316 100644 > --- a/drivers/net/dpaa2/dpaa2_ethdev.c > +++ b/drivers/net/dpaa2/dpaa2_ethdev.c > @@ -903,7 +903,9 @@ dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_PMD_ERR("Failure in affining portal"); > + DPAA2_PMD_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return -EINVAL; > } > } > diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c > index 89a8221cb8..630f8c73c7 100644 > --- a/drivers/net/dpaa2/dpaa2_rxtx.c > +++ b/drivers/net/dpaa2/dpaa2_rxtx.c > @@ -762,7 +762,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_PMD_ERR("Failure in affining portal\n"); > + DPAA2_PMD_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -882,7 +884,9 @@ uint16_t dpaa2_dev_tx_conf(void *queue) > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_PMD_ERR("Failure in affining portal\n"); > + DPAA2_PMD_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -1021,7 +1025,9 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_PMD_ERR("Failure in affining portal"); > + DPAA2_PMD_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -1282,7 +1288,9 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_PMD_ERR("Failure in affining portal"); > + DPAA2_PMD_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c > index 997d1c8739..7c21c6a528 100644 > --- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c > +++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c > @@ -70,7 +70,9 @@ dpaa2_cmdif_enqueue_bufs(struct rte_rawdev *dev, > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_CMDIF_ERR("Failure in affining portal\n"); > + DPAA2_CMDIF_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -133,7 +135,9 @@ dpaa2_cmdif_dequeue_bufs(struct rte_rawdev *dev, > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_CMDIF_ERR("Failure in affining portal\n"); > + DPAA2_CMDIF_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c > index c905954004..d5202d6522 100644 > --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c > +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c > @@ -666,7 +666,9 @@ dpdmai_dev_enqueue_multi(struct dpaa2_dpdmai_dev *dpdmai_dev, > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_QDMA_ERR("Failure in affining portal"); > + DPAA2_QDMA_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -788,7 +790,9 @@ dpdmai_dev_dequeue_multijob_prefetch( > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_QDMA_ERR("Failure in affining portal"); > + DPAA2_QDMA_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } > @@ -929,7 +933,9 @@ dpdmai_dev_dequeue_multijob_no_prefetch( > if (unlikely(!DPAA2_PER_LCORE_DPIO)) { > ret = dpaa2_affine_qbman_swp(); > if (ret) { > - DPAA2_QDMA_ERR("Failure in affining portal"); > + DPAA2_QDMA_ERR( > + "Failed to allocate IO portal, tid: %d\n", > + rte_gettid()); > return 0; > } > } >
diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 0919f3bf47..256a9a1955 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1459,7 +1459,9 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, if (!DPAA2_PER_LCORE_DPIO) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_SEC_ERR("Failure in affining portal"); + DPAA2_SEC_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -1641,7 +1643,9 @@ dpaa2_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops, if (!DPAA2_PER_LCORE_DPIO) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_SEC_ERR("Failure in affining portal"); + DPAA2_SEC_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index 2be6e12f66..a196ad4c64 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -74,7 +74,9 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], /* Affine current thread context to a qman portal */ ret = dpaa2_affine_qbman_swp(); if (ret < 0) { - DPAA2_EVENTDEV_ERR("Failure in affining portal"); + DPAA2_EVENTDEV_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -273,7 +275,9 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[], /* Affine current thread context to a qman portal */ ret = dpaa2_affine_qbman_swp(); if (ret < 0) { - DPAA2_EVENTDEV_ERR("Failure in affining portal"); + DPAA2_EVENTDEV_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index 48887beb7e..fa9b53e64d 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -69,7 +69,9 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_MEMPOOL_ERR("Failure in affining portal"); + DPAA2_MEMPOOL_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); goto err1; } } @@ -198,7 +200,9 @@ rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused, if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret != 0) { - DPAA2_MEMPOOL_ERR("Failed to allocate IO portal"); + DPAA2_MEMPOOL_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return; } } @@ -317,7 +321,9 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret != 0) { - DPAA2_MEMPOOL_ERR("Failed to allocate IO portal"); + DPAA2_MEMPOOL_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return ret; } } diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index b70a2ac01c..817e9e0316 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -903,7 +903,9 @@ dpaa2_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_PMD_ERR("Failure in affining portal"); + DPAA2_PMD_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return -EINVAL; } } diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 89a8221cb8..630f8c73c7 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -762,7 +762,9 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_PMD_ERR("Failure in affining portal\n"); + DPAA2_PMD_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -882,7 +884,9 @@ uint16_t dpaa2_dev_tx_conf(void *queue) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_PMD_ERR("Failure in affining portal\n"); + DPAA2_PMD_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -1021,7 +1025,9 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_PMD_ERR("Failure in affining portal"); + DPAA2_PMD_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -1282,7 +1288,9 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_PMD_ERR("Failure in affining portal"); + DPAA2_PMD_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c index 997d1c8739..7c21c6a528 100644 --- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c +++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c @@ -70,7 +70,9 @@ dpaa2_cmdif_enqueue_bufs(struct rte_rawdev *dev, if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_CMDIF_ERR("Failure in affining portal\n"); + DPAA2_CMDIF_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -133,7 +135,9 @@ dpaa2_cmdif_dequeue_bufs(struct rte_rawdev *dev, if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_CMDIF_ERR("Failure in affining portal\n"); + DPAA2_CMDIF_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c index c905954004..d5202d6522 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c @@ -666,7 +666,9 @@ dpdmai_dev_enqueue_multi(struct dpaa2_dpdmai_dev *dpdmai_dev, if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_QDMA_ERR("Failure in affining portal"); + DPAA2_QDMA_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -788,7 +790,9 @@ dpdmai_dev_dequeue_multijob_prefetch( if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_QDMA_ERR("Failure in affining portal"); + DPAA2_QDMA_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } } @@ -929,7 +933,9 @@ dpdmai_dev_dequeue_multijob_no_prefetch( if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_QDMA_ERR("Failure in affining portal"); + DPAA2_QDMA_ERR( + "Failed to allocate IO portal, tid: %d\n", + rte_gettid()); return 0; } }