Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Julian Pidancet <julian.pidancet@oracle.com>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Peter Zijlstra <peterz@infradead.org>,
        Dave Hansen <dave.hansen@linux.intel.com>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org,
        Julian Pidancet <julian.pidancet@oracle.com>
Subject: [PATCH v2] x86/alternative: Consistently patch SMP locks in vmlinux and modules
Date:   Thu, 27 Oct 2022 22:49:06 +0200
Message-Id: <20221027204906.511277-1-julian.pidancet@oracle.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?8MZrL+KUOHmObeHz8GE2msdmrCU3G8MpifaiMjVaaC2WYIHgTCVDYIEHoVWp?=
 =?us-ascii?Q?E2ZLkq1XqahH9u0YI/bhEUBlurE+aZc9MIsbhj73FRG4mBbY1MzbocVCGu1M?=
 =?us-ascii?Q?yuaMhsrAPr37/td9QnWovPpPHuEvYaJ0eJKJvakb7pr8TU4+/c6SsyVz6yxS?=
 =?us-ascii?Q?movmBvvlehXsqFAsBOtNy3gi+17QEvuHLtdQpGUVUlwuko8B7R8dTq85y/iV?=
 =?us-ascii?Q?1mryyUlSW5TFJMfpa4IKkqWd2+MBDt5ftJrbrES8qEAvTNJw3u2AJdXmR6as?=
 =?us-ascii?Q?RN/CQqc9vn7yZliw2Yq073unKBwMGNGD2KJnNeIkxPkqjjx7P2d5Z5QbzoqY?=
 =?us-ascii?Q?DOllfQIQ99E5APDCL/iX6+E2E4H0YJ0yr8x+tkXL5+ScQ8Yvgc7/zyANg6Y3?=
 =?us-ascii?Q?HAZ+KNSFfWaBh0ZXUXqXSdyUcRuyVv21PBdzPHi+rBLJMd+nlwjOHOrXbnEq?=
 =?us-ascii?Q?Iz9tTy9ugaCOrnRPLEwEervjcZBTan3MM26hBmOGqf2ZSFDCtnIkVInao4B9?=
 =?us-ascii?Q?Dpu3r405lZG53T6iy/4OGg3ujvpciIA/R9cIsRXdTv1gu1yFKQUaCKimplxO?=
 =?us-ascii?Q?SqXt6xFfx9iKaAIuJtcCkhhdiHwNY2NGTlldzk5rMteF6eGCoXx+L5jAoQSn?=
 =?us-ascii?Q?T8k9SqCMvqVzdEixNK78BzNOQmWNSE927NlBB9UZQ3sND1nnFU5cCMSyhU7v?=
 =?us-ascii?Q?DOndmFhelEgDsNh5kwx6+c6kg+gNIB8UOY0OllZuNRqRwBmF1rCh5bcqbV8M?=
 =?us-ascii?Q?Zq/4TLgmjfpiNQpVaizO55B6eXxKvIh5fGPNNoSwAXOy7VCA96AyKUwQR8bd?=
 =?us-ascii?Q?CY7j4JuFvPKeMyx2cSgXo8ST3U8qVXS139BWfYPwNIqI32zNSi+KoUf/2KVf?=
 =?us-ascii?Q?E7f65fHu+2TsumpS6tM8HjHLorgJWkI0rG0F+ipV85myMqH1ClHvTQLSaVZ/?=
 =?us-ascii?Q?asl0lLS4zCTA944iwLke94vxIGLPhMCaQdqbYPDRi97IPSK0a3tiT3EWAf2x?=
 =?us-ascii?Q?8zYhIy1zHbg8m+uIwH9AnxXoHQinXytw/PT+pevgmxU5+PiPGNdvnKkilmot?=
 =?us-ascii?Q?W1o57sDXp5+I/uu/F9+VS2bLzfNNbhBNrGaMEV9WkskxX9ISpB2QnpnAgm0Z?=
 =?us-ascii?Q?4IvKvY5IZDaNaqGS3Fdy3+kVHAhzc3Zeh6S8mEtam8+tjGJCkaV6JPfpS7PU?=
 =?us-ascii?Q?va7HgVHNey/VQSNMoXDgNIyjlUN+EbZvOAJxV3MC8NdITfTaQlnTwQPf0d3W?=
 =?us-ascii?Q?0N2/ny6ZuoqcF30wu580WDJTKAa51gDYyVW0aVvAgeB5uYAWycxtqqyeHHkh?=
 =?us-ascii?Q?o3J4nzoQoaNO7g1ouHa63GeLuBJf9pKUyU4lSDV6KdtTs/M0ONzCVcpHT1qL?=
 =?us-ascii?Q?lmCt1l60JhAkXXu7CJjqm+27KHukQy0GY0ookwZf5ug3eweXHgFjLwNmgLZk?=
 =?us-ascii?Q?lYLQsVsrQ1ie4N+JCgg+iNU8evZMdbcysNgT/EpABA4ZbfXg5+v63esX+5dV?=
 =?us-ascii?Q?onGUWwr4wzeYhM1X8xGWSNzjaQSiGW1DubeKaLklwv7DPIy89juWicQJmrxw?=
 =?us-ascii?Q?dj8xgOhR+bvGI4ZRdeaOrGsRQnSGTry8uRyfcKwuuQ+eYWgWDcOVUaep2tY7?=
 =?us-ascii?Q?qa9BTlQvkTxw7qysb+tpwJs=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7f82a339-9778-42c6-1d46-08dab85cc923
