From: Alex Williamson <alex.williamson@redhat.com>
To: hexin <hexin.op@gmail.com>
Cc: kvm@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, hexin <hexin15@baidu.com>,
Liu Qi <liuqi16@baidu.com>, Zhang Yu <zhangyu31@baidu.com>
Subject: Re: [PATCH] vfio_pci: Replace pci_try_reset_function() with __pci_reset_function_locked() to ensure that the pci device configuration space is restored to its original state
Date: Fri, 16 Aug 2019 09:24:15 -0600 [thread overview]
Message-ID: <20190816092415.1b05aa0a@x1.home> (raw)
In-Reply-To: <1565926427-21675-1-git-send-email-hexin15@baidu.com>
On Fri, 16 Aug 2019 11:33:47 +0800
hexin <hexin.op@gmail.com> wrote:
> In vfio_pci_enable(), save the device's initial configuration information
> and then restore the configuration in vfio_pci_disable(). However, the
> execution result is not the same. Since the pci_try_reset_function()
> function saves the current state before resetting, the configuration
> information restored by pci_load_and_free_saved_state() will be
> overwritten. The __pci_reset_function_locked() function can be used
> to prevent the configuration space from being overwritten.
>
> Signed-off-by: hexin <hexin15@baidu.com>
> Signed-off-by: Liu Qi <liuqi16@baidu.com>
> Signed-off-by: Zhang Yu <zhangyu31@baidu.com>
> ---
> drivers/vfio/pci/vfio_pci.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> index 703948c..3c93492 100644
> --- a/drivers/vfio/pci/vfio_pci.c
> +++ b/drivers/vfio/pci/vfio_pci.c
> @@ -441,8 +441,14 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)
> * Try to reset the device. The success of this is dependent on
> * being able to lock the device, which is not always possible.
> */
> - if (vdev->reset_works && !pci_try_reset_function(pdev))
> - vdev->needs_reset = false;
> + if (vdev->reset_works && pci_cfg_access_trylock(pdev)) {
> + if (device_trylock(&pdev->dev)) {
> + if (!__pci_reset_function_locked(pdev))
> + vdev->needs_reset = false;
> + device_unlock(&pdev->dev);
> + }
> + pci_cfg_access_unlock(pdev);
> + }
>
> pci_restore_state(pdev);
> out:
This used to work, I think what happened is that we initially called
__pci_reset_function() to avoid the saved state getting overwritten,
then commit d24cdbfd28b7 ("vfio-pci: Avoid deadlock on remove") added
the trylock support to avoid deadlock, then commit 890ed578df82
("vfio-pci: Use pci "try" reset interface") assumed the trylock was the
reason for the unusual calling convention and simply replaced it with
pci_try_reset_function(). So, I think we need two things. First, a
fixes tag:
Fixes: 890ed578df82 ("vfio-pci: Use pci "try" reset interface")
Second, a comment to warn us against performing a similar cleanup again
in the future. Thanks,
Alex
prev parent reply other threads:[~2019-08-16 15:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 3:33 [PATCH] vfio_pci: Replace pci_try_reset_function() with __pci_reset_function_locked() to ensure that the pci device configuration space is restored to its original state hexin
2019-08-16 15:24 ` Alex Williamson [this message]
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=20190816092415.1b05aa0a@x1.home \
--to=alex.williamson@redhat.com \
--cc=hexin.op@gmail.com \
--cc=hexin15@baidu.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=liuqi16@baidu.com \
--cc=zhangyu31@baidu.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).