The names are the other way round: jumbo_buffer_pa holds the virtual address and jumbo_buffer_va holds the IOVA, which is why the bug went unnoticed.
Rename them to jumbo_buf and jumbo_iova with matching types, which also removes the casts. Suggested-by: Stephen Hemminger <[email protected]> Signed-off-by: Renyong Wan <[email protected]> --- drivers/net/xsc/xsc_dev.c | 2 +- drivers/net/xsc/xsc_dev.h | 4 ++-- drivers/net/xsc/xsc_rx.c | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/xsc/xsc_dev.c b/drivers/net/xsc/xsc_dev.c index ae0dca16..c666a47e 100644 --- a/drivers/net/xsc/xsc_dev.c +++ b/drivers/net/xsc/xsc_dev.c @@ -345,7 +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->jumbo_buf); rte_free(xdev); } diff --git a/drivers/net/xsc/xsc_dev.h b/drivers/net/xsc/xsc_dev.h index d4a7d90b..3473333c 100644 --- a/drivers/net/xsc/xsc_dev.h +++ b/drivers/net/xsc/xsc_dev.h @@ -189,8 +189,8 @@ struct xsc_dev { void *dev_priv; char name[PCI_PRI_STR_SIZE]; void *bar_addr; - void *jumbo_buffer_pa; - void *jumbo_buffer_va; + void *jumbo_buf; + rte_iova_t jumbo_iova; uint64_t bar_len; int ctrl_fd; rte_intr_callback_fn intr_cb; diff --git a/drivers/net/xsc/xsc_rx.c b/drivers/net/xsc/xsc_rx.c index 5baeedf1..3435ff67 100644 --- a/drivers/net/xsc/xsc_rx.c +++ b/drivers/net/xsc/xsc_rx.c @@ -206,27 +206,27 @@ xsc_rxq_initialize(struct xsc_dev *xdev, struct xsc_rxq_data *rxq_data) uint32_t log2ds = rte_log2_u32(rx_ds_num); uintptr_t addr; struct rte_mbuf *mbuf; - void *jumbo_buffer_pa = xdev->jumbo_buffer_pa; - void *jumbo_buffer_va = xdev->jumbo_buffer_va; + void *jumbo_buf = xdev->jumbo_buf; + rte_iova_t jumbo_iova = xdev->jumbo_iova; 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) { + if ((rx_ds_num != 1) && (jumbo_buf == NULL)) { + jumbo_buf = rte_malloc(NULL, XSC_MAX_RECV_LEN, 0); + if (jumbo_buf == 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) { + jumbo_iova = rte_malloc_virt2iova(jumbo_buf); + if (jumbo_iova == RTE_BAD_IOVA) { PMD_DRV_LOG(ERR, "Failed to get IOVA of jumbo_buffer"); - rte_free(jumbo_buffer_pa); + rte_free(jumbo_buf); return -EFAULT; } - xdev->jumbo_buffer_pa = jumbo_buffer_pa; - xdev->jumbo_buffer_va = jumbo_buffer_va; + xdev->jumbo_buf = jumbo_buf; + xdev->jumbo_iova = jumbo_iova; } for (i = 0; (i != wqe_n); ++i) { @@ -246,7 +246,7 @@ xsc_rxq_initialize(struct xsc_dev *xdev, struct xsc_rxq_data *rxq_data) if (rx_ds_num != 1) { seg_next = seg + 1; *seg_next = (struct xsc_wqe_data_seg){ - .va = rte_cpu_to_le_64((uint64_t)jumbo_buffer_va), + .va = rte_cpu_to_le_64(jumbo_iova), .seg_len = rte_cpu_to_le_32(XSC_MAX_RECV_LEN - seg_len), .lkey = 0, };

