B.A.T.M.A.N August 2013

b.a.t.m.a.n@lists.open-mesh.org

12 participants
45 discussions

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix variable name in compat code
by Antonio Quartulli 18 Aug '13

18 Aug '13

compat code introduced by 0d941e82ab5f92faf33bee6abdde519056f3ac2d ("batman-adv: Unmap fragment page once iterator is done") is declaring a variable having the same name of one used in the batman-adv code. Rename it to prevent sparse warnings. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- compat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compat.h b/compat.h index 346a824..35ed4d9 100644 --- a/compat.h +++ b/compat.h @@ -309,10 +309,10 @@ static int __batadv_interface_set_mac_addr(x, y) /* older kernels still need to call skb_abort_seq_read() */ #define skb_seq_read(consumed, data, st) \ ({ \ - int len = skb_seq_read(consumed, data, st); \ - if (len == 0) \ + int __len = skb_seq_read(consumed, data, st); \ + if (__len == 0) \ skb_abort_seq_read(st); \ - len; \ + __len; \ }) #endif /* < KERNEL_VERSION(3, 11, 0) */ -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: compat-code for skb_abort_seq_read()
by Simon Wunderlich 17 Aug '13

17 Aug '13

Since skb_abort_seq_read() has been removed in the patch "net: Unmap fragment page once iterator is done" in linux, but is still needed for older kernel, add compat code to call it after the iteration is done. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- compat.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/compat.h b/compat.h index ddc1b29..e9b531f 100644 --- a/compat.h +++ b/compat.h @@ -326,6 +326,14 @@ static int __batadv_interface_set_mac_addr(x, y) #define netdev_notifier_info_to_dev(ptr) ptr +/* older kernels still need to call skb_abort_seq_read() */ +#define skb_seq_read(consumed, data, st) \ + ({ \ + int len = skb_seq_read(consumed, data, st); \ + if (len == 0) \ + skb_abort_seq_read(st); \ + len; \ + }) #endif /* < KERNEL_VERSION(3, 11, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ -- 1.7.10.4

2 1

[B.A.T.M.A.N.] Kernel panic & Process batadv.sh - Fatal
by cmsv 17 Aug '13

17 Aug '13

