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

_apply patch failure_

Submitter: Michael Baum <michaelba@nvidia.com>
Date: Thursday, February 02 2023 16:25:37 
Applied on: CommitID:5003661613fa7663347b7ea75f2560b8a6458a30
Apply patch set 122971-122976 failed:

Checking patch doc/guides/compressdevs/features/mlx5.ini...
Checking patch doc/guides/compressdevs/mlx5.rst...
Checking patch doc/guides/rel_notes/release_23_03.rst...
error: while searching for:
  * Added support for ``RTE_COMP_CHECKSUM_XXHASH32``.
  * Added support for ``lz4`` in test-compress-perf algo options.

* **Allowed test single compress operation in test-compress-perf.**

  Enable the application options for testing only compress and only decompress.

error: patch failed: doc/guides/rel_notes/release_23_03.rst:86
Checking patch drivers/compress/mlx5/mlx5_compress.c...
error: while searching for:

int mlx5_compress_logtype;

static const struct rte_compressdev_capabilities mlx5_caps[] = {
	{
		.algo = RTE_COMP_ALGO_NULL,
		.comp_feature_flags = RTE_COMP_FF_ADLER32_CHECKSUM |
				      RTE_COMP_FF_CRC32_CHECKSUM |
				      RTE_COMP_FF_CRC32_ADLER32_CHECKSUM |
				      RTE_COMP_FF_SHAREABLE_PRIV_XFORM,
	},
	{
		.algo = RTE_COMP_ALGO_DEFLATE,
		.comp_feature_flags = RTE_COMP_FF_ADLER32_CHECKSUM |
				      RTE_COMP_FF_CRC32_CHECKSUM |
				      RTE_COMP_FF_CRC32_ADLER32_CHECKSUM |
				      RTE_COMP_FF_SHAREABLE_PRIV_XFORM |
				      RTE_COMP_FF_HUFFMAN_FIXED |
				      RTE_COMP_FF_HUFFMAN_DYNAMIC,
		.window_size = {.min = 10, .max = 15, .increment = 1},
	},
	RTE_COMP_END_OF_CAPABILITIES_LIST()
};

static void
mlx5_compress_dev_info_get(struct rte_compressdev *dev,
			   struct rte_compressdev_info *info)
{
	RTE_SET_USED(dev);
	if (info != NULL) {
		info->max_nb_queue_pairs = MLX5_COMPRESS_MAX_QPS;
		info->feature_flags = RTE_COMPDEV_FF_HW_ACCELERATED;
		info->capabilities = mlx5_caps;
	}
}


error: patch failed: drivers/compress/mlx5/mlx5_compress.c:70
Hunk #4 succeeded at 240 (offset 22 lines).
Hunk #5 succeeded at 286 (offset 22 lines).
Hunk #6 succeeded at 301 (offset 22 lines).
Hunk #7 succeeded at 321 (offset 22 lines).
Hunk #8 succeeded at 428 (offset 22 lines).
Hunk #9 succeeded at 456 (offset 22 lines).
Hunk #10 succeeded at 723 (offset 22 lines).
Hunk #11 succeeded at 790 (offset 22 lines).
Hunk #12 succeeded at 853 (offset 22 lines).
Hunk #13 succeeded at 877 (offset 22 lines).
Hunk #14 succeeded at 888 (offset 22 lines).
Applied patch doc/guides/compressdevs/features/mlx5.ini cleanly.
Applied patch doc/guides/compressdevs/mlx5.rst cleanly.
Applying patch doc/guides/rel_notes/release_23_03.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/compress/mlx5/mlx5_compress.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
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.
diff a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst	(rejected hunks)
@@ -86,6 +86,10 @@ New Features
   * Added support for ``RTE_COMP_CHECKSUM_XXHASH32``.
   * Added support for ``lz4`` in test-compress-perf algo options.
 
+* **Updated NVIDIA mlx5 compress PMD.**
+
+  * Added LZ4 algorithm support for decompress operation.
+
 * **Allowed test single compress operation in test-compress-perf.**
 
   Enable the application options for testing only compress and only decompress.
diff a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c	(rejected hunks)
@@ -70,36 +72,16 @@ static pthread_mutex_t priv_list_lock = PTHREAD_MUTEX_INITIALIZER;
 
 int mlx5_compress_logtype;
 
-static const struct rte_compressdev_capabilities mlx5_caps[] = {
-	{
-		.algo = RTE_COMP_ALGO_NULL,
-		.comp_feature_flags = RTE_COMP_FF_ADLER32_CHECKSUM |
-				      RTE_COMP_FF_CRC32_CHECKSUM |
-				      RTE_COMP_FF_CRC32_ADLER32_CHECKSUM |
-				      RTE_COMP_FF_SHAREABLE_PRIV_XFORM,
-	},
-	{
-		.algo = RTE_COMP_ALGO_DEFLATE,
-		.comp_feature_flags = RTE_COMP_FF_ADLER32_CHECKSUM |
-				      RTE_COMP_FF_CRC32_CHECKSUM |
-				      RTE_COMP_FF_CRC32_ADLER32_CHECKSUM |
-				      RTE_COMP_FF_SHAREABLE_PRIV_XFORM |
-				      RTE_COMP_FF_HUFFMAN_FIXED |
-				      RTE_COMP_FF_HUFFMAN_DYNAMIC,
-		.window_size = {.min = 10, .max = 15, .increment = 1},
-	},
-	RTE_COMP_END_OF_CAPABILITIES_LIST()
-};
-
 static void
 mlx5_compress_dev_info_get(struct rte_compressdev *dev,
 			   struct rte_compressdev_info *info)
 {
-	RTE_SET_USED(dev);
-	if (info != NULL) {
+	if (dev != NULL && info != NULL) {
+		struct mlx5_compress_priv *priv = dev->data->dev_private;
+
 		info->max_nb_queue_pairs = MLX5_COMPRESS_MAX_QPS;
 		info->feature_flags = RTE_COMPDEV_FF_HW_ACCELERATED;
-		info->capabilities = mlx5_caps;
+		info->capabilities = priv->caps;
 	}
 }
 

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

UNH-IOL DPDK Community Lab