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

Commit 0f7b67dd authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller
Browse files

llc: optimize multicast delivery 



Optimize multicast delivery by doing the actual delivery without
holding the lock. Based on the same approach used in UDP code.

Signed-off-by: default avatarOctavian Purdila <opurdila@ixiacom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b76f5a84

net/llc/llc_sap.c

+28 −8
Original line number Original line Diff line number Diff line
@@ -355,6 +355,24 @@ static inline bool llc_mcast_match(const struct llc_sap *sap, 
	  llc->dev == skb->dev;

	  llc->dev == skb->dev;

}

}





static void llc_do_mcast(struct llc_sap *sap, struct sk_buff *skb,

			 struct sock **stack, int count)

{

	struct sk_buff *skb1;

	int i;



	for (i = 0; i < count; i++) {

		skb1 = skb_clone(skb, GFP_ATOMIC);

		if (!skb1) {

			sock_put(stack[i]);

			continue;

		}



		llc_sap_rcv(sap, skb1, stack[i]);

		sock_put(stack[i]);

	}

}



/**

/**

 * 	llc_sap_mcast - Deliver multicast PDU's to all matching datagram sockets.

 * 	llc_sap_mcast - Deliver multicast PDU's to all matching datagram sockets.

 *	@sap: SAP

 *	@sap: SAP
@@ -367,25 +385,27 @@ static void llc_sap_mcast(struct llc_sap *sap, 
			  const struct llc_addr *laddr,

			  const struct llc_addr *laddr,

			  struct sk_buff *skb)

			  struct sk_buff *skb)

{

{

	struct sock *sk;

	int i = 0, count = 256 / sizeof(struct sock *);

	struct sock *sk, *stack[count];

	struct hlist_nulls_node *node;

	struct hlist_nulls_node *node;





	spin_lock_bh(&sap->sk_lock);

	spin_lock_bh(&sap->sk_lock);

	sk_nulls_for_each_rcu(sk, node, &sap->sk_list) {

	sk_nulls_for_each_rcu(sk, node, &sap->sk_list) {

		struct sk_buff *skb1;





		if (!llc_mcast_match(sap, laddr, skb, sk))

		if (!llc_mcast_match(sap, laddr, skb, sk))

			continue;

			continue;





		skb1 = skb_clone(skb, GFP_ATOMIC);

		if (!skb1)

			break;



		sock_hold(sk);

		sock_hold(sk);

		llc_sap_rcv(sap, skb1, sk);

		if (i < count)

		sock_put(sk);

			stack[i++] = sk;

		else {

			llc_do_mcast(sap, skb, stack, i);

			i = 0;

		}

	}

	}

	spin_unlock_bh(&sap->sk_lock);

	spin_unlock_bh(&sap->sk_lock);



	llc_do_mcast(sap, skb, stack, i);

}

}