Commit 93139037 authored by Zhu Lingshan's avatar Zhu Lingshan Committed by Michael S. Tsirkin
Browse files

vDPA/ifcvf: allocate the adapter in dev_add() 



The adapter is the container of the vdpa_device,
this commits allocate the adapter in dev_add()
rather than in probe(). So that the vdpa_device()
could be re-created when the userspace creates
the vdpa device, and free-ed in dev_del()

Signed-off-by: default avatarZhu Lingshan <lingshan.zhu@intel.com>
Cc: stable@vger.kernel.org
Message-Id: <20221125145724.1129962-11-lingshan.zhu@intel.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 6a3b2f17

drivers/vdpa/ifcvf/ifcvf_main.c

+13 −21
Original line number Diff line number Diff line
@@ -746,12 +746,20 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, 
	int ret;



	ifcvf_mgmt_dev = container_of(mdev, struct ifcvf_vdpa_mgmt_dev, mdev);

	if (!ifcvf_mgmt_dev->adapter)

		return -EOPNOTSUPP;

	vf = &ifcvf_mgmt_dev->vf;

	pdev = vf->pdev;

	adapter = vdpa_alloc_device(struct ifcvf_adapter, vdpa,

				    &pdev->dev, &ifc_vdpa_ops, 1, 1, NULL, false);

	if (IS_ERR(adapter)) {

		IFCVF_ERR(pdev, "Failed to allocate vDPA structure");

		return PTR_ERR(adapter);

	}



	adapter = ifcvf_mgmt_dev->adapter;

	vf = adapter->vf;

	pdev = adapter->pdev;

	ifcvf_mgmt_dev->adapter = adapter;

	adapter->pdev = pdev;

	adapter->vdpa.dma_dev = &pdev->dev;

	adapter->vdpa.mdev = mdev;

	adapter->vf = vf;

	vdpa_dev = &adapter->vdpa;



	if (name)
@@ -769,7 +777,6 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, 
	return 0;

}





static void ifcvf_vdpa_dev_del(struct vdpa_mgmt_dev *mdev, struct vdpa_device *dev)

{

	struct ifcvf_vdpa_mgmt_dev *ifcvf_mgmt_dev;
@@ -788,7 +795,6 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
{

	struct ifcvf_vdpa_mgmt_dev *ifcvf_mgmt_dev;

	struct device *dev = &pdev->dev;

	struct ifcvf_adapter *adapter;

	struct ifcvf_hw *vf;

	u32 dev_type;

	int ret, i;
@@ -825,24 +831,10 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return -ENOMEM;

	}



	adapter = vdpa_alloc_device(struct ifcvf_adapter, vdpa,

				    dev, &ifc_vdpa_ops, 1, 1, NULL, false);

	if (IS_ERR(adapter)) {

		IFCVF_ERR(pdev, "Failed to allocate vDPA structure");

		ret = PTR_ERR(adapter);

		goto err;

	}



	adapter->pdev = pdev;

	adapter->vdpa.dma_dev = &pdev->dev;

	adapter->vdpa.mdev = &ifcvf_mgmt_dev->mdev;

	ifcvf_mgmt_dev->adapter = adapter;



	vf = &ifcvf_mgmt_dev->vf;

	vf->dev_type = get_dev_type(pdev);

	vf->base = pcim_iomap_table(pdev);

	vf->pdev = pdev;

	adapter->vf = vf;



	ret = ifcvf_init_hw(vf, pdev);

	if (ret) {