From: dserrg@gmail.com (Sergey Dyasly)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: LPAE: don't reject mapping /dev/mem above 4GB
Date: Thu, 27 Jun 2013 21:24:35 +0400 [thread overview]
Message-ID: <1372353875-3262-1-git-send-email-dserrg@gmail.com> (raw)
With LPAE enabled, physical address space is larger than 4GB. Allow mapping any
part of it via /dev/mem by utilizing the same check as in arm64.
Reported-by: Vassili Karpov <av1474@comtv.ru>
Tested-by: Vassili Karpov <av1474@comtv.ru>
Signed-off-by: Sergey Dyasly <dserrg@gmail.com>
---
arch/arm/mm/mmap.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index 10062ce..8f1bbbc 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -203,6 +203,15 @@ int valid_phys_addr_range(phys_addr_t addr, size_t size)
return 1;
}
+#ifdef CONFIG_ARM_LPAE
+/*
+ * Do not allow /dev/mem mappings beyond the supported physical range.
+ */
+int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
+{
+ return !(((pfn << PAGE_SHIFT) + size) & ~PHYS_MASK);
+}
+#else
/*
* We don't use supersection mappings for mmap() on /dev/mem, which
* means that we can't map the memory area above the 4G barrier into
@@ -212,6 +221,7 @@ int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
{
return !(pfn + (size >> PAGE_SHIFT) > 0x00100000);
}
+#endif
#ifdef CONFIG_STRICT_DEVMEM
--
1.8.1.2
next reply other threads:[~2013-06-27 17:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-27 17:24 Sergey Dyasly [this message]
2013-06-28 9:00 ` [PATCH] ARM: LPAE: don't reject mapping /dev/mem above 4GB Catalin Marinas
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=1372353875-3262-1-git-send-email-dserrg@gmail.com \
--to=dserrg@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.