From: Yishai Hadas <yishaih@nvidia.com>
To: <alex.williamson@redhat.com>, <jgg@nvidia.com>, <saeedm@nvidia.com>
Cc: <kvm@vger.kernel.org>, <netdev@vger.kernel.org>,
<kuba@kernel.org>, <leonro@nvidia.com>, <yishaih@nvidia.com>,
<maorg@nvidia.com>, <cohuck@redhat.com>
Subject: [PATCH mlx5-next 1/5] vfio/mlx5: Reorganize the VF is migratable code
Date: Wed, 27 Apr 2022 12:31:16 +0300 [thread overview]
Message-ID: <20220427093120.161402-2-yishaih@nvidia.com> (raw)
In-Reply-To: <20220427093120.161402-1-yishaih@nvidia.com>
Reorganize the VF is migratable code to be in a separate function, next
patches from the series may use this.
Signed-off-by: Yishai Hadas <yishaih@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
drivers/vfio/pci/mlx5/cmd.c | 18 ++++++++++++++++++
drivers/vfio/pci/mlx5/cmd.h | 1 +
drivers/vfio/pci/mlx5/main.c | 22 +++++++---------------
3 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/drivers/vfio/pci/mlx5/cmd.c b/drivers/vfio/pci/mlx5/cmd.c
index 5c9f9218cc1d..d608b8167f58 100644
--- a/drivers/vfio/pci/mlx5/cmd.c
+++ b/drivers/vfio/pci/mlx5/cmd.c
@@ -71,6 +71,24 @@ int mlx5vf_cmd_query_vhca_migration_state(struct pci_dev *pdev, u16 vhca_id,
return ret;
}
+bool mlx5vf_cmd_is_migratable(struct pci_dev *pdev)
+{
+ struct mlx5_core_dev *mdev = mlx5_vf_get_core_dev(pdev);
+ bool migratable = false;
+
+ if (!mdev)
+ return false;
+
+ if (!MLX5_CAP_GEN(mdev, migration))
+ goto end;
+
+ migratable = true;
+
+end:
+ mlx5_vf_put_core_dev(mdev);
+ return migratable;
+}
+
int mlx5vf_cmd_get_vhca_id(struct pci_dev *pdev, u16 function_id, u16 *vhca_id)
{
struct mlx5_core_dev *mdev = mlx5_vf_get_core_dev(pdev);
diff --git a/drivers/vfio/pci/mlx5/cmd.h b/drivers/vfio/pci/mlx5/cmd.h
index 1392a11a9cc0..2da6a1c0ec5c 100644
--- a/drivers/vfio/pci/mlx5/cmd.h
+++ b/drivers/vfio/pci/mlx5/cmd.h
@@ -29,6 +29,7 @@ int mlx5vf_cmd_resume_vhca(struct pci_dev *pdev, u16 vhca_id, u16 op_mod);
int mlx5vf_cmd_query_vhca_migration_state(struct pci_dev *pdev, u16 vhca_id,
size_t *state_size);
int mlx5vf_cmd_get_vhca_id(struct pci_dev *pdev, u16 function_id, u16 *vhca_id);
+bool mlx5vf_cmd_is_migratable(struct pci_dev *pdev);
int mlx5vf_cmd_save_vhca_state(struct pci_dev *pdev, u16 vhca_id,
struct mlx5_vf_migration_file *migf);
int mlx5vf_cmd_load_vhca_state(struct pci_dev *pdev, u16 vhca_id,
diff --git a/drivers/vfio/pci/mlx5/main.c b/drivers/vfio/pci/mlx5/main.c
index bbec5d288fee..2578f61eaeae 100644
--- a/drivers/vfio/pci/mlx5/main.c
+++ b/drivers/vfio/pci/mlx5/main.c
@@ -597,21 +597,13 @@ static int mlx5vf_pci_probe(struct pci_dev *pdev,
return -ENOMEM;
vfio_pci_core_init_device(&mvdev->core_device, pdev, &mlx5vf_pci_ops);
- if (pdev->is_virtfn) {
- struct mlx5_core_dev *mdev =
- mlx5_vf_get_core_dev(pdev);
-
- if (mdev) {
- if (MLX5_CAP_GEN(mdev, migration)) {
- mvdev->migrate_cap = 1;
- mvdev->core_device.vdev.migration_flags =
- VFIO_MIGRATION_STOP_COPY |
- VFIO_MIGRATION_P2P;
- mutex_init(&mvdev->state_mutex);
- spin_lock_init(&mvdev->reset_lock);
- }
- mlx5_vf_put_core_dev(mdev);
- }
+ if (pdev->is_virtfn && mlx5vf_cmd_is_migratable(pdev)) {
+ mvdev->migrate_cap = 1;
+ mvdev->core_device.vdev.migration_flags =
+ VFIO_MIGRATION_STOP_COPY |
+ VFIO_MIGRATION_P2P;
+ mutex_init(&mvdev->state_mutex);
+ spin_lock_init(&mvdev->reset_lock);
}
ret = vfio_pci_core_register_device(&mvdev->core_device);
--
2.18.1
next prev parent reply other threads:[~2022-04-27 10:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 9:31 [PATCH mlx5-next 0/5] Improve mlx5 live migration driver Yishai Hadas
2022-04-27 9:31 ` Yishai Hadas [this message]
2022-05-04 20:13 ` [PATCH mlx5-next 1/5] vfio/mlx5: Reorganize the VF is migratable code Alex Williamson
2022-05-08 12:56 ` Yishai Hadas
2022-04-27 9:31 ` [PATCH mlx5-next 2/5] net/mlx5: Expose mlx5_sriov_blocking_notifier_register / unregister APIs Yishai Hadas
2022-05-04 13:55 ` Jason Gunthorpe
2022-04-27 9:31 ` [PATCH mlx5-next 3/5] vfio/mlx5: Manage the VF attach/detach callback from the PF Yishai Hadas
2022-05-04 20:34 ` Alex Williamson
2022-05-08 13:04 ` Yishai Hadas
2022-04-27 9:31 ` [PATCH mlx5-next 4/5] vfio/mlx5: Refactor to enable VFs migration in parallel Yishai Hadas
2022-04-27 9:31 ` [PATCH mlx5-next 5/5] vfio/mlx5: Run the SAVE state command in an async mode Yishai Hadas
2022-05-04 13:29 ` [PATCH mlx5-next 0/5] Improve mlx5 live migration driver Yishai Hadas
2022-05-04 20:19 ` Alex Williamson
2022-05-04 21:33 ` Jason Gunthorpe
2022-05-04 22:48 ` Alex Williamson
2022-05-05 5:38 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220427093120.161402-2-yishaih@nvidia.com \
--to=yishaih@nvidia.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=jgg@nvidia.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=leonro@nvidia.com \
--cc=maorg@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).