OpenWrt version: Attitude Adjustment (r37747) Recently there was someone (Lucaspost) on #batman with a problem caused by mixing the latest AA and Batman-adv 2013.3.0 and while i can't be sure the problem is exactly this one; here goes my testing with a D-link 615C1 I can only access the router using a serial connection and here is the log. attached goes the kernel configuration that i used while compiling the image. Since i am not sure which side is causing the this problem (batman-adv or openwrt) i am emailing both lists. [ 26.790000] Kernel panic - not syncing: Fatal exception in interrupt [ 26.800000] Rebooting in 3 seconds.. U-Boot 1.1.4 (Sep 5 2008 - 17:05:35) AP81 (ar7100) U-boot DRAM: AP81 initdram sri:ddr_init 32 MB Top of RAM usable for U-Boot at: 82000000 Reserving 177k for U-Boot at: 81fd0000 Reserving 192k for malloc() at: 81fa0000 Reserving 44 Bytes for Board Info at: 81f9ffd4 Reserving 36 Bytes for Global Data at: 81f9ffb0 Reserving 128k for boot params() at: 81f7ffb0 Stack Pointer at: 81f7ff98 Now running in RAM - U-Boot at: 81fd0000 ar7100 flash_init id read 0x10000107 flash size 400000, sector count = 64 Flash: 4 MB Using default environment In: serial Out: serial Err: serial Net: eth_initialize CONFIG_NET_MULTI ag7100_enet_initialize eth0: 00:22:b0:d2:61:0b ethernet found. eth0 ## Booting image at bf030000 ... checksum:8ba30c3a Image Name: MIPS OpenWrt Linux-3.3.8 Created: 2013-08-12 3:37:29 UTC Image Type: MIPS Linux Kernel Image (lzma compressed) Data Size: 924127 Bytes = 902.5 kB Load Address: 80060000 Entry Point: 80060000 Verifying Checksum ... OK LZMA Umcompressing Kernel Image ... Image loaded from 80060000-8030ae40 OK Boot image os 5=IH_OS_LINUX ## do_bootm_linux start.... No initrd ## Transferring control to Linux (at address 80060000) ... ## Giving linux memsize in bytes, 33554432 ##Starting kernel ... [ 0.000000] Linux version 3.3.8 (cmsv@nixbits) (gcc version 4.6.3 20120201 (prerelease) (Linaro GCC 4.6-2012.02) ) #1 Sun Aug 11 23:35:48 EDT 2013 [ 0.000000] bootconsole [early0] enabled [ 0.000000] CPU revision is: 00019374 (MIPS 24Kc) [ 0.000000] SoC: Atheros AR9130 rev 1 [ 0.000000] Clocks: CPU:400.000MHz, DDR:400.000MHz, AHB:100.000MHz, Ref:5.000MHz [ 0.000000] Determined physical RAM map: [ 0.000000] memory: 02000000 @ 00000000 (usable) [ 0.000000] Initrd not found or empty - disabling initrd [ 0.000000] Zone PFN ranges: [ 0.000000] Normal 0x00000000 -> 0x00002000 [ 0.000000] Movable zone start PFN for each node [ 0.000000] Early memory PFN ranges [ 0.000000] 0: 0x00000000 -> 0x00002000 [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 8128 [ 0.000000] Kernel command line: board=DIR-615-C1 console=ttyS0,115200 mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,960k(kernel),2880k(rootfs),64k(art)ro,3840k@0x30000(firmware) rootfstype=squashfs,jffs2 noinitrd [ 0.000000] PID hash table entries: 128 (order: -3, 512 bytes) [ 0.000000] Dentry cache hash table entries: 4096 (order: 2, 16384 bytes) [ 0.000000] Inode-cache hash table entries: 2048 (order: 1, 8192 bytes) [ 0.000000] Primary instruction cache 64kB, VIPT, 4-way, linesize 32 bytes. [ 0.000000] Primary data cache 32kB, 4-way, VIPT, cache aliases, linesize 32 bytes [ 0.000000] Writing ErrCtl register=00000000 [ 0.000000] Readback ErrCtl register=00000000 [ 0.000000] Memory: 29116k/32768k available (2115k kernel code, 3652k reserved, 406k data, 208k init, 0k highmem) [ 0.000000] SLUB: Genslabs=9, HWalign=32, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 [ 0.000000] NR_IRQS:51 [ 0.000000] Calibrating delay loop... 265.42 BogoMIPS (lpj=1327104) [ 0.080000] pid_max: default: 32768 minimum: 301 [ 0.080000] Mount-cache hash table entries: 512 [ 0.090000] NET: Registered protocol family 16 [ 0.090000] gpiochip_add: registered GPIOs 0 to 21 on device: ath79 [ 0.100000] MIPS: machine is D-Link DIR-615 rev. C1 [ 0.580000] bio: create slab <bio-0> at 0 [ 0.590000] Switching to clocksource MIPS [ 0.600000] NET: Registered protocol family 2 [ 0.600000] IP route cache hash table entries: 1024 (order: 0, 4096 bytes) [ 0.600000] TCP established hash table entries: 1024 (order: 1, 8192 bytes) [ 0.610000] TCP bind hash table entries: 1024 (order: 0, 4096 bytes) [ 0.610000] TCP: Hash tables configured (established 1024 bind 1024) [ 0.620000] TCP reno registered [ 0.620000] UDP hash table entries: 256 (order: 0, 4096 bytes) [ 0.630000] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes) [ 0.630000] NET: Registered protocol family 1 [ 0.660000] squashfs: version 4.0 (2009/01/31) Phillip Lougher [ 0.660000] JFFS2 version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc. [ 0.670000] msgmni has been set to 56 [ 0.680000] io scheduler noop registered [ 0.680000] io scheduler deadline registered (default) [ 0.690000] Serial: 8250/16550 driver, 1 ports, IRQ sharing disabled [ 0.710000] serial8250.0: ttyS0 at MMIO 0x18020000 (irq = 11) is a 16550A [ 0.720000] console [ttyS0] enabled, bootconsole disabled [ 0.720000] console [ttyS0] enabled, bootconsole disabled [ 0.740000] m25p80 spi0.0: found s25sl032a, expected m25p80 [ 0.740000] m25p80 spi0.0: s25sl032a (4096 Kbytes) [ 0.750000] 6 cmdlinepart partitions found on MTD device spi0.0 [ 0.750000] Creating 6 MTD partitions on "spi0.0": [ 0.760000] 0x000000000000-0x000000020000 : "u-boot" [ 0.760000] 0x000000020000-0x000000030000 : "config" [ 0.770000] 0x000000030000-0x000000120000 : "kernel" [ 0.780000] 0x000000120000-0x0000003f0000 : "rootfs" [ 0.780000] mtd: partition "rootfs" set to be root filesystem [ 0.790000] mtd: partition "rootfs_data" created automatically, ofs=380000, len=70000 [ 0.800000] 0x000000380000-0x0000003f0000 : "rootfs_data" [ 0.800000] 0x0000003f0000-0x000000400000 : "art" [ 0.810000] 0x000000030000-0x0000003f0000 : "firmware" [ 0.870000] ag71xx_mdio: probed [ 0.870000] eth0: Atheros AG71xx at 0xb9000000, irq 4 [ 1.200000] eth0: Atheros AR8216 switch driver attached. [ 1.300000] ag71xx ag71xx.0: eth0: connected to PHY at ag71xx-mdio.0:00 [uid=004dd042, driver=Atheros AR8216/AR8236/AR8316] [ 1.310000] eth1: Atheros AG71xx at 0xba000000, irq 5 [ 1.640000] ag71xx ag71xx.1: eth1: connected to PHY at ag71xx-mdio.0:04 [uid=004dd042, driver=Atheros AR8216/AR8236/AR8316] [ 1.650000] TCP cubic registered [ 1.660000] NET: Registered protocol family 17 [ 1.660000] 8021q: 802.1Q VLAN Support v1.8 [ 1.670000] VFS: Mounted root (squashfs filesystem) readonly on device 31:3. [ 1.680000] Freeing unused kernel memory: 208k freed - preinit - Press the [f] key and hit [enter] to enter failsafe mode [ 5.310000] eth0: link up (100Mbps/Full duplex) - regular preinit - jffs2 not ready yet; using ramdisk - init - [ 7.400000] eth0: link down [ 8.000000] Loading modules backported from Linux version master-2013-06-27-0-gdcfa6d5 [ 8.000000] Backport generated by backports.git backports-20130617-4-ge3220f5 [ 8.040000] cfg80211: Calling CRDA to update world regulatory domain [ 8.040000] cfg80211: World regulatory domain updated: [ 8.050000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) [ 8.050000] cfg80211: (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) [ 8.060000] cfg80211: (2457000 KHz - 2482000 KHz @ 20000 KHz), (300 mBi, 2000 mBm) [ 8.070000] cfg80211: (2474000 KHz - 2494000 KHz @ 20000 KHz), (300 mBi, 2000 mBm) [ 8.080000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) [ 8.090000] cfg80211: (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) [ 8.370000] usbcore: registered new interface driver usbfs [ 8.380000] usbcore: registered new interface driver hub [ 8.380000] usbcore: registered new device driver usb [ 9.070000] ieee80211 phy0: Atheros AR9100 MAC/BB Rev:7 AR2122 RF Rev:a1 mem=0xb80c0000, irq=2 [ 9.080000] cfg80211: Calling CRDA for country: US [ 9.080000] cfg80211: Regulatory domain changed to country: US [ 9.090000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) [ 9.100000] cfg80211: (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2700 mBm) [ 9.110000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 1700 mBm) [ 9.110000] cfg80211: (5250000 KHz - 5330000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) [ 9.120000] cfg80211: (5490000 KHz - 5600000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) [ 9.130000] cfg80211: (5650000 KHz - 5710000 KHz @ 40000 KHz), (300 mBi, 2000 mBm) [ 9.140000] cfg80211: (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 3000 mBm) [ 9.190000] PPP generic driver version 2.4.2 [ 9.420000] ip_tables: (C) 2000-2006 Netfilter Core Team [ 9.640000] NET: Registered protocol family 24 [ 9.660000] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver [ 9.680000] nf_conntrack version 0.5.0 (458 buckets, 1832 max) [ 9.970000] batman_adv: B.A.T.M.A.N. advanced 2013.3.0 (compatibility version 14) loaded [ 10.030000] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver Please press Enter to activate this console. [ 15.580000] device eth0 entered promiscuous mode [ 17.530000] eth0: link up (100Mbps/Full duplex) [ 17.540000] br-lan: port 1(eth0) entered forwarding state [ 17.540000] br-lan: port 1(eth0) entered forwarding state [ 19.540000] br-lan: port 1(eth0) entered forwarding state [ 19.570000] cfg80211: Calling CRDA for country: PT [ 19.580000] cfg80211: Regulatory domain changed to country: PT [ 19.580000] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp) [ 19.590000] cfg80211: (2402000 KHz - 2482000 KHz @ 40000 KHz), (N/A, 2000 mBm) [ 19.600000] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (N/A, 2000 mBm) [ 19.610000] cfg80211: (5250000 KHz - 5330000 KHz @ 40000 KHz), (N/A, 2000 mBm) [ 19.610000] cfg80211: (5490000 KHz - 5710000 KHz @ 40000 KHz), (N/A, 2700 mBm) [ 21.980000] device wlan0 entered promiscuous mode [ 22.000000] br-lan: port 2(wlan0) entered forwarding state [ 22.010000] br-lan: port 2(wlan0) entered forwarding state [ 24.010000] br-lan: port 2(wlan0) entered forwarding state [ 25.780000] br-lan: port 2(wlan0) entered disabled state [ 26.590000] CPU 0 Unable to handle kernel paging request at virtual address 00000108, epc == 801e0a88, ra == 801e0a88 [ 26.600000] Oops[#1]: [ 26.600000] Cpu 0 [ 26.600000] $ 0 : 00000000 00000000 80eefa80 80f2c030 [ 26.600000] $ 4 : 80f2c764 00000000 00000000 000001e8 [ 26.600000] $ 8 : 00000024 80165c2c 00000003 ee940fc2 [ 26.600000] $12 : 802d6204 b479fa57 25acb3af e000044c [ 26.600000] $16 : 00000000 80f2cb80 80f2cb80 81b05000 [ 26.600000] $20 : 80e97f10 80340000 80db2300 80ef6c98 [ 26.600000] $24 : 00000003 00000000 [ 26.600000] $28 : 80e96000 80e97d60 00000000 801e0a88 [ 26.600000] Hi : 000001dd [ 26.600000] Lo : 003fcd9e [ 26.600000] epc : 801e0a88 0x801e0a88 [ 26.600000] Tainted: G O [ 26.600000] ra : 801e0a88 0x801e0a88 [ 26.600000] Status: 1000f403 KERNEL EXL IE [ 26.600000] Cause : 00800008 [ 26.600000] BadVA : 00000108 [ 26.600000] PrId : 00019374 (MIPS 24Kc) [ 26.600000] Modules linked in: ath79_wdt ohci_hcd ledtrig_usbdev ledtrig_netdev batman_adv(O) nf_nat_irc nf_conntrack_irc nf_nat_ftp nf_conntrack_ftp ipt_MASQUERADE iptable_nat nf_nat pppoe xt_conntrack xt_CT xt_NOTRACK iptable_raw xt_state nf_conntrack_ipv4 nf_defrag_ipv4 nf_conntrack ehci_hcd pppox ipt_REJECT xt_TCPMSS ipt_LOG xt_comment xt_multiport xt_mac xt_limit iptable_mangle iptable_filter ip_tables xt_tcpudp x_tables ppp_async ppp_generic slhc ath9k(O) ath9k_common(O) ath9k_hw(O) ath(O) mac80211(O) usbcore usb_common nls_base libcrc32c crc16 crc_ccitt cfg80211(O) compat(O) arc4 aes_generic crc32c crypto_hash crypto_algapi ledtrig_timer ledtrig_default_on leds_gpio gpio_button_hotplug(O) [ 26.600000] Process batadv.sh (pid: 1050, threadinfo=80e96000, task=80f44850, tls=77a5e440) [ 26.600000] Stack : 80279120 00000000 00000010 80f2cb80 80f48800 80ed7318 00000001 80f2c800 [ 26.600000] 80f2cb80 81b05000 00000001 80f2c800 80f2cb80 81b05000 80e97f10 80ec8808 [ 26.600000] 80ed9968 81b05000 80e97f10 00000000 00000000 80f2c800 80f2cb80 80ecf8ac [ 26.600000] 00000000 80ecf97c 00000000 00000000 80f2c800 00000000 00000000 801edc74 [ 26.600000] 80f2c800 801e8e80 80e97f00 80dad000 00000000 80f2c800 81b05000 00000000 [ 26.600000] ... [ 26.600000] Call Trace:[<80ed7318>] 0x80ed7318 [ 26.600000] [<80ec8808>] 0x80ec8808 [ 26.600000] [<80ecf8ac>] 0x80ecf8ac [ 26.600000] [<80ecf97c>] 0x80ecf97c [ 26.600000] [<801edc74>] 0x801edc74 [ 26.600000] [<801e8e80>] 0x801e8e80 [ 26.600000] [<80ed01a8>] 0x80ed01a8 [ 26.600000] [<801e8bcc>] 0x801e8bcc [ 26.600000] [<80ec7084>] 0x80ec7084 [ 26.600000] [<80ed0af8>] 0x80ed0af8 [ 26.600000] [<800b19f0>] 0x800b19f0 [ 26.600000] [<80122acc>] 0x80122acc [ 26.600000] [<800d9104>] 0x800d9104 [ 26.600000] [<800757dc>] 0x800757dc [ 26.600000] [<800d93dc>] 0x800d93dc [ 26.600000] [<8006a284>] 0x8006a284 [ 26.600000] [<8007580c>] 0x8007580c [ 26.600000] [ 26.600000] [ 26.600000] Code: afbf0014 0c078286 00808021 <8e030108> 7c6304c0 1460000a 8fbf0014 10400009 8fb00010 [ 26.870000] ---[ end trace d26ab0e286851b8a ]--- [ 26.870000] Kernel panic - not syncing: Fatal exception in interrupt [ 26.880000] Rebooting in 3 seconds.. -- Site: http://wirelesspt.net Mesh: http://tinyurl.com/wirelesspt Admin: http://wirelesspt.net/wiki/Cmsv Twitter: http://twitter.com/wirelesspt Suporte técnico via sms: 91 19 11 798 Donativos/Paypal: http://tinyurl.com/doar-verba Chave publica PGP/SSH: http://wirelesspt.net/arquivos/pk Email assinado digitalmente pelo emissor assegurando autenticidade

