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;
Content-Type: multipart/signed;
 boundary=e38e8ba36671be4adfb48d8c065096aa4842e725837190220e18958090e3;
 micalg=pgp-sha512; protocol="application/pgp-signature"
Date:   Wed, 05 Oct 2022 10:38:59 +0200
Message-Id: <CNDUR9ATG2H2.2VY6HU95S91C5@orcldev>
Cc:     <linux-kernel@vger.kernel.org>, <x86@kernel.org>
Subject: Re: [PATCH] x86/alternative: Consistently patch SMP locks in
 vmlinux and modules
From:   "Julian Pidancet" <julian.pidancet@oracle.com>
To:     "Julian Pidancet" <julian.pidancet@oracle.com>,
        "Thomas Gleixner" <tglx@linutronix.de>,
        "Ingo Molnar" <mingo@redhat.com>, "Borislav Petkov" <bp@alien8.de>,
        "Dave Hansen" <dave.hansen@linux.intel.com>
References: <ed7a508717bb8bec6273c2740418f0dc2df9eeba.1661943721.git.julian.pidancet@oracle.com>
In-Reply-To: <ed7a508717bb8bec6273c2740418f0dc2df9eeba.1661943721.git.julian.pidancet@oracle.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R2Fjd3drVFhtN05nRHdSK0RyYW9ES3NFUTJ1bGZLdFRwVDBnbisrV29INVVt?=
 =?utf-8?B?YlhIenJ5eGVmMFZmajB4c3A2eGlwTVdZeGp6SWpLZzdsNmZaR2dRbEJMSmdS?=
 =?utf-8?B?L0xJVEZibC8wOTdkT2NGdC9qSjY0bkY0T08ydzlBTTArWVdxeXJ6RVFPbEE5?=
 =?utf-8?B?ZzVuMmp1a0VYODBDNUZoSXRaajFxMUw0NmlHaXQ5bVRnU1c4L2N4amVac2pT?=
 =?utf-8?B?dHhEMWF2ZzZIWHhReDVYNmtIYzRYZFhPdXNzUVlmcUZPczhPdXo4WGZubDY0?=
 =?utf-8?B?N0NwbTdqZElnWk9kY2pqNGRieWlBMjg2OTNOSEkxLzNvR1REM3YvbE5KRzdq?=
 =?utf-8?B?YTF5Mm1DRUZTeUdwZjBHT2RTR1dOdHNVS29icEo0QmIvSm1RQTFBWGFtZ3o5?=
 =?utf-8?B?R1JmYjdZZlp6c0pKVVNiYmtLU3RTbkN2dFd4SzRIUjFvYmVObXdLNHE2RTZ5?=
 =?utf-8?B?eWVTUnlmeWgrMkFiZlhzRTRPOVB6TWJOMThLbno5NVJHcmN5d21yVlZIQ1d0?=
 =?utf-8?B?RXQvbHNhVWIyUkY1TTZ0L3Y0ZHphWVIzVXJ2a3NRR24xMyt3Y0pzLzhsNkU1?=
 =?utf-8?B?YlVwZS9CT0tWWTYwb0JxdHJnK3JySGlYSjBJd2IxV0FOTUcwa1ZuMkVCODlM?=
 =?utf-8?B?eG1zZ1lmMEpxcTNWYWN5WnNXSGMvbjVTYVB6d2VVZTltV0dYdm54aHFOVG02?=
 =?utf-8?B?YmNSTmpUaUUwOWN0aHdJVGtVR3hzdkJOOTEvSFltU29MTCtIWlZ0ME44citN?=
 =?utf-8?B?aHNVQkxMd2ludXhVejd3ZC9nUDJ5Z2NKUXRnWEM1VHdxd2dBSi94dElCUlo5?=
 =?utf-8?B?b09aRGNMT3FPRjNBekt0YjlVOVBHRlJRWUFiN2N3V1U4WHNqZHRHRjlyQjNY?=
 =?utf-8?B?MjNleVZkNm42RmtuL1IrN1lBdENzRXE5aHpDTE55SWExQXpSSk9aMG82WVZR?=
 =?utf-8?B?dkNacVRoa2t6OFo5b3Joa2labTYwUnJtbTBBK2dSMjlqMjM1NDlqRWZGbHNt?=
 =?utf-8?B?VUkrSUNvR3J6ZFdqbDlBbzlneFlwekFaZzBmVElRSi9nVEtBY3htSXJHQ2Nn?=
 =?utf-8?B?VU03VGtDa3A0bTQrUEZGWnQ2eWxvdHhOSTNWazY2ZTEyRVZSRHRaMjM4K0ZY?=
 =?utf-8?B?STg0WS83T3lBZG02MVl3UlFHZzZRWXZZZG1MdkFQNFN3a2ZGaXcrc2wvNUZq?=
 =?utf-8?B?bjBIVlU2YTNuQUE5dnIxMUlWSmZmYll3eFhyVmdmMVVzQjh1VnRPN1NIckNZ?=
 =?utf-8?B?bG5Hc1EwOFNnQWJPaFY1MTR1QmdJRG9mWVhwaEE3YXBkTzlSUit2VzFTTndY?=
 =?utf-8?B?Q05wT21OanRFQnpZbThpRUZxa1JXb2hFdm0yZysxaUFWNmZHRExJNy9rNURU?=
 =?utf-8?B?bVVyU1p0c21CaTFxOE44VlQ5dUIvdW1NVEJsbVRvVHRhZVVaa0haaW9FKzdJ?=
 =?utf-8?B?TUVqdzhKVnRMSkhYdzJNb0RxcGJnY0ZMU3RsZHZqYk1zcHpsc1dkanpFaThq?=
 =?utf-8?B?cWlCN1ZubEZGbG44ZktnMCtQTmtkTzBGZTJST0wvV2huYmdPYWlaTHd1YWYz?=
 =?utf-8?B?ckFoTkkzeWYxRElNSTYvZjdHbmVXb0ZvU0ZLZVR5RTVya0Ntd0dacEplMHdv?=
 =?utf-8?B?dlV0S3dIbWtlVlltNndYK3N1V2lKbUY0bDBlVjQxUnhSaldQeDRIRysyZzFU?=
 =?utf-8?B?SGdORXhOSlNyeit3LzdWRXhGc1kydGt2WUxIZ1RvNEdMRzJTS05xaEd5RFM4?=
 =?utf-8?B?Tk04SmQ3TU1Tc0ErN2l4S3d4clJwWDF5N3A1QkpaMTlNMTc0ZUk3QnU2QzMy?=
 =?utf-8?B?MHdTKzdUVjdQRUlqUWJhL1JtNDVyVzVOWm4xb3YyZWhBNlFnazgxb2IrTWRQ?=
 =?utf-8?B?RkRZZTlYRHlxSDJVUHBxd1M0WnpuNEYxOG5HQnlxU2Yxc1hoTE1xblpPVk5x?=
 =?utf-8?B?S3VhSnZUaHFvZGJHUDl6cFRLbG96MlRGOVhtMFdVSW9qaGs3V1BLTnptV1RJ?=
 =?utf-8?B?M1NLalNJUmlUM0s3UzM1UCs2SGpubENZdjVNZ0ZNOTN6UzBYZDdZdlcwOS84?=
 =?utf-8?B?b3NMY0RSdFRiQlBtMW9vSHhUZnU2b3hRN0hCc20vQUowV2NqRGpQQ01MaWs5?=
 =?utf-8?B?aWtwZm9Sd0lCdHozYy9LbnFGUktOTldXc1Vxc0x5TUh2TDV3N3NFNnFzTEFM?=
 =?utf-8?Q?e1UBruFSchIEeSaNyAp1qLo=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +/tWhYpKb79+xaWs7x/zxsfwAoli8jvuy8f1zb8BGhxYOBt3e45MZT8zLp2KC4nZD988OOhJp+BmAJYJFsAp1G7yEC8yrJDAH+3tELWl4IurFMAFduo6v/K3WWI64dDqO4ijiLEjv97gdkdca3R5jzbUfnty9Tn4pa/BvXFmIoxbnIidpzoVKFpb8lZYKivfz3htyfs7cOsKEpMgN299uJQB16ae6OMDZqIQVXmP5dJRO2hJo2iLpRK7LvXAnSaZ6/kGCeNkHNmx1afm9scjEoc9PJNqhCbLw2txG/XQqF6VgfBOosZF8x5cdNEzt0yml7bPQUrb3KEJBThSSdmXjuDa7ZNhsvIn7CTON2RB6HtdiCHEMRs9tUJ26ELDAtkGALWZge7rJVwDdhEXb8+eGeYy8vJzznLt+/2fl4SpTUELoxVJsskcjcNoz99IvsB2u+n8+5kebBC1SLYi6hmNe1w/F6OmTDT/dx364dAVmj3waxd7gh68VCBY6Uw90HF0G8oQDWTtd3/7ST8XcxDeTnujpBY9mwRa+IKRmh1OY9GGfAgYgbUmiZ7Aqmnwcf3io+TEEgYve8LWWaj+OpagtU/ZTGyuFUGk4DpGPYmf8+9VoWa494vD4QWq3EHKLQPsmdf7vCe7lByzQtyj0cTGer6YPCbQTQyuObn7uNI8/3/lsWvTORsiLkIsNSn3ADhnYApktU1H/OPBw/AF+us7ik7Q3IMN8mEuCGBPzab+vc06L9lV7+hUv8/CitWWpCP8gbqKSpO17e+BdwEEjARewBc4WdnTkAS1FzqnTLkwSxl8sdY5KI9CJ4ScJZiD+z28phAM21Bp96mWYS3IlJVg8E5612r3FoDCKyWoZOP9wd0jSduMAWpx+SeWdYnBurFrjQFJ6ILZxPVbOpogU5gAU4uI1Y2DFDgGMz6x8U+p7XY=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5190b728-1fdb-4e6a-a749-08daa6ad0eb7
