From: Alex Williamson <alex.williamson@redhat.com>
To: Yishai Hadas <yishaih@nvidia.com>
Cc: <bhelgaas@google.com>, <jgg@nvidia.com>, <saeedm@nvidia.com>,
<linux-pci@vger.kernel.org>, <kvm@vger.kernel.org>,
<netdev@vger.kernel.org>, <kuba@kernel.org>, <leonro@nvidia.com>,
<kwankhede@nvidia.com>, <mgurtovoy@nvidia.com>,
<maorg@nvidia.com>
Subject: Re: [PATCH V4 mlx5-next 11/13] vfio/mlx5: Implement vfio_pci driver for mlx5 devices
Date: Tue, 26 Oct 2021 16:42:28 -0600 [thread overview]
Message-ID: <20211026164228.084a7524.alex.williamson@redhat.com> (raw)
In-Reply-To: <20211026090605.91646-12-yishaih@nvidia.com>
On Tue, 26 Oct 2021 12:06:03 +0300
Yishai Hadas <yishaih@nvidia.com> wrote:
> +static int mlx5vf_pci_set_device_state(struct mlx5vf_pci_core_device *mvdev,
> + u32 state)
> +{
> + struct mlx5vf_pci_migration_info *vmig = &mvdev->vmig;
> + u32 old_state = vmig->vfio_dev_state;
> + u32 flipped_bits = old_state ^ state;
> + int ret = 0;
> +
> + if (old_state == VFIO_DEVICE_STATE_ERROR ||
> + !VFIO_DEVICE_STATE_VALID(state) ||
> + (state & ~MLX5VF_SUPPORTED_DEVICE_STATES))
> + return -EINVAL;
> +
> + /* Running switches off */
> + if ((flipped_bits & VFIO_DEVICE_STATE_RUNNING) &&
> + !(state & VFIO_DEVICE_STATE_RUNNING)) {
> + ret = mlx5vf_pci_quiesce_device(mvdev);
> + if (ret)
> + return ret;
> + ret = mlx5vf_pci_freeze_device(mvdev);
> + if (ret) {
> + vmig->vfio_dev_state = VFIO_DEVICE_STATE_ERROR;
> + return ret;
Is it not possible for this to unwind, only entering the error state if
unquiesce also fails?
> + }
> + }
> +
> + /* Saving switches on and not running */
> + if ((flipped_bits &
> + (VFIO_DEVICE_STATE_RUNNING | VFIO_DEVICE_STATE_SAVING)) &&
> + ((state & (VFIO_DEVICE_STATE_RUNNING |
> + VFIO_DEVICE_STATE_SAVING)) == VFIO_DEVICE_STATE_SAVING)) {
Can't this be reduced to:
if ((flipped_bits & ~VFIO_DEVICE_STATE_RESUMING) &&
(state == VFIO_DEVICE_STATE_SAVING)) {
Maybe there's an argument for the original to be more invariant of TBD
device_state bits? Thanks,
Alex
> + ret = mlx5vf_pci_save_device_data(mvdev);
> + if (ret)
> + return ret;
> + }
> +
> + /* Resuming switches on */
> + if ((flipped_bits & VFIO_DEVICE_STATE_RESUMING) &&
> + (state & VFIO_DEVICE_STATE_RESUMING)) {
> + mlx5vf_reset_mig_state(mvdev);
> + ret = mlx5vf_pci_new_write_window(mvdev);
> + if (ret)
> + return ret;
> + }
> +
> + /* Resuming switches off */
> + if ((flipped_bits & VFIO_DEVICE_STATE_RESUMING) &&
> + !(state & VFIO_DEVICE_STATE_RESUMING)) {
> + /* deserialize state into the device */
> + ret = mlx5vf_load_state(mvdev);
> + if (ret) {
> + vmig->vfio_dev_state = VFIO_DEVICE_STATE_ERROR;
> + return ret;
> + }
> + }
> +
> + /* Running switches on */
> + if ((flipped_bits & VFIO_DEVICE_STATE_RUNNING) &&
> + (state & VFIO_DEVICE_STATE_RUNNING)) {
> + ret = mlx5vf_pci_unfreeze_device(mvdev);
> + if (ret)
> + return ret;
> + ret = mlx5vf_pci_unquiesce_device(mvdev);
> + if (ret) {
> + vmig->vfio_dev_state = VFIO_DEVICE_STATE_ERROR;
> + return ret;
> + }
> + }
> +
> + vmig->vfio_dev_state = state;
> + return 0;
> +}
next prev parent reply other threads:[~2021-10-26 22:42 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 9:05 [PATCH V4 mlx5-next 00/13] Add mlx5 live migration driver Yishai Hadas
2021-10-26 9:05 ` [PATCH V4 mlx5-next 01/13] PCI/IOV: Add pci_iov_vf_id() to get VF index Yishai Hadas
2021-10-26 9:05 ` [PATCH V4 mlx5-next 02/13] net/mlx5: Reuse exported virtfn index function call Yishai Hadas
2021-10-26 9:05 ` [PATCH V4 mlx5-next 03/13] net/mlx5: Disable SRIOV before PF removal Yishai Hadas
2021-10-26 9:05 ` [PATCH V4 mlx5-next 04/13] PCI/IOV: Add pci_iov_get_pf_drvdata() to allow VF reaching the drvdata of a PF Yishai Hadas
2021-10-26 9:05 ` [PATCH V4 mlx5-next 05/13] net/mlx5: Expose APIs to get/put the mlx5 core device Yishai Hadas
2021-10-26 9:05 ` [PATCH V4 mlx5-next 06/13] vfio: Fix VFIO_DEVICE_STATE_SET_ERROR macro Yishai Hadas
2021-10-26 15:32 ` Cornelia Huck
2021-10-26 15:50 ` Alex Williamson
2021-10-26 15:56 ` Cornelia Huck
2021-10-26 16:18 ` Leon Romanovsky
2021-10-26 16:32 ` Cornelia Huck
2021-10-26 16:42 ` Leon Romanovsky
2021-10-26 16:57 ` Cornelia Huck
2021-10-26 9:05 ` [PATCH V4 mlx5-next 07/13] vfio: Add a macro for VFIO_DEVICE_STATE_ERROR Yishai Hadas
2021-10-26 15:37 ` Cornelia Huck
2021-10-26 9:06 ` [PATCH V4 mlx5-next 08/13] vfio/pci_core: Make the region->release() function optional Yishai Hadas
2021-10-26 9:06 ` [PATCH V4 mlx5-next 09/13] net/mlx5: Introduce migration bits and structures Yishai Hadas
2021-10-26 9:06 ` [PATCH V4 mlx5-next 10/13] vfio/mlx5: Expose migration commands over mlx5 device Yishai Hadas
2021-10-26 9:06 ` [PATCH V4 mlx5-next 11/13] vfio/mlx5: Implement vfio_pci driver for mlx5 devices Yishai Hadas
2021-10-26 22:42 ` Alex Williamson [this message]
2021-10-26 23:46 ` Jason Gunthorpe
2021-10-26 9:06 ` [PATCH V4 mlx5-next 12/13] vfio/pci: Expose vfio_pci_aer_err_detected() Yishai Hadas
2021-10-26 22:45 ` Alex Williamson
2021-10-26 9:06 ` [PATCH V4 mlx5-next 13/13] vfio/mlx5: Use its own PCI reset_done error handler Yishai Hadas
2021-10-26 23:16 ` Alex Williamson
2021-10-26 23:50 ` Jason Gunthorpe
2021-10-27 15:29 ` Alex Williamson
2021-10-27 15:53 ` Jason Gunthorpe
2021-10-27 16:48 ` Alex Williamson
2021-10-27 16:53 ` Jason Gunthorpe
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=20211026164228.084a7524.alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=bhelgaas@google.com \
--cc=jgg@nvidia.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=leonro@nvidia.com \
--cc=linux-pci@vger.kernel.org \
--cc=maorg@nvidia.com \
--cc=mgurtovoy@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
--cc=yishaih@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).