Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/108524 _apply patch failure_ Submitter: Min Hu (Connor) Date: Friday, March 04 2022 01:22:54 Applied on: CommitID:305769000c40a4fdf1ed0cf24c157b447b91ea7d Apply patch set 108524 failed: .git/rebase-apply/patch:505: trailing whitespace. }; .git/rebase-apply/patch:773: trailing whitespace. } .git/rebase-apply/patch:1048: trailing whitespace. get_port_pvid_info(file, hw); .git/rebase-apply/patch:1316: trailing whitespace. return 0; .git/rebase-apply/patch:1321: trailing whitespace. get_fdir_basic_info(file, &hns->pf); Checking patch app/proc-info/main.c... Hunk #1 succeeded at 48 (offset 1 line). Hunk #2 succeeded at 90 (offset 3 lines). Hunk #3 succeeded at 109 (offset 3 lines). Hunk #4 succeeded at 209 (offset 5 lines). Hunk #5 succeeded at 319 (offset 7 lines). Hunk #6 succeeded at 372 (offset 9 lines). Hunk #7 succeeded at 799 (offset 11 lines). Hunk #8 succeeded at 929 (offset 11 lines). Hunk #9 succeeded at 1008 (offset 11 lines). Hunk #10 succeeded at 1105 (offset 11 lines). Hunk #11 succeeded at 1799 (offset 15 lines). Hunk #12 succeeded at 1813 (offset 15 lines). Checking patch drivers/net/hns3/hns3_ethdev.c... error: while searching for: return hns3_get_autoneg_fc_mode(hw); } static int hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) { struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); error: patch failed: drivers/net/hns3/hns3_ethdev.c:5514 error: while searching for: .timesync_adjust_time = hns3_timesync_adjust_time, .timesync_read_time = hns3_timesync_read_time, .timesync_write_time = hns3_timesync_write_time, }; static const struct hns3_reset_ops hns3_reset_ops = { error: patch failed: drivers/net/hns3/hns3_ethdev.c:6732 Checking patch drivers/net/hns3/hns3_ethdev.h... error: while searching for: return __atomic_fetch_and(addr, ~mask, __ATOMIC_RELAXED) & mask; } uint32_t hns3_get_speed_capa(struct hns3_hw *hw); int hns3_buffer_alloc(struct hns3_hw *hw); error: patch failed: drivers/net/hns3/hns3_ethdev.h:1068 error: while searching for: int hns3_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts); int hns3_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta); static inline bool is_reset_pending(struct hns3_adapter *hns) error: patch failed: drivers/net/hns3/hns3_ethdev.h:1093 Checking patch drivers/net/hns3/hns3_ethdev_dump.c... error: drivers/net/hns3/hns3_ethdev_dump.c: already exists in index Checking patch drivers/net/hns3/hns3_ethdev_vf.c... error: while searching for: .get_reg = hns3_get_regs, .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get, .tx_done_cleanup = hns3_tx_done_cleanup, }; static const struct hns3_reset_ops hns3vf_reset_ops = { error: patch failed: drivers/net/hns3/hns3_ethdev_vf.c:2290 Checking patch drivers/net/hns3/meson.build... error: while searching for: 'hns3_tm.c', 'hns3_ptp.c', 'hns3_common.c', ) deps += ['hash'] error: patch failed: drivers/net/hns3/meson.build:30 Checking patch lib/ethdev/ethdev_driver.h... error: while searching for: typedef int (*eth_rx_metadata_negotiate_t)(struct rte_eth_dev *dev, uint64_t *features); /** * @internal A structure containing the functions exported by an Ethernet driver. */ error: patch failed: lib/ethdev/ethdev_driver.h:990 error: while searching for: * kinds of metadata to the PMD */ eth_rx_metadata_negotiate_t rx_metadata_negotiate; }; /** error: patch failed: lib/ethdev/ethdev_driver.h:1186 Checking patch lib/ethdev/rte_ethdev.c... error: while searching for: (*dev->dev_ops->rx_metadata_negotiate)(dev, features)); } RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); RTE_INIT(ethdev_init_telemetry) error: patch failed: lib/ethdev/rte_ethdev.c:6487 Checking patch lib/ethdev/rte_ethdev.h... Hunk #1 succeeded at 6152 (offset 264 lines). Applied patch app/proc-info/main.c cleanly. Applying patch drivers/net/hns3/hns3_ethdev.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch drivers/net/hns3/hns3_ethdev.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch drivers/net/hns3/hns3_ethdev_vf.c with 1 reject... Rejected hunk #1. Applying patch drivers/net/hns3/meson.build with 1 reject... Rejected hunk #1. Applying patch lib/ethdev/ethdev_driver.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applying patch lib/ethdev/rte_ethdev.c with 1 reject... Rejected hunk #1. Applied patch lib/ethdev/rte_ethdev.h cleanly. diff a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c (rejected hunks) @@ -5514,7 +5514,7 @@ hns3_get_current_fc_mode(struct rte_eth_dev *dev) return hns3_get_autoneg_fc_mode(hw); } -static int +int hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) { struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -6732,6 +6732,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = { .timesync_adjust_time = hns3_timesync_adjust_time, .timesync_read_time = hns3_timesync_read_time, .timesync_write_time = hns3_timesync_write_time, + .eth_dev_priv_dump = hns3_eth_dev_priv_dump, }; static const struct hns3_reset_ops hns3_reset_ops = { diff a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h (rejected hunks) @@ -1068,6 +1068,8 @@ hns3_test_and_clear_bit(unsigned int nr, volatile uint64_t *addr) return __atomic_fetch_and(addr, ~mask, __ATOMIC_RELAXED) & mask; } +int +hns3_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); uint32_t hns3_get_speed_capa(struct hns3_hw *hw); int hns3_buffer_alloc(struct hns3_hw *hw); @@ -1093,6 +1095,7 @@ int hns3_timesync_read_time(struct rte_eth_dev *dev, struct timespec *ts); int hns3_timesync_write_time(struct rte_eth_dev *dev, const struct timespec *ts); int hns3_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta); +int hns3_eth_dev_priv_dump(FILE *file, struct rte_eth_dev *dev); static inline bool is_reset_pending(struct hns3_adapter *hns) diff a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c (rejected hunks) @@ -2290,6 +2290,7 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = { .get_reg = hns3_get_regs, .dev_supported_ptypes_get = hns3_dev_supported_ptypes_get, .tx_done_cleanup = hns3_tx_done_cleanup, + .eth_dev_priv_dump = hns3_eth_dev_priv_dump, }; static const struct hns3_reset_ops hns3vf_reset_ops = { diff a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build (rejected hunks) @@ -30,6 +30,7 @@ sources = files( 'hns3_tm.c', 'hns3_ptp.c', 'hns3_common.c', + 'hns3_ethdev_dump.c', ) deps += ['hash'] diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -990,6 +990,20 @@ typedef int (*eth_representor_info_get_t)(struct rte_eth_dev *dev, typedef int (*eth_rx_metadata_negotiate_t)(struct rte_eth_dev *dev, uint64_t *features); +/** + * @internal + * Get ethdev private info. + * + * @param file + * A pointer to a file for output. + * @param dev + * Port (ethdev) handle. + * + * @return + * Negative errno value on error, positive value on success. + */ +typedef int (*eth_dev_priv_dump_t)(FILE *file, struct rte_eth_dev *dev); + /** * @internal A structure containing the functions exported by an Ethernet driver. */ @@ -1186,6 +1200,9 @@ struct eth_dev_ops { * kinds of metadata to the PMD */ eth_rx_metadata_negotiate_t rx_metadata_negotiate; + + /** Dump ethdev private info */ + eth_dev_priv_dump_t eth_dev_priv_dump; }; /** diff a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c (rejected hunks) @@ -6487,6 +6487,21 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id, uint64_t *features) (*dev->dev_ops->rx_metadata_negotiate)(dev, features)); } +int +rte_eth_dev_priv_dump(FILE *file, uint16_t port_id) +{ + struct rte_eth_dev *dev; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->eth_dev_priv_dump, -ENOTSUP); + ret = (*dev->dev_ops->eth_dev_priv_dump)(file, dev); + + return ret; +} + RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); RTE_INIT(ethdev_init_telemetry) https://lab.dpdk.org/results/dashboard/patchsets/21386/ UNH-IOL DPDK Community Lab