Skip to contentSkip to conversation

init: make the path argument a const in name_to_dev_t

PATCH In review Will Drewry 4 participants 8 messages May 25, 2010 – Jun 8, 2010 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 init: make the path argument a const in name_to_dev_t

name_to_dev_t takes a char * argument which it never modifies. This change converts it to a const char *.

(This is useful with the second patch in the series which exports the symbol. External consumers of the function will now be able to pass in a const char * without duping or casting away const-ness.)

---
 include/linux/mount.h |    2 +-
 init/do_mounts.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/mount.h +1 -1
index 4bd0547..ad819a0 100644
@@ -134,6 +134,6 @@ extern int do_add_mount(struct vfsmount *newmnt, struct path *path,
 
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 
-extern dev_t name_to_dev_t(char *name);
+extern dev_t name_to_dev_t(const char *name);
 
 #endif /* _LINUX_MOUNT_H */
init/do_mounts.c +1 -1
index 0848a5b..a322b13 100644
@@ -75,7 +75,7 @@ __setup("rw", readwrite);
  *	bangs.
  */
 
-dev_t name_to_dev_t(char *name)
+dev_t name_to_dev_t(const char *name)
 {
 	char s[32];
 	char *p;
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/2 init, mount: export the name_to_dev_t symbol

This change only adds EXPORT_SYMBOL() for name_to_dev_t.

name_to_dev_t is in use outside of init/ but is not 'officially' exported. It provides behavior that is useful for any code that may be need to lookup a block device by major:minor or registered kernel name, especially before there is a root filesystem.

Hopefully, this is the appropriate use of EXPORT_SYMBOL(). This specific function seems to be a stable interface and is available in include/linux/mount.h.

---
 init/do_mounts.c      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
init/do_mounts.c +1 -0
index a322b13..b9206e7 100644
@@ -144,6 +144,7 @@ fail:
 done:
 	return res;
 }
+EXPORT_SYMBOL(name_to_dev_t);
 
 static int __init root_dev_setup(char *line)
 {
Signature · 1 line
1.7.0.4
#2 lore raw

Re: [PATCH 2/2] init, mount: export the name_to_dev_t symbol

Quoted 10 lines · Will Drewry

This change only adds EXPORT_SYMBOL() for name_to_dev_t.

name_to_dev_t is in use outside of init/ but is not 'officially' exported. It provides behavior that is useful for any code that may be need to lookup a block device by major:minor or registered kernel name, especially before there is a root filesystem.

Hopefully, this is the appropriate use of EXPORT_SYMBOL(). This specific function seems to be a stable interface and is available in include/linux/mount.h.

NACK. It's really a hack for the boot code, there's no offical name to dev_t mapping.

What are you trying to use it for?

#3 lore raw

Re: [PATCH 2/2] init, mount: export the name_to_dev_t symbol

Quoted 3 lines · Christoph Hellwig

NACK. It's really a hack for the boot code, there's no offical name to dev_t mapping.
What are you trying to use it for?

Device-mapper contains a subset of that code, so he's proposing we use it here:

@@ -434,17 +435,13 @@ static int __table_get_device(struct dm_
int r;
dev_t uninitialized_var(dev);
struct dm_dev_internal *dd;
- unsigned int major, minor;

BUG_ON(!t);

- if (sscanf(path, "%u:%u", &major, &minor) == 2) {
- /* Extract the major/minor numbers */
- dev = MKDEV(major, minor);
- if (MAJOR(dev) != major || MINOR(dev) != minor)
- return -EOVERFLOW;
- } else {
- /* convert the path to a device */
+ /* lookup by major:minor or registered device name */
+ dev = name_to_dev_t(path);
+ if (!dev) {
+ /* convert the path to a device by finding its inode */
struct block_device *bdev = lookup_bdev(path);

if (IS_ERR(bdev))

Alasdair

#4 lore raw

Re: [PATCH 2/2] init, mount: export the name_to_dev_t symbol

Quoted 20 lines · Alasdair G Kergon
Quoted 3 lines · Christoph Hellwig

NACK.  It's really a hack for the boot code, there's no offical name to dev_t mapping.
What are you trying to use it for?

Device-mapper contains a subset of that code, so he's proposing we use it here:

(quoted diff) +0 -5
@@ -434,17 +435,13 @@ static int __table_get_device(struct dm_
        int r;
        dev_t uninitialized_var(dev);
        struct dm_dev_internal *dd;
-       unsigned int major, minor;
 
        BUG_ON(!t);
 
-       if (sscanf(path, "%u:%u", &major, &minor) == 2) {
-               /* Extract the major/minor numbers */
-               dev = MKDEV(major, minor);
-               if (MAJOR(dev) != major || MINOR(dev) != minor)

Review static int __table_get_device(struct dm_ · line 447

Quoted 10 lines
(quoted diff) +4 -3
-                       return -EOVERFLOW;
-       } else {
-               /* convert the path to a device */
+       /* lookup by major:minor or registered device name */
+       dev = name_to_dev_t(path);
+       if (!dev) {
+               /* convert the path to a device by finding its inode */
                struct block_device *bdev = lookup_bdev(path);
 
                if (IS_ERR(bdev))

In addition to getting rid of the code duplication, I'd like device-mapper to be able to resolve slave devices at boot-time to accommodate a do_mounts_dm.c equivalent to do_mounts_md.c:

https://patchwork.kernel.org/patch/101024/

(which I neglected to mail to the other init-related maintainers - sorry!
I'll correct that when I mail out the next revision.)

thanks!
will

#5 lore raw

Re: [PATCH 2/2] init, mount: export the name_to_dev_t symbol

Quoted 3 lines · Will Drewry

In addition to getting rid of the code duplication, I'd like device-mapper to be able to resolve slave devices at boot-time to accommodate a do_mounts_dm.c equivalent to do_mounts_md.c:

So please add a do_mounts_dm.c instead of pushing this somewhere it doesn't belong to.

#6 lore raw

Re: [PATCH 2/2] init, mount: export the name_to_dev_t symbol

Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · Will Drewry

In addition to getting rid of the code duplication, I'd like device-mapper to be able to resolve slave devices at boot-time to accommodate a do_mounts_dm.c equivalent to do_mounts_md.c:

So please add a do_mounts_dm.c instead of pushing this somewhere it doesn't belong to.

He is proposing doing just that, you cut out the patchwork url he already shared: https://patchwork.kernel.org/patch/101024/

Will's intentions are good: avoid code duplication.

He is also trying to keep DM-specific common code in drivers/md/

So in this instance, avoiding the need to export name_to_dev_t would require splitting the internal DM __table_get_device (or more likely:
dm_get_device) out to a public facing interface that takes a dev_t.

Mike

#7 lore raw

Re: [PATCH 2/2] init, mount: export the name_to_dev_t symbol

Quoted 14 lines · Mike Snitzer
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · Will Drewry

In addition to getting rid of the code duplication, I'd like device-mapper to be able to resolve slave devices at boot-time to accommodate a do_mounts_dm.c equivalent to do_mounts_md.c:

So please add a do_mounts_dm.c instead of pushing this somewhere it doesn't belong to.

He is proposing doing just that, you cut out the patchwork url he already shared: https://patchwork.kernel.org/patch/101024/

Quoted 7 lines

Will's intentions are good: avoid code duplication.

He is also trying to keep DM-specific common code in drivers/md/

So in this instance, avoiding the need to export name_to_dev_t would require splitting the internal DM __table_get_device (or more likely:
dm_get_device) out to a public facing interface that takes a dev_t.

FWIW, I mailed out a new patchset which does not expect the dm core code to understand device paths before there is a root device. Now it walks the target parameters supplied to do_mounts_dm.c and attempts a best-guess replacement with major:minor numbers. It's not as succinct, but it achieves the isolation requested and negates the need for the patch on this thread.

The relevant init-time patchwork link:
https://patchwork.kernel.org/patch/104861/
(Full patchset is 58-61)

Any and all comments will be appreciated - thanks! will