B.A.T.M.A.N April 2016

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

17 participants
42 discussions

[B.A.T.M.A.N.] [PATCH 0/1] batman-adv: Avoid duplicate neigh_node additions
by Linus Lüssing 02 May '16

02 May '16

Based on top of Sven's last kref patchset. Patch is untested, so would be great if Martin could verify that it at least fixes some log spam. If yes, not sure whether it is worth for maint though. Cheers, Linus

2 2

[B.A.T.M.A.N.] [PATCH 1/2] batctl: tcpdump - filter OGM and OGMv2 packets independently
by Antonio Quartulli 02 May '16

02 May '16

for debugging purposes it might be required to dump either OGMs or OGM2s only. For this reason it is better to make the tcpdump engine more flexible and accept distinct filters for the two packet types. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- tcpdump.c | 15 ++++++++------- tcpdump.h | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index a30e34b..745f5d4 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -64,10 +64,11 @@ if ((size_t)(buff_len) < (check_len)) { \ return; \ } -static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATELP | - DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | - DUMP_TYPE_BATBCAST | DUMP_TYPE_BATUTVLV | - DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; +static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATOGM2 | + DUMP_TYPE_BATELP | DUMP_TYPE_BATICMP | + DUMP_TYPE_BATUCAST | DUMP_TYPE_BATBCAST | + DUMP_TYPE_BATUTVLV | DUMP_TYPE_BATFRAG | + DUMP_TYPE_NONBAT; static unsigned short dump_level; static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed); @@ -82,8 +83,8 @@ static void tcpdump_usage(void) fprintf(stderr, " \t -p dump specific packet type\n"); fprintf(stderr, " \t -x dump all packet types except specified\n"); fprintf(stderr, "packet types:\n"); - fprintf(stderr, " \t\t%3d - batman ogm/ogmv2 packets\n", - DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3d - batman ogmv2 packets\n", DUMP_TYPE_BATOGM2); fprintf(stderr, " \t\t%3d - batman elp packets\n", DUMP_TYPE_BATELP); fprintf(stderr, " \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); @@ -963,7 +964,7 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read dump_batman_iv_ogm(packet_buff, buff_len, read_opt, time_printed); break; case BATADV_OGM2: - if (dump_level & DUMP_TYPE_BATOGM) + if (dump_level & DUMP_TYPE_BATOGM2) dump_batman_ogm2(packet_buff, buff_len, read_opt, time_printed); break; diff --git a/tcpdump.h b/tcpdump.h index 5ec474f..229ee70 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -38,13 +38,14 @@ #endif #define DUMP_TYPE_BATOGM 1 -#define DUMP_TYPE_BATELP 2 -#define DUMP_TYPE_BATICMP 4 -#define DUMP_TYPE_BATUCAST 8 -#define DUMP_TYPE_BATBCAST 16 -#define DUMP_TYPE_BATUTVLV 32 -#define DUMP_TYPE_BATFRAG 64 -#define DUMP_TYPE_NONBAT 128 +#define DUMP_TYPE_BATOGM2 2 +#define DUMP_TYPE_BATELP 4 +#define DUMP_TYPE_BATICMP 8 +#define DUMP_TYPE_BATUCAST 16 +#define DUMP_TYPE_BATBCAST 32 +#define DUMP_TYPE_BATUTVLV 64 +#define DUMP_TYPE_BATFRAG 128 +#define DUMP_TYPE_NONBAT 256 #define IEEE80211_FCTL_FTYPE 0x0c00 #define IEEE80211_FCTL_TODS 0x0001 -- 2.8.1

3 5

[B.A.T.M.A.N.] [PATCH v2 00/12] netns and netlink support
by Andrew Lunn 30 Apr '16

30 Apr '16

