From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Eric W. Biederman" <ebiederm@aristanetworks.com>,
"Hans J. Koch" <hjk@linutronix.de>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 17/31] uio: Support 2^MINOR_BITS minors
Date: Fri, 22 Oct 2010 11:25:02 -0700 [thread overview]
Message-ID: <1287771916-15016-17-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20101022175107.GB13489@kroah.com>
From: Eric W. Biederman <ebiederm@aristanetworks.com>
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>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
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
next prev parent reply other threads:[~2010-10-22 18:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 17:51 [GIT PATCH] driver core merge for .37-rc1 Greg KH
2010-10-22 18:24 ` [PATCH 01/31] Dynamic Debug: Split out query string parsing/setup from proc_write Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 02/31] Dynamic Debug: Introduce ddebug_query= boot parameter Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 03/31] Dynamic Debug: Initialize dynamic debug earlier via arch_initcall Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 04/31] driver core: platform: Use drv->driver.bus instead of assuming platform_bus_type Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 05/31] uio: do not use PCI resources before pci_enable_device() Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 06/31] driver core: platform_bus: allow runtime override of dev_pm_ops Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 07/31] add Packet hub driver for Topcliff Platform controller hub Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 08/31] pch_phub: fix build warnings Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 09/31] debugfs: mark me as the maintainer Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 10/31] base/platform: Safe handling for NULL platform data and resources Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 11/31] base/platform: Simplifications for NULL platform data/resources handling Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 12/31] driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 13/31] SYSFS: Allow boot time switching between deprecated and modern sysfs layout Greg Kroah-Hartman
2010-10-22 18:24 ` [PATCH 14/31] uio: Fix lack of locking in init_uio_class Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 15/31] uio: Don't clear driver data Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 16/31] uio: Cleanup irq handling Greg Kroah-Hartman
2010-10-22 18:25 ` Greg Kroah-Hartman [this message]
2010-10-22 18:25 ` [PATCH 18/31] uio: Statically allocate uio_class and use class .dev_attrs Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 19/31] FW_LOADER: fix kconfig dependency warning on HOTPLUG Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 20/31] sysfs: Fail bin file mmap if vma close is implemented Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 21/31] sysfs: only access bin file vm_ops with the active lock Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 22/31] driver-core: base: change to new flag variable Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 23/31] driver core: fix build for CONFIG_BLOCK not enabled Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 24/31] kobject: Introduce kset_find_obj_hinted Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 25/31] driver core: Introduce find_memory_block_hinted which utilizes kset_find_obj_hinted Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 26/31] driver core: Convert link_mem_sections to use find_memory_block_hinted Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 27/31] hpilo: Despecificate driver from iLO generation Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 28/31] Driver core: Move find_memory_block routine Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 29/31] Driver core: Add mutex for adding/removing memory blocks Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 30/31] Driver core: Add section count to memory_block struct Greg Kroah-Hartman
2010-10-22 18:25 ` [PATCH 31/31] driver core: Display error codes when class suspend fails Greg Kroah-Hartman
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=1287771916-15016-17-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=ebiederm@aristanetworks.com \
--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
Powered by JetHome