From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: David Miller <davem@davemloft.net>
Cc: Neil Horman <nhorman@tuxdriver.com>,
Wei Yongjun <yjwei@cn.fujitsu.com>,
Netdev <netdev@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH resend] drop_monitor: fix trace_napi_poll_hit()
Date: Mon, 31 Aug 2009 14:10:43 +0800 [thread overview]
Message-ID: <4A9B6963.5090207@cn.fujitsu.com> (raw)
The net_dev of backlog napi is NULL, like below:
__get_cpu_var(softnet_data).backlog.dev == NULL
So, we should check it in napi tracepoint's probe function
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
net/core/drop_monitor.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 9d66fa9..d311202 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -182,7 +182,8 @@ static void trace_napi_poll_hit(struct napi_struct *napi)
/*
* Ratelimit our check time to dm_hw_check_delta jiffies
*/
- if (!time_after(jiffies, napi->dev->last_rx + dm_hw_check_delta))
+ if (!napi->dev ||
+ !time_after(jiffies, napi->dev->last_rx + dm_hw_check_delta))
return;
rcu_read_lock();
--
1.6.1.2
next reply other threads:[~2009-08-31 6:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-31 6:10 Xiao Guangrong [this message]
2009-08-31 6:31 ` [PATCH resend] drop_monitor: fix trace_napi_poll_hit() Eric Dumazet
2009-08-31 11:12 ` Neil Horman
2009-08-31 11:47 ` David Miller
2009-08-31 13:33 ` Eric Dumazet
2009-08-31 15:42 ` Neil Horman
2009-08-31 16:34 ` [PATCH net-next-2.6] drivers: Kill now superfluous ->last_rx stores Eric Dumazet
2009-08-31 17:37 ` Neil Horman
2009-09-03 6:09 ` David Miller
2009-09-02 1:20 ` [PATCH resend] drop_monitor: fix trace_napi_poll_hit() David Miller
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=4A9B6963.5090207@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=yjwei@cn.fujitsu.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).