From: Rick Edgecombe <rick.p.edgecombe@intel.com>
To: akpm@linux-foundation.org, jeyu@kernel.org, bpf@vger.kernel.org,
ast@kernel.org, daniel@iogearbox.net, luto@kernel.org,
dave.hansen@linux.intel.com, peterz@infradead.org,
x86@kernel.org, rppt@kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, dan.j.williams@intel.com
Cc: elena.reshetova@intel.com, ira.weiny@intel.com,
Rick Edgecombe <rick.p.edgecombe@intel.com>
Subject: [PATCH RFC 06/10] x86/alternatives: Handle perm_allocs for modules
Date: Fri, 20 Nov 2020 12:24:22 -0800 [thread overview]
Message-ID: <20201120202426.18009-7-rick.p.edgecombe@intel.com> (raw)
In-Reply-To: <20201120202426.18009-1-rick.p.edgecombe@intel.com>
Modules being loaded using perm_allocs may have a separate writable
address. Handle this case in alternatives for operations called during
module loading.
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
---
arch/x86/kernel/alternative.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 2400ad62f330..e6d8a696540b 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -373,7 +373,7 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
struct alt_instr *end)
{
struct alt_instr *a;
- u8 *instr, *replacement;
+ u8 *instr, *writ_instr, *replacement, *writ_replacement;
u8 insn_buff[MAX_PATCH_LEN];
DPRINTK("alt table %px, -> %px", start, end);
@@ -391,11 +391,13 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
instr = (u8 *)&a->instr_offset + a->instr_offset;
replacement = (u8 *)&a->repl_offset + a->repl_offset;
+ writ_instr = (u8 *)module_adjust_writable_addr(instr);
+ writ_replacement = (u8 *)module_adjust_writable_addr(replacement);
BUG_ON(a->instrlen > sizeof(insn_buff));
BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
if (!boot_cpu_has(a->cpuid)) {
if (a->padlen > 1)
- optimize_nops(a, instr);
+ optimize_nops(a, writ_instr);
continue;
}
@@ -403,13 +405,13 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
DPRINTK("feat: %d*32+%d, old: (%pS (%px) len: %d), repl: (%px, len: %d), pad: %d",
a->cpuid >> 5,
a->cpuid & 0x1f,
- instr, instr, a->instrlen,
+ writ_instr, instr, a->instrlen,
replacement, a->replacementlen, a->padlen);
DUMP_BYTES(instr, a->instrlen, "%px: old_insn: ", instr);
DUMP_BYTES(replacement, a->replacementlen, "%px: rpl_insn: ", replacement);
- memcpy(insn_buff, replacement, a->replacementlen);
+ memcpy(insn_buff, writ_replacement, a->replacementlen);
insn_buff_sz = a->replacementlen;
/*
@@ -435,7 +437,7 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
}
DUMP_BYTES(insn_buff, insn_buff_sz, "%px: final_insn: ", instr);
- text_poke_early(instr, insn_buff, insn_buff_sz);
+ text_poke_early(writ_instr, insn_buff, insn_buff_sz);
}
}
@@ -496,6 +498,10 @@ void __init_or_module alternatives_smp_module_add(struct module *mod,
void *text, void *text_end)
{
struct smp_alt_module *smp;
+ void *w_locks = module_adjust_writable_addr(locks);
+ void *w_locks_end = module_adjust_writable_addr(locks_end);
+ void *w_text = module_adjust_writable_addr(text);
+ void *w_text_end = module_adjust_writable_addr(text_end);
mutex_lock(&text_mutex);
if (!uniproc_patched)
@@ -522,7 +528,7 @@ void __init_or_module alternatives_smp_module_add(struct module *mod,
list_add_tail(&smp->next, &smp_alt_modules);
smp_unlock:
- alternatives_smp_unlock(locks, locks_end, text, text_end);
+ alternatives_smp_unlock(w_locks, w_locks_end, w_text, w_text_end);
unlock:
mutex_unlock(&text_mutex);
}
@@ -601,17 +607,18 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
for (p = start; p < end; p++) {
unsigned int used;
+ void *writable = module_adjust_writable_addr(p->instr);
BUG_ON(p->len > MAX_PATCH_LEN);
/* prep the buffer with the original instructions */
- memcpy(insn_buff, p->instr, p->len);
- used = pv_ops.init.patch(p->type, insn_buff, (unsigned long)p->instr, p->len);
+ memcpy(insn_buff, writable, p->len);
+ used = pv_ops.init.patch(p->type, insn_buff, (unsigned long)writable, p->len);
BUG_ON(used > p->len);
/* Pad the rest with nops */
add_nops(insn_buff + used, p->len - used);
- text_poke_early(p->instr, insn_buff, p->len);
+ text_poke_early(writable, insn_buff, p->len);
}
}
extern struct paravirt_patch_site __start_parainstructions[],
--
2.20.1
next prev parent reply other threads:[~2020-11-20 20:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 20:24 [PATCH RFC 00/10] New permission vmalloc interface Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 01/10] vmalloc: Add basic perm alloc implementation Rick Edgecombe
2020-11-22 4:10 ` Andy Lutomirski
2020-11-23 0:01 ` Edgecombe, Rick P
2020-11-24 10:16 ` Christoph Hellwig
2020-11-24 20:00 ` Edgecombe, Rick P
2020-11-23 9:00 ` Christoph Hellwig
2020-11-23 20:44 ` Edgecombe, Rick P
2020-11-24 10:19 ` hch
2020-11-24 19:59 ` Edgecombe, Rick P
2020-12-04 23:24 ` Sean Christopherson
2020-12-07 23:55 ` Edgecombe, Rick P
2020-11-20 20:24 ` [PATCH RFC 02/10] bpf: Use perm_alloc() for BPF JIT filters Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 03/10] module: Use perm_alloc() for modules Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 04/10] module: Support separate writable allocation Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 05/10] x86/modules: Use real perm_allocations Rick Edgecombe
2020-11-20 20:24 ` Rick Edgecombe [this message]
2020-11-20 20:24 ` [PATCH RFC 07/10] x86/unwind: Unwind orc at module writable address Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 08/10] jump_label: Handle " Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 09/10] ftrace: Use " Rick Edgecombe
2020-11-20 20:24 ` [PATCH RFC 10/10] vmalloc: Add perm_alloc x86 implementation Rick Edgecombe
2020-11-22 15:29 ` [vmalloc] 377647beed: WARNING:at_arch/x86/kernel/ftrace.c:#ftrace_verify_code kernel 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=20201120202426.18009-7-rick.p.edgecombe@intel.com \
--to=rick.p.edgecombe@intel.com \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dan.j.williams@intel.com \
--cc=daniel@iogearbox.net \
--cc=dave.hansen@linux.intel.com \
--cc=elena.reshetova@intel.com \
--cc=ira.weiny@intel.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=peterz@infradead.org \
--cc=rppt@kernel.org \
--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).