From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: <arnd@arndb.de>, <linux-arch@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linuxppc-dev@lists.ozlabs.org>,
<rostedt@goodmis.org>, <mingo@redhat.com>, <davem@davemloft.net>,
<ast@kernel.org>, <ryabinin.a.a@gmail.com>,
<akpm@linux-foundation.org>
Cc: <mpe@ellerman.id.au>, <benh@kernel.crashing.org>,
<paulus@samba.org>, <bpf@vger.kernel.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v3 9/9] powerpc/mm: Use is_kernel_text() and is_kernel_inittext() helper
Date: Sun, 26 Sep 2021 15:20:48 +0800 [thread overview]
Message-ID: <20210926072048.190336-10-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20210926072048.190336-1-wangkefeng.wang@huawei.com>
Use is_kernel_text() and is_kernel_inittext() helper to simplify code,
also drop etext, _stext, _sinittext, _einittext declaration which
already declared in section.h.
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/powerpc/mm/pgtable_32.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index dcf5ecca19d9..13c798308c2e 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -33,8 +33,6 @@
#include <mm/mmu_decl.h>
-extern char etext[], _stext[], _sinittext[], _einittext[];
-
static u8 early_fixmap_pagetable[FIXMAP_PTE_SIZE] __page_aligned_data;
notrace void __init early_ioremap_init(void)
@@ -104,14 +102,13 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)
{
unsigned long v, s;
phys_addr_t p;
- int ktext;
+ bool ktext;
s = offset;
v = PAGE_OFFSET + s;
p = memstart_addr + s;
for (; s < top; s += PAGE_SIZE) {
- ktext = ((char *)v >= _stext && (char *)v < etext) ||
- ((char *)v >= _sinittext && (char *)v < _einittext);
+ ktext = (is_kernel_text(v) || is_kernel_inittext(v));
map_kernel_page(v, p, ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL);
v += PAGE_SIZE;
p += PAGE_SIZE;
--
2.26.2
next prev parent reply other threads:[~2021-09-26 7:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-26 7:20 [PATCH v3 0/9] sections: Unify kernel sections range check and use Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 1/9] kallsyms: Remove arch specific text and data check Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 2/9] kallsyms: Fix address-checks for kernel related range Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 3/9] sections: Move and rename core_kernel_data() to is_kernel_core_data() Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 4/9] sections: Move is_kernel_inittext() into sections.h Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 5/9] x86: mm: Rename __is_kernel_text() to is_x86_32_kernel_text() Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 6/9] sections: Provide internal __is_kernel() and __is_kernel_text() helper Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 7/9] mm: kasan: Use is_kernel() helper Kefeng Wang
2021-09-26 7:20 ` [PATCH v3 8/9] extable: Use is_kernel_text() helper Kefeng Wang
2021-09-26 7:20 ` Kefeng Wang [this message]
2021-09-28 17:51 ` [PATCH v3 9/9] powerpc/mm: Use is_kernel_text() and is_kernel_inittext() helper Christophe Leroy
2021-09-29 1:14 ` Kefeng Wang
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=20210926072048.190336-10-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=ryabinin.a.a@gmail.com \
/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).