This patchset completes netns support, by disabling debugfs entries when not in the default name space, and correctly handling interface stack loops when the parent is in a different name space. It additionally adds netlink support for most of the information found in debugfs, and is netns awaire. Note: BLA is untested, so best assume it is broken... v2: All changes requested by Sven: * Added lots of missing includes and structure forward declarations * Add two kernel doc comments * Fixed an obvious bug in BLA, but it is probably still broken... * Merged in the compat code Sven suggested. Only compile tested with 4.5.0 Sven: I added a SOB for some of your code. If you disagree, please so say and i will remove them. Andrew Lunn (7): batman-adv: Handle parent interfaces in a different netns batman-adv: compat.h: Add workaround for get_link_net() batman-adv: Suppress debugfs entries for netns's batman-adv: compat: Workarounds for previous patch batman-adv: Indicate netlink socket can be used with netns. batman-adv: add B.A.T.M.A.N. Dump gateways via netlink batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink Matthias Schiffer (5): batman-adv: add generic netlink query API to replace debugfs files batman-adv: netlink: add translation table query batman-adv: netlink: add originator and neighbor table queries batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations Makefile | 1 + compat-include/linux/netlink.h | 45 +++++ compat-include/net/genetlink.h | 34 ++++ compat.h | 14 +- include/uapi/linux/batman_adv.h | 111 ++++++++++++ net/batman-adv/Makefile | 1 + net/batman-adv/bat_iv_ogm.c | 271 +++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 257 +++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 166 ++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/debugfs.c | 18 ++ net/batman-adv/gateway_client.c | 131 ++++++++++++++ net/batman-adv/gateway_client.h | 2 + net/batman-adv/hard-interface.c | 56 +++++- net/batman-adv/main.c | 51 ++++++ net/batman-adv/main.h | 2 + net/batman-adv/netlink.c | 302 ++++++++++++++++++++++++++++++++ net/batman-adv/netlink.h | 41 +++++ net/batman-adv/originator.c | 160 +++++++++++++++++ net/batman-adv/originator.h | 4 + net/batman-adv/packet.h | 36 ---- net/batman-adv/translation-table.c | 308 +++++++++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 7 + 24 files changed, 1987 insertions(+), 45 deletions(-) create mode 100644 compat-include/linux/netlink.h create mode 100644 compat-include/net/genetlink.h create mode 100644 include/uapi/linux/batman_adv.h create mode 100644 net/batman-adv/netlink.c create mode 100644 net/batman-adv/netlink.h -- 2.8.0.rc3

2 15

[B.A.T.M.A.N.] [PATCH 00/10] netns and netlink support
by Andrew Lunn 29 Apr '16

29 Apr '16

This patchset completes netns support, by disabling debugfs entries when not in the default name space, and correctly handling interface stack loops when the parent is in a different name space. It additionally adds netlink support for most of the information found in debugfs, and is netns awaire. Note: BLA is untested, so best assume it is broken... batctl patches to follow. Andrew Lunn (5): batman-adv: Handle parent interfaces in a different netns batman-adv: Suppress debugfs entries for netns's batman-adv: Indicate netlink socket can be used with netns. batman-adv: add B.A.T.M.A.N. Dump gateways via netlink batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink Matthias Schiffer (5): batman-adv: add generic netlink query API to replace debugfs files batman-adv: netlink: add translation table query batman-adv: netlink: add originator and neighbor table queries batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations Makefile | 1 + include/uapi/linux/batman_adv.h | 111 ++++++++++++ net/batman-adv/Makefile | 1 + net/batman-adv/bat_iv_ogm.c | 268 +++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 250 +++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 162 +++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 9 +- net/batman-adv/debugfs.c | 19 +- net/batman-adv/gateway_client.c | 126 ++++++++++++++ net/batman-adv/gateway_client.h | 1 + net/batman-adv/hard-interface.c | 31 +++- net/batman-adv/main.c | 48 ++++++ net/batman-adv/main.h | 1 + net/batman-adv/netlink.c | 291 +++++++++++++++++++++++++++++++ net/batman-adv/netlink.h | 36 ++++ net/batman-adv/originator.c | 142 +++++++++++++++ net/batman-adv/originator.h | 2 + net/batman-adv/packet.h | 36 ---- net/batman-adv/translation-table.c | 305 +++++++++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 2 + net/batman-adv/types.h | 7 + 21 files changed, 1804 insertions(+), 45 deletions(-) create mode 100644 include/uapi/linux/batman_adv.h create mode 100644 net/batman-adv/netlink.c create mode 100644 net/batman-adv/netlink.h -- 2.8.0.rc3

