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;
Message-ID: <e4fb6847-2d17-fed9-bda4-092ea581072f@nokia.com>
Date:   Wed, 24 Aug 2022 15:04:08 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH] ARM: module: Teach unwinder about PLTs
Content-Language: en-US
To:     Russell King <linux@armlinux.org.uk>
Cc:     florian.fainelli@broadcom.com,
        Kursad Oney <kursad.oney@broadcom.com>,
        Ard Biesheuvel <ardb@kernel.org>, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
References: <20220706163135.53874-1-alexander.sverdlin@nokia.com>
From:   Alexander Sverdlin <alexander.sverdlin@nokia.com>
In-Reply-To: <20220706163135.53874-1-alexander.sverdlin@nokia.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MGJhVThXcDRLVUx6Vlg3NllBT3pYQmc5UGZDT24zT3pKeWR0TVBwL3BDWDRI?=
 =?utf-8?B?bmYrY3p5ZVI2K2o5bDc1MkJFK1o3U1VOenl2b2J4SjI2bElHZTk0NjYzRTA5?=
 =?utf-8?B?bCs1R21NV3l0T0dsMy9yQTdKL1VYcHBWTkNPUklvMU44cDdsbE95YjlKQkZD?=
 =?utf-8?B?K1YyWnJoQm1WdXNTMmxHV0ZJRDQzMnFYZ2J3VjdrcVhUVytYblN6MlgrSkN5?=
 =?utf-8?B?MUFNRWlLWmU1ZkREZGRwODlEZVhydWZNaXlzbnZwSUk5Ykh6cS9MMGE2TlNK?=
 =?utf-8?B?SkxtUTNEN20vYStqNStaY0JPa3pHRjNQWVJJZGNNTk95dFU0Q3I3RkJnUVFZ?=
 =?utf-8?B?V1BHaGN2VkRHNFQyMmcxZ0Y3cDFyZTg5UU43NlZGQ3hjcW13aDljSkVoLzM3?=
 =?utf-8?B?TDY1UFFjT1c2b0tjcjRsazNtVFgwSytmallIaitFZjl3L25Sb2Z6cUs4aThQ?=
 =?utf-8?B?MndYaTFzd0hYbkNJWTlOZ1Jod2tyQ2pyZ2libm9TSGJYUGY4ZEhwaFNnMEN1?=
 =?utf-8?B?OWVhSzZ4d2V5b0U4aHB2QXFrUEg1dEdGSDNXSkszWm91QlBGamZVTldnZTR5?=
 =?utf-8?B?ZWZ3K3hkSkkxTTZRekY4Z1lVTzZKSzJWSGxDYnpzUWRCR2drNWRWK0pWWDJE?=
 =?utf-8?B?Z2R1NGxRQU1wMnJvd0V5bVBONTE5Y3VWc0NLWjVhdGt5ODZIck41dXQ2ckNY?=
 =?utf-8?B?RDBHWW9CWTBHY1dGMlB4b0VWdUNqV1hqbzVEVm9rUkQzUHhvVFdmcTZnR1lr?=
 =?utf-8?B?Y3pxQXYxL285Y2VsLzRTSHI4NFEyd3pFdGpvQ0hQMEUxQzMzZGl6ZlErMUVo?=
 =?utf-8?B?TFlFczhIbFZCalBpYVlPVXhLcmUrbGFaVXMvUDFnR3REZWZVaVA4bmtHQ0Jy?=
 =?utf-8?B?c3pqRnhVUUZVdWNNdVVIWlRhVTVxUzE1VUcrM0pyQmIwUHBkNzdsMW5ma2Rh?=
 =?utf-8?B?c0RRaXVHSFdkdHlLeHg1YmpVaVp3RnNqRUdlb1pCQTNCZjVDYmVmUGlQczRo?=
 =?utf-8?B?VTdTUTZxMmluQktlQUZGeVNKcVF0YVZEdWNwaFZJeHJMQlFDUCtxLzlFYnBF?=
 =?utf-8?B?Sm1TR2QrZFI5REZ0bkFpQWtjaXIrYklRR3R6OGRJRHNoNXp0UE1XNFhweXRx?=
 =?utf-8?B?czlEU0lvTkFuYm9ZWXRpazdJRHBtbXlDWUpwSFJzaXZ4Lys1bURuSGhaZ3RE?=
 =?utf-8?B?WGNMYXhRUjJqUHJ2TjF4REtZbmM4K3lOTEgwZkd5aEhmUE9oL3BCdDduMEU3?=
 =?utf-8?B?dVE0dSt3MVk0RU9ROVJaVnQ5dEpqNFQwaGlBSVNUSHJVeks5aGw1SVNRQUF0?=
 =?utf-8?B?cXJDWE5GN2xpUzFuZkl5NGwxbWtyUEpYK0tIako4UktaVGp2L1d5amR2M2FZ?=
 =?utf-8?B?RGk5d29UelkreHByd2FIbmdKY3JHTTQ0ZXExalh0NDdoMDNLWXlXUVoxdDFP?=
 =?utf-8?B?R01sSWpsMmlleFpiY0lsTE9PRVZqaDlrMlh4bUVUZDZ5engrRG1qam1kZkdk?=
 =?utf-8?B?MkpPSGZtTXcxZkFad2tLMjJJYnZlNklJQyt5UzA0eE1zRkk2WEttcHViUUR4?=
 =?utf-8?B?S2gycFR3VVR4NEFhV214UFduTzFxOE85L1V3ZVZlMHhRZGV2MzJzazNHQ05J?=
 =?utf-8?B?MFlHYWJEME9KWEhLaFFWUVUyTlF2MXVwVXZzU3NQSVhnd2Y4bm9qa01ic0VD?=
 =?utf-8?B?WEZQRkpvbFRQbTJ2MzBXM3Bidm5RQjBuQytacmhBRXlKdjk1RFZBVGhqUGVr?=
 =?utf-8?B?YWwwZnFNZ3NaMEUrVkRVSTArZi9ZbDJJZlY1NnIwVWVJYm9kczB2aDZOZTdp?=
 =?utf-8?B?WkszRHFuMTZRWGJtT2dLY0NHYmN5OXNPRDdTWnM3d2VCd1YyWlpjVXJhc2hQ?=
 =?utf-8?B?eG4zc0JNVDhXYlNMNmUxWEtNTGY0SmR4bXN2TlUrcG5vR25TbG9UbVdkWEhJ?=
 =?utf-8?B?MjFlcGYzcDBEeTNNQ3NFQ2YycFpQUEVQRmpGMGZsT2pNTkowdWJuY1ZqelV2?=
 =?utf-8?B?d0M2bmtuczlmL1gwSWtMUnVnQWRiV1RWUXFCWWhuMFoza1hkVGRDcFF3ZWdo?=
 =?utf-8?B?cEVtT2ExanZEa1BabXNwQnJYLzhnUUJCTHpHWXlUY1pQOWdmNHY5eDB5SW1D?=
 =?utf-8?B?cXlMQWtVUnpMYU9mUjJ0Z2NVVlN6bkFvUUFpUkJMa3Z3RzNSLzdpeXBibzNX?=
 =?utf-8?B?MWc9PQ==?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ae5e158e-bfe7-4786-5eb4-08da85d123f7
