From: tip-bot for Wen Congyang <wency@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
mingo@kernel.org, minchan@kernel.org, mel@csn.ul.ie,
stable@vger.kernel.org, wency@cn.fujitsu.com, fweisbec@gmail.com,
rostedt@goodmis.org, akpm@linux-foundation.org,
tglx@linutronix.de
Subject: [tip:perf/urgent] tracing: Don't call page_to_pfn() if page is NULL
Date: Fri, 21 Sep 2012 05:37:52 -0700 [thread overview]
Message-ID: <tip-85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa@git.kernel.org> (raw)
In-Reply-To: <505AB1FF.8020104@cn.fujitsu.com>
Commit-ID: 85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa
Gitweb: http://git.kernel.org/tip/85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa
Author: Wen Congyang <wency@cn.fujitsu.com>
AuthorDate: Thu, 20 Sep 2012 14:04:47 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Thu, 20 Sep 2012 15:51:16 -0400
tracing: Don't call page_to_pfn() if page is NULL
When allocating memory fails, page is NULL. page_to_pfn() will
cause the kernel panicked if we don't use sparsemem vmemmap.
Link: http://lkml.kernel.org/r/505AB1FF.8020104@cn.fujitsu.com
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: stable <stable@vger.kernel.org>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/events/kmem.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index 5f889f1..08fa272 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -214,7 +214,7 @@ TRACE_EVENT(mm_page_alloc,
TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
__entry->page,
- page_to_pfn(__entry->page),
+ __entry->page ? page_to_pfn(__entry->page) : 0,
__entry->order,
__entry->migratetype,
show_gfp_flags(__entry->gfp_flags))
@@ -240,7 +240,7 @@ DECLARE_EVENT_CLASS(mm_page,
TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
__entry->page,
- page_to_pfn(__entry->page),
+ __entry->page ? page_to_pfn(__entry->page) : 0,
__entry->order,
__entry->migratetype,
__entry->order == 0)
prev parent reply other threads:[~2012-09-21 12:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 6:04 [PATCH] trace: don't " Wen Congyang
2012-09-20 6:28 ` Minchan Kim
2012-09-20 13:41 ` Steven Rostedt
2012-09-20 13:48 ` Steven Rostedt
2012-09-20 14:24 ` Mel Gorman
2012-09-21 12:37 ` tip-bot for Wen Congyang [this message]
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=tip-85f2a2ef1d0ab99523e0b947a2b723f5650ed6aa@git.kernel.org \
--to=wency@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mel@csn.ul.ie \
--cc=minchan@kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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
Powered by JetHome