Commit 484f0a07 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Michael S. Tsirkin

vduse: make vduse_class constant

Now that the driver core allows for struct class to be in read-only
memory, we should make all 'class' structures declared at build time
placing them into read-only memory, instead of having to be dynamically
allocated at runtime.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Message-Id: <2023100643-tricolor-citizen-6c2d@gregkh>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarXie Yongji <xieyongji@bytedance.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
parent 5ff1f51e
...@@ -134,7 +134,6 @@ static DEFINE_MUTEX(vduse_lock); ...@@ -134,7 +134,6 @@ static DEFINE_MUTEX(vduse_lock);
static DEFINE_IDR(vduse_idr); static DEFINE_IDR(vduse_idr);
static dev_t vduse_major; static dev_t vduse_major;
static struct class *vduse_class;
static struct cdev vduse_ctrl_cdev; static struct cdev vduse_ctrl_cdev;
static struct cdev vduse_cdev; static struct cdev vduse_cdev;
static struct workqueue_struct *vduse_irq_wq; static struct workqueue_struct *vduse_irq_wq;
...@@ -1528,6 +1527,16 @@ static const struct kobj_type vq_type = { ...@@ -1528,6 +1527,16 @@ static const struct kobj_type vq_type = {
.default_groups = vq_groups, .default_groups = vq_groups,
}; };
static char *vduse_devnode(const struct device *dev, umode_t *mode)
{
return kasprintf(GFP_KERNEL, "vduse/%s", dev_name(dev));
}
static const struct class vduse_class = {
.name = "vduse",
.devnode = vduse_devnode,
};
static void vduse_dev_deinit_vqs(struct vduse_dev *dev) static void vduse_dev_deinit_vqs(struct vduse_dev *dev)
{ {
int i; int i;
...@@ -1638,7 +1647,7 @@ static int vduse_destroy_dev(char *name) ...@@ -1638,7 +1647,7 @@ static int vduse_destroy_dev(char *name)
mutex_unlock(&dev->lock); mutex_unlock(&dev->lock);
vduse_dev_reset(dev); vduse_dev_reset(dev);
device_destroy(vduse_class, MKDEV(MAJOR(vduse_major), dev->minor)); device_destroy(&vduse_class, MKDEV(MAJOR(vduse_major), dev->minor));
idr_remove(&vduse_idr, dev->minor); idr_remove(&vduse_idr, dev->minor);
kvfree(dev->config); kvfree(dev->config);
vduse_dev_deinit_vqs(dev); vduse_dev_deinit_vqs(dev);
...@@ -1805,7 +1814,7 @@ static int vduse_create_dev(struct vduse_dev_config *config, ...@@ -1805,7 +1814,7 @@ static int vduse_create_dev(struct vduse_dev_config *config,
dev->minor = ret; dev->minor = ret;
dev->msg_timeout = VDUSE_MSG_DEFAULT_TIMEOUT; dev->msg_timeout = VDUSE_MSG_DEFAULT_TIMEOUT;
dev->dev = device_create_with_groups(vduse_class, NULL, dev->dev = device_create_with_groups(&vduse_class, NULL,
MKDEV(MAJOR(vduse_major), dev->minor), MKDEV(MAJOR(vduse_major), dev->minor),
dev, vduse_dev_groups, "%s", config->name); dev, vduse_dev_groups, "%s", config->name);
if (IS_ERR(dev->dev)) { if (IS_ERR(dev->dev)) {
...@@ -1821,7 +1830,7 @@ static int vduse_create_dev(struct vduse_dev_config *config, ...@@ -1821,7 +1830,7 @@ static int vduse_create_dev(struct vduse_dev_config *config,
return 0; return 0;
err_vqs: err_vqs:
device_destroy(vduse_class, MKDEV(MAJOR(vduse_major), dev->minor)); device_destroy(&vduse_class, MKDEV(MAJOR(vduse_major), dev->minor));
err_dev: err_dev:
idr_remove(&vduse_idr, dev->minor); idr_remove(&vduse_idr, dev->minor);
err_idr: err_idr:
...@@ -1934,11 +1943,6 @@ static const struct file_operations vduse_ctrl_fops = { ...@@ -1934,11 +1943,6 @@ static const struct file_operations vduse_ctrl_fops = {
.llseek = noop_llseek, .llseek = noop_llseek,
}; };
static char *vduse_devnode(const struct device *dev, umode_t *mode)
{
return kasprintf(GFP_KERNEL, "vduse/%s", dev_name(dev));
}
struct vduse_mgmt_dev { struct vduse_mgmt_dev {
struct vdpa_mgmt_dev mgmt_dev; struct vdpa_mgmt_dev mgmt_dev;
struct device dev; struct device dev;
...@@ -2082,11 +2086,9 @@ static int vduse_init(void) ...@@ -2082,11 +2086,9 @@ static int vduse_init(void)
int ret; int ret;
struct device *dev; struct device *dev;
vduse_class = class_create("vduse"); ret = class_register(&vduse_class);
if (IS_ERR(vduse_class)) if (ret)
return PTR_ERR(vduse_class); return ret;
vduse_class->devnode = vduse_devnode;
ret = alloc_chrdev_region(&vduse_major, 0, VDUSE_DEV_MAX, "vduse"); ret = alloc_chrdev_region(&vduse_major, 0, VDUSE_DEV_MAX, "vduse");
if (ret) if (ret)
...@@ -2099,7 +2101,7 @@ static int vduse_init(void) ...@@ -2099,7 +2101,7 @@ static int vduse_init(void)
if (ret) if (ret)
goto err_ctrl_cdev; goto err_ctrl_cdev;
dev = device_create(vduse_class, NULL, vduse_major, NULL, "control"); dev = device_create(&vduse_class, NULL, vduse_major, NULL, "control");
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
ret = PTR_ERR(dev); ret = PTR_ERR(dev);
goto err_device; goto err_device;
...@@ -2141,13 +2143,13 @@ static int vduse_init(void) ...@@ -2141,13 +2143,13 @@ static int vduse_init(void)
err_wq: err_wq:
cdev_del(&vduse_cdev); cdev_del(&vduse_cdev);
err_cdev: err_cdev:
device_destroy(vduse_class, vduse_major); device_destroy(&vduse_class, vduse_major);
err_device: err_device:
cdev_del(&vduse_ctrl_cdev); cdev_del(&vduse_ctrl_cdev);
err_ctrl_cdev: err_ctrl_cdev:
unregister_chrdev_region(vduse_major, VDUSE_DEV_MAX); unregister_chrdev_region(vduse_major, VDUSE_DEV_MAX);
err_chardev_region: err_chardev_region:
class_destroy(vduse_class); class_unregister(&vduse_class);
return ret; return ret;
} }
module_init(vduse_init); module_init(vduse_init);
...@@ -2159,10 +2161,10 @@ static void vduse_exit(void) ...@@ -2159,10 +2161,10 @@ static void vduse_exit(void)
destroy_workqueue(vduse_irq_bound_wq); destroy_workqueue(vduse_irq_bound_wq);
destroy_workqueue(vduse_irq_wq); destroy_workqueue(vduse_irq_wq);
cdev_del(&vduse_cdev); cdev_del(&vduse_cdev);
device_destroy(vduse_class, vduse_major); device_destroy(&vduse_class, vduse_major);
cdev_del(&vduse_ctrl_cdev); cdev_del(&vduse_ctrl_cdev);
unregister_chrdev_region(vduse_major, VDUSE_DEV_MAX); unregister_chrdev_region(vduse_major, VDUSE_DEV_MAX);
class_destroy(vduse_class); class_unregister(&vduse_class);
} }
module_exit(vduse_exit); module_exit(vduse_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment