Skip to contentSkip to conversation

Tunneling minor patches

PATCH In review Stephen Hemminger 4 participants 10 messages Nov 29, 2010 – Dec 1, 2010

Subsystems (3)
lore
Share & tools
lore
#2 lore raw

PATCH 2/3 gre: add module alias for gre0 tunnel device

In reply to Stephen Hemminger

If gre is built as a module the 'ip tunnel add' command would fail because the ip_gre module was not being autoloaded. Adding an alias for the gre0 device name cause dev_load() to autoload it when needed.

net/ipv4/ip_gre.c +1 -0
@@ -1764,3 +1764,4 @@ module_exit(ipgre_fini);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_RTNL_LINK("gre");
 MODULE_ALIAS_RTNL_LINK("gretap");
+MODULE_ALIAS("gre0");
#3 lore raw

PATCH 3/3 ipip: add module alias for tunl0 tunnel device

In reply to Stephen Hemminger

If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded. Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed.

net/ipv4/ipip.c +1 -0
@@ -913,3 +913,4 @@ static void __exit ipip_fini(void)
 module_init(ipip_init);
 module_exit(ipip_fini);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("tunl0");
#1 lore raw

PATCH 1/3 gre: minor cleanups

Use strcpy() rather the sprintf() for the case where name is getting generated. Fix indentation.

net/ipv4/ip_gre.c +2 -2
@@ -405,11 +405,11 @@ static struct ip_tunnel *ipgre_tunnel_lo
 	if (parms->name[0])
 		strlcpy(name, parms->name, IFNAMSIZ);
 	else
-		sprintf(name, "gre%%d");
+		strcpy(name, "gre%d");
 
 	dev = alloc_netdev(sizeof(*t), name, ipgre_tunnel_setup);
 	if (!dev)
-	  return NULL;
+		return NULL;
 
 	dev_net_set(dev, net);
 
#4 lore raw

Re: [PATCH 3/3] ipip: add module alias for tunl0 tunnel device

In reply to Stephen Hemminger
Quoted 10 lines · Stephen Hemminger

pièce jointe document texte brut (ipip-alias.patch)
If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded. Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed.

net/ipv4/ipip.c static void __exit ipip_fini(void) · line 916

Quoted 4 lines
net/ipv4/ipip.c +1 -0
@@ -913,3 +913,4 @@ static void __exit ipip_fini(void)
 module_init(ipip_init);
 module_exit(ipip_fini);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("tunl0");

I am not sure I understand you...

Here, I do have ipip built as a module, and I have no problem :

# lsmod|grep ipip

# ip tunnel add
cannot determine tunnel mode (ipip, gre or sit)
# lsmod|grep ipip
# ip tunnel add mode ipip
# lsmod|grep ipip
ipip                    7692  0 
tunnel4                 2949  1 ipip
# 

What am I missing ?

#5 lore raw

Re: [PATCH 3/3] ipip: add module alias for tunl0 tunnel device

Quoted 30 lines · Eric Dumazet
Quoted 10 lines · Stephen Hemminger

pièce jointe document texte brut (ipip-alias.patch)
If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded.  Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed.

net/ipv4/ipip.c 2010-11-29 11:41:05.790681069 -0800 static void __exit ipip_fini(void) · line 916

Quoted 4 lines
net/ipv4/ipip.c 2010-11-29 11:41:05.790681069 -0800 renamed from net/ipv4/ipip.c 2010-11-29 11:40:25.026277890 -0800 +1 -0
@@ -913,3 +913,4 @@ static void __exit ipip_fini(void)
  module_init(ipip_init);
  module_exit(ipip_fini);
  MODULE_LICENSE("GPL");
+MODULE_ALIAS("tunl0");

I am not sure I understand you...

Here, I do have ipip built as a module, and I have no problem :

# lsmod|grep ipip

# ip tunnel add
cannot determine tunnel mode (ipip, gre or sit)
# lsmod|grep ipip
# ip tunnel add mode ipip
# lsmod|grep ipip
ipip                    7692  0
tunnel4                 2949  1 ipip
#
Quoted 3 lines

What am I missing ?

localhost linux # lsmod
Module Size Used by
ipv6 309359 12
localhost linux # ip -V
ip utility, iproute2-ss091226 localhost linux # ip tunnel add mode gre
ioctl: No such device
localhost linux # ip tunnel add mode ipip
ioctl: No such device
localhost linux # modprobe ip_gre localhost linux # modprobe ipip localhost linux # ip tunnel add mode ipip localhost linux # ip tunnel add mode gre localhost linux # lsmod

Module                  Size  Used by
ipip                    8128  0
tunnel4                 2683  1 ipip
ip_gre                 15055  0
gre                     1967  1 ip_gre
ipv6                  309359  13 ip_gre
Signature · 2 lines
Regards,
Changli Gao([email protected])
#6 lore raw

Re: [PATCH 3/3] ipip: add module alias for tunl0 tunnel device

Quoted 49 lines · Changli Gao
Quoted 30 lines · Eric Dumazet
Quoted 10 lines · Stephen Hemminger

pièce jointe document texte brut (ipip-alias.patch)
If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded. Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed.

net/ipv4/ipip.c 2010-11-29 11:41:05.790681069 -0800 static void __exit ipip_fini(void) · line 916

