[dpdk-test-report] |WARNING| pw96157-96172 [PATCH] [v4, 16/16] common/mlx5: clean up legacy PCI bus driver

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Xueming Li <xuemingl at nvidia.com>
Date: Wednesday, July 21 2021 14:37:43 
Applied on: CommitID:cf1e803508009917f41dd5bb347e4140043afe03
Apply patch set 96157-96172 failed:

Checking patch drivers/common/mlx5/mlx5_common.h...
Checking patch drivers/common/mlx5/mlx5_common_pci.c...
error: while searching for:
	unsigned int driver_class;
} mlx5_classes[] = {
	{ .name = "vdpa", .driver_class = MLX5_CLASS_VDPA },
	{ .name = "net", .driver_class = MLX5_CLASS_NET },
	{ .name = "regex", .driver_class = MLX5_CLASS_REGEX },
	{ .name = "compress", .driver_class = MLX5_CLASS_COMPRESS },
	{ .name = "crypto", .driver_class = MLX5_CLASS_CRYPTO },
};

static const unsigned int mlx5_class_combinations[] = {
	MLX5_CLASS_NET,
	MLX5_CLASS_VDPA,
	MLX5_CLASS_REGEX,
	MLX5_CLASS_COMPRESS,
	MLX5_CLASS_CRYPTO,
	MLX5_CLASS_NET | MLX5_CLASS_REGEX,
	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX,
	MLX5_CLASS_NET | MLX5_CLASS_COMPRESS,
	MLX5_CLASS_VDPA | MLX5_CLASS_COMPRESS,
	MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
	MLX5_CLASS_NET | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_VDPA | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
	MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_NET | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_VDPA | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
	MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS |
	MLX5_CLASS_CRYPTO,
	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS |
	MLX5_CLASS_CRYPTO,

error: patch failed: drivers/common/mlx5/mlx5_common_pci.c:28
Hunk #2 succeeded at 303 (offset -16 lines).
Checking patch drivers/net/mlx5/mlx5.c...
Applied patch drivers/common/mlx5/mlx5_common.h cleanly.
Applying patch drivers/common/mlx5/mlx5_common_pci.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch drivers/net/mlx5/mlx5.c cleanly.
diff a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c	(rejected hunks)
@@ -28,34 +28,36 @@ static const struct {
 	unsigned int driver_class;
 } mlx5_classes[] = {
 	{ .name = "vdpa", .driver_class = MLX5_CLASS_VDPA },
-	{ .name = "net", .driver_class = MLX5_CLASS_NET },
+	{ .name = "eth", .driver_class = MLX5_CLASS_ETH },
+	/* Keep name "net" for backward compatibility. */
+	{ .name = "net", .driver_class = MLX5_CLASS_ETH },
 	{ .name = "regex", .driver_class = MLX5_CLASS_REGEX },
 	{ .name = "compress", .driver_class = MLX5_CLASS_COMPRESS },
 	{ .name = "crypto", .driver_class = MLX5_CLASS_CRYPTO },
 };
 
 static const unsigned int mlx5_class_combinations[] = {
-	MLX5_CLASS_NET,
+	MLX5_CLASS_ETH,
 	MLX5_CLASS_VDPA,
 	MLX5_CLASS_REGEX,
 	MLX5_CLASS_COMPRESS,
 	MLX5_CLASS_CRYPTO,
-	MLX5_CLASS_NET | MLX5_CLASS_REGEX,
+	MLX5_CLASS_ETH | MLX5_CLASS_REGEX,
 	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX,
-	MLX5_CLASS_NET | MLX5_CLASS_COMPRESS,
+	MLX5_CLASS_ETH | MLX5_CLASS_COMPRESS,
 	MLX5_CLASS_VDPA | MLX5_CLASS_COMPRESS,
 	MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
-	MLX5_CLASS_NET | MLX5_CLASS_CRYPTO,
+	MLX5_CLASS_ETH | MLX5_CLASS_CRYPTO,
+	MLX5_CLASS_ETH | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
 	MLX5_CLASS_VDPA | MLX5_CLASS_CRYPTO,
 	MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
 	MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
-	MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
 	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS,
-	MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
+	MLX5_CLASS_ETH | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
 	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_CRYPTO,
-	MLX5_CLASS_NET | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
+	MLX5_CLASS_ETH | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
 	MLX5_CLASS_VDPA | MLX5_CLASS_COMPRESS | MLX5_CLASS_CRYPTO,
-	MLX5_CLASS_NET | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS |
+	MLX5_CLASS_ETH | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS |
 	MLX5_CLASS_CRYPTO,
 	MLX5_CLASS_VDPA | MLX5_CLASS_REGEX | MLX5_CLASS_COMPRESS |
 	MLX5_CLASS_CRYPTO,
Skipped patch 'doc/guides/rel_notes/release_21_08.rst'.
Checking patch drivers/common/mlx5/linux/mlx5_common_os.c...
Checking patch drivers/common/mlx5/linux/mlx5_common_os.h...
Checking patch drivers/common/mlx5/linux/mlx5_common_verbs.c...
Checking patch drivers/common/mlx5/mlx5_common.c...
Checking patch drivers/common/mlx5/mlx5_common.h...
error: drivers/common/mlx5/mlx5_common.h: does not match index
Checking patch drivers/common/mlx5/mlx5_common_pci.c...
error: drivers/common/mlx5/mlx5_common_pci.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common_private.h...
Checking patch drivers/common/mlx5/mlx5_common_utils.h...
Checking patch drivers/common/mlx5/version.map...
Applied patch drivers/common/mlx5/linux/mlx5_common_os.c cleanly.
Applied patch drivers/common/mlx5/linux/mlx5_common_os.h cleanly.
Applied patch drivers/common/mlx5/linux/mlx5_common_verbs.c cleanly.
Applied patch drivers/common/mlx5/mlx5_common.c cleanly.
Applied patch drivers/common/mlx5/mlx5_common_private.h cleanly.
Applied patch drivers/common/mlx5/mlx5_common_utils.h cleanly.
Applied patch drivers/common/mlx5/version.map cleanly.
Checking patch drivers/common/mlx5/linux/mlx5_common_os.c...
error: drivers/common/mlx5/linux/mlx5_common_os.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common.h...
error: drivers/common/mlx5/mlx5_common.h: does not match index
Checking patch drivers/common/mlx5/linux/meson.build...
Checking patch drivers/common/mlx5/linux/mlx5_common_auxiliary.c...
Checking patch drivers/common/mlx5/linux/mlx5_common_verbs.c...
error: drivers/common/mlx5/linux/mlx5_common_verbs.c: does not match index
Checking patch drivers/common/mlx5/meson.build...
Checking patch drivers/common/mlx5/mlx5_common.c...
error: drivers/common/mlx5/mlx5_common.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common.h...
error: drivers/common/mlx5/mlx5_common.h: does not match index
Checking patch drivers/common/mlx5/mlx5_common_private.h...
error: drivers/common/mlx5/mlx5_common_private.h: does not exist in index
Checking patch drivers/common/mlx5/version.map...
error: drivers/common/mlx5/version.map: does not match index
Applied patch drivers/common/mlx5/linux/meson.build cleanly.
Applied patch drivers/common/mlx5/linux/mlx5_common_auxiliary.c cleanly.
Applied patch drivers/common/mlx5/meson.build cleanly.
Checking patch drivers/common/mlx5/linux/mlx5_common_auxiliary.c...
error: drivers/common/mlx5/linux/mlx5_common_auxiliary.c: does not exist in index
Checking patch drivers/common/mlx5/linux/mlx5_common_os.c...
error: drivers/common/mlx5/linux/mlx5_common_os.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common.c...
error: drivers/common/mlx5/mlx5_common.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common.h...
error: drivers/common/mlx5/mlx5_common.h: does not match index
Checking patch drivers/common/mlx5/mlx5_common_private.h...
error: drivers/common/mlx5/mlx5_common_private.h: does not exist in index
Checking patch drivers/common/mlx5/version.map...
error: drivers/common/mlx5/version.map: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
Applied patch drivers/net/mlx5/linux/mlx5_os.c cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_ethdev_os.c...
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
Checking patch drivers/net/mlx5/mlx5_ethdev.c...
Checking patch drivers/net/mlx5/mlx5_mr.c...
Checking patch drivers/net/mlx5/mlx5_trigger.c...
Checking patch drivers/net/mlx5/mlx5_txq.c...
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
Applied patch drivers/net/mlx5/linux/mlx5_ethdev_os.c cleanly.
Applied patch drivers/net/mlx5/mlx5.h cleanly.
Applied patch drivers/net/mlx5/mlx5_ethdev.c cleanly.
Applied patch drivers/net/mlx5/mlx5_mr.c cleanly.
Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly.
Applied patch drivers/net/mlx5/mlx5_txq.c cleanly.
Applied patch drivers/net/mlx5/windows/mlx5_os.c cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_os.h...
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_mr.c...
error: drivers/net/mlx5/mlx5_mr.c: does not match index
Checking patch drivers/net/mlx5/mlx5_rxtx.h...
Applied patch drivers/net/mlx5/linux/mlx5_os.h cleanly.
Applied patch drivers/net/mlx5/mlx5_rxtx.h cleanly.
Skipped patch 'doc/guides/nics/mlx5.rst'.
Checking patch drivers/net/mlx5/linux/mlx5_ethdev_os.c...
error: drivers/net/mlx5/linux/mlx5_ethdev_os.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/net/mlx5/linux/mlx5_os.h...
error: drivers/net/mlx5/linux/mlx5_os.h: does not match index
Checking patch drivers/net/mlx5/mlx5.c...
error: drivers/net/mlx5/mlx5.c: does not match index
Checking patch drivers/net/mlx5/mlx5.h...
error: drivers/net/mlx5/mlx5.h: does not match index
Checking patch drivers/net/mlx5/mlx5_mac.c...
Checking patch drivers/net/mlx5/mlx5_rxmode.c...
Checking patch drivers/net/mlx5/mlx5_trigger.c...
error: drivers/net/mlx5/mlx5_trigger.c: does not match index
Checking patch drivers/net/mlx5/windows/mlx5_os.c...
error: drivers/net/mlx5/windows/mlx5_os.c: does not match index
Applied patch drivers/net/mlx5/mlx5_mac.c cleanly.
Applied patch drivers/net/mlx5/mlx5_rxmode.c cleanly.
Checking patch drivers/net/mlx5/linux/mlx5_os.c...
error: drivers/net/mlx5/linux/mlx5_os.c: does not match index
Checking patch drivers/compress/mlx5/mlx5_compress.c...
error: while searching for:
	}
}