X-MS-Exchange-CrossTenant-AuthSource: AS4PR07MB8658.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 13:04:12.6451
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 61ydGgaH5UVJ+8MKvPsRnVhMb2ouizHem4fx5kDjD82LiEz+ffWPHMVl6R2/Uq/Nh2bWZZOgxw+jLIJqkdSI4Zmpbu+45vVsdYZ7hUQsl1g=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2373
X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=no 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

Hello Russel,

shall I add this one to your patch tracker?
There is little interest to this patch, but also no complaints, as I can tell.

On 06/07/2022 18:31, Alexander A Sverdlin wrote:
> From: Alexander Sverdlin <alexander.sverdlin@nokia.com>
> 
> "unwind: Index not found eef26358" warnings keep popping up on
> CONFIG_ARM_MODULE_PLTS-enabled systems if the PC points to a PLT veneer.
> Teach the unwinder how to deal with them, taking into account they don't
> change state of the stack or register file except loading PC.
> 
> Tested-by: Kursad Oney <kursad.oney@broadcom.com>
> Link: https://lore.kernel.org/linux-arm-kernel/20200402153845.30985-1-kursad.oney@broadcom.com/
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
> ---
>  arch/arm/include/asm/module.h |  5 +++++
>  arch/arm/kernel/module-plts.c | 14 ++++++++++++++
>  arch/arm/kernel/unwind.c      | 13 ++++++++++++-
>  3 files changed, 31 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
> index 5546c9751478c..07c51a34f77d5 100644
> --- a/arch/arm/include/asm/module.h
> +++ b/arch/arm/include/asm/module.h
> @@ -37,6 +37,11 @@ struct mod_arch_specific {
>  
>  struct module;
>  u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val);
> +#ifdef CONFIG_ARM_MODULE_PLTS
> +bool in_module_plt(unsigned long loc);
> +#else
> +static inline bool in_module_plt(unsigned long loc) { return false; }
> +#endif
>  
>  #ifdef CONFIG_THUMB2_KERNEL
>  #define HAVE_ARCH_KALLSYMS_SYMBOL_VALUE
> diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c
> index 1fc309b41f944..af7c322ebed68 100644
> --- a/arch/arm/kernel/module-plts.c
> +++ b/arch/arm/kernel/module-plts.c
> @@ -284,3 +284,17 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
>  		 mod->arch.core.plt->sh_size, mod->arch.init.plt->sh_size);
>  	return 0;
>  }
> +
> +bool in_module_plt(unsigned long loc)
> +{
> +	struct module *mod;
> +	bool ret;
> +
> +	preempt_disable();
> +	mod = __module_text_address(loc);
> +	ret = mod && (loc - (u32)mod->arch.core.plt_ent < mod->arch.core.plt_count * PLT_ENT_SIZE ||
> +		      loc - (u32)mod->arch.init.plt_ent < mod->arch.init.plt_count * PLT_ENT_SIZE);
> +	preempt_enable();
> +
> +	return ret;
> +}
> diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
> index a37ea6c772cd5..53be7ea6181b3 100644
> --- a/arch/arm/kernel/unwind.c
> +++ b/arch/arm/kernel/unwind.c
> @@ -28,6 +28,7 @@
>  #include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/list.h>
> +#include <linux/module.h>
>  
>  #include <asm/stacktrace.h>
>  #include <asm/traps.h>
> @@ -395,8 +396,18 @@ int unwind_frame(struct stackframe *frame)
>  
>  	idx = unwind_find_idx(frame->pc);
>  	if (!idx) {
> -		if (frame->pc && kernel_text_address(frame->pc))
> +		if (frame->pc && kernel_text_address(frame->pc)) {
> +			if (in_module_plt(frame->pc) && frame->pc != frame->lr) {
> +				/*
> +				 * Quoting Ard: Veneers only set PC using a
> +				 * PC+immediate LDR, and so they don't affect
> +				 * the state of the stack or the register file
> +				 */
> +				frame->pc = frame->lr;
> +				return URC_OK;
> +			}
>  			pr_warn("unwind: Index not found %08lx\n", frame->pc);
> +		}
>  		return -URC_FAILURE;
>  	}
>  

-- 
Best regards,
Alexander Sverdlin.