2 35

[B.A.T.M.A.N.] [PATCH 0/2] batctl: Netlink support
by Andrew Lunn 29 Apr '16

29 Apr '16

Extend batctl to use the netlink socket where available. If it is not available, fall back to debugfs. No attempt has been made to keep the netlink output compatible with the debugfs output. Anything why tries the parse the output is probably broken. BLA has not been tested, so is also probably broken. Andrew Lunn (2): batctl: Document a network namespaces example. batctl: Use netlink when available, rather than debugfs Makefile | 20 +- README | 58 +++++ debug.c | 19 +- debug.h | 4 +- functions.c | 11 + functions.h | 1 + main.h | 1 + netlink.c | 810 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 920 insertions(+), 4 deletions(-) create mode 100644 netlink.c -- 2.8.0.rc3

2 6

[B.A.T.M.A.N.] pull request [net]: batman-adv-0160426
by Antonio Quartulli 28 Apr '16

28 Apr '16

Hi David, this is a batch intended for net. Changes are quite small, therefore I hope it is not a big deal to include them at this point of the release cycle. In this patchset you can find the following fixes: 1) check skb size to avoid reading beyond its border when delivering payloads, by Sven Eckelmann 2) initialize last_seen time in neigh_node object to prevent cleanup routine from accidentally purge it, by Marek Lindner 3) release "recently added" slave interfaces upon virtual/batman interface shutdown, by Sven Eckelmann 4) properly decrease router object reference counter upon routing table update, by Sven Eckelmann 5) release queue slots when purging OGM packets of deactivating slave interface, by Linus Lüssing Patch 2 and 3 have no "Fixes:" tag because the offending commits date back to when batman-adv was not yet officially in the net tree. Note that all these changes are fixing very old commits and therefore it would be nice if you could queue them for *stable*. Please pull or let me know of any issue! Thanks a lot, Antonio The following changes since commit 5f44abd041c5f3be76d57579ab254d78e601315b: Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux (2016-04-21 15:41:13 -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 c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f: batman-adv: Fix broadcast/ogm queue limit on a removed interface (2016-04-24 15:41:56 +0800) ---------------------------------------------------------------- In this patchset you can find the following fixes: 1) check skb size to avoid reading beyond its border when delivering payloads, by Sven Eckelmann 2) initialize last_seen time in neigh_node object to prevent cleanup routine from accidentally purge it, by Marek Lindner 3) release "recently added" slave interfaces upon virtual/batman interface shutdown, by Sven Eckelmann 4) properly decrease router object reference counter upon routing table update, by Sven Eckelmann 5) release queue slots when purging OGM packets of deactivating slave interface, by Linus Lüssing Patch 2 and 3 have no "Fixes:" tag because the offending commits date back to when batman-adv was not yet officially in the net tree. ---------------------------------------------------------------- Linus Lüssing (1): batman-adv: Fix broadcast/ogm queue limit on a removed interface Marek Lindner (1): batman-adv: init neigh node last seen field Sven Eckelmann (3): batman-adv: Check skb size before using encapsulated ETH+VLAN header batman-adv: Deactivate TO_BE_ACTIVATED hardif on shutdown batman-adv: Reduce refcnt of removed router when updating route net/batman-adv/hard-interface.c | 3 +-- net/batman-adv/originator.c | 1 + net/batman-adv/routing.c | 9 +++++++++ net/batman-adv/send.c | 6 ++++++ net/batman-adv/soft-interface.c | 8 ++++++-- 5 files changed, 23 insertions(+), 4 deletions(-)

4 9

[B.A.T.M.A.N.] [RFC] alfred: implement TCP support for server-to-server
by Hans-Werner Hilse 24 Apr '16

24 Apr '16

