* [PATCH v4] vdpa/vp_vdpa : add vdpa tool support in vp_vdpa
@ 2022-04-29 9:10 Cindy Lu
2022-05-05 7:56 ` Jason Wang
0 siblings, 1 reply; 3+ messages in thread
From: Cindy Lu @ 2022-04-29 9:10 UTC (permalink / raw)
To: mst, jasowang, lulu, virtualization, linux-kernel
this patch is to add the support for vdpa tool in vp_vdpa
here is the example steps
modprobe vp_vdpa
modprobe vhost_vdpa
echo 0000:00:06.0>/sys/bus/pci/drivers/virtio-pci/unbind
echo 1af4 1041 > /sys/bus/pci/drivers/vp-vdpa/new_id
vdpa dev add name vdpa1 mgmtdev pci/0000:00:06.0
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
drivers/vdpa/virtio_pci/vp_vdpa.c | 161 ++++++++++++++++++++++++------
include/linux/vdpa.h | 2 +-
2 files changed, 130 insertions(+), 33 deletions(-)
diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
index cce101e6a940..adb75d77eff2 100644
--- a/drivers/vdpa/virtio_pci/vp_vdpa.c
+++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
@@ -32,7 +32,7 @@ struct vp_vring {
struct vp_vdpa {
struct vdpa_device vdpa;
- struct virtio_pci_modern_device mdev;
+ struct virtio_pci_modern_device *mdev;
struct vp_vring *vring;
struct vdpa_callback config_cb;
char msix_name[VP_VDPA_NAME_SIZE];
@@ -41,6 +41,12 @@ struct vp_vdpa {
int vectors;
};
+struct vp_vdpa_mgmtdev {
+ struct vdpa_mgmt_dev mgtdev;
+ struct virtio_pci_modern_device *mdev;
+ struct vp_vdpa *vp_vdpa;
+};
+
static struct vp_vdpa *vdpa_to_vp(struct vdpa_device *vdpa)
{
return container_of(vdpa, struct vp_vdpa, vdpa);
@@ -50,7 +56,12 @@ static struct virtio_pci_modern_device *vdpa_to_mdev(struct vdpa_device *vdpa)
{
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
- return &vp_vdpa->mdev;
+ return vp_vdpa->mdev;
+}
+
+static struct virtio_pci_modern_device *vp_vdpa_to_mdev(struct vp_vdpa *vp_vdpa)
+{
+ return vp_vdpa->mdev;
}
static u64 vp_vdpa_get_device_features(struct vdpa_device *vdpa)
@@ -96,7 +107,7 @@ static int vp_vdpa_get_vq_irq(struct vdpa_device *vdpa, u16 idx)
static void vp_vdpa_free_irq(struct vp_vdpa *vp_vdpa)
{
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
struct pci_dev *pdev = mdev->pci_dev;
int i;
@@ -143,7 +154,7 @@ static irqreturn_t vp_vdpa_config_handler(int irq, void *arg)
static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa)
{
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
struct pci_dev *pdev = mdev->pci_dev;
int i, ret, irq;
int queues = vp_vdpa->queues;
@@ -198,7 +209,7 @@ static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa)
static void vp_vdpa_set_status(struct vdpa_device *vdpa, u8 status)
{
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
u8 s = vp_vdpa_get_status(vdpa);
if (status & VIRTIO_CONFIG_S_DRIVER_OK &&
@@ -212,7 +223,7 @@ static void vp_vdpa_set_status(struct vdpa_device *vdpa, u8 status)
static int vp_vdpa_reset(struct vdpa_device *vdpa)
{
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
u8 s = vp_vdpa_get_status(vdpa);
vp_modern_set_status(mdev, 0);
@@ -372,7 +383,7 @@ static void vp_vdpa_get_config(struct vdpa_device *vdpa,
void *buf, unsigned int len)
{
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
u8 old, new;
u8 *p;
int i;
@@ -392,7 +403,7 @@ static void vp_vdpa_set_config(struct vdpa_device *vdpa,
unsigned int len)
{
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
const u8 *p = buf;
int i;
@@ -412,7 +423,7 @@ static struct vdpa_notification_area
vp_vdpa_get_vq_notification(struct vdpa_device *vdpa, u16 qid)
{
struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
- struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
+ struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
struct vdpa_notification_area notify;
notify.addr = vp_vdpa->vring[qid].notify_pa;
@@ -454,38 +465,31 @@ static void vp_vdpa_free_irq_vectors(void *data)
pci_free_irq_vectors(data);
}
-static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
+ const struct vdpa_dev_set_config *add_config)
{
- struct virtio_pci_modern_device *mdev;
+ struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev =
+ container_of(v_mdev, struct vp_vdpa_mgmtdev, mgtdev);
+
+ struct virtio_pci_modern_device *mdev = vp_vdpa_mgtdev->mdev;
+ struct pci_dev *pdev = mdev->pci_dev;
struct device *dev = &pdev->dev;
- struct vp_vdpa *vp_vdpa;
+ struct vp_vdpa *vp_vdpa = NULL;
int ret, i;
- ret = pcim_enable_device(pdev);
- if (ret)
- return ret;
+ vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa, dev, &vp_vdpa_ops,
+ name, false);
- vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa,
- dev, &vp_vdpa_ops, NULL, false);
if (IS_ERR(vp_vdpa)) {
dev_err(dev, "vp_vdpa: Failed to allocate vDPA structure\n");
return PTR_ERR(vp_vdpa);
}
- mdev = &vp_vdpa->mdev;
- mdev->pci_dev = pdev;
-
- ret = vp_modern_probe(mdev);
- if (ret) {
- dev_err(&pdev->dev, "Failed to probe modern PCI device\n");
- goto err;
- }
-
- pci_set_master(pdev);
- pci_set_drvdata(pdev, vp_vdpa);
+ vp_vdpa_mgtdev->vp_vdpa = vp_vdpa;
vp_vdpa->vdpa.dma_dev = &pdev->dev;
vp_vdpa->queues = vp_modern_get_num_queues(mdev);
+ vp_vdpa->mdev = mdev;
ret = devm_add_action_or_reset(dev, vp_vdpa_free_irq_vectors, pdev);
if (ret) {
@@ -516,7 +520,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
vp_vdpa->config_irq = VIRTIO_MSI_NO_VECTOR;
- ret = vdpa_register_device(&vp_vdpa->vdpa, vp_vdpa->queues);
+ vp_vdpa->vdpa.mdev = &vp_vdpa_mgtdev->mgtdev;
+ ret = _vdpa_register_device(&vp_vdpa->vdpa, vp_vdpa->queues);
if (ret) {
dev_err(&pdev->dev, "Failed to register to vdpa bus\n");
goto err;
@@ -529,12 +534,104 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return ret;
}
+static void vp_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev,
+ struct vdpa_device *dev)
+{
+ struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev =
+ container_of(v_mdev, struct vp_vdpa_mgmtdev, mgtdev);
+
+ struct vp_vdpa *vp_vdpa = vp_vdpa_mgtdev->vp_vdpa;
+
+ _vdpa_unregister_device(&vp_vdpa->vdpa);
+ vp_vdpa_mgtdev->vp_vdpa = NULL;
+}
+
+static const struct vdpa_mgmtdev_ops vp_vdpa_mdev_ops = {
+ .dev_add = vp_vdpa_dev_add,
+ .dev_del = vp_vdpa_dev_del,
+};
+
+static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+ struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev = NULL;
+ struct vdpa_mgmt_dev *mgtdev;
+ struct device *dev = &pdev->dev;
+ struct virtio_pci_modern_device *mdev = NULL;
+ struct virtio_device_id *mdev_id = NULL;
+ int err;
+
+ vp_vdpa_mgtdev = kzalloc(sizeof(*vp_vdpa_mgtdev), GFP_KERNEL);
+ if (!vp_vdpa_mgtdev)
+ return -ENOMEM;
+
+ mgtdev = &vp_vdpa_mgtdev->mgtdev;
+ mgtdev->ops = &vp_vdpa_mdev_ops;
+ mgtdev->device = dev;
+
+ mdev = kzalloc(sizeof(struct virtio_pci_modern_device), GFP_KERNEL);
+ if (!mdev) {
+ err = -ENOMEM;
+ goto mdev_err;
+ }
+
+ mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL);
+ if (!mdev_id) {
+ err = -ENOMEM;
+ goto mdev_id_err;
+ }
+
+ vp_vdpa_mgtdev->mdev = mdev;
+ mdev->pci_dev = pdev;
+
+ err = pcim_enable_device(pdev);
+ if (err) {
+ goto probe_err;
+ }
+
+ err = vp_modern_probe(mdev);
+ if (err) {
+ dev_err(&pdev->dev, "Failed to probe modern PCI device\n");
+ goto probe_err;
+ }
+
+ mdev_id->device = mdev->id.device;
+ mdev_id->vendor = mdev->id.vendor;
+ mgtdev->id_table = mdev_id;
+ mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev);
+ mgtdev->supported_features = vp_modern_get_features(mdev);
+ pci_set_master(pdev);
+ pci_set_drvdata(pdev, vp_vdpa_mgtdev);
+
+ err = vdpa_mgmtdev_register(mgtdev);
+ if (err) {
+ dev_err(&pdev->dev, "Failed to register vdpa mgmtdev device\n");
+ goto register_err;
+ }
+
+ return 0;
+
+register_err:
+ vp_modern_remove(vp_vdpa_mgtdev->mdev);
+probe_err:
+ kfree(mdev_id);
+mdev_id_err:
+ kfree(mdev);
+mdev_err:
+ kfree(vp_vdpa_mgtdev);
+ return err;
+}
+
static void vp_vdpa_remove(struct pci_dev *pdev)
{
- struct vp_vdpa *vp_vdpa = pci_get_drvdata(pdev);
+ struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev = pci_get_drvdata(pdev);
+ struct virtio_pci_modern_device *mdev = NULL;
- vp_modern_remove(&vp_vdpa->mdev);
- vdpa_unregister_device(&vp_vdpa->vdpa);
+ mdev = vp_vdpa_mgtdev->mdev;
+ vp_modern_remove(mdev);
+ vdpa_mgmtdev_unregister(&vp_vdpa_mgtdev->mgtdev);
+ kfree(&vp_vdpa_mgtdev->mgtdev.id_table);
+ kfree(mdev);
+ kfree(vp_vdpa_mgtdev);
}
static struct pci_driver vp_vdpa_driver = {
diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
index 721089bb4c84..342c454c1623 100644
--- a/include/linux/vdpa.h
+++ b/include/linux/vdpa.h
@@ -462,7 +462,7 @@ struct vdpa_mgmtdev_ops {
struct vdpa_mgmt_dev {
struct device *device;
const struct vdpa_mgmtdev_ops *ops;
- const struct virtio_device_id *id_table;
+ struct virtio_device_id *id_table;
u64 config_attr_mask;
struct list_head list;
u64 supported_features;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4] vdpa/vp_vdpa : add vdpa tool support in vp_vdpa
2022-04-29 9:10 [PATCH v4] vdpa/vp_vdpa : add vdpa tool support in vp_vdpa Cindy Lu
@ 2022-05-05 7:56 ` Jason Wang
0 siblings, 0 replies; 3+ messages in thread
From: Jason Wang @ 2022-05-05 7:56 UTC (permalink / raw)
To: Cindy Lu, mst, virtualization, linux-kernel
在 2022/4/29 17:10, Cindy Lu 写道:
> this patch is to add the support for vdpa tool in vp_vdpa
> here is the example steps
>
> modprobe vp_vdpa
> modprobe vhost_vdpa
> echo 0000:00:06.0>/sys/bus/pci/drivers/virtio-pci/unbind
> echo 1af4 1041 > /sys/bus/pci/drivers/vp-vdpa/new_id
>
> vdpa dev add name vdpa1 mgmtdev pci/0000:00:06.0
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vdpa/virtio_pci/vp_vdpa.c | 161 ++++++++++++++++++++++++------
> include/linux/vdpa.h | 2 +-
> 2 files changed, 130 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
> index cce101e6a940..adb75d77eff2 100644
> --- a/drivers/vdpa/virtio_pci/vp_vdpa.c
> +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
> @@ -32,7 +32,7 @@ struct vp_vring {
>
> struct vp_vdpa {
> struct vdpa_device vdpa;
> - struct virtio_pci_modern_device mdev;
> + struct virtio_pci_modern_device *mdev;
> struct vp_vring *vring;
> struct vdpa_callback config_cb;
> char msix_name[VP_VDPA_NAME_SIZE];
> @@ -41,6 +41,12 @@ struct vp_vdpa {
> int vectors;
> };
>
> +struct vp_vdpa_mgmtdev {
> + struct vdpa_mgmt_dev mgtdev;
> + struct virtio_pci_modern_device *mdev;
> + struct vp_vdpa *vp_vdpa;
> +};
> +
> static struct vp_vdpa *vdpa_to_vp(struct vdpa_device *vdpa)
> {
> return container_of(vdpa, struct vp_vdpa, vdpa);
> @@ -50,7 +56,12 @@ static struct virtio_pci_modern_device *vdpa_to_mdev(struct vdpa_device *vdpa)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
>
> - return &vp_vdpa->mdev;
> + return vp_vdpa->mdev;
> +}
> +
> +static struct virtio_pci_modern_device *vp_vdpa_to_mdev(struct vp_vdpa *vp_vdpa)
> +{
> + return vp_vdpa->mdev;
> }
>
> static u64 vp_vdpa_get_device_features(struct vdpa_device *vdpa)
> @@ -96,7 +107,7 @@ static int vp_vdpa_get_vq_irq(struct vdpa_device *vdpa, u16 idx)
>
> static void vp_vdpa_free_irq(struct vp_vdpa *vp_vdpa)
> {
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> struct pci_dev *pdev = mdev->pci_dev;
> int i;
>
> @@ -143,7 +154,7 @@ static irqreturn_t vp_vdpa_config_handler(int irq, void *arg)
>
> static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa)
> {
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> struct pci_dev *pdev = mdev->pci_dev;
> int i, ret, irq;
> int queues = vp_vdpa->queues;
> @@ -198,7 +209,7 @@ static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa)
> static void vp_vdpa_set_status(struct vdpa_device *vdpa, u8 status)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> u8 s = vp_vdpa_get_status(vdpa);
>
> if (status & VIRTIO_CONFIG_S_DRIVER_OK &&
> @@ -212,7 +223,7 @@ static void vp_vdpa_set_status(struct vdpa_device *vdpa, u8 status)
> static int vp_vdpa_reset(struct vdpa_device *vdpa)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> u8 s = vp_vdpa_get_status(vdpa);
>
> vp_modern_set_status(mdev, 0);
> @@ -372,7 +383,7 @@ static void vp_vdpa_get_config(struct vdpa_device *vdpa,
> void *buf, unsigned int len)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> u8 old, new;
> u8 *p;
> int i;
> @@ -392,7 +403,7 @@ static void vp_vdpa_set_config(struct vdpa_device *vdpa,
> unsigned int len)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> const u8 *p = buf;
> int i;
>
> @@ -412,7 +423,7 @@ static struct vdpa_notification_area
> vp_vdpa_get_vq_notification(struct vdpa_device *vdpa, u16 qid)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> struct vdpa_notification_area notify;
>
> notify.addr = vp_vdpa->vring[qid].notify_pa;
> @@ -454,38 +465,31 @@ static void vp_vdpa_free_irq_vectors(void *data)
> pci_free_irq_vectors(data);
> }
>
> -static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> +static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
> + const struct vdpa_dev_set_config *add_config)
> {
> - struct virtio_pci_modern_device *mdev;
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev =
> + container_of(v_mdev, struct vp_vdpa_mgmtdev, mgtdev);
> +
> + struct virtio_pci_modern_device *mdev = vp_vdpa_mgtdev->mdev;
> + struct pci_dev *pdev = mdev->pci_dev;
> struct device *dev = &pdev->dev;
> - struct vp_vdpa *vp_vdpa;
> + struct vp_vdpa *vp_vdpa = NULL;
> int ret, i;
>
> - ret = pcim_enable_device(pdev);
> - if (ret)
> - return ret;
> + vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa, dev, &vp_vdpa_ops,
> + name, false);
>
> - vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa,
> - dev, &vp_vdpa_ops, NULL, false);
> if (IS_ERR(vp_vdpa)) {
> dev_err(dev, "vp_vdpa: Failed to allocate vDPA structure\n");
> return PTR_ERR(vp_vdpa);
> }
>
> - mdev = &vp_vdpa->mdev;
> - mdev->pci_dev = pdev;
> -
> - ret = vp_modern_probe(mdev);
> - if (ret) {
> - dev_err(&pdev->dev, "Failed to probe modern PCI device\n");
> - goto err;
> - }
> -
> - pci_set_master(pdev);
> - pci_set_drvdata(pdev, vp_vdpa);
> + vp_vdpa_mgtdev->vp_vdpa = vp_vdpa;
>
> vp_vdpa->vdpa.dma_dev = &pdev->dev;
> vp_vdpa->queues = vp_modern_get_num_queues(mdev);
> + vp_vdpa->mdev = mdev;
>
> ret = devm_add_action_or_reset(dev, vp_vdpa_free_irq_vectors, pdev);
> if (ret) {
> @@ -516,7 +520,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> }
> vp_vdpa->config_irq = VIRTIO_MSI_NO_VECTOR;
>
> - ret = vdpa_register_device(&vp_vdpa->vdpa, vp_vdpa->queues);
> + vp_vdpa->vdpa.mdev = &vp_vdpa_mgtdev->mgtdev;
> + ret = _vdpa_register_device(&vp_vdpa->vdpa, vp_vdpa->queues);
> if (ret) {
> dev_err(&pdev->dev, "Failed to register to vdpa bus\n");
> goto err;
> @@ -529,12 +534,104 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> return ret;
> }
>
> +static void vp_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev,
> + struct vdpa_device *dev)
> +{
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev =
> + container_of(v_mdev, struct vp_vdpa_mgmtdev, mgtdev);
> +
> + struct vp_vdpa *vp_vdpa = vp_vdpa_mgtdev->vp_vdpa;
> +
> + _vdpa_unregister_device(&vp_vdpa->vdpa);
> + vp_vdpa_mgtdev->vp_vdpa = NULL;
> +}
> +
> +static const struct vdpa_mgmtdev_ops vp_vdpa_mdev_ops = {
> + .dev_add = vp_vdpa_dev_add,
> + .dev_del = vp_vdpa_dev_del,
> +};
> +
> +static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> +{
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev = NULL;
> + struct vdpa_mgmt_dev *mgtdev;
> + struct device *dev = &pdev->dev;
> + struct virtio_pci_modern_device *mdev = NULL;
> + struct virtio_device_id *mdev_id = NULL;
> + int err;
> +
> + vp_vdpa_mgtdev = kzalloc(sizeof(*vp_vdpa_mgtdev), GFP_KERNEL);
> + if (!vp_vdpa_mgtdev)
> + return -ENOMEM;
> +
> + mgtdev = &vp_vdpa_mgtdev->mgtdev;
> + mgtdev->ops = &vp_vdpa_mdev_ops;
> + mgtdev->device = dev;
> +
> + mdev = kzalloc(sizeof(struct virtio_pci_modern_device), GFP_KERNEL);
> + if (!mdev) {
> + err = -ENOMEM;
> + goto mdev_err;
> + }
> +
> + mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL);
> + if (!mdev_id) {
> + err = -ENOMEM;
> + goto mdev_id_err;
> + }
> +
> + vp_vdpa_mgtdev->mdev = mdev;
> + mdev->pci_dev = pdev;
> +
> + err = pcim_enable_device(pdev);
> + if (err) {
> + goto probe_err;
> + }
> +
> + err = vp_modern_probe(mdev);
> + if (err) {
> + dev_err(&pdev->dev, "Failed to probe modern PCI device\n");
> + goto probe_err;
> + }
> +
> + mdev_id->device = mdev->id.device;
> + mdev_id->vendor = mdev->id.vendor;
> + mgtdev->id_table = mdev_id;
> + mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev);
> + mgtdev->supported_features = vp_modern_get_features(mdev);
> + pci_set_master(pdev);
> + pci_set_drvdata(pdev, vp_vdpa_mgtdev);
> +
> + err = vdpa_mgmtdev_register(mgtdev);
> + if (err) {
> + dev_err(&pdev->dev, "Failed to register vdpa mgmtdev device\n");
> + goto register_err;
> + }
> +
> + return 0;
> +
> +register_err:
> + vp_modern_remove(vp_vdpa_mgtdev->mdev);
> +probe_err:
> + kfree(mdev_id);
> +mdev_id_err:
> + kfree(mdev);
> +mdev_err:
> + kfree(vp_vdpa_mgtdev);
> + return err;
> +}
> +
> static void vp_vdpa_remove(struct pci_dev *pdev)
> {
> - struct vp_vdpa *vp_vdpa = pci_get_drvdata(pdev);
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev = pci_get_drvdata(pdev);
> + struct virtio_pci_modern_device *mdev = NULL;
>
> - vp_modern_remove(&vp_vdpa->mdev);
> - vdpa_unregister_device(&vp_vdpa->vdpa);
> + mdev = vp_vdpa_mgtdev->mdev;
> + vp_modern_remove(mdev);
> + vdpa_mgmtdev_unregister(&vp_vdpa_mgtdev->mgtdev);
> + kfree(&vp_vdpa_mgtdev->mgtdev.id_table);
> + kfree(mdev);
> + kfree(vp_vdpa_mgtdev);
> }
>
> static struct pci_driver vp_vdpa_driver = {
> diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
> index 721089bb4c84..342c454c1623 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -462,7 +462,7 @@ struct vdpa_mgmtdev_ops {
> struct vdpa_mgmt_dev {
> struct device *device;
> const struct vdpa_mgmtdev_ops *ops;
> - const struct virtio_device_id *id_table;
> + struct virtio_device_id *id_table;
> u64 config_attr_mask;
> struct list_head list;
> u64 supported_features;
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4] vdpa/vp_vdpa : add vdpa tool support in vp_vdpa
@ 2022-05-05 7:56 ` Jason Wang
0 siblings, 0 replies; 3+ messages in thread
From: Jason Wang @ 2022-05-05 7:56 UTC (permalink / raw)
To: Cindy Lu, mst, virtualization, linux-kernel
在 2022/4/29 17:10, Cindy Lu 写道:
> this patch is to add the support for vdpa tool in vp_vdpa
> here is the example steps
>
> modprobe vp_vdpa
> modprobe vhost_vdpa
> echo 0000:00:06.0>/sys/bus/pci/drivers/virtio-pci/unbind
> echo 1af4 1041 > /sys/bus/pci/drivers/vp-vdpa/new_id
>
> vdpa dev add name vdpa1 mgmtdev pci/0000:00:06.0
>
> Signed-off-by: Cindy Lu <lulu@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vdpa/virtio_pci/vp_vdpa.c | 161 ++++++++++++++++++++++++------
> include/linux/vdpa.h | 2 +-
> 2 files changed, 130 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
> index cce101e6a940..adb75d77eff2 100644
> --- a/drivers/vdpa/virtio_pci/vp_vdpa.c
> +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
> @@ -32,7 +32,7 @@ struct vp_vring {
>
> struct vp_vdpa {
> struct vdpa_device vdpa;
> - struct virtio_pci_modern_device mdev;
> + struct virtio_pci_modern_device *mdev;
> struct vp_vring *vring;
> struct vdpa_callback config_cb;
> char msix_name[VP_VDPA_NAME_SIZE];
> @@ -41,6 +41,12 @@ struct vp_vdpa {
> int vectors;
> };
>
> +struct vp_vdpa_mgmtdev {
> + struct vdpa_mgmt_dev mgtdev;
> + struct virtio_pci_modern_device *mdev;
> + struct vp_vdpa *vp_vdpa;
> +};
> +
> static struct vp_vdpa *vdpa_to_vp(struct vdpa_device *vdpa)
> {
> return container_of(vdpa, struct vp_vdpa, vdpa);
> @@ -50,7 +56,12 @@ static struct virtio_pci_modern_device *vdpa_to_mdev(struct vdpa_device *vdpa)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
>
> - return &vp_vdpa->mdev;
> + return vp_vdpa->mdev;
> +}
> +
> +static struct virtio_pci_modern_device *vp_vdpa_to_mdev(struct vp_vdpa *vp_vdpa)
> +{
> + return vp_vdpa->mdev;
> }
>
> static u64 vp_vdpa_get_device_features(struct vdpa_device *vdpa)
> @@ -96,7 +107,7 @@ static int vp_vdpa_get_vq_irq(struct vdpa_device *vdpa, u16 idx)
>
> static void vp_vdpa_free_irq(struct vp_vdpa *vp_vdpa)
> {
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> struct pci_dev *pdev = mdev->pci_dev;
> int i;
>
> @@ -143,7 +154,7 @@ static irqreturn_t vp_vdpa_config_handler(int irq, void *arg)
>
> static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa)
> {
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> struct pci_dev *pdev = mdev->pci_dev;
> int i, ret, irq;
> int queues = vp_vdpa->queues;
> @@ -198,7 +209,7 @@ static int vp_vdpa_request_irq(struct vp_vdpa *vp_vdpa)
> static void vp_vdpa_set_status(struct vdpa_device *vdpa, u8 status)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> u8 s = vp_vdpa_get_status(vdpa);
>
> if (status & VIRTIO_CONFIG_S_DRIVER_OK &&
> @@ -212,7 +223,7 @@ static void vp_vdpa_set_status(struct vdpa_device *vdpa, u8 status)
> static int vp_vdpa_reset(struct vdpa_device *vdpa)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> u8 s = vp_vdpa_get_status(vdpa);
>
> vp_modern_set_status(mdev, 0);
> @@ -372,7 +383,7 @@ static void vp_vdpa_get_config(struct vdpa_device *vdpa,
> void *buf, unsigned int len)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> u8 old, new;
> u8 *p;
> int i;
> @@ -392,7 +403,7 @@ static void vp_vdpa_set_config(struct vdpa_device *vdpa,
> unsigned int len)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> const u8 *p = buf;
> int i;
>
> @@ -412,7 +423,7 @@ static struct vdpa_notification_area
> vp_vdpa_get_vq_notification(struct vdpa_device *vdpa, u16 qid)
> {
> struct vp_vdpa *vp_vdpa = vdpa_to_vp(vdpa);
> - struct virtio_pci_modern_device *mdev = &vp_vdpa->mdev;
> + struct virtio_pci_modern_device *mdev = vp_vdpa_to_mdev(vp_vdpa);
> struct vdpa_notification_area notify;
>
> notify.addr = vp_vdpa->vring[qid].notify_pa;
> @@ -454,38 +465,31 @@ static void vp_vdpa_free_irq_vectors(void *data)
> pci_free_irq_vectors(data);
> }
>
> -static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> +static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
> + const struct vdpa_dev_set_config *add_config)
> {
> - struct virtio_pci_modern_device *mdev;
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev =
> + container_of(v_mdev, struct vp_vdpa_mgmtdev, mgtdev);
> +
> + struct virtio_pci_modern_device *mdev = vp_vdpa_mgtdev->mdev;
> + struct pci_dev *pdev = mdev->pci_dev;
> struct device *dev = &pdev->dev;
> - struct vp_vdpa *vp_vdpa;
> + struct vp_vdpa *vp_vdpa = NULL;
> int ret, i;
>
> - ret = pcim_enable_device(pdev);
> - if (ret)
> - return ret;
> + vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa, dev, &vp_vdpa_ops,
> + name, false);
>
> - vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa,
> - dev, &vp_vdpa_ops, NULL, false);
> if (IS_ERR(vp_vdpa)) {
> dev_err(dev, "vp_vdpa: Failed to allocate vDPA structure\n");
> return PTR_ERR(vp_vdpa);
> }
>
> - mdev = &vp_vdpa->mdev;
> - mdev->pci_dev = pdev;
> -
> - ret = vp_modern_probe(mdev);
> - if (ret) {
> - dev_err(&pdev->dev, "Failed to probe modern PCI device\n");
> - goto err;
> - }
> -
> - pci_set_master(pdev);
> - pci_set_drvdata(pdev, vp_vdpa);
> + vp_vdpa_mgtdev->vp_vdpa = vp_vdpa;
>
> vp_vdpa->vdpa.dma_dev = &pdev->dev;
> vp_vdpa->queues = vp_modern_get_num_queues(mdev);
> + vp_vdpa->mdev = mdev;
>
> ret = devm_add_action_or_reset(dev, vp_vdpa_free_irq_vectors, pdev);
> if (ret) {
> @@ -516,7 +520,8 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> }
> vp_vdpa->config_irq = VIRTIO_MSI_NO_VECTOR;
>
> - ret = vdpa_register_device(&vp_vdpa->vdpa, vp_vdpa->queues);
> + vp_vdpa->vdpa.mdev = &vp_vdpa_mgtdev->mgtdev;
> + ret = _vdpa_register_device(&vp_vdpa->vdpa, vp_vdpa->queues);
> if (ret) {
> dev_err(&pdev->dev, "Failed to register to vdpa bus\n");
> goto err;
> @@ -529,12 +534,104 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> return ret;
> }
>
> +static void vp_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev,
> + struct vdpa_device *dev)
> +{
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev =
> + container_of(v_mdev, struct vp_vdpa_mgmtdev, mgtdev);
> +
> + struct vp_vdpa *vp_vdpa = vp_vdpa_mgtdev->vp_vdpa;
> +
> + _vdpa_unregister_device(&vp_vdpa->vdpa);
> + vp_vdpa_mgtdev->vp_vdpa = NULL;
> +}
> +
> +static const struct vdpa_mgmtdev_ops vp_vdpa_mdev_ops = {
> + .dev_add = vp_vdpa_dev_add,
> + .dev_del = vp_vdpa_dev_del,
> +};
> +
> +static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> +{
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev = NULL;
> + struct vdpa_mgmt_dev *mgtdev;
> + struct device *dev = &pdev->dev;
> + struct virtio_pci_modern_device *mdev = NULL;
> + struct virtio_device_id *mdev_id = NULL;
> + int err;
> +
> + vp_vdpa_mgtdev = kzalloc(sizeof(*vp_vdpa_mgtdev), GFP_KERNEL);
> + if (!vp_vdpa_mgtdev)
> + return -ENOMEM;
> +
> + mgtdev = &vp_vdpa_mgtdev->mgtdev;
> + mgtdev->ops = &vp_vdpa_mdev_ops;
> + mgtdev->device = dev;
> +
> + mdev = kzalloc(sizeof(struct virtio_pci_modern_device), GFP_KERNEL);
> + if (!mdev) {
> + err = -ENOMEM;
> + goto mdev_err;
> + }
> +
> + mdev_id = kzalloc(sizeof(struct virtio_device_id), GFP_KERNEL);
> + if (!mdev_id) {
> + err = -ENOMEM;
> + goto mdev_id_err;
> + }
> +
> + vp_vdpa_mgtdev->mdev = mdev;
> + mdev->pci_dev = pdev;
> +
> + err = pcim_enable_device(pdev);
> + if (err) {
> + goto probe_err;
> + }
> +
> + err = vp_modern_probe(mdev);
> + if (err) {
> + dev_err(&pdev->dev, "Failed to probe modern PCI device\n");
> + goto probe_err;
> + }
> +
> + mdev_id->device = mdev->id.device;
> + mdev_id->vendor = mdev->id.vendor;
> + mgtdev->id_table = mdev_id;
> + mgtdev->max_supported_vqs = vp_modern_get_num_queues(mdev);
> + mgtdev->supported_features = vp_modern_get_features(mdev);
> + pci_set_master(pdev);
> + pci_set_drvdata(pdev, vp_vdpa_mgtdev);
> +
> + err = vdpa_mgmtdev_register(mgtdev);
> + if (err) {
> + dev_err(&pdev->dev, "Failed to register vdpa mgmtdev device\n");
> + goto register_err;
> + }
> +
> + return 0;
> +
> +register_err:
> + vp_modern_remove(vp_vdpa_mgtdev->mdev);
> +probe_err:
> + kfree(mdev_id);
> +mdev_id_err:
> + kfree(mdev);
> +mdev_err:
> + kfree(vp_vdpa_mgtdev);
> + return err;
> +}
> +
> static void vp_vdpa_remove(struct pci_dev *pdev)
> {
> - struct vp_vdpa *vp_vdpa = pci_get_drvdata(pdev);
> + struct vp_vdpa_mgmtdev *vp_vdpa_mgtdev = pci_get_drvdata(pdev);
> + struct virtio_pci_modern_device *mdev = NULL;
>
> - vp_modern_remove(&vp_vdpa->mdev);
> - vdpa_unregister_device(&vp_vdpa->vdpa);
> + mdev = vp_vdpa_mgtdev->mdev;
> + vp_modern_remove(mdev);
> + vdpa_mgmtdev_unregister(&vp_vdpa_mgtdev->mgtdev);
> + kfree(&vp_vdpa_mgtdev->mgtdev.id_table);
> + kfree(mdev);
> + kfree(vp_vdpa_mgtdev);
> }
>
> static struct pci_driver vp_vdpa_driver = {
> diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
> index 721089bb4c84..342c454c1623 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -462,7 +462,7 @@ struct vdpa_mgmtdev_ops {
> struct vdpa_mgmt_dev {
> struct device *device;
> const struct vdpa_mgmtdev_ops *ops;
> - const struct virtio_device_id *id_table;
> + struct virtio_device_id *id_table;
> u64 config_attr_mask;
> struct list_head list;
> u64 supported_features;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-05 7:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-29 9:10 [PATCH v4] vdpa/vp_vdpa : add vdpa tool support in vp_vdpa Cindy Lu
2022-05-05 7:56 ` Jason Wang
2022-05-05 7:56 ` Jason Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.