From patchwork Wed Dec 23 23:45:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Octavian Purdila X-Patchwork-Id: 41726 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 84115B7BF2 for ; Thu, 24 Dec 2009 10:49:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757546AbZLWXtQ (ORCPT ); Wed, 23 Dec 2009 18:49:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757557AbZLWXtO (ORCPT ); Wed, 23 Dec 2009 18:49:14 -0500 Received: from ixro-out-rtc.ixiacom.com ([92.87.192.98]:23684 "EHLO ixro-ex1.ixiacom.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757548AbZLWXtM (ORCPT ); Wed, 23 Dec 2009 18:49:12 -0500 Received: from localhost.localdomain ([10.205.9.170]) by ixro-ex1.ixiacom.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 24 Dec 2009 01:48:53 +0200 From: Octavian Purdila To: netdev@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Eric Dumazet , Octavian Purdila Subject: [net-next PATCH v2 5/9] llc: optimize multicast delivery Date: Thu, 24 Dec 2009 01:45:30 +0200 Message-Id: <1261611934-24348-6-git-send-email-opurdila@ixiacom.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1261611934-24348-1-git-send-email-opurdila@ixiacom.com> References: <1261611934-24348-1-git-send-email-opurdila@ixiacom.com> X-OriginalArrivalTime: 23 Dec 2009 23:48:53.0056 (UTC) FILETIME=[7B986C00:01CA842A] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Optimize multicast delivery by doing the actual delivery without holding the lock. Based on the same approach used in UDP code. Signed-off-by: Octavian Purdila --- net/llc/llc_sap.c | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c index f154ab5..6a06b89 100644 --- a/net/llc/llc_sap.c +++ b/net/llc/llc_sap.c @@ -355,6 +355,24 @@ static inline bool llc_mcast_match(const struct llc_sap *sap, 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. * @sap: SAP @@ -367,25 +385,27 @@ static void llc_sap_mcast(struct llc_sap *sap, const struct llc_addr *laddr, 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; spin_lock_bh(&sap->sk_lock); sk_nulls_for_each_rcu(sk, node, &sap->sk_list) { - struct sk_buff *skb1; if (!llc_mcast_match(sap, laddr, skb, sk)) continue; - skb1 = skb_clone(skb, GFP_ATOMIC); - if (!skb1) - break; - sock_hold(sk); - llc_sap_rcv(sap, skb1, sk); - sock_put(sk); + if (i < count) + stack[i++] = sk; + else { + llc_do_mcast(sap, skb, stack, i); + i = 0; + } } spin_unlock_bh(&sap->sk_lock); + + llc_do_mcast(sap, skb, stack, i); }