As announced in A.L.F.R.E.D. issue #202 (https://www.open-mesh.org/issues/202), I gave implementing server-to-server communication via TCP a spin. The result is this - rather large - patch. I'd be glad for comments on the implementation. Also, I might split this into more commits, but I think I need ideas on how to properly separate the various parts - they mostly make sense to me as a unit only. A rough overview: alfred.h: * struct tcp_connection is new, stores socket fd, pointer to data buffer, a counter for data already read from socket (TCP is a stream and we can't rely on self-contained datagrams), and list management * struct interface is extended by a socket fd for the TCP socket and a list of "tcp_connection"s * struct globals is extended by a "requestproto" field that stores desired operation mode. main.c: * TCP operation is for now triggered by a command line flag "-t". netsock.c: * for each interface, a TCP socket, bound/listening, is created and teared down along with the UDP sockets * a list of tcp_connection sockets is kept, managed and cleared alongside * the sockets are incorporated into the fd_set management for select() recv.c: * process_alfred_request() gets another argument for a socket fd. It just gets handed over to push_data() for sending the reply over the same socket the request came from. * recv_alfred_stream() is new and the analog function to recv_alfred_packet(). It manages the data buffer and will act on a received packet if and when it is completely received. ALFRED_REQUEST, ALFRED_PUSH_DATA and ALFRED_STATUS_TXEND packets are handled for now. send.c: * connect_tcp() function for setting up a new connection to a (TCP) server * push_data() gets a new argument for a socket fd (c.f. process_alfred_request() in recv.c). If said argument is >=0, the function will operate on the socket rather than recvmsg() a datagram. * sync_data() will act on requestproto configuration in globals struct and opt to make the sync via TCP if configured to do so * send_alfred_stream() will use connect_tcp() to create a new connection, then send a packet analog to send_alfred_packet() and will then register the socket to the list of "tcp_connection"s for the interface it is currently operating upon. This way, the socket can receive a reply and will be handled as long as it is not closed on the other end. server.c: * check_if_socket() will tear down the TCP server and client sockets along with the UDP sockets unix_sock.c: * depending on the globals' requestproto setting, a REQUEST will be send via TCP rather than UDP. Testing has been only in an artificial virtual setup for now. I have some hopes to get "mission clearance" for giving it a spin in our local "Freifunk" setup. Even then TCP will most certainly only be used on a handful of gateways since on the majority of nodes, reading values from A.L.F.R.E.D. is not really needed (they are mostly push-only). I'd be glad to hear some feedback. -hwh Hans-Werner Hilse (1): alfred: implement TCP support for server-to-server communication alfred.h | 24 +++++++++- main.c | 8 +++- netsock.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- recv.c | 88 ++++++++++++++++++++++++++++++++++-- send.c | 119 +++++++++++++++++++++++++++++++++++++++++++----- server.c | 11 +++++ unix_sock.c | 8 ++++ 7 files changed, 389 insertions(+), 17 deletions(-) -- 2.7.3

5 9

[B.A.T.M.A.N.] some of you at Wireless_Community_Weekend_2016 ?
by info＠rauberhaus.de 24 Apr '16

24 Apr '16

https://wiki.freifunk.net/Wireless_Community_Weekend_2016/Participants some of you will be there? Would be nice to know .. discuss some things first hand ...

1 0

[B.A.T.M.A.N.] [PATCHv12 0/4] Multicast optimizations for bridges
by Linus Lüssing 24 Apr '16

24 Apr '16