3 4

[B.A.T.M.A.N.] [PATCH] batman-adv: properly print the VID in DAT
by Antonio Quartulli 16 Aug '13

16 Aug '13

Make the DAT code use the PRINT_VID macro to print the VIDs. Introduced by 3e26722bc9f248ec4316749fc1957365c0fa5e4b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- distributed-arp-table.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 081c1af..df65f8c 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -282,8 +282,9 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN); dat_entry->last_update = jiffies; batadv_dbg(BATADV_DBG_DAT, bat_priv, - "Entry updated: %pI4 %pM (vid: %u)\n", - &dat_entry->ip, dat_entry->mac_addr, vid); + "Entry updated: %pI4 %pM (vid: %d)\n", + &dat_entry->ip, dat_entry->mac_addr, + BATADV_PRINT_VID(vid)); goto out; } @@ -307,8 +308,8 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, goto out; } - batadv_dbg(BATADV_DBG_DAT, bat_priv, "New entry added: %pI4 %pM (vid: %u)\n", - &dat_entry->ip, dat_entry->mac_addr, vid); + batadv_dbg(BATADV_DBG_DAT, bat_priv, "New entry added: %pI4 %pM (vid: %d)\n", + &dat_entry->ip, dat_entry->mac_addr, BATADV_PRINT_VID(vid)); out: if (dat_entry) -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH-next] batman-adv: set skb priority according to content
by Simon Wunderlich 16 Aug '13

