Merge tag 'mlx5-vfio-v10' of... (b042b278) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -20320,6 +20320,12 @@ L: kvm@vger.kernel.org
		S: Maintained
		F: drivers/vfio/platform/

		VFIO MLX5 PCI DRIVER
		M: Yishai Hadas <yishaih@nvidia.com>
		L: kvm@vger.kernel.org
		S: Maintained
		F: drivers/vfio/pci/mlx5/

		VGA_SWITCHEROO
		R: Lukas Wunner <lukas@wunner.de>
		S: Maintained

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -477,6 +477,11 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
		case MLX5_CMD_OP_QUERY_VHCA_STATE:
		case MLX5_CMD_OP_MODIFY_VHCA_STATE:
		case MLX5_CMD_OP_ALLOC_SF:
		case MLX5_CMD_OP_SUSPEND_VHCA:
		case MLX5_CMD_OP_RESUME_VHCA:
		case MLX5_CMD_OP_QUERY_VHCA_MIGRATION_STATE:
		case MLX5_CMD_OP_SAVE_VHCA_STATE:
		case MLX5_CMD_OP_LOAD_VHCA_STATE:
		*status = MLX5_DRIVER_STATUS_ABORTED;
		*synd = MLX5_DRIVER_SYND;
		return -EIO;
		@@ -674,6 +679,11 @@ const char *mlx5_command_str(int command)
		MLX5_COMMAND_STR_CASE(MODIFY_VHCA_STATE);
		MLX5_COMMAND_STR_CASE(ALLOC_SF);
		MLX5_COMMAND_STR_CASE(DEALLOC_SF);
		MLX5_COMMAND_STR_CASE(SUSPEND_VHCA);
		MLX5_COMMAND_STR_CASE(RESUME_VHCA);
		MLX5_COMMAND_STR_CASE(QUERY_VHCA_MIGRATION_STATE);
		MLX5_COMMAND_STR_CASE(SAVE_VHCA_STATE);
		MLX5_COMMAND_STR_CASE(LOAD_VHCA_STATE);
		default: return "unknown command opcode";
		}
		}

drivers/net/ethernet/mellanox/mlx5/core/main.c

+45 −0

Original line number	Diff line number	Diff line
		@@ -1620,6 +1620,7 @@ static void remove_one(struct pci_dev *pdev)
		struct devlink *devlink = priv_to_devlink(dev);

		devlink_unregister(devlink);
		mlx5_sriov_disable(pdev);
		mlx5_crdump_disable(dev);
		mlx5_drain_health_wq(dev);
		mlx5_uninit_one(dev);
		@@ -1880,6 +1881,50 @@ static struct pci_driver mlx5_core_driver = {
		.sriov_set_msix_vec_count = mlx5_core_sriov_set_msix_vec_count,
		};

		/**
		* mlx5_vf_get_core_dev - Get the mlx5 core device from a given VF PCI device if
		* mlx5_core is its driver.
		* @pdev: The associated PCI device.
		*
		* Upon return the interface state lock stay held to let caller uses it safely.
		* Caller must ensure to use the returned mlx5 device for a narrow window
		* and put it back with mlx5_vf_put_core_dev() immediately once usage was over.
		*
		* Return: Pointer to the associated mlx5_core_dev or NULL.
		*/
		struct mlx5_core_dev mlx5_vf_get_core_dev(struct pci_dev pdev)
		__acquires(&mdev->intf_state_mutex)
		{
		struct mlx5_core_dev *mdev;

		mdev = pci_iov_get_pf_drvdata(pdev, &mlx5_core_driver);
		if (IS_ERR(mdev))
		return NULL;

		mutex_lock(&mdev->intf_state_mutex);
		if (!test_bit(MLX5_INTERFACE_STATE_UP, &mdev->intf_state)) {
		mutex_unlock(&mdev->intf_state_mutex);
		return NULL;
		}

		return mdev;
		}
		EXPORT_SYMBOL(mlx5_vf_get_core_dev);

		/**
		* mlx5_vf_put_core_dev - Put the mlx5 core device back.
		* @mdev: The mlx5 core device.
		*
		* Upon return the interface state lock is unlocked and caller should not
		* access the mdev any more.
		*/
		void mlx5_vf_put_core_dev(struct mlx5_core_dev *mdev)
		__releases(&mdev->intf_state_mutex)
		{
		mutex_unlock(&mdev->intf_state_mutex);
		}
		EXPORT_SYMBOL(mlx5_vf_put_core_dev);

		static void mlx5_core_verify_params(void)
		{
		if (prof_sel >= ARRAY_SIZE(profile)) {

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,7 @@ void mlx5_sriov_cleanup(struct mlx5_core_dev *dev);
		int mlx5_sriov_attach(struct mlx5_core_dev *dev);
		void mlx5_sriov_detach(struct mlx5_core_dev *dev);
		int mlx5_core_sriov_configure(struct pci_dev *dev, int num_vfs);
		void mlx5_sriov_disable(struct pci_dev *pdev);
		int mlx5_core_sriov_set_msix_vec_count(struct pci_dev *vf, int msix_vec_count);
		int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id);
		int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id);

drivers/net/ethernet/mellanox/mlx5/core/sriov.c

+3 −14

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ static int mlx5_sriov_enable(struct pci_dev *pdev, int num_vfs)
		return err;
		}

		static void mlx5_sriov_disable(struct pci_dev *pdev)
		void mlx5_sriov_disable(struct pci_dev *pdev)
		{
		struct mlx5_core_dev *dev = pci_get_drvdata(pdev);
		int num_vfs = pci_num_vf(dev->pdev);
		@@ -205,19 +205,8 @@ int mlx5_core_sriov_set_msix_vec_count(struct pci_dev *vf, int msix_vec_count)
		mlx5_get_default_msix_vec_count(dev, pci_num_vf(pf));

		sriov = &dev->priv.sriov;

		/* Reversed translation of PCI VF function number to the internal
		* function_id, which exists in the name of virtfn symlink.
		*/
		for (id = 0; id < pci_num_vf(pf); id++) {
		if (!sriov->vfs_ctx[id].enabled)
		continue;

		if (vf->devfn == pci_iov_virtfn_devfn(pf, id))
		break;
		}

		if (id == pci_num_vf(pf) \|\| !sriov->vfs_ctx[id].enabled)
		id = pci_iov_vf_id(vf);
		if (id < 0 \|\| !sriov->vfs_ctx[id].enabled)
		return -EINVAL;

		return mlx5_set_msix_vec_count(dev, id + 1, msix_vec_count);