From: ebiederm@xmission.com (Eric W. Biederman)
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: "Hans J. Koch" <hjk@linutronix.de>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/5] uio: Support 2^MINOR_BITS minors
Date: Tue, 14 Sep 2010 11:38:06 -0700 [thread overview]
Message-ID: <m1eicw892p.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <m1y6b48973.fsf@fess.ebiederm.org> (Eric W. Biederman's message of "Tue, 14 Sep 2010 11:35:28 -0700")
register_chrdev limits uio devices to 256 minor numbers which causes
problems on one system I have with 384+ uio devices. So instead set
UIO_MAX_DEVICES to the maximum number of minors and use
alloc_chrdev_region to reserve the uio minors.
The final result is that the code works the same but the uio driver now
supports any minor the idr allocator comes up with.
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
---
drivers/uio/uio.c | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 0fd2cda..3d4d65b 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -23,9 +23,10 @@
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/kobject.h>
+#include <linux/cdev.h>
#include <linux/uio_driver.h>
-#define UIO_MAX_DEVICES 255
+#define UIO_MAX_DEVICES (1U << MINORBITS)
struct uio_device {
struct module *owner;
@@ -41,6 +42,7 @@ struct uio_device {
};
static int uio_major;
+static struct cdev *uio_cdev;
static DEFINE_IDR(uio_idr);
static const struct file_operations uio_fops;
@@ -731,15 +733,44 @@ static const struct file_operations uio_fops = {
static int uio_major_init(void)
{
- uio_major = register_chrdev(0, "uio", &uio_fops);
- if (uio_major < 0)
- return uio_major;
- return 0;
+ static const char name[] = "uio";
+ struct cdev *cdev = NULL;
+ dev_t uio_dev = 0;
+ int result;
+
+ result = alloc_chrdev_region(&uio_dev, 0, UIO_MAX_DEVICES, name);
+ if (result)
+ goto out;
+
+ result = -ENOMEM;
+ cdev = cdev_alloc();
+ if (!cdev)
+ goto out_unregister;
+
+ cdev->owner = THIS_MODULE;
+ cdev->ops = &uio_fops;
+ kobject_set_name(&cdev->kobj, "%s", name);
+
+ result = cdev_add(cdev, uio_dev, UIO_MAX_DEVICES);
+ if (result)
+ goto out_put;
+
+ uio_major = MAJOR(uio_dev);
+ uio_cdev = cdev;
+ result = 0;
+out:
+ return result;
+out_put:
+ kobject_put(&cdev->kobj);
+out_unregister:
+ unregister_chrdev_region(uio_dev, UIO_MAX_DEVICES);
+ goto out;
}
static void uio_major_cleanup(void)
{
- unregister_chrdev(uio_major, "uio");
+ unregister_chrdev_region(MKDEV(uio_major, 0), UIO_MAX_DEVICES);
+ cdev_del(uio_cdev);
}
static int init_uio_class(void)
--
1.7.2.2
next prev parent reply other threads:[~2010-09-14 18:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-14 18:35 [PATCH 0/5] Uio enhancements Eric W. Biederman
2010-09-14 18:36 ` [PATCH 1/5] uio: Fix lack of locking in init_uio_class Eric W. Biederman
2010-09-17 20:32 ` Thomas Gleixner
2010-09-17 20:49 ` Hans J. Koch
2010-09-14 18:36 ` [PATCH 2/5] uio: Don't clear driver data Eric W. Biederman
2010-09-17 20:33 ` Thomas Gleixner
2010-09-17 20:50 ` Hans J. Koch
2010-09-14 18:37 ` [PATCH 3/5] uio: Cleanup irq handling Eric W. Biederman
2010-09-17 20:34 ` Thomas Gleixner
2010-09-17 20:51 ` Hans J. Koch
2010-09-14 18:38 ` Eric W. Biederman [this message]
2010-09-17 20:36 ` [PATCH 4/5] uio: Support 2^MINOR_BITS minors Thomas Gleixner
2010-09-17 20:57 ` Hans J. Koch
2010-09-17 21:09 ` Greg KH
2010-09-21 21:08 ` Greg KH
2010-09-21 21:38 ` Thomas Gleixner
2010-09-21 21:56 ` Greg KH
2010-09-21 22:21 ` Eric W. Biederman
2010-09-21 22:26 ` Thomas Gleixner
2010-09-14 18:38 ` [PATCH 5/5] uio: Statically allocate uio_class and use class .dev_attrs Eric W. Biederman
2010-09-17 20:37 ` Thomas Gleixner
2010-09-17 20:57 ` Hans J. Koch
2010-09-17 20:59 ` [PATCH 0/5] Uio enhancements Hans J. Koch
2010-09-20 7:19 ` [PATCH 0/5] uio hotplug support Eric W. Biederman
2010-09-20 7:21 ` [PATCH 1/5] uio: Simplify the lifetime logic of struct uio_device Eric W. Biederman
2010-09-20 7:21 ` [PATCH 2/5] uio: Kill unused vma_count Eric W. Biederman
2010-09-20 7:23 ` [PATCH 3/5] uio: Remove unused uio_info mmap method Eric W. Biederman
2010-09-20 7:23 ` [PATCH 4/5] libunload: A library to help remove open files Eric W. Biederman
2010-09-20 7:24 ` [PATCH 5/5] uio: Implement hotunplug support, using libunload Eric W. Biederman
2010-09-24 10:55 ` Hans J. Koch
2010-09-24 17:11 ` Eric W. Biederman
2010-09-25 2:06 ` [PATCH] uio: Fix accidentally changed return value in uio_read Eric W. Biederman
2010-09-24 10:45 ` [PATCH 0/5] uio hotplug support Hans J. Koch
2010-09-24 17:14 ` Eric W. Biederman
2010-09-24 17:31 ` Hans J. Koch
2010-09-24 18:38 ` Eric W. Biederman
2010-09-25 0:05 ` Eric W. Biederman
2010-09-25 0:33 ` Greg KH
2010-09-25 1:54 ` Eric W. Biederman
2010-09-26 19:21 ` Greg KH
2010-09-26 22:46 ` [PATCH 1/5] uio: Simplify the lifetime logic of struct uio_device Eric W. Biederman
2010-09-30 22:00 ` Hans J. Koch
2010-09-26 22:47 ` [PATCH 2/5] uio: Kill unused vma_count Eric W. Biederman
2010-09-26 22:48 ` [PATCH 3/5] uio: Remove unused uio_info mmap method Eric W. Biederman
2010-10-04 9:26 ` Hans J. Koch
2010-09-26 22:48 ` [PATCH 4/5] libunload: A library to help remove open files Eric W. Biederman
2010-10-04 9:56 ` Hans J. Koch
2010-09-26 22:49 ` [PATCH 5/5] uio: Implement hotunplug support, using libunload Eric W. Biederman
2010-10-04 10:47 ` Hans J. Koch
2010-10-04 12:34 ` Hans J. Koch
2010-10-04 18:19 ` Eric W. Biederman
2010-10-04 18:52 ` Hans J. Koch
2010-09-26 22:49 ` [PATCH 6/5] uio: Fix accidentally changed return value in uio_read Eric W. Biederman
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=m1eicw892p.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=gregkh@suse.de \
--cc=hjk@linutronix.de \
--cc=linux-kernel@vger.kernel.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