16 Aug '13

From: Simon Wunderlich <simon(a)open-mesh.com> The skb priority field may help the wireless driver to choose the right queue (e.g. WMM queues). This should be set in batman-adv, as this information is only available here. This patch adds support for IPv4/IPv6 DS fields and VLAN PCP. Note that only VLAN PCP is used if a VLAN header is present. Also initially set TC_PRIO_CONTROL only for self-generated packets, and keep the priority set by higher layers. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCH: * add compat code * base on next instead of master --- bat_iv_ogm.c | 1 + compat.h | 3 +++ icmp_socket.c | 1 + main.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ main.h | 1 + routing.c | 20 +++++++++++++++++- send.c | 1 - soft-interface.c | 2 ++ translation-table.c | 5 +++++ unicast.c | 2 ++ vis.c | 2 ++ 11 files changed, 94 insertions(+), 2 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 2031071..0a8a80c 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -479,6 +479,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, kfree(forw_packet_aggr); goto out; } + forw_packet_aggr->skb->priority = TC_PRIO_CONTROL; skb_reserve(forw_packet_aggr->skb, ETH_HLEN); skb_buff = skb_put(forw_packet_aggr->skb, packet_len); diff --git a/compat.h b/compat.h index 17ef089..0847d49 100644 --- a/compat.h +++ b/compat.h @@ -84,6 +84,9 @@ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, return skb; } +#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */ +#define VLAN_PRIO_SHIFT 13 + #endif /* < KERNEL_VERSION(2, 6, 33) */ diff --git a/icmp_socket.c b/icmp_socket.c index b27508b..5a99bb4 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -183,6 +183,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto out; } + skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len); diff --git a/main.c b/main.c index 51aafd6..ed97382 100644 --- a/main.c +++ b/main.c @@ -19,6 +19,10 @@ #include <linux/crc32c.h> #include <linux/highmem.h> +#include <linux/if_vlan.h> +#include <net/ip.h> +#include <net/ipv6.h> +#include <net/dsfield.h> #include "main.h" #include "sysfs.h" #include "debugfs.h" @@ -249,6 +253,60 @@ out: return primary_if; } +/** + * batadv_skb_set_priority - sets skb priority according to packet content + * @skb: the packet to be sent + * @offset: offset to the packet content + * + * This function sets a value between 256 and 263 (802.1d priority), which + * can be interpreted by the cfg80211 or other drivers. + */ +void batadv_skb_set_priority(struct sk_buff *skb, int offset) +{ + struct iphdr ip_hdr_tmp, *ip_hdr; + struct ipv6hdr ip6_hdr_tmp, *ip6_hdr; + struct ethhdr ethhdr_tmp, *ethhdr; + struct vlan_ethhdr *vhdr, vhdr_tmp; + u32 prio; + + /* already set, do nothing */ + if (skb->priority >= 256 && skb->priority <= 263) + return; + + ethhdr = skb_header_pointer(skb, offset, sizeof(*ethhdr), &ethhdr_tmp); + if (!ethhdr) + return; + + switch (ethhdr->h_proto) { + case htons(ETH_P_8021Q): + vhdr = skb_header_pointer(skb, offset + sizeof(*vhdr), + sizeof(*vhdr), &vhdr_tmp); + if (!vhdr) + return; + prio = htons(vhdr->h_vlan_TCI) & VLAN_PRIO_MASK; + prio = prio >> VLAN_PRIO_SHIFT; + break; + case htons(ETH_P_IP): + ip_hdr = skb_header_pointer(skb, offset + sizeof(*ethhdr), + sizeof(*ip_hdr), &ip_hdr_tmp); + if (!ip_hdr) + return; + prio = (ipv4_get_dsfield(ip_hdr) & 0xfc) >> 5; + break; + case htons(ETH_P_IPV6): + ip6_hdr = skb_header_pointer(skb, offset + sizeof(*ethhdr), + sizeof(*ip6_hdr), &ip6_hdr_tmp); + if (!ip6_hdr) + return; + prio = (ipv6_get_dsfield(ip6_hdr) & 0xfc) >> 5; + break; + default: + return; + } + + skb->priority = prio + 256; +} + static int batadv_recv_unhandled_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if) { diff --git a/main.h b/main.h index 2c0c14d..70474ff 100644 --- a/main.h +++ b/main.h @@ -186,6 +186,7 @@ void batadv_mesh_free(struct net_device *soft_iface); int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_hard_iface * batadv_seq_print_text_primary_if_get(struct seq_file *seq); +void batadv_skb_set_priority(struct sk_buff *skb, int offset); int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *orig_dev); diff --git a/routing.c b/routing.c index 2f0bd3f..0439395 100644 --- a/routing.c +++ b/routing.c @@ -775,7 +775,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, struct batadv_neigh_node *neigh_node = NULL; struct batadv_unicast_packet *unicast_packet; struct ethhdr *ethhdr = eth_hdr(skb); - int res, ret = NET_RX_DROP; + int res, hdr_len, ret = NET_RX_DROP; struct sk_buff *new_skb; unicast_packet = (struct batadv_unicast_packet *)skb->data; @@ -835,6 +835,22 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, /* decrement ttl */ unicast_packet->header.ttl--; + switch (unicast_packet->header.packet_type) { + case BATADV_UNICAST_4ADDR: + hdr_len = sizeof(struct batadv_unicast_4addr_packet); + break; + case BATADV_UNICAST: + hdr_len = sizeof(struct batadv_unicast_packet); + break; + default: + /* other packet types not supported - yet */ + hdr_len = -1; + break; + } + + if (hdr_len > 0) + batadv_skb_set_priority(skb, hdr_len); + res = batadv_send_skb_to_orig(skb, orig_node, recv_if); /* translate transmit result into receive result */ @@ -1193,6 +1209,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, if (batadv_bla_check_bcast_duplist(bat_priv, skb)) goto out; + batadv_skb_set_priority(skb, sizeof(struct batadv_bcast_packet)); + /* rebroadcast packet */ batadv_add_bcast_packet_to_list(bat_priv, skb, 1); diff --git a/send.c b/send.c index e9ff8d8..0266edd 100644 --- a/send.c +++ b/send.c @@ -67,7 +67,6 @@ int batadv_send_skb_packet(struct sk_buff *skb, ethhdr->h_proto = __constant_htons(ETH_P_BATMAN); skb_set_network_header(skb, ETH_HLEN); - skb->priority = TC_PRIO_CONTROL; skb->protocol = __constant_htons(ETH_P_BATMAN); skb->dev = hard_iface->net_dev; diff --git a/soft-interface.c b/soft-interface.c index 700d0b4..9779801 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -222,6 +222,8 @@ static int batadv_interface_tx(struct sk_buff *skb, } } + batadv_skb_set_priority(skb, 0); + /* ethernet packet should be broadcasted */ if (do_bcast) { primary_if = batadv_primary_if_get_selected(bat_priv); diff --git a/translation-table.c b/translation-table.c index 429aeef..34510f3 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1626,6 +1626,7 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn, if (!skb) goto out; + skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); tt_response = (struct batadv_tt_query_packet *)skb_put(skb, len); tt_response->ttvn = ttvn; @@ -1691,6 +1692,7 @@ static int batadv_send_tt_request(struct batadv_priv *bat_priv, if (!skb) goto out; + skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); tt_req_len = sizeof(*tt_request); @@ -1788,6 +1790,7 @@ batadv_send_other_tt_response(struct batadv_priv *bat_priv, if (!skb) goto unlock; + skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; @@ -1906,6 +1909,7 @@ batadv_send_my_tt_response(struct batadv_priv *bat_priv, if (!skb) goto unlock; + skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); packet_pos = skb_put(skb, len); tt_response = (struct batadv_tt_query_packet *)packet_pos; @@ -2240,6 +2244,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, if (!skb) goto out; + skb->priority = TC_PRIO_CONTROL; skb_reserve(skb, ETH_HLEN); roam_adv_packet = (struct batadv_roam_adv_packet *)skb_put(skb, len); diff --git a/unicast.c b/unicast.c index dc8b5d4..869fcdb 100644 --- a/unicast.c +++ b/unicast.c @@ -242,6 +242,8 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv, frag_skb = dev_alloc_skb(data_len - (data_len / 2) + ucf_hdr_len); if (!frag_skb) goto dropped; + + skb->priority = TC_PRIO_CONTROL; skb_reserve(frag_skb, ucf_hdr_len); unicast_packet = (struct batadv_unicast_packet *)skb->data; diff --git a/vis.c b/vis.c index 4983340..d8ea31a 100644 --- a/vis.c +++ b/vis.c @@ -397,6 +397,7 @@ batadv_add_packet(struct batadv_priv *bat_priv, kfree(info); return NULL; } + info->skb_packet->priority = TC_PRIO_CONTROL; skb_reserve(info->skb_packet, ETH_HLEN); packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len); @@ -861,6 +862,7 @@ int batadv_vis_init(struct batadv_priv *bat_priv) if (!bat_priv->vis.my_info->skb_packet) goto free_info; + bat_priv->vis.my_info->skb_packet->priority = TC_PRIO_CONTROL; skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN); tmp_skb = bat_priv->vis.my_info->skb_packet; packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet)); -- 1.7.10.4

