public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org,
	Ian Campbell <ian.campbell@citrix.com>,
	Yinghai Lu <yinghai@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH] x86: do not free zero sized per cpu areas
Date: Fri, 19 Mar 2010 12:24:23 -0700	[thread overview]
Message-ID: <4BA3CF67.9000107@kernel.org> (raw)
In-Reply-To: <4B914A61.20409@kernel.org>

From: Ian Campbell <ian.campbell@citrix.com>

This avoids an infinite loop in free_early_partial().

Add a warning to free_early_partial to catch future problems.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/setup_percpu.c |    3 ++-
 kernel/early_res.c             |    5 +++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index ef6370b..89a3205 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -140,7 +140,8 @@ static void __init pcpu_fc_free(void *ptr, size_t size)
 #ifdef CONFIG_NO_BOOTMEM
 	u64 start = __pa(ptr);
 	u64 end = start + size;
-	free_early_partial(start, end);
+	if (start < end)
+		free_early_partial(start, end);
 #else
 	free_bootmem(__pa(ptr), size);
 #endif
diff --git a/kernel/early_res.c b/kernel/early_res.c
index 3cb2c66..f3a861b 100644
--- a/kernel/early_res.c
+++ b/kernel/early_res.c
@@ -333,6 +333,11 @@ void __init free_early_partial(u64 start, u64 end)
 	struct early_res *r;
 	int i;
 
+	if (WARN_ONCE(start >= end,
+		      "free_early_partial got wrong start/end %#llx/%#llx\n",
+		      start, end))
+		return;
+
 try_next:
 	i = find_overlapped_early(start, end);
 	if (i >= max_early_res)
-- 
1.5.6.5

  parent reply	other threads:[~2010-03-19 19:25 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-05 15:03 Infinite loop on boot in free_early_partial due to start==end on tip/master Ian Campbell
2010-03-05 18:16 ` Yinghai Lu
2010-03-05 19:45   ` Ian Campbell
2010-03-05 19:49   ` [PATCH] x86: do not free zero sized per cpu areas Ian Campbell
2010-03-05 19:51     ` Yinghai Lu
2010-03-19 19:24   ` Yinghai Lu [this message]
2010-03-19 21:42     ` H. Peter Anvin
2010-03-19 22:18   ` [PATCH -v3] " Yinghai Lu
2010-03-19 22:21     ` H. Peter Anvin
2010-03-19 23:24       ` Yinghai Lu
2010-03-19 23:29         ` H. Peter Anvin
2010-03-19 23:45           ` [PATCH -v4] " Yinghai Lu
2010-03-20  1:00             ` Linus Torvalds
2010-03-20  1:59               ` [PATCH -v5] " Yinghai Lu
2010-03-20  2:41                 ` Linus Torvalds
2010-03-20  6:38                   ` [PATCH -v6] " Yinghai Lu
2010-03-20  7:12                     ` Ian Campbell
2010-03-22 17:30                     ` [LKML] " Konrad Rzeszutek Wilk
2010-03-19 23:35         ` [PATCH -v3] " Ian Campbell
2010-03-19 23:43           ` Ian Campbell
2010-03-19 23:43           ` H. Peter Anvin
2010-03-19 18:28 ` Infinite loop on boot in free_early_partial due to start==end on tip/master Konrad Rzeszutek Wilk
2010-03-19 19:04   ` Yinghai Lu
2010-03-19 19:34     ` Ian Campbell
2010-03-19 20:04       ` [LKML] " Konrad Rzeszutek Wilk
2010-03-19 21:17         ` Yinghai Lu
2010-03-19 21:37           ` Ian Campbell
2010-03-20  3:37           ` Tejun Heo

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=4BA3CF67.9000107@kernel.org \
    --to=yinghai@kernel.org \
    --cc=hpa@zytor.com \
    --cc=ian.campbell@citrix.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /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