2004-03-02 12:30:38 +03:00
/*
* udevstart . c
*
* Copyright ( C ) 2004 Greg Kroah - Hartman < greg @ kroah . com >
*
* Quick and dirty way to populate a / dev with udev if your system
* does not have access to a shell . Based originally on a patch to udev
* from Harald Hoyer < harald @ redhat . com >
*
* This program is free software ; you can redistribute it and / or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation version 2 of the License .
*
* This program is distributed in the hope that it will be useful , but
* WITHOUT ANY WARRANTY ; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the GNU
* General Public License for more details .
*
* You should have received a copy of the GNU General Public License along
* with this program ; if not , write to the Free Software Foundation , Inc . ,
* 675 Mass Ave , Cambridge , MA 0213 9 , USA .
*
*/
# include <stdlib.h>
2004-07-02 09:19:18 +04:00
# include <stddef.h>
2004-03-02 12:30:38 +03:00
# include <string.h>
# include <stdio.h>
# include <errno.h>
# include <ctype.h>
# include <dirent.h>
# include <sys/wait.h>
2004-04-01 11:03:07 +04:00
# include <sys/types.h>
# include <unistd.h>
2004-03-02 12:30:38 +03:00
# include "logging.h"
2004-04-01 12:59:58 +04:00
# include "udev_lib.h"
2004-07-02 09:19:18 +04:00
# include "list.h"
[PATCH] Make udev/udevstart be one binary
Hi,
The following patch makes udev/udevstart be a common binary. First,
doing this grows udev by a total of 1.8kB (ppc32, stripped) whereas
udevstart by itself is 6.4kB. I know you mentioned being able to
replace udevstart with a script, but at 1.8kB I don't think it'll be
easy to beat this with size there. Next, the following are by-eye
timings of before, after, and with devfs on a slow, but still usable
embedded platform (config stripped down to more-or-less bare for
ramdisk):
-- Embedded Planet RPX LITE, 64Mhz MPC 823e --
devfs : 15.333s, 15.253s, 14.988s (15.191s avg)
udev-pristine : 18.675s, 18.079s, 18.418s (18.390s avg)
udev-multi : 14.587s, 14.747s, 14.868s (14.734s avg)
The patch ends up being rather large to add this, as in doing so I ended
up making all refs (that I hit..) to devpath/subsystem be marked as
'const'.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2004-08-10 11:50:21 +04:00
# include "udev.h"
2004-03-02 12:30:38 +03:00
2004-03-03 09:15:20 +03:00
# define MAX_PATHLEN 1024
# define SYSBLOCK " / sys / block"
# define SYSCLASS " / sys / class"
2004-03-02 12:30:38 +03:00
2004-07-02 09:19:18 +04:00
struct device {
struct list_head list ;
char path [ MAX_PATHLEN ] ;
char subsys [ MAX_PATHLEN ] ;
} ;
/* sort files in lexical order */
static int device_list_insert ( char * path , char * subsystem , struct list_head * device_list )
{
struct device * loop_device ;
struct device * new_device ;
list_for_each_entry ( loop_device , device_list , list ) {
if ( strcmp ( loop_device - > path , path ) > 0 ) {
break ;
}
}
new_device = malloc ( sizeof ( struct device ) ) ;
if ( new_device = = NULL ) {
dbg ( " error malloc " ) ;
return - ENOMEM ;
}
strfieldcpy ( new_device - > path , path ) ;
strfieldcpy ( new_device - > subsys , subsystem ) ;
list_add_tail ( & new_device - > list , & loop_device - > list ) ;
[PATCH] Fix naming ethernet devices in udevstart
On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore. I don't quite know when this got broken (or rather, if
> > it was supposed to be working. I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.
How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.
It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)
It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.
2004-09-11 08:09:25 +04:00
dbg ( " add '%s' from subsys '%s' " , new_device - > path , new_device - > subsys ) ;
2004-07-02 09:19:18 +04:00
return 0 ;
}
/* list of devices that we should run last due to any one of a number of reasons */
static char * last_list [ ] = {
" /block/dm " , /* on here because dm wants to have the block devices around before it */
NULL ,
} ;
2004-09-11 08:44:15 +04:00
/* list of devices that we should run first due to any one of a number of reasons */
static char * first_list [ ] = {
" /class/mem " , /* people tend to like their memory devices around first... */
NULL ,
} ;
2004-07-02 09:19:18 +04:00
static void exec_list ( struct list_head * device_list )
{
struct device * loop_device ;
struct device * tmp_device ;
2004-09-11 08:44:15 +04:00
int i ;
/* handle the "first" type devices first */
list_for_each_entry_safe ( loop_device , tmp_device , device_list , list ) {
for ( i = 0 ; first_list [ i ] ! = NULL ; i + + ) {
if ( strncmp ( loop_device - > path , first_list [ i ] , strlen ( first_list [ i ] ) ) = = 0 ) {
udev_add_device ( loop_device - > path , loop_device - > subsys , NOFAKE ) ;
list_del ( & loop_device - > list ) ;
free ( loop_device ) ;
break ;
}
}
}
2004-07-02 09:19:18 +04:00
/* handle the devices we are allowed to, excluding the "last" type devices */
list_for_each_entry_safe ( loop_device , tmp_device , device_list , list ) {
int found = 0 ;
for ( i = 0 ; last_list [ i ] ! = NULL ; i + + ) {
if ( strncmp ( loop_device - > path , last_list [ i ] , strlen ( last_list [ i ] ) ) = = 0 ) {
found = 1 ;
break ;
}
}
if ( found )
continue ;
[PATCH] Fix naming ethernet devices in udevstart
On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore. I don't quite know when this got broken (or rather, if
> > it was supposed to be working. I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.
How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.
It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)
It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.
2004-09-11 08:09:25 +04:00
udev_add_device ( loop_device - > path , loop_device - > subsys , NOFAKE ) ;
2004-07-02 09:19:18 +04:00
list_del ( & loop_device - > list ) ;
free ( loop_device ) ;
}
/* handle the rest of the devices left over, if any */
list_for_each_entry_safe ( loop_device , tmp_device , device_list , list ) {
[PATCH] Fix naming ethernet devices in udevstart
On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore. I don't quite know when this got broken (or rather, if
> > it was supposed to be working. I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.
How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.
It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)
It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.
2004-09-11 08:09:25 +04:00
udev_add_device ( loop_device - > path , loop_device - > subsys , NOFAKE ) ;
2004-07-02 09:19:18 +04:00
list_del ( & loop_device - > list ) ;
free ( loop_device ) ;
}
}
static void udev_scan_block ( void )
2004-03-02 12:30:38 +03:00
{
2004-03-03 09:15:20 +03:00
DIR * dir ;
struct dirent * dent ;
2004-07-02 09:19:18 +04:00
LIST_HEAD ( device_list ) ;
2004-03-02 12:30:38 +03:00
2004-07-02 09:19:18 +04:00
dir = opendir ( SYSBLOCK ) ;
2004-03-03 09:15:20 +03:00
if ( dir ! = NULL ) {
for ( dent = readdir ( dir ) ; dent ! = NULL ; dent = readdir ( dir ) ) {
char dirname [ MAX_PATHLEN ] ;
DIR * dir2 ;
struct dirent * dent2 ;
if ( ( strcmp ( dent - > d_name , " . " ) = = 0 ) | |
( strcmp ( dent - > d_name , " .. " ) = = 0 ) )
2004-03-02 12:30:38 +03:00
continue ;
2004-07-02 09:19:18 +04:00
snprintf ( dirname , MAX_PATHLEN , " /block/%s " , dent - > d_name ) ;
dirname [ MAX_PATHLEN - 1 ] = ' \0 ' ;
device_list_insert ( dirname , " block " , & device_list ) ;
snprintf ( dirname , MAX_PATHLEN , " %s/%s " , SYSBLOCK , dent - > d_name ) ;
2004-03-02 12:30:38 +03:00
dir2 = opendir ( dirname ) ;
2004-03-03 09:15:20 +03:00
if ( dir2 ! = NULL ) {
for ( dent2 = readdir ( dir2 ) ; dent2 ! = NULL ; dent2 = readdir ( dir2 ) ) {
2004-07-02 09:19:18 +04:00
char dirname2 [ MAX_PATHLEN ] ;
2004-03-03 09:15:20 +03:00
DIR * dir3 ;
struct dirent * dent3 ;
2004-03-02 12:30:38 +03:00
if ( ( strcmp ( dent2 - > d_name , " . " ) = = 0 ) | |
( strcmp ( dent2 - > d_name , " .. " ) = = 0 ) )
continue ;
snprintf ( dirname2 , MAX_PATHLEN , " %s/%s " , dirname , dent2 - > d_name ) ;
2004-03-03 09:15:20 +03:00
dirname2 [ MAX_PATHLEN - 1 ] = ' \0 ' ;
2004-03-02 12:30:38 +03:00
dir3 = opendir ( dirname2 ) ;
2004-03-03 09:15:20 +03:00
if ( dir3 ! = NULL ) {
for ( dent3 = readdir ( dir3 ) ; dent3 ! = NULL ; dent3 = readdir ( dir3 ) ) {
2004-03-02 12:30:38 +03:00
char filename [ MAX_PATHLEN ] ;
if ( strcmp ( dent3 - > d_name , " dev " ) = = 0 ) {
2004-07-02 09:19:18 +04:00
snprintf ( filename , MAX_PATHLEN , " /block/%s/%s " ,
2004-03-03 09:15:20 +03:00
dent - > d_name , dent2 - > d_name ) ;
filename [ MAX_PATHLEN - 1 ] = ' \0 ' ;
2004-07-02 09:19:18 +04:00
device_list_insert ( filename , " block " , & device_list ) ;
2004-03-02 12:30:38 +03:00
}
}
2004-04-24 08:55:57 +04:00
closedir ( dir3 ) ;
2004-03-02 12:30:38 +03:00
}
}
2004-04-24 08:55:57 +04:00
closedir ( dir2 ) ;
2004-03-02 12:30:38 +03:00
}
}
2004-04-24 08:55:57 +04:00
closedir ( dir ) ;
2004-03-02 12:30:38 +03:00
}
2004-07-02 09:19:18 +04:00
exec_list ( & device_list ) ;
}
static void udev_scan_class ( void )
{
DIR * dir ;
struct dirent * dent ;
LIST_HEAD ( device_list ) ;
dir = opendir ( SYSCLASS ) ;
2004-03-03 09:15:20 +03:00
if ( dir ! = NULL ) {
for ( dent = readdir ( dir ) ; dent ! = NULL ; dent = readdir ( dir ) ) {
char dirname [ MAX_PATHLEN ] ;
DIR * dir2 ;
struct dirent * dent2 ;
if ( ( strcmp ( dent - > d_name , " . " ) = = 0 ) | |
( strcmp ( dent - > d_name , " .. " ) = = 0 ) )
2004-03-02 12:30:38 +03:00
continue ;
2004-07-02 09:19:18 +04:00
snprintf ( dirname , MAX_PATHLEN , " %s/%s " , SYSCLASS , dent - > d_name ) ;
2004-07-10 05:46:08 +04:00
dirname [ MAX_PATHLEN - 1 ] = ' \0 ' ;
2004-03-02 12:30:38 +03:00
dir2 = opendir ( dirname ) ;
2004-03-03 09:15:20 +03:00
if ( dir2 ! = NULL ) {
for ( dent2 = readdir ( dir2 ) ; dent2 ! = NULL ; dent2 = readdir ( dir2 ) ) {
2004-10-06 11:27:10 +04:00
char dirname2 [ MAX_PATHLEN ] ;
2004-03-03 09:15:20 +03:00
DIR * dir3 ;
struct dirent * dent3 ;
2004-03-02 12:30:38 +03:00
2004-03-03 09:15:20 +03:00
if ( ( strcmp ( dent2 - > d_name , " . " ) = = 0 ) | |
( strcmp ( dent2 - > d_name , " .. " ) = = 0 ) )
2004-03-02 12:30:38 +03:00
continue ;
[PATCH] Fix naming ethernet devices in udevstart
On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore. I don't quite know when this got broken (or rather, if
> > it was supposed to be working. I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.
How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.
It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)
It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.
2004-09-11 08:09:25 +04:00
/* pass the net class as it is */
if ( strcmp ( dent - > d_name , " net " ) = = 0 ) {
snprintf ( dirname2 , MAX_PATHLEN , " /class/net/%s " , dent2 - > d_name ) ;
device_list_insert ( dirname2 , " net " , & device_list ) ;
continue ;
}
2004-03-02 12:30:38 +03:00
snprintf ( dirname2 , MAX_PATHLEN , " %s/%s " , dirname , dent2 - > d_name ) ;
2004-03-03 09:15:20 +03:00
dirname2 [ MAX_PATHLEN - 1 ] = ' \0 ' ;
2004-03-02 12:30:38 +03:00
dir3 = opendir ( dirname2 ) ;
2004-03-03 09:15:20 +03:00
if ( dir3 ! = NULL ) {
for ( dent3 = readdir ( dir3 ) ; dent3 ! = NULL ; dent3 = readdir ( dir3 ) ) {
char filename [ MAX_PATHLEN ] ;
2004-03-02 12:30:38 +03:00
[PATCH] Fix naming ethernet devices in udevstart
On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore. I don't quite know when this got broken (or rather, if
> > it was supposed to be working. I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.
How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.
It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)
It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.
2004-09-11 08:09:25 +04:00
/* pass devices with a "dev" file */
2004-03-02 12:30:38 +03:00
if ( strcmp ( dent3 - > d_name , " dev " ) = = 0 ) {
2004-07-02 09:19:18 +04:00
snprintf ( filename , MAX_PATHLEN , " /class/%s/%s " ,
2004-03-03 09:15:20 +03:00
dent - > d_name , dent2 - > d_name ) ;
filename [ MAX_PATHLEN - 1 ] = ' \0 ' ;
2004-07-02 09:19:18 +04:00
device_list_insert ( filename , dent - > d_name , & device_list ) ;
[PATCH] Fix naming ethernet devices in udevstart
On Tue, Sep 07, 2004 at 12:46:43PM +0200, Kay Sievers wrote:
> On Mon, 2004-09-06 at 20:18 -0700, Tom Rini wrote:
> > I noticed somewhat recently that my enet devices weren't being renamed
> > on boot anymore. I don't quite know when this got broken (or rather, if
> > it was supposed to be working. I swear it worked for me once..), but
> > the following seems to do it.
>
> I think it never worked in the udevstart case. It worked only with the
> hotplug-event-udev, I expect.
>
> > In udev_scan_class(), look for not just
> > %s/%s/dev (which everything with a dev node has), but %s/%s/dev* (both
> > of my enet devices, sis900 & 3c59x only have device) and if that
> > exists, pass this along to udev.
>
> Yeah, network devices don't have a devnode and therefore no "dev", but
> they are all in /sys/class/net/. We may just test if we are there
> instead of the "device" match.
How about something like this. It adds all the net devices without
looking at the attributes and keeps the remaining logic like it is.
It also removes certain levels of indirection and much simplifies the
udevstart process. We surely don't need to open and close the udevdb
for every node while iterating over the list. (We are about 5% faster on
my box)
It's not well tested, so it would be nice if someone can have a look
at it, before a broken udevstart renders any system unbootable.
2004-09-11 08:09:25 +04:00
break ;
2004-03-02 12:30:38 +03:00
}
}
2004-04-24 08:55:57 +04:00
closedir ( dir3 ) ;
2004-03-02 12:30:38 +03:00
}
}
2004-04-24 08:55:57 +04:00
closedir ( dir2 ) ;
2004-03-02 12:30:38 +03:00
}
}
2004-04-24 08:55:57 +04:00
closedir ( dir ) ;
2004-03-02 12:30:38 +03:00
}
2004-07-02 09:19:18 +04:00
exec_list ( & device_list ) ;
2004-03-02 12:30:38 +03:00
}
[PATCH] Make udev/udevstart be one binary
Hi,
The following patch makes udev/udevstart be a common binary. First,
doing this grows udev by a total of 1.8kB (ppc32, stripped) whereas
udevstart by itself is 6.4kB. I know you mentioned being able to
replace udevstart with a script, but at 1.8kB I don't think it'll be
easy to beat this with size there. Next, the following are by-eye
timings of before, after, and with devfs on a slow, but still usable
embedded platform (config stripped down to more-or-less bare for
ramdisk):
-- Embedded Planet RPX LITE, 64Mhz MPC 823e --
devfs : 15.333s, 15.253s, 14.988s (15.191s avg)
udev-pristine : 18.675s, 18.079s, 18.418s (18.390s avg)
udev-multi : 14.587s, 14.747s, 14.868s (14.734s avg)
The patch ends up being rather large to add this, as in doing so I ended
up making all refs (that I hit..) to devpath/subsystem be marked as
'const'.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2004-08-10 11:50:21 +04:00
int udev_start ( void )
2004-03-02 12:30:38 +03:00
{
2004-07-02 09:19:18 +04:00
udev_scan_class ( ) ;
udev_scan_block ( ) ;
2004-03-05 06:10:02 +03:00
return 0 ;
2004-03-02 12:30:38 +03:00
}