/**
 * DPDK callback to register a PCI device.
 *
 * This function spawns compress device out of a given PCI device.
 *
 * @param[in] pci_drv
 *   PCI driver structure (mlx5_compress_driver).
 * @param[in] pci_dev
 *   PCI device information.
 *
 * @return
 *   0 on success, 1 to skip this driver, a negative errno value otherwise
 *   and rte_errno is set.
 */
static int
mlx5_compress_pci_probe(struct rte_pci_driver *pci_drv,
			struct rte_pci_device *pci_dev)
{
	struct ibv_device *ibv;
	struct rte_compressdev *cdev;

error: patch failed: drivers/compress/mlx5/mlx5_compress.c:780
Hunk #5 succeeded at 734 (offset -54 lines).
Hunk #6 succeeded at 760 (offset -54 lines).
Hunk #7 succeeded at 775 (offset -54 lines).
Hunk #8 succeeded at 800 (offset -59 lines).
Hunk #9 succeeded at 831 (offset -62 lines).
Applying patch drivers/compress/mlx5/mlx5_compress.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
diff a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c	(rejected hunks)
@@ -780,23 +778,8 @@ mlx5_compress_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
 	}
 }
 
-/**
- * DPDK callback to register a PCI device.
- *
- * This function spawns compress device out of a given PCI device.
- *
- * @param[in] pci_drv
- *   PCI driver structure (mlx5_compress_driver).
- * @param[in] pci_dev
- *   PCI device information.
- *
- * @return
- *   0 on success, 1 to skip this driver, a negative errno value otherwise
- *   and rte_errno is set.
- */
 static int