X-MS-Exchange-CrossTenant-AuthSource: DM5PR1001MB2153.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2022 08:39:03.5160
 (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: vSSLh89I0jg2rOPy/Lux42O9BsFjqaM3XeBbtua2iUrKO1QlHjz5bnoXXrm9oxXeMgMEFccu77wDb9s9zzzy3nMqNGuYx9/5O7BY1YPDgxg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4150
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-10-04_09,2022-09-29_03,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 adultscore=0
 mlxlogscore=999 malwarescore=0 bulkscore=0 mlxscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000
 definitions=main-2210050053
X-Proofpoint-ORIG-GUID: ebcVC1OwYJFZYqAmA7T9j8no_xoT_wO2
X-Proofpoint-GUID: ebcVC1OwYJFZYqAmA7T9j8no_xoT_wO2
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

--e38e8ba36671be4adfb48d8c065096aa4842e725837190220e18958090e3
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8

Hi list,

Kind ping.

On Tue Aug 30, 2022 at 09:42, Julian Pidancet wrote:
> 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
> which may have been deallocated when the alternatives code run.
>
> 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.
>
> This change aims to 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 we 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/1ee457623426f3e3902a28eda=
f2c80d0=20
> Related thread: https://marc.info/?t=3D130864398400006
>
>  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 b1abf663417c..da22193eb5e0 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 =3D NULL, *alt =3D NULL, *locks =3D NULL,
> -		*para =3D NULL, *orc =3D NULL, *orc_ip =3D NULL,
> -		*retpolines =3D NULL, *returns =3D NULL, *ibt_endbr =3D NULL;
> +	const Elf_Shdr *s, *alt =3D NULL, *locks =3D NULL, *para =3D NULL,
> +		*orc =3D NULL, *orc_ip =3D NULL, *retpolines =3D NULL,
> +		*returns =3D NULL, *ibt_endbr =3D NULL;
>  	char *secstrings =3D (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
> =20
>  	for (s =3D sechdrs; s < sechdrs + hdr->e_shnum; s++) {
> -		if (!strcmp(".text", secstrings + s->sh_name))
> -			text =3D s;
>  		if (!strcmp(".altinstructions", secstrings + s->sh_name))
>  			alt =3D s;
>  		if (!strcmp(".smp_locks", secstrings + s->sh_name))
> @@ -302,12 +300,13 @@ int module_finalize(const Elf_Ehdr *hdr,
>  		void *iseg =3D (void *)ibt_endbr->sh_addr;
>  		apply_ibt_endbr(iseg, iseg + ibt_endbr->sh_size);
>  	}
> -	if (locks && text) {
> +	if (locks) {
>  		void *lseg =3D (void *)locks->sh_addr;
> -		void *tseg =3D (void *)text->sh_addr;
> +		void *text =3D me->core_layout.base;
> +		void *text_end =3D 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);
>  	}
> =20
>  	if (orc && orc_ip)
> --=20
> 2.37.1

--=20
Julian


--e38e8ba36671be4adfb48d8c065096aa4842e725837190220e18958090e3
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iJEEABYKADkWIQTd3Z6iZzTygRNy7F4XFh3U+bgUcgUCYz1CoxscanVsaWFuLnBp
ZGFuY2V0QG9yYWNsZS5jb20ACgkQFxYd1Pm4FHIDsgEAgwfV6laOjw/P361tBp8v
GUZpSc/JD5NQ/srQ/9mZdhYA/2pam3NThOBRljLtKb1AN3OuoGp8HbyD6Tx14kmg
T6UL
=FLvZ
-----END PGP SIGNATURE-----

--e38e8ba36671be4adfb48d8c065096aa4842e725837190220e18958090e3--