3 4

[B.A.T.M.A.N.] Basic Multicast Optimizations
by Linus Lüssing 15 Aug '13

15 Aug '13

This is the eighth revision of the basic multicast optimization patches. It adds many style + functional changes and fixes some bugs. It also adds a new, important fifth patch, which addresses an issue that I would have overlooked if it weren't for the extensive offline talks with Simon about the interaction of batman-adv and various multicast related RFCs. # Changelog v7 -> v8 ## Style improvements * renamed batadv_mcast_tt_clean() tobatadv_mcast_tt_retract() * renamed batadv_mcast_tvlv_update_flag_counter() to batadv_mcast_update_counter() * renamed batadv_mcast_mla_tt_update() to batadv_mcast_mla_update() * renamed batadv_mcast_update_counter() to batadv_mcast_counter_update() * renamed BATADV_MCAST_HAS_NO_BRIDGE to BATADV_MCAST_WANT_ALL_UNSNOOPABLES (and reverse its logic) * change value of BATADV_UNINIT_FLAGS from -1 to an unused bit, BIT(15) -> no more need to check BATADV_UNINIT_FLAGS in batadv_mcast_counter_update() * moved code from batadv_mcast_mla_tt_update() to newly introduced batadv_mcast_mla_tvlv_update * moved introduction of multicast_mode sysfs file to the third patch * added kernel doc for struct batadv_priv_mcast and enum batadv_mcast_flag ## Functional improvements * changed a '== -EINVAL' to '< 0' * check for a bridge anywhere on top of bat0 (like br0 on bond0 on bat0, not just br0 on bat0) (as discussed on IRC we don't need to check for bridges on top of vlans yet as multicast optimizations are only enabled for non-VLAN packets at the moment) * removed sysfs file control over multicast TT+TVLV announcements, moved sysfs file introduction to the third patch * removed BATADV_MCAST_LISTENER_ANNOUNCEMENT flag: its purpose is now provided by checking the existence of the multicast tvlv instead * made the tvlv value length check in the multicast tvlv handler to not only accept a length of one byte but anything greater, too * New Patch: batman-adv: Send multicast packets to nodes with a WANT_ALL flag ## Bugs * converted the static 'enabled' variable in batadv_mcast_mla_tt_update() to a per bat_priv variable, using bat_priv->mcast.flags (fixes a bug when using multiple batX interfaces) * the announced tvlv was missing the BATADV_MCAST_HAS_NO_BRIDGE flag (not needed anymore with the reversed logic) * batadv_mcast_update_counter() was missing a case which would have needed a BATADV_UNINIT_FLAGS check (not needed anymore with reversed logic and new value for BATADV_UNINIT_FLAGS) * added missing update for num_want_all_unsnoopables (former num_has_bridge) counter in batadv_mcast_purge_orig() Cheers, Linus

