The jumbo buffer is allocated inside the WQE loop, so a device without
IOVA retries it on every WQE and logs an error each time. The fallback
also hands XSC_MAX_RECV_LEN bytes to a segment that points into an
mbuf, which is a DMA overrun.

Allocate it once before the loop and fail the queue start on error.
It is never freed on close either, so free it in xsc_dev_uninit().

Fixes: 0ff4b93c318f ("net/xsc: support device start")
Cc: [email protected]
Reported-by: Stephen Hemminger <[email protected]>
Signed-off-by: Renyong Wan <[email protected]>
---
 drivers/net/xsc/xsc_dev.c |  1 +
 drivers/net/xsc/xsc_rx.c  | 47 ++++++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c
index 478f4895..6bd12510 100644
--- a/drivers/net/xsc/xsc_dev.c
+++ b/drivers/net/xsc/xsc_dev.c
@@ -345,6 +345,7 @@ xsc_dev_uninit(struct xsc_dev *xdev)
        PMD_INIT_FUNC_TRACE();
        xsc_dev_pct_uninit(xdev);
        xsc_dev_close(xdev, XSC_DEV_REPR_ID_INVALID);
+       rte_free(xdev->jumbo_buffer_pa);
        rte_free(xdev);
 }
 
diff --git a/drivers/net/xsc/xsc_rx.c b/drivers/net/xsc/xsc_rx.c
index 13b2e269..5baeedf1 100644
--- a/drivers/net/xsc/xsc_rx.c
+++ b/drivers/net/xsc/xsc_rx.c
@@ -195,7 +195,7 @@ xsc_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, 
uint16_t pkts_n)
        return nb_pkts;
 }
 
-static void
+static int
 xsc_rxq_initialize(struct xsc_dev *xdev, struct xsc_rxq_data *rxq_data)
 {
        const uint32_t wqe_n = rxq_data->wqe_s;
@@ -211,6 +211,24 @@ xsc_rxq_initialize(struct xsc_dev *xdev, struct 
xsc_rxq_data *rxq_data)
        volatile struct xsc_wqe_data_seg *seg;
        volatile struct xsc_wqe_data_seg *seg_next;
 
+       if ((rx_ds_num != 1) && (jumbo_buffer_va == NULL)) {
+               jumbo_buffer_pa = rte_malloc(NULL, XSC_MAX_RECV_LEN, 0);
+               if (jumbo_buffer_pa == NULL) {
+                       PMD_DRV_LOG(ERR, "Failed to malloc jumbo_buffer");
+                       return -ENOMEM;
+               }
+
+               jumbo_buffer_va = (void *)rte_malloc_virt2iova(jumbo_buffer_pa);
+               if ((rte_iova_t)jumbo_buffer_va == RTE_BAD_IOVA) {
+                       PMD_DRV_LOG(ERR, "Failed to get IOVA of jumbo_buffer");
+                       rte_free(jumbo_buffer_pa);
+                       return -EFAULT;
+               }
+
+               xdev->jumbo_buffer_pa = jumbo_buffer_pa;
+               xdev->jumbo_buffer_va = jumbo_buffer_va;
+       }
+
        for (i = 0; (i != wqe_n); ++i) {
                mbuf = (*rxq_data->elts)[i];
                seg = &((volatile struct xsc_wqe_data_seg *)rxq_data->wqes)[i * 
rx_ds_num];
@@ -227,25 +245,6 @@ xsc_rxq_initialize(struct xsc_dev *xdev, struct 
xsc_rxq_data *rxq_data)
 
                if (rx_ds_num != 1) {
                        seg_next = seg + 1;
-                       if (jumbo_buffer_va == NULL) {
-                               jumbo_buffer_pa = rte_malloc(NULL, 
XSC_MAX_RECV_LEN, 0);
-                               if (jumbo_buffer_pa == NULL) {
-                                       /* Rely on mtu */
-                                       seg->seg_len = XSC_MAX_RECV_LEN;
-                                       PMD_DRV_LOG(ERR, "Failed to malloc 
jumbo_buffer");
-                                       continue;
-                               } else {
-                                       jumbo_buffer_va =
-                                               (void 
*)rte_malloc_virt2iova(jumbo_buffer_pa);
-                                       if ((rte_iova_t)jumbo_buffer_va == 
RTE_BAD_IOVA) {
-                                               seg->seg_len = XSC_MAX_RECV_LEN;
-                                               PMD_DRV_LOG(ERR, "Failed to 
turn jumbo_buffer");
-                                               continue;
-                                       }
-                               }
-                               xdev->jumbo_buffer_pa = jumbo_buffer_pa;
-                               xdev->jumbo_buffer_va = jumbo_buffer_va;
-                       }
                        *seg_next = (struct xsc_wqe_data_seg){
                                .va = 
rte_cpu_to_le_64((uint64_t)jumbo_buffer_va),
                                .seg_len = rte_cpu_to_le_32(XSC_MAX_RECV_LEN - 
seg_len),
@@ -264,6 +263,8 @@ xsc_rxq_initialize(struct xsc_dev *xdev, struct 
xsc_rxq_data *rxq_data)
        recv_db.next_pid = wqe_n << log2ds;
        recv_db.qp_num = rxq_data->qpn;
        rte_write32(rte_cpu_to_le_32(recv_db.recv_data), rxq_data->rq_db);
+
+       return 0;
 }
 
 static int
@@ -484,7 +485,11 @@ xsc_rss_qp_create(struct xsc_ethdev_priv *priv, int 
port_id)
 
                rxq_data->qpn = rqn_base + i;
                xsc_dev_modify_qp_status(xdev, rxq_data->qpn, 1, 
XSC_CMD_OP_RTR2RTS_QP);
-               xsc_rxq_initialize(xdev, rxq_data);
+               ret = xsc_rxq_initialize(xdev, rxq_data);
+               if (ret != 0) {
+                       rte_errno = -ret;
+                       goto set_qp_fail;
+               }
                rxq_data->cq_ci = 0;
                PMD_DRV_LOG(INFO, "Port %d create rx qp, wqe_s:%d, wqe_n:%d, 
qp_db=%p, qpn:%u",
                            port_id,

Reply via email to