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 linux-next v3 6/6] vdpa_sim_net: Add support for user supported devices Date: Tue, 5 Jan 2021 12:32:03 +0200 Message-ID: <20210105103203.82508-7-parav@nvidia.com> (raw) In-Reply-To: <20210105103203.82508-1-parav@nvidia.com> Enable user to create vdpasim net simulate devices. Show vdpa management device that supports creating, deleting vdpa devices. $ vdpa mgmtdev show vdpasim_net: supported_classes net $ vdpa mgmtdev show -jp { "show": { "vdpasim_net": { "supported_classes": { "net" } } } Create a vdpa device of type networking named as "foo2" from the management device vdpasim: $ vdpa dev add mgmtdev vdpasim_net name foo2 Show the newly created vdpa device by its name: $ vdpa dev show foo2 foo2: type network mgmtdev vdpasim_net vendor_id 0 max_vqs 2 max_vq_size 256 $ vdpa dev show foo2 -jp { "dev": { "foo2": { "type": "network", "mgmtdev": "vdpasim_net", "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> --- Changelog: v2->v3: - removed code branches due to default device removal patch v1->v2: - rebased --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 3 +- drivers/vdpa/vdpa_sim/vdpa_sim.h | 2 + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 96 ++++++++++++++++++++-------- 3 files changed, 75 insertions(+), 26 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index db1636a99ba4..d5942842432d 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -235,7 +235,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) ops = &vdpasim_config_ops; vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, - dev_attr->nvqs, NULL); + dev_attr->nvqs, dev_attr->name); if (!vdpasim) goto err_alloc; @@ -249,6 +249,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64))) goto err_iommu; set_dma_ops(dev, &vdpasim_dma_ops); + vdpasim->vdpa.mdev = dev_attr->mgmt_dev; vdpasim->config = kzalloc(dev_attr->config_size, GFP_KERNEL); if (!vdpasim->config) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.h b/drivers/vdpa/vdpa_sim/vdpa_sim.h index b02142293d5b..6d75444f9948 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.h +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.h @@ -33,6 +33,8 @@ struct vdpasim_virtqueue { }; struct vdpasim_dev_attr { + struct vdpa_mgmt_dev *mgmt_dev; + const char *name; u64 supported_features; size_t config_size; size_t buffer_size; diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c index f0482427186b..d344c5b7c914 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c @@ -35,8 +35,6 @@ MODULE_PARM_DESC(macaddr, "Ethernet MAC address"); static u8 macaddr_buf[ETH_ALEN]; -static struct vdpasim *vdpasim_net_dev; - static void vdpasim_net_work(struct work_struct *work) { struct vdpasim *vdpasim = container_of(work, struct vdpasim, work); @@ -120,21 +118,23 @@ static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config) memcpy(net_config->mac, macaddr_buf, ETH_ALEN); } -static int __init vdpasim_net_init(void) +static void vdpasim_net_mgmtdev_release(struct device *dev) +{ +} + +static struct device vdpasim_net_mgmtdev = { + .init_name = "vdpasim_net", + .release = vdpasim_net_mgmtdev_release, +}; + +static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char *name) { struct vdpasim_dev_attr dev_attr = {}; + struct vdpasim *simdev; int ret; - if (macaddr) { - mac_pton(macaddr, macaddr_buf); - if (!is_valid_ether_addr(macaddr_buf)) { - ret = -EADDRNOTAVAIL; - goto out; - } - } else { - eth_random_addr(macaddr_buf); - } - + dev_attr.mgmt_dev = mdev; + dev_attr.name = name; dev_attr.id = VIRTIO_ID_NET; dev_attr.supported_features = VDPASIM_NET_FEATURES; dev_attr.nvqs = VDPASIM_NET_VQ_NUM; @@ -143,29 +143,75 @@ static int __init vdpasim_net_init(void) dev_attr.work_fn = vdpasim_net_work; dev_attr.buffer_size = PAGE_SIZE; - vdpasim_net_dev = vdpasim_create(&dev_attr); - if (IS_ERR(vdpasim_net_dev)) { - ret = PTR_ERR(vdpasim_net_dev); - goto out; + simdev = vdpasim_create(&dev_attr); + if (IS_ERR(simdev)) + return PTR_ERR(simdev); + + ret = _vdpa_register_device(&simdev->vdpa); + if (ret) + goto reg_err; + + return 0; + +reg_err: + put_device(&simdev->vdpa.dev); + return ret; +} + +static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev, + struct vdpa_device *dev) +{ + struct vdpasim *simdev = container_of(dev, struct vdpasim, vdpa); + + _vdpa_unregister_device(&simdev->vdpa); +} + +static const struct vdpa_mgmtdev_ops vdpasim_net_mgmtdev_ops = { + .dev_add = vdpasim_net_dev_add, + .dev_del = vdpasim_net_dev_del +}; + +static struct virtio_device_id id_table[] = { + { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID }, + { 0 }, +}; + +static struct vdpa_mgmt_dev mgmt_dev = { + .device = &vdpasim_net_mgmtdev, + .id_table = id_table, + .ops = &vdpasim_net_mgmtdev_ops, +}; + +static int __init vdpasim_net_init(void) +{ + int ret; + + if (macaddr) { + mac_pton(macaddr, macaddr_buf); + if (!is_valid_ether_addr(macaddr_buf)) + return -EADDRNOTAVAIL; + } else { + eth_random_addr(macaddr_buf); } - ret = vdpa_register_device(&vdpasim_net_dev->vdpa); + ret = device_register(&vdpasim_net_mgmtdev); if (ret) - goto put_dev; + return ret; + ret = vdpa_mgmtdev_register(&mgmt_dev); + if (ret) + goto parent_err; return 0; -put_dev: - put_device(&vdpasim_net_dev->vdpa.dev); -out: +parent_err: + device_unregister(&vdpasim_net_mgmtdev); return ret; } static void __exit vdpasim_net_exit(void) { - struct vdpa_device *vdpa = &vdpasim_net_dev->vdpa; - - vdpa_unregister_device(vdpa); + vdpa_mgmtdev_unregister(&mgmt_dev); + device_unregister(&vdpasim_net_mgmtdev); } module_init(vdpasim_net_init); -- 2.26.2
next prev parent reply index 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 ` [PATCH 7/7] vdpa/vdpa_sim: Enable user to create vdpasim net devices Parav Pandit 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 ` Parav Pandit [this message] 2021-01-05 11:48 ` [PATCH linux-next v3 6/6] vdpa_sim_net: Add support for user supported devices 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=20210105103203.82508-7-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
Netdev Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \ netdev@vger.kernel.org public-inbox-index netdev Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.netdev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git