From: Laura Abbott <labbott@redhat.com>
To: Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Will Deacon <will.deacon@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Laura Abbott <labbott@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Andrew Morton <akpm@linux-foundation.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
linux-arm-kernel@lists.infradead.org,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
kasan-dev@googlegroups.com
Subject: [PATCHv5 09/11] mm/kasan: Switch to using __pa_symbol and lm_alias
Date: Tue, 6 Dec 2016 15:50:55 -0800 [thread overview]
Message-ID: <1481068257-6367-10-git-send-email-labbott@redhat.com> (raw)
In-Reply-To: <1481068257-6367-1-git-send-email-labbott@redhat.com>
__pa_symbol is the correct API to find the physical address of symbols.
Switch to it to allow for debugging APIs to work correctly. Other
functions such as p*d_populate may call __pa internally. Ensure that the
address passed is in the linear region by calling lm_alias.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v5: Add missing lm_alias call
---
mm/kasan/kasan_init.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/mm/kasan/kasan_init.c b/mm/kasan/kasan_init.c
index 3f9a41c..922f459 100644
--- a/mm/kasan/kasan_init.c
+++ b/mm/kasan/kasan_init.c
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/memblock.h>
#include <linux/pfn.h>
+#include <linux/mm.h>
#include <asm/page.h>
#include <asm/pgalloc.h>
@@ -49,7 +50,7 @@ static void __init zero_pte_populate(pmd_t *pmd, unsigned long addr,
pte_t *pte = pte_offset_kernel(pmd, addr);
pte_t zero_pte;
- zero_pte = pfn_pte(PFN_DOWN(__pa(kasan_zero_page)), PAGE_KERNEL);
+ zero_pte = pfn_pte(PFN_DOWN(__pa_symbol(kasan_zero_page)), PAGE_KERNEL);
zero_pte = pte_wrprotect(zero_pte);
while (addr + PAGE_SIZE <= end) {
@@ -69,7 +70,7 @@ static void __init zero_pmd_populate(pud_t *pud, unsigned long addr,
next = pmd_addr_end(addr, end);
if (IS_ALIGNED(addr, PMD_SIZE) && end - addr >= PMD_SIZE) {
- pmd_populate_kernel(&init_mm, pmd, kasan_zero_pte);
+ pmd_populate_kernel(&init_mm, pmd, lm_alias(kasan_zero_pte));
continue;
}
@@ -92,9 +93,9 @@ static void __init zero_pud_populate(pgd_t *pgd, unsigned long addr,
if (IS_ALIGNED(addr, PUD_SIZE) && end - addr >= PUD_SIZE) {
pmd_t *pmd;
- pud_populate(&init_mm, pud, kasan_zero_pmd);
+ pud_populate(&init_mm, pud, lm_alias(kasan_zero_pmd));
pmd = pmd_offset(pud, addr);
- pmd_populate_kernel(&init_mm, pmd, kasan_zero_pte);
+ pmd_populate_kernel(&init_mm, pmd, lm_alias(kasan_zero_pte));
continue;
}
@@ -135,11 +136,11 @@ void __init kasan_populate_zero_shadow(const void *shadow_start,
* puds,pmds, so pgd_populate(), pud_populate()
* is noops.
*/
- pgd_populate(&init_mm, pgd, kasan_zero_pud);
+ pgd_populate(&init_mm, pgd, lm_alias(kasan_zero_pud));
pud = pud_offset(pgd, addr);
- pud_populate(&init_mm, pud, kasan_zero_pmd);
+ pud_populate(&init_mm, pud, lm_alias(kasan_zero_pmd));
pmd = pmd_offset(pud, addr);
- pmd_populate_kernel(&init_mm, pmd, kasan_zero_pte);
+ pmd_populate_kernel(&init_mm, pmd, lm_alias(kasan_zero_pte));
continue;
}
--
2.7.4
next prev parent reply other threads:[~2016-12-06 23:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-06 23:50 [PATCHv5 00/11] CONFIG_DEBUG_VIRTUAL for arm64 Laura Abbott
2016-12-06 23:50 ` [PATCHv5 01/11] lib/Kconfig.debug: Add ARCH_HAS_DEBUG_VIRTUAL Laura Abbott
2016-12-06 23:50 ` [PATCHv5 02/11] mm/cma: Cleanup highmem check Laura Abbott
2016-12-06 23:50 ` [PATCHv5 03/11] arm64: Move some macros under #ifndef __ASSEMBLY__ Laura Abbott
2016-12-06 23:50 ` [PATCHv5 04/11] arm64: Add cast for virt_to_pfn Laura Abbott
2016-12-06 23:50 ` [PATCHv5 05/11] mm: Introduce lm_alias Laura Abbott
2016-12-06 23:50 ` [PATCHv5 06/11] arm64: Use __pa_symbol for kernel symbols Laura Abbott
2016-12-13 12:31 ` Mark Rutland
2016-12-06 23:50 ` [PATCHv5 07/11] drivers: firmware: psci: Use __pa_symbol for kernel symbol Laura Abbott
2016-12-06 23:50 ` [PATCHv5 08/11] kexec: Switch to __pa_symbol Laura Abbott
2016-12-06 23:50 ` Laura Abbott [this message]
2016-12-13 12:31 ` [PATCHv5 09/11] mm/kasan: Switch to using __pa_symbol and lm_alias Mark Rutland
2016-12-06 23:50 ` [PATCHv5 10/11] mm/usercopy: Switch to using lm_alias Laura Abbott
2016-12-06 23:50 ` [PATCHv5 11/11] arm64: Add support for CONFIG_DEBUG_VIRTUAL Laura Abbott
2016-12-08 18:59 ` [PATCH v2 0/4] ARM: " Florian Fainelli
2016-12-08 18:59 ` [PATCH v2 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2016-12-08 18:59 ` [PATCH v2 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2016-12-08 18:59 ` [PATCH v2 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-08 18:59 ` [PATCH v2 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2016-12-08 21:49 ` kbuild test robot
2016-12-09 23:36 ` [PATCH v3 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-09 23:36 ` [PATCH v3 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2016-12-14 7:08 ` Boris Brezillon
2016-12-09 23:36 ` [PATCH v3 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2016-12-09 23:36 ` [PATCH v3 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-22 2:40 ` Laura Abbott
2016-12-09 23:36 ` [PATCH v3 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2016-12-13 20:29 ` [PATCH v3 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-26 20:38 ` [PATCH v4 " Florian Fainelli
2016-12-26 20:38 ` [PATCH v4 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2016-12-26 20:38 ` [PATCH v4 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2016-12-26 20:38 ` [PATCH v4 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-26 20:38 ` [PATCH v4 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2017-01-02 14:10 ` [PATCH v4 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Russell King - ARM Linux
2016-12-13 13:50 ` [PATCHv5 00/11] CONFIG_DEBUG_VIRTUAL for arm64 Mark Rutland
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=1481068257-6367-10-git-send-email-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=hpa@zytor.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).