2 9

[B.A.T.M.A.N.] DAT issue
by Fernando Pizarro 14 Aug '13

14 Aug '13

Hi all! I'm playing with OpenWRT and BATMAN advance and I had configured one essid to serve dynamic vlans via freeradius reply attributes. I have a bridge (br0) with bat0, wireless and ethernet interface, and hostapd creates a new bridge by vlan (brvlanX) with vlanX and wlan1.X succefully. Br0 has configured a VLAN and IP to connect with every other nodes. There is the same explanation, but schematic: Wireless: phy0 -> wlan0 -> bat0 phy1 -> wlan1 -> wlan1.1 \ --> wlan1.N Hostapd bridge: wlan1 -> brvlan1 -> {wlan1.1; vlan1} \ --> brvlanN -> {wlan1.N; vlanN} Ethernet bridge: br0 -> {bat0; eth0; wlan1} \ --> br0.X == IP/NETMASK When I look at batman dat table there aren't any registry, but variuos stations are connected. Why is that? What's wrong in my config? Thanks a lot. Fernando.

3 8

[B.A.T.M.A.N.] [PATCHv2 0/9] Improving the routing protocol abstraction
by Antonio Quartulli 13 Aug '13

13 Aug '13

Hello list, This is the second version of the "improved routing abstraction" patchset. In this second version I simply removed the bat_metric_compare() API since it was not really needed. The reason is that we are now assuming that all the metrics are represented by a uint32_t and they can be generically compared with a simple comparison (<, == or >). This patchset is introducing a new set of routing API functions meant to improve the routing protocol abstraction. Also the orig_node and the neigh_node structure have been heavily modified in order to split their generic members from those which are metric related. (the rest of the message is what you already had in the RFC cover letter). This changes have been written while developing batman V. The latter helped me in understanding what batman iv and v have in common and what not. The main problem was the metric: the two protocols use different metric domains and different semantics. Therefore all the functions handling/printing the metric needed to be generalised and rearranged to let the protocols decide what to do. Another issue was the way routing protocols handle the orig and neigh node structures. Also these two have been changed and some small APIs have been provided as well. Moreover, after Simon's RFC about the new multi-interface optimisation, we saw the need for a better abstraction so that mechanisms like that could easily be re-used by new algorithms (like batman v) with little effort. This is the second version of this RFC where I introduced some changes to the names of some functions and some other minor changes discussed in the previous RFC thread. + metric related: - bat_metric_get - bat_metric_is_equiv_or_better + orig_node related: - bat_orig_print: print the originator table - bat_orig_free - bat_orig_add_if - bat_orig_del_if Changes from v1: - removed bat_metric_compare() API. This is not really useful since we are assuming all the metrics are in the same domain (uint32_t) so a simple comparison is more than enough. Cheers, *** BLURB HERE *** Antonio Quartulli (9): batman-adv: make struct batadv_neigh_node algorithm agnostic batman-adv: make struct batadv_orig_node algorithm agnostic batman-adv: add bat_orig_print function API batman-adv: add bat_metric_get API function batman-adv: add bat_metric_is_equiv_or_better API function batman-adv: adapt bonding to use the new API functions batman-adv: adapt the neighbor purging routine to use the new API functions batman-adv: provide orig_node routing API batman-adv: adapt the TT component to use the new API functions bat_iv_ogm.c | 344 +++++++++++++++++++++++++++++++++++++++++++--------- gateway_client.c | 16 +-- main.c | 4 +- main.h | 6 + network-coding.c | 8 +- originator.c | 228 +++++++--------------------------- originator.h | 5 +- routing.c | 34 ++++-- routing.h | 3 +- translation-table.c | 31 +++-- types.h | 85 ++++++++----- 11 files changed, 457 insertions(+), 307 deletions(-) -- 1.8.1.5

