Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99ba18ef authored by Linus Lüssing's avatar Linus Lüssing Committed by Simon Wunderlich
Browse files

batman-adv: privatize forw_packet skb assignment 



An skb is assigned to a forw_packet only once, shortly after the
forw_packet allocation.

With this patch the assignment is moved into the this allocation
function.

Signed-off-by: default avatarLinus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent a3a5129e

net/batman-adv/bat_iv_ogm.c

+9 −8
Original line number Diff line number Diff line
@@ -679,15 +679,11 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
{

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

	struct batadv_forw_packet *forw_packet_aggr;

	struct sk_buff *skb;

	unsigned char *skb_buff;

	unsigned int skb_size;

	atomic_t *queue_left = own_packet ? NULL : &bat_priv->batman_queue_left;



	forw_packet_aggr = batadv_forw_packet_alloc(if_incoming, if_outgoing,

						    queue_left, bat_priv);

	if (!forw_packet_aggr)

		return;



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

	    packet_len < BATADV_MAX_AGGREGATION_BYTES)

		skb_size = BATADV_MAX_AGGREGATION_BYTES;
@@ -696,9 +692,14 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 


	skb_size += ETH_HLEN;



	forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size);

	if (!forw_packet_aggr->skb) {

		batadv_forw_packet_free(forw_packet_aggr, true);

	skb = netdev_alloc_skb_ip_align(NULL, skb_size);

	if (!skb)

		return;



	forw_packet_aggr = batadv_forw_packet_alloc(if_incoming, if_outgoing,

						    queue_left, bat_priv, skb);

	if (!forw_packet_aggr) {

		kfree_skb(skb);

		return;

	}

net/batman-adv/send.c

+12 −9
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet, 
 * @if_outgoing: The (optional) if_outgoing to be grabbed

 * @queue_left: The (optional) queue counter to decrease

 * @bat_priv: The bat_priv for the mesh of this forw_packet

 * @skb: The raw packet this forwarding packet shall contain

 *

 * Allocates a forwarding packet and tries to get a reference to the

 * (optional) if_incoming, if_outgoing and queue_left. If queue_left
@@ -493,7 +494,8 @@ struct batadv_forw_packet * 
batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming,

			 struct batadv_hard_iface *if_outgoing,

			 atomic_t *queue_left,

			 struct batadv_priv *bat_priv)

			 struct batadv_priv *bat_priv,

			 struct sk_buff *skb)

{

	struct batadv_forw_packet *forw_packet;

	const char *qname;
@@ -525,7 +527,7 @@ batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming, 


	INIT_HLIST_NODE(&forw_packet->list);

	INIT_HLIST_NODE(&forw_packet->cleanup_list);

	forw_packet->skb = NULL;

	forw_packet->skb = skb;

	forw_packet->queue_left = queue_left;

	forw_packet->if_incoming = if_incoming;

	forw_packet->if_outgoing = if_outgoing;
@@ -756,22 +758,23 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, 
	if (!primary_if)

		goto err;



	newskb = skb_copy(skb, GFP_ATOMIC);

	if (!newskb) {

		batadv_hardif_put(primary_if);

		goto err;

	}



	forw_packet = batadv_forw_packet_alloc(primary_if, NULL,

					       &bat_priv->bcast_queue_left,

					       bat_priv);

					       bat_priv, newskb);

	batadv_hardif_put(primary_if);

	if (!forw_packet)

		goto err;



	newskb = skb_copy(skb, GFP_ATOMIC);

	if (!newskb)

		goto err_packet_free;



	/* as we have a copy now, it is safe to decrease the TTL */

	bcast_packet = (struct batadv_bcast_packet *)newskb->data;

	bcast_packet->ttl--;



	forw_packet->skb = newskb;

	forw_packet->own = own_packet;



	INIT_DELAYED_WORK(&forw_packet->delayed_work,
@@ -781,7 +784,7 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, 
	return NETDEV_TX_OK;



err_packet_free:

	batadv_forw_packet_free(forw_packet, true);

	kfree_skb(newskb);

err:

	return NETDEV_TX_BUSY;

}

net/batman-adv/send.h

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ struct batadv_forw_packet * 
batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming,

			 struct batadv_hard_iface *if_outgoing,

			 atomic_t *queue_left,

			 struct batadv_priv *bat_priv);

			 struct batadv_priv *bat_priv,

			 struct sk_buff *skb);

bool batadv_forw_packet_steal(struct batadv_forw_packet *packet, spinlock_t *l);

void batadv_forw_packet_ogmv1_queue(struct batadv_priv *bat_priv,

				    struct batadv_forw_packet *forw_packet,