Commit cb145cdf authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by james toy

The current dynamic allocation of minor number for misc devices has some

drawbacks.

First of all, the range for dynamic numbers include some statically
allocated numbers.  It goes from 63 to 0, and we have numbers in the range
from 1 to 15 already allocated.  Although, it gives priority to the higher
and not allocated numbers, we may end up in a situation where we must
reject registering a driver which got a static number because a driver got
its number with dynamic allocation.  Considering fs/dlm/user.c allocates
as many misc devices as lockspaces are created, and that we have more than
50 users around, it's not unreasonable to reach that situation.

The proposed solution uses the not yet reserved range from 64 to 127.  If
more devices are needed, we may push 64 to 16.
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 33948503
...@@ -60,6 +60,7 @@ static DEFINE_MUTEX(misc_mtx); ...@@ -60,6 +60,7 @@ static DEFINE_MUTEX(misc_mtx);
/* /*
* Assigned numbers, used for dynamic minors * Assigned numbers, used for dynamic minors
*/ */
#define DYNAMIC_MINOR_BASE 64
#define DYNAMIC_MINORS 64 /* like dynamic majors */ #define DYNAMIC_MINORS 64 /* like dynamic majors */
static DECLARE_BITMAP(misc_minors, DYNAMIC_MINORS); static DECLARE_BITMAP(misc_minors, DYNAMIC_MINORS);
...@@ -204,7 +205,7 @@ int misc_register(struct miscdevice * misc) ...@@ -204,7 +205,7 @@ int misc_register(struct miscdevice * misc)
mutex_unlock(&misc_mtx); mutex_unlock(&misc_mtx);
return -EBUSY; return -EBUSY;
} }
misc->minor = DYNAMIC_MINORS - i - 1; misc->minor = DYNAMIC_MINOR_BASE + i;
set_bit(i, misc_minors); set_bit(i, misc_minors);
} }
...@@ -213,7 +214,7 @@ int misc_register(struct miscdevice * misc) ...@@ -213,7 +214,7 @@ int misc_register(struct miscdevice * misc)
misc->this_device = device_create(misc_class, misc->parent, dev, misc->this_device = device_create(misc_class, misc->parent, dev,
misc, "%s", misc->name); misc, "%s", misc->name);
if (IS_ERR(misc->this_device)) { if (IS_ERR(misc->this_device)) {
int i = DYNAMIC_MINORS - misc->minor - 1; int i = misc->minor - DYNAMIC_MINOR_BASE;
if (i < DYNAMIC_MINORS && i >= 0) if (i < DYNAMIC_MINORS && i >= 0)
clear_bit(i, misc_minors); clear_bit(i, misc_minors);
err = PTR_ERR(misc->this_device); err = PTR_ERR(misc->this_device);
...@@ -242,7 +243,7 @@ int misc_register(struct miscdevice * misc) ...@@ -242,7 +243,7 @@ int misc_register(struct miscdevice * misc)
int misc_deregister(struct miscdevice *misc) int misc_deregister(struct miscdevice *misc)
{ {
int i = DYNAMIC_MINORS - misc->minor - 1; int i = misc->minor - DYNAMIC_MINOR_BASE;
if (list_empty(&misc->list)) if (list_empty(&misc->list))
return -EINVAL; return -EINVAL;
......
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