Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/107336

_apply patch failure_

Submitter: Min Hu (Connor) <humin29@huawei.com>
Date: Friday, February 11 2022 04:49:30 
Applied on: CommitID:1d1126ad436e8c7c015fb3f67ad3af05c3b397d5
Apply patch set 107336-107344 failed:

Checking patch doc/guides/rel_notes/release_22_03.rst...
Hunk #1 succeeded at 76 (offset -4 lines).
Checking patch lib/ethdev/ethdev_driver.h...
error: while searching for:
typedef int (*eth_ip_reassembly_conf_set_t)(struct rte_eth_dev *dev,
		const struct rte_eth_ip_reassembly_params *conf);

/**
 * @internal A structure containing the functions exported by an Ethernet driver.
 */

error: patch failed: lib/ethdev/ethdev_driver.h:1045
error: while searching for:
	eth_ip_reassembly_conf_get_t ip_reassembly_conf_get;
	/** Set IP reassembly configuration */
	eth_ip_reassembly_conf_set_t ip_reassembly_conf_set;
};

/**

error: patch failed: lib/ethdev/ethdev_driver.h:1252
Checking patch lib/ethdev/rte_ethdev.c...
error: while searching for:
	return 0;
}

RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO);

RTE_INIT(ethdev_init_telemetry)

error: patch failed: lib/ethdev/rte_ethdev.c:6750
Checking patch lib/ethdev/rte_ethdev.h...
error: while searching for:
	uint16_t nb_frags;
} rte_eth_ip_reassembly_dynfield_t;


#include <rte_ethdev_core.h>


error: patch failed: lib/ethdev/rte_ethdev.h:5432
Checking patch lib/ethdev/version.map...
error: while searching for:
	rte_eth_ip_reassembly_capability_get;
	rte_eth_ip_reassembly_conf_get;
	rte_eth_ip_reassembly_conf_set;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:263
Applied patch doc/guides/rel_notes/release_22_03.rst cleanly.
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.
Applying patch lib/ethdev/rte_ethdev.h with 1 reject...
Rejected hunk #1.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h	(rejected hunks)
@@ -1045,6 +1045,25 @@ typedef int (*eth_ip_reassembly_conf_get_t)(struct rte_eth_dev *dev,
 typedef int (*eth_ip_reassembly_conf_set_t)(struct rte_eth_dev *dev,
 		const struct rte_eth_ip_reassembly_params *conf);
 
+/**
+ * @internal
+ * Dump private info from device to a file.
+ *
+ * @param dev
+ *   Port (ethdev) handle.
+ * @param file
+ *   A pointer to a file for output.
+ *
+ * @return
+ *   Negative value on error, 0 on success.
+ *
+ * @retval 0
+ *   Success
+ * @retval -EINVAL
+ *   Invalid file
+ */
+typedef int (*eth_dev_priv_dump_t)(struct rte_eth_dev *dev, FILE *file);
+
 /**
  * @internal A structure containing the functions exported by an Ethernet driver.
  */
@@ -1252,6 +1271,9 @@ struct eth_dev_ops {
 	eth_ip_reassembly_conf_get_t ip_reassembly_conf_get;
 	/** Set IP reassembly configuration */
 	eth_ip_reassembly_conf_set_t ip_reassembly_conf_set;
+
+	/** Dump private info from device */
+	eth_dev_priv_dump_t eth_dev_priv_dump;
 };
 
 /**
diff a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c	(rejected hunks)
@@ -6750,6 +6750,23 @@ rte_eth_ip_reassembly_dynfield_register(int *field_offset, int *flag_offset)
 	return 0;
 }
 
+int
+rte_eth_dev_priv_dump(uint16_t port_id, FILE *file)
+{
+	struct rte_eth_dev *dev;
+
+	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+	dev = &rte_eth_devices[port_id];
+
+	if (file == NULL) {
+		RTE_ETHDEV_LOG(ERR, "Invalid file (NULL)\n");
+		return -EINVAL;
+	}
+
+	RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->eth_dev_priv_dump, -ENOTSUP);
+	return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file));
+}
+
 RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO);
 
 RTE_INIT(ethdev_init_telemetry)
diff a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h	(rejected hunks)
@@ -5432,6 +5432,26 @@ typedef struct {
 	uint16_t nb_frags;
 } rte_eth_ip_reassembly_dynfield_t;
 
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Dump private info from device to a file. Provided data and the order depends
+ * on the PMD.
+ *
+ * @param port_id
+ *   The port identifier of the Ethernet device.
+ * @param file
+ *   A pointer to a file for output.
+ * @return
+ *   - (0) on success.
+ *   - (-ENODEV) if *port_id* is invalid.
+ *   - (-EINVAL) if null file.
+ *   - (-ENOTSUP) if the device does not support this function.
+ *   - (-EIO) if device is removed.
+ */
+__rte_experimental
+int rte_eth_dev_priv_dump(uint16_t port_id, FILE *file);
 
 #include <rte_ethdev_core.h>
 
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -263,6 +263,7 @@ EXPERIMENTAL {
 	rte_eth_ip_reassembly_capability_get;
 	rte_eth_ip_reassembly_conf_get;
 	rte_eth_ip_reassembly_conf_set;
+	rte_eth_dev_priv_dump;
 };
 
 INTERNAL {

https://lab.dpdk.org/results/dashboard/patchsets/21026/

UNH-IOL DPDK Community Lab