From patchwork Tue Mar 30 11:40:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Sverdlin X-Patchwork-Id: 12172331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1387CC433DB for ; Tue, 30 Mar 2021 11:42:36 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 92A0861964 for ; Tue, 30 Mar 2021 11:42:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92A0861964 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nokia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=g6nZatm5oF07sgeNk1c/dqpSYNZPEd9f+WJHgCWA2/M=; b=ZoMobP5C1bbZOvcWiNtGptgOEI hF6BSRlDz2yECOJQjoByM0dHBe1Ebbrn3aMri2bpDrmMrHMZKy/6E2Oj8SEqIpnUATnjlhYbSSFpw 1TUVYRRROSmKQWqRpihTTBUHisKsHD6eCcurfWllfbJvGmr8mIhmpqDTjwoYaELbNLbkRQ8g4bPyS ZxYN5yz+ge2DhyvP3byTKuzwouV7kS8soJ782wdBaHZ8gfQeqmWX83HE2PYxnCQgsI9QdzkVOIK1E FdMJWRPTCQL+4zqY3NqlyYS86wBTQWPDlzigyqEzZIB6SebLMLrV4e5Ozb1CHu9PUIWlqR/iu1gjz STCm7s8g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRCju-003aje-5Y; Tue, 30 Mar 2021 11:40:54 +0000 Received: from mail-eopbgr30121.outbound.protection.outlook.com ([40.107.3.121] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRCjn-003aiB-15 for linux-arm-kernel@lists.infradead.org; Tue, 30 Mar 2021 11:40:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YBdSuJRYE2c3ZKqQk31GPmRQ8EzQvK1JK+UEECxilf4fgf4VhUB/zZBYvfASeifs4RSkBeFX4Lw6BKcBbnUyPXzf3XDDJ5MXIJfGJKNVwG17fkYpLIx1JN96Qjm7lyUNj2yNSs+7uaIKKZaQHyGYK6FGWTkdARMNrTBffBUpyI23w+Fle9i+Fx+JQIpXjZQHtJiRQIYQsx8t0YpEH4EBNDQdbYc7D/cZCzKX1sXYaE4llJa59SVr+jIyO7p/QAmQwuHhQbDoytJ78aWGGgIqku5F2K8pvdHzqNTcZlQ7qoD3Q6QXVrrFhBIMTZXYNFQf7aDWeiuBtwIvivCJnLc/BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/vnNT0cAOKE99+naUJjBQLeti2+AkJQPIzA21oLGMCY=; b=cKPm7JdHkuRqfgVqJtNWy4zXnrccRCG9PlSxQl91DpRiuygkb3Ou0SNwbQGpwpTQMpo6NO/x4BpqKqpANyJT4bTC/xS3f6qpZFb/v1m1NkweGFAvLSTeyXwlojbs9+xopTUurrfmqhpxDIyULx6dHkDRz6sdjbP78HDZ7is0YXEO6YChZmyA1KQ/Oi13dKhNpGeU/IcsQ+QiZTVFTsoEpRkFI+uKgabcrDhFIu3iBA/aMiRcdIA8Zw3Cz+5RGMNZGrerpeuiFMhYDOs5RikO+bCwsHt4GbdZVpsheZcMrbO5I2C6gWyaYNGCUpOxJpRC8hafNfzILX7zGgRMQ5Zr1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.8) smtp.rcpttodomain=arm.com smtp.mailfrom=nokia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nokia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/vnNT0cAOKE99+naUJjBQLeti2+AkJQPIzA21oLGMCY=; b=mvwqe0Xr/8QdT5uo5Qwt0x+whDN0B7mxC4H0VrDIjdZgcm7FiHU1LP+1HUlmj93HFAL0S+fg5fVkI48o23mgZ+jDOsRqQtEC8Tyja0hl6UmUGhESa7ZxrdJIacJ+v2drscejJ9k5xa6sYljjY+E6Y3/NSgwTx2CEMzPjd5luunA= Received: from AM5P194CA0024.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::34) by AS8PR07MB7077.eurprd07.prod.outlook.com (2603:10a6:20b:259::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.17; Tue, 30 Mar 2021 11:40:44 +0000 Received: from AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:8f:cafe::ce) by AM5P194CA0024.outlook.office365.com (2603:10a6:203:8f::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Tue, 30 Mar 2021 11:40:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.8) smtp.mailfrom=nokia.com; arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.8 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.8; helo=fihe3nok0734.emea.nsn-net.net; Received: from fihe3nok0734.emea.nsn-net.net (131.228.2.8) by AM5EUR03FT019.mail.protection.outlook.com (10.152.16.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Tue, 30 Mar 2021 11:40:44 +0000 Received: from ulegcparamis.emea.nsn-net.net (ulegcparamis.emea.nsn-net.net [10.151.74.146]) by fihe3nok0734.emea.nsn-net.net (GMO) with ESMTP id 12UBeeul023631; Tue, 30 Mar 2021 11:40:41 GMT From: Alexander A Sverdlin To: linux-arm-kernel@lists.infradead.org Cc: Alexander Sverdlin , Steven Rostedt , Ingo Molnar , Russell King , Florian Fainelli , linux-kernel@vger.kernel.org, Ard Biesheuvel , Qais Yousef Subject: [PATCH v8 0/3] ARM: Implement MODULE_PLT support in FTRACE Date: Tue, 30 Mar 2021 13:40:32 +0200 Message-Id: <20210330114035.18575-1-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.10.2 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e9f50b00-6b2a-429d-8431-08d8f370a783 X-MS-TrafficTypeDiagnostic: AS8PR07MB7077: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QL6npV9GFddFuLobM9wnt33yS7J4zDdM6Gupu4RBuGacEspvdCUtpfDwla/0aRDbpAdEgNewfJBoe4jvH3ztyl0k/PoogmN8cwWSSaWgGMHJbyBG1no6+5Jr1Sumr4N/Fp/DMZtz0or/DbTrIGogq2+RAM5K6lltDKlPbEa8YyTGMfIRixUmCPPQAdKF0FH6/sCYiK4ofbgfMKv1yYoQBSiu8UZdlw1QXg8fNQDD2KGfzO77D+jiacN2WugV4hbTKORa9W4ophqgi03mcJJf7m36y7qMPL+6cLTel0U6dV3r8bxN/j4FW1EpmItDnBFJ7c3zIMzcEA2goCZ1TonDIUGMDneW6HvjjAhJlDOp+T7eYcFF3BZu039+g7+783Qv6uuyx/LmUsojC4SJ+qfDUo77nr4XZSV99/5SAM1nWD5dvcHb4m0fY9y+LapMFeAzRkYKKLIT4XpNSPobazETsDpsWRtFaoec7oFtzfu+aHjjdOSXNpo8H+aqqSTCMXAL8t2PDXyRQX9vlhmppxd4ps/45DgWy29voNMvNMJC6SIct19hrmnre3gAGz3YNiCECyHEpAsdCsacuQDYkdGYnarMDhwFtlj2znftwwRyizsRFY2V/QGHiFiR8s4KwmAO1qdf4h6CzsJedlfSpKuvZxUAN3hlXwo3WazaD1QAuIZlmKSjXxmMj4vYonUbBf0g X-Forefront-Antispam-Report: CIP:131.228.2.8; CTRY:FI; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:fihe3nok0734.emea.nsn-net.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(376002)(136003)(346002)(39860400002)(396003)(46966006)(36840700001)(81166007)(70206006)(6916009)(36860700001)(2616005)(47076005)(478600001)(70586007)(54906003)(82740400003)(336012)(356005)(26005)(1076003)(316002)(186003)(86362001)(83380400001)(36756003)(6666004)(4326008)(82310400003)(2906002)(8936002)(5660300002)(8676002)(36900700001); DIR:OUT; SFP:1102; X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2021 11:40:44.4556 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e9f50b00-6b2a-429d-8431-08d8f370a783 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.8]; Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7077 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210330_124047_252561_9E17DFF9 X-CRM114-Status: GOOD ( 12.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Alexander Sverdlin FTRACE's function tracer currently doesn't always work on ARM with MODULE_PLT option enabled. If the module is loaded too far, FTRACE's code modifier cannot cope with introduced veneers and turns the function tracer off globally. ARM64 already has a solution for the problem, refer to the following patches: arm64: ftrace: emit ftrace-mod.o contents through code arm64: module-plts: factor out PLT generation code for ftrace arm64: ftrace: fix !CONFIG_ARM64_MODULE_PLTS kernels arm64: ftrace: fix building without CONFIG_MODULES arm64: ftrace: add support for far branches to dynamic ftrace arm64: ftrace: don't validate branch via PLT in ftrace_make_nop() But the presented ARM variant has just a half of the footprint in terms of the changed LoCs. It also retains the code validation-before-modification instead of switching it off. Changelog: v8: * Add warn suppress parameter to arm_gen_branch_link() v7: * rebased v6: * rebased v5: * BUILD_BUG_ON() ensures fixed_plts[] always fits one PLT block * use "for" loop instead of "while" * scripts/recordmcount is filtering reloc types v4: * Fixed build without CONFIG_FUNCTION_TRACER * Reorganized pre-allocated PLTs handling in get_module_plt(), now compiler eliminates the whole FTRACE-related handling code if ARRAY_SIZE(fixed_plts) == 0 v3: * Only extend struct dyn_arch_ftrace when ARM_MODULE_PLTS is enabled v2: * As suggested by Steven Rostedt, refrain from tree-wide API modification, save module pointer in struct dyn_arch_ftrace instead (PowerPC way) Alexander Sverdlin (3): ARM: PLT: Move struct plt_entries definition to header ARM: Add warn suppress parameter to arm_gen_branch_link() ARM: ftrace: Add MODULE_PLTS support arch/arm/include/asm/ftrace.h | 3 +++ arch/arm/include/asm/insn.h | 8 +++---- arch/arm/include/asm/module.h | 10 +++++++++ arch/arm/kernel/ftrace.c | 46 +++++++++++++++++++++++++++++++++------- arch/arm/kernel/insn.c | 19 +++++++++-------- arch/arm/kernel/module-plts.c | 49 +++++++++++++++++++++++++++++++++---------- 6 files changed, 103 insertions(+), 32 deletions(-) Tested-by: Florian Fainelli Tested-by: Qais Yousef