-mlx5_compress_pci_probe(struct rte_pci_driver *pci_drv,
-			struct rte_pci_device *pci_dev)
+mlx5_compress_dev_probe(struct rte_device *dev)
 {
 	struct ibv_device *ibv;
 	struct rte_compressdev *cdev;
Checking patch drivers/crypto/mlx5/mlx5_crypto.c...
error: drivers/crypto/mlx5/mlx5_crypto.c: does not exist in index
Checking patch drivers/crypto/mlx5/mlx5_crypto.h...
error: drivers/crypto/mlx5/mlx5_crypto.h: does not exist in index
Checking patch drivers/common/mlx5/linux/mlx5_common_os.h...
error: drivers/common/mlx5/linux/mlx5_common_os.h: does not match index
Checking patch drivers/common/mlx5/mlx5_common.c...
error: drivers/common/mlx5/mlx5_common.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common.h...
error: drivers/common/mlx5/mlx5_common.h: does not match index
Checking patch drivers/common/mlx5/mlx5_common_pci.c...
error: drivers/common/mlx5/mlx5_common_pci.c: does not match index
Checking patch drivers/common/mlx5/mlx5_common_pci.h...
error: while searching for:
/* SPDX-License-Identifier: BSD-3-Clause
 * Copyright 2020 Mellanox Technologies, Ltd
 */

#ifndef _MLX5_COMMON_PCI_H_
#define _MLX5_COMMON_PCI_H_

/**
 * @file
 *
 * RTE Mellanox PCI Driver Interface
 * Mellanox ConnectX PCI device supports multiple class: net,vdpa,regex,compress
 * and crypto devices. This layer enables creating such multiple class of
 * devices on a single PCI device by allowing to bind multiple class specific
 * device driver to attach to mlx5_pci driver.
 *
 * --------    --------    ---------    ------------    ----------
 * | mlx5 |    | mlx5 |    | mlx5  |    |   mlx5   |    |  mlx5  |
 * | net  |    | vdpa |    | regex |    | compress |    | crypto |
 * | pmd  |    | pmd  |    |  pmd  |    |   pmd    |    |  pmd   |
 * --------    --------    ---------    ------------    ----------
 *      \              \         |          /              /
 *       \              \        |         /              /
 *        \              \_--------------_/              /
 *         \_______________|   mlx5     |_______________/
 *                         | pci common |
 *                         --------------
 *                               |
 *                           -----------
 *                           |   mlx5  |
 *                           | pci dev |
 *                           -----------
 *
 * - mlx5 pci driver binds to mlx5 PCI devices defined by PCI
 *   ID table of all related mlx5 PCI devices.
 * - mlx5 class driver such as net, vdpa, regex PMD defines its
 *   specific PCI ID table and mlx5 bus driver probes matching
 *   class drivers.
 * - mlx5 pci bus driver is cental place that validates supported
 *   class combinations.
 */

#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */

#include <rte_pci.h>
#include <rte_bus_pci.h>

#include <mlx5_common.h>

void mlx5_common_pci_init(void);

/**
 * A structure describing a mlx5 pci driver.
 */
struct mlx5_pci_driver {
	struct rte_pci_driver pci_driver;	/**< Inherit core pci driver. */
	uint32_t driver_class;	/**< Class of this driver, enum mlx5_class */
	TAILQ_ENTRY(mlx5_pci_driver) next;
};

/**
 * Register a mlx5_pci device driver.
 *
 * @param driver
 *   A pointer to a mlx5_pci_driver structure describing the driver
 *   to be registered.
 */
__rte_internal
void
mlx5_pci_driver_register(struct mlx5_pci_driver *driver);

#ifdef __cplusplus
}
#endif /* __cplusplus */

#endif /* _MLX5_COMMON_PCI_H_ */

error: patch failed: drivers/common/mlx5/mlx5_common_pci.h:1
error: removal patch leaves file contents
error: drivers/common/mlx5/mlx5_common_pci.h: patch does not apply
Checking patch drivers/common/mlx5/mlx5_common_private.h...
error: drivers/common/mlx5/mlx5_common_private.h: does not exist in index
Checking patch drivers/common/mlx5/version.map...
error: drivers/common/mlx5/version.map: does not match index

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

UNH-IOL DPDK Community Lab