From: tip-bot for Minfei Huang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, mingo@kernel.org,
torvalds@linux-foundation.org, mnfhuang@gmail.com, hpa@zytor.com,
linux-kernel@vger.kernel.org
Subject: [tip:x86/mm] x86/mm: Avoid overlap the fixmap area on i386
Date: Tue, 28 Oct 2014 04:24:34 -0700 [thread overview]
Message-ID: <tip-96e70f83285676d8794f62f3c294d0247bef6b21@git.kernel.org> (raw)
In-Reply-To: <6B680A9E-6CE9-4C96-934B-CB01DCB58278@gmail.com>
Commit-ID: 96e70f83285676d8794f62f3c294d0247bef6b21
Gitweb: http://git.kernel.org/tip/96e70f83285676d8794f62f3c294d0247bef6b21
Author: Minfei Huang <mnfhuang@gmail.com>
AuthorDate: Thu, 23 Oct 2014 23:36:17 +0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 28 Oct 2014 12:21:48 +0100
x86/mm: Avoid overlap the fixmap area on i386
It is a problem when configuring high memory off where the
vmalloc reserve area could end up overlapping the early_ioremap
fixmap area on i386.
The ordering of the VMALLOC_RESERVE space is:
FIXADDR_TOP
fixed_addresses
FIXADDR_START
early_ioremap fixed addresses
FIXADDR_BOOT_START
Persistent kmap area
PKMAP_BASE
VMALLOC_END
Vmalloc area
VMALLOC_START
high_memory
The available address we can use is lower than
FIXADDR_BOOT_START. So we will set the kmap boundary below the
FIXADDR_BOOT_START, if we configure high memory.
If we configure high memory, the vmalloc reserve area should
end up to PKMAP_BASE, otherwise should end up to
FIXADDR_BOOT_START.
Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/6B680A9E-6CE9-4C96-934B-CB01DCB58278@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/pgtable_32_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
index ed5903b..2ac5fc8 100644
--- a/arch/x86/include/asm/pgtable_32_types.h
+++ b/arch/x86/include/asm/pgtable_32_types.h
@@ -43,7 +43,7 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
#ifdef CONFIG_HIGHMEM
# define VMALLOC_END (PKMAP_BASE - 2 * PAGE_SIZE)
#else
-# define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
+# define VMALLOC_END (FIXADDR_BOOT_START - 2 * PAGE_SIZE)
#endif
#define MODULES_VADDR VMALLOC_START
prev parent reply other threads:[~2014-10-28 11:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-23 15:36 [PATCH] mm: Avoid overlap the fixmap area on i386 Minfei Huang
2014-10-28 11:06 ` Thomas Gleixner
2014-10-28 17:24 ` H. Peter Anvin
2014-10-28 17:29 ` Thomas Gleixner
2014-10-29 3:14 ` H. Peter Anvin
2014-10-29 4:30 ` Minfei Huang
2014-10-28 11:24 ` tip-bot for Minfei Huang [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-96e70f83285676d8794f62f3c294d0247bef6b21@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mnfhuang@gmail.com \
--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