2 15

[B.A.T.M.A.N.] [PATCH] alfred: handle failing write() in unix sockets
by Simon Wunderlich 12 Aug '13

12 Aug '13

This is not really critical, but some compilers seem to complain about that. Reported-by: Braden Aran <bradenaran(a)gmail.com> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- unix_sock.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/unix_sock.c b/unix_sock.c index b29f635..c778a61 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -158,7 +158,7 @@ static int unix_sock_req_data_reply(struct globals *globals, int client_sock, struct alfred_push_data_v0 *push; struct hash_it_t *hashit = NULL; uint8_t buf[MAX_PAYLOAD]; - uint16_t seqno = 0; + uint16_t seqno = 0, ret = 0; /* send some data back through the unix socket */ @@ -184,12 +184,15 @@ static int unix_sock_req_data_reply(struct globals *globals, int client_sock, push->header.length = htons(len); push->tx.seqno = htons(seqno++); - write(client_sock, buf, sizeof(push->header) + len); + if (write(client_sock, buf, sizeof(push->header) + len) < 0) { + ret = -1; + break; + } } close(client_sock); - return 0; + return ret; } static int unix_sock_req_data(struct globals *globals, @@ -234,7 +237,7 @@ int unix_sock_req_data_finish(struct globals *globals, struct transaction_head *head) { struct alfred_status_v0 status; - int send_data = 1; + int ret = 0, send_data = 1; int client_sock; uint16_t id; uint8_t requested_type; @@ -258,10 +261,11 @@ int unix_sock_req_data_finish(struct globals *globals, status.header.length = htons(sizeof(status) - sizeof(status.header)); status.tx.id = htons(id); status.tx.seqno = 1; - write(client_sock, &status, sizeof(status)); + if (write(client_sock, &status, sizeof(status)) < 0) + ret = -1; close(client_sock); - return 0; + return ret; } int unix_sock_read(struct globals *globals) -- 1.7.10.4

1 1

[B.A.T.M.A.N.] pull request for net: batman-adv 2013-08-10
by Antonio Quartulli 10 Aug '13

10 Aug '13

Hello David, here you have one fix intended for net/linux-3.11. To avoid kernel paging errors, this patch takes care of re-assigning the value of skb->data to the related pointers after that the skb has been re-allocated. Please pull or let me know of any problem! Thank you, Antonio The following changes since commit 645359930231d5e78fd3296a38b98c1a658a7ade: rtnetlink: Fix inverted check in ndo_dflt_fdb_del() (2013-08-10 01:24:12 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 9d2c9488cedb666bc8206fbdcdc1575e0fbc5929: batman-adv: fix potential kernel paging errors for unicast transmissions (2013-08-10 22:55:42 +0200) ---------------------------------------------------------------- Included change: - reassign pointers to data after skb reallocation to avoid kernel paging errors ---------------------------------------------------------------- Linus Lüssing (1): batman-adv: fix potential kernel paging errors for unicast transmissions net/batman-adv/bridge_loop_avoidance.c | 2 ++ net/batman-adv/gateway_client.c | 13 ++++++++++++- net/batman-adv/gateway_client.h | 3 +-- net/batman-adv/soft-interface.c | 9 ++++++++- net/batman-adv/unicast.c | 13 ++++++++++--- 5 files changed, 33 insertions(+), 7 deletions(-)

2 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N August 2013