Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
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 1/4] extable: add __sort_main_extable
Date:   Wed, 22 Nov 2023 17:28:52 +0800
Message-Id: <20231122092855.4440-2-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?1RzdCUcNKvGfBTKrBp3ZcMNl4wK3wN/7GIMULMm5NbO5JORCcQ6te1WUy6KI?=
 =?us-ascii?Q?kCEUFYGMpTa3Gup7JWRBvrsgj5bnx1zIdoROZEVxupD7W54y5X721nNp9dCz?=
 =?us-ascii?Q?An9Ye968Dt8ZyfiLYwO+EfmN7O5NHNuSHB04qlk62fWxVRvbHQLXDo02xbgv?=
 =?us-ascii?Q?EbQPRD0S1PLNZ7DIWKMElrX+GPMofr0N1graSLBkp2VJgUS2lyCX5cjyhvVa?=
 =?us-ascii?Q?ZIqI+3sISLJGD2SkB61J7eX06cKvCBaUXkEIWOEZQkXW/DBi/uILBsHPOUgS?=
 =?us-ascii?Q?YQYaYGVpt5ZKCdsfiKSVWoLyIflNY7iGDs9yLBqy7sjAIevTJ2wfAi+I3wPT?=
 =?us-ascii?Q?BmhoO3qeBCQZc2q0vUNuhlFYFFhM7b/72RqRlr82hauhnjwVY0/4mOGWJLaR?=
 =?us-ascii?Q?/ocJg+G2IO24JJSnYxQ1WxRprbRTFtiDgT6byBUN4WKSoV6oRWiR2ur/vKNx?=
 =?us-ascii?Q?WfWL+BK44MG6IA1Ke6zkb7t8S1UTZdvuaHL6rGvIBgvGH4Y85+AMSa5HqAX/?=
 =?us-ascii?Q?9a0rQPERS7AZysZ/MUib6l92VKNBLmUEkF8rTCPCavqWSLarcd+FTuSjlSsZ?=
 =?us-ascii?Q?b0rejPKQSKjX53g+0P3NKXV/ArhD16xvS44Q/lH5VzkIAdzhsRKvDWAHJgSc?=
 =?us-ascii?Q?YmTFMyhBEi/wajxnNWt/6UnjEIS5m0trrgtqicc1XtwFFqQHO7BbaqwyyraB?=
 =?us-ascii?Q?ttnc2sE7yci+Wrr6nvroXas5RSCBAde0URPAXJZk6TLQbEbCS8dmh+zEllQB?=
 =?us-ascii?Q?ABImfIT52YOW7p/FeN2lznVa9PK6MmFlKVaQzJZ3UOEFV5a9r8+ZGVnduYxP?=
 =?us-ascii?Q?yw061gPVGHMfQE2nBf9a2X3gQGz4jKTDNPBxY16+gA7VdJKCTch5RE8a2MWS?=
 =?us-ascii?Q?1yhXbFK9LyW+YRF8WVOSr/zTr697aQx51aHjekTZSpNvmsBkc/PS9qN1N4Zf?=
 =?us-ascii?Q?tb1JIssKmQ/wdUwmdEeYV5QcBuwPsQo1n2qDkJedLnarAF+VxdXuMCiuaMOu?=
 =?us-ascii?Q?2diqHPh22ZOYDwpS9CaLgFRBcwZAd7ZYXaUXmYOU02ZQ0OM4JXHdAKrg39yd?=
 =?us-ascii?Q?y4GX7wf6IHEXS9rsuLEIfXE5EPnPMNv0MeJd+7D/WOXrByFnV8HKE+eKUTv3?=
 =?us-ascii?Q?LADa5WRV5erm567e+V4U4bu2o0v/H0AX7Ucw5nAfxUEanKFIKIRtbLyNyCSr?=
 =?us-ascii?Q?BGUhDkjeJbzcWJ9Ohd3TbNFmGBWFD0NZOfqLyvmwy6k1Nedne1HoKMA0zXtJ?=
 =?us-ascii?Q?VBk2bT7qloxENkyrdCRWj2EuaeaoML9hCKkByqDzabWyeDCP/fZDfYW06gW9?=
 =?us-ascii?Q?QpYAhIgWLnFpx2LIlC2mRL3nNzxeqzu2T18sa0oV/qoBLoOWaJ7yEMu5Pieb?=
 =?us-ascii?Q?qS27bxKq++e/zuXdmeHJwrcfEUZEdDAC2JCMTf1cmsFIuWfldJAawt8swsew?=
 =?us-ascii?Q?AZqgwYed8SNVYTbf6U36i15oi66reTUBlkmY3+fXYO5lnNIGYPhVLp9m308t?=
 =?us-ascii?Q?sZ5p96iYoF9rhIHir9xuPDisoLQCTh20JC33n0HBDsh8eV2Q27scazuHSMjd?=
 =?us-ascii?Q?YoPGhPwSs+99+71JHjhM9xvR45XExwDbPjji4CCyCLTbqSUqu/fA+FJMtn5n?=
 =?us-ascii?Q?X3FQHNq8htA89jyRhDaoWr8=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4328448c-3e67-4d2e-65f5-08dbeb3d8ccc
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:39.3289
 (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: DVqP2sfgyoJ+rHBDZmyM0sHtwgQoqZNVe6RPXNnmlVy5THcXWkK89pnAlVC8y7cWZ8MRxbTMSfaMKMhkmTSrFjsYOaQuXTOVGKYf/GjnCF9gpFg/U28sVygqdaP/TeJ6
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR01MB6760
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
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 (agentk.vger.email [0.0.0.0]); Wed, 22 Nov 2023 01:30:32 -0800 (PST)

The AmpereOne chip(arm64) may change the kernel exception table at
boot time, so it needs to sort the kernel extable table during
the kernel boot.

Introduce __sort_main_extable which is used to sort the kernel
exception table.

Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
---
 include/linux/extable.h | 2 ++
 kernel/extable.c        | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/linux/extable.h b/include/linux/extable.h
index 4ab9e78f313b..ef70ec3633b0 100644
--- a/include/linux/extable.h
+++ b/include/linux/extable.h
@@ -15,6 +15,8 @@ search_extable(const struct exception_table_entry *base,
 void sort_extable(struct exception_table_entry *start,
 		  struct exception_table_entry *finish);
 void sort_main_extable(void);
+void __sort_main_extable(void);
+
 void trim_init_extable(struct module *m);
 
 /* Given an address, look for it in the exception tables */
diff --git a/kernel/extable.c b/kernel/extable.c
index 71f482581cab..0fbe0ccb1c3a 100644
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -32,13 +32,19 @@ extern struct exception_table_entry __stop___ex_table[];
 /* Cleared by build time tools if the table is already sorted. */
 u32 __initdata __visible main_extable_sort_needed = 1;
 
+void __sort_main_extable(void)
+{
+	if (&__stop___ex_table > &__start___ex_table)
+		sort_extable(__start___ex_table, __stop___ex_table);
+}
+
 /* Sort the kernel's built-in exception table */
 void __init sort_main_extable(void)
 {
 	if (main_extable_sort_needed &&
 	    &__stop___ex_table > &__start___ex_table) {
 		pr_notice("Sorting __ex_table...\n");
-		sort_extable(__start___ex_table, __stop___ex_table);
+		__sort_main_extable();
 	}
 }
 
-- 
2.40.1