Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
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
Message-Id: <20231122092855.4440-3-shijie@os.amperecomputing.com>
In-Reply-To: <20231122092855.4440-1-shijie@os.amperecomputing.com>
References: <20231122092855.4440-1-shijie@os.amperecomputing.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EWKGUL0VhRMabPmxy3qFWoWmeDPfiAeD1DTmts7nn1+6LTWpMf/Vw4L4aiqP?=
 =?us-ascii?Q?R7N/10lTliK7F+JtwbqPvD2Z7i0p99KA7e/SirEbeZRqIMzf8i5sdNc0gtWJ?=
 =?us-ascii?Q?AKnHb16Hr1rpzwyQVN7qBaA/M/ceqbz6n0PNBRFca21zXqU7dy+VMe0hmlhk?=
 =?us-ascii?Q?Tf4DmofOlvucPBUznZ5qtm69/jYAaW1ydR3/7MVsDssoGAQqXB3Vsmn6bFSg?=
 =?us-ascii?Q?uGk8g9cSr3pIoRvA+EMSU3pgkEXnRfLpGiXXEyUyeqC3w0NxnweC9H0YT2Mj?=
 =?us-ascii?Q?KbB2dA5DCINLajpyxwFenFCP/7GWIkML0ffXytJARCsIA+zXxs907p/9m0cB?=
 =?us-ascii?Q?HWgCn+RiBGsqlHreK1sNc4GSFkxRlDNV+XzqDyM2OlJuMGyGy4zuLwTTKM+U?=
 =?us-ascii?Q?38iRpP9uPXd5Rq1BmhThj8tfqotJ6us4g8hqti6RVxS1pOUNqi42ar6BNWvf?=
 =?us-ascii?Q?q/LUyEafkQDtRWbmFp4B3TVPXngHvGTKA1o3ODUTxLkqmuYZWN3C1as/gedi?=
 =?us-ascii?Q?8Qzsk6hyWhOqY7T/Plyy1J2CJZQPXzSOcm7dOz/4yTgrFowLVrgpGouLcVda?=
 =?us-ascii?Q?jbOZbbH0mVowxd/N230Jx4hCCL83Jo9i0rxoTDzIn2/ClaKvtheTwW9pu9+U?=
 =?us-ascii?Q?lHk0ij30fHMoBGZwnd1/1ZeayGKkXgKTbwroIIIXDnp8Wa2IGEoSJymdX/4C?=
 =?us-ascii?Q?SWwosSLZUhptVMGeE/vAQr69CCdyyXy1OxY5DqhLqfzLSNCfl5h3VUqZps3B?=
 =?us-ascii?Q?4RKYrODdINPtzrG4mqH3Bky0fm/FdUv/Wltp+bxEKl+hWAMaoQGpZhpTvCWX?=
 =?us-ascii?Q?zAtjt1T5bsSkqe8u35oC2WryA8627hU1V7YFcquIvF4ArgY+mI1Dzyn1Ag8W?=
 =?us-ascii?Q?piZDYiH60616ZBmKAtpZlWnNd7oEEwCfdKLWUos0zW5x90UmYghGgubhi3zv?=
 =?us-ascii?Q?nYQW7F6BwWh827xC2eiE5P3VhqXVg7MQptWB1mqozsKAxu5X88foovrKGnGJ?=
 =?us-ascii?Q?l8pOhOb8Pip7fdE1V21oQlcOEi1AB0EPWiD+PqrJWokKp5LTNTOQffLDailP?=
 =?us-ascii?Q?r+QVUwJ7xsVeYuDSf4qnViXJx1CZPaKwOrAn6nFx9iSTF7AwjNRfxdXWUfxm?=
 =?us-ascii?Q?teTostKRX8zeo10mFhSQIZu2hQeebDARq2QABpHR9v/4dvAqlgrJ2xdLBlhf?=
 =?us-ascii?Q?64wTAWolVTv8gpDAVYWdaZm687Ok0cy0V47Wxbco6dKs0ESnorgFReeabb8b?=
 =?us-ascii?Q?K66FTdd7RimxPKktTmGGRfWiu+MfmwgqxlTcHMsAhKC8IKw9JZ5Wknie1A+N?=
 =?us-ascii?Q?H8P0pewpbmPthUKhIGPIPTTTphWstLeHtw/83qzLNuIYmWWBdL2/RXPTS5LU?=
 =?us-ascii?Q?7lL8f2hEOEe1Uzsu7ssunGG7ZAl3ZO+dvf4kwusOzFtFAXsz9bw9uzQBJd4Z?=
 =?us-ascii?Q?5yR6nPJ5bC890CmT7gnE+Wgjz3fynr3RxYuYe1ADuGCV89W56ZbAbCvuI6lV?=
 =?us-ascii?Q?II25/dxA9sfsak+JvMgvZhAFMpTD2fyVaeT0CX6NnnPbPjBErWP7eP53H0pY?=
 =?us-ascii?Q?QCrepsWdoX1GUBXiE5ePPsQnT4gxvqzjN5WWVq6uI98NaVOJZJnwK4Tr1NuJ?=
 =?us-ascii?Q?4kaCADZtuCLOq1yzVX5MHMc=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa21e5d5-c202-4ad2-8287-08dbeb3d8f90
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB7975.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2023 09:29:43.9654
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yo83bd2K29ZBU2doqssWgpeoT6cTPDq3FugHG7cfvsJ19fkgMg8riBQ5K+3w529K72K4I8cYkTz8UjBNpF7UB0Kyf/EQupacCvE1QrwNLlGqor0ScJHVbQ3XpeNKQOn/
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR01MB6760
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 22 Nov 2023 01:30:19 -0800 (PST)

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