From patchwork Wed Apr 12 20:26:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp588461vqo; Wed, 12 Apr 2023 13:37:03 -0700 (PDT) X-Google-Smtp-Source: AKy350YwA/1lV5B/wUMwfeXqs3yVuUPTA/4itXWzaP7aBlbJNsj1A5e3uvpAyQV8RGVCwt3ZzKbM X-Received: by 2002:a17:903:25ce:b0:1a2:914e:2d2b with SMTP id jc14-20020a17090325ce00b001a2914e2d2bmr188587plb.19.1681331823387; Wed, 12 Apr 2023 13:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681331823; cv=none; d=google.com; s=arc-20160816; b=oZ+M6M77snIURgcLfEimDQmlUge7Hd9q2AYQVn27MgXlkTmmFWGTBySbLYW2BI88HU 8KzCorHW/foPVKP3LF/GXNr+tQWTsIy/vw/0tTUemQee0c0PSJYcm4s8MqdmdC49XBtd 7myQ8u08VAnge5/f5fxQxRMU29hWjjEKe4rKv3FPpTluMONKFvtFfOXinFDzudN/jYjl rBYKoKWNX3EbQf/+v4pVTEKIMWcZ05Oj/7YXcLGy1xmHPALk0GIWXsz+rm+mdxF7ikOD UvFLsFwSqD0ik3XOKULmeb5Yc/EG9M2QyH6F0+tWY+pen6T3vW257T0TOpCe/wneMJW7 wVfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HQGCNvZXE32huc7Ob/Z6RVGtXq2Nngk68hUV3JpSdc8=; b=Rz/cZT0bveizEfgI3POYaz9Y18Q3YfYmjJBHv3xETg/wmYQJDjaW90gqh5Pd9a0qh5 VoUoIU8kFtxhQoK6mhw4st39YtuZyMIal7SnHpcTNId3yMo6rzZqYGheSFFIuXyTbKpw BAWcDj0kAP7UYdrnAQfexGElVylG0um0LZS+QChsVg+eN7aEAaukfwGAXpyCg/SyKv+7 Ovf8alTgaJB99LQ8y0cNziC6m9izK6xo5gH3tlNhj4boPnGYv4nSFI38W5RdRV8noTwl wHVFtkFMPAYCXneWVIQpqIqMI0f6kcvull48w3CUNR59K4gKS2YXd2onqYuVd0O/hgb0 ifkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L2pgvMDW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p6-20020a1709026b8600b001a24efa45bfsi53498plk.81.2023.04.12.13.36.50; Wed, 12 Apr 2023 13:37:03 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L2pgvMDW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229817AbjDLU01 (ORCPT + 99 others); Wed, 12 Apr 2023 16:26:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbjDLU0X (ORCPT ); Wed, 12 Apr 2023 16:26:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDD1D18F for ; Wed, 12 Apr 2023 13:26:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A09D638F2 for ; Wed, 12 Apr 2023 20:26:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE6F2C4339B; Wed, 12 Apr 2023 20:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681331181; bh=PtEZ2XxRT+V9+YOlqDPVexSNm4/7T9Gs06ZBZ6BpOSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L2pgvMDWoT9nJBFn0Rn1R0uCBjMOfrFyChbbIZ026c93YYDLFX/PFpqjuMdA160Qs lXdXXgDUYi5AqcnMuEbsJC8wGcPeBAJp/qsArOMkw2Z254qGFRjpxKquFi7rY+Qgr9 WuqXMbWj9Nt3y6+QlOvPlT863k3mSIsK9aaXxoBNdFSQpAiwEDdPEpoetc0pITMkY1 M0ENx/C0StKxtQk2y+fK+ZT0RXg/6IGKGH6x5XOnVWk+gXWk9bzUowvqIbT1hxwIj5 Cm/VbbvLGD8McPER+7vtxBiu9IK3EFmvjgQDK9kp16QHvRQ9PJD7inpxzZZaMIRjy7 ZytnaGGKemc5A== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 1/3] objtool: Separate prefix code from stack validation code Date: Wed, 12 Apr 2023 13:26:13 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763004198102288719?= X-GMAIL-MSGID: =?utf-8?q?1763004198102288719?= Simplify the prefix code and make it a standalone feature. Signed-off-by: Josh Poimboeuf --- tools/objtool/check.c | 88 ++++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 53940e2ac632..2f3136145b2e 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4120,54 +4120,61 @@ static bool ignore_unreachable_insn(struct objtool_file *file, struct instructio return false; } -static int add_prefix_symbol(struct objtool_file *file, struct symbol *func, - struct instruction *insn) +static int add_prefix_symbol(struct objtool_file *file, struct symbol *func) { - if (!opts.prefix) - return 0; + struct instruction *insn, *prev; - for (;;) { - struct instruction *prev = prev_insn_same_sec(file, insn); - u64 offset; + insn = find_insn(file, func->sec, func->offset); + if (!insn) + return -1; - if (!prev) - break; + for (prev = prev_insn_same_sec(file, insn); + prev; + prev = prev_insn_same_sec(file, prev)) { + u64 offset; if (prev->type != INSN_NOP) - break; + return -1; offset = func->offset - prev->offset; - if (offset >= opts.prefix) { - if (offset == opts.prefix) { - /* - * Since the sec->symbol_list is ordered by - * offset (see elf_add_symbol()) the added - * symbol will not be seen by the iteration in - * validate_section(). - * - * Hence the lack of list_for_each_entry_safe() - * there. - * - * The direct concequence is that prefix symbols - * don't get visited (because pointless), except - * for the logic in ignore_unreachable_insn() - * that needs the terminating insn to be visited - * otherwise it will report the hole. - * - * Hence mark the first instruction of the - * prefix symbol as visisted. - */ - prev->visited |= VISITED_BRANCH; - elf_create_prefix_symbol(file->elf, func, opts.prefix); - } - break; - } - insn = prev; + + if (offset > opts.prefix) + return -1; + + if (offset < opts.prefix) + continue; + + elf_create_prefix_symbol(file->elf, func, opts.prefix); + break; } + if (!prev) + return -1; + return 0; } +static int add_prefix_symbols(struct objtool_file *file) +{ + struct section *sec; + struct symbol *func; + int ret, warnings = 0; + + for_each_sec(file, sec) { + if (!(sec->sh.sh_flags & SHF_EXECINSTR)) + continue; + + list_for_each_entry(func, &sec->symbol_list, list) { + if (func->type != STT_FUNC) + continue; + + add_prefix_symbol(file, func); + } + } + + return warnings; +} + static int validate_symbol(struct objtool_file *file, struct section *sec, struct symbol *sym, struct insn_state *state) { @@ -4186,8 +4193,6 @@ static int validate_symbol(struct objtool_file *file, struct section *sec, if (!insn || insn->ignore || insn->visited) return 0; - add_prefix_symbol(file, sym, insn); - state->uaccess = sym->uaccess_safe; ret = validate_branch(file, insn_func(insn), insn, *state); @@ -4744,6 +4749,13 @@ int check(struct objtool_file *file) warnings += ret; } + if (opts.prefix) { + ret = add_prefix_symbols(file); + if (ret < 0) + return ret; + warnings += ret; + } + if (opts.ibt) { ret = create_ibt_endbr_seal_sections(file); if (ret < 0) From patchwork Wed Apr 12 20:26:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82674 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp597101vqo; Wed, 12 Apr 2023 13:59:39 -0700 (PDT) X-Google-Smtp-Source: AKy350ZdlzR2dlXVrEpd4vymdWH5UW9ysiDWzgQ75OlT3v8fVR9Ksq15lY++AUV0Loya32bnOtjI X-Received: by 2002:a17:906:82c1:b0:930:7d8f:15a4 with SMTP id a1-20020a17090682c100b009307d8f15a4mr195009ejy.53.1681333179167; Wed, 12 Apr 2023 13:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681333179; cv=none; d=google.com; s=arc-20160816; b=VZvuRifdKbd8XnI4PbAp91GFyyuP/ZXA2OVlBC4QB12sZF3pZW0M3twBVj0zEfXhow S19hRfA6uSDrchDX+xQsvuDunuXPFESSPWS271RVx1mFBZEaBqmSXQOcv9GEKhZoJ8zC OAQNt4p4XcJNTT76tq/BxYYSzdg+LsusEhOLSCU/PMEUPx6Kr7Tq+qTXjtU1dQa27xDF 65N/yhJX07AXdXPOqemKJgTW0eB/SnnZHGZ+zoOtm9xXC3lXTG33n0n+kqUK8czjOCxO 1mXhDnzXxveULLA1+iousaJI0mzyJ7zsOw7uZygHPJfwzc/HU9qiXdGXOiayGTRq9EHV bNxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HtWzieDnWcNJLmiP1f/Wpq9muFbVp4eFjgZD886nCW0=; b=ArGC0DydFAZ1cEZdga0FaMxKZOxkrnOWk/qO4Jmds12mLWEDQHY3FF8E25BLQF5krZ u0RxUIP2JO6cX82zBSinamLVoGD01wY+zUnp2T1VbzsCs2mKO0Kul7i+HnSHj8xDL7DT gBivK1YDeI0q2qbtEPFY1ljcKMHYy18SZBgp70rSmu5W1r7LhJRrInkX+Mml255prG5P BFyAQ3/jCSsmszpDJ2rLm5GHL9qo9h9HXuh57aFB9O88lkkoj0Gl4amTOVXar2jlDCfZ aO3SH92jEebWBlfZG5p5Z0MnpUUKm6Xy2KG4sHeXoSrujSbVklp55DJHk8KTN9o+9EuS y5uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pP+al7ot; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fi12-20020a170906da0c00b0094a735f0026si4936893ejb.974.2023.04.12.13.59.14; Wed, 12 Apr 2023 13:59:39 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pP+al7ot; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbjDLU03 (ORCPT + 99 others); Wed, 12 Apr 2023 16:26:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbjDLU0X (ORCPT ); Wed, 12 Apr 2023 16:26:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3665594 for ; Wed, 12 Apr 2023 13:26:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C5AF36390B for ; Wed, 12 Apr 2023 20:26:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BA5BC433A0; Wed, 12 Apr 2023 20:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681331182; bh=1f+D/INVsHu7FMXl7yZ+eU5VEMYIQVwkoMtNsfmlqSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pP+al7otwpbXGE80VGWlfTn9pWbN4cNBbQ2+KqmiaPq120LvBUGSf2OTCjJPTUkeg jroiqW0R8dJO+svdRTI7WKALwssdYQqpdSHaAQWRMpbgShx9Pdi7ha1Kb+3V4x8EmI h2tCUFObYtaDioKtWNyK78YNrAilq5fH9S1P4wcqaMuVCS2LqEm5hpoibxXUI4rvPs A7mOYjCXWT7E4A+0qvg0lhThk+WETbMBjx8kHtMm0vSJuWa+vLtWdQpAuUHSHDY0xm RkP8cxVzfG2XQoBocJwDjMn+b5FDP+gO8V6+ykj8FMpVBs8dnbfZolDje7Jzr+5/iP 02Dgp6UoUQO/g== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 2/3] x86/linkage: Fix padding for typed functions Date: Wed, 12 Apr 2023 13:26:14 -0700 Message-Id: <721f0da48d2a49fe907225711b8b76a2b787f9a8.1681331135.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763005619377726142?= X-GMAIL-MSGID: =?utf-8?q?1763005619377726142?= CFI typed functions are failing to get padded properly for CONFIG_CALL_PADDING. Signed-off-by: Josh Poimboeuf --- arch/x86/include/asm/linkage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h index dd9b8118f784..0953aa32a324 100644 --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -99,7 +99,7 @@ /* SYM_TYPED_FUNC_START -- use for indirectly called globals, w/ CFI type */ #define SYM_TYPED_FUNC_START(name) \ - SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) \ + SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_F_ALIGN) \ ENDBR /* SYM_FUNC_START -- use for global functions */ From patchwork Wed Apr 12 20:26:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 82670 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp584879vqo; Wed, 12 Apr 2023 13:28:58 -0700 (PDT) X-Google-Smtp-Source: AKy350b1CbuDAyxk5K7CL135nh/21moZxxPDVzEssX0kVCAxHmwa+ruwRVzSZ7JcWP74c3PwrTyv X-Received: by 2002:a05:6402:1608:b0:504:92aa:12ee with SMTP id f8-20020a056402160800b0050492aa12eemr3740596edv.15.1681331338288; Wed, 12 Apr 2023 13:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681331338; cv=none; d=google.com; s=arc-20160816; b=1KsfSYMY3duXUwsXGi4TahMXpYvB+3fi6WR2XEZd1PCoqr8GCEPLilqa/DOKbvKSpd I07BeI+g2Zmp+lGCA/KuxBhvhl/kpA0et9jkdZ4UdjiLJBipQPesI+KyVJACQSIHcnQy FpFSjS+PYgyfgBIfztte4XsIXbTeSR+dJTKHUgpRvNkLhqJ2CwbX/6V8gJ+obrN0ZS8D ivD26G2nO1yRzPvNiXaxTie/5d0jhqz763HNX+7N/yUE3BDBpa+M0lCRHzEvqwMattVX Ik1GW/nzEJwkffCu7KVOH186ska0ZPGT2QFX+IUrQHtxYf9OuHRL4qdyGG81ZLbqFkQW rnLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RgP29RvCH7uU1Rd8NUq7EMbGXTC7mbRrwzgoggKrhZw=; b=E/IcQuRGky92vl9Q/haaBR/Brgua6bjJmUz8wPeEVk3SFPB0IAZ4FsxCwoBIWB7w4l rUI4bvqZIL5AS/q8lNvZ98LQc9C9STzSgyj4sJcVMDokC/HswWz+XjOc2J5vyRN92KhU fy2iUD2ipmc15VCNOchX3aImJRVTdA1R1PqctgUpNeXCY2Ps0B3OFIVLnuzUylHiMSJ/ hjN7PO02mjhZCN5k3iE3tsdlw8CvSTrUcACjghQmJ7LAjJBwddiMVKKJttXJlt6QVCkK 5mXMjC38949MNmT1DCIaIKXm2uZZBZ3XgJ2xIBp8a6YJEHtgTpG6TfdKUyrpq7qSc0VH lhyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pGh8C+Wj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y1-20020a50e601000000b00501d531b215si15129711edm.522.2023.04.12.13.28.34; Wed, 12 Apr 2023 13:28:58 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pGh8C+Wj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229667AbjDLU0c (ORCPT + 99 others); Wed, 12 Apr 2023 16:26:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229762AbjDLU0Y (ORCPT ); Wed, 12 Apr 2023 16:26:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89FE410DC for ; Wed, 12 Apr 2023 13:26:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1EC2F631DF for ; Wed, 12 Apr 2023 20:26:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C79FC433A4; Wed, 12 Apr 2023 20:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681331182; bh=zo0BxAzMtQYruLjF5XaJiSkqwASG0OADnk73jUKYYMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pGh8C+WjFDMkawFcUIWtEsUhPrhmYCi0exlZBJVzag/j57IfTMGMCHT/uSH6nBnO/ qY69xO3WOk/r1W/nY7ZPEMpmuOI6hdpqLNYRfGc4Gj51zroYfmHeyncccCPbuV3bTM 0ceZjyKGyOgzw1dXPXsNfavYYygL09hqrvNouTDMbuQ0q9pKNSiMRr9n9jo2Z1xdvb vsUql2XbzlSbef8FR2Oigx6di1bi7E53UAcfZ+7YnudmAoB5FijOwKYUnwaRJksD0w 8zAkeBSFe9ptgTiK7hq96ZWzV93WtNPGAB0vfBVLs1xXjziMbouEqxrvD9IssoC4VO 3HpR7NIvLXa8A== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 3/3] objtool: Generate ORC data for __pfx code Date: Wed, 12 Apr 2023 13:26:15 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763003689658234902?= X-GMAIL-MSGID: =?utf-8?q?1763003689658234902?= Allow unwinding from prefix code by copying the CFI from the starting instruction of the corresponding function. Even when the NOPs are replaced, they're still stack-invariant instructions so the same ORC entry can be reused everywhere. Signed-off-by: Josh Poimboeuf --- tools/objtool/check.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 2f3136145b2e..3f27a0278bf8 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4123,6 +4123,7 @@ static bool ignore_unreachable_insn(struct objtool_file *file, struct instructio static int add_prefix_symbol(struct objtool_file *file, struct symbol *func) { struct instruction *insn, *prev; + struct cfi_state *cfi; insn = find_insn(file, func->sec, func->offset); if (!insn) @@ -4151,6 +4152,19 @@ static int add_prefix_symbol(struct objtool_file *file, struct symbol *func) if (!prev) return -1; + if (!insn->cfi) { + /* + * This can happen if stack validation isn't enabled or the + * function is annotated with STACK_FRAME_NON_STANDARD. + */ + return 0; + } + + /* Propagate insn->cfi to the prefix code */ + cfi = cfi_hash_find_or_add(insn->cfi); + for (; prev != insn; prev = next_insn_same_sec(file, prev)) + prev->cfi = cfi; + return 0; } @@ -4158,7 +4172,7 @@ static int add_prefix_symbols(struct objtool_file *file) { struct section *sec; struct symbol *func; - int ret, warnings = 0; + int warnings = 0; for_each_sec(file, sec) { if (!(sec->sh.sh_flags & SHF_EXECINSTR))