From: Parav Pandit <parav@nvidia.com>
To: <virtualization@lists.linux-foundation.org>
Cc: <mst@redhat.com>, <jasowang@redhat.com>, <parav@nvidia.com>,
<elic@nvidia.com>, <netdev@vger.kernel.org>
Subject: [PATCH 7/7] vdpa/vdpa_sim: Enable user to create vdpasim net devices
Date: Thu, 12 Nov 2020 08:40:05 +0200 [thread overview]
Message-ID: <20201112064005.349268-8-parav@nvidia.com> (raw)
In-Reply-To: <20201112064005.349268-1-parav@nvidia.com>
Enable user to create vdpasim net simulate devices.
Show vdpa parent device that supports creating, deleting vdpa devices.
$ vdpa parentdev show
vdpasim:
supported_classes
net
$ vdpa parentdev show -jp
{
"show": {
"vdpasim": {
"supported_classes": {
"net"
}
}
}
Create a vdpa device of type networking named as "foo2" from
the parent device vdpasim:
$ vdpa dev add parentdev vdpasim type net name foo2
Show the newly created vdpa device by its name:
$ vdpa dev show foo2
foo2: type network parentdev vdpasim vendor_id 0 max_vqs 2 max_vq_size 256
$ vdpa dev show foo2 -jp
{
"dev": {
"foo2": {
"type": "network",
"parentdev": "vdpasim",
"vendor_id": 0,
"max_vqs": 2,
"max_vq_size": 256
}
}
}
Delete the vdpa device after its use:
$ vdpa dev del foo2
Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Eli Cohen <elic@nvidia.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
drivers/vdpa/vdpa_sim/vdpa_sim.c | 81 +++++++++++++++++++++++++++-----
1 file changed, 69 insertions(+), 12 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index aed1bb7770ab..85776e4e6749 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -28,6 +28,7 @@
#include <linux/vhost_iotlb.h>
#include <uapi/linux/virtio_config.h>
#include <uapi/linux/virtio_net.h>
+#include <uapi/linux/vdpa.h>
#define DRV_VERSION "0.1"
#define DRV_AUTHOR "Jason Wang <jasowang@redhat.com>"
@@ -42,6 +43,17 @@ static char *macaddr;
module_param(macaddr, charp, 0);
MODULE_PARM_DESC(macaddr, "Ethernet MAC address");
+static struct vdpa_parent_dev parent_dev;
+
+static void vdpasim_parent_release(struct device *dev)
+{
+}
+
+static struct device vdpasim_parent = {
+ .init_name = "vdpasim",
+ .release = vdpasim_parent_release,
+};
+
struct vdpasim_virtqueue {
struct vringh vring;
struct vringh_kiov iov;
@@ -101,8 +113,6 @@ static inline __virtio16 cpu_to_vdpasim16(struct vdpasim *vdpasim, u16 val)
return __cpu_to_virtio16(vdpasim_is_little_endian(vdpasim), val);
}
-static struct vdpasim *vdpasim_dev;
-
static struct vdpasim *vdpa_to_sim(struct vdpa_device *vdpa)
{
return container_of(vdpa, struct vdpasim, vdpa);
@@ -345,7 +355,7 @@ static const struct dma_map_ops vdpasim_dma_ops = {
static const struct vdpa_config_ops vdpasim_net_config_ops;
static const struct vdpa_config_ops vdpasim_net_batch_config_ops;
-static struct vdpasim *vdpasim_create(void)
+static struct vdpasim *vdpasim_create(const char *name)
{
const struct vdpa_config_ops *ops;
struct vdpasim *vdpasim;
@@ -357,7 +367,7 @@ static struct vdpasim *vdpasim_create(void)
else
ops = &vdpasim_net_config_ops;
- vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, VDPASIM_VQ_NUM, NULL);
+ vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, VDPASIM_VQ_NUM, name);
if (!vdpasim)
goto err_alloc;
@@ -393,7 +403,8 @@ static struct vdpasim *vdpasim_create(void)
vringh_set_iotlb(&vdpasim->vqs[1].vring, vdpasim->iommu);
vdpasim->vdpa.dma_dev = dev;
- ret = vdpa_register_device(&vdpasim->vdpa);
+ vdpasim->vdpa.pdev = &parent_dev;
+ ret = _vdpa_register_device(&vdpasim->vdpa);
if (ret)
goto err_iommu;
@@ -714,21 +725,67 @@ static const struct vdpa_config_ops vdpasim_net_batch_config_ops = {
.free = vdpasim_free,
};
+static struct vdpa_device *
+vdpa_dev_add(struct vdpa_parent_dev *pdev, const char *name, u32 device_id)
+{
+ struct vdpasim *simdev;
+
+ if (device_id != VIRTIO_ID_NET)
+ return ERR_PTR(-EOPNOTSUPP);
+
+ simdev = vdpasim_create(name);
+ if (IS_ERR(simdev))
+ return (struct vdpa_device *)simdev;
+
+ return &simdev->vdpa;
+}
+
+static void vdpa_dev_del(struct vdpa_parent_dev *pdev, struct vdpa_device *dev)
+{
+ struct vdpasim *simdev = container_of(dev, struct vdpasim, vdpa);
+
+ _vdpa_unregister_device(&simdev->vdpa);
+}
+
+static const struct vdpa_dev_ops vdpa_dev_parent_ops = {
+ .dev_add = vdpa_dev_add,
+ .dev_del = vdpa_dev_del
+};
+
+static struct virtio_device_id id_table[] = {
+ { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
+ { 0 },
+};
+
+static struct vdpa_parent_dev parent_dev = {
+ .device = &vdpasim_parent,
+ .id_table = id_table,
+ .ops = &vdpa_dev_parent_ops,
+};
+
static int __init vdpasim_dev_init(void)
{
- vdpasim_dev = vdpasim_create();
+ int ret;
- if (!IS_ERR(vdpasim_dev))
- return 0;
+ ret = device_register(&vdpasim_parent);
+ if (ret)
+ return ret;
+
+ ret = vdpa_parentdev_register(&parent_dev);
+ if (ret)
+ goto parent_err;
- return PTR_ERR(vdpasim_dev);
+ return 0;
+
+parent_err:
+ device_unregister(&vdpasim_parent);
+ return ret;
}
static void __exit vdpasim_dev_exit(void)
{
- struct vdpa_device *vdpa = &vdpasim_dev->vdpa;
-
- vdpa_unregister_device(vdpa);
+ vdpa_parentdev_unregister(&parent_dev);
+ device_unregister(&vdpasim_parent);
}
module_init(vdpasim_dev_init)
--
2.26.2
next prev parent reply other threads:[~2020-11-12 6:40 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 6:39 [PATCH 0/7] Introduce vdpa management tool Parav Pandit
2020-11-12 6:39 ` [PATCH 1/7] vdpa: Add missing comment for virtqueue count Parav Pandit
2020-11-12 6:40 ` [PATCH 2/7] vdpa: Use simpler version of ida allocation Parav Pandit
2020-11-12 6:40 ` [PATCH 3/7] vdpa: Extend routine to accept vdpa device name Parav Pandit
2020-11-12 6:40 ` [PATCH 4/7] vdpa: Define vdpa parent device, ops and a netlink interface Parav Pandit
2020-11-12 6:40 ` [PATCH 5/7] vdpa: Enable a user to add and delete a vdpa device Parav Pandit
2020-11-12 6:40 ` [PATCH 6/7] vdpa: Enable user to query vdpa device info Parav Pandit
2020-11-12 6:40 ` Parav Pandit [this message]
2020-11-16 9:41 ` [PATCH 0/7] Introduce vdpa management tool Stefan Hajnoczi
2020-11-17 19:41 ` Parav Pandit
2020-11-16 22:23 ` Jakub Kicinski
2020-11-17 19:51 ` Parav Pandit
2020-12-16 9:13 ` Michael S. Tsirkin
[not found] ` <20201216080610.08541f44@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
2020-12-16 16:54 ` Parav Pandit
2020-12-16 19:57 ` Michael S. Tsirkin
2020-12-17 12:13 ` Parav Pandit
2020-11-27 3:53 ` Jason Wang
[not found] ` <CACycT3sYScObb9nN3g7L3cesjE7sCZWxZ5_5R1usGU9ePZEeqA@mail.gmail.com>
2020-11-30 3:36 ` [External] " Jason Wang
2020-11-30 7:07 ` Yongji Xie
2020-12-01 6:25 ` Jason Wang
2020-12-01 9:55 ` Yongji Xie
2020-12-01 11:32 ` Parav Pandit
2020-12-01 14:18 ` Yongji Xie
2020-12-01 15:58 ` Parav Pandit
2020-12-02 3:29 ` Yongji Xie
2020-12-02 4:53 ` Parav Pandit
2020-12-02 5:51 ` Jason Wang
2020-12-02 6:24 ` Parav Pandit
2020-12-02 7:55 ` Jason Wang
2020-12-02 9:27 ` Yongji Xie
2020-12-02 9:21 ` Yongji Xie
2020-12-02 11:13 ` Parav Pandit
2020-12-02 13:18 ` Yongji Xie
2020-12-02 5:48 ` Jason Wang
2020-12-08 22:47 ` David Ahern
2021-01-19 4:21 ` Parav Pandit
2020-12-16 9:16 ` Michael S. Tsirkin
2021-01-04 3:31 ` [PATCH linux-next v2 " Parav Pandit
2021-01-04 3:31 ` [PATCH linux-next v2 1/7] vdpa_sim_net: Make mac address array static Parav Pandit
2021-01-04 7:00 ` Jason Wang
2021-01-04 3:31 ` [PATCH linux-next v2 2/7] vdpa_sim_net: Add module param to disable default vdpa net device Parav Pandit
2021-01-04 3:31 ` [PATCH linux-next v2 3/7] vdpa: Extend routine to accept vdpa device name Parav Pandit
2021-01-04 3:31 ` [PATCH linux-next v2 4/7] vdpa: Define vdpa mgmt device, ops and a netlink interface Parav Pandit
2021-01-04 7:03 ` Jason Wang
2021-01-04 7:24 ` Parav Pandit
2021-01-05 4:10 ` Jason Wang
2021-01-05 6:33 ` Parav Pandit
2021-01-05 8:36 ` Jason Wang
2021-01-04 3:31 ` [PATCH linux-next v2 5/7] vdpa: Enable a user to add and delete a vdpa device Parav Pandit
2021-01-04 3:31 ` [PATCH linux-next v2 6/7] vdpa: Enable user to query vdpa device info Parav Pandit
2021-01-04 3:31 ` [PATCH linux-next v2 7/7] vdpa_sim_net: Add support for user supported devices Parav Pandit
2021-01-04 7:05 ` Jason Wang
2021-01-04 7:21 ` Parav Pandit
2021-01-05 4:06 ` Jason Wang
2021-01-05 6:22 ` Parav Pandit
2021-01-05 10:31 ` [PATCH linux-next v3 0/6] Introduce vdpa management tool Parav Pandit
2021-01-05 10:31 ` [PATCH linux-next v3 1/6] vdpa_sim_net: Make mac address array static Parav Pandit
2021-01-07 13:45 ` Stefano Garzarella
2021-01-05 10:31 ` [PATCH linux-next v3 2/6] vdpa: Extend routine to accept vdpa device name Parav Pandit
2021-01-05 10:32 ` [PATCH linux-next v3 3/6] vdpa: Define vdpa mgmt device, ops and a netlink interface Parav Pandit
2021-01-05 10:32 ` [PATCH linux-next v3 4/6] vdpa: Enable a user to add and delete a vdpa device Parav Pandit
2021-01-05 10:32 ` [PATCH linux-next v3 5/6] vdpa: Enable user to query vdpa device info Parav Pandit
2021-01-05 10:32 ` [PATCH linux-next v3 6/6] vdpa_sim_net: Add support for user supported devices Parav Pandit
2021-01-05 11:48 ` Michael S. Tsirkin
2021-01-05 12:02 ` Parav Pandit
2021-01-05 12:14 ` Michael S. Tsirkin
2021-01-05 12:30 ` Parav Pandit
2021-01-05 13:23 ` Michael S. Tsirkin
2021-01-07 3:48 ` Parav Pandit
2021-01-12 4:14 ` Parav Pandit
2021-01-14 4:17 ` Jason Wang
2021-01-14 7:58 ` Parav Pandit
2021-01-15 5:38 ` Jason Wang
2021-01-15 6:27 ` Parav Pandit
2021-01-19 11:09 ` Jason Wang
2021-01-20 3:21 ` Parav Pandit
2021-01-20 3:46 ` Parav Pandit
2021-01-18 18:03 ` Parav Pandit
2021-01-20 7:53 ` Michael S. Tsirkin
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=20201112064005.349268-8-parav@nvidia.com \
--to=parav@nvidia.com \
--cc=elic@nvidia.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/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).