On Mon, May 05, 2014 at 02:25:17PM -0700, Alexander Duyck wrote:
> This fixes an issue I found in which triggering a reset via the PCI sysfs
> reset while SR-IOV was enabled would leave the VFs in a state in which the
> BME and MSI-X enable bits were all cleared.
>
> To correct that I have added code so that the VF state is saved and restored
> as a part of the PF save and restore state functions. By doing this the VF
> state is restored as well as the IOV state allowing the VFs to resume function
> following a reset.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
> ---
> drivers/pci/iov.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
> drivers/pci/pci.c | 2 ++
> drivers/pci/pci.h | 5 +++++
> 3 files changed, 53 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
> index de7a747..645ed71 100644
> --- a/drivers/pci/iov.c
> +++ b/drivers/pci/iov.c
> @@ -521,13 +521,57 @@ resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)
> }
>
> /**
> + * pci_save_iov_state - Save the state of the VF configurations
> + * @dev: the PCI device
> + */
> +int pci_save_iov_state(struct pci_dev *dev)
> +{
> + struct pci_dev *vfdev = NULL;
> + unsigned short dev_id;
> +
> + /* only search if we are a PF */
> + if (!dev->is_physfn)
> + return 0;
> +
> + /* retrieve VF device ID */
> + pci_read_config_word(dev, dev->sriov->pos + PCI_SRIOV_VF_DID, &dev_id);
This is just an optimization to reduce the number of things you get
back from pci_get_device(), and hence reduce the number of times the
"vfdev->is_virtfn && (vfdev->physfn == dev)" condition is false, right?
> + /* loop through all the VFs and save their state information */
> + while ((vfdev = pci_get_device(dev->vendor, dev_id, vfdev))) {
> + if (vfdev->is_virtfn && (vfdev->physfn == dev)) {
> + int err = pci_save_state(vfdev);
It makes me uneasy to operate on another device (we're resetting A, and
here we save state for B). I know B is dependent on A, since B is a VF
related to PF A, but what synchronization is there to serialize this
against any other save/restore operations that may be in progress by B's
driver or by a sysfs operation on B?
Is there anything in the reset path that pays attention to whether
resetting this PF will clobber VFs? Do we care whether those VFs are in
use? I assume they might be in use by guests?
> + if (err)
> + return err;
> + }
> + }
pci_get_device() acquires a reference on each device it returns, so this
strategy would require a pci_dev_put().
But I'm not really keen on pci_get_device() in the first place. It works
by iterating over all PCI devices in the system, which seems like a
sledgehammer approach. It *is* widely used, but mostly in quirk-type code
from which I avert my eyes.
Maybe you could do something based on pci_walk_bus()? If you did that, I
think the PCI_SRIOV_VF_DID would become superfluous.
> +
> + return 0;
> +}
> +
> +/**
> * pci_restore_iov_state - restore the state of the IOV capability
> * @dev: the PCI device
> */
> void pci_restore_iov_state(struct pci_dev *dev)
> {
> - if (dev->is_physfn)
> - sriov_restore_state(dev);
> + struct pci_dev *vfdev = NULL;
> + unsigned short dev_id;
> +
> + if (!dev->is_physfn)
> + return;
> +
> + sriov_restore_state(dev);
> +
> + /* retrieve VF device ID */
> + pci_read_config_word(dev, dev->sriov->pos + PCI_SRIOV_VF_DID, &dev_id);
> +
> + /* loop through all VFs and restore state for any of our VFs */
> + while ((vfdev = pci_get_device(dev->vendor, dev_id, vfdev))) {
> + if (vfdev->is_virtfn && (vfdev->physfn == dev))
> + pci_restore_state(vfdev);
> + }
> +
> + return 0;
> }
>
> /**
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 7325d43..120a432 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -1015,6 +1015,8 @@ pci_save_state(struct pci_dev *dev)
> return i;
> if ((i = pci_save_vc_state(dev)) != 0)
> return i;
> + if ((i = pci_save_iov_state(dev)) != 0)
> + return i;
> return 0;
> }
>
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 6bd0822..9185edd 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -254,6 +254,7 @@ void pci_iov_release(struct pci_dev *dev);
> int pci_iov_resource_bar(struct pci_dev *dev, int resno,
> enum pci_bar_type *type);
> resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno);
> +int pci_save_iov_state(struct pci_dev *dev);
> void pci_restore_iov_state(struct pci_dev *dev);
> int pci_iov_bus_range(struct pci_bus *bus);
>
> @@ -271,6 +272,10 @@ static inline int pci_iov_resource_bar(struct pci_dev *dev, int resno,
> {
> return 0;
> }
> +static inline void pci_save_iov_state(struct pci_dev *dev)
> +{
> + return 0;
> +}
> static inline void pci_restore_iov_state(struct pci_dev *dev)
> {
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
