pull request for net-next: batman-adv 2021-08-19
Subsystems (4)
Simon Wunderlich
maintainercover pull request for net-next: batman-adv 2021-08-19
Hi Jakub, hi David,
here is a little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit b37a466837393af72fe8bcb8f1436410f3f173f3:
netdevice: add the case if dev is NULL (2021-08-05 13:29:26 +0100)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-pullrequest-20210819
for you to fetch changes up to 808cfdfad57999c85f9ab13499a38d136d032232:
batman-adv: bcast: remove remaining skb-copy calls (2021-08-18 18:39:00 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- update docs about move IRC channel away from freenode, by Sven Eckelmann
- Switch to kstrtox.h for kstrtou64, by Sven Eckelmann
- Update NULL checks, by Sven Eckelmann (2 patches)
- remove remaining skb-copy calls for broadcast packets, by Linus Lüssing
----------------------------------------------------------------
Linus Lüssing (1):
batman-adv: bcast: remove remaining skb-copy calls
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (4):
batman-adv: Move IRC channel to hackint.org
batman-adv: Switch to kstrtox.h for kstrtou64
batman-adv: Check ptr for NULL before reducing its refcnt
batman-adv: Drop NULL check before dropping references
Documentation/networking/batman-adv.rst | 2 +- MAINTAINERS | 2 +- net/batman-adv/bat_iv_ogm.c | 75 ++++++++--------------- net/batman-adv/bat_v.c | 30 ++++------ net/batman-adv/bat_v_elp.c | 9 +-- net/batman-adv/bat_v_ogm.c | 39 ++++-------- net/batman-adv/bridge_loop_avoidance.c | 33 +++++------ net/batman-adv/distributed-arp-table.c | 24 ++++---- net/batman-adv/fragmentation.c | 6 +- net/batman-adv/gateway_client.c | 57 +++++------------- net/batman-adv/gateway_client.h | 16 ++++- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/hard-interface.c | 21 +++---- net/batman-adv/hard-interface.h | 3 + net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/netlink.c | 6 +- net/batman-adv/network-coding.c | 24 ++++---- net/batman-adv/originator.c | 102 +++++--------------------------- net/batman-adv/originator.h | 96 +++++++++++++++++++++++++++--- net/batman-adv/routing.c | 39 ++++-------- net/batman-adv/send.c | 33 ++++++----- net/batman-adv/soft-interface.c | 27 ++------- net/batman-adv/soft-interface.h | 16 ++++- net/batman-adv/tp_meter.c | 27 ++++----- net/batman-adv/translation-table.c | 100 +++++++++++-------------------- net/batman-adv/translation-table.h | 18 +++++- net/batman-adv/tvlv.c | 9 ++- 28 files changed, 364 insertions(+), 456 deletions(-)
Simon Wunderlich
maintainerPATCH 1/6 batman-adv: Start new development cycle
This version will contain all the (major or even only minor) changes for Linux 5.15.
The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0).
--- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/main.h +1 -1
@@ -13,7 +13,7 @@#define BATADV_DRIVER_DEVICE "batman-adv"#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2021.2" +#define BATADV_SOURCE_VERSION "2021.3"#endif /* B.A.T.M.A.N. parameters */
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 2/6 batman-adv: Move IRC channel to hackint.org
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
Due to recent developments around the Freenode.org IRC network, the opinions about the usage of this service shifted dramatically. The majority of the still active users of the #batman channel prefers a move to the hackint.org network.
--- Documentation/networking/batman-adv.rst | 2 +- MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/networking/batman-adv.rst +1 -1
@@ -157,7 +157,7 @@ Contact Please send us comments, experiences, questions, anything :) IRC: - #batman on irc.freenode.org + #batadv on ircs://irc.hackint.org/ Mailing-list: [email protected] (optional subscription at https://lists.open-mesh.org/mailman3/postorius/lists/b.a.t.m.a.n.lists.open-mesh.org/)
MAINTAINERS +1 -1
@@ -3197,7 +3197,7 @@ S: Maintained W: https://www.open-mesh.org/ Q: https://patchwork.open-mesh.org/project/batman/list/ B: https://www.open-mesh.org/projects/batman-adv/issues -C: irc://chat.freenode.net/batman +C: ircs://irc.hackint.org/batadv T: git https://git.open-mesh.org/linux-merge.git F: Documentation/networking/batman-adv.rst F: include/uapi/linux/batadv_packet.h
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerRe: [PATCH 2/6] batman-adv: Move IRC channel to hackint.org
Quoted 8 lines · On Thu, 19 Aug 2021 17:33:30 +0200 Simon Wunderlich wrote:
From: Sven Eckelmann <[email protected]>
Due to recent developments around the Freenode.org IRC network, the opinions about the usage of this service shifted dramatically. The majority of the still active users of the #batman channel prefers a move to the hackint.org network.
Signed-off-by Sven Eckelmann <[email protected]>
This one is missing your sign-off:
Commit 71d41c09f1fa ("batman-adv: Move IRC channel to hackint.org")
committer Signed-off-by missing
author email: [email protected]
committer email: [email protected]
Simon Wunderlich
maintainerPATCH 3/6 batman-adv: Switch to kstrtox.h for kstrtou64
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The commit 4c52729377ea ("kernel.h: split out kstrtox() and simple_strtox() to a separate header") moved the kstrtou64 function to a new header called linux/kstrtox.h.
--- net/batman-adv/gateway_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/gateway_common.c +1 -1
@@ -10,7 +10,7 @@#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> -#include <linux/kernel.h> +#include <linux/kstrtox.h> #include <linux/limits.h> #include <linux/math64.h> #include <linux/netdevice.h>
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 4/6 batman-adv: Check ptr for NULL before reducing its refcnt
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The commit b37a46683739 ("netdevice: add the case if dev is NULL") changed the way how the NULL check for net_devices have to be handled when trying to reduce its reference counter. Before this commit, it was the responsibility of the caller to check whether the object is NULL or not. But it was changed to behave more like kfree. Now the callee has to handle the NULL-case.
The batman-adv code was scanned via cocinelle for similar places. These were changed to use the paradigm
@@
identifier E, T, R, C;
identifier put;
@@
void put(struct T *E)
{
+ if (!E)
+ return;
kref_put(&E->C, R);
}Functions which were used in other sources files were moved to the header to allow the compiler to inline the NULL check and the kref_put call.
--- net/batman-adv/bridge_loop_avoidance.c | 6 ++ net/batman-adv/distributed-arp-table.c | 3 + net/batman-adv/gateway_client.c | 12 +--- net/batman-adv/gateway_client.h | 16 ++++- net/batman-adv/hard-interface.h | 3 + net/batman-adv/network-coding.c | 6 ++ net/batman-adv/originator.c | 72 ++----------------- net/batman-adv/originator.h | 96 ++++++++++++++++++++++++-- net/batman-adv/soft-interface.c | 15 +--- net/batman-adv/soft-interface.h | 16 ++++- net/batman-adv/tp_meter.c | 3 + net/batman-adv/translation-table.c | 22 +++--- net/batman-adv/translation-table.h | 18 ++++- net/batman-adv/tvlv.c | 6 ++ 14 files changed, 181 insertions(+), 113 deletions(-)
net/batman-adv/bridge_loop_avoidance.c +6 -0
@@ -162,6 +162,9 @@ static void batadv_backbone_gw_release(struct kref *ref)*/ static void batadv_backbone_gw_put (struct batadv_bla_backbone_gw *backbone_gw) { +if (!backbone_gw) +return ; +kref_put (&backbone_gw->refcount, batadv_backbone_gw_release); }
@@ -197,6 +200,9 @@ static void batadv_claim_release(struct kref *ref)*/ static void batadv_claim_put (struct batadv_bla_claim *claim) { +if (!claim) +return ; +kref_put (&claim->refcount, batadv_claim_release); }
net/batman-adv/distributed-arp-table.c +3 -0
@@ -127,6 +127,9 @@ static void batadv_dat_entry_release(struct kref *ref)*/ static void batadv_dat_entry_put (struct batadv_dat_entry *dat_entry) { +if (!dat_entry) +return ; +kref_put (&dat_entry->refcount, batadv_dat_entry_release); }
net/batman-adv/gateway_client.c +1 -11
@@ -59,7 +59,7 @@* after rcu grace period * @ref: kref pointer of the gw_node */ -static void batadv_gw_node_release (struct kref *ref) +void batadv_gw_node_release (struct kref *ref) {struct batadv_gw_node *gw_node;
@@ -69,16 +69,6 @@ static void batadv_gw_node_release(struct kref *ref)kfree_rcu (gw_node, rcu); } -/** -* batadv_gw_node_put() - decrement the gw_node refcounter and possibly release -* it -* @gw_node: gateway node to free -*/ -void batadv_gw_node_put (struct batadv_gw_node *gw_node) -{ -kref_put (&gw_node->refcount, batadv_gw_node_release); -} -/** * batadv_gw_get_selected_gw_node() - Get currently selected gateway * @bat_priv: the bat priv with all the soft interface information
net/batman-adv/gateway_client.h +15 -1
@@ -9,6 +9,7 @@#include "main.h" +#include <linux/kref.h> #include <linux/netlink.h> #include <linux/skbuff.h> #include <linux/types.h>
@@ -27,7 +28,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,void batadv_gw_node_delete (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node);void batadv_gw_node_free (struct batadv_priv *bat_priv); -void batadv_gw_node_put (struct batadv_gw_node *gw_node); +void batadv_gw_node_release (struct kref *ref);struct batadv_gw_node *batadv_gw_get_selected_gw_node (struct batadv_priv *bat_priv);int batadv_gw_dump (struct sk_buff *msg,struct netlink_callback *cb);
@@ -38,4 +39,17 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len,struct batadv_gw_node *batadv_gw_node_get (struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node); +/** +* batadv_gw_node_put() - decrement the gw_node refcounter and possibly release +* it +* @gw_node: gateway node to free +*/ +static inline void batadv_gw_node_put (struct batadv_gw_node *gw_node) +{ +if (!gw_node) +return ; + +kref_put (&gw_node->refcount, batadv_gw_node_release); +} +#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
net/batman-adv/hard-interface.h +3 -0
@@ -89,6 +89,9 @@ int batadv_hardif_no_broadcast(struct batadv_hard_iface *if_outgoing,*/ static inline void batadv_hardif_put (struct batadv_hard_iface *hard_iface) { +if (!hard_iface) +return ; +kref_put (&hard_iface->refcount, batadv_hardif_release); }
net/batman-adv/network-coding.c +6 -0
@@ -217,6 +217,9 @@ static void batadv_nc_node_release(struct kref *ref)*/ static void batadv_nc_node_put (struct batadv_nc_node *nc_node) { +if (!nc_node) +return ; +kref_put (&nc_node->refcount, batadv_nc_node_release); }
@@ -241,6 +244,9 @@ static void batadv_nc_path_release(struct kref *ref)*/ static void batadv_nc_path_put (struct batadv_nc_path *nc_path) { +if (!nc_path) +return ; +kref_put (&nc_path->refcount, batadv_nc_path_release); }
net/batman-adv/originator.c +6 -66
142 lines not on this page · raw message
net/batman-adv/originator.h +89 -7
139 lines not on this page · raw message
net/batman-adv/soft-interface.c +1 -14
@@ -501,7 +501,7 @@ void batadv_interface_rx(struct net_device *soft_iface,* after rcu grace period * @ref: kref pointer of the vlan object */ -static void batadv_softif_vlan_release (struct kref *ref) +void batadv_softif_vlan_release (struct kref *ref) {struct batadv_softif_vlan *vlan;
@@ -514,19 +514,6 @@ static void batadv_softif_vlan_release(struct kref *ref)kfree_rcu (vlan, rcu); } -/** -* batadv_softif_vlan_put() - decrease the vlan object refcounter and -* possibly release it -* @vlan: the vlan object to release -*/ -void batadv_softif_vlan_put (struct batadv_softif_vlan *vlan) -{ -if (!vlan) -return ; - -kref_put (&vlan->refcount, batadv_softif_vlan_release); -} -/** * batadv_softif_vlan_get() - get the vlan object for a specific vid * @bat_priv: the bat priv with all the soft interface information
net/batman-adv/soft-interface.h +15 -1
@@ -9,6 +9,7 @@#include "main.h" +#include <linux/kref.h> #include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/types.h>
@@ -21,8 +22,21 @@ void batadv_interface_rx(struct net_device *soft_iface,bool 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_put (struct batadv_softif_vlan *softif_vlan); +void batadv_softif_vlan_release (struct kref *ref);struct batadv_softif_vlan *batadv_softif_vlan_get (struct batadv_priv *bat_priv,unsigned short vid); +/** +* batadv_softif_vlan_put() - decrease the vlan object refcounter and +* possibly release it +* @vlan: the vlan object to release +*/ +static inline void batadv_softif_vlan_put (struct batadv_softif_vlan *vlan) +{ +if (!vlan) +return ; + +kref_put (&vlan->refcount, batadv_softif_vlan_release); +} +#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
net/batman-adv/tp_meter.c +3 -0
@@ -358,6 +358,9 @@ static void batadv_tp_vars_release(struct kref *ref)*/ static void batadv_tp_vars_put (struct batadv_tp_vars *tp_vars) { +if (!tp_vars) +return ; +kref_put (&tp_vars->refcount, batadv_tp_vars_release); }
net/batman-adv/translation-table.c +10 -12
@@ -247,6 +247,9 @@ static void batadv_tt_local_entry_release(struct kref *ref)static void batadv_tt_local_entry_put (struct batadv_tt_local_entry *tt_local_entry) { +if (!tt_local_entry) +return ; +kref_put (&tt_local_entry->common.refcount, batadv_tt_local_entry_release); }
@@ -270,7 +273,7 @@ static void batadv_tt_global_entry_free_rcu(struct rcu_head *rcu)* queue for free after rcu grace period * @ref: kref pointer of the nc_node */ -static void batadv_tt_global_entry_release (struct kref *ref) +void batadv_tt_global_entry_release (struct kref *ref) {struct batadv_tt_global_entry *tt_global_entry;
@@ -282,17 +285,6 @@ static void batadv_tt_global_entry_release(struct kref *ref)call_rcu (&tt_global_entry->common.rcu, batadv_tt_global_entry_free_rcu); } -/** -* batadv_tt_global_entry_put() - decrement the tt_global_entry refcounter and -* possibly release it -* @tt_global_entry: tt_global_entry to be free'd -*/ -void batadv_tt_global_entry_put (struct batadv_tt_global_entry *tt_global_entry) -{ -kref_put (&tt_global_entry->common.refcount, - batadv_tt_global_entry_release); -} -/** * batadv_tt_global_hash_count() - count the number of orig entries * @bat_priv: the bat priv with all the soft interface information
@@ -452,6 +444,9 @@ static void batadv_tt_orig_list_entry_release(struct kref *ref)static void batadv_tt_orig_list_entry_put (struct batadv_tt_orig_list_entry *orig_entry) { +if (!orig_entry) +return ; +kref_put (&orig_entry->refcount, batadv_tt_orig_list_entry_release); }
@@ -2603,6 +2598,9 @@ static void batadv_tt_req_node_release(struct kref *ref)*/ static void batadv_tt_req_node_put (struct batadv_tt_req_node *tt_req_node) { +if (!tt_req_node) +return ; +kref_put (&tt_req_node->refcount, batadv_tt_req_node_release); }
net/batman-adv/translation-table.h +17 -1
@@ -9,6 +9,7 @@#include "main.h" +#include <linux/kref.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/skbuff.h>
@@ -28,7 +29,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,struct batadv_tt_global_entry *batadv_tt_global_hash_find (struct batadv_priv *bat_priv,const u8 *addr,unsigned short vid); -void batadv_tt_global_entry_put (struct batadv_tt_global_entry *tt_global_entry); +void batadv_tt_global_entry_release (struct kref *ref);int batadv_tt_global_hash_count (struct batadv_priv *bat_priv,const u8 *addr,unsigned short vid); struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,
@@ -55,4 +56,19 @@ bool batadv_tt_global_is_isolated(struct batadv_priv *bat_priv,int batadv_tt_cache_init (void );void batadv_tt_cache_destroy (void ); +/** +* batadv_tt_global_entry_put() - decrement the tt_global_entry refcounter and +* possibly release it +* @tt_global_entry: tt_global_entry to be free'd +*/ +static inline void +batadv_tt_global_entry_put (struct batadv_tt_global_entry *tt_global_entry) +{ +if (!tt_global_entry) +return ; + +kref_put (&tt_global_entry->common.refcount, + batadv_tt_global_entry_release); +} +#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
net/batman-adv/tvlv.c +6 -0
@@ -50,6 +50,9 @@ static void batadv_tvlv_handler_release(struct kref *ref)*/ static void batadv_tvlv_handler_put (struct batadv_tvlv_handler *tvlv_handler) { +if (!tvlv_handler) +return ; +kref_put (&tvlv_handler->refcount, batadv_tvlv_handler_release); }
@@ -106,6 +109,9 @@ static void batadv_tvlv_container_release(struct kref *ref)*/ static void batadv_tvlv_container_put (struct batadv_tvlv_container *tvlv) { +if (!tvlv) +return ; +kref_put (&tvlv->refcount, batadv_tvlv_container_release); }
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 5/6 batman-adv: Drop NULL check before dropping references
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The check if a batman-adv related object is NULL or not is now directly in the batadv_*_put functions. It is not needed anymore to perform this check outside these function:
The changes were generated using a coccinelle semantic patch:
@@
expression E;
@@
- if (likely(E != NULL))
(
batadv_backbone_gw_put
|
batadv_claim_put
|
batadv_dat_entry_put
|
batadv_gw_node_put
|
batadv_hardif_neigh_put
|
batadv_hardif_put
|
batadv_nc_node_put
|
batadv_nc_path_put
|
batadv_neigh_ifinfo_put
|
batadv_neigh_node_put
|
batadv_orig_ifinfo_put
|
batadv_orig_node_put
|
batadv_orig_node_vlan_put
|
batadv_softif_vlan_put
|
batadv_tp_vars_put
|
batadv_tt_global_entry_put
|
batadv_tt_local_entry_put
|
batadv_tt_orig_list_entry_put
|
batadv_tt_req_node_put
|
batadv_tvlv_container_put
|
batadv_tvlv_handler_put
)(E);
--- net/batman-adv/bat_iv_ogm.c | 75 +++++++++---------------- net/batman-adv/bat_v.c | 30 ++++------ net/batman-adv/bat_v_elp.c | 9 +-- net/batman-adv/bat_v_ogm.c | 39 +++++-------- net/batman-adv/bridge_loop_avoidance.c | 27 +++------ net/batman-adv/distributed-arp-table.c | 21 +++---- net/batman-adv/fragmentation.c | 6 +- net/batman-adv/gateway_client.c | 45 +++++---------- net/batman-adv/hard-interface.c | 21 +++---- net/batman-adv/multicast.c | 2 +- net/batman-adv/netlink.c | 6 +- net/batman-adv/network-coding.c | 18 ++---- net/batman-adv/originator.c | 30 ++++------ net/batman-adv/routing.c | 39 +++++-------- net/batman-adv/send.c | 21 +++---- net/batman-adv/soft-interface.c | 12 ++-- net/batman-adv/tp_meter.c | 24 +++----- net/batman-adv/translation-table.c | 78 +++++++++----------------- net/batman-adv/tvlv.c | 3 +- 19 files changed, 169 insertions(+), 337 deletions(-)
net/batman-adv/bat_iv_ogm.c +25 -50
@@ -519,8 +519,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, } out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);return res; }
@@ -857,8 +856,7 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface)rcu_read_unlock (); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); }static void batadv_iv_ogm_schedule (struct batadv_hard_iface *hard_iface)
@@ -1046,14 +1044,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, unlock:rcu_read_unlock (); out: -if (neigh_node) -batadv_neigh_node_put (neigh_node); -if (router) -batadv_neigh_node_put (router); -if (neigh_ifinfo) -batadv_neigh_ifinfo_put (neigh_ifinfo); -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_node_put (neigh_node); +batadv_neigh_node_put (router); +batadv_neigh_ifinfo_put (neigh_ifinfo); +batadv_neigh_ifinfo_put (router_ifinfo); }/**
@@ -1194,8 +1188,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, ret = true; out: -if (neigh_node) -batadv_neigh_node_put (neigh_node); +batadv_neigh_node_put (neigh_node);return ret; }
@@ -1496,16 +1489,11 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset,if (orig_neigh_node && !is_single_hop_neigh)batadv_orig_node_put (orig_neigh_node); out: -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); -if (router) -batadv_neigh_node_put (router); -if (router_router) -batadv_neigh_node_put (router_router); -if (orig_neigh_router) -batadv_neigh_node_put (orig_neigh_router); -if (hardif_neigh) -batadv_hardif_neigh_put (hardif_neigh); +batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_node_put (router); +batadv_neigh_node_put (router_router); +batadv_neigh_node_put (orig_neigh_router); +batadv_hardif_neigh_put (hardif_neigh);consume_skb (skb_priv); }
@@ -1926,8 +1914,7 @@ batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, } out: -if (neigh_node_best) -batadv_neigh_node_put (neigh_node_best); +batadv_neigh_node_put (neigh_node_best); *sub_s =0 ;return 0 ;
@@ -2049,10 +2036,8 @@ static bool batadv_iv_ogm_neigh_diff(struct batadv_neigh_node *neigh1, *diff = (int )tq1 - (int )tq2; out: -if (neigh1_ifinfo) -batadv_neigh_ifinfo_put (neigh1_ifinfo); -if (neigh2_ifinfo) -batadv_neigh_ifinfo_put (neigh2_ifinfo); +batadv_neigh_ifinfo_put (neigh1_ifinfo); +batadv_neigh_ifinfo_put (neigh2_ifinfo);return ret; }
@@ -2299,8 +2284,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)if (tmp_gw_factor > max_gw_factor || (tmp_gw_factor == max_gw_factor && tq_avg > max_tq)) { -if (curr_gw) -batadv_gw_node_put (curr_gw); +batadv_gw_node_put (curr_gw); curr_gw = gw_node;kref_get (&curr_gw->refcount); }
@@ -2314,8 +2298,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv)* $routing_class more tq points) */ if (tq_avg > max_tq) { -if (curr_gw) -batadv_gw_node_put (curr_gw); +batadv_gw_node_put (curr_gw); curr_gw = gw_node;kref_get (&curr_gw->refcount); }
@@ -2332,8 +2315,7 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) next:batadv_neigh_node_put (router); -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_ifinfo_put (router_ifinfo); }rcu_read_unlock ();
@@ -2397,14 +2379,10 @@ static bool batadv_iv_gw_is_eligible(struct batadv_priv *bat_priv, ret = true; out: -if (router_gw_ifinfo) -batadv_neigh_ifinfo_put (router_gw_ifinfo); -if (router_orig_ifinfo) -batadv_neigh_ifinfo_put (router_orig_ifinfo); -if (router_gw) -batadv_neigh_node_put (router_gw); -if (router_orig) -batadv_neigh_node_put (router_orig); +batadv_neigh_ifinfo_put (router_gw_ifinfo); +batadv_neigh_ifinfo_put (router_orig_ifinfo); +batadv_neigh_node_put (router_gw); +batadv_neigh_node_put (router_orig);return ret; }
@@ -2479,12 +2457,9 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, ret =0 ; out: -if (curr_gw) -batadv_gw_node_put (curr_gw); -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); -if (router) -batadv_neigh_node_put (router); +batadv_gw_node_put (curr_gw); +batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_node_put (router);return ret; }
net/batman-adv/bat_v.c +10 -20
@@ -106,8 +106,7 @@ static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface)batadv_v_primary_iface_set (hard_iface); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); } static void
@@ -366,8 +365,7 @@ batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, } out: -if (neigh_node_best) -batadv_neigh_node_put (neigh_node_best); +batadv_neigh_node_put (neigh_node_best); *sub_s =0 ;return 0 ;
@@ -568,10 +566,8 @@ static int batadv_v_gw_throughput_get(struct batadv_gw_node *gw_node, u32 *bw) ret =0 ; out: -if (router) -batadv_neigh_node_put (router); -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_node_put (router); +batadv_neigh_ifinfo_put (router_ifinfo);return ret; }
@@ -599,8 +595,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv)if (curr_gw && bw <= max_bw) goto next; -if (curr_gw) -batadv_gw_node_put (curr_gw); +batadv_gw_node_put (curr_gw); curr_gw = gw_node;kref_get (&curr_gw->refcount);
@@ -662,10 +657,8 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv, ret = true; out: -if (curr_gw) -batadv_gw_node_put (curr_gw); -if (orig_gw) -batadv_gw_node_put (orig_gw); +batadv_gw_node_put (curr_gw); +batadv_gw_node_put (orig_gw);return ret; }
@@ -764,12 +757,9 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, ret =0 ; out: -if (curr_gw) -batadv_gw_node_put (curr_gw); -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); -if (router) -batadv_neigh_node_put (router); +batadv_gw_node_put (curr_gw); +batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_node_put (router);return ret; }
net/batman-adv/bat_v_elp.c +3 -6
@@ -486,14 +486,11 @@ static void batadv_v_elp_neigh_update(struct batadv_priv *bat_priv, hardif_neigh->bat_v.elp_interval =ntohl (elp_packet->elp_interval); hardif_free: -if (hardif_neigh) -batadv_hardif_neigh_put (hardif_neigh); +batadv_hardif_neigh_put (hardif_neigh); neigh_free: -if (neigh) -batadv_neigh_node_put (neigh); +batadv_neigh_node_put (neigh); orig_free: -if (orig_neigh) -batadv_orig_node_put (orig_neigh); +batadv_orig_node_put (orig_neigh); }/**
net/batman-adv/bat_v_ogm.c +13 -26
@@ -584,12 +584,9 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv,batadv_v_ogm_queue_on_if (skb, if_outgoing); out: -if (orig_ifinfo) -batadv_orig_ifinfo_put (orig_ifinfo); -if (router) -batadv_neigh_node_put (router); -if (neigh_ifinfo) -batadv_neigh_ifinfo_put (neigh_ifinfo); +batadv_orig_ifinfo_put (orig_ifinfo); +batadv_neigh_node_put (router); +batadv_neigh_ifinfo_put (neigh_ifinfo); }/**
@@ -669,10 +666,8 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv,else ret =0 ; out: -if (orig_ifinfo) -batadv_orig_ifinfo_put (orig_ifinfo); -if (neigh_ifinfo) -batadv_neigh_ifinfo_put (neigh_ifinfo); +batadv_orig_ifinfo_put (orig_ifinfo); +batadv_neigh_ifinfo_put (neigh_ifinfo);return ret; }
@@ -763,16 +758,11 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv,batadv_update_route (bat_priv, orig_node, if_outgoing, neigh_node); out: -if (router) -batadv_neigh_node_put (router); -if (orig_neigh_router) -batadv_neigh_node_put (orig_neigh_router); -if (orig_neigh_node) -batadv_orig_node_put (orig_neigh_node); -if (router_ifinfo) -batadv_neigh_ifinfo_put (router_ifinfo); -if (neigh_ifinfo) -batadv_neigh_ifinfo_put (neigh_ifinfo); +batadv_neigh_node_put (router); +batadv_neigh_node_put (orig_neigh_router); +batadv_orig_node_put (orig_neigh_node); +batadv_neigh_ifinfo_put (router_ifinfo); +batadv_neigh_ifinfo_put (neigh_ifinfo);return forward; }
@@ -978,12 +968,9 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset, }rcu_read_unlock (); out: -if (orig_node) -batadv_orig_node_put (orig_node); -if (neigh_node) -batadv_neigh_node_put (neigh_node); -if (hardif_neigh) -batadv_hardif_neigh_put (hardif_neigh); +batadv_orig_node_put (orig_node); +batadv_neigh_node_put (neigh_node); +batadv_hardif_neigh_put (hardif_neigh); }/**
net/batman-adv/bridge_loop_avoidance.c +9 -18
@@ -445,8 +445,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,netif_rx_any_context (skb); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); }/**
@@ -1504,8 +1503,7 @@ static void batadv_bla_periodic_work(struct work_struct *work)rcu_read_unlock (); } out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);queue_delayed_work (batadv_event_workqueue, &bat_priv->bla.work,msecs_to_jiffies (BATADV_BLA_PERIOD_LENGTH ));
@@ -1814,8 +1812,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv)batadv_hash_destroy (bat_priv->bla.backbone_hash); bat_priv->bla.backbone_hash =NULL ; } -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); }/**
@@ -2002,10 +1999,8 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, ret = true; out: -if (primary_if) -batadv_hardif_put (primary_if); -if (claim) -batadv_claim_put (claim); +batadv_hardif_put (primary_if); +batadv_claim_put (claim);return ret; }
@@ -2109,10 +2104,8 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, handled: ret = true; out: -if (primary_if) -batadv_hardif_put (primary_if); -if (claim) -batadv_claim_put (claim); +batadv_hardif_put (primary_if); +batadv_claim_put (claim);return ret; }
@@ -2277,8 +2270,7 @@ int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) ret = msg->len; out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);dev_put (soft_iface);
@@ -2448,8 +2440,7 @@ int batadv_bla_backbone_dump(struct sk_buff *msg, struct netlink_callback *cb) ret = msg->len; out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);dev_put (soft_iface);
net/batman-adv/distributed-arp-table.c +7 -14
@@ -408,8 +408,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, &dat_entry->ip, dat_entry->mac_addr, batadv_print_vid(vid)); out: -if (dat_entry) -batadv_dat_entry_put (dat_entry); +batadv_dat_entry_put (dat_entry); }#ifdef CONFIG_BATMAN_ADV_DEBUG
@@ -597,8 +596,7 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv,continue ; max = tmp_max; -if (max_orig_node) -batadv_orig_node_put (max_orig_node); +batadv_orig_node_put (max_orig_node); max_orig_node = orig_node; }rcu_read_unlock ();
@@ -984,8 +982,7 @@ int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb) ret = msg->len; out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);dev_put (soft_iface);
@@ -1220,8 +1217,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, BATADV_P_DAT_DHT_GET); } out: -if (dat_entry) -batadv_dat_entry_put (dat_entry); +batadv_dat_entry_put (dat_entry);return ret; }
@@ -1288,8 +1284,7 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, ret = true; } out: -if (dat_entry) -batadv_dat_entry_put (dat_entry); +batadv_dat_entry_put (dat_entry);if (ret)kfree_skb (skb);return ret;
@@ -1422,8 +1417,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, out:if (dropped)kfree_skb (skb); -if (dat_entry) -batadv_dat_entry_put (dat_entry); +batadv_dat_entry_put (dat_entry);/* if dropped == false -> deliver to the interface */ return dropped; }
@@ -1832,7 +1826,6 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv, ret = true; out: -if (dat_entry) -batadv_dat_entry_put (dat_entry); +batadv_dat_entry_put (dat_entry);return ret; }
net/batman-adv/fragmentation.c +2 -4
@@ -381,10 +381,8 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, } out: -if (orig_node_dst) -batadv_orig_node_put (orig_node_dst); -if (neigh_node) -batadv_neigh_node_put (neigh_node); +batadv_orig_node_put (orig_node_dst); +batadv_neigh_node_put (neigh_node);return ret; }
net/batman-adv/gateway_client.c +15 -30
89 lines not on this page · raw message
net/batman-adv/hard-interface.c +7 -14
@@ -236,8 +236,7 @@ static struct net_device *batadv_get_real_netdevice(struct net_device *netdev) real_netdev =dev_get_by_index (real_net, ifindex); out: -if (hard_iface) -batadv_hardif_put (hard_iface); +batadv_hardif_put (hard_iface);return real_netdev; }
@@ -457,8 +456,7 @@ static void batadv_primary_if_update_addr(struct batadv_priv *bat_priv,batadv_dat_init_own_addr (bat_priv, primary_if);batadv_bla_update_orig_address (bat_priv, primary_if, oldif); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); } static void batadv_primary_if_select(struct batadv_priv *bat_priv,
@@ -481,8 +479,7 @@ static void batadv_primary_if_select(struct batadv_priv *bat_priv,batadv_primary_if_update_addr (bat_priv, curr_hard_iface); out: -if (curr_hard_iface) -batadv_hardif_put (curr_hard_iface); +batadv_hardif_put (curr_hard_iface); } static bool
@@ -657,8 +654,7 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) bat_priv->algo_ops->iface.activate (hard_iface); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); } static void
@@ -811,8 +807,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface) new_if =batadv_hardif_get_active (hard_iface->soft_iface);batadv_primary_if_select (bat_priv, new_if); -if (new_if) -batadv_hardif_put (new_if); +batadv_hardif_put (new_if); } bat_priv->algo_ops->iface.disable (hard_iface);
@@ -834,8 +829,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)batadv_hardif_put (hard_iface); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if); } static struct batadv_hard_iface *
@@ -990,8 +984,7 @@ static int batadv_hard_if_event(struct notifier_block *this, hardif_put:batadv_hardif_put (hard_iface); out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);return NOTIFY_DONE ; }
net/batman-adv/multicast.c +1 -1
@@ -2241,7 +2241,7 @@ batadv_mcast_netlink_get_primary(struct netlink_callback *cb,if (!ret && primary_if) *primary_if = hard_iface; -else if (hard_iface) +else batadv_hardif_put (hard_iface);return ret;
net/batman-adv/netlink.c +2 -4
@@ -359,15 +359,13 @@ static int batadv_netlink_mesh_fill(struct sk_buff *msg, atomic_read(&bat_priv->orig_interval))) goto nla_put_failure; -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);genlmsg_end (msg, hdr);return 0 ; nla_put_failure: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);genlmsg_cancel (msg, hdr);return -EMSGSIZE ;
net/batman-adv/network-coding.c +6 -12
@@ -936,10 +936,8 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, out_nc_node->last_seen = jiffies; out: -if (in_nc_node) -batadv_nc_node_put (in_nc_node); -if (out_nc_node) -batadv_nc_node_put (out_nc_node); +batadv_nc_node_put (in_nc_node); +batadv_nc_node_put (out_nc_node); }/**
@@ -1215,14 +1213,10 @@ static bool batadv_nc_code_packets(struct batadv_priv *bat_priv,batadv_send_unicast_skb (skb_dest, first_dest); res = true; out: -if (router_neigh) -batadv_neigh_node_put (router_neigh); -if (router_coding) -batadv_neigh_node_put (router_coding); -if (router_neigh_ifinfo) -batadv_neigh_ifinfo_put (router_neigh_ifinfo); -if (router_coding_ifinfo) -batadv_neigh_ifinfo_put (router_coding_ifinfo); +batadv_neigh_node_put (router_neigh); +batadv_neigh_node_put (router_coding); +batadv_neigh_ifinfo_put (router_neigh_ifinfo); +batadv_neigh_ifinfo_put (router_coding_ifinfo);return res; }
net/batman-adv/originator.c +10 -20
@@ -664,8 +664,7 @@ batadv_neigh_node_create(struct batadv_orig_node *orig_node, out:spin_unlock_bh (&orig_node->neigh_list_lock); -if (hardif_neigh) -batadv_hardif_neigh_put (hardif_neigh); +batadv_hardif_neigh_put (hardif_neigh);return neigh_node; }
@@ -757,11 +756,9 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb) ret = msg->len; out: -if (hardif) -batadv_hardif_put (hardif); +batadv_hardif_put (hardif);dev_put (hard_iface); -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);dev_put (soft_iface);return ret;
@@ -784,8 +781,7 @@ void batadv_orig_ifinfo_release(struct kref *ref)/* this is the last reference to this object */ router =rcu_dereference_protected (orig_ifinfo->router, true); -if (router) -batadv_neigh_node_put (router); +batadv_neigh_node_put (router);kfree_rcu (orig_ifinfo, rcu); }
@@ -843,8 +839,7 @@ void batadv_orig_node_release(struct kref *ref) orig_node->last_bonding_candidate =NULL ;spin_unlock_bh (&orig_node->neigh_list_lock); -if (last_candidate) -batadv_orig_ifinfo_put (last_candidate); +batadv_orig_ifinfo_put (last_candidate);spin_lock_bh (&orig_node->vlan_list_lock);hlist_for_each_entry_safe (vlan, node_tmp, &orig_node->vlan_list, list) {
@@ -1151,8 +1146,7 @@ batadv_find_best_neighbor(struct batadv_priv *bat_priv,if (!kref_get_unless_zero (&neigh->refcount))continue ; -if (best) -batadv_neigh_node_put (best); +batadv_neigh_node_put (best); best = neigh; }
@@ -1197,8 +1191,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, BATADV_IF_DEFAULT);batadv_update_route (bat_priv, orig_node,BATADV_IF_DEFAULT , best_neigh_node); -if (best_neigh_node) -batadv_neigh_node_put (best_neigh_node); +batadv_neigh_node_put (best_neigh_node);/* ... then for all other interfaces. */ rcu_read_lock ();
@@ -1217,8 +1210,7 @@ static bool batadv_purge_orig_node(struct batadv_priv *bat_priv, hard_iface);batadv_update_route (bat_priv, orig_node, hard_iface, best_neigh_node); -if (best_neigh_node) -batadv_neigh_node_put (best_neigh_node); +batadv_neigh_node_put (best_neigh_node);batadv_hardif_put (hard_iface); }
@@ -1348,11 +1340,9 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) ret = msg->len; out: -if (hardif) -batadv_hardif_put (hardif); +batadv_hardif_put (hardif);dev_put (hard_iface); -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);dev_put (soft_iface);return ret;
net/batman-adv/routing.c +13 -26
@@ -101,8 +101,7 @@ static void _batadv_update_route(struct batadv_priv *bat_priv, }/* decrease refcount of previous best neighbor */ -if (curr_router) -batadv_neigh_node_put (curr_router); +batadv_neigh_node_put (curr_router); }/**
@@ -128,8 +127,7 @@ void batadv_update_route(struct batadv_priv *bat_priv,_batadv_update_route (bat_priv, orig_node, recv_if, neigh_node); out: -if (router) -batadv_neigh_node_put (router); +batadv_neigh_node_put (router); }/**
@@ -269,10 +267,8 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, goto out; } out: -if (primary_if) -batadv_hardif_put (primary_if); -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_hardif_put (primary_if); +batadv_orig_node_put (orig_node);kfree_skb (skb);
@@ -324,10 +320,8 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, skb =NULL ; out: -if (primary_if) -batadv_hardif_put (primary_if); -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_hardif_put (primary_if); +batadv_orig_node_put (orig_node);kfree_skb (skb);
@@ -425,8 +419,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, skb =NULL ; put_orig_node: -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_orig_node_put (orig_node); free_skb:kfree_skb (skb);
@@ -513,8 +506,7 @@ batadv_last_bonding_replace(struct batadv_orig_node *orig_node, orig_node->last_bonding_candidate = new_candidate;spin_unlock_bh (&orig_node->neigh_list_lock); -if (old_candidate) -batadv_orig_ifinfo_put (old_candidate); +batadv_orig_ifinfo_put (old_candidate); }/**
@@ -656,8 +648,7 @@ batadv_find_router(struct batadv_priv *bat_priv,batadv_orig_ifinfo_put (next_candidate); } -if (last_candidate) -batadv_orig_ifinfo_put (last_candidate); +batadv_orig_ifinfo_put (last_candidate);return router; }
@@ -785,10 +776,8 @@ batadv_reroute_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, ret = true; out: -if (primary_if) -batadv_hardif_put (primary_if); -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_hardif_put (primary_if); +batadv_orig_node_put (orig_node);return ret; }
@@ -1031,8 +1020,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, orig_node); rx_success: -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_orig_node_put (orig_node);return NET_RX_SUCCESS ; }
@@ -1279,7 +1267,6 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,kfree_skb (skb); ret =NET_RX_DROP ; out: -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_orig_node_put (orig_node);return ret; }
net/batman-adv/send.c +7 -14
@@ -152,8 +152,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb,if (hardif_neigh && ret !=NET_XMIT_DROP ) hardif_neigh->bat_v.last_unicast_tx = jiffies; -if (hardif_neigh) -batadv_hardif_neigh_put (hardif_neigh); +batadv_hardif_neigh_put (hardif_neigh);#endif return ret;
@@ -309,8 +308,7 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv, ret = true; out: -if (primary_if) -batadv_hardif_put (primary_if); +batadv_hardif_put (primary_if);return ret; }
@@ -425,8 +423,7 @@ int batadv_send_skb_via_tt_generic(struct batadv_priv *bat_priv, ret =batadv_send_skb_unicast (bat_priv, skb, packet_type, packet_subtype, orig_node, vid); -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_orig_node_put (orig_node);return ret; }
@@ -452,8 +449,7 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, ret =batadv_send_skb_unicast (bat_priv, skb,BATADV_UNICAST_4ADDR ,BATADV_P_DATA , orig_node, vid); -if (orig_node) -batadv_orig_node_put (orig_node); +batadv_orig_node_put (orig_node);return ret; }
@@ -474,10 +470,8 @@ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet,else consume_skb (forw_packet->skb); -if (forw_packet->if_incoming) -batadv_hardif_put (forw_packet->if_incoming); -if (forw_packet->if_outgoing) -batadv_hardif_put (forw_packet->if_outgoing); +batadv_hardif_put (forw_packet->if_incoming); +batadv_hardif_put (forw_packet->if_outgoing);if (forw_packet->queue_left)atomic_inc (forw_packet->queue_left);kfree (forw_packet);
@@ -867,8 +861,7 @@ static bool batadv_send_no_broadcast(struct batadv_priv *bat_priv, ret =batadv_hardif_no_broadcast (if_out, bcast_packet->orig, orig_neigh); -if (neigh_node) -batadv_hardif_neigh_put (neigh_node); +batadv_hardif_neigh_put (neigh_node);/* ok, may broadcast */ if (!ret)
net/batman-adv/soft-interface.c +4 -8
@@ -383,10 +383,8 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, dropped_freed:batadv_inc_counter (bat_priv,BATADV_CNT_TX_DROPPED ); end: -if (mcast_single_orig) -batadv_orig_node_put (mcast_single_orig); -if (primary_if) -batadv_hardif_put (primary_if); +batadv_orig_node_put (mcast_single_orig); +batadv_hardif_put (primary_if);return NETDEV_TX_OK ; }
@@ -838,8 +836,7 @@ static int batadv_softif_slave_add(struct net_device *dev, ret =batadv_hardif_enable_interface (hard_iface, dev); out: -if (hard_iface) -batadv_hardif_put (hard_iface); +batadv_hardif_put (hard_iface);return ret; }
@@ -865,8 +862,7 @@ static int batadv_softif_slave_del(struct net_device *dev, ret =0 ; out: -if (hard_iface) -batadv_hardif_put (hard_iface); +batadv_hardif_put (hard_iface);return ret; }
net/batman-adv/tp_meter.c +8 -16
@@ -751,12 +751,9 @@ static void batadv_tp_recv_ack(struct batadv_priv *bat_priv,wake_up (&tp_vars->more_bytes); out: -if (likely (primary_if)) -batadv_hardif_put (primary_if); -if (likely (orig_node)) -batadv_orig_node_put (orig_node); -if (likely (tp_vars)) -batadv_tp_vars_put (tp_vars); +batadv_hardif_put (primary_if); +batadv_orig_node_put (orig_node); +batadv_tp_vars_put (tp_vars); }/**
@@ -885,10 +882,8 @@ static int batadv_tp_send(void *arg) } out: -if (likely (primary_if)) -batadv_hardif_put (primary_if); -if (likely (orig_node)) -batadv_orig_node_put (orig_node); +batadv_hardif_put (primary_if); +batadv_orig_node_put (orig_node);batadv_tp_sender_end (bat_priv, tp_vars);batadv_tp_sender_cleanup (bat_priv, tp_vars);
@@ -1208,10 +1203,8 @@ static int batadv_tp_send_ack(struct batadv_priv *bat_priv, const u8 *dst, ret =0 ; out: -if (likely (orig_node)) -batadv_orig_node_put (orig_node); -if (likely (primary_if)) -batadv_hardif_put (primary_if); +batadv_orig_node_put (orig_node); +batadv_hardif_put (primary_if);return ret; }
@@ -1459,8 +1452,7 @@ static void batadv_tp_recv_msg(struct batadv_priv *bat_priv,batadv_tp_send_ack (bat_priv, icmp->orig, tp_vars->last_recv, icmp->timestamp, icmp->session, icmp->uid); out: -if (likely (tp_vars)) -batadv_tp_vars_put (tp_vars); +batadv_tp_vars_put (tp_vars); }/**
net/batman-adv/translation-table.c +26 -52
192 lines not on this page · raw message
net/batman-adv/tvlv.c +1 -2
@@ -444,8 +444,7 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, ogm_source, orig_node, src, dst, tvlv_value, tvlv_value_cont_len); -if (tvlv_handler) -batadv_tvlv_handler_put (tvlv_handler); +batadv_tvlv_handler_put (tvlv_handler); tvlv_value = (u8 *)tvlv_value + tvlv_value_cont_len; tvlv_value_len -= tvlv_value_cont_len; }
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 6/6 batman-adv: bcast: remove remaining skb-copy calls
In reply to Simon WunderlichFrom: Linus Lüssing <[email protected]>
We currently have two code paths for broadcast packets:
A) self-generated, via batadv_interface_tx()-> batadv_send_bcast_packet().
B) received/forwarded, via batadv_recv_bcast_packet()-> batadv_forw_bcast_packet().
For A), self-generated broadcast packets:
The only modifications to the skb data is the ethernet header which is added/pushed to the skb in batadv_send_broadcast_skb()->batadv_send_skb_packet(). However before doing so, batadv_skb_head_push() is called which calls skb_cow_head() to unshare the space for the to be pushed ethernet header. So for this case, it is safe to use skb clones.
For B), received/forwarded packets:
The same applies as in A) for the to be forwarded packets. Only the ethernet header is added. However after (queueing for) forwarding the packet in batadv_recv_bcast_packet()->batadv_forw_bcast_packet(), a packet is additionally decapsulated and is sent up the stack through batadv_recv_bcast_packet()->batadv_interface_rx().
Protocols higher up the stack are already required to check if the packet is shared and create a copy for further modifications. When the next (protocol) layer works correctly, it cannot happen that it tries to operate on the data behind the skb clone which is still queued up for forwarding.
--- net/batman-adv/send.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/batman-adv/send.c +10 -2
@@ -742,6 +742,10 @@ void batadv_forw_packet_ogmv1_queue(struct batadv_priv *bat_priv,* Adds a broadcast packet to the queue and sets up timers. Broadcast packets * are sent multiple times to increase probability for being received. * +* This call clones the given skb, hence the caller needs to take into +* account that the data segment of the original skb might not be +* modifiable anymore. +* * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors. */ static int batadv_forw_bcast_packet_to_list(struct batadv_priv *bat_priv,
@@ -755,7 +759,7 @@ static int batadv_forw_bcast_packet_to_list(struct batadv_priv *bat_priv,unsigned long send_time = jiffies;struct sk_buff *newskb; - newskb =skb_copy (skb,GFP_ATOMIC ); + newskb =skb_clone (skb,GFP_ATOMIC );if (!newskb) goto err;
@@ -794,6 +798,10 @@ static int batadv_forw_bcast_packet_to_list(struct batadv_priv *bat_priv,* or if a delay is given after that. Furthermore, queues additional * retransmissions if this interface is a wireless one. * +* This call clones the given skb, hence the caller needs to take into +* account that the data segment of the original skb might not be +* modifiable anymore. +* * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY on errors. */ static int batadv_forw_bcast_packet_if(struct batadv_priv *bat_priv,
@@ -808,7 +816,7 @@ static int batadv_forw_bcast_packet_if(struct batadv_priv *bat_priv,int ret =NETDEV_TX_OK ;if (!delay) { - newskb =skb_copy (skb,GFP_ATOMIC ); + newskb =skb_clone (skb,GFP_ATOMIC );if (!newskb)return NETDEV_TX_BUSY ;
Signature · 1 line
2.20.1