linux.git/net/ipv4/ipmr.c, branch v2.6.27

netns: Use net_eq() to compare net-namespaces for optimization.

2008-07-20T05:34:43+00:00

Without CONFIG_NET_NS, namespace is always &init_net.
Compiler will be able to omit namespace comparisons with this patch.

Signed-off-by: YOSHIFUJI Hideaki 
Signed-off-by: David S. Miller

mib: add net to IP_INC_STATS_BH

2008-07-17T03:20:11+00:00

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

ipv4: Fix ipmr unregister device oops

2008-07-15T03:56:34+00:00

An oops happens during device unregister.

The following oops happened when I add two tunnels, which
use a same device, and then delete one tunnel.
Obviously deleting tunnel "A" causes device unregister, which
send a notification, and after receiving notification, ipmr do
unregister again for tunnel "B" which also use same device.
That is wrong.
After receiving notification, ipmr only needs to decrease reference
count and don't do duplicated unregister.
Fortunately, IPv6 side doesn't add tunnel in ip6mr, so it's clean.

This patch fixs:
- unregister device oops
- using after dev_put()

Here is the oops:
===
Jul 11 15:39:29 wangchen kernel: ------------[ cut here ]------------
Jul 11 15:39:29 wangchen kernel: kernel BUG at net/core/dev.c:3651!
Jul 11 15:39:29 wangchen kernel: invalid opcode: 0000 [#1] 
Jul 11 15:39:29 wangchen kernel: Modules linked in: ipip tunnel4 nfsd lockd nfs_acl auth_rpcgss sunrpc exportfs ipv6 snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device af_packet binfmt_misc button battery ac loop dm_mod usbhid ff_memless pcmcia firmware_class ohci1394 8139too mii ieee1394 yenta_socket rsrc_nonstatic pcmcia_core ide_cd_mod cdrom snd_intel8x0 snd_ac97_codec ac97_bus snd_pcm i2c_i801 snd_timer snd i2c_core soundcore snd_page_alloc rng_core shpchp ehci_hcd uhci_hcd pci_hotplug intel_agp agpgart usbcore ext3 jbd ata_piix ahci libata dock edd fan thermal processor thermal_sys piix sd_mod scsi_mod ide_disk ide_core [last unloaded: freq_table]
Jul 11 15:39:29 wangchen kernel: 
Jul 11 15:39:29 wangchen kernel: Pid: 4102, comm: mroute Not tainted (2.6.26-rc9-default #69)
Jul 11 15:39:29 wangchen kernel: EIP: 0060:[] EFLAGS: 00010202 CPU: 0
Jul 11 15:39:29 wangchen kernel: EIP is at rollback_registered+0x61/0xe3
Jul 11 15:39:29 wangchen kernel: EAX: 00000001 EBX: ecba6000 ECX: 00000000 EDX: ffffffff
Jul 11 15:39:29 wangchen kernel: ESI: 00000001 EDI: ecba6000 EBP: c03de2e8 ESP: ed8e7c3c
Jul 11 15:39:29 wangchen kernel:  DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
Jul 11 15:39:29 wangchen kernel: Process mroute (pid: 4102, ti=ed8e6000 task=ed41e830 task.ti=ed8e6000)
Jul 11 15:39:29 wangchen kernel: Stack: ecba6000 c024641c 00000028 c0284e1a 00000001 c03de2e8 ecba6000 eecff360 
Jul 11 15:39:29 wangchen kernel:        c0284e4c c03536f4 fffffff8 00000000 c029a819 ecba6000 00000006 ecba6000 
Jul 11 15:39:29 wangchen kernel:        00000000 ecba6000 c03de2c0 c012841b ffffffff 00000000 c024639f ecba6000 
Jul 11 15:39:29 wangchen kernel: Call Trace:
Jul 11 15:39:29 wangchen kernel:  [] unregister_netdevice+0x2f/0x51
Jul 11 15:39:29 wangchen kernel:  [] vif_delete+0xaf/0xc3
Jul 11 15:39:29 wangchen kernel:  [] ipmr_device_event+0x1e/0x30
Jul 11 15:39:29 wangchen kernel:  [] notifier_call_chain+0x2a/0x47
Jul 11 15:39:29 wangchen kernel:  [] raw_notifier_call_chain+0x9/0xc
Jul 11 15:39:29 wangchen kernel:  [] rollback_registered+0x95/0xe3
Jul 11 15:39:29 wangchen kernel:  [] unregister_netdevice+0x2f/0x51
Jul 11 15:39:29 wangchen kernel:  [] vif_delete+0xaf/0xc3
Jul 11 15:39:29 wangchen kernel:  [] ip_mroute_setsockopt+0x47a/0x801
Jul 11 15:39:29 wangchen kernel:  [] do_get_write_access+0x2df/0x313 [jbd]
Jul 11 15:39:29 wangchen kernel:  [] __find_get_block_slow+0xda/0xe4
Jul 11 15:39:29 wangchen kernel:  [] __find_get_block+0xf8/0x122
Jul 11 15:39:29 wangchen kernel:  [] __find_get_block+0xf8/0x122
Jul 11 15:39:29 wangchen kernel:  [] journal_cancel_revoke+0xda/0x110 [jbd]
Jul 11 15:39:29 wangchen kernel:  [] ip_setsockopt+0xa9/0x9ee
Jul 11 15:39:29 wangchen kernel:  [] journal_cancel_revoke+0xda/0x110 [jbd]
Jul 11 15:39:29 wangchen kernel:  [] do_get_write_access+0x2df/0x313 [jbd]
Jul 11 15:39:29 wangchen kernel:  [] __ext3_get_inode_loc+0xcf/0x271 [ext3]
Jul 11 15:39:29 wangchen kernel:  [] __ext3_journal_dirty_metadata+0x13/0x32 [ext3]
Jul 11 15:39:29 wangchen kernel:  [] __wake_up+0xf/0x15
Jul 11 15:39:29 wangchen kernel:  [] journal_stop+0x1bd/0x1c6 [jbd]
Jul 11 15:39:29 wangchen kernel:  [] __ext3_journal_stop+0x19/0x34 [ext3]
Jul 11 15:39:29 wangchen kernel:  [] get_page_from_freelist+0x94/0x369
Jul 11 15:39:29 wangchen kernel:  [] filemap_fault+0x1ac/0x2fe
Jul 11 15:39:29 wangchen kernel:  [] security_sk_alloc+0xd/0xf
Jul 11 15:39:29 wangchen kernel:  [] sk_prot_alloc+0x36/0x78
Jul 11 15:39:29 wangchen kernel:  [] sk_alloc+0x3a/0x40
Jul 11 15:39:29 wangchen kernel:  [] raw_hash_sk+0x46/0x4e
Jul 11 15:39:29 wangchen kernel:  [] d_alloc+0x1b/0x157
Jul 11 15:39:29 wangchen kernel:  [] sock_common_setsockopt+0x12/0x16
Jul 11 15:39:29 wangchen kernel:  [] sys_setsockopt+0x6f/0x8e
Jul 11 15:39:29 wangchen kernel:  [] sys_socketcall+0x15c/0x19e
Jul 11 15:39:29 wangchen kernel:  [] sysenter_past_esp+0x6a/0x99
Jul 11 15:39:29 wangchen kernel:  [] unix_poll+0x69/0x78
Jul 11 15:39:29 wangchen kernel:  =======================
Jul 11 15:39:29 wangchen kernel: Code: 83 e0 01 00 00 85 c0 75 1f 53 53 68 12 81 31 c0 e8 3c 30 ed ff ba 3f 0e 00 00 b8 b9 7f 31 c0 83 c4 0c 5b e9 f5 26 ed ff 48 74 04 <0f> 0b eb fe 89 d8 e8 21 ff ff ff 89 d8 e8 62 ea ff ff c7 83 e0 
Jul 11 15:39:29 wangchen kernel: EIP: [] rollback_registered+0x61/0xe3 SS:ESP 0068:ed8e7c3c
Jul 11 15:39:29 wangchen kernel: ---[ end trace c311acf85d169786 ]---
===

Signed-off-by: Wang Chen 
Signed-off-by: David S. Miller

ipv4: Check return of dev_set_allmulti

2008-07-15T03:55:26+00:00

allmulti might overflow.
Commit: "netdevice: Fix promiscuity and allmulti overflow" in net-next makes
dev_set_promiscuity/allmulti return error number if overflow happened.

Here, we check the positive increment for allmulti to get error return.

PS: For unwinding tunnel creating, we let ipip->ioctl() to handle it.

Signed-off-by: Wang Chen 
Signed-off-by: David S. Miller

ipv4: Do cleanup for ip_mr_init

2008-07-03T08:51:57+00:00

Same as ip6_mr_init(), make ip_mr_init() return errno if fails.
But do not do error handling in inet_init(), just print a msg.

Signed-off-by: Wang Chen 
Signed-off-by: YOSHIFUJI Hideaki

net: remove CVS keywords

2008-06-12T04:00:38+00:00

This patch removes CVS keywords that weren't updated for a long time
from comments.

Signed-off-by: Adrian Bunk 
Signed-off-by: David S. Miller

ipmr: Use on-device stats instead of private ones.

2008-05-21T21:43:45+00:00

These devices use the private area of appropriate size for
statistics. Turning them to use on-device ones make them
"privless" and thus - really small wrt kmalloc cache, they
are allocated from.

Besides, code looks nicer, because of absence of multi-braced
type casts and dereferences.

[ Fix build failures -DaveM ]

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

ipmr: Ipip tunnel uses on-device stats.

2008-05-21T21:16:14+00:00

The ipmr uses ipip tunnels for its purposes and updates the
tunnels' stats, but the ipip driver is already switched to
use on-device ones.

Actually, this is a part of the patch #4 from this set.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

2008-03-25T19:39:55+00:00

Introduce per-sock inlines: sock_net(), sock_net_set()
and per-inet_timewait_sock inlines: twsk_net(), twsk_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.

Signed-off-by: YOSHIFUJI Hideaki

[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.

2008-03-25T19:39:53+00:00

Introduce per-net_device inlines: dev_net(), dev_net_set().
Without CONFIG_NET_NS, no namespace other than &init_net exists.
Let's explicitly define them to help compiler optimizations.

Signed-off-by: YOSHIFUJI Hideaki