Quoted 4 lines
net/ipv4/ipip.c 2010-11-29 11:41:05.790681069 -0800 renamed from net/ipv4/ipip.c 2010-11-29 11:40:25.026277890 -0800 +1 -0
@@ -913,3 +913,4 @@ static void __exit ipip_fini(void)
 module_init(ipip_init);
 module_exit(ipip_fini);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("tunl0");

I am not sure I understand you...

Here, I do have ipip built as a module, and I have no problem :

# lsmod|grep ipip

# ip tunnel add
cannot determine tunnel mode (ipip, gre or sit)
# lsmod|grep ipip
# ip tunnel add mode ipip
# lsmod|grep ipip
ipip                    7692  0
tunnel4                 2949  1 ipip
#
Quoted 3 lines

What am I missing ?

localhost linux # lsmod
Module Size Used by
ipv6 309359 12
localhost linux # ip -V
ip utility, iproute2-ss091226 localhost linux # ip tunnel add mode gre
ioctl: No such device
localhost linux # ip tunnel add mode ipip
ioctl: No such device
localhost linux # modprobe ip_gre localhost linux # modprobe ipip localhost linux # ip tunnel add mode ipip localhost linux # ip tunnel add mode gre localhost linux # lsmod

Quoted 8 lines
Module                  Size  Used by
ipip                    8128  0
tunnel4                 2683  1 ipip
ip_gre                 15055  0
gre                     1967  1 ip_gre
ipv6                  309359  13 ip_gre

Hmm. I still dont get it, ipv6 as a module ?

Works well here.

# lsmod
Module                  Size  Used by
bonding                89194  0 
ipv6                  232889  29 bonding
# ip tunnel add mode ipip
# lsmod
Module                  Size  Used by
ipip                    6221  0 
bonding                89194  0 
ipv6                  232889  29 bonding
# ip -V
ip utility, iproute2-ss100823
# 
#7 lore raw

Re: [PATCH 3/3] ipip: add module alias for tunl0 tunnel device

Quoted 63 lines · On Tue, 30 Nov 2010 09:21:09 +0100 Eric Dumazet <[email protected]> wrote:
Quoted 49 lines · Changli Gao
Quoted 30 lines · Eric Dumazet
Quoted 10 lines · Stephen Hemminger

pièce jointe document texte brut (ipip-alias.patch)
If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded. Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed.

net/ipv4/ipip.c 2010-11-29 11:41:05.790681069 -0800 static void __exit ipip_fini(void) · line 916

Quoted 4 lines
net/ipv4/ipip.c 2010-11-29 11:41:05.790681069 -0800 renamed from net/ipv4/ipip.c 2010-11-29 11:40:25.026277890 -0800 +1 -0
@@ -913,3 +913,4 @@ static void __exit ipip_fini(void)
 module_init(ipip_init);
 module_exit(ipip_fini);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("tunl0");

I am not sure I understand you...

Here, I do have ipip built as a module, and I have no problem :

# lsmod|grep ipip

# ip tunnel add
cannot determine tunnel mode (ipip, gre or sit)
# lsmod|grep ipip
# ip tunnel add mode ipip
# lsmod|grep ipip
ipip                    7692  0
tunnel4                 2949  1 ipip
#
Quoted 3 lines

What am I missing ?

localhost linux # lsmod
Module Size Used by
ipv6 309359 12
localhost linux # ip -V
ip utility, iproute2-ss091226 localhost linux # ip tunnel add mode gre
ioctl: No such device
localhost linux # ip tunnel add mode ipip
ioctl: No such device
localhost linux # modprobe ip_gre localhost linux # modprobe ipip localhost linux # ip tunnel add mode ipip localhost linux # ip tunnel add mode gre localhost linux # lsmod

Quoted 8 lines
Module                  Size  Used by
ipip                    8128  0
tunnel4                 2683  1 ipip
ip_gre                 15055  0
gre                     1967  1 ip_gre
ipv6                  309359  13 ip_gre

Hmm. I still dont get it, ipv6 as a module ?

Works well here.

Quoted 13 lines
# lsmod
Module                  Size  Used by
bonding                89194  0 
ipv6                  232889  29 bonding
# ip tunnel add mode ipip
# lsmod
Module                  Size  Used by
ipip                    6221  0 
bonding                89194  0 
ipv6                  232889  29 bonding
# ip -V
ip utility, iproute2-ss100823
# 

If you run debian there is a list of aliases in /etc/modprobe.d/aliases.conf that includes the ipip alias.

My patch provides same information from the kernel. In olden times, the kernel relied more on user space defined aliases, but in the modern era MODULE_ALIAS() is used to provide that information.

#8 lore raw

Re: [PATCH 3/3] ipip: add module alias for tunl0 tunnel device

Quoted 7 lines · Stephen Hemminger

If you run debian there is a list of aliases in /etc/modprobe.d/aliases.conf that includes the ipip alias.

My patch provides same information from the kernel. In olden times, the kernel relied more on user space defined aliases, but in the modern era MODULE_ALIAS() is used to provide that information.

Thanks for the clarification.

Running an old Red Hat Enterprise Linux ES release 4 (Nahant Update 8)

# cat /etc/modprobe.conf
alias eth0 bnx2x
alias eth1 bnx2x
alias eth2 tg3
alias eth3 tg3

(No /etc/modprobe.d/ directory)

But I can see the alias in the '.dist' file

# grep ipip /etc/modprobe.conf.dist
alias tunl0 ipip
# mv /etc/modprobe.conf.dist /etc/modprobe.conf.dist.old
# ip tunnel add mode ipip
ioctl: No such device

Thanks !