Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102694 _apply patch failure_ Submitter: Harman Kalra Date: Friday, October 22 2021 20:49:34 Applied on: CommitID:3ac2dffae88e8eb5c374b1fdd40d605014526510 Apply patch set 102694-102698 failed: Checking patch drivers/baseband/acc100/rte_acc100_pmd.c... Checking patch drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c... Checking patch drivers/baseband/fpga_lte_fec/fpga_lte_fec.c... Checking patch drivers/bus/auxiliary/auxiliary_common.c... Checking patch drivers/bus/auxiliary/linux/auxiliary.c... Checking patch drivers/bus/auxiliary/rte_bus_auxiliary.h... Checking patch drivers/bus/dpaa/dpaa_bus.c... Checking patch drivers/bus/dpaa/rte_dpaa_bus.h... Checking patch drivers/bus/fslmc/fslmc_bus.c... Checking patch drivers/bus/fslmc/fslmc_vfio.c... Checking patch drivers/bus/fslmc/portal/dpaa2_hw_dpio.c... Checking patch drivers/bus/fslmc/portal/dpaa2_hw_pvt.h... Checking patch drivers/bus/fslmc/rte_fslmc.h... Checking patch drivers/bus/ifpga/ifpga_bus.c... Checking patch drivers/bus/ifpga/rte_bus_ifpga.h... Checking patch drivers/bus/pci/bsd/pci.c... Checking patch drivers/bus/pci/linux/pci.c... Checking patch drivers/bus/pci/linux/pci_uio.c... Checking patch drivers/bus/pci/linux/pci_vfio.c... Checking patch drivers/bus/pci/pci_common.c... Checking patch drivers/bus/pci/pci_common_uio.c... Checking patch drivers/bus/pci/rte_bus_pci.h... Checking patch drivers/bus/vmbus/linux/vmbus_bus.c... Checking patch drivers/bus/vmbus/linux/vmbus_uio.c... Checking patch drivers/bus/vmbus/rte_bus_vmbus.h... Checking patch drivers/bus/vmbus/vmbus_common_uio.c... Checking patch drivers/common/cnxk/roc_cpt.c... Checking patch drivers/common/cnxk/roc_dev.c... Checking patch drivers/common/cnxk/roc_irq.c... Checking patch drivers/common/cnxk/roc_nix_inl_dev_irq.c... Checking patch drivers/common/cnxk/roc_nix_irq.c... Checking patch drivers/common/cnxk/roc_npa.c... Checking patch drivers/common/cnxk/roc_platform.h... Hunk #1 succeeded at 103 (offset -3 lines). Hunk #2 succeeded at 192 (offset -18 lines). Hunk #3 succeeded at 212 (offset -18 lines). Checking patch drivers/common/cnxk/roc_sso.c... Checking patch drivers/common/cnxk/roc_tim.c... Checking patch drivers/common/octeontx2/otx2_dev.c... Checking patch drivers/common/octeontx2/otx2_irq.c... Checking patch drivers/crypto/octeontx2/otx2_cryptodev_hw_access.c... Checking patch drivers/event/octeontx2/otx2_evdev_irq.c... Checking patch drivers/mempool/octeontx2/otx2_mempool.c... Checking patch drivers/net/atlantic/atl_ethdev.c... Hunk #1 succeeded at 360 (offset 1 line). Hunk #2 succeeded at 479 (offset 1 line). Hunk #3 succeeded at 525 (offset 1 line). Hunk #4 succeeded at 607 (offset 1 line). Hunk #5 succeeded at 637 (offset 1 line). Hunk #6 succeeded at 688 (offset 1 line). Checking patch drivers/net/avp/avp_ethdev.c... Checking patch drivers/net/axgbe/axgbe_ethdev.c... Hunk #3 succeeded at 404 (offset -2 lines). Hunk #4 succeeded at 2323 (offset 12 lines). Hunk #5 succeeded at 2347 (offset 12 lines). Checking patch drivers/net/axgbe/axgbe_mdio.c... Checking patch drivers/net/bnx2x/bnx2x_ethdev.c... Hunk #2 succeeded at 234 (offset 4 lines). Hunk #3 succeeded at 262 (offset 4 lines). Checking patch drivers/net/bnxt/bnxt_ethdev.c... Hunk #1 succeeded at 735 (offset 6 lines). Hunk #2 succeeded at 847 (offset 1 line). Hunk #3 succeeded at 1477 (offset 6 lines). Hunk #4 succeeded at 1519 (offset 6 lines). Checking patch drivers/net/bnxt/bnxt_irq.c... Checking patch drivers/net/dpaa/dpaa_ethdev.c... Hunk #1 succeeded at 219 (offset 11 lines). Hunk #2 succeeded at 276 (offset 21 lines). Hunk #3 succeeded at 390 (offset 21 lines). Hunk #4 succeeded at 463 (offset 21 lines). Hunk #5 succeeded at 472 (offset 21 lines). Hunk #6 succeeded at 1103 (offset 23 lines). Checking patch drivers/net/dpaa2/dpaa2_ethdev.c... Hunk #1 succeeded at 1153 (offset 8 lines). Hunk #2 succeeded at 1224 (offset 8 lines). Hunk #3 succeeded at 1264 (offset 8 lines). Checking patch drivers/net/e1000/em_ethdev.c... Hunk #2 succeeded at 525 (offset 2 lines). Hunk #3 succeeded at 575 (offset 2 lines). Hunk #4 succeeded at 716 (offset 2 lines). Hunk #5 succeeded at 750 (offset 2 lines). Hunk #6 succeeded at 762 (offset 2 lines). Hunk #7 succeeded at 1003 (offset 2 lines). Checking patch drivers/net/e1000/igb_ethdev.c... Hunk #3 succeeded at 853 (offset 2 lines). Hunk #4 succeeded at 996 (offset 4 lines). Hunk #5 succeeded at 1200 (offset 4 lines). Hunk #6 succeeded at 1259 (offset 4 lines). Hunk #7 succeeded at 1421 (offset 4 lines). Hunk #8 succeeded at 1465 (offset 4 lines). Hunk #9 succeeded at 1505 (offset 4 lines). Hunk #10 succeeded at 1531 (offset 4 lines). Hunk #11 succeeded at 2773 (offset 8 lines). Hunk #12 succeeded at 3290 (offset 8 lines). Hunk #13 succeeded at 3321 (offset 8 lines). Hunk #14 succeeded at 3346 (offset 8 lines). Hunk #15 succeeded at 3370 (offset 8 lines). Hunk #16 succeeded at 3410 (offset 8 lines). Hunk #17 succeeded at 5132 (offset 28 lines). Hunk #18 succeeded at 5152 (offset 28 lines). Hunk #19 succeeded at 5230 (offset 28 lines). Hunk #20 succeeded at 5271 (offset 28 lines). Hunk #21 succeeded at 5291 (offset 28 lines). Hunk #22 succeeded at 5302 (offset 28 lines). Checking patch drivers/net/ena/ena_ethdev.c... Hunk #1 succeeded at 473 (offset -22 lines). Hunk #2 succeeded at 945 (offset -10 lines). Hunk #3 succeeded at 967 (offset -10 lines). Hunk #4 succeeded at 985 (offset -10 lines). Hunk #5 succeeded at 1005 (offset -10 lines). Hunk #6 succeeded at 1665 (offset -162 lines). Hunk #7 succeeded at 2817 (offset -298 lines). Hunk #8 succeeded at 2844 (offset -298 lines). Hunk #9 succeeded at 2865 (offset -298 lines). Hunk #10 succeeded at 2875 (offset -298 lines). Checking patch drivers/net/enic/enic_main.c... Hunk #5 succeeded at 1112 (offset 1 line). Checking patch drivers/net/failsafe/failsafe.c... Checking patch drivers/net/failsafe/failsafe_intr.c... Checking patch drivers/net/failsafe/failsafe_ops.c... Checking patch drivers/net/failsafe/failsafe_private.h... Checking patch drivers/net/fm10k/fm10k_ethdev.c... Hunk #5 succeeded at 2368 (offset 1 line). Hunk #6 succeeded at 2393 (offset 1 line). Hunk #7 succeeded at 2421 (offset 1 line). Hunk #8 succeeded at 2790 (offset 1 line). Hunk #9 succeeded at 3056 (offset 1 line). Checking patch drivers/net/hinic/hinic_pmd_ethdev.c... Hunk #1 succeeded at 1229 (offset 1 line). Hunk #2 succeeded at 3136 (offset 18 lines). Hunk #3 succeeded at 3146 (offset 18 lines). Hunk #4 succeeded at 3176 (offset 18 lines). Checking patch drivers/net/hns3/hns3_ethdev.c... Hunk #1 succeeded at 5269 (offset 45 lines). Hunk #2 succeeded at 5282 (offset 45 lines). Hunk #3 succeeded at 5341 (offset 45 lines). Hunk #4 succeeded at 5375 (offset 45 lines). Hunk #5 succeeded at 5710 (offset 45 lines). Hunk #6 succeeded at 5733 (offset 45 lines). Hunk #7 succeeded at 5752 (offset 45 lines). Hunk #8 succeeded at 5777 (offset 45 lines). Hunk #9 succeeded at 5787 (offset 45 lines). Hunk #10 succeeded at 5932 (offset 45 lines). Hunk #11 succeeded at 5952 (offset 45 lines). Checking patch drivers/net/hns3/hns3_ethdev_vf.c... Hunk #1 succeeded at 1985 (offset 29 lines). Hunk #2 succeeded at 1993 (offset 29 lines). Hunk #3 succeeded at 2045 (offset 29 lines). Hunk #4 succeeded at 2074 (offset 29 lines). Hunk #5 succeeded at 2118 (offset 29 lines). Hunk #6 succeeded at 2136 (offset 29 lines). Hunk #7 succeeded at 2301 (offset 29 lines). Hunk #8 succeeded at 2324 (offset 29 lines). error: while searching for: HNS3_RING_TYPE_RX, q_id); if (ret) goto vf_bind_vector_error; intr_handle->intr_vec[q_id] = vec; /* * If there are not enough efds (e.g. not enough interrupt), * remaining queues will be bond to the last interrupt. */ if (vec < base + intr_handle->nb_efd - 1) vec++; } rte_intr_enable(intr_handle); return 0; vf_bind_vector_error: rte_free(intr_handle->intr_vec); intr_handle->intr_vec = NULL; vf_alloc_intr_vec_error: rte_intr_efd_disable(intr_handle); return ret; error: patch failed: drivers/net/hns3/hns3_ethdev_vf.c:2317 Hunk #10 succeeded at 2367 (offset 27 lines). Hunk #11 succeeded at 2377 (offset 27 lines). Hunk #12 succeeded at 2843 (offset 27 lines). Hunk #13 succeeded at 2869 (offset 27 lines). Checking patch drivers/net/hns3/hns3_rxtx.c... Checking patch drivers/net/i40e/i40e_ethdev.c... error: while searching for: } i40e_set_default_ptype_table(dev); pci_dev = RTE_ETH_DEV_TO_PCI(dev); intr_handle = &pci_dev->intr_handle; rte_eth_copy_pci_info(dev, pci_dev); error: patch failed: drivers/net/i40e/i40e_ethdev.c:1440 Hunk #13 succeeded at 11054 (offset -13 lines). Hunk #14 succeeded at 11073 (offset -13 lines). Hunk #15 succeeded at 11082 (offset -13 lines). Checking patch drivers/net/iavf/iavf_ethdev.c... Hunk #1 succeeded at 660 (offset -1 lines). Hunk #2 succeeded at 729 (offset -1 lines). Hunk #3 succeeded at 740 (offset -1 lines). Hunk #4 succeeded at 791 (offset -1 lines). Hunk #5 succeeded at 927 (offset -1 lines). Hunk #6 succeeded at 1667 (offset 15 lines). Hunk #7 succeeded at 1687 (offset 15 lines). Hunk #8 succeeded at 1699 (offset 15 lines). Hunk #9 succeeded at 2384 (offset 14 lines). Hunk #10 succeeded at 2423 (offset 14 lines). Checking patch drivers/net/iavf/iavf_vchnl.c... Checking patch drivers/net/ice/ice_dcf.c... Checking patch drivers/net/ice/ice_dcf_ethdev.c... Hunk #1 succeeded at 160 (offset 1 line). Hunk #2 succeeded at 212 (offset 1 line). Hunk #3 succeeded at 223 (offset 1 line). Hunk #4 succeeded at 634 (offset 3 lines). Checking patch drivers/net/ice/ice_ethdev.c... Hunk #1 succeeded at 2171 (offset -7 lines). Hunk #2 succeeded at 2368 (offset -7 lines). Hunk #3 succeeded at 2398 (offset -7 lines). Hunk #4 succeeded at 2423 (offset -7 lines). Hunk #5 succeeded at 2437 (offset -7 lines). Hunk #6 succeeded at 3335 (offset -7 lines). Hunk #7 succeeded at 3367 (offset -7 lines). Hunk #8 succeeded at 3378 (offset -7 lines). Hunk #9 succeeded at 3392 (offset -7 lines). Hunk #10 succeeded at 3418 (offset -7 lines). Hunk #11 succeeded at 3438 (offset -7 lines). Hunk #12 succeeded at 4765 (offset 11 lines). Hunk #13 succeeded at 4786 (offset 11 lines). Checking patch drivers/net/igc/igc_ethdev.c... Hunk #1 succeeded at 384 (offset 7 lines). Hunk #2 succeeded at 404 (offset 7 lines). Hunk #3 succeeded at 616 (offset 7 lines). Hunk #4 succeeded at 668 (offset 7 lines). Hunk #5 succeeded at 728 (offset 7 lines). Hunk #6 succeeded at 752 (offset 7 lines). Hunk #7 succeeded at 770 (offset 7 lines). Hunk #8 succeeded at 807 (offset 7 lines). Hunk #9 succeeded at 816 (offset 7 lines). Hunk #10 succeeded at 911 (offset 7 lines). Hunk #11 succeeded at 949 (offset 7 lines). Hunk #12 succeeded at 1166 (offset 7 lines). Hunk #13 succeeded at 1336 (offset 8 lines). Hunk #14 succeeded at 2097 (offset 24 lines). Hunk #15 succeeded at 2116 (offset 24 lines). Checking patch drivers/net/ionic/ionic_ethdev.c... Hunk #1 succeeded at 1071 (offset 11 lines). Hunk #2 succeeded at 1085 (offset 11 lines). Hunk #3 succeeded at 1117 (offset 11 lines). Checking patch drivers/net/ixgbe/ixgbe_ethdev.c... Hunk #2 succeeded at 1526 (offset 1 line). Hunk #3 succeeded at 2542 (offset 2 lines). Hunk #4 succeeded at 2597 (offset 2 lines). Hunk #5 succeeded at 2835 (offset 2 lines). Hunk #6 succeeded at 2886 (offset 2 lines). Hunk #7 succeeded at 2970 (offset 2 lines). Hunk #8 succeeded at 4616 (offset 2 lines). Hunk #9 succeeded at 5297 (offset 11 lines). Hunk #10 succeeded at 5360 (offset 11 lines). Hunk #11 succeeded at 5402 (offset 11 lines). Hunk #12 succeeded at 5430 (offset 11 lines). Hunk #13 succeeded at 5442 (offset 11 lines). Hunk #14 succeeded at 5740 (offset 11 lines). Hunk #15 succeeded at 5766 (offset 11 lines). Hunk #16 succeeded at 5782 (offset 11 lines). Hunk #17 succeeded at 5909 (offset 11 lines). Hunk #18 succeeded at 5936 (offset 11 lines). Hunk #19 succeeded at 5960 (offset 11 lines). Hunk #20 succeeded at 6004 (offset 11 lines). Checking patch drivers/net/memif/memif_socket.c... Checking patch drivers/net/memif/memif_socket.h... Checking patch drivers/net/memif/rte_eth_memif.c... Checking patch drivers/net/memif/rte_eth_memif.h... Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4.h... Checking patch drivers/net/mlx4/mlx4_intr.c... Checking patch drivers/net/mlx5/linux/mlx5_os.c... Hunk #1 succeeded at 2586 (offset 83 lines). Hunk #2 succeeded at 2752 (offset 83 lines). error: while searching for: int flags; struct ibv_context *ctx = sh->cdev->ctx; sh->intr_handle.fd = -1; flags = fcntl(ctx->async_fd, F_GETFL); ret = fcntl(ctx->async_fd, F_SETFL, flags | O_NONBLOCK); if (ret) { DRV_LOG(INFO, "failed to change file descriptor async event" " queue"); } else { sh->intr_handle.fd = ctx->async_fd; sh->intr_handle.type = RTE_INTR_HANDLE_EXT; if (rte_intr_callback_register(&sh->intr_handle, mlx5_dev_interrupt_handler, sh)) { DRV_LOG(INFO, "Fail to install the shared interrupt."); sh->intr_handle.fd = -1; } } if (sh->devx) { #ifdef HAVE_IBV_DEVX_ASYNC sh->intr_handle_devx.fd = -1; sh->devx_comp = (void *)mlx5_glue->devx_create_cmd_comp(ctx); struct mlx5dv_devx_cmd_comp *devx_comp = sh->devx_comp; if (!devx_comp) { error: patch failed: drivers/net/mlx5/linux/mlx5_os.c:2725 Hunk #4 succeeded at 2969 (offset 199 lines). Hunk #5 succeeded at 2993 (offset 199 lines). Checking patch drivers/net/mlx5/linux/mlx5_socket.c... Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 1025 (offset 29 lines). error: while searching for: struct mlx5_indexed_pool *ipool[MLX5_IPOOL_MAX]; struct mlx5_indexed_pool *mdh_ipools[MLX5_MAX_MODIFY_NUM]; /* Shared interrupt handler section. */ struct rte_intr_handle intr_handle; /* Interrupt handler for device. */ struct rte_intr_handle intr_handle_devx; /* DEVX interrupt handler. */ void *devx_comp; /* DEVX async comp obj. */ struct mlx5_devx_obj *tis; /* TIS object. */ struct mlx5_devx_obj *td; /* Transport domain. */ error: patch failed: drivers/net/mlx5/mlx5.h:1154 Checking patch drivers/net/mlx5/mlx5_rxq.c... Checking patch drivers/net/mlx5/mlx5_trigger.c... Checking patch drivers/net/mlx5/mlx5_txpp.c... Hunk #1 succeeded at 756 (offset -3 lines). Hunk #2 succeeded at 785 (offset -3 lines). Checking patch drivers/net/netvsc/hn_ethdev.c... Checking patch drivers/net/nfp/nfp_common.c... Hunk #3 succeeded at 808 (offset 4 lines). Hunk #4 succeeded at 829 (offset 4 lines). Hunk #5 succeeded at 880 (offset 4 lines). Checking patch drivers/net/nfp/nfp_ethdev.c... Checking patch drivers/net/nfp/nfp_ethdev_vf.c... Checking patch drivers/net/ngbe/ngbe_ethdev.c... Checking patch drivers/net/octeontx2/otx2_ethdev_irq.c... Checking patch drivers/net/qede/qede_ethdev.c... Hunk #1 succeeded at 1576 (offset 7 lines). Hunk #2 succeeded at 2581 (offset 27 lines). Checking patch drivers/net/sfc/sfc_intr.c... Checking patch drivers/net/tap/rte_eth_tap.c... Hunk #1 succeeded at 1668 (offset 5 lines). Hunk #2 succeeded at 1680 (offset 5 lines). Hunk #3 succeeded at 1709 (offset 5 lines). Hunk #4 succeeded at 1925 (offset 5 lines). Hunk #5 succeeded at 1950 (offset 5 lines). Hunk #6 succeeded at 2103 (offset 5 lines). Checking patch drivers/net/tap/rte_eth_tap.h... Checking patch drivers/net/tap/tap_intr.c... Checking patch drivers/net/thunderx/nicvf_ethdev.c... Hunk #1 succeeded at 1876 (offset 18 lines). Hunk #2 succeeded at 2178 (offset 18 lines). Checking patch drivers/net/thunderx/nicvf_struct.h... Checking patch drivers/net/txgbe/txgbe_ethdev.c... Hunk #1 succeeded at 547 (offset -1 lines). Hunk #2 succeeded at 1619 (offset -1 lines). Hunk #3 succeeded at 1680 (offset 10 lines). Hunk #4 succeeded at 1868 (offset 10 lines). Hunk #5 succeeded at 1918 (offset 10 lines). Hunk #6 succeeded at 1981 (offset 10 lines). error: while searching for: struct txgbe_hw *hw = TXGBE_DEV_HW(dev); struct txgbe_interrupt *intr = TXGBE_DEV_INTR(dev); if (intr_handle->type != RTE_INTR_HANDLE_UIO && intr_handle->type != RTE_INTR_HANDLE_VFIO_MSIX) wr32(hw, TXGBE_PX_INTA, 1); /* clear all cause mask */ error: patch failed: drivers/net/txgbe/txgbe_ethdev.c:2936 Hunk #8 succeeded at 3101 (offset 4 lines). Hunk #9 succeeded at 3634 (offset 17 lines). Hunk #10 succeeded at 3716 (offset 17 lines). Hunk #11 succeeded at 3750 (offset 17 lines). Checking patch drivers/net/txgbe/txgbe_ethdev_vf.c... Checking patch drivers/net/vhost/rte_eth_vhost.c... Checking patch drivers/net/virtio/virtio_ethdev.c... Hunk #2 succeeded at 1640 (offset 1 line). Hunk #3 succeeded at 1681 (offset 1 line). Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c... Checking patch drivers/net/vmxnet3/vmxnet3_ethdev.c... Hunk #1 succeeded at 620 (offset 1 line). Hunk #2 succeeded at 633 (offset 1 line). Hunk #3 succeeded at 641 (offset 1 line). Hunk #4 succeeded at 801 (offset 1 line). Hunk #5 succeeded at 826 (offset 1 line). Hunk #6 succeeded at 1025 (offset 1 line). Hunk #7 succeeded at 1671 (offset 1 line). Hunk #8 succeeded at 1683 (offset 1 line). Checking patch drivers/raw/ifpga/ifpga_rawdev.c... Checking patch drivers/raw/ntb/ntb.c... Checking patch drivers/regex/octeontx2/otx2_regexdev_hw_access.c... Checking patch drivers/vdpa/ifc/ifcvf_vdpa.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa.c... error: while searching for: DRV_LOG(ERR, "Failed to allocate VAR %u.", errno); goto error; } priv->vdev = rte_vdpa_register_device(cdev->dev, &mlx5_vdpa_ops); if (priv->vdev == NULL) { DRV_LOG(ERR, "Failed to register vDPA device."); error: patch failed: drivers/vdpa/mlx5/mlx5_vdpa.c:535 error: while searching for: if (priv) { if (priv->var) mlx5_glue->dv_free_var(priv->var); rte_free(priv); } return -rte_errno; error: patch failed: drivers/vdpa/mlx5/mlx5_vdpa.c:553 error: while searching for: if (priv->vdev) rte_vdpa_unregister_device(priv->vdev); pthread_mutex_destroy(&priv->vq_config_lock); rte_free(priv); } return 0; error: patch failed: drivers/vdpa/mlx5/mlx5_vdpa.c:584 Checking patch drivers/vdpa/mlx5/mlx5_vdpa.h... Hunk #2 succeeded at 139 (offset 2 lines). Checking patch drivers/vdpa/mlx5/mlx5_vdpa_event.c... Hunk #1 succeeded at 410 (offset -1 lines). Hunk #2 succeeded at 441 (offset -1 lines). Checking patch drivers/vdpa/mlx5/mlx5_vdpa_virtq.c... Hunk #4 succeeded at 517 (offset -1 lines). Checking patch lib/bbdev/rte_bbdev.c... Checking patch lib/eal/freebsd/eal_alarm.c... Checking patch lib/eal/include/rte_eal_trace.h... Checking patch lib/eal/linux/eal_alarm.c... Checking patch lib/eal/linux/eal_dev.c... Checking patch lib/ethdev/ethdev_pci.h... Checking patch lib/ethdev/rte_ethdev.c... Hunk #1 succeeded at 4696 (offset -86 lines). Hunk #2 succeeded at 4737 (offset -86 lines). Hunk #3 succeeded at 4923 (offset -86 lines). Applied patch drivers/baseband/acc100/rte_acc100_pmd.c cleanly. Applied patch drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c cleanly. Applied patch drivers/baseband/fpga_lte_fec/fpga_lte_fec.c cleanly. Applied patch drivers/bus/auxiliary/auxiliary_common.c cleanly. Applied patch drivers/bus/auxiliary/linux/auxiliary.c cleanly. Applied patch drivers/bus/auxiliary/rte_bus_auxiliary.h cleanly. Applied patch drivers/bus/dpaa/dpaa_bus.c cleanly. Applied patch drivers/bus/dpaa/rte_dpaa_bus.h cleanly. Applied patch drivers/bus/fslmc/fslmc_bus.c cleanly. Applied patch drivers/bus/fslmc/fslmc_vfio.c cleanly. Applied patch drivers/bus/fslmc/portal/dpaa2_hw_dpio.c cleanly. Applied patch drivers/bus/fslmc/portal/dpaa2_hw_pvt.h cleanly. Applied patch drivers/bus/fslmc/rte_fslmc.h cleanly. Applied patch drivers/bus/ifpga/ifpga_bus.c cleanly. Applied patch drivers/bus/ifpga/rte_bus_ifpga.h cleanly. Applied patch drivers/bus/pci/bsd/pci.c cleanly. Applied patch drivers/bus/pci/linux/pci.c cleanly. Applied patch drivers/bus/pci/linux/pci_uio.c cleanly. Applied patch drivers/bus/pci/linux/pci_vfio.c cleanly. Applied patch drivers/bus/pci/pci_common.c cleanly. Applied patch drivers/bus/pci/pci_common_uio.c cleanly. Applied patch drivers/bus/pci/rte_bus_pci.h cleanly. Applied patch drivers/bus/vmbus/linux/vmbus_bus.c cleanly. Applied patch drivers/bus/vmbus/linux/vmbus_uio.c cleanly. Applied patch drivers/bus/vmbus/rte_bus_vmbus.h cleanly. Applied patch drivers/bus/vmbus/vmbus_common_uio.c cleanly. Applied patch drivers/common/cnxk/roc_cpt.c cleanly. Applied patch drivers/common/cnxk/roc_dev.c cleanly. Applied patch drivers/common/cnxk/roc_irq.c cleanly. Applied patch drivers/common/cnxk/roc_nix_inl_dev_irq.c cleanly. Applied patch drivers/common/cnxk/roc_nix_irq.c cleanly. Applied patch drivers/common/cnxk/roc_npa.c cleanly. Applied patch drivers/common/cnxk/roc_platform.h cleanly. Applied patch drivers/common/cnxk/roc_sso.c cleanly. Applied patch drivers/common/cnxk/roc_tim.c cleanly. Applied patch drivers/common/octeontx2/otx2_dev.c cleanly. Applied patch drivers/common/octeontx2/otx2_irq.c cleanly. Applied patch drivers/crypto/octeontx2/otx2_cryptodev_hw_access.c cleanly. Applied patch drivers/event/octeontx2/otx2_evdev_irq.c cleanly. Applied patch drivers/mempool/octeontx2/otx2_mempool.c cleanly. Applied patch drivers/net/atlantic/atl_ethdev.c cleanly. Applied patch drivers/net/avp/avp_ethdev.c cleanly. Applied patch drivers/net/axgbe/axgbe_ethdev.c cleanly. Applied patch drivers/net/axgbe/axgbe_mdio.c cleanly. Applied patch drivers/net/bnx2x/bnx2x_ethdev.c cleanly. Applied patch drivers/net/bnxt/bnxt_ethdev.c cleanly. Applied patch drivers/net/bnxt/bnxt_irq.c cleanly. Applied patch drivers/net/dpaa/dpaa_ethdev.c cleanly. Applied patch drivers/net/dpaa2/dpaa2_ethdev.c cleanly. Applied patch drivers/net/e1000/em_ethdev.c cleanly. Applied patch drivers/net/e1000/igb_ethdev.c cleanly. Applied patch drivers/net/ena/ena_ethdev.c cleanly. Applied patch drivers/net/enic/enic_main.c cleanly. Applied patch drivers/net/failsafe/failsafe.c cleanly. Applied patch drivers/net/failsafe/failsafe_intr.c cleanly. Applied patch drivers/net/failsafe/failsafe_ops.c cleanly. Applied patch drivers/net/failsafe/failsafe_private.h cleanly. Applied patch drivers/net/fm10k/fm10k_ethdev.c cleanly. Applied patch drivers/net/hinic/hinic_pmd_ethdev.c cleanly. Applied patch drivers/net/hns3/hns3_ethdev.c cleanly. Applying patch drivers/net/hns3/hns3_ethdev_vf.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Rejected hunk #9. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Applied patch drivers/net/hns3/hns3_rxtx.c cleanly. Applying patch drivers/net/i40e/i40e_ethdev.c with 1 reject... Rejected hunk #1. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Hunk #14 applied cleanly. Hunk #15 applied cleanly. Applied patch drivers/net/iavf/iavf_ethdev.c cleanly. Applied patch drivers/net/iavf/iavf_vchnl.c cleanly. Applied patch drivers/net/ice/ice_dcf.c cleanly. Applied patch drivers/net/ice/ice_dcf_ethdev.c cleanly. Applied patch drivers/net/ice/ice_ethdev.c cleanly. Applied patch drivers/net/igc/igc_ethdev.c cleanly. Applied patch drivers/net/ionic/ionic_ethdev.c cleanly. Applied patch drivers/net/ixgbe/ixgbe_ethdev.c cleanly. Applied patch drivers/net/memif/memif_socket.c cleanly. Applied patch drivers/net/memif/memif_socket.h cleanly. Applied patch drivers/net/memif/rte_eth_memif.c cleanly. Applied patch drivers/net/memif/rte_eth_memif.h cleanly. Applied patch drivers/net/mlx4/mlx4.c cleanly. Applied patch drivers/net/mlx4/mlx4.h cleanly. Applied patch drivers/net/mlx4/mlx4_intr.c cleanly. Applying patch drivers/net/mlx5/linux/mlx5_os.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Applied patch drivers/net/mlx5/linux/mlx5_socket.c cleanly. Applying patch drivers/net/mlx5/mlx5.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applied patch drivers/net/mlx5/mlx5_rxq.c cleanly. Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly. Applied patch drivers/net/mlx5/mlx5_txpp.c cleanly. Applied patch drivers/net/netvsc/hn_ethdev.c cleanly. Applied patch drivers/net/nfp/nfp_common.c cleanly. Applied patch drivers/net/nfp/nfp_ethdev.c cleanly. Applied patch drivers/net/nfp/nfp_ethdev_vf.c cleanly. Applied patch drivers/net/ngbe/ngbe_ethdev.c cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev_irq.c cleanly. Applied patch drivers/net/qede/qede_ethdev.c cleanly. Applied patch drivers/net/sfc/sfc_intr.c cleanly. Applied patch drivers/net/tap/rte_eth_tap.c cleanly. Applied patch drivers/net/tap/rte_eth_tap.h cleanly. Applied patch drivers/net/tap/tap_intr.c cleanly. Applied patch drivers/net/thunderx/nicvf_ethdev.c cleanly. Applied patch drivers/net/thunderx/nicvf_struct.h cleanly. Applying patch drivers/net/txgbe/txgbe_ethdev.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Rejected hunk #7. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Applied patch drivers/net/txgbe/txgbe_ethdev_vf.c cleanly. Applied patch drivers/net/vhost/rte_eth_vhost.c cleanly. Applied patch drivers/net/virtio/virtio_ethdev.c cleanly. Applied patch drivers/net/virtio/virtio_user/virtio_user_dev.c cleanly. Applied patch drivers/net/vmxnet3/vmxnet3_ethdev.c cleanly. Applied patch drivers/raw/ifpga/ifpga_rawdev.c cleanly. Applied patch drivers/raw/ntb/ntb.c cleanly. Applied patch drivers/regex/octeontx2/otx2_regexdev_hw_access.c cleanly. Applied patch drivers/vdpa/ifc/ifcvf_vdpa.c cleanly. Applying patch drivers/vdpa/mlx5/mlx5_vdpa.c with 3 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Applied patch drivers/vdpa/mlx5/mlx5_vdpa.h cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_event.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_virtq.c cleanly. Applied patch lib/bbdev/rte_bbdev.c cleanly. Applied patch lib/eal/freebsd/eal_alarm.c cleanly. Applied patch lib/eal/include/rte_eal_trace.h cleanly. Applied patch lib/eal/linux/eal_alarm.c cleanly. Applied patch lib/eal/linux/eal_dev.c cleanly. Applied patch lib/ethdev/ethdev_pci.h cleanly. Applied patch lib/ethdev/rte_ethdev.c cleanly. diff a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c (rejected hunks) @@ -2317,20 +2314,22 @@ hns3vf_map_rx_interrupt(struct rte_eth_dev *dev) HNS3_RING_TYPE_RX, q_id); if (ret) goto vf_bind_vector_error; - intr_handle->intr_vec[q_id] = vec; + + if (rte_intr_vec_list_index_set(intr_handle, q_id, vec)) + goto vf_bind_vector_error; + /* * If there are not enough efds (e.g. not enough interrupt), * remaining queues will be bond to the last interrupt. */ - if (vec < base + intr_handle->nb_efd - 1) + if (vec < base + rte_intr_nb_efd_get(intr_handle) - 1) vec++; } rte_intr_enable(intr_handle); return 0; vf_bind_vector_error: - rte_free(intr_handle->intr_vec); - intr_handle->intr_vec = NULL; + rte_intr_vec_list_free(intr_handle); vf_alloc_intr_vec_error: rte_intr_efd_disable(intr_handle); return ret; diff a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c (rejected hunks) @@ -1440,7 +1440,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) } i40e_set_default_ptype_table(dev); pci_dev = RTE_ETH_DEV_TO_PCI(dev); - intr_handle = &pci_dev->intr_handle; + intr_handle = pci_dev->intr_handle; rte_eth_copy_pci_info(dev, pci_dev); diff a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c (rejected hunks) @@ -2725,24 +2724,39 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh) int flags; struct ibv_context *ctx = sh->cdev->ctx; - sh->intr_handle.fd = -1; + sh->intr_handle = + rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_SHARED); + if (!sh->intr_handle) { + DRV_LOG(ERR, "Fail to allocate intr_handle"); + rte_errno = ENOMEM; + return; + } + rte_intr_fd_set(sh->intr_handle, -1); + flags = fcntl(ctx->async_fd, F_GETFL); ret = fcntl(ctx->async_fd, F_SETFL, flags | O_NONBLOCK); if (ret) { DRV_LOG(INFO, "failed to change file descriptor async event" " queue"); } else { - sh->intr_handle.fd = ctx->async_fd; - sh->intr_handle.type = RTE_INTR_HANDLE_EXT; - if (rte_intr_callback_register(&sh->intr_handle, + rte_intr_fd_set(sh->intr_handle, ctx->async_fd); + rte_intr_type_set(sh->intr_handle, RTE_INTR_HANDLE_EXT); + if (rte_intr_callback_register(sh->intr_handle, mlx5_dev_interrupt_handler, sh)) { DRV_LOG(INFO, "Fail to install the shared interrupt."); - sh->intr_handle.fd = -1; + rte_intr_fd_set(sh->intr_handle, -1); } } if (sh->devx) { #ifdef HAVE_IBV_DEVX_ASYNC - sh->intr_handle_devx.fd = -1; + sh->intr_handle_devx = + rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_SHARED); + if (!sh->intr_handle_devx) { + DRV_LOG(ERR, "Fail to allocate intr_handle"); + rte_errno = ENOMEM; + return; + } + rte_intr_fd_set(sh->intr_handle_devx, -1); sh->devx_comp = (void *)mlx5_glue->devx_create_cmd_comp(ctx); struct mlx5dv_devx_cmd_comp *devx_comp = sh->devx_comp; if (!devx_comp) { diff a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h (rejected hunks) @@ -1154,8 +1154,8 @@ struct mlx5_dev_ctx_shared { struct mlx5_indexed_pool *ipool[MLX5_IPOOL_MAX]; struct mlx5_indexed_pool *mdh_ipools[MLX5_MAX_MODIFY_NUM]; /* Shared interrupt handler section. */ - struct rte_intr_handle intr_handle; /* Interrupt handler for device. */ - struct rte_intr_handle intr_handle_devx; /* DEVX interrupt handler. */ + struct rte_intr_handle *intr_handle; /* Interrupt handler for device. */ + struct rte_intr_handle *intr_handle_devx; /* DEVX interrupt handler. */ void *devx_comp; /* DEVX async comp obj. */ struct mlx5_devx_obj *tis; /* TIS object. */ struct mlx5_devx_obj *td; /* Transport domain. */ diff a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c (rejected hunks) @@ -2936,8 +2930,8 @@ txgbe_dev_interrupt_get_status(struct rte_eth_dev *dev, struct txgbe_hw *hw = TXGBE_DEV_HW(dev); struct txgbe_interrupt *intr = TXGBE_DEV_INTR(dev); - if (intr_handle->type != RTE_INTR_HANDLE_UIO && - intr_handle->type != RTE_INTR_HANDLE_VFIO_MSIX) + if (rte_intr_type_get(intr_handle) != RTE_INTR_HANDLE_UIO && + rte_intr_type_get(intr_handle) != RTE_INTR_HANDLE_VFIO_MSIX) wr32(hw, TXGBE_PX_INTA, 1); /* clear all cause mask */ diff a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c (rejected hunks) @@ -535,6 +535,12 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) DRV_LOG(ERR, "Failed to allocate VAR %u.", errno); goto error; } + priv->err_intr_handle = + rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_SHARED); + if (!priv->err_intr_handle) { + DRV_LOG(ERR, "Fail to allocate intr_handle"); + goto error; + } priv->vdev = rte_vdpa_register_device(cdev->dev, &mlx5_vdpa_ops); if (priv->vdev == NULL) { DRV_LOG(ERR, "Failed to register vDPA device."); @@ -553,6 +559,8 @@ mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev) if (priv) { if (priv->var) mlx5_glue->dv_free_var(priv->var); + if (priv->err_intr_handle) + rte_intr_instance_free(priv->err_intr_handle); rte_free(priv); } return -rte_errno; @@ -584,6 +592,8 @@ mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev) if (priv->vdev) rte_vdpa_unregister_device(priv->vdev); pthread_mutex_destroy(&priv->vq_config_lock); + if (priv->err_intr_handle) + rte_intr_instance_free(priv->err_intr_handle); rte_free(priv); } return 0; Checking patch drivers/bus/pci/linux/pci_vfio.c... error: drivers/bus/pci/linux/pci_vfio.c: does not match index Checking patch lib/eal/common/eal_common_interrupts.c... Checking patch lib/eal/include/meson.build... Checking patch lib/eal/include/rte_eal_interrupts.h... Checking patch lib/eal/include/rte_interrupts.h... Applied patch lib/eal/common/eal_common_interrupts.c cleanly. Applied patch lib/eal/include/meson.build cleanly. Applied patch lib/eal/include/rte_eal_interrupts.h cleanly. Applied patch lib/eal/include/rte_interrupts.h cleanly. Checking patch lib/eal/common/eal_private.h... Checking patch lib/eal/freebsd/eal.c... Checking patch lib/eal/freebsd/eal_alarm.c... error: lib/eal/freebsd/eal_alarm.c: does not match index Checking patch lib/eal/linux/eal.c... Checking patch lib/eal/linux/eal_alarm.c... error: lib/eal/linux/eal_alarm.c: does not match index Applied patch lib/eal/common/eal_private.h cleanly. Applied patch lib/eal/freebsd/eal.c cleanly. Applied patch lib/eal/linux/eal.c cleanly. https://lab.dpdk.org/results/dashboard/patchsets/19663/ UNH-IOL DPDK Community Lab