Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/95219 _apply patch failure_ Submitter: Ting Xu Date: Friday, July 02 2021 15:00:27 Applied on: CommitID:2508c18cff9ffb217ac40e44071dc2762d257f31 Apply patch set 95219 failed: Checking patch drivers/net/ice/ice_dcf.c... Hunk #1 succeeded at 576 (offset -1 lines). error: while searching for: } } if (hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_QOS) ice_dcf_tm_conf_init(eth_dev); hw->eth_dev = eth_dev; rte_intr_callback_register(&pci_dev->intr_handle, error: patch failed: drivers/net/ice/ice_dcf.c:669 Checking patch drivers/net/ice/ice_dcf.h... error: while searching for: uint16_t pf_vsi_id; struct ice_dcf_tm_conf tm_conf; struct ice_aqc_port_ets_elem *ets_config; struct virtchnl_version_info virtchnl_version; struct virtchnl_vf_resource *vf_res; /* VF resource */ error: patch failed: drivers/net/ice/ice_dcf.h:90 error: while searching for: __rte_unused int wait_to_complete); void ice_dcf_tm_conf_init(struct rte_eth_dev *dev); void ice_dcf_tm_conf_uninit(struct rte_eth_dev *dev); #endif /* _ICE_DCF_H_ */ error: patch failed: drivers/net/ice/ice_dcf.h:131 Checking patch drivers/net/ice/ice_dcf_ethdev.c... error: while searching for: ice_dcf_add_del_all_mac_addr(&dcf_ad->real_hw, false); dev->data->dev_link.link_status = ETH_LINK_DOWN; ad->pf.adapter_stopped = 1; dcf_ad->real_hw.tm_conf.committed = false; return 0; } error: patch failed: drivers/net/ice/ice_dcf_ethdev.c:622 Checking patch drivers/net/ice/ice_dcf_parent.c... Checking patch drivers/net/ice/ice_dcf_sched.c... error: drivers/net/ice/ice_dcf_sched.c: does not exist in index Applying patch drivers/net/ice/ice_dcf.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applying patch drivers/net/ice/ice_dcf.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch drivers/net/ice/ice_dcf_ethdev.c with 1 reject... Rejected hunk #1. Applied patch drivers/net/ice/ice_dcf_parent.c cleanly. diff a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c (rejected hunks) @@ -669,8 +669,15 @@ ice_dcf_init_hw(struct rte_eth_dev *eth_dev, struct ice_dcf_hw *hw) } } - if (hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_QOS) + if (hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_QOS) { ice_dcf_tm_conf_init(eth_dev); + size = sizeof(struct virtchnl_dcf_bw_cfg_list *) * hw->num_vfs; + hw->qos_bw_cfg = rte_zmalloc("qos_bw_cfg", size, 0); + if (!hw->qos_bw_cfg) { + PMD_INIT_LOG(ERR, "no memory for qos_bw_cfg"); + goto err_rss; + } + } hw->eth_dev = eth_dev; rte_intr_callback_register(&pci_dev->intr_handle, diff a/drivers/net/ice/ice_dcf.h b/drivers/net/ice/ice_dcf.h (rejected hunks) @@ -90,6 +90,7 @@ struct ice_dcf_hw { uint16_t pf_vsi_id; struct ice_dcf_tm_conf tm_conf; + struct virtchnl_dcf_bw_cfg_list **qos_bw_cfg; struct ice_aqc_port_ets_elem *ets_config; struct virtchnl_version_info virtchnl_version; struct virtchnl_vf_resource *vf_res; /* VF resource */ @@ -131,5 +132,6 @@ int ice_dcf_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete); void ice_dcf_tm_conf_init(struct rte_eth_dev *dev); void ice_dcf_tm_conf_uninit(struct rte_eth_dev *dev); +int ice_dcf_replay_vf_bw(struct ice_dcf_hw *hw, uint16_t vf_id); #endif /* _ICE_DCF_H_ */ diff a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c (rejected hunks) @@ -622,7 +622,6 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev) ice_dcf_add_del_all_mac_addr(&dcf_ad->real_hw, false); dev->data->dev_link.link_status = ETH_LINK_DOWN; ad->pf.adapter_stopped = 1; - dcf_ad->real_hw.tm_conf.committed = false; return 0; } https://lab.dpdk.org/results/dashboard/patchsets/17618/ UNH-IOL DPDK Community Lab