From: "tip-bot2 for Sean Christopherson" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sean Christopherson <seanjc@google.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/mm] x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names
Date: Sat, 17 Dec 2022 18:55:29 -0000 [thread overview]
Message-ID: <167130332996.4906.17918341321563753453.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221110203504.1985010-4-seanjc@google.com>
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 7077d2ccb94dafd00b29cc2d601c9f6891648f5b
Gitweb: https://git.kernel.org/tip/7077d2ccb94dafd00b29cc2d601c9f6891648f5b
Author: Sean Christopherson <seanjc@google.com>
AuthorDate: Thu, 10 Nov 2022 20:35:02
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00
x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names
Rename the CPU entry area variables in kasan_init() to shorten their
names, a future fix will reference the beginning of the per-CPU portion
of the CPU entry area, and shadow_cpu_entry_per_cpu_begin is a bit much.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Link: https://lkml.kernel.org/r/20221110203504.1985010-4-seanjc@google.com
---
arch/x86/mm/kasan_init_64.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index d141692..ad7872a 100644
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -331,7 +331,7 @@ void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid)
void __init kasan_init(void)
{
int i;
- void *shadow_cpu_entry_begin, *shadow_cpu_entry_end;
+ void *shadow_cea_begin, *shadow_cea_end;
memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt));
@@ -372,16 +372,16 @@ void __init kasan_init(void)
map_range(&pfn_mapped[i]);
}
- shadow_cpu_entry_begin = (void *)CPU_ENTRY_AREA_BASE;
- shadow_cpu_entry_begin = kasan_mem_to_shadow(shadow_cpu_entry_begin);
- shadow_cpu_entry_begin = (void *)round_down(
- (unsigned long)shadow_cpu_entry_begin, PAGE_SIZE);
+ shadow_cea_begin = (void *)CPU_ENTRY_AREA_BASE;
+ shadow_cea_begin = kasan_mem_to_shadow(shadow_cea_begin);
+ shadow_cea_begin = (void *)round_down(
+ (unsigned long)shadow_cea_begin, PAGE_SIZE);
- shadow_cpu_entry_end = (void *)(CPU_ENTRY_AREA_BASE +
+ shadow_cea_end = (void *)(CPU_ENTRY_AREA_BASE +
CPU_ENTRY_AREA_MAP_SIZE);
- shadow_cpu_entry_end = kasan_mem_to_shadow(shadow_cpu_entry_end);
- shadow_cpu_entry_end = (void *)round_up(
- (unsigned long)shadow_cpu_entry_end, PAGE_SIZE);
+ shadow_cea_end = kasan_mem_to_shadow(shadow_cea_end);
+ shadow_cea_end = (void *)round_up(
+ (unsigned long)shadow_cea_end, PAGE_SIZE);
kasan_populate_early_shadow(
kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM),
@@ -403,9 +403,9 @@ void __init kasan_init(void)
kasan_populate_early_shadow(
kasan_mem_to_shadow((void *)VMALLOC_END + 1),
- shadow_cpu_entry_begin);
+ shadow_cea_begin);
- kasan_populate_early_shadow(shadow_cpu_entry_end,
+ kasan_populate_early_shadow(shadow_cea_end,
kasan_mem_to_shadow((void *)__START_KERNEL_map));
kasan_populate_shadow((unsigned long)kasan_mem_to_shadow(_stext),
next prev parent reply other threads:[~2022-12-17 18:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 20:34 [PATCH v2 0/5] x86/kasan: Bug fixes for recent CEA changes Sean Christopherson
2022-11-10 20:35 ` [PATCH v2 1/5] x86/mm: Recompute physical address for every page of per-CPU CEA mapping Sean Christopherson
2022-11-14 14:09 ` Andrey Ryabinin
2022-11-15 22:26 ` [tip: x86/mm] " tip-bot2 for Sean Christopherson
2022-12-17 18:55 ` tip-bot2 for Sean Christopherson
2022-11-10 20:35 ` [PATCH v2 2/5] x86/mm: Populate KASAN shadow for entire per-CPU range of CPU entry area Sean Christopherson
2022-11-14 14:10 ` Andrey Ryabinin
2022-11-15 22:26 ` [tip: x86/mm] " tip-bot2 for Sean Christopherson
2022-12-17 18:55 ` tip-bot2 for Sean Christopherson
2022-11-10 20:35 ` [PATCH v2 3/5] x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names Sean Christopherson
2022-11-14 14:10 ` Andrey Ryabinin
2022-11-15 22:26 ` [tip: x86/mm] " tip-bot2 for Sean Christopherson
2022-12-17 18:55 ` tip-bot2 for Sean Christopherson [this message]
2022-11-10 20:35 ` [PATCH v2 4/5] x86/kasan: Add helpers to align shadow addresses up and down Sean Christopherson
2022-11-14 14:13 ` Andrey Ryabinin
2022-11-15 22:26 ` [tip: x86/mm] " tip-bot2 for Sean Christopherson
2022-12-17 18:55 ` tip-bot2 for Sean Christopherson
2022-11-10 20:35 ` [PATCH v2 5/5] x86/kasan: Populate shadow for shared chunk of the CPU entry area Sean Christopherson
2022-11-14 14:44 ` Andrey Ryabinin
2022-11-14 15:12 ` Peter Zijlstra
2022-11-14 17:53 ` Sean Christopherson
2022-11-14 21:46 ` Peter Zijlstra
2022-11-15 22:26 ` [tip: x86/mm] " tip-bot2 for Sean Christopherson
2022-12-17 18:55 ` tip-bot2 for Sean Christopherson
2022-11-14 11:57 ` [PATCH v2 0/5] x86/kasan: Bug fixes for recent CEA changes Peter Zijlstra
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=167130332996.4906.17918341321563753453.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=ryabinin.a.a@gmail.com \
--cc=seanjc@google.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
all inboxes | Powered by JetHome®