From: Florian Fainelli <f.fainelli@gmail.com>
To: David Ahern <dsahern@gmail.com>, netdev@vger.kernel.org
Cc: Scott Feldman <sfeldma@gmail.com>, Jiri Pirko <jiri@resnulli.us>
Subject: Re: [PATCH] net: rocker: Add basic netdev counters
Date: Wed, 14 Jan 2015 14:57:00 -0800 [thread overview]
Message-ID: <54B6F43C.4030207@gmail.com> (raw)
In-Reply-To: <1421275161-99434-1-git-send-email-dsahern@gmail.com>
On 14/01/15 14:39, David Ahern wrote:
> Add packet and byte counters for RX and TX paths.
>
> $ ifconfig eth1
> eth1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
> inet6 fe80::5054:ff:fe12:3501 prefixlen 64 scopeid 0x20<link>
> ether 52:54:00:12:35:01 txqueuelen 1000 (Ethernet)
> RX packets 63 bytes 15813 (15.4 KiB)
> RX errors 0 dropped 0 overruns 0 frame 0
> TX packets 79 bytes 17991 (17.5 KiB)
> TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
>
> Signed-off-by: David Ahern <dsahern@gmail.com>
> Cc: Scott Feldman <sfeldma@gmail.com>
> Cc: Jiri Pirko <jiri@resnulli.us>
> ---
> drivers/net/ethernet/rocker/rocker.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
> index 2f398fa4b9e6..9743279d9121 100644
> --- a/drivers/net/ethernet/rocker/rocker.c
> +++ b/drivers/net/ethernet/rocker/rocker.c
> @@ -3557,6 +3557,9 @@ static netdev_tx_t rocker_port_xmit(struct sk_buff *skb, struct net_device *dev)
> if (!desc_info)
> netif_stop_queue(dev);
>
> + dev->stats.tx_packets++;
> + dev->stats.tx_bytes += skb->len;
Potential use after free, the skb pointer is certainly not valid anymore
here.
BTW, increasing statistics here is valid because this is a driver for a
virtual piece of HW, which does not have TX reclaim/completion logic,
but if it did, statistics update should occur there, not in the
ndo_start_xmit() function.
> +
> return NETDEV_TX_OK;
>
> unmap_frags:
> @@ -3565,6 +3568,8 @@ static netdev_tx_t rocker_port_xmit(struct sk_buff *skb, struct net_device *dev)
> rocker_tlv_nest_cancel(desc_info, frags);
> out:
> dev_kfree_skb(skb);
> + dev->stats.tx_dropped++;
> +
> return NETDEV_TX_OK;
> }
>
> @@ -3890,6 +3895,9 @@ static int rocker_port_rx_proc(struct rocker *rocker,
> skb->protocol = eth_type_trans(skb, rocker_port->dev);
> netif_receive_skb(skb);
>
> + rocker_port->dev->stats.rx_packets++;
> + rocker_port->dev->stats.rx_bytes += skb->len;
Same here, past netif_receive_skb() you should not assume that this skb
reference is valid.
> +
> return rocker_dma_rx_ring_skb_alloc(rocker, rocker_port, desc_info);
> }
>
>
--
Florian
next prev parent reply other threads:[~2015-01-14 22:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 22:39 [PATCH] net: rocker: Add basic netdev counters David Ahern
2015-01-14 22:57 ` Florian Fainelli [this message]
2015-01-14 23:54 ` David Ahern
2015-01-16 19:53 ` Scott Feldman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54B6F43C.4030207@gmail.com \
--to=f.fainelli@gmail.com \
--cc=dsahern@gmail.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=sfeldma@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).