pull request for net-next: batman-adv 2019-11-05
Subsystems (3)
Simon Wunderlich
maintainercover pull request for net-next: batman-adv 2019-11-05
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 1204c70d9dcba31164f78ad5d8c88c42335d51f8:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2019-11-01 17:48:11 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20191105
for you to fetch changes up to 5759af0682b3395e64cf615e062d6ecad01428dc:
batman-adv: Drop lockdep.h include for soft-interface.c (2019-11-03 08:30:58 +0100)
----------------------------------------------------------------
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Simplify batadv_v_ogm_aggr_list_free using skb_queue_purge, by Christophe Jaillet
- Replace aggr_list_lock with lock free skb handlers, by Christophe Jaillet
- explicitly mark fallthrough cases, by Sven Eckelmann
- Drop lockdep.h include from soft-interface.c, by Sven Eckelmann
----------------------------------------------------------------
Christophe JAILLET (2):
batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()'
batman-adv: Axe 'aggr_list_lock'
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Use 'fallthrough' pseudo keyword
batman-adv: Drop lockdep.h include for soft-interface.c
net/batman-adv/bat_v.c | 1 - net/batman-adv/bat_v_ogm.c | 34 +++++++++++++++------------------- net/batman-adv/main.h | 2 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/soft-interface.c | 5 ++--- net/batman-adv/types.h | 3 --- 6 files changed, 19 insertions(+), 28 deletions(-)
Simon Wunderlich
maintainerPATCH 1/5 batman-adv: Start new development cycle
--- 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 "2019.4" +#define BATADV_SOURCE_VERSION "2019.5"#endif /* B.A.T.M.A.N. parameters */
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 2/5 batman-adv: Simplify 'batadv_v_ogm_aggr_list_free()'
In reply to Simon WunderlichFrom: Christophe JAILLET <[email protected]>
Use 'skb_queue_purge()' instead of re-implementing it.
--- net/batman-adv/bat_v_ogm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/batman-adv/bat_v_ogm.c +1 -5
@@ -178,13 +178,9 @@ static bool batadv_v_ogm_queue_left(struct sk_buff *skb,*/ static void batadv_v_ogm_aggr_list_free (struct batadv_hard_iface *hard_iface) { -struct sk_buff *skb; -lockdep_assert_held (&hard_iface->bat_v.aggr_list_lock); -while ((skb =skb_dequeue (&hard_iface->bat_v.aggr_list))) -kfree_skb (skb); - +skb_queue_purge (&hard_iface->bat_v.aggr_list); hard_iface->bat_v.aggr_len =0 ; }
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 3/5 batman-adv: Axe 'aggr_list_lock'
In reply to Simon WunderlichFrom: Christophe JAILLET <[email protected]>
'aggr_list.lock' can safely be used in place of another explicit spinlock when access to 'aggr_list' has to be guarded.
This avoids to take 2 locks, knowing that the 2nd one is always successful.
Now that the 'aggr_list.lock' is handled explicitly, the lock-free __sbk_something() variants should be used when dealing with 'aggr_list'.
--- net/batman-adv/bat_v.c | 1 - net/batman-adv/bat_v_ogm.c | 30 +++++++++++++++--------------- net/batman-adv/types.h | 3 --- 3 files changed, 15 insertions(+), 19 deletions(-)
net/batman-adv/bat_v.c +0 -1
@@ -1085,7 +1085,6 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface) hard_iface->bat_v.aggr_len =0 ;skb_queue_head_init (&hard_iface->bat_v.aggr_list); -spin_lock_init (&hard_iface->bat_v.aggr_list_lock);INIT_DELAYED_WORK (&hard_iface->bat_v.aggr_wq, batadv_v_ogm_aggr_work); }
net/batman-adv/bat_v_ogm.c +15 -15
@@ -152,7 +152,7 @@ static unsigned int batadv_v_ogm_len(struct sk_buff *skb)* @skb: the OGM to check * @hard_iface: the interface to use to send the OGM * -* Caller needs to hold the hard_iface->bat_v.aggr_list_lock. +* Caller needs to hold the hard_iface->bat_v.aggr_list.lock. * * Return: True, if the given OGMv2 packet still fits, false otherwise. */
@@ -163,7 +163,7 @@ static bool batadv_v_ogm_queue_left(struct sk_buff *skb, BATADV_MAX_AGGREGATION_BYTES);unsigned int ogm_len =batadv_v_ogm_len (skb); -lockdep_assert_held (&hard_iface->bat_v.aggr_list_lock); +lockdep_assert_held (&hard_iface->bat_v.aggr_list.lock);return hard_iface->bat_v.aggr_len + ogm_len <= max; }
@@ -174,13 +174,13 @@ static bool batadv_v_ogm_queue_left(struct sk_buff *skb,* * Empties the OGMv2 aggregation queue and frees all the skbs it contained. * -* Caller needs to hold the hard_iface->bat_v.aggr_list_lock. +* Caller needs to hold the hard_iface->bat_v.aggr_list.lock. */ static void batadv_v_ogm_aggr_list_free (struct batadv_hard_iface *hard_iface) { -lockdep_assert_held (&hard_iface->bat_v.aggr_list_lock); +lockdep_assert_held (&hard_iface->bat_v.aggr_list.lock); -skb_queue_purge (&hard_iface->bat_v.aggr_list); +__skb_queue_purge (&hard_iface->bat_v.aggr_list); hard_iface->bat_v.aggr_len =0 ; }
@@ -193,7 +193,7 @@ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface)* * The aggregation queue is empty after this call. * -* Caller needs to hold the hard_iface->bat_v.aggr_list_lock. +* Caller needs to hold the hard_iface->bat_v.aggr_list.lock. */ static void batadv_v_ogm_aggr_send (struct batadv_hard_iface *hard_iface) {
@@ -202,7 +202,7 @@ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface)unsigned int ogm_len;struct sk_buff *skb; -lockdep_assert_held (&hard_iface->bat_v.aggr_list_lock); +lockdep_assert_held (&hard_iface->bat_v.aggr_list.lock);if (!aggr_len)return ;
@@ -216,7 +216,7 @@ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface)skb_reserve (skb_aggr,ETH_HLEN +NET_IP_ALIGN );skb_reset_network_header (skb_aggr); -while ((skb =skb_dequeue (&hard_iface->bat_v.aggr_list))) { +while ((skb =__skb_dequeue (&hard_iface->bat_v.aggr_list))) { hard_iface->bat_v.aggr_len -=batadv_v_ogm_len (skb); ogm_len =batadv_v_ogm_len (skb);
@@ -243,13 +243,13 @@ static void batadv_v_ogm_queue_on_if(struct sk_buff *skb,return ; } -spin_lock_bh (&hard_iface->bat_v.aggr_list_lock); +spin_lock_bh (&hard_iface->bat_v.aggr_list.lock);if (!batadv_v_ogm_queue_left (skb, hard_iface))batadv_v_ogm_aggr_send (hard_iface); hard_iface->bat_v.aggr_len +=batadv_v_ogm_len (skb); -skb_queue_tail (&hard_iface->bat_v.aggr_list, skb); -spin_unlock_bh (&hard_iface->bat_v.aggr_list_lock); +__skb_queue_tail (&hard_iface->bat_v.aggr_list, skb); +spin_unlock_bh (&hard_iface->bat_v.aggr_list.lock); }/**
@@ -388,9 +388,9 @@ void batadv_v_ogm_aggr_work(struct work_struct *work) batv = container_of(work, struct batadv_hard_iface_bat_v, aggr_wq.work); hard_iface = container_of(batv, struct batadv_hard_iface, bat_v); -spin_lock_bh (&hard_iface->bat_v.aggr_list_lock); +spin_lock_bh (&hard_iface->bat_v.aggr_list.lock);batadv_v_ogm_aggr_send (hard_iface); -spin_unlock_bh (&hard_iface->bat_v.aggr_list_lock); +spin_unlock_bh (&hard_iface->bat_v.aggr_list.lock);batadv_v_ogm_start_queue_timer (hard_iface); }
@@ -421,9 +421,9 @@ void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface) {cancel_delayed_work_sync (&hard_iface->bat_v.aggr_wq); -spin_lock_bh (&hard_iface->bat_v.aggr_list_lock); +spin_lock_bh (&hard_iface->bat_v.aggr_list.lock);batadv_v_ogm_aggr_list_free (hard_iface); -spin_unlock_bh (&hard_iface->bat_v.aggr_list_lock); +spin_unlock_bh (&hard_iface->bat_v.aggr_list.lock); }/**
net/batman-adv/types.h +0 -3
@@ -130,9 +130,6 @@ struct batadv_hard_iface_bat_v {/** @aggr_len: size of the OGM aggregate (excluding ethernet header) */ unsigned int aggr_len; -/** @aggr_list_lock: protects aggr_list */ -spinlock_t aggr_list_lock; -/** * @throughput_override: throughput override to disable link * auto-detection
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 4/5 batman-adv: Use 'fallthrough' pseudo keyword
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The usage of the '/* fall through */' comments in switches are no longer marked as non-deprecated variant of implicit fall throughs for switch statements. The commit 294f69e662d1 ("compiler_attributes.h: Add 'fallthrough' pseudo keyword for switch/case use") introduced a replacement keyword which should be used instead.
--- net/batman-adv/multicast.c | 2 +- net/batman-adv/soft-interface.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
net/batman-adv/multicast.c +1 -1
@@ -1421,7 +1421,7 @@ batadv_mcast_forw_mode(struct batadv_priv *bat_priv, struct sk_buff *skb,if (*orig)return BATADV_FORW_SINGLE ; -/* fall through */ + fallthrough;case 0 :return BATADV_FORW_NONE ;default :
net/batman-adv/soft-interface.c +2 -2
@@ -230,7 +230,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb,break ; } -/* fall through */ + fallthrough;case ETH_P_BATMAN : goto dropped; }
@@ -455,7 +455,7 @@ void batadv_interface_rx(struct net_device *soft_iface,if (vhdr->h_vlan_encapsulated_proto !=htons (ETH_P_BATMAN ))break ; -/* fall through */ + fallthrough;case ETH_P_BATMAN : goto dropped; }
Signature · 1 line
2.20.1
Simon Wunderlich
maintainerPATCH 5/5 batman-adv: Drop lockdep.h include for soft-interface.c
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The commit ab92d68fc22f ("net: core: add generic lockdep keys") removed all lockdep functionality from soft-interface.c but didn't remove the include for this functionality.
--- net/batman-adv/soft-interface.c | 1 - 1 file changed, 1 deletion(-)
net/batman-adv/soft-interface.c +0 -1
@@ -22,7 +22,6 @@#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/percpu.h>
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Simon Wunderlich <[email protected]>
Date: Tue, 5 Nov 2019 10:35:26 +0100
Quoted 3 lines
here is a little cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Pulled, thanks.