From: Daniel Axtens <dja@axtens.net>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org,
linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, kasan-dev@googlegroups.com,
christophe.leroy@c-s.fr, aneesh.kumar@linux.ibm.com,
bsingharora@gmail.com
Cc: Daniel Axtens <dja@axtens.net>
Subject: [PATCH v2 2/4] kasan: use MAX_PTRS_PER_* for early shadow
Date: Tue, 10 Dec 2019 15:47:12 +1100 [thread overview]
Message-ID: <20191210044714.27265-3-dja@axtens.net> (raw)
Message-ID: <20191210044712.4QhqTZByll5-g_UPrNCpxkpsGKmiq_wMzQjdQIaiJeE@z> (raw)
In-Reply-To: <20191210044714.27265-1-dja@axtens.net>
This helps with powerpc support, and should have no effect on
anything else.
Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
include/linux/kasan.h | 6 +++---
mm/kasan/init.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index e18fe54969e9..d2f2a4ffcb12 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -15,9 +15,9 @@ struct task_struct;
#include <asm/pgtable.h>
extern unsigned char kasan_early_shadow_page[PAGE_SIZE];
-extern pte_t kasan_early_shadow_pte[PTRS_PER_PTE];
-extern pmd_t kasan_early_shadow_pmd[PTRS_PER_PMD];
-extern pud_t kasan_early_shadow_pud[PTRS_PER_PUD];
+extern pte_t kasan_early_shadow_pte[MAX_PTRS_PER_PTE];
+extern pmd_t kasan_early_shadow_pmd[MAX_PTRS_PER_PMD];
+extern pud_t kasan_early_shadow_pud[MAX_PTRS_PER_PUD];
extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D];
int kasan_populate_early_shadow(const void *shadow_start,
diff --git a/mm/kasan/init.c b/mm/kasan/init.c
index ce45c491ebcd..8b54a96d3b3e 100644
--- a/mm/kasan/init.c
+++ b/mm/kasan/init.c
@@ -46,7 +46,7 @@ static inline bool kasan_p4d_table(pgd_t pgd)
}
#endif
#if CONFIG_PGTABLE_LEVELS > 3
-pud_t kasan_early_shadow_pud[PTRS_PER_PUD] __page_aligned_bss;
+pud_t kasan_early_shadow_pud[MAX_PTRS_PER_PUD] __page_aligned_bss;
static inline bool kasan_pud_table(p4d_t p4d)
{
return p4d_page(p4d) == virt_to_page(lm_alias(kasan_early_shadow_pud));
@@ -58,7 +58,7 @@ static inline bool kasan_pud_table(p4d_t p4d)
}
#endif
#if CONFIG_PGTABLE_LEVELS > 2
-pmd_t kasan_early_shadow_pmd[PTRS_PER_PMD] __page_aligned_bss;
+pmd_t kasan_early_shadow_pmd[MAX_PTRS_PER_PMD] __page_aligned_bss;
static inline bool kasan_pmd_table(pud_t pud)
{
return pud_page(pud) == virt_to_page(lm_alias(kasan_early_shadow_pmd));
@@ -69,7 +69,7 @@ static inline bool kasan_pmd_table(pud_t pud)
return false;
}
#endif
-pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss;
+pte_t kasan_early_shadow_pte[MAX_PTRS_PER_PTE] __page_aligned_bss;
static inline bool kasan_pte_table(pmd_t pmd)
{
--
2.20.1
next prev parent reply other threads:[~2019-12-10 4:47 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 4:47 [PATCH v2 0/4] KASAN for powerpc64 radix, plus generic mm change Daniel Axtens
2019-12-10 4:47 ` Daniel Axtens
2019-12-10 4:47 ` [PATCH v2 1/4] mm: define MAX_PTRS_PER_{PTE,PMD,PUD} Daniel Axtens
2019-12-10 4:47 ` Daniel Axtens
2019-12-10 6:35 ` Christophe Leroy
2019-12-10 6:35 ` Christophe Leroy
2019-12-10 9:35 ` Balbir Singh
2019-12-10 9:35 ` Balbir Singh
2019-12-10 10:39 ` kbuild test robot
2019-12-10 10:39 ` kbuild test robot
2019-12-10 4:47 ` Daniel Axtens [this message]
2019-12-10 4:47 ` [PATCH v2 2/4] kasan: use MAX_PTRS_PER_* for early shadow Daniel Axtens
2019-12-10 6:40 ` Christophe Leroy
2019-12-10 6:40 ` Christophe Leroy
2019-12-10 9:36 ` Balbir Singh
2019-12-10 9:36 ` Balbir Singh
2019-12-10 14:39 ` Christophe Leroy
2019-12-10 14:39 ` Christophe Leroy
2019-12-10 4:47 ` [PATCH v2 3/4] kasan: Document support on 32-bit powerpc Daniel Axtens
2019-12-10 4:47 ` Daniel Axtens
2019-12-10 6:40 ` Christophe Leroy
2019-12-10 6:40 ` Christophe Leroy
2019-12-10 4:47 ` [PATCH v2 4/4] powerpc: Book3S 64-bit "heavyweight" KASAN support Daniel Axtens
2019-12-10 4:47 ` Daniel Axtens
2019-12-10 7:21 ` Christophe Leroy
2019-12-10 7:21 ` Christophe Leroy
2019-12-12 13:41 ` Daniel Axtens
2019-12-12 13:41 ` Daniel Axtens
2019-12-10 10:57 ` Balbir Singh
2019-12-10 10:57 ` Balbir Singh
2019-12-11 5:21 ` Daniel Axtens
2019-12-11 5:21 ` Daniel Axtens
2019-12-11 8:57 ` Balbir Singh
2019-12-11 8:57 ` Balbir Singh
2019-12-11 14:24 ` Daniel Axtens
2019-12-11 14:24 ` Daniel Axtens
2019-12-12 7:42 ` Balbir Singh
2019-12-12 7:42 ` Balbir Singh
2019-12-12 9:38 ` Christophe Leroy
2019-12-12 9:38 ` Christophe Leroy
2019-12-12 9:56 ` Andrey Ryabinin
2019-12-12 9:56 ` Andrey Ryabinin
2019-12-10 11:20 ` kbuild test robot
2019-12-10 11:20 ` kbuild test robot
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=20191210044714.27265-3-dja@axtens.net \
--to=dja@axtens.net \
--cc=aneesh.kumar@linux.ibm.com \
--cc=bsingharora@gmail.com \
--cc=christophe.leroy@c-s.fr \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.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).