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/mm: Recompute physical address for every page of per-CPU CEA mapping
Date: Tue, 15 Nov 2022 22:26:24 -0000 [thread overview]
Message-ID: <166855118442.4906.2253990342203519446.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221110203504.1985010-2-seanjc@google.com>
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 991ab455645118e83fe9f2f9aea6ee383908ffd4
Gitweb: https://git.kernel.org/tip/991ab455645118e83fe9f2f9aea6ee383908ffd4
Author: Sean Christopherson <seanjc@google.com>
AuthorDate: Thu, 10 Nov 2022 20:35:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 15 Nov 2022 22:29:58 +01:00
x86/mm: Recompute physical address for every page of per-CPU CEA mapping
Recompute the physical address for each per-CPU page in the CPU entry
area, a recent commit inadvertantly modified cea_map_percpu_pages() such
that every PTE is mapped to the physical address of the first page.
Fixes: 9fd429c28073 ("x86/kasan: Map shadow for percpu pages on demand")
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-2-seanjc@google.com
---
arch/x86/mm/cpu_entry_area.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/cpu_entry_area.c b/arch/x86/mm/cpu_entry_area.c
index dff9001..d831aae 100644
--- a/arch/x86/mm/cpu_entry_area.c
+++ b/arch/x86/mm/cpu_entry_area.c
@@ -97,7 +97,7 @@ cea_map_percpu_pages(void *cea_vaddr, void *ptr, int pages, pgprot_t prot)
early_pfn_to_nid(PFN_DOWN(pa)));
for ( ; pages; pages--, cea_vaddr+= PAGE_SIZE, ptr += PAGE_SIZE)
- cea_set_pte(cea_vaddr, pa, prot);
+ cea_set_pte(cea_vaddr, per_cpu_ptr_to_phys(ptr), prot);
}
static void __init percpu_setup_debug_store(unsigned int cpu)
next prev parent reply other threads:[~2022-11-15 22:27 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-bot2 for Sean Christopherson [this message]
2022-12-17 18:55 ` [tip: x86/mm] " 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
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=166855118442.4906.2253990342203519446.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®