This patchset enables the usage of the batman-adv multicast optimizations for scenarios involving bridges on top of e.g. bat0, too. The first one alters the forwarding behaviour for IGMP and MLD reports which is a prerequisite before enabling multicast optimizations in bridged setups. It also increases the MCAST TVLV version number to 2. More on the issue of insufficient report handling with the v1 MCAST TVLV can be found here: http://www.open-mesh.org/projects/batman-adv/wiki/Multicast-optimizations-l… The second patch finally enables the multicast optimizations for bridged setups. Along come two more patches adding according debugging facilities to make it possible for the user to check why the multicast optimizations might not work ideally to give hints about what they might change about their topology. This patchset can be found in the current linus/multicast-bridge branch. Cheers, Linus ----- Changes in v12: * Rebase to current master branch (automatic 3-way merge, then batadv_hardif_free_ref() -> batadv_hardif_put()) * Adding Linux upstream fix to compat-sources/net/core/skbuff.c -> "net: fix bridge multicast packet checksum validation" (9b368814b33, present since v4.5, queued for stable) Changes in v11: * Rewording of commit messages (PATCH 1/4+2/4) * Rebasing to master (solving conflict with kernel doc "return" changes) * Updating kerneldoc to proper "Return:" syntax * Using eth_zero_addr() over memset (fixes a new checkpatch warning) * Changing uint8_t to u8 and uint32_t to u32 (fixes new checkpatch warnings) * Turning some batadv_dbg() into batadv_info(), making querier presence more visible (i.e. in dmesg too) (PATCH 3/4) Changes in v10: - PATCH 1/4: * Former "[PATCH 4/4] batman-adv: Forward IGMP/MLD reports to selected querier (only)" substituted by the interim branch "batman-adv: Always flood IGMP/MLD reports" with the following changes: * Increased compatibility to mcast-v1-tvlv nodes by registering a v1 tvlv container and handler, too (note: PATCH 2/4 needs to still unregister the handler if the node is bridged bc. it can't "trust" v1 nodes) * Removed skb_set_network_header() call (extra patch pending for review for maint) * Compared to patchset v9 this substitution makes things compilable again for kernels < 2.6.35 - PATCH 2/4: * Moved enum introduction of BATADV_DBG_MCAST to PATCH 3/4, not needed in PATCH 2/4 yet * Adjusted compat code to new compat layout * Adjustments to batadv_mcast_mla_tvlv_update() to fit now preceding PATCH 1/4 * bat_priv->mcast.bridged flag already introduced here (instead of in PATCH 3/4) because we need it for the new mcast-v1-tvlv handling --- Interim Changlog of "batman-adv: Always flood IGMP/MLD reports" v1: * Removed query snooping and state * Squashed all three patches into one * Renamed "batadv_mcast_tvlv_ogm_handler_v1()" to *_v2() * Added explicit icmpv6.h include * Rebased on top of master ----- Interim Interim Changelog of "batman-adv: Unicasting multicast reports to querier-node only" v6: * compat: copied copyright headers from original upstream c files * compat: unified ordering in compat c files: -> copyright header, then includes, then kernel specific functions v5: * Removed RFC tag: Needed exports got merged to net-next and are going to be available with Linux 4.2 * Redid compat solution - now fully backwards compatible down to 2.6.33 v4: * excluded bridge part from this patchset, they should hopefully be added to net-next soon * Added a compat solution (PATCH 3/3) * Removed Kconfig-depends as by David's suggestion the needed parsing functions for MLD are going to be forced built-ins even if IPv6 is going to be built as a module * Removed unused variable 'int ret' in batadv_mcast_is_report_ipv6() * Adjusted to new folder structure v3: * Adding Kconfig-depends and #if's (so basically adding similar dependancy constraints as the bridge code has, except that there are no depends if batman-adv gets compiled without multicast optimizations) -> the case of IPv6=M and batman-adv=y is still impossible if multicast optimizations are enabled; but I don't see the practical demand for that either - people who use IPv6 as a module will probably also want to use batman-adv as a module v2: * various bugfixes (now runtime tested, too - should(tm) work) * added netdev+bridge mailinglists ----- --- Changes in v9: - PATCH 1/4: * fix: added compat code for pr_warn_once() * compat fix for bridge export stubs: fixes compile error with kernels < 3.16 without bridge (snooping) support - PATCH 2/4: * perform updates of variables within bat_priv->mcast.querier_ipv{4,6} individually (there's a new, third member in 4/4 which shouldn't be overriden) * PATCH 4/4: NEW Changes in v8 (thanks to Simon's suggestions): - PATCH 2/3: * print shadowing status log of an appearing and shadowing querier, too (the bridge-querier-existence call has an additional 10s delay to ensure reports had their time to arrive - the bridge-querier-port call doesn't have that) - PATCH 3/3: * changing debugfs output from "+" and "-" to "U/4/6" and "." * fixing "no querier present" logic (introduced in [PATCHv7 3/3]) Changes in v7 (thanks to Simon's suggestions): - PATCH 2/3: * renaming old/new_querier to old/new_state * slightly extended kerneldoc of batadv_mcast_querier_log() * removing words "good" and "bad" from debug output * simplified batadv_mcast_flags_log() * assignment instead of memset in batadv_mcast_mla_tvlv_update() and batadv_softif_init_late() * simple struct member assignments instead of one complex struct assigment * removing unnecessary memcmp's * substituting return statement for an if-block in batadv_mcast_querier_log() and batadv_mcast_bridge_log() * print "Unsnoopables(U)-flag" instead of just "U-flag" - PATCH 3/3: * use bat_priv values instead of querying bridge ABI in batadv_mcast_flags_print_header() Changes in v6: * New PATCH 2/3 inserted, moving logging to separate patch * More verbose logging added to PATCH 2/3: Bridge and querier state changes are logged too * upper case to lower case for kernel doc of batadv_mcast_flags_open (PATCH 2/3) * Adding note to kernel doc of batadv_mcast_get_bridge about increased refcount (PATCH 1/3) * Printing some lines about current bridge and querier state to debugfs too (PATCH 3/3) Changes in v5 (PATCH 2/2 only): * s/dat_cache/mcast_flags/ in kerneldoc (copy&paste error) Changes in v4 (PATCH 2/2 only): * initial {ad,e}dition of this patch Changes in v3 (PATCH 1/2 only): * Removed "RFC" tag in title again: The stubs and new export are upstream in net-next and therefore going to be included in 3.17 * Added some debug output: * Two warning messages: -> Old kernel version or no bridge IGMP/MLD snooping compiled * New batman-adv log-level "mcast": -> Logging mcast flag changes (a third debugging facility, a new table for debugfs for a global mcast flag overview will be added in a separate patch later as discussed with Simon) Changes in v2 (PATCH 1/2 only): * fetching local (= on this same kernel) multicast listeners from the bridge instead of the bat0 interface if a bridge is present - just like ip addresses and routes should be used from br0, the same goes for multicast listeners * beautification of batadv_mcast_mla_br_addr_cpy(), now using already present functions from the kernel instead of own, hackish approach * changed names of some goto-labels (not using "skip" anymore) * using new, third bridge multicast export (because this export is not upstream yet, I've added the "RFC" in the title): br_multicast_has_querier_anywhere() * adding compat stubs for two bridge multicast exports, to make batman-adv compile- and usable even if a 3.16 kernel was compiled without bridge code - the stubs are supposed to be upstream in the bridge code in 3.17 (therefore just 'compat') * updated kerneldocs for batadv_mcast_mla_bridge_get() and batadv_mcast_mla_softif_get() * The two sentences in the commit message starting with "Queriers: ..." were slightly modified to include the third bridge multicast export

