Commit d673f563 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20191105' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
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
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9647722b 5759af06

net/batman-adv/bat_v.c

+0 −1
Original line number Diff line number Diff line
@@ -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 −19
Original line number Diff line number Diff line
@@ -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,17 +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)

{

	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);

	lockdep_assert_held(&hard_iface->bat_v.aggr_list.lock);



	__skb_queue_purge(&hard_iface->bat_v.aggr_list);

	hard_iface->bat_v.aggr_len = 0;

}
@@ -197,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)

{
@@ -206,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;
@@ -220,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);
@@ -247,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);

}



/**
@@ -392,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);

}
@@ -425,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/main.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/batman-adv/multicast.c

+1 −1
Original line number Diff line number Diff line
@@ -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 −3
Original line number Diff line number Diff line
@@ -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>
@@ -230,7 +229,7 @@ static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, 
			break;

		}



		/* fall through */

		fallthrough;

	case ETH_P_BATMAN:

		goto dropped;

	}
@@ -455,7 +454,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;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE