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

Merge tag 'batadv-next-for-davem-20190808' 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

 - Replace usage of strlcpy with strscpy, by Sven Eckelmann

 - Add OGMv2 per-interface queue and aggregations, by Linus Luessing
   (2 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 13dfb3fa 9cb9a178

net/batman-adv/bat_v.c

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static int batadv_v_iface_enable(struct batadv_hard_iface *hard_iface) 


static void batadv_v_iface_disable(struct batadv_hard_iface *hard_iface)

{

	batadv_v_ogm_iface_disable(hard_iface);

	batadv_v_elp_iface_disable(hard_iface);

}
@@ -1081,6 +1082,12 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface) 
	 */

	atomic_set(&hard_iface->bat_v.throughput_override, 0);

	atomic_set(&hard_iface->bat_v.elp_interval, 500);



	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

+177 −2
Original line number Diff line number Diff line
@@ -17,12 +17,14 @@ 
#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <linux/random.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/stddef.h>

#include <linux/string.h>

#include <linux/types.h>
@@ -76,6 +78,20 @@ struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv, 
	return orig_node;

}



/**

 * batadv_v_ogm_start_queue_timer() - restart the OGM aggregation timer

 * @hard_iface: the interface to use to send the OGM

 */

static void batadv_v_ogm_start_queue_timer(struct batadv_hard_iface *hard_iface)

{

	unsigned int msecs = BATADV_MAX_AGGREGATION_MS * 1000;



	/* msecs * [0.9, 1.1] */

	msecs += prandom_u32() % (msecs / 5) - (msecs / 10);

	queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.aggr_wq,

			   msecs_to_jiffies(msecs / 1000));

}



/**

 * batadv_v_ogm_start_timer() - restart the OGM sending timer

 * @bat_priv: the bat priv with all the soft interface information
@@ -115,6 +131,130 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb, 
	batadv_send_broadcast_skb(skb, hard_iface);

}



/**

 * batadv_v_ogm_len() - OGMv2 packet length

 * @skb: the OGM to check

 *

 * Return: Length of the given OGMv2 packet, including tvlv length, excluding

 * ethernet header length.

 */

static unsigned int batadv_v_ogm_len(struct sk_buff *skb)

{

	struct batadv_ogm2_packet *ogm_packet;



	ogm_packet = (struct batadv_ogm2_packet *)skb->data;

	return BATADV_OGM2_HLEN + ntohs(ogm_packet->tvlv_len);

}



/**

 * batadv_v_ogm_queue_left() - check if given OGM still fits aggregation queue

 * @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.

 *

 * Return: True, if the given OGMv2 packet still fits, false otherwise.

 */

static bool batadv_v_ogm_queue_left(struct sk_buff *skb,

				    struct batadv_hard_iface *hard_iface)

{

	unsigned int max = min_t(unsigned int, hard_iface->net_dev->mtu,

				 BATADV_MAX_AGGREGATION_BYTES);

	unsigned int ogm_len = batadv_v_ogm_len(skb);



	lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock);



	return hard_iface->bat_v.aggr_len + ogm_len <= max;

}



/**

 * batadv_v_ogm_aggr_list_free - free all elements in an aggregation queue

 * @hard_iface: the interface holding the aggregation queue

 *

 * Empties the OGMv2 aggregation queue and frees all the skbs it contained.

 *

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



	hard_iface->bat_v.aggr_len = 0;

}



/**

 * batadv_v_ogm_aggr_send() - flush & send aggregation queue

 * @hard_iface: the interface with the aggregation queue to flush

 *

 * Aggregates all OGMv2 packets currently in the aggregation queue into a

 * single OGMv2 packet and transmits this aggregate.

 *

 * The aggregation queue is empty after this call.

 *

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

{

	unsigned int aggr_len = hard_iface->bat_v.aggr_len;

	struct sk_buff *skb_aggr;

	unsigned int ogm_len;

	struct sk_buff *skb;



	lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock);



	if (!aggr_len)

		return;



	skb_aggr = dev_alloc_skb(aggr_len + ETH_HLEN + NET_IP_ALIGN);

	if (!skb_aggr) {

		batadv_v_ogm_aggr_list_free(hard_iface);

		return;

	}



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

		hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb);



		ogm_len = batadv_v_ogm_len(skb);

		skb_put_data(skb_aggr, skb->data, ogm_len);



		consume_skb(skb);

	}



	batadv_v_ogm_send_to_if(skb_aggr, hard_iface);

}



/**

 * batadv_v_ogm_queue_on_if() - queue a batman ogm on a given interface

 * @skb: the OGM to queue

 * @hard_iface: the interface to queue the OGM on

 */

static void batadv_v_ogm_queue_on_if(struct sk_buff *skb,

				     struct batadv_hard_iface *hard_iface)

{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);



	if (!atomic_read(&bat_priv->aggregated_ogms)) {

		batadv_v_ogm_send_to_if(skb, hard_iface);

		return;

	}



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

}



/**

 * batadv_v_ogm_send() - periodic worker broadcasting the own OGM

 * @work: work queue item
@@ -210,7 +350,7 @@ static void batadv_v_ogm_send(struct work_struct *work) 
			break;

		}



		batadv_v_ogm_send_to_if(skb_tmp, hard_iface);

		batadv_v_ogm_queue_on_if(skb_tmp, hard_iface);

		batadv_hardif_put(hard_iface);

	}

	rcu_read_unlock();
@@ -223,6 +363,27 @@ static void batadv_v_ogm_send(struct work_struct *work) 
	return;

}



/**

 * batadv_v_ogm_aggr_work() - OGM queue periodic task per interface

 * @work: work queue item

 *

 * Emits aggregated OGM message in regular intervals.

 */

void batadv_v_ogm_aggr_work(struct work_struct *work)

{

	struct batadv_hard_iface_bat_v *batv;

	struct batadv_hard_iface *hard_iface;



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

	batadv_v_ogm_aggr_send(hard_iface);

	spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock);



	batadv_v_ogm_start_queue_timer(hard_iface);

}



/**

 * batadv_v_ogm_iface_enable() - prepare an interface for B.A.T.M.A.N. V

 * @hard_iface: the interface to prepare
@@ -235,11 +396,25 @@ int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface) 
{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);



	batadv_v_ogm_start_queue_timer(hard_iface);

	batadv_v_ogm_start_timer(bat_priv);



	return 0;

}



/**

 * batadv_v_ogm_iface_disable() - release OGM interface private resources

 * @hard_iface: interface for which the resources have to be released

 */

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

	batadv_v_ogm_aggr_list_free(hard_iface);

	spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock);

}



/**

 * batadv_v_ogm_primary_iface_set() - set a new primary interface

 * @primary_iface: the new primary interface
@@ -382,7 +557,7 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, 
		   if_outgoing->net_dev->name, ntohl(ogm_forward->throughput),

		   ogm_forward->ttl, if_incoming->net_dev->name);



	batadv_v_ogm_send_to_if(skb, if_outgoing);

	batadv_v_ogm_queue_on_if(skb, if_outgoing);



out:

	if (orig_ifinfo)

net/batman-adv/bat_v_ogm.h

+3 −0
Original line number Diff line number Diff line
@@ -11,10 +11,13 @@ 


#include <linux/skbuff.h>

#include <linux/types.h>

#include <linux/workqueue.h>



int batadv_v_ogm_init(struct batadv_priv *bat_priv);

void batadv_v_ogm_free(struct batadv_priv *bat_priv);

void batadv_v_ogm_aggr_work(struct work_struct *work);

int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface);

void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface);

struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv,

					       const u8 *addr);

void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface);

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.3"

#define BATADV_SOURCE_VERSION "2019.4"

#endif



/* B.A.T.M.A.N. parameters */

net/batman-adv/soft-interface.c

+4 −4
Original line number Diff line number Diff line
@@ -943,10 +943,10 @@ static const struct net_device_ops batadv_netdev_ops = { 
static void batadv_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver));

	strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version));

	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strlcpy(info->bus_info, "batman", sizeof(info->bus_info));

	strscpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver));

	strscpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version));

	strscpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strscpy(info->bus_info, "batman", sizeof(info->bus_info));

}



/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702