From patchwork Fri Jun 29 06:15:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 167986 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 445A91007D4 for ; Fri, 29 Jun 2012 16:15:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751162Ab2F2GPS (ORCPT ); Fri, 29 Jun 2012 02:15:18 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:47688 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750991Ab2F2GPQ (ORCPT ); Fri, 29 Jun 2012 02:15:16 -0400 Received: by eaak11 with SMTP id k11so1156019eaa.19 for ; Thu, 28 Jun 2012 23:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=BCUZod2pc7DqfDDgLmoFEV70hDGpTB92g7Zmeqz7T6o=; b=g5IEI9+vS8cMYQ13JOrFkxIfWJc5gDfzIfLkUNquLQotVvdJE4w0xAhYCKuL2JQvPH LdQmJV318gxSaslDWsEde+Tx+It3KT8SVyUQl+4dQXiogRuYGXtpz0AlaCSXX/MYXVKq mOQfRc2t2XPYVBRTrcEquKNMmcz913EQUs7mDS1ZwmduRal9USbnbZpA2WvWYy1b06xx 3t9gMxQoSgYcWmR4RNcgXaKmZzLKf2/8dgNJzS8sKCaAXrQU2nfgnUcBsUTI+bQVXI7q DXEtCDs8k4a0zd54tLT0jRmpZxcv9F3lmEHB52+s7BxfVK8i7e/EfRrBOiVSF8kRDWBB 5cbQ== Received: by 10.180.92.7 with SMTP id ci7mr2598963wib.1.1340950515085; Thu, 28 Jun 2012 23:15:15 -0700 (PDT) Received: from [172.28.88.52] ([74.125.122.49]) by mx.google.com with ESMTPS id bg10sm6187670wib.9.2012.06.28.23.15.14 (version=SSLv3 cipher=OTHER); Thu, 28 Jun 2012 23:15:14 -0700 (PDT) Subject: [PATCH net-next] net: l2tp_eth: provide tx_dropped counter From: Eric Dumazet To: David Miller Cc: netdev Date: Fri, 29 Jun 2012 08:15:13 +0200 Message-ID: <1340950513.29822.103.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet Change l2tp_xmit_skb() to return NET_XMIT_DROP in case skb is dropped. Use kfree_skb() instead dev_kfree_skb() for drop_monitor pleasure. Support tx_dropped counter for l2tp_eth Signed-off-by: Eric Dumazet Cc: James Chapman --- net/l2tp/l2tp_core.c | 11 ++++++----- net/l2tp/l2tp_eth.c | 15 ++++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 32b2155..393355d 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1128,6 +1128,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len int headroom; int uhlen = (tunnel->encap == L2TP_ENCAPTYPE_UDP) ? sizeof(struct udphdr) : 0; int udp_len; + int ret = NET_XMIT_SUCCESS; /* Check that there's enough headroom in the skb to insert IP, * UDP and L2TP headers. If not enough, expand it to @@ -1137,8 +1138,8 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len uhlen + hdr_len; old_headroom = skb_headroom(skb); if (skb_cow_head(skb, headroom)) { - dev_kfree_skb(skb); - goto abort; + kfree_skb(skb); + return NET_XMIT_DROP; } new_headroom = skb_headroom(skb); @@ -1156,7 +1157,8 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len bh_lock_sock(sk); if (sock_owned_by_user(sk)) { - dev_kfree_skb(skb); + kfree_skb(skb); + ret = NET_XMIT_DROP; goto out_unlock; } @@ -1215,8 +1217,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len out_unlock: bh_unlock_sock(sk); -abort: - return 0; + return ret; } EXPORT_SYMBOL_GPL(l2tp_xmit_skb); diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 47b259f..f9ee74d 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -44,6 +44,7 @@ struct l2tp_eth { struct list_head list; atomic_long_t tx_bytes; atomic_long_t tx_packets; + atomic_long_t tx_dropped; atomic_long_t rx_bytes; atomic_long_t rx_packets; atomic_long_t rx_errors; @@ -92,12 +93,15 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct l2tp_eth *priv = netdev_priv(dev); struct l2tp_session *session = priv->session; + unsigned int len = skb->len; + int ret = l2tp_xmit_skb(session, skb, session->hdr_len); - atomic_long_add(skb->len, &priv->tx_bytes); - atomic_long_inc(&priv->tx_packets); - - l2tp_xmit_skb(session, skb, session->hdr_len); - + if (likely(ret == NET_XMIT_SUCCESS)) { + atomic_long_add(len, &priv->tx_bytes); + atomic_long_inc(&priv->tx_packets); + } else { + atomic_long_inc(&priv->tx_dropped); + } return NETDEV_TX_OK; } @@ -108,6 +112,7 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev, stats->tx_bytes = atomic_long_read(&priv->tx_bytes); stats->tx_packets = atomic_long_read(&priv->tx_packets); + stats->tx_dropped = atomic_long_read(&priv->tx_dropped); stats->rx_bytes = atomic_long_read(&priv->rx_bytes); stats->rx_packets = atomic_long_read(&priv->rx_packets); stats->rx_errors = atomic_long_read(&priv->rx_errors);