From: Huang Shijie <shijie@os.amperecomputing.com>
To: catalin.marinas@arm.com
Cc: will@kernel.org, mark.rutland@arm.com, suzuki.poulose@arm.com,
broonie@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, anshuman.khandual@arm.com,
robh@kernel.org, oliver.upton@linux.dev, maz@kernel.org,
patches@amperecomputing.com,
Huang Shijie <shijie@os.amperecomputing.com>
Subject: [PATCH 2/4] arm64: alternative: handle the kernel exception table
Date: Wed, 22 Nov 2023 17:28:53 +0800 [thread overview]
Message-ID: <20231122092855.4440-3-shijie@os.amperecomputing.com> (raw)
In-Reply-To: <20231122092855.4440-1-shijie@os.amperecomputing.com>
In arch/arm64/lib/copy_templates.S, some macros involve kernel exception table,
such as ldp1/stp1/strh1/str1,etc. Current alternative_if does not support
to embed them.
This patch adds the support to embed them into alternative_if:
1.) Modify the @insn to the right address,
2.) Sort the kernel exception table.
Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
---
arch/arm64/kernel/alternative.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c
index 8ff6610af496..4c73f9cc9a85 100644
--- a/arch/arm64/kernel/alternative.c
+++ b/arch/arm64/kernel/alternative.c
@@ -19,6 +19,7 @@
#include <asm/sections.h>
#include <asm/vdso.h>
#include <linux/stop_machine.h>
+#include <linux/extable.h>
#define __ALT_PTR(a, f) ((void *)&(a)->f + (a)->f)
#define ALT_ORIG_PTR(a) __ALT_PTR(a, orig_offset)
@@ -101,6 +102,22 @@ static __always_inline u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr,
return insn;
}
+/* Check the kernel exception table */
+static void check_extable(__le32 *origptr, __le32 *updptr, __le32 *replptr)
+{
+ struct exception_table_entry *e;
+ unsigned long addr = (unsigned long)replptr;
+
+ e = (struct exception_table_entry *)search_kernel_exception_table(addr);
+ if (e) {
+ /* Modify the @insn to the right address */
+ e->insn = cpu_to_le32((int)((long)(origptr) - (long)(&e->insn)));
+
+ /* Sort the kernel exception table */
+ __sort_main_extable();
+ }
+}
+
static noinstr void patch_alternative(struct alt_instr *alt,
__le32 *origptr, __le32 *updptr, int nr_inst)
{
@@ -112,6 +129,7 @@ static noinstr void patch_alternative(struct alt_instr *alt,
u32 insn;
insn = get_alt_insn(alt, origptr + i, replptr + i);
+ check_extable(origptr + i, updptr + i, replptr + i);
updptr[i] = cpu_to_le32(insn);
}
}
--
2.40.1
next prev parent reply other threads:[~2023-11-22 9:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 9:28 [PATCH 0/4] arm64: an optimization for AmpereOne Huang Shijie
2023-11-22 9:28 ` [PATCH 1/4] extable: add __sort_main_extable Huang Shijie
2023-11-22 9:28 ` Huang Shijie [this message]
2023-11-22 9:28 ` [PATCH 3/4] arm64: copy_template.S: add loop_for_copy_128_bytes macro Huang Shijie
2023-11-22 9:28 ` [PATCH 4/4] arm64: add software prefetches for AmpereOne Huang Shijie
2023-11-22 11:34 ` Robin Murphy
2023-11-22 9:48 ` [PATCH 0/4] arm64: an optimization " Will Deacon
2023-11-22 11:40 ` Mark Rutland
2023-11-22 12:11 ` Marc Zyngier
2023-11-23 7:59 ` Linus Walleij
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=20231122092855.4440-3-shijie@os.amperecomputing.com \
--to=shijie@os.amperecomputing.com \
--cc=anshuman.khandual@arm.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=patches@amperecomputing.com \
--cc=robh@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=will@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®