X-MS-Exchange-CrossTenant-AuthSource: DM5PR1001MB2153.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 20:49:47.9557
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Dvmg5N6DF72pttTCqE+ynP1VSJ4NXYpqPloDXPlRPUcA74Ez14sXhEqtVdlevJJDaFuhh/LJTJMo/rtMPKNeMmUZ1f2rNgFACtF3w16CYqs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6632
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-27_07,2022-10-27_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0
 adultscore=0 malwarescore=0 mlxscore=0 suspectscore=0 bulkscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2210170000 definitions=main-2210270117
X-Proofpoint-GUID: t9wzHz53Fn410tEeyy647hCqXXvzz1QK
X-Proofpoint-ORIG-GUID: t9wzHz53Fn410tEeyy647hCqXXvzz1QK
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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

The alternatives_smp_module_add() function restricts patching of SMP
lock prefixes to the text address range passed as an argument.

For vmlinux, patching all the instructions located between the _text and
_etext symbols is allowed. That includes the .text section but also
other sections such as .text.hot and .text.unlikely.

As per the comment inside the 'struct smp_alt_module' definition, the
original purpose of this restriction is to avoid patching the init code.

For modules, the current code only allows patching instructions located
inside the .text segment, excluding other sections such as .text.hot or
.text.unlikely, which may need patching.

Make patching of the kernel core and modules more consistent, by
allowing all text sections of modules except .init.text to be patched in
module_finalize().

For that, use mod->core_layout.base/mod->core_layout.text_size as the
address range allowed to be patched, which include all the code sections
except the init code.

Signed-off-by: Julian Pidancet <julian.pidancet@oracle.com>
---
Public tests: https://gist.github.com/jpidancet/1ee457623426f3e3902a28edaf2c80d0
Related thread: https://marc.info/?t=130864398400006

V1 -> V2: Reworded the commit description.

 arch/x86/kernel/module.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index c032edcd3d95..b1e6e45a5e10 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -251,14 +251,12 @@ int module_finalize(const Elf_Ehdr *hdr,
 		    const Elf_Shdr *sechdrs,
 		    struct module *me)
 {
-	const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL,
-		*para = NULL, *orc = NULL, *orc_ip = NULL,
-		*retpolines = NULL, *returns = NULL, *ibt_endbr = NULL;
+	const Elf_Shdr *s, *alt = NULL, *locks = NULL, *para = NULL,
+		*orc = NULL, *orc_ip = NULL, *retpolines = NULL,
+		*returns = NULL, *ibt_endbr = NULL;
 	char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
 
 	for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) {
-		if (!strcmp(".text", secstrings + s->sh_name))
-			text = s;
 		if (!strcmp(".altinstructions", secstrings + s->sh_name))
 			alt = s;
 		if (!strcmp(".smp_locks", secstrings + s->sh_name))
@@ -302,12 +300,13 @@ int module_finalize(const Elf_Ehdr *hdr,
 		void *iseg = (void *)ibt_endbr->sh_addr;
 		apply_ibt_endbr(iseg, iseg + ibt_endbr->sh_size);
 	}
-	if (locks && text) {
+	if (locks) {
 		void *lseg = (void *)locks->sh_addr;
-		void *tseg = (void *)text->sh_addr;
+		void *text = me->core_layout.base;
+		void *text_end = text + me->core_layout.text_size;
 		alternatives_smp_module_add(me, me->name,
 					    lseg, lseg + locks->sh_size,
-					    tseg, tseg + text->sh_size);
+					    text, text_end);
 	}
 
 	if (orc && orc_ip)
-- 
2.37.3