Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/105918 _apply patch failure_ Submitter: Date: Monday, January 17 2022 11:29:06 Applied on: CommitID:6f716880ee53ac1e50c9c75dc749886e3257bb8f Apply patch set 105918 failed: Checking patch drivers/vdpa/sfc/sfc_vdpa_hw.c... error: while searching for: { uint64_t mcdi_iova; size_t mcdi_buff_size; const struct rte_memzone *mz = NULL; int numa_node = sva->pdev->device.numa_node; int ret; mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE); sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len); mz = rte_memzone_reserve_aligned(name, mcdi_buff_size, numa_node, RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE); if (mz == NULL) { sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s", name, (unsigned int)len, rte_strerror(rte_errno)); return -ENOMEM; } error: patch failed: drivers/vdpa/sfc/sfc_vdpa_hw.c:25 Applying patch drivers/vdpa/sfc/sfc_vdpa_hw.c with 1 reject... Rejected hunk #1. diff a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c (rejected hunks) @@ -25,21 +25,30 @@ { uint64_t mcdi_iova; size_t mcdi_buff_size; + char mz_name[RTE_MEMZONE_NAMESIZE]; const struct rte_memzone *mz = NULL; int numa_node = sva->pdev->device.numa_node; int ret; mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE); + ret = snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "%s_%s", + sva->pdev->name, name); + if (ret < 0 || ret >= RTE_MEMZONE_NAMESIZE) { + sfc_vdpa_err(sva, "%s_%s too long to fit in mz_name", + sva->pdev->name, name); + return -EINVAL; + } - sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len); + sfc_vdpa_log_init(sva, "name=%s, len=%zu", mz_name, len); - mz = rte_memzone_reserve_aligned(name, mcdi_buff_size, + mz = rte_memzone_reserve_aligned(mz_name, mcdi_buff_size, numa_node, RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE); if (mz == NULL) { sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s", - name, (unsigned int)len, rte_strerror(rte_errno)); + mz_name, (unsigned int)len, + rte_strerror(rte_errno)); return -ENOMEM; } https://lab.dpdk.org/results/dashboard/patchsets/20686/ UNH-IOL DPDK Community Lab