(unknown)
Subsystems (4)
Hello David,
this is another batch intended for net-next/linux-3.13.
This pull request is a bit bigger than usual, but 6 patches are very small (three of them are about email updates)..
Patch 1 is fixing a previous merge conflict resolution that went wrong (I realised that only now while checking other patches..). Patches from 2 to 4 that are updating our emails in all the proper files (Documentation/, headers and MAINTAINERS).
Patches 5, 6 and 7 are bringing a big improvement to the TranslationTable
component: it is now able to group non-mesh clients based on the VLAN they belong to. In this way a lot a new enhancements are now possible thanks to the fact that each batman-adv behaviour can be applied on a per VLAN basis.
And, of course, in patches from 8 to 12 you have some of the enhancements I was talking about:
- make the batman-Gateway selection VLAN dependent
- make DAT (Distributed ARP Table) group ARP entries on a VLAN basis (this allows DAT to work even when the admin decided to use the same IP subnet on different VLANs)
- make the AP-Isolation behaviour switchable on each VLAN independently
- export VLAN specific attributes via sysfs. Switches like the AP-Isolation are now exported once per VLAN (backward compatibility of the sysfs interface has been preserved)
Patches 13 and 14 are small code cleanups.
Patch 15 is a minor improvement in the TT locking mechanism.
Patches 16 and 17 are other enhancements to the TT component. Those allow a node to parse a "non-mesh client announcement message" and accept only those TT entries belonging to certain VLANs.
Patch 18 exploits this parse&accept mechanism to make the Bridge Loop Avoidance component reject only TT entries connected to the VLAN where it is operating. Previous to this change, BLA was rejecting all the entries coming from any other Backbone node, regardless of the VLAN (for more details about how the Bridge Loop Avoidance works please check [1]).
Please pull or let me know of any problem.
Thanks a lot,
Antonio
[1] http://www.open-mesh.org/projects/batman-adv/wiki/Bridge-loop-avoidance-II
The following changes since commit b1eda2ac3fa6bf23b27c7c70eda6885124c79ed3:
em_ipset: use dev_net() accessor (2013-10-18 16:23:06 -0400)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem
for you to fetch changes up to cfd4f75701b6b13b1ec74e6f65ad0d1969c19247:
batman-adv: make the backbone gw check VLAN specific (2013-10-19 23:25:38 +0200)
----------------------------------------------------------------
Included changed:
- email addresses update in documentation, source files and MAINTAINERS
- make the TT component distinguish non-mesh clients based on the VLAN they belong to
- improve all the internal components to properly work on a per-VLAN basis (enabled by the new TT-VLAN feature)
- enhance the sysfs interface in order to provide behaviour switches on a per-VLAN basis (enabled by the new TT-VLAN feature)
- improve TT lock mechanism
- improve unicast transmission APIs
----------------------------------------------------------------
Antonio Quartulli (15):
batman-adv: check skb preparation return value
batman-adv: update email address for Antonio Quartulli
batman-adv: add the VLAN ID attribute to the TT entry
batman-adv: use vid when computing local and global TT CRC
batman-adv: print the VID together with the TT entries
batman-adv: make the GW module correctly talk to the new VLAN-TT
batman-adv: make the Distributed ARP Table vlan aware
batman-adv: add per VLAN interface attribute framework
batman-adv: add sysfs framework for VLAN
batman-adv: make the AP isolation attribute VLAN specific
batman-adv: remove bogus comment
batman-adv: lock around TT operations to avoid sending inconsistent data
batman-adv: make the TT CRC logic VLAN specific
batman-adv: make the TT global purge routine VLAN specific
batman-adv: make the backbone gw check VLAN specific
Linus Lüssing (1):
batman-adv: refine API calls for unicast transmissions of SKBs
Marek Lindner (1):
batman-adv: update email address for Marek Lindner
Simon Wunderlich (1):
batman-adv: update email address for Simon Wunderlich
.../ABI/testing/sysfs-class-net-batman-adv | 4 +- Documentation/ABI/testing/sysfs-class-net-mesh | 23 +- Documentation/networking/batman-adv.txt | 4 +- MAINTAINERS | 2 +- net/batman-adv/bridge_loop_avoidance.c | 58 +- net/batman-adv/bridge_loop_avoidance.h | 10 +- net/batman-adv/distributed-arp-table.c | 160 ++- net/batman-adv/gateway_client.c | 25 +- net/batman-adv/hard-interface.c | 2 + net/batman-adv/main.c | 33 +- net/batman-adv/main.h | 15 +- net/batman-adv/originator.c | 104 +- net/batman-adv/originator.h | 7 + net/batman-adv/packet.h | 32 +- net/batman-adv/routing.c | 28 +- net/batman-adv/send.c | 98 +- net/batman-adv/send.h | 51 +- net/batman-adv/soft-interface.c | 227 +++- net/batman-adv/soft-interface.h | 4 + net/batman-adv/sysfs.c | 178 ++- net/batman-adv/sysfs.h | 10 + net/batman-adv/translation-table.c | 1157 +++++++++++++++----- net/batman-adv/translation-table.h | 23 +- net/batman-adv/types.h | 83 +- 24 files changed, 1851 insertions(+), 487 deletions(-)
PATCH 1/18 batman-adv: check skb preparation return value
Fix bogus merge conflict resolution by checking the return values of the skb preparation routines.
--- net/batman-adv/send.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/batman-adv/send.c +6 -3
@@ -267,11 +267,14 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,switch (packet_type) {case BATADV_UNICAST : -batadv_send_skb_prepare_unicast (skb, orig_node); +if (!batadv_send_skb_prepare_unicast (skb, orig_node)) + goto out;break ;case BATADV_UNICAST_4ADDR : -batadv_send_skb_prepare_unicast_4addr (bat_priv, skb, orig_node, - packet_subtype); +if (!batadv_send_skb_prepare_unicast_4addr (bat_priv, skb, + orig_node, + packet_subtype)) + goto out;break ;default :/* this function supports UNICAST and UNICAST_4ADDR only. It
Signature · 1 line
1.8.4
PATCH 2/18 batman-adv: update email address for Simon Wunderlich
In reply to Antonio QuartulliFrom: Simon Wunderlich <[email protected]>
My university will stop email service for alumni in january 2014, please use my new e-mail address instead.
--- Documentation/ABI/testing/sysfs-class-net-mesh | 4 ++-- Documentation/networking/batman-adv.txt | 2 +- MAINTAINERS | 2 +- net/batman-adv/main.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
Documentation/ABI/testing/sysfs-class-net-mesh +2 -2
@@ -16,7 +16,7 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/bonding Date: June 2010 -Contact: Simon Wunderlich <[email protected]> +Contact: Simon Wunderlich <[email protected]> Description: Indicates whether the data traffic going through the mesh will be sent using multiple interfaces at the
@@ -24,7 +24,7 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/bridge_loop_avoidance Date: November 2011 -Contact: Simon Wunderlich <[email protected]> +Contact: Simon Wunderlich <[email protected]> Description: Indicates whether the bridge loop avoidance feature is enabled. This feature detects and avoids loops
Documentation/networking/batman-adv.txt +1 -1
@@ -200,4 +200,4 @@ Mailing-list: [email protected] (optional subscription You can also contact the Authors: Marek Lindner <[email protected]> -Simon Wunderlich <[email protected]> +Simon Wunderlich <[email protected]>
MAINTAINERS +1 -1
@@ -1653,7 +1653,7 @@ F: include/linux/backlight.h BATMAN ADVANCED M: Marek Lindner <[email protected]> -M: Simon Wunderlich <[email protected]> +M: Simon Wunderlich <[email protected]> M: Antonio Quartulli <[email protected]> L: [email protected] W: http://www.open-mesh.org/
net/batman-adv/main.h +1 -1
@@ -21,7 +21,7 @@#define _NET_BATMAN_ADV_MAIN_H_#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ - "Simon Wunderlich <[email protected]>" + "Simon Wunderlich <[email protected]>"#define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced"#define BATADV_DRIVER_DEVICE "batman-adv"
Signature · 1 line
1.8.4
PATCH 3/18 batman-adv: update email address for Antonio Quartulli
In reply to Antonio Quartulli--- Documentation/ABI/testing/sysfs-class-net-mesh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/ABI/testing/sysfs-class-net-mesh +1 -1
@@ -8,7 +8,7 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/ap_isolation Date: May 2011 -Contact: Antonio Quartulli <[email protected]> +Contact: Antonio Quartulli <[email protected]> Description: Indicates whether the data traffic going from a wireless client to another wireless client will be
Signature · 1 line
1.8.4
PATCH 4/18 batman-adv: update email address for Marek Lindner
In reply to Antonio QuartulliFrom: Marek Lindner <[email protected]>
--- Documentation/ABI/testing/sysfs-class-net-batman-adv | 4 ++-- Documentation/ABI/testing/sysfs-class-net-mesh | 12 ++++++------ Documentation/networking/batman-adv.txt | 2 +- net/batman-adv/main.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
Documentation/ABI/testing/sysfs-class-net-batman-adv +2 -2
@@ -1,13 +1,13 @@ What: /sys/class/net/<iface>/batman-adv/iface_status Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Indicates the status of <iface> as it is seen by batman. What: /sys/class/net/<iface>/batman-adv/mesh_iface Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: The /sys/class/net/<iface>/batman-adv/mesh_iface file displays the batman mesh interface this <iface>
Documentation/ABI/testing/sysfs-class-net-mesh +6 -6
@@ -1,7 +1,7 @@ What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not.
@@ -41,21 +41,21 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth Date: October 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the bandwidth which is propagated by this node if gw_mode was set to 'server'. What: /sys/class/net/<mesh_iface>/mesh/gw_mode Date: October 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the state of the gateway features. Can be either 'off', 'client' or 'server'. What: /sys/class/net/<mesh_iface>/mesh/gw_sel_class Date: October 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the selection criteria this node will use to choose a gateway if gw_mode was set to 'client'.
@@ -77,14 +77,14 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the interval in milliseconds in which batman sends its protocol messages. What: /sys/class/net/<mesh_iface>/mesh/routing_algo Date: Dec 2011 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the routing procotol this mesh instance uses to find the optimal paths through the mesh.
Documentation/networking/batman-adv.txt +1 -1
@@ -199,5 +199,5 @@ Mailing-list: [email protected] (optional subscription You can also contact the Authors: -Marek Lindner <[email protected]> +Marek Lindner <[email protected]> Simon Wunderlich <[email protected]>
net/batman-adv/main.h +1 -1
@@ -20,7 +20,7 @@#ifndef _NET_BATMAN_ADV_MAIN_H_#define _NET_BATMAN_ADV_MAIN_H_ -#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ +#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ "Simon Wunderlich <[email protected]>"#define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced"#define BATADV_DRIVER_DEVICE "batman-adv"
Signature · 1 line
1.8.4
PATCH 5/18 batman-adv: add the VLAN ID attribute to the TT entry
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
To make the translation table code VLAN-aware, each entry must carry the VLAN ID which it belongs to. This patch adds such attribute to the related TT structures.
--- net/batman-adv/bridge_loop_avoidance.c | 37 ++--- net/batman-adv/distributed-arp-table.c | 11 +- net/batman-adv/gateway_client.c | 3 +- net/batman-adv/main.c | 29 +++- net/batman-adv/main.h | 9 +- net/batman-adv/packet.h | 14 +- net/batman-adv/routing.c | 28 ++-- net/batman-adv/send.c | 8 +- net/batman-adv/send.h | 16 ++- net/batman-adv/soft-interface.c | 35 ++--- net/batman-adv/translation-table.c | 240 ++++++++++++++++++++++++++------- net/batman-adv/translation-table.h | 19 +-- net/batman-adv/types.h | 2 + 13 files changed, 314 insertions(+), 137 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +12 -25
@@ -858,27 +858,25 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv,struct batadv_hard_iface *primary_if, struct sk_buff *skb) { - struct ethhdr *ethhdr; -struct vlan_ethhdr *vhdr; -struct arphdr *arphdr; -uint8_t *hw_src, *hw_dst; struct batadv_bla_claim_dst *bla_dst; +uint8_t *hw_src, *hw_dst; +struct vlan_ethhdr *vhdr; +struct ethhdr *ethhdr; +struct arphdr *arphdr; +unsigned short vid;__be16 proto;int headlen; -unsigned short vid =BATADV_NO_FLAGS ;int ret; + vid =batadv_get_vid (skb,0 ); ethhdr =eth_hdr (skb); -if (ethhdr->h_proto ==htons (ETH_P_8021Q )) { + proto = ethhdr->h_proto; + headlen =ETH_HLEN ; +if (vid &BATADV_VLAN_HAS_TAG ) { vhdr = (struct vlan_ethhdr *)ethhdr; - vid =ntohs (vhdr->h_vlan_TCI) &VLAN_VID_MASK ; - vid |=BATADV_VLAN_HAS_TAG ; proto = vhdr->h_vlan_encapsulated_proto; - headlen =sizeof (*vhdr); - }else { - proto = ethhdr->h_proto; - headlen =ETH_HLEN ; + headlen +=VLAN_HLEN ; }if (proto !=htons (ETH_P_ARP ))
@@ -1365,10 +1363,8 @@ int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig)int batadv_bla_is_backbone_gw (struct sk_buff *skb,struct batadv_orig_node *orig_node,int hdr_size) { -struct ethhdr *ethhdr; -struct vlan_ethhdr *vhdr;struct batadv_bla_backbone_gw *backbone_gw; -unsigned short vid =BATADV_NO_FLAGS ; +unsigned short vid;if (!atomic_read (&orig_node->bat_priv->bridge_loop_avoidance))return 0 ;
@@ -1377,16 +1373,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,if (!pskb_may_pull (skb, hdr_size +ETH_HLEN ))return 0 ; - ethhdr = (struct ethhdr *)(((uint8_t *)skb->data) + hdr_size); - -if (ethhdr->h_proto ==htons (ETH_P_8021Q )) { -if (!pskb_may_pull (skb, hdr_size +VLAN_ETH_HLEN )) -return 0 ; - - vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size); - vid =ntohs (vhdr->h_vlan_TCI) &VLAN_VID_MASK ; - vid |=BATADV_VLAN_HAS_TAG ; - } + vid =batadv_get_vid (skb, hdr_size);/* see if this originator is a backbone gw for this VLAN */ backbone_gw = batadv_backbone_hash_find(orig_node->bat_priv,
net/batman-adv/distributed-arp-table.c +7 -4
@@ -905,7 +905,8 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,* additional DAT answer may trigger kernel warnings about * a packet coming from the wrong port. */ -if (batadv_is_my_client (bat_priv, dat_entry->mac_addr)) { +if (batadv_is_my_client (bat_priv, dat_entry->mac_addr, +BATADV_NO_FLAGS )) { ret = true; goto out; }
@@ -990,9 +991,11 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,*/ if (hdr_size ==sizeof (struct batadv_unicast_4addr_packet )) err =batadv_send_skb_unicast_4addr (bat_priv, skb_new, -BATADV_P_DAT_CACHE_REPLY ); +BATADV_P_DAT_CACHE_REPLY , +BATADV_NO_FLAGS );else - err =batadv_send_skb_unicast (bat_priv, skb_new); + err =batadv_send_skb_unicast (bat_priv, skb_new, +BATADV_NO_FLAGS );if (!err) {batadv_inc_counter (bat_priv,BATADV_CNT_DAT_CACHED_REPLY_TX );
@@ -1080,7 +1083,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,/* if this REPLY is directed to a client of mine, let's deliver the * packet to the interface */ - ret = !batadv_is_my_client (bat_priv, hw_dst); + ret = !batadv_is_my_client (bat_priv, hw_dst,BATADV_NO_FLAGS ); out:if (ret)kfree_skb (skb);
net/batman-adv/gateway_client.c +2 -1
@@ -744,7 +744,8 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, ethhdr = (struct ethhdr *)skb->data; orig_dst_node =batadv_transtable_search (bat_priv, ethhdr->h_source, - ethhdr->h_dest); + ethhdr->h_dest, +BATADV_NO_FLAGS );if (!orig_dst_node) goto out;
net/batman-adv/main.c +28 -1
@@ -132,7 +132,7 @@ int batadv_mesh_init(struct net_device *soft_iface) goto err;batadv_tt_local_add (soft_iface, soft_iface->dev_addr, -BATADV_NULL_IFINDEX ); +BATADV_NO_FLAGS ,BATADV_NULL_IFINDEX ); ret =batadv_bla_init (bat_priv);if (ret <0 )
@@ -1144,6 +1144,33 @@ out:batadv_orig_node_free_ref (orig_node); } +/** +* batadv_get_vid - extract the VLAN identifier from skb if any +* @skb: the buffer containing the packet +* @header_len: length of the batman header preceding the ethernet header +* +* If the packet embedded in the skb is vlan tagged this function returns the +* VID with the BATADV_VLAN_HAS_TAG flag. Otherwise BATADV_NO_FLAGS is returned. +*/ +unsigned short batadv_get_vid (struct sk_buff *skb,size_t header_len) +{ +struct ethhdr *ethhdr = (struct ethhdr *)(skb->data + header_len); +struct vlan_ethhdr *vhdr; +unsigned short vid; + +if (ethhdr->h_proto !=htons (ETH_P_8021Q )) +return BATADV_NO_FLAGS ; + +if (!pskb_may_pull (skb, header_len +VLAN_ETH_HLEN )) +return BATADV_NO_FLAGS ; + + vhdr = (struct vlan_ethhdr *)(skb->data + header_len); + vid =ntohs (vhdr->h_vlan_TCI) &VLAN_VID_MASK ; + vid |=BATADV_VLAN_HAS_TAG ; + +return vid; +} +static int batadv_param_set_ra (const char *val,const struct kernel_param *kp) {struct batadv_algo_ops *bat_algo_ops;
net/batman-adv/main.h +1 -8
@@ -169,14 +169,6 @@ enum batadv_uev_type {#include <linux/seq_file.h> #include "types.h" -/** -* batadv_vlan_flags - flags for the four MSB of any vlan ID field -* @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not -*/ -enum batadv_vlan_flags { -BATADV_VLAN_HAS_TAG =BIT (15 ), -}; -#define BATADV_PRINT_VID (vid) (vid & BATADV_VLAN_HAS_TAG ? \ (int)(vid & VLAN_VID_MASK) : -1)
@@ -368,5 +360,6 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv,void batadv_tvlv_unicast_send (struct batadv_priv *bat_priv,uint8_t *src,uint8_t *dst,uint8_t type,uint8_t version,void *tvlv_value,uint16_t tvlv_value_len); +unsigned short batadv_get_vid (struct sk_buff *skb,size_t header_len);#endif /* _NET_BATMAN_ADV_MAIN_H_ */
net/batman-adv/packet.h +12 -2
@@ -122,6 +122,14 @@ enum batadv_tt_client_flags { BATADV_TT_CLIENT_TEMP = BIT(11), }; +/** +* batadv_vlan_flags - flags for the four MSB of any vlan ID field +* @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not +*/ +enum batadv_vlan_flags { +BATADV_VLAN_HAS_TAG =BIT (15 ), +}; +/* claim frame types for the bridge loop avoidance */ enum batadv_bla_claimframe {BATADV_CLAIM_TYPE_CLAIM =0x00 ,
@@ -399,21 +407,23 @@ struct batadv_tvlv_tt_data {* batadv_tt_client_flags) * @reserved: reserved field * @addr: mac address of non-mesh client that triggered this tt change +* @vid: VLAN identifier */ struct batadv_tvlv_tt_change {uint8_t flags;uint8_t reserved;uint8_t addr[ETH_ALEN ]; +__be16 vid; };/** * struct batadv_tvlv_roam_adv - roaming advertisement * @client: mac address of roaming client -* @reserved: field reserved for future use +* @vid: VLAN identifier */ struct batadv_tvlv_roam_adv {uint8_t client[ETH_ALEN ]; -uint16_t reserved; +__be16 vid; };#endif /* _NET_BATMAN_ADV_PACKET_H_ */
net/batman-adv/routing.c +17 -11
@@ -30,6 +30,8 @@#include "network-coding.h" #include "fragmentation.h" +#include <linux/if_vlan.h> +static int batadv_route_unicast_packet (struct sk_buff *skb,struct batadv_hard_iface *recv_if);
@@ -724,6 +726,7 @@ out:* @bat_priv: the bat priv with all the soft interface information * @unicast_packet: the unicast header to be updated * @dst_addr: the payload destination +* @vid: VLAN identifier * * Search the translation table for dst_addr and update the unicast header with * the new corresponding information (originator address where the destination
@@ -734,21 +737,22 @@ out:static bool batadv_reroute_unicast_packet (struct batadv_priv *bat_priv,struct batadv_unicast_packet *unicast_packet, -uint8_t *dst_addr) +uint8_t *dst_addr,unsigned short vid) {struct batadv_orig_node *orig_node =NULL ;struct batadv_hard_iface *primary_if =NULL ;bool ret = false;uint8_t *orig_addr, orig_ttvn; -if (batadv_is_my_client (bat_priv, dst_addr)) { +if (batadv_is_my_client (bat_priv, dst_addr, vid)) { primary_if =batadv_primary_if_get_selected (bat_priv);if (!primary_if) goto out; orig_addr = primary_if->net_dev->dev_addr; orig_ttvn = (uint8_t )atomic_read (&bat_priv->tt.vn); }else { - orig_node =batadv_transtable_search (bat_priv,NULL , dst_addr); + orig_node =batadv_transtable_search (bat_priv,NULL , dst_addr, + vid);if (!orig_node) goto out;
@@ -775,11 +779,12 @@ out:static int batadv_check_unicast_ttvn (struct batadv_priv *bat_priv,struct sk_buff *skb,int hdr_len) { -uint8_t curr_ttvn, old_ttvn; -struct batadv_orig_node *orig_node; -struct ethhdr *ethhdr; +struct batadv_unicast_packet *unicast_packet;struct batadv_hard_iface *primary_if; -struct batadv_unicast_packet *unicast_packet; +struct batadv_orig_node *orig_node; +uint8_t curr_ttvn, old_ttvn; +struct ethhdr *ethhdr; +unsigned short vid;int is_old_ttvn;/* check if there is enough data before accessing it */
@@ -791,6 +796,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,return 0 ; unicast_packet = (struct batadv_unicast_packet *)skb->data; + vid =batadv_get_vid (skb, hdr_len); ethhdr = (struct ethhdr *)(skb->data + hdr_len);/* check if the destination client was served by this node and it is now
@@ -798,9 +804,9 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,* message and that it knows the new destination in the mesh to re-route * the packet to */ -if (batadv_tt_local_client_is_roaming (bat_priv, ethhdr->h_dest)) { +if (batadv_tt_local_client_is_roaming (bat_priv, ethhdr->h_dest, vid)) {if (batadv_reroute_unicast_packet (bat_priv, unicast_packet, - ethhdr->h_dest)) + ethhdr->h_dest, vid)) net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n",
@@ -846,7 +852,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,* target host */ if (batadv_reroute_unicast_packet (bat_priv, unicast_packet, - ethhdr->h_dest)) { + ethhdr->h_dest, vid)) { net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv, "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n", unicast_packet->dest, ethhdr->h_dest,
@@ -858,7 +864,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv,* currently served by this node or there is no destination at all and * it is possible to drop the packet */ -if (!batadv_is_my_client (bat_priv, ethhdr->h_dest)) +if (!batadv_is_my_client (bat_priv, ethhdr->h_dest, vid))return 0 ;/* update the header in order to let the packet be delivered to this
net/batman-adv/send.c +5 -3
@@ -240,12 +240,14 @@ out:* @packet_type: the batman unicast packet type to use * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast * 4addr packets) +* @vid: the vid to be used to search the translation table * * Returns 1 in case of error or 0 otherwise. */ int batadv_send_skb_generic_unicast (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype) +int packet_subtype, +unsigned short vid) {struct ethhdr *ethhdr = (struct ethhdr *)skb->data;struct batadv_unicast_packet *unicast_packet;
@@ -260,7 +262,7 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,* returns NULL in case of AP isolation */ orig_node =batadv_transtable_search (bat_priv, ethhdr->h_source, - ethhdr->h_dest); + ethhdr->h_dest, vid);if (!orig_node) goto out;
@@ -290,7 +292,7 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,* try to reroute it because the ttvn contained in the header is less * than the current one */ -if (batadv_tt_global_client_is_roaming (bat_priv, ethhdr->h_dest)) +if (batadv_tt_global_client_is_roaming (bat_priv, ethhdr->h_dest, vid)) unicast_packet->ttvn = unicast_packet->ttvn -1 ;if (batadv_send_skb_to_orig (skb, orig_node,NULL ) !=NET_XMIT_DROP )
net/batman-adv/send.h +10 -6
@@ -40,21 +40,23 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv, int packet_subtype);int batadv_send_skb_generic_unicast (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype); - +int packet_subtype, +unsigned short vid);/** * batadv_send_unicast_skb - send the skb encapsulated in a unicast packet * @bat_priv: the bat priv with all the soft interface information * @skb: the payload to send +* @vid: the vid to be used to search the translation table * * Returns 1 in case of error or 0 otherwise. */ static inline int batadv_send_skb_unicast (struct batadv_priv *bat_priv, -struct sk_buff *skb) +struct sk_buff *skb, +unsigned short vid) {return batadv_send_skb_generic_unicast (bat_priv, skb,BATADV_UNICAST , -0 ); +0 , vid); }/**
@@ -63,16 +65,18 @@ static inline int batadv_send_skb_unicast(struct batadv_priv *bat_priv,* @bat_priv: the bat priv with all the soft interface information * @skb: the payload to send * @packet_subtype: the unicast 4addr packet subtype to use +* @vid: the vid to be used to search the translation table * * Returns 1 in case of error or 0 otherwise. */ static inline int batadv_send_skb_unicast_4addr (struct batadv_priv *bat_priv,struct sk_buff *skb, -int packet_subtype) +int packet_subtype, +unsigned short vid) {return batadv_send_skb_generic_unicast (bat_priv, skb,BATADV_UNICAST_4ADDR , - packet_subtype); + packet_subtype, vid); }#endif /* _NET_BATMAN_ADV_SEND_H_ */
net/batman-adv/soft-interface.c +18 -17
@@ -118,9 +118,10 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)/* only modify transtable if it has been initialized before */ if (atomic_read (&bat_priv->mesh_state) ==BATADV_MESH_ACTIVE ) { -batadv_tt_local_remove (bat_priv, old_addr, +batadv_tt_local_remove (bat_priv, old_addr,BATADV_NO_FLAGS ,"mac address changed" , false); -batadv_tt_local_add (dev, addr->sa_data,BATADV_NULL_IFINDEX ); +batadv_tt_local_add (dev, addr->sa_data,BATADV_NO_FLAGS , +BATADV_NULL_IFINDEX ); }return 0 ;
@@ -152,33 +153,33 @@ static void batadv_interface_set_rx_mode(struct net_device *dev)static int batadv_interface_tx (struct sk_buff *skb,struct net_device *soft_iface) { -struct ethhdr *ethhdr = (struct ethhdr *)skb->data; +struct ethhdr *ethhdr;struct batadv_priv *bat_priv =netdev_priv (soft_iface);struct batadv_hard_iface *primary_if =NULL ;struct batadv_bcast_packet *bcast_packet; -struct vlan_ethhdr *vhdr;__be16 ethertype =htons (ETH_P_BATMAN );static const uint8_t stp_addr[ETH_ALEN ] = {0x01 ,0x80 ,0xC2 ,0x00 ,0x00 ,0x00 };static const uint8_t ectp_addr[ETH_ALEN ] = {0xCF ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +struct vlan_ethhdr *vhdr;unsigned int header_len =0 ;int data_len = skb->len, ret; -unsigned short vid__maybe_unused =BATADV_NO_FLAGS ; +unsigned long brd_delay =1 ;bool do_bcast = false; +unsigned short vid;uint32_t seqno; -unsigned long brd_delay =1 ;if (atomic_read (&bat_priv->mesh_state) !=BATADV_MESH_ACTIVE ) goto dropped; soft_iface->trans_start = jiffies; + vid =batadv_get_vid (skb,0 ); + ethhdr = (struct ethhdr *)skb->data;switch (ntohs (ethhdr->h_proto)) {case ETH_P_8021Q : vhdr = (struct vlan_ethhdr *)skb->data; - vid =ntohs (vhdr->h_vlan_TCI) &VLAN_VID_MASK ; - vid |=BATADV_VLAN_HAS_TAG ;if (vhdr->h_vlan_encapsulated_proto != ethertype)break ;
@@ -196,7 +197,8 @@ static int batadv_interface_tx(struct sk_buff *skb,/* Register the client MAC in the transtable */ if (!is_multicast_ether_addr (ethhdr->h_source)) -batadv_tt_local_add (soft_iface, ethhdr->h_source, skb->skb_iif); +batadv_tt_local_add (soft_iface, ethhdr->h_source, vid, + skb->skb_iif);/* don't accept stp packets. STP does not help in meshes. * better use the bridge loop avoidance ...
@@ -296,7 +298,7 @@ static int batadv_interface_tx(struct sk_buff *skb,batadv_dat_snoop_outgoing_arp_reply (bat_priv, skb); - ret =batadv_send_skb_unicast (bat_priv, skb); + ret =batadv_send_skb_unicast (bat_priv, skb, vid);if (ret !=0 ) goto dropped_freed; }
@@ -319,12 +321,12 @@ void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct batadv_hard_iface *recv_if, int hdr_size, struct batadv_orig_node *orig_node) { - struct batadv_priv *bat_priv = netdev_priv(soft_iface); -struct ethhdr *ethhdr; -struct vlan_ethhdr *vhdr; struct batadv_header *batadv_header = (struct batadv_header *)skb->data; -unsigned short vid__maybe_unused =BATADV_NO_FLAGS ; +struct batadv_priv *bat_priv =netdev_priv (soft_iface);__be16 ethertype =htons (ETH_P_BATMAN ); +struct vlan_ethhdr *vhdr; +struct ethhdr *ethhdr; +unsigned short vid;bool is_bcast; is_bcast = (batadv_header->packet_type ==BATADV_BCAST );
@@ -336,13 +338,12 @@ void batadv_interface_rx(struct net_device *soft_iface,skb_pull_rcsum (skb, hdr_size);skb_reset_mac_header (skb); + vid =batadv_get_vid (skb, hdr_size); ethhdr =eth_hdr (skb);switch (ntohs (ethhdr->h_proto)) {case ETH_P_8021Q : vhdr = (struct vlan_ethhdr *)skb->data; - vid =ntohs (vhdr->h_vlan_TCI) &VLAN_VID_MASK ; - vid |=BATADV_VLAN_HAS_TAG ;if (vhdr->h_vlan_encapsulated_proto != ethertype)break ;
@@ -378,7 +379,7 @@ void batadv_interface_rx(struct net_device *soft_iface,if (orig_node)batadv_tt_add_temporary_global_entry (bat_priv, orig_node, - ethhdr->h_source); + ethhdr->h_source, vid);if (batadv_is_ap_isolated (bat_priv, ethhdr->h_source, ethhdr->h_dest)) goto dropped;
net/batman-adv/translation-table.c +189 -51
520 lines not on this page · raw message
net/batman-adv/translation-table.h +11 -8
@@ -22,10 +22,10 @@int batadv_tt_init (struct batadv_priv *bat_priv);void batadv_tt_local_add (struct net_device *soft_iface,const uint8_t *addr, -int ifindex); +unsigned short vid,int ifindex);uint16_t batadv_tt_local_remove (struct batadv_priv *bat_priv, -const uint8_t *addr,const char *message, -bool roaming); +const uint8_t *addr,unsigned short vid, +const char *message,bool roaming);int batadv_tt_local_seq_print_text (struct seq_file *seq,void *offset);int batadv_tt_global_seq_print_text (struct seq_file *seq,void *offset); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
@@ -33,18 +33,21 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, const char *message);struct batadv_orig_node *batadv_transtable_search (struct batadv_priv *bat_priv,const uint8_t *src, -const uint8_t *addr); +const uint8_t *addr, +unsigned short vid);void batadv_tt_free (struct batadv_priv *bat_priv); -bool batadv_is_my_client (struct batadv_priv *bat_priv,const uint8_t *addr); +bool batadv_is_my_client (struct batadv_priv *bat_priv,const uint8_t *addr, +unsigned short vid);bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,uint8_t *src,uint8_t *dst);void batadv_tt_local_commit_changes (struct batadv_priv *bat_priv);bool batadv_tt_global_client_is_roaming (struct batadv_priv *bat_priv, -uint8_t *addr); +uint8_t *addr,unsigned short vid);bool batadv_tt_local_client_is_roaming (struct batadv_priv *bat_priv, -uint8_t *addr); +uint8_t *addr,unsigned short vid);bool batadv_tt_add_temporary_global_entry (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node, -const unsigned char *addr); +const unsigned char *addr, +unsigned short vid);#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
net/batman-adv/types.h +2 -0
@@ -715,6 +715,7 @@ struct batadv_bla_claim {/** * struct batadv_tt_common_entry - tt local & tt global common data * @addr: mac address of non-mesh client +* @vid: VLAN identifier * @hash_entry: hlist node for batadv_priv_tt::local_hash or for * batadv_priv_tt::global_hash * @flags: various state handling flags (see batadv_tt_client_flags)
@@ -724,6 +725,7 @@ struct batadv_bla_claim {*/ struct batadv_tt_common_entry {uint8_t addr[ETH_ALEN ]; +unsigned short vid;struct hlist_node hash_entry;uint16_t flags;unsigned long added_at;
Signature · 1 line
1.8.4
PATCH 6/18 batman-adv: use vid when computing local and global TT CRC
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
now that each TT entry is characterised by a VLAN ID, the latter has to be taken into consideration when computing the local/global table CRC as it would be theoretically possible to have the same client in two different VLANs
--- net/batman-adv/translation-table.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)
net/batman-adv/translation-table.c +31 -4
@@ -1506,6 +1506,24 @@ out:* batadv_tt_global_crc - calculates the checksum of the local table belonging * to the given orig_node * @bat_priv: the bat priv with all the soft interface information +* @orig_node: originator for which the CRC should be computed +* +* This function computes the checksum for the global table corresponding to a +* specific originator. In particular, the checksum is computed as follows: For +* each client connected to the originator the CRC32C of the MAC address and the +* VID is computed and then all the CRC32Cs of the various clients are xor'ed +* together. +* +* The idea behind is that CRC32C should be used as much as possible in order to +* produce a unique hash of the table, but since the order which is used to feed +* the CRC32C function affects the result and since every node in the network +* probably sorts the clients differently, the hash function cannot be directly +* computed over the entire table. Hence the CRC32C is used only on +* the single client entry, while all the results are then xor'ed together +* because the XOR operation can combine them all while trying to reduce the +* noise as much as possible. +* +* Returns the checksum of the global table of a given originator. */ static uint32_t batadv_tt_global_crc (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node)
@@ -1514,7 +1532,7 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv,struct batadv_tt_common_entry *tt_common;struct batadv_tt_global_entry *tt_global;struct hlist_head *head; -uint32_t i, crc =0 ; +uint32_t i, crc_tmp, crc =0 ;for (i =0 ; i < hash->size; i++) { head = &hash->table[i];
@@ -1545,7 +1563,9 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv, orig_node))continue ; - crc ^=crc32c (0 , tt_common->addr,ETH_ALEN ); + crc_tmp =crc32c (0 , &tt_common->vid, +sizeof (tt_common->vid)); + crc ^=crc32c (crc_tmp, tt_common->addr,ETH_ALEN ); }rcu_read_unlock (); }
@@ -1556,13 +1576,18 @@ static uint32_t batadv_tt_global_crc(struct batadv_priv *bat_priv,/** * batadv_tt_local_crc - calculates the checksum of the local table * @bat_priv: the bat priv with all the soft interface information +* +* For details about the computation, please refer to the documentation for +* batadv_tt_global_crc(). +* +* Returns the checksum of the local table */ static uint32_t batadv_tt_local_crc (struct batadv_priv *bat_priv) {struct batadv_hashtable *hash = bat_priv->tt.local_hash;struct batadv_tt_common_entry *tt_common;struct hlist_head *head; -uint32_t i, crc =0 ; +uint32_t i, crc_tmp, crc =0 ;for (i =0 ; i < hash->size; i++) { head = &hash->table[i];
@@ -1575,7 +1600,9 @@ static uint32_t batadv_tt_local_crc(struct batadv_priv *bat_priv)if (tt_common->flags &BATADV_TT_CLIENT_NEW )continue ; - crc ^=crc32c (0 , tt_common->addr,ETH_ALEN ); + crc_tmp =crc32c (0 , &tt_common->vid, +sizeof (tt_common->vid)); + crc ^=crc32c (crc_tmp, tt_common->addr,ETH_ALEN ); }rcu_read_unlock (); }
Signature · 1 line
1.8.4
PATCH 7/18 batman-adv: print the VID together with the TT entries
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
--- net/batman-adv/main.h | 2 + net/batman-adv/translation-table.c | 82 +++++++++++++++++++++++--------------- 2 files changed, 52 insertions(+), 32 deletions(-)
net/batman-adv/main.h +2 -0
@@ -167,6 +167,8 @@ enum batadv_uev_type {#include <net/rtnetlink.h> #include <linux/jiffies.h> #include <linux/seq_file.h> +#include <linux/if_vlan.h> +#include "types.h" #define BATADV_PRINT_VID (vid) (vid & BATADV_VLAN_HAS_TAG ? \
net/batman-adv/translation-table.c +50 -32
212 lines not on this page · raw message
Signature · 1 line
1.8.4
PATCH 8/18 batman-adv: make the GW module correctly talk to the new VLAN-TT
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
The gateway code is now adapted in order to correctly interact with the Translation Table component by using the vlan ID
--- net/batman-adv/gateway_client.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
net/batman-adv/gateway_client.c +18 -3
@@ -726,7 +726,20 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)return true; } -/* this call might reallocate skb data */ +/** +* batadv_gw_out_of_range - check if the dhcp request destination is the best gw +* @bat_priv: the bat priv with all the soft interface information +* @skb: the outgoing packet +* +* Check if the skb is a DHCP request and if it is sent to the current best GW +* server. Due to topology changes it may be the case that the GW server +* previously selected is not the best one anymore. +* +* Returns true if the packet destination is unicast and it is not the best gw, +* false otherwise. +* +* This call might reallocate skb data. +*/ bool batadv_gw_out_of_range (struct batadv_priv *bat_priv,struct sk_buff *skb) {
@@ -737,6 +750,9 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,bool ret, out_of_range = false;unsigned int header_len =0 ;uint8_t curr_tq_avg; +unsigned short vid; + + vid =batadv_get_vid (skb,0 ); ret =batadv_gw_is_dhcp_target (skb, &header_len);if (!ret)
@@ -744,8 +760,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, ethhdr = (struct ethhdr *)skb->data; orig_dst_node =batadv_transtable_search (bat_priv, ethhdr->h_source, - ethhdr->h_dest, -BATADV_NO_FLAGS ); + ethhdr->h_dest, vid);if (!orig_dst_node) goto out;
Signature · 1 line
1.8.4
PATCH 9/18 batman-adv: make the Distributed ARP Table vlan aware
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
The same IP subnet can be used on different VLANs, therefore DAT has to differentiate whether the IP to resolve belongs to one or the other virtual LAN.
To accomplish this task DAT has to deal with the VLAN tag and store it together with each ARP entry.
--- net/batman-adv/distributed-arp-table.c | 153 ++++++++++++++++++++++----------- net/batman-adv/types.h | 2 + 2 files changed, 107 insertions(+), 48 deletions(-)
net/batman-adv/distributed-arp-table.c +105 -48
@@ -19,6 +19,7 @@#include <linux/if_ether.h> #include <linux/if_arp.h> +#include <linux/if_vlan.h> #include <net/arp.h> #include "main.h"
@@ -205,15 +206,11 @@ static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size)*/ static uint32_t batadv_hash_dat (const void *data,uint32_t size) { -const unsigned char *key = data;uint32_t hash =0 ; -size_t i; +const struct batadv_dat_entry *dat = data; -for (i =0 ; i <4 ; i++) { - hash += key[i]; - hash += (hash <<10 ); - hash ^= (hash >>6 ); - } + hash =batadv_hash_bytes (hash, &dat->ip,sizeof (dat->ip)); + hash =batadv_hash_bytes (hash, &dat->vid,sizeof (dat->vid)); hash += (hash <<3 ); hash ^= (hash >>11 );
@@ -227,21 +224,26 @@ static uint32_t batadv_hash_dat(const void *data, uint32_t size)* table * @bat_priv: the bat priv with all the soft interface information * @ip: search key +* @vid: VLAN identifier * * Returns the dat_entry if found, NULL otherwise. */ static struct batadv_dat_entry * -batadv_dat_entry_hash_find (struct batadv_priv *bat_priv,__be32 ip) +batadv_dat_entry_hash_find (struct batadv_priv *bat_priv,__be32 ip, +unsigned short vid) {struct hlist_head *head; -struct batadv_dat_entry *dat_entry, *dat_entry_tmp =NULL ; +struct batadv_dat_entry to_find, *dat_entry, *dat_entry_tmp =NULL ;struct batadv_hashtable *hash = bat_priv->dat.hash;uint32_t index;if (!hash)return NULL ; - index =batadv_hash_dat (&ip, hash->size); + to_find.ip = ip; + to_find.vid = vid; + + index =batadv_hash_dat (&to_find, hash->size); head = &hash->table[index];rcu_read_lock ();
@@ -265,22 +267,24 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip)* @bat_priv: the bat priv with all the soft interface information * @ip: ipv4 to add/edit * @mac_addr: mac address to assign to the given ipv4 +* @vid: VLAN identifier */ static void batadv_dat_entry_add (struct batadv_priv *bat_priv,__be32 ip, -uint8_t *mac_addr) +uint8_t *mac_addr,unsigned short vid) {struct batadv_dat_entry *dat_entry;int hash_added; - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip); + dat_entry =batadv_dat_entry_hash_find (bat_priv, ip, vid);/* if this entry is already known, just update it */ if (dat_entry) {if (!batadv_compare_eth (dat_entry->mac_addr, mac_addr))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\n" , &dat_entry->ip, - dat_entry->mac_addr); +"Entry updated: %pI4 %pM (vid: %d)\n" , + &dat_entry->ip, dat_entry->mac_addr, +BATADV_PRINT_VID (vid)); goto out; }
@@ -289,12 +293,13 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, goto out; dat_entry->ip = ip; + dat_entry->vid = vid;memcpy (dat_entry->mac_addr, mac_addr,ETH_ALEN ); dat_entry->last_update = jiffies;atomic_set (&dat_entry->refcount,2 ); hash_added =batadv_hash_add (bat_priv->dat.hash, batadv_compare_dat, - batadv_hash_dat, &dat_entry->ip, + batadv_hash_dat, dat_entry, &dat_entry->hash_entry);if (unlikely (hash_added !=0 )) {
@@ -303,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\n" , - &dat_entry->ip, dat_entry->mac_addr); +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)
@@ -756,8 +761,8 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) goto out;seq_printf (seq,"Distributed ARP Table (%s):\n" , net_dev->name); -seq_printf (seq," %-7s %-13s %5s\n" ,"IPv4" ,"MAC" , -"last-seen" ); +seq_printf (seq," %-7s %-9s %4s %11s\n" ,"IPv4" , +"MAC" ,"VID" ,"last-seen" );for (i =0 ; i < hash->size; i++) { head = &hash->table[i];
@@ -770,8 +775,9 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) last_seen_msecs = last_seen_msecs %60000 ; last_seen_secs = last_seen_msecs /1000 ; -seq_printf (seq," * %15pI4 %14pM %6i:%02i\n" , +seq_printf (seq," * %15pI4 %14pM %4i %6i:%02i\n" , &dat_entry->ip, dat_entry->mac_addr, +BATADV_PRINT_VID (dat_entry->vid), last_seen_mins, last_seen_secs); }rcu_read_unlock ();
@@ -858,6 +864,31 @@ out: }/** +* batadv_dat_get_vid - extract the VLAN identifier from skb if any +* @skb: the buffer containing the packet to extract the VID from +* @hdr_size: the size of the batman-adv header encapsulating the packet +* +* If the packet embedded in the skb is vlan tagged this function returns the +* VID with the BATADV_VLAN_HAS_TAG flag. Otherwise BATADV_NO_FLAGS is returned. +*/ +static unsigned short batadv_dat_get_vid (struct sk_buff *skb,int *hdr_size) +{ +unsigned short vid; + + vid =batadv_get_vid (skb, *hdr_size); + +/* ARP parsing functions jump forward of hdr_size + ETH_HLEN. +* If the header contained in the packet is a VLAN one (which is longer) +* hdr_size is updated so that the functions will still skip the +* correct amount of bytes. +*/ +if (vid &BATADV_VLAN_HAS_TAG ) + *hdr_size +=VLAN_HLEN ; + +return vid; +} + +/** * batadv_dat_snoop_outgoing_arp_request - snoop the ARP request and try to * answer using DAT * @bat_priv: the bat priv with all the soft interface information
@@ -876,26 +907,31 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,bool ret = false;struct batadv_dat_entry *dat_entry =NULL ;struct sk_buff *skb_new; +int hdr_size =0 ; +unsigned short vid;if (!atomic_read (&bat_priv->distributed_arp_table)) goto out; - type =batadv_arp_get_type (bat_priv, skb,0 ); + vid =batadv_dat_get_vid (skb, &hdr_size); + + type =batadv_arp_get_type (bat_priv, skb, hdr_size);/* If the node gets an ARP_REQUEST it has to send a DHT_GET unicast * message to the selected DHT candidates */ if (type !=ARPOP_REQUEST ) goto out; -batadv_dbg_arp (bat_priv, skb, type,0 ,"Parsing outgoing ARP REQUEST" ); +batadv_dbg_arp (bat_priv, skb, type, hdr_size, +"Parsing outgoing ARP REQUEST" ); - ip_src =batadv_arp_ip_src (skb,0 ); - hw_src =batadv_arp_hw_src (skb,0 ); - ip_dst =batadv_arp_ip_dst (skb,0 ); + ip_src =batadv_arp_ip_src (skb, hdr_size); + hw_src =batadv_arp_hw_src (skb, hdr_size); + ip_dst =batadv_arp_ip_dst (skb, hdr_size); -batadv_dat_entry_add (bat_priv, ip_src, hw_src); +batadv_dat_entry_add (bat_priv, ip_src, hw_src, vid); - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst); + dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst, vid);if (dat_entry) {/* If the ARP request is destined for a local client the local * client will answer itself. DAT would only generate a
@@ -917,11 +953,15 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,if (!skb_new) goto out; +if (vid &BATADV_VLAN_HAS_TAG ) + skb_new =vlan_insert_tag (skb_new,htons (ETH_P_8021Q ), + vid &VLAN_VID_MASK ); +skb_reset_mac_header (skb_new); skb_new->protocol =eth_type_trans (skb_new, bat_priv->soft_iface); bat_priv->stats.rx_packets++; - bat_priv->stats.rx_bytes += skb->len +ETH_HLEN ; + bat_priv->stats.rx_bytes += skb->len +ETH_HLEN + hdr_size; bat_priv->soft_iface->last_rx = jiffies;netif_rx (skb_new);
@@ -956,11 +996,14 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,struct sk_buff *skb_new;struct batadv_dat_entry *dat_entry =NULL ;bool ret = false; +unsigned short vid;int err;if (!atomic_read (&bat_priv->distributed_arp_table)) goto out; + vid =batadv_dat_get_vid (skb, &hdr_size); + type =batadv_arp_get_type (bat_priv, skb, hdr_size);if (type !=ARPOP_REQUEST ) goto out;
@@ -972,9 +1015,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,batadv_dbg_arp (bat_priv, skb, type, hdr_size,"Parsing incoming ARP REQUEST" ); -batadv_dat_entry_add (bat_priv, ip_src, hw_src); +batadv_dat_entry_add (bat_priv, ip_src, hw_src, vid); - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst); + dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst, vid);if (!dat_entry) goto out;
@@ -985,6 +1028,10 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,if (!skb_new) goto out; +if (vid &BATADV_VLAN_HAS_TAG ) + skb_new =vlan_insert_tag (skb_new,htons (ETH_P_8021Q ), + vid &VLAN_VID_MASK ); +/* To preserve backwards compatibility, the node has choose the outgoing * format based on the incoming request packet type. The assumption is * that a node not using the 4addr packet format doesn't support it.
@@ -992,10 +1039,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,if (hdr_size ==sizeof (struct batadv_unicast_4addr_packet )) err =batadv_send_skb_unicast_4addr (bat_priv, skb_new,BATADV_P_DAT_CACHE_REPLY , -BATADV_NO_FLAGS ); + vid);else - err =batadv_send_skb_unicast (bat_priv, skb_new, -BATADV_NO_FLAGS ); + err =batadv_send_skb_unicast (bat_priv, skb_new, vid);if (!err) {batadv_inc_counter (bat_priv,BATADV_CNT_DAT_CACHED_REPLY_TX );
@@ -1020,23 +1066,28 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv,uint16_t type;__be32 ip_src, ip_dst;uint8_t *hw_src, *hw_dst; +int hdr_size =0 ; +unsigned short vid;if (!atomic_read (&bat_priv->distributed_arp_table))return ; - type =batadv_arp_get_type (bat_priv, skb,0 ); + vid =batadv_dat_get_vid (skb, &hdr_size); + + type =batadv_arp_get_type (bat_priv, skb, hdr_size);if (type !=ARPOP_REPLY )return ; -batadv_dbg_arp (bat_priv, skb, type,0 ,"Parsing outgoing ARP REPLY" ); +batadv_dbg_arp (bat_priv, skb, type, hdr_size, +"Parsing outgoing ARP REPLY" ); - hw_src =batadv_arp_hw_src (skb,0 ); - ip_src =batadv_arp_ip_src (skb,0 ); - hw_dst =batadv_arp_hw_dst (skb,0 ); - ip_dst =batadv_arp_ip_dst (skb,0 ); + hw_src =batadv_arp_hw_src (skb, hdr_size); + ip_src =batadv_arp_ip_src (skb, hdr_size); + hw_dst =batadv_arp_hw_dst (skb, hdr_size); + ip_dst =batadv_arp_ip_dst (skb, hdr_size); -batadv_dat_entry_add (bat_priv, ip_src, hw_src); -batadv_dat_entry_add (bat_priv, ip_dst, hw_dst); +batadv_dat_entry_add (bat_priv, ip_src, hw_src, vid); +batadv_dat_entry_add (bat_priv, ip_dst, hw_dst, vid);/* Send the ARP reply to the candidates for both the IP addresses that * the node obtained from the ARP reply
@@ -1058,10 +1109,13 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,__be32 ip_src, ip_dst;uint8_t *hw_src, *hw_dst;bool ret = false; +unsigned short vid;if (!atomic_read (&bat_priv->distributed_arp_table)) goto out; + vid =batadv_dat_get_vid (skb, &hdr_size); + type =batadv_arp_get_type (bat_priv, skb, hdr_size);if (type !=ARPOP_REPLY ) goto out;
@@ -1077,13 +1131,13 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,/* Update our internal cache with both the IP addresses the node got * within the ARP reply */ -batadv_dat_entry_add (bat_priv, ip_src, hw_src); -batadv_dat_entry_add (bat_priv, ip_dst, hw_dst); +batadv_dat_entry_add (bat_priv, ip_src, hw_src, vid); +batadv_dat_entry_add (bat_priv, ip_dst, hw_dst, vid);/* if this REPLY is directed to a client of mine, let's deliver the * packet to the interface */ - ret = !batadv_is_my_client (bat_priv, hw_dst,BATADV_NO_FLAGS ); + ret = !batadv_is_my_client (bat_priv, hw_dst, vid); out:if (ret)kfree_skb (skb);
@@ -1106,7 +1160,8 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,__be32 ip_dst;struct batadv_dat_entry *dat_entry =NULL ;bool ret = false; -const size_t bcast_len =sizeof (struct batadv_bcast_packet ); +int hdr_size =sizeof (struct batadv_bcast_packet ); +unsigned short vid;if (!atomic_read (&bat_priv->distributed_arp_table)) goto out;
@@ -1117,12 +1172,14 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv,if (forw_packet->num_packets) goto out; - type =batadv_arp_get_type (bat_priv, forw_packet->skb, bcast_len); + vid =batadv_dat_get_vid (forw_packet->skb, &hdr_size); + + type =batadv_arp_get_type (bat_priv, forw_packet->skb, hdr_size);if (type !=ARPOP_REQUEST ) goto out; - ip_dst =batadv_arp_ip_dst (forw_packet->skb, bcast_len); - dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst); + ip_dst =batadv_arp_ip_dst (forw_packet->skb, hdr_size); + dat_entry =batadv_dat_entry_hash_find (bat_priv, ip_dst, vid);/* check if the node already got this entry */ if (!dat_entry) { batadv_dbg(BATADV_DBG_DAT, bat_priv,
net/batman-adv/types.h +2 -0
@@ -933,6 +933,7 @@ struct batadv_algo_ops {* is used to stored ARP entries needed for the global DAT cache * @ip: the IPv4 corresponding to this DAT/ARP entry * @mac_addr: the MAC address associated to the stored IPv4 +* @vid: the vlan ID associated to this entry * @last_update: time in jiffies when this entry was refreshed last time * @hash_entry: hlist node for batadv_priv_dat::hash * @refcount: number of contexts the object is used
@@ -941,6 +942,7 @@ struct batadv_algo_ops {struct batadv_dat_entry {__be32 ip;uint8_t mac_addr[ETH_ALEN ]; +unsigned short vid;unsigned long last_update;struct hlist_node hash_entry;atomic_t refcount;
Signature · 1 line
1.8.4
PATCH 10/18 batman-adv: add per VLAN interface attribute framework
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
Since batman-adv is now fully VLAN-aware, a proper framework able to handle per-vlan-interface attributes is needed.
Those attributes will affect the associated VLAN interface only, rather than the real soft_iface (which would result in every vlan interface having the same attribute configuration).
To make the code simpler and easier to extend, attributes associated to the standalone soft_iface are now treated like belonging to yet another vlan having a special vid. This vid is different from the others because it is made up by all zeros and the VLAN_HAS_TAG bit is not set.
--- net/batman-adv/hard-interface.c | 2 + net/batman-adv/main.c | 5 +- net/batman-adv/soft-interface.c | 171 ++++++++++++++++++++++++++++++++++++++++ net/batman-adv/soft-interface.h | 1 + net/batman-adv/types.h | 21 +++++ 5 files changed, 197 insertions(+), 3 deletions(-)
net/batman-adv/hard-interface.c +2 -0
@@ -643,6 +643,8 @@ static int batadv_hard_if_event(struct notifier_block *this,if (batadv_softif_is_valid (net_dev) && event ==NETDEV_REGISTER ) {batadv_sysfs_add_meshif (net_dev); + bat_priv =netdev_priv (net_dev); +batadv_softif_create_vlan (bat_priv,BATADV_NO_FLAGS );return NOTIFY_DONE ; }
net/batman-adv/main.c +2 -3
@@ -113,6 +113,7 @@ int batadv_mesh_init(struct net_device *soft_iface)spin_lock_init (&bat_priv->gw.list_lock);spin_lock_init (&bat_priv->tvlv.container_list_lock);spin_lock_init (&bat_priv->tvlv.handler_list_lock); +spin_lock_init (&bat_priv->softif_vlan_list_lock);INIT_HLIST_HEAD (&bat_priv->forw_bat_list);INIT_HLIST_HEAD (&bat_priv->forw_bcast_list);
@@ -122,6 +123,7 @@ int batadv_mesh_init(struct net_device *soft_iface)INIT_LIST_HEAD (&bat_priv->tt.roam_list);INIT_HLIST_HEAD (&bat_priv->tvlv.container_list);INIT_HLIST_HEAD (&bat_priv->tvlv.handler_list); +INIT_HLIST_HEAD (&bat_priv->softif_vlan_list); ret =batadv_originator_init (bat_priv);if (ret <0 )
@@ -131,9 +133,6 @@ int batadv_mesh_init(struct net_device *soft_iface)if (ret <0 ) goto err; -batadv_tt_local_add (soft_iface, soft_iface->dev_addr, -BATADV_NO_FLAGS ,BATADV_NULL_IFINDEX ); - ret =batadv_bla_init (bat_priv);if (ret <0 ) goto err;
net/batman-adv/soft-interface.c +171 -0
201 lines not on this page · raw message
net/batman-adv/soft-interface.h +1 -0
@@ -28,5 +28,6 @@ struct net_device *batadv_softif_create(const char *name);void batadv_softif_destroy_sysfs (struct net_device *soft_iface);int batadv_softif_is_valid (const struct net_device *net_dev);extern struct rtnl_link_ops batadv_link_ops; +int batadv_softif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid);#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
net/batman-adv/types.h +21 -0
@@ -531,6 +531,22 @@ struct batadv_priv_nc { };/** +* struct batadv_softif_vlan - per VLAN attributes set +* @vid: VLAN identifier +* @kobj: kobject for sysfs vlan subdirectory +* @list: list node for bat_priv::softif_vlan_list +* @refcount: number of context where this object is currently in use +* @rcu: struct used for freeing in a RCU-safe manner +*/ +struct batadv_softif_vlan { +unsigned short vid; +struct kobject *kobj; +struct hlist_node list; +atomic_t refcount; +struct rcu_head rcu; +}; + +/** * struct batadv_priv - per mesh interface data * @mesh_state: current status of the mesh (inactive/active/deactivating) * @soft_iface: net device which holds this struct as private data
@@ -566,6 +582,9 @@ struct batadv_priv_nc {* @primary_if: one of the hard interfaces assigned to this mesh interface * becomes the primary interface * @bat_algo_ops: routing algorithm used by this mesh interface +* @softif_vlan_list: a list of softif_vlan structs, one per VLAN created on top +* of the mesh interface represented by this object +* @softif_vlan_list_lock: lock protecting softif_vlan_list * @bla: bridge loope avoidance data * @debug_log: holding debug logging relevant data * @gw: gateway data
@@ -613,6 +632,8 @@ struct batadv_priv {struct work_struct cleanup_work;struct batadv_hard_iface __rcu *primary_if;/* rcu protected pointer */ struct batadv_algo_ops *bat_algo_ops; +struct hlist_head softif_vlan_list; +spinlock_t softif_vlan_list_lock;/* protects softif_vlan_list */ #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_priv_bla bla;#endif
Signature · 1 line
1.8.4
PATCH 11/18 batman-adv: add sysfs framework for VLAN
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
Each VLAN can now have its own set of attributes which are exported through a new subfolder in the sysfs tree. Each VLAN created on top of a soft_iface will have its own subfolder.
The subfolder is named "vlan%VID" and it is created inside the "mesh" sysfs folder belonging to batman-adv.
Attributes corresponding to the untagged LAN are stored in the root sysfs folder as before.
This patch also creates all the needed macros and data structures to easily handle new VLAN spacific attributes.
--- net/batman-adv/soft-interface.c | 15 +++- net/batman-adv/soft-interface.h | 3 + net/batman-adv/sysfs.c | 173 ++++++++++++++++++++++++++++++++++++++++ net/batman-adv/sysfs.h | 10 +++ 4 files changed, 198 insertions(+), 3 deletions(-)
net/batman-adv/soft-interface.c +12 -3
@@ -398,7 +398,7 @@ out:* possibly free it * @softif_vlan: the vlan object to release */ -static void batadv_softif_vlan_free_ref (struct batadv_softif_vlan *softif_vlan) +void batadv_softif_vlan_free_ref (struct batadv_softif_vlan *softif_vlan) {if (atomic_dec_and_test (&softif_vlan->refcount))kfree_rcu (softif_vlan, rcu);
@@ -412,8 +412,8 @@ static void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan)* Returns the private data of the vlan matching the vid passed as argument or * NULL otherwise. The refcounter of the returned object is incremented by 1. */ -static struct batadv_softif_vlan * -batadv_softif_vlan_get (struct batadv_priv *bat_priv,unsigned short vid) +struct batadv_softif_vlan *batadv_softif_vlan_get (struct batadv_priv *bat_priv, +unsigned short vid) {struct batadv_softif_vlan *vlan_tmp, *vlan =NULL ;
@@ -443,6 +443,7 @@ batadv_softif_vlan_get(struct batadv_priv *bat_priv, unsigned short vid)int batadv_softif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid) {struct batadv_softif_vlan *vlan; +int err; vlan =batadv_softif_vlan_get (bat_priv, vid);if (vlan) {
@@ -457,6 +458,12 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) vlan->vid = vid;atomic_set (&vlan->refcount,1 ); + err =batadv_sysfs_add_vlan (bat_priv->soft_iface, vlan); +if (err) { +kfree (vlan); +return err; + } +/* add a new TT local entry. This one will be marked with the NOPURGE * flag */
@@ -483,6 +490,8 @@ static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv,hlist_del_rcu (&vlan->list);spin_unlock_bh (&bat_priv->softif_vlan_list_lock); +batadv_sysfs_del_vlan (bat_priv, vlan); +/* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag */
net/batman-adv/soft-interface.h +3 -0
@@ -29,5 +29,8 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface);int batadv_softif_is_valid (const struct net_device *net_dev);extern struct rtnl_link_ops batadv_link_ops;int batadv_softif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid); +void batadv_softif_vlan_free_ref (struct batadv_softif_vlan *softif_vlan); +struct batadv_softif_vlan *batadv_softif_vlan_get (struct batadv_priv *bat_priv, +unsigned short vid);#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
net/batman-adv/sysfs.c +173 -0
209 lines not on this page · raw message
net/batman-adv/sysfs.h +10 -0
@@ -22,6 +22,12 @@#define BATADV_SYSFS_IF_MESH_SUBDIR "mesh"#define BATADV_SYSFS_IF_BAT_SUBDIR "batman_adv" +/** +* BATADV_SYSFS_VLAN_SUBDIR_PREFIX - prefix of the subfolder that will be +* created in the sysfs hierarchy for each VLAN interface. The subfolder will +* be named "BATADV_SYSFS_VLAN_SUBDIR_PREFIX%vid". +*/ +#define BATADV_SYSFS_VLAN_SUBDIR_PREFIX "vlan"struct batadv_attribute {struct attribute attr;
@@ -36,6 +42,10 @@ void batadv_sysfs_del_meshif(struct net_device *dev);int batadv_sysfs_add_hardif (struct kobject **hardif_obj,struct net_device *dev);void batadv_sysfs_del_hardif (struct kobject **hardif_obj); +int batadv_sysfs_add_vlan (struct net_device *dev, +struct batadv_softif_vlan *vlan); +void batadv_sysfs_del_vlan (struct batadv_priv *bat_priv, +struct batadv_softif_vlan *vlan);int batadv_throw_uevent (struct batadv_priv *bat_priv,enum batadv_uev_type type,enum batadv_uev_action action,const char *data);
Signature · 1 line
1.8.4
PATCH 12/18 batman-adv: make the AP isolation attribute VLAN specific
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
AP isolation has to be enabled on one VLAN interface only. This patch moves the AP isolation attribute to the per-vlan interface attribute set, enabling it to have a different value depending on the selected vlan.
--- Documentation/ABI/testing/sysfs-class-net-mesh | 5 +++-- net/batman-adv/soft-interface.c | 6 ++++-- net/batman-adv/sysfs.c | 5 +++-- net/batman-adv/translation-table.c | 27 +++++++++++++++++++------- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 4 ++-- 6 files changed, 33 insertions(+), 16 deletions(-)
Documentation/ABI/testing/sysfs-class-net-mesh +3 -2
@@ -6,13 +6,14 @@ Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not. -What: /sys/class/net/<mesh_iface>/mesh/ap_isolation +What: /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation Date: May 2011 Contact: Antonio Quartulli <[email protected]> Description: Indicates whether the data traffic going from a wireless client to another wireless client will be - silently dropped. + silently dropped. <vlan_subdir> is empty when referring + to the untagged lan. What: /sys/class/net/<mesh_iface>/mesh/bonding Date: June 2010
net/batman-adv/soft-interface.c +4 -2
@@ -381,7 +381,8 @@ void batadv_interface_rx(struct net_device *soft_iface,batadv_tt_add_temporary_global_entry (bat_priv, orig_node, ethhdr->h_source, vid); -if (batadv_is_ap_isolated (bat_priv, ethhdr->h_source, ethhdr->h_dest)) +if (batadv_is_ap_isolated (bat_priv, ethhdr->h_source, ethhdr->h_dest, + vid)) goto dropped;netif_rx (skb);
@@ -458,6 +459,8 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) vlan->vid = vid;atomic_set (&vlan->refcount,1 ); +atomic_set (&vlan->ap_isolation,0 ); + err =batadv_sysfs_add_vlan (bat_priv->soft_iface, vlan);if (err) {kfree (vlan);
@@ -657,7 +660,6 @@ static int batadv_softif_init_late(struct net_device *dev)#ifdef CONFIG_BATMAN_ADV_DAT atomic_set (&bat_priv->distributed_arp_table,1 );#endif -atomic_set (&bat_priv->ap_isolation,0 );atomic_set (&bat_priv->gw_mode,BATADV_GW_MODE_OFF );atomic_set (&bat_priv->gw_sel_class,20 );atomic_set (&bat_priv->gw.bandwidth_down,100 );
net/batman-adv/sysfs.c +3 -2
@@ -453,7 +453,6 @@ BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, batadv_dat_status_update);#endif BATADV_ATTR_SIF_BOOL (fragmentation,S_IRUGO |S_IWUSR , batadv_update_min_mtu); -BATADV_ATTR_SIF_BOOL (ap_isolation,S_IRUGO |S_IWUSR ,NULL ); static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL); static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode, batadv_store_gw_mode);
@@ -483,7 +482,6 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { &batadv_attr_distributed_arp_table, #endif &batadv_attr_fragmentation, - &batadv_attr_ap_isolation, &batadv_attr_routing_algo, &batadv_attr_gw_mode, &batadv_attr_orig_interval,
@@ -499,10 +497,13 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { NULL, }; +BATADV_ATTR_VLAN_BOOL (ap_isolation,S_IRUGO |S_IWUSR ,NULL ); +/** * batadv_vlan_attrs - array of vlan specific sysfs attributes */ static struct batadv_attribute *batadv_vlan_attrs[] = { + &batadv_attr_vlan_ap_isolation,NULL , };
net/batman-adv/translation-table.c +20 -7
@@ -1482,8 +1482,19 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,struct batadv_tt_global_entry *tt_global_entry =NULL ;struct batadv_orig_node *orig_node =NULL ;struct batadv_tt_orig_list_entry *best_entry; +bool ap_isolation_enabled = false; +struct batadv_softif_vlan *vlan; -if (src &&atomic_read (&bat_priv->ap_isolation)) { +/* if the AP isolation is requested on a VLAN, then check for its +* setting in the proper VLAN private data structure +*/ + vlan =batadv_softif_vlan_get (bat_priv, vid); +if (vlan) { + ap_isolation_enabled =atomic_read (&vlan->ap_isolation); +batadv_softif_vlan_free_ref (vlan); + } + +if (src && ap_isolation_enabled) { tt_local_entry =batadv_tt_local_hash_find (bat_priv, src, vid);if (!tt_local_entry || (tt_local_entry->common.flags &BATADV_TT_CLIENT_PENDING ))
@@ -2547,22 +2558,22 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) }bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,uint8_t *src, -uint8_t *dst) +uint8_t *dst,unsigned short vid) {struct batadv_tt_local_entry *tt_local_entry =NULL ;struct batadv_tt_global_entry *tt_global_entry =NULL ; +struct batadv_softif_vlan *vlan;bool ret = false; -if (!atomic_read (&bat_priv->ap_isolation)) + vlan =batadv_softif_vlan_get (bat_priv, vid); +if (!vlan || !atomic_read (&vlan->ap_isolation)) goto out; - tt_local_entry =batadv_tt_local_hash_find (bat_priv, dst, -BATADV_NO_FLAGS ); + tt_local_entry =batadv_tt_local_hash_find (bat_priv, dst, vid);if (!tt_local_entry) goto out; - tt_global_entry =batadv_tt_global_hash_find (bat_priv, src, -BATADV_NO_FLAGS ); + tt_global_entry =batadv_tt_global_hash_find (bat_priv, src, vid);if (!tt_global_entry) goto out;
@@ -2572,6 +2583,8 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src, ret = true; out: +if (vlan) +batadv_softif_vlan_free_ref (vlan);if (tt_global_entry)batadv_tt_global_entry_free_ref (tt_global_entry);if (tt_local_entry)
net/batman-adv/translation-table.h +1 -1
@@ -39,7 +39,7 @@ void batadv_tt_free(struct batadv_priv *bat_priv);bool batadv_is_my_client (struct batadv_priv *bat_priv,const uint8_t *addr,unsigned short vid);bool batadv_is_ap_isolated (struct batadv_priv *bat_priv,uint8_t *src, -uint8_t *dst); +uint8_t *dst,unsigned short vid);void batadv_tt_local_commit_changes (struct batadv_priv *bat_priv);bool batadv_tt_global_client_is_roaming (struct batadv_priv *bat_priv,uint8_t *addr,unsigned short vid);
net/batman-adv/types.h +2 -2
@@ -534,6 +534,7 @@ struct batadv_priv_nc {* struct batadv_softif_vlan - per VLAN attributes set * @vid: VLAN identifier * @kobj: kobject for sysfs vlan subdirectory +* @ap_isolation: AP isolation state * @list: list node for bat_priv::softif_vlan_list * @refcount: number of context where this object is currently in use * @rcu: struct used for freeing in a RCU-safe manner
@@ -541,6 +542,7 @@ struct batadv_priv_nc {struct batadv_softif_vlan {unsigned short vid;struct kobject *kobj; +atomic_t ap_isolation;/* boolean */ struct hlist_node list;atomic_t refcount;struct rcu_head rcu;
@@ -556,7 +558,6 @@ struct batadv_softif_vlan {* @bonding: bool indicating whether traffic bonding is enabled * @fragmentation: bool indicating whether traffic fragmentation is enabled * @frag_seqno: incremental counter to identify chains of egress fragments -* @ap_isolation: bool indicating whether ap isolation is enabled * @bridge_loop_avoidance: bool indicating whether bridge loop avoidance is * enabled * @distributed_arp_table: bool indicating whether distributed ARP table is
@@ -603,7 +604,6 @@ struct batadv_priv {atomic_t bonding;atomic_t fragmentation;atomic_t frag_seqno; -atomic_t ap_isolation;#ifdef CONFIG_BATMAN_ADV_BLA atomic_t bridge_loop_avoidance;#endif
Signature · 1 line
1.8.4
PATCH 13/18 batman-adv: refine API calls for unicast transmissions of SKBs
In reply to Antonio QuartulliFrom: Linus Lüssing <[email protected]>
With this patch the functions batadv_send_skb_unicast() and batadv_send_skb_unicast_4addr() are further refined into batadv_send_skb_via_tt(), batadv_send_skb_via_tt_4addr() and batadv_send_skb_via_gw(). This way we avoid any "guessing" about where to send a packet in the unicast forwarding methods and let the callers decide.
This is going to be useful for the upcoming multicast related patches in particular.
Further, the return values were polished a little to use the more appropriate NET_XMIT_* defines.
--- net/batman-adv/distributed-arp-table.c | 10 ++-- net/batman-adv/send.c | 87 ++++++++++++++++++++++++++-------- net/batman-adv/send.h | 51 ++++++++++++-------- net/batman-adv/soft-interface.c | 8 +++- 4 files changed, 108 insertions(+), 48 deletions(-)
net/batman-adv/distributed-arp-table.c +5 -5
@@ -1037,13 +1037,13 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,* that a node not using the 4addr packet format doesn't support it. */ if (hdr_size ==sizeof (struct batadv_unicast_4addr_packet )) - err =batadv_send_skb_unicast_4addr (bat_priv, skb_new, -BATADV_P_DAT_CACHE_REPLY , - vid); + err =batadv_send_skb_via_tt_4addr (bat_priv, skb_new, +BATADV_P_DAT_CACHE_REPLY , + vid);else - err =batadv_send_skb_unicast (bat_priv, skb_new, vid); + err =batadv_send_skb_via_tt (bat_priv, skb_new, vid); -if (!err) { +if (err !=NET_XMIT_DROP ) {batadv_inc_counter (bat_priv,BATADV_CNT_DAT_CACHED_REPLY_TX ); ret = true; }
net/batman-adv/send.c +67 -20
118 lines not on this page · raw message
net/batman-adv/send.h +30 -21
75 lines not on this page · raw message
net/batman-adv/soft-interface.c +6 -2
@@ -298,8 +298,12 @@ static int batadv_interface_tx(struct sk_buff *skb,batadv_dat_snoop_outgoing_arp_reply (bat_priv, skb); - ret =batadv_send_skb_unicast (bat_priv, skb, vid); -if (ret !=0 ) +if (is_multicast_ether_addr (ethhdr->h_dest)) + ret =batadv_send_skb_via_gw (bat_priv, skb, vid); +else + ret =batadv_send_skb_via_tt (bat_priv, skb, vid); + +if (ret ==NET_XMIT_DROP ) goto dropped_freed; }
Signature · 1 line
1.8.4
PATCH 14/18 batman-adv: remove bogus comment
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
this comment refers to the old batmand codebase and does not make sense anymore. Remove it
--- net/batman-adv/gateway_client.c | 5 ----- 1 file changed, 5 deletions(-)
net/batman-adv/gateway_client.c +0 -5
@@ -221,11 +221,6 @@ void batadv_gw_election(struct batadv_priv *bat_priv)struct batadv_neigh_node *router =NULL ;char gw_addr[18 ] = {'\0' }; -/* The batman daemon checks here if we already passed a full originator -* cycle in order to make sure we don't choose the first gateway we -* hear about. This check is based on the daemon's uptime which we -* don't have. -*/ if (atomic_read (&bat_priv->gw_mode) !=BATADV_GW_MODE_CLIENT ) goto out;
Signature · 1 line
1.8.4
PATCH 15/18 batman-adv: lock around TT operations to avoid sending inconsistent data
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
A TT response may be prepared and sent while the local or global translation table is getting updated.
The worst case is when one of the tables is accessed after its content has been recently updated but the metadata (TTVN/CRC) has not yet. In this case the reader will get a table content which does not match the TTVN/CRC. This will lead to an inconsistent state and so to a TT recovery.
To avoid entering this situation, put a lock around those TT operations recomputing the metadata and around the TT Response creation (the latter is the only reader that accesses the metadata together with the table).
--- net/batman-adv/main.c | 1 + net/batman-adv/originator.c | 1 + net/batman-adv/translation-table.c | 37 ++++++++++++++++++++++++++----------- net/batman-adv/types.h | 13 +++++++++++++ 4 files changed, 41 insertions(+), 11 deletions(-)
net/batman-adv/main.c +1 -0
@@ -110,6 +110,7 @@ int batadv_mesh_init(struct net_device *soft_iface)spin_lock_init (&bat_priv->tt.req_list_lock);spin_lock_init (&bat_priv->tt.roam_list_lock);spin_lock_init (&bat_priv->tt.last_changeset_lock); +spin_lock_init (&bat_priv->tt.commit_lock);spin_lock_init (&bat_priv->gw.list_lock);spin_lock_init (&bat_priv->tvlv.container_list_lock);spin_lock_init (&bat_priv->tvlv.handler_list_lock);
net/batman-adv/originator.c +1 -0
@@ -239,6 +239,7 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,spin_lock_init (&orig_node->bcast_seqno_lock);spin_lock_init (&orig_node->neigh_list_lock);spin_lock_init (&orig_node->tt_buff_lock); +spin_lock_init (&orig_node->tt_lock);batadv_nc_init_orig (orig_node);
net/batman-adv/translation-table.c +26 -11
@@ -2019,6 +2019,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, req_src, tt_data->ttvn, (tt_data->flags & BATADV_TT_FULL_TABLE ? 'F' : '.')); +spin_lock_bh (&bat_priv->tt.commit_lock); my_ttvn = (uint8_t )atomic_read (&bat_priv->tt.vn); req_ttvn = tt_data->ttvn;
@@ -2091,6 +2092,7 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, unlock:spin_unlock_bh (&bat_priv->tt.last_changeset_lock); out: +spin_unlock_bh (&bat_priv->tt.commit_lock);if (orig_node)batadv_orig_node_free_ref (orig_node);if (primary_if)
@@ -2259,6 +2261,8 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv,if (!orig_node) goto out; +spin_lock_bh (&orig_node->tt_lock); +if (tt_data->flags &BATADV_TT_FULL_TABLE ) {batadv_tt_fill_gtable (bat_priv, tt_data, resp_src, num_entries); }else {
@@ -2267,18 +2271,20 @@ static void batadv_handle_tt_response(struct batadv_priv *bat_priv, tt_data->ttvn, tt_change); } -/* Delete the tt_req_node from pending tt_requests list */ -spin_lock_bh (&bat_priv->tt.req_list_lock); -list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { -if (!batadv_compare_eth (node->addr, resp_src)) -continue ; -list_del (&node->list); -kfree (node); - } -spin_unlock_bh (&bat_priv->tt.req_list_lock); -/* Recalculate the CRC for this orig_node and store it */ orig_node->tt_crc =batadv_tt_global_crc (bat_priv, orig_node); + +spin_unlock_bh (&orig_node->tt_lock); + +/* Delete the tt_req_node from pending tt_requests list */ +spin_lock_bh (&bat_priv->tt.req_list_lock); +list_for_each_entry_safe (node, safe, &bat_priv->tt.req_list, list) { +if (!batadv_compare_eth (node->addr, resp_src)) +continue ; +list_del (&node->list); +kfree (node); + } +spin_unlock_bh (&bat_priv->tt.req_list_lock); out:if (orig_node)batadv_orig_node_free_ref (orig_node);
@@ -2532,10 +2538,12 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) {uint16_t changed_num =0 ; +spin_lock_bh (&bat_priv->tt.commit_lock); +if (atomic_read (&bat_priv->tt.local_changes) <1 ) {if (!batadv_atomic_dec_not_zero (&bat_priv->tt.ogm_append_cnt))batadv_tt_tvlv_container_update (bat_priv); -return ; + goto out; } changed_num = batadv_tt_set_flags(bat_priv->tt.local_hash,
@@ -2555,6 +2563,9 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv)/* reset the sending counter */ atomic_set (&bat_priv->tt.ogm_append_cnt,BATADV_TT_OGM_APPEND_MAX );batadv_tt_tvlv_container_update (bat_priv); + +out: +spin_unlock_bh (&bat_priv->tt.commit_lock); } bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src,
@@ -2631,6 +2642,8 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, goto request_table; } +spin_lock_bh (&orig_node->tt_lock); + tt_change = (struct batadv_tvlv_tt_change *)tt_buff;batadv_tt_update_changes (bat_priv, orig_node, tt_num_changes, ttvn, tt_change);
@@ -2641,6 +2654,8 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv,*/ orig_node->tt_crc =batadv_tt_global_crc (bat_priv, orig_node); +spin_unlock_bh (&orig_node->tt_lock); +/* The ttvn alone is not enough to guarantee consistency * because a single value could represent different states * (due to the wrap around). Thus a node has to check whether
net/batman-adv/types.h +13 -0
@@ -128,6 +128,10 @@ struct batadv_frag_list_entry {* @tt_size: number of global TT entries announced by the orig node * @tt_initialised: bool keeping track of whether or not this node have received * any translation table information from the orig node yet +* @tt_lock: prevents from updating the table while reading it. Table update is +* made up by two operations (data structure update and metdata -CRC/TTVN- +* recalculation) and they have to be executed atomically in order to avoid +* another thread to read the table/metadata between those. * @last_real_seqno: last and best known sequence number * @last_ttl: ttl of last received packet * @bcast_bits: bitfield containing the info which payload broadcast originated
@@ -171,6 +175,8 @@ struct batadv_orig_node {spinlock_t tt_buff_lock;/* protects tt_buff & tt_buff_len */ atomic_t tt_size;bool tt_initialised; +/* prevents from changing the table while reading it */ +spinlock_t tt_lock;uint32_t last_real_seqno;uint8_t last_ttl;DECLARE_BITMAP (bcast_bits,BATADV_TQ_LOCAL_WINDOW_SIZE );
@@ -388,6 +394,11 @@ enum batadv_counters {* @last_changeset: last tt changeset this host has generated * @last_changeset_len: length of last tt changeset this host has generated * @last_changeset_lock: lock protecting last_changeset & last_changeset_len +* @commit_lock: prevents from executing a local TT commit while reading the +* local table. The local TT commit is made up by two operations (data +* structure update and metdata -CRC/TTVN- recalculation) and they have to be +* executed atomically in order to avoid another thread to read the +* table/metadata between those. * @work: work queue callback item for translation table purging */ struct batadv_priv_tt {
@@ -408,6 +419,8 @@ struct batadv_priv_tt {int16_t last_changeset_len;/* protects last_changeset & last_changeset_len */ spinlock_t last_changeset_lock; +/* prevents from executing a commit while reading the table */ +spinlock_t commit_lock;struct delayed_work work; };
Signature · 1 line
1.8.4
PATCH 16/18 batman-adv: make the TT CRC logic VLAN specific
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
This change allows nodes to handle the TT table on a per-VLAN basis. This is needed because nodes may have to store only some of the global entries advertised by another node.
In this scenario such nodes would re-create only a partial global table and would not be able to compute a correct CRC anymore.
This patch splits the logic and introduces one CRC per VLAN. In this way a node fetching only some entries belonging to some VLANs is still able to compute the needed CRCs and still check the table correctness.
With this patch the shape of the TVLV-TT is changed too because now a node needs to advertise all the CRCs of all the VLANs that it is wired to.
The debug output of the local Translation Table now shows the CRC along with each entry since there is not a common value for the entire table anymore.
--- net/batman-adv/originator.c | 101 +++++- net/batman-adv/originator.h | 7 + net/batman-adv/packet.h | 18 +- net/batman-adv/translation-table.c | 720 +++++++++++++++++++++++++++++-------- net/batman-adv/types.h | 41 ++- 5 files changed, 730 insertions(+), 157 deletions(-)
net/batman-adv/originator.c +98 -3
@@ -44,6 +44,88 @@ static int batadv_compare_orig(const struct hlist_node *node, const void *data2)return (memcmp (data1, data2,ETH_ALEN ) ==0 ?1 :0 ); } +/** +* batadv_orig_node_vlan_get - get an orig_node_vlan object +* @orig_node: the originator serving the VLAN +* @vid: the VLAN identifier +* +* Returns the vlan object identified by vid and belonging to orig_node or NULL +* if it does not exist. +*/ +struct batadv_orig_node_vlan * +batadv_orig_node_vlan_get (struct batadv_orig_node *orig_node, +unsigned short vid) +{ +struct batadv_orig_node_vlan *vlan =NULL , *tmp; + +rcu_read_lock (); +list_for_each_entry_rcu (tmp, &orig_node->vlan_list, list) { +if (tmp->vid != vid) +continue ; + +if (!atomic_inc_not_zero (&tmp->refcount)) +continue ; + + vlan = tmp; + +break ; + } +rcu_read_unlock (); + +return vlan; +} + +/** +* batadv_orig_node_vlan_new - search and possibly create an orig_node_vlan +* object +* @orig_node: the originator serving the VLAN +* @vid: the VLAN identifier +* +* Returns NULL in case of failure or the vlan object identified by vid and +* belonging to orig_node otherwise. The object is created and added to the list +* if it does not exist. +* +* The object is returned with refcounter increased by 1. +*/ +struct batadv_orig_node_vlan * +batadv_orig_node_vlan_new (struct batadv_orig_node *orig_node, +unsigned short vid) +{ +struct batadv_orig_node_vlan *vlan; + +spin_lock_bh (&orig_node->vlan_list_lock); + +/* first look if an object for this vid already exists */ + vlan =batadv_orig_node_vlan_get (orig_node, vid); +if (vlan) + goto out; + + vlan =kzalloc (sizeof (*vlan),GFP_ATOMIC ); +if (!vlan) + goto out; + +atomic_set (&vlan->refcount,2 ); + vlan->vid = vid; + +list_add_rcu (&vlan->list, &orig_node->vlan_list); + +out: +spin_unlock_bh (&orig_node->vlan_list_lock); + +return vlan; +} + +/** +* batadv_orig_node_vlan_free_ref - decrement the refcounter and possibly free +* the originator-vlan object +* @orig_vlan: the originator-vlan object to release +*/ +void batadv_orig_node_vlan_free_ref (struct batadv_orig_node_vlan *orig_vlan) +{ +if (atomic_dec_and_test (&orig_vlan->refcount)) +kfree_rcu (orig_vlan, rcu); +} +int batadv_originator_init (struct batadv_priv *bat_priv) {if (bat_priv->orig_hash)
@@ -218,6 +300,7 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv, const uint8_t *addr) {struct batadv_orig_node *orig_node; +struct batadv_orig_node_vlan *vlan;int size, i;int hash_added;unsigned long reset_time;
@@ -235,11 +318,13 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,INIT_HLIST_HEAD (&orig_node->neigh_list);INIT_LIST_HEAD (&orig_node->bond_list); +INIT_LIST_HEAD (&orig_node->vlan_list);spin_lock_init (&orig_node->ogm_cnt_lock);spin_lock_init (&orig_node->bcast_seqno_lock);spin_lock_init (&orig_node->neigh_list_lock);spin_lock_init (&orig_node->tt_buff_lock);spin_lock_init (&orig_node->tt_lock); +spin_lock_init (&orig_node->vlan_list_lock);batadv_nc_init_orig (orig_node);
@@ -251,22 +336,30 @@ struct batadv_orig_node *batadv_get_orig_node(struct batadv_priv *bat_priv,memcpy (orig_node->orig, addr,ETH_ALEN );batadv_dat_init_orig_node_addr (orig_node); orig_node->router =NULL ; - orig_node->tt_crc =0 ;atomic_set (&orig_node->last_ttvn,0 ); orig_node->tt_buff =NULL ; orig_node->tt_buff_len =0 ; -atomic_set (&orig_node->tt_size,0 ); reset_time = jiffies -1 -msecs_to_jiffies (BATADV_RESET_PROTECTION_MS ); orig_node->bcast_seqno_reset = reset_time; orig_node->batman_seqno_reset = reset_time;atomic_set (&orig_node->bond_candidates,0 ); +/* create a vlan object for the "untagged" LAN */ + vlan =batadv_orig_node_vlan_new (orig_node,BATADV_NO_FLAGS ); +if (!vlan) + goto free_orig_node; +/* batadv_orig_node_vlan_new() increases the refcounter. +* Immediately release vlan since it is not needed anymore in this +* context +*/ +batadv_orig_node_vlan_free_ref (vlan); + size = bat_priv->num_ifaces *sizeof (unsigned long ) *BATADV_NUM_WORDS ; orig_node->bcast_own =kzalloc (size,GFP_ATOMIC );if (!orig_node->bcast_own) - goto free_orig_node; + goto free_vlan; size = bat_priv->num_ifaces *sizeof (uint8_t ); orig_node->bcast_own_sum =kzalloc (size,GFP_ATOMIC );
@@ -291,6 +384,8 @@ free_bcast_own_sum:kfree (orig_node->bcast_own_sum); free_bcast_own:kfree (orig_node->bcast_own); +free_vlan: +batadv_orig_node_vlan_free_ref (vlan); free_orig_node:kfree (orig_node);return NULL ;
net/batman-adv/originator.h +7 -0
@@ -40,6 +40,13 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, int max_if_num);int batadv_orig_hash_del_if (struct batadv_hard_iface *hard_iface,int max_if_num); +struct batadv_orig_node_vlan * +batadv_orig_node_vlan_new (struct batadv_orig_node *orig_node, +unsigned short vid); +struct batadv_orig_node_vlan * +batadv_orig_node_vlan_get (struct batadv_orig_node *orig_node, +unsigned short vid); +void batadv_orig_node_vlan_free_ref (struct batadv_orig_node_vlan *orig_vlan);/* hashfunction to choose an entry in a hash table of given size
net/batman-adv/packet.h +15 -3
@@ -391,14 +391,26 @@ struct batadv_tvlv_gateway_data {* struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container * @flags: translation table flags (see batadv_tt_data_flags) * @ttvn: translation table version number -* @reserved: field reserved for future use -* @crc: crc32 checksum of the local translation table +* @vlan_num: number of announced VLANs. In the TVLV this struct is followed by +* one batadv_tvlv_tt_vlan_data object per announced vlan */ struct batadv_tvlv_tt_data {uint8_t flags;uint8_t ttvn; +__be16 num_vlan; +}; + +/** +* struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through +* the tt tvlv container +* @crc: crc32 checksum of the entries belonging to this vlan +* @vid: vlan identifier +* @reserved: unused, useful for alignment purposes +*/ +struct batadv_tvlv_tt_vlan_data { +__be32 crc; +__be16 vid;uint16_t reserved; -__be32 crc; };/**
net/batman-adv/translation-table.c +577 -143
1,177 lines not on this page · raw message
net/batman-adv/types.h +33 -8
102 lines not on this page · raw message
Signature · 1 line
1.8.4
PATCH 17/18 batman-adv: make the TT global purge routine VLAN specific
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
Instead of unconditionally removing all the TT entries served by a given originator, make tt_global_orig_del() remove only entries matching a given VLAN identifier provided as argument.
If such argument is negative all the global entries served by the originator are removed.
This change is used into the BLA code to purge entries served by a newly discovered Backbone node, but limiting the operation only to those connected to the VLAN where the backbone has been discovered.
--- net/batman-adv/bridge_loop_avoidance.c | 4 ++-- net/batman-adv/originator.c | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/translation-table.c | 17 ++++++++++++++++- net/batman-adv/translation-table.h | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +2 -2
@@ -411,10 +411,10 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,return NULL ; } -/* this is a gateway now, remove any tt entries */ +/* this is a gateway now, remove any TT entry on this VLAN */ orig_node =batadv_orig_hash_find (bat_priv, orig);if (orig_node) { -batadv_tt_global_del_orig (bat_priv, orig_node, +batadv_tt_global_del_orig (bat_priv, orig_node, vid,"became a backbone gateway" );batadv_orig_node_free_ref (orig_node); }
net/batman-adv/originator.c +1 -1
@@ -230,7 +230,7 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu)batadv_frag_purge_orig (orig_node,NULL ); -batadv_tt_global_del_orig (orig_node->bat_priv, orig_node, +batadv_tt_global_del_orig (orig_node->bat_priv, orig_node,-1 ,"originator timed out" );kfree (orig_node->tt_buff);
net/batman-adv/routing.c +1 -1
@@ -47,7 +47,7 @@ static void _batadv_update_route(struct batadv_priv *bat_priv,if ((curr_router) && (!neigh_node)) {batadv_dbg (BATADV_DBG_ROUTES , bat_priv,"Deleting route towards: %pM\n" , orig_node->orig); -batadv_tt_global_del_orig (bat_priv, orig_node, +batadv_tt_global_del_orig (bat_priv, orig_node,-1 ,"Deleted route towards originator" );/* route added */
net/batman-adv/translation-table.c +16 -1
@@ -1581,8 +1581,18 @@ out:batadv_tt_local_entry_free_ref (local_entry); } +/** +* batadv_tt_global_del_orig - remove all the TT global entries belonging to the +* given originator matching the provided vid +* @bat_priv: the bat priv with all the soft interface information +* @orig_node: the originator owning the entries to remove +* @match_vid: the VLAN identifier to match. If negative all the entries will be +* removed +* @message: debug message to print as "reason" +*/ void batadv_tt_global_del_orig (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node, +int32_t match_vid,const char *message) {struct batadv_tt_global_entry *tt_global;
@@ -1604,6 +1614,10 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,spin_lock_bh (list_lock);hlist_for_each_entry_safe (tt_common_entry, safe, head, hash_entry) { +/* remove only matching entries */ +if (match_vid >=0 && tt_common_entry->vid != match_vid) +continue ; + tt_global =container_of (tt_common_entry, struct batadv_tt_global_entry, common);
@@ -2570,7 +2584,8 @@ static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv, goto out;/* Purge the old table first.. */ -batadv_tt_global_del_orig (bat_priv, orig_node,"Received full table" ); +batadv_tt_global_del_orig (bat_priv, orig_node,-1 , +"Received full table" );_batadv_tt_update_changes (bat_priv, orig_node, tt_change, num_entries, ttvn);
net/batman-adv/translation-table.h +1 -1
@@ -30,7 +30,7 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset);int batadv_tt_global_seq_print_text (struct seq_file *seq,void *offset);void batadv_tt_global_del_orig (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node, -const char *message); +int32_t match_vid,const char *message); struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, const uint8_t *src, const uint8_t *addr,
Signature · 1 line
1.8.4
PATCH 18/18 batman-adv: make the backbone gw check VLAN specific
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
The backbone gw check has to be VLAN specific so that code using it can specify VID where the check has to be done.
In the TT code, the check has been moved into the tt_global_add() function so that it can be performed on a per-entry basis instead of ignoring all the TT data received from another backbone node. Only TT global entries belonging to the VLAN where the backbone node is connected to are skipped.
All the other spots where the TT code was checking whether a node is a backbone have been removed.
Moreover, batadv_bla_is_backbone_gw_orig() now returns bool since it used to return only 1 or 0.
--- net/batman-adv/bridge_loop_avoidance.c | 19 +++++++++------- net/batman-adv/bridge_loop_avoidance.h | 10 +++++---- net/batman-adv/translation-table.c | 41 +++++++++------------------------- 3 files changed, 27 insertions(+), 43 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +11 -8
@@ -1315,12 +1315,14 @@ out:/* @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address +* @vid: VLAN identifier * -* check if the originator is a gateway for any VLAN ID. +* Check if the originator is a gateway for the VLAN identified by vid. * -* returns 1 if it is found, 0 otherwise +* Returns true if orig is a backbone for this vid, false otherwise. */ -int batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,uint8_t *orig) +bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,uint8_t *orig, +unsigned short vid) {struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;struct hlist_head *head;
@@ -1328,25 +1330,26 @@ int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig)int i;if (!atomic_read (&bat_priv->bridge_loop_avoidance)) -return 0 ; +return false;if (!hash) -return 0 ; +return false;for (i =0 ; i < hash->size; i++) { head = &hash->table[i];rcu_read_lock ();hlist_for_each_entry_rcu (backbone_gw, head, hash_entry) { -if (batadv_compare_eth (backbone_gw->orig, orig)) { +if (batadv_compare_eth (backbone_gw->orig, orig) && + backbone_gw->vid == vid) {rcu_read_unlock (); -return 1 ; +return true; } }rcu_read_unlock (); } -return 0 ; +return false; }
net/batman-adv/bridge_loop_avoidance.h +6 -4
@@ -30,7 +30,8 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb,int batadv_bla_claim_table_seq_print_text (struct seq_file *seq,void *offset);int batadv_bla_backbone_table_seq_print_text (struct seq_file *seq,void *offset); -int batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,uint8_t *orig); +bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv,uint8_t *orig, +unsigned short vid);int batadv_bla_check_bcast_duplist (struct batadv_priv *bat_priv,struct sk_buff *skb); void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
@@ -74,10 +75,11 @@ static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq,return 0 ; } -static inline int batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv, -uint8_t *orig) +static inline bool batadv_bla_is_backbone_gw_orig (struct batadv_priv *bat_priv, +uint8_t *orig, +unsigned short vid) { -return 0 ; +return false; } static inline int
net/batman-adv/translation-table.c +10 -31
92 lines not on this page · raw message
Signature · 1 line
1.8.4
David Miller
maintainerFrom: Antonio Quartulli <[email protected]>
Date: Sun, 20 Oct 2013 00:21:52 +0200
Quoted 1 line
this is another batch intended for net-next/linux-3.13.
Looks good, pulled, thanks a lot Antonio.
Please don't use empty subject lines in the future, lots of sites block such emails and I see all of those bounces as vger postmaster :-/
Re: your mail
Quoted 11 lines · David Miller
From: Antonio Quartulli <[email protected]>
Date: Sun, 20 Oct 2013 00:21:52 +0200Quoted 1 line
this is another batch intended for net-next/linux-3.13.
Looks good, pulled, thanks a lot Antonio.
Please don't use empty subject lines in the future, lots of sites block such emails and I see all of those bounces as vger postmaster :-/
Ops, my bad. I won't do it again in the future!
Thanks a lot David.
Regards,
Signature · 1 line
Antonio Quartulli