3 13

[B.A.T.M.A.N.] [PATCH v4] batman-adv: Create batman soft interfaces within correct netns.
by Sven Eckelmann 21 Apr '16

21 Apr '16

From: Andrew Lunn <andrew(a)lunn.ch> When creating a soft interface, create it in the same netns as the hard interface. Replace all references to init_net with the correct name space for the interface being manipulated. Suggested-by: Daniel Ehlers <danielehlers(a)mindeye.net> Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Acked-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v4: rebase on current master net/batman-adv/hard-interface.c | 10 +++++----- net/batman-adv/hard-interface.h | 3 ++- net/batman-adv/soft-interface.c | 7 +++++-- net/batman-adv/soft-interface.h | 3 ++- net/batman-adv/sysfs.c | 3 ++- net/batman-adv/translation-table.c | 4 ++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index c5cfda1..8c2f399 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -36,7 +36,6 @@ #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/workqueue.h> -#include <net/net_namespace.h> #include "bridge_loop_avoidance.h" #include "debugfs.h" @@ -121,6 +120,7 @@ static bool batadv_mutual_parents(const struct net_device *dev1, static bool batadv_is_on_batman_iface(const struct net_device *net_dev) { struct net_device *parent_dev; + struct net *net = dev_net(net_dev); bool ret; /* check if this is a batman-adv mesh interface */ @@ -133,7 +133,7 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) return false; /* recurse over the parent device */ - parent_dev = __dev_get_by_index(&init_net, dev_get_iflink(net_dev)); + parent_dev = __dev_get_by_index(net, dev_get_iflink(net_dev)); /* if we got a NULL parent_dev there is something broken.. */ if (WARN(!parent_dev, "Cannot find parent device")) return false; @@ -456,7 +456,7 @@ static int batadv_master_del_slave(struct batadv_hard_iface *slave, } int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, - const char *iface_name) + struct net *net, const char *iface_name) { struct batadv_priv *bat_priv; struct net_device *soft_iface, *master; @@ -469,10 +469,10 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, kref_get(&hard_iface->refcount); - soft_iface = dev_get_by_name(&init_net, iface_name); + soft_iface = dev_get_by_name(net, iface_name); if (!soft_iface) { - soft_iface = batadv_softif_create(iface_name); + soft_iface = batadv_softif_create(net, iface_name); if (!soft_iface) { ret = -ENOMEM; diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index d74f198..a76724d 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -28,6 +28,7 @@ #include <linux/types.h> struct net_device; +struct net; enum batadv_hard_if_state { BATADV_IF_NOT_IN_USE, @@ -55,7 +56,7 @@ bool batadv_is_wifi_iface(int ifindex); struct batadv_hard_iface* batadv_hardif_get_by_netdev(const struct net_device *net_dev); int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, - const char *iface_name); + struct net *net, const char *iface_name); void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, enum batadv_hard_if_cleanup autodel); void batadv_hardif_remove_interfaces(void); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index f1ac60e..f37ce39 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -885,13 +885,14 @@ static int batadv_softif_slave_add(struct net_device *dev, struct net_device *slave_dev) { struct batadv_hard_iface *hard_iface; + struct net *net = dev_net(dev); int ret = -EINVAL; hard_iface = batadv_hardif_get_by_netdev(slave_dev); if (!hard_iface || hard_iface->soft_iface) goto out; - ret = batadv_hardif_enable_interface(hard_iface, dev->name); + ret = batadv_hardif_enable_interface(hard_iface, net, dev->name); out: if (hard_iface) @@ -988,7 +989,7 @@ static void batadv_softif_init_early(struct net_device *dev) memset(priv, 0, sizeof(*priv)); } -struct net_device *batadv_softif_create(const char *name) +struct net_device *batadv_softif_create(struct net *net, const char *name) { struct net_device *soft_iface; int ret; @@ -998,6 +999,8 @@ struct net_device *batadv_softif_create(const char *name) if (!soft_iface) return NULL; + dev_net_set(soft_iface, net); + soft_iface->rtnl_link_ops = &batadv_link_ops; ret = register_netdevice(soft_iface); diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 13dcfe5..ec303dd 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -24,13 +24,14 @@ #include <net/rtnetlink.h> struct net_device; +struct net; struct sk_buff; int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, int hdr_size, struct batadv_orig_node *orig_node); -struct net_device *batadv_softif_create(const char *name); +struct net_device *batadv_softif_create(struct net *net, const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); bool batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index fffa230..414b207 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -832,6 +832,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, size_t count) { struct net_device *net_dev = batadv_kobj_to_netdev(kobj); + struct net *net = dev_net(net_dev); struct batadv_hard_iface *hard_iface; int status_tmp = -1; int ret = count; @@ -875,7 +876,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, batadv_hardif_disable_interface(hard_iface, BATADV_IF_CLEANUP_AUTO); - ret = batadv_hardif_enable_interface(hard_iface, buff); + ret = batadv_hardif_enable_interface(hard_iface, net, buff); unlock: rtnl_unlock(); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 57efb07..feaf492 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -43,7 +43,6 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> -#include <net/net_namespace.h> #include "bridge_loop_avoidance.h" #include "hard-interface.h" @@ -585,6 +584,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_tt_local_entry *tt_local; struct batadv_tt_global_entry *tt_global = NULL; + struct net *net = dev_net(soft_iface); struct batadv_softif_vlan *vlan; struct net_device *in_dev = NULL; struct hlist_head *head; @@ -596,7 +596,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, u32 match_mark; if (ifindex != BATADV_NULL_IFINDEX) - in_dev = dev_get_by_index(&init_net, ifindex); + in_dev = dev_get_by_index(net, ifindex); tt_local = batadv_tt_local_hash_find(bat_priv, addr, vid); -- 2.8.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N April 2016