From patchwork Fri Feb 23 16:58:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander A Sverdlin X-Patchwork-Id: 877324 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zp6445xVWz9s7T for ; Sat, 24 Feb 2018 09:54:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="eU0xS/df"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zp6444D0tzF1dx for ; Sat, 24 Feb 2018 09:54:44 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="eU0xS/df"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nokia.com (client-ip=40.107.0.128; helo=eur02-am5-obe.outbound.protection.outlook.com; envelope-from=alexander.sverdlin@nokia.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="eU0xS/df"; dkim-atps=neutral Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00128.outbound.protection.outlook.com [40.107.0.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3znyC36RhpzF1lF for ; Sat, 24 Feb 2018 04:00:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=CEy1tkRVP1JWRvDZlvQcNcaRFyQ16n9dlt55kwQwios=; b=eU0xS/dfTb2slFWbcZmcWcL0KaAjrNgc75VfZC+cJ3R/vGIC9C5xZW6WETHaLpJlO+fU0QY/P4YR+1V21JdG3i9bVtOK/vQe6TBHXFiBnh8knd0hWgxzDR80GrBTGq+U4O4s9qU0udSOVXK+shSXUL9n1VlhWN8+I66J8KFCYac= Received: from ulegcpsvdell.emea.nsn-net.net (131.228.2.20) by AM4PR07MB1316.eurprd07.prod.outlook.com (2a01:111:e400:59ec::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.548.6; Fri, 23 Feb 2018 16:59:59 +0000 From: Alexander Sverdlin To: Steven Rostedt , Ingo Molnar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ftrace: Add module to ftrace_make_call() parameters Date: Fri, 23 Feb 2018 17:58:47 +0100 Message-Id: <20180223165849.16388-2-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180223165849.16388-1-alexander.sverdlin@nokia.com> References: <20180223165849.16388-1-alexander.sverdlin@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.20] X-ClientProxiedBy: VI1PR0202CA0036.eurprd02.prod.outlook.com (2603:10a6:803:14::49) To AM4PR07MB1316.eurprd07.prod.outlook.com (2a01:111:e400:59ec::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a7422511-d0ff-4381-3814-08d57adee232 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7193020); SRVR:AM4PR07MB1316; X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 3:LEmSDZ1abEfjPHTLN+JYcMS/OhJoOa9vA+Vnas9tdQYyuHyFYtXe7YzMvgq+HhLtrwZ1opalBhIDzjwOtpLLk/OsAoaQ1XOP6k7ebSDXJ2n8vu3T/yTdqMn8TkhFNgqh7VT1lpAU3eahQ27kLyun5jFguFypdLoYqRgZOXzmXeQTfSrTqB141imqVEYuEZyL1yotOFqkysd+96VWdDThbXZV1kgD4GAu62TdsSH/RK3ngGRzvSPX9jWuSslMLnoL; 25:EjC2kanqYdFzGsnTwts09IGj0jZG4nly4hiLmwCOwec9bG1NGSx+JaNle3smFxYEjMBNngaOHlfskondf3+PkrT2+MHOBCQtDlJkFDjuRXNKuj9DHICpv2eYXsqZ9cUYYeP/XFA9Pz9lN0XnTxpV5Oz3pqe/L48bIBmApAdwapdOfF39wSrYeoyoBIqlO8kIeIror7xcejouW5DgnY4Lma48kO714qrXvp2jegqW1lDdOA+DoY+Gq6NM+X4RYO4dYSg3K7SrrMRZv2HtoNJYgSMPpuK4ldbmglgGXQfabwu78R8oMzjijSO2scg5wejOWokj1dWvY1wFbD3ikDpwFw==; 31:InG5mBgDoIEg5n0y2owl9M29BO0sna/VP3tgYdVdFYaOk3/vTbenrEKHkYa1jrMVv0gdvAlmwnTfedBOFODcIpnR19VhOTPPw6wq/Aw/pEDK4LYRe9l8YQFodSFcOdlgWicHGf4WD8c5hfdyTnluZfXvbmdJ8OkVH/kJUYFg2u63USCzR1sKtNlVCRRmPlUSuVnI26k6Vc3zImFVD1J/ySrDMDwJOKDzy/YqYFYB3FA= X-MS-TrafficTypeDiagnostic: AM4PR07MB1316: X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 20:Ko6Zd3jh+eouqUGEwL/Of+qbPJ3ExfsQPMW5iXjdlfRwOkKthPcSlEhwjmwcFeug1Lg+MrJSuk3cJLG59I5WSmSQ/6oKZWu5nItRUrZfSqFyDKNDrH0iceBEdFidcPzBww8Wp0pszWWsR67lUjrJUIBx8Mal7cXXGuy0UPG3Wq4exJqrjKkbWmsJe0U/MskgvZ7/Qq8Q+gQVsS/HL6pd3Wu3891K4PpEmsYGc2znPuRyFX4kUBUGurUopx8j8fjoyMOXDPOQO6WcUkRb3MTIk+kHMr33yxM2X0CDBQEU6dKHjXQRquolXeIF62n+4Hb7DCwzMzYI7hRfZMgAgA9ApqsuRj4D76zS1zDBWpS1nvYxwdMKXkdLFbgF1/Qe6/RUU5GIBn/k4Jv0WvDTOuyOoIQ21Ftw+y5bwdRMKHWvw3iQOflgd/68aboR5j3uTWDb/KkNcrSFqnrGHYtI4upEUmawR+2HQNRaB2ooPX6+KPTEPckZvJDtq5eAK4o3ojm25pOuLYXE6XuH/yEcN6pDltq8XrjQscvo99cFVfEivYSw7ZZH1hLSL+3iQG6r8dMmcxhnRUwSg9oaKfAH4wjhmPTh4BBQ3c2PF/ITHhIXSOE=; 4:xls9ochS3fb9m3ISYV6IWGekQ5F7Uto4U1Izkb8wY3iYWMdadbxFsztKD4Rm3B5eZpSVrOrEQY3bLeylTrilK33Pu82Ha5VUKIh82XxqPRTQBnzQIL5y7MrsGGgYEsyNYk9575N6T3WL5+qG7/deqj2RRDjGHqg58xQV/tDckrvMxuAwph0Ym3zalqTZbctnKXv8oyElhbrzsZx11JslGJulvtP0LoMdwqjBFpfdS0osUylHp2x+gAfl3/EjfinexT0l8+mk0xWu6gSPnHm5uRxWhlaO+cNBwzukbAr4cwq4Tn/YgblU7WefopOYNLOe X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231192)(11241501184)(806099)(944501161)(52105095)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:AM4PR07MB1316; BCL:0; PCL:0; RULEID:; SRVR:AM4PR07MB1316; X-Forefront-PRVS: 0592A9FDE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39860400002)(39380400002)(366004)(346002)(199004)(189003)(52116002)(6506007)(386003)(7736002)(305945005)(2950100002)(76176011)(1076002)(7406005)(7416002)(97736004)(5660300001)(6666003)(6116002)(59450400001)(39060400002)(3846002)(16526019)(186003)(50226002)(105586002)(478600001)(106356001)(81166006)(81156014)(66066001)(6346003)(8936002)(47776003)(68736007)(26005)(8676002)(86362001)(50466002)(4326008)(53936002)(51416003)(25786009)(6486002)(48376002)(54906003)(110136005)(16586007)(6512007)(316002)(2906002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM4PR07MB1316; H:ulegcpsvdell.emea.nsn-net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alexander.sverdlin@nokia.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR07MB1316; 23:WUXkvlSFIteBK8M3r323conbNDTtSv7vyfh0+cXpD?= qwAqTPJbQ0B4T2rls9RCsG7W5nXBrkpStybJjWW4wwLJ1dxvAAK2fAPWRKrIS/2V4NxEghqoYgWlqKJ9hfqqBknlsQAYffv0gTxMC8sPUkVpuXA+rkZpWS+JWxfJG+eYTnm+2gvl7OpXcu/RTGdD5myAySKbZfHsVVcFWj0XFCkn3GevXT+jmJKXTz+F18a85GbwgH0NTMMwrQd+9srCeNmUUrl21QalIFXiz5G68YbsPB1pves5EF7fe3VFT4VvJ1UXNZqTkqkGVeYlHSEjlRLC+WNoVkxb3ASnlkG2VVyceG6Hq0ajcfAqUArQSAhrCeCldJiNogQDf1RezNGp/wzBM7H4jwWjp+Ly+ULiZgQ1DDTky0FEhcqdrenWJw1r+d4SL1wD4set6Fe9McXBBnBPr19ayhtVnhMnLI7Xuk0JMMbY1NwPp2Oz49hbDTRdESWx0ml3vcp60b7b0H/i6n5OnLS8+qLCJN2sP4wZHmdgkvdR+j22P+VPKmuPfARORl+/G7Ry/T5XuYdPo8Kl1FuMKMwog4cd4m8XBBmLuRYwAFZhjDAUocy+FtqDPVwBUDxsuhPQstBtH/wuk3gQ+l0S4ZgkFVO3TpRLQ5L0VrB5Aa192GBbX05x3Hf1iqRlZUnYHE0q06f/w2o4HlGZr8Lgl3H+vbaUuyg1lBk1D01mFFehd+E5jnficYR93V5ArE+jzm8aroJbm+5S+G1NHX8ot2hY8EYz4fOaejeJBE/agFiRtRZtms1ZYwQRANONnK0vKS2SBuQEOO2gwPQD1GSgO2qd9W0gWQanrqWcATZ9M4m5ttJpjQUZ7dTS9lV6MPquNdB6SgXcKu8Dzj292w+CBKxB1Ld3LvQFpyK6m1ZXVN11yGfIoq5gCIxG3zsm0GTiuks/W2GX16WWwpqbCCroQluHb14AkS+KXeVFqQhn2t3gCCDhqkZlYh7ZGyad7R2dHdvTg3biApj8mZMLScIXwLGVpzTa3UKvkF0lhZMgNMLKw9WdGkrk62pXnPlvo/FLkinzTumZksntw8UAJfPaBo8IAYbUnrCzXacCZe6VUbgcB9Dvh9WjyKZXKrgmPhf1Qu8DIGfcOSPstDaGxuVLt8ssxE+fBbZMff7PEUqpSeE7NmLxbkjiWctpXr55gpqRLn+WLBy14MaOftq1RSuEm66NyTK2pzyZR2ZKr97nJPN5aLPzDMYzVa0lzLb+DQ= X-Microsoft-Antispam-Message-Info: zMUsTMZHWFZ102segHExlvJiep0ngrWxoj4Bu+tYhty6SHuK2sBz+2qZpMKcnnx/yVJvVmgbI5hafa0tY9dY5A== X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 6:dsf8NICqJT/7rkmHIzzmhGryuPn4Lxu6rjB/Bt9EjpgJt2xgTA9EOgKRDX/+d1y4jjinaVqs5wVEcPVAEBGGfoWxrFbGf7KUj/K7JXGeNYo8sQCqaBithKiBRQmwUhtfmCJ1Mo23tsFswzjPPkomTcnZHR7K/OvtSO5hz9cwIB6/+q6tFM7oAYFx2w2O/SdXq4kfhIqos/LyCOEKFJK1retQJuEu0IHoQ5Y8rgbmAku0pxzUjaGGSqh7dLUwTOe3uYvCMo+o7MuOypjV4A65AiRk/U4xvuAuWMhB5yqZ7o5o1EsPDAqLoKqUqUhVR7vgVbtfPXraxbo83f774F6o4ZL/bg254bVyZsUbn0zrAIQ=; 5:YWOX0CAnBWU1X5s9CpkQefBwDNe+zq7OXQ/KSx8uHjqhgluhPsw95vz+UW9O5XO4KLdVGptw4tEQc3kF6nGB7S3HEwBfqiHG2wtjVMLruHeC06FRD2u0VjkzuNiB/5djyE97w+jVNY19rlpqGpIUNyD8i+Y3kPR/lAUmYB/KxlU=; 24:xYygtN2kfl3MPxK5ZeJ9krm9j7jeAPE1xlNL8pEPMvxVXMCp1k8SUsUWCm3ZxXVTtL2KX/NyEjZF+pWrhObn7xHOaNLuSI/iZTXYMngeOsM=; 7:hfvXXtPYafU8UAwVTobwgCQaqgY+Pj9ppDFIDaOp4ZpiUtQ/tp5TbJuhHOb/0UGYvUkNSbScnJlzwWBYL+CmLTZGfqk2Kd5HqQUD5bHoUTIyS9mJ0GQ2sQdQABjOO9X1IUETjj2418rhCwUw1Nyk2xD2YJT2/JhP6IJ4/YBPfvG8q+UAP3Uygp/Ar2ithxMzBqdkgmPZffisBtd888YH/AusgYulpYQkG0IZwY/tSxWte7tNW1+9XoYSzvUcqIXs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2018 16:59:59.8059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a7422511-d0ff-4381-3814-08d57adee232 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR07MB1316 X-Mailman-Approved-At: Sat, 24 Feb 2018 09:51:07 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Rich Felker , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Heiko Carstens , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Yoshinori Sato , x86@kernel.org, Russell King , Catalin Marinas , James Hogan , Fenghua Yu , Chris Metcalf , Steven Miao , Will Deacon , adi-buildroot-devel@lists.sourceforge.net, Alexander Sverdlin , Thomas Gleixner , linux-metag@vger.kernel.org, Michal Simek , Tony Luck , Ralf Baechle , Martin Schwidefsky , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" ARM support for modules' PLTs will require a module pointer in ftrace_make_call() exactly as ftrace_make_nop() has it. Change the function signature without functional change for now. Signed-off-by: Alexander Sverdlin --- arch/arm/kernel/ftrace.c | 3 ++- arch/arm64/kernel/ftrace.c | 3 ++- arch/blackfin/kernel/ftrace.c | 3 ++- arch/ia64/kernel/ftrace.c | 3 ++- arch/metag/kernel/ftrace.c | 3 ++- arch/microblaze/kernel/ftrace.c | 3 ++- arch/mips/kernel/ftrace.c | 3 ++- arch/powerpc/kernel/trace/ftrace.c | 3 ++- arch/s390/kernel/ftrace.c | 3 ++- arch/sh/kernel/ftrace.c | 3 ++- arch/sparc/kernel/ftrace.c | 3 ++- arch/tile/kernel/ftrace.c | 3 ++- arch/x86/kernel/ftrace.c | 3 ++- include/linux/ftrace.h | 4 +++- kernel/trace/ftrace.c | 6 +++--- 15 files changed, 32 insertions(+), 17 deletions(-) diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 5617932..be20adc 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c @@ -162,7 +162,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ret; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long new, old; unsigned long ip = rec->ip; diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 50986e3..e3a95d3 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -68,7 +68,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) /* * Turn on the call to ftrace_caller() in instrumented function */ -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long pc = rec->ip; u32 old, new; diff --git a/arch/blackfin/kernel/ftrace.c b/arch/blackfin/kernel/ftrace.c index 8dad758..61ffc99 100644 --- a/arch/blackfin/kernel/ftrace.c +++ b/arch/blackfin/kernel/ftrace.c @@ -45,7 +45,8 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, return ftrace_modify_code(rec->ip, mnop, sizeof(mnop)); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { /* Restore the mcount call site */ unsigned char call[8]; diff --git a/arch/ia64/kernel/ftrace.c b/arch/ia64/kernel/ftrace.c index cee411e..658a011 100644 --- a/arch/ia64/kernel/ftrace.c +++ b/arch/ia64/kernel/ftrace.c @@ -169,7 +169,8 @@ int ftrace_make_nop(struct module *mod, return ftrace_modify_code(rec->ip, NULL, new, 0); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long ip = rec->ip; unsigned char *old, *new; diff --git a/arch/metag/kernel/ftrace.c b/arch/metag/kernel/ftrace.c index f7b23d3..635652a 100644 --- a/arch/metag/kernel/ftrace.c +++ b/arch/metag/kernel/ftrace.c @@ -104,7 +104,8 @@ int ftrace_make_nop(struct module *mod, return ftrace_modify_code(ip, old, new); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned char *new, *old; unsigned long ip = rec->ip; diff --git a/arch/microblaze/kernel/ftrace.c b/arch/microblaze/kernel/ftrace.c index d57563c..01b314a 100644 --- a/arch/microblaze/kernel/ftrace.c +++ b/arch/microblaze/kernel/ftrace.c @@ -161,7 +161,8 @@ int ftrace_make_nop(struct module *mod, } /* I believe that first is called ftrace_make_nop before this function */ -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { int ret; pr_debug("%s: addr:0x%x, rec->ip: 0x%x, imm:0x%x\n", diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c index 7f3dfdb..9dcec19 100644 --- a/arch/mips/kernel/ftrace.c +++ b/arch/mips/kernel/ftrace.c @@ -200,7 +200,8 @@ int ftrace_make_nop(struct module *mod, #endif } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned int new; unsigned long ip = rec->ip; diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c index 4741fe1..b198433 100644 --- a/arch/powerpc/kernel/trace/ftrace.c +++ b/arch/powerpc/kernel/trace/ftrace.c @@ -437,7 +437,8 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) #endif /* CONFIG_PPC64 */ #endif /* CONFIG_MODULES */ -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long ip = rec->ip; unsigned int old, new; diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index dc76d81..1691d53 100644 --- a/arch/s390/kernel/ftrace.c +++ b/arch/s390/kernel/ftrace.c @@ -136,7 +136,8 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, return 0; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { struct ftrace_insn orig, new, old; diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c index 96dd9f7..2d3cacd 100644 --- a/arch/sh/kernel/ftrace.c +++ b/arch/sh/kernel/ftrace.c @@ -242,7 +242,8 @@ int ftrace_make_nop(struct module *mod, return ftrace_modify_code(rec->ip, old, new); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned char *new, *old; unsigned long ip = rec->ip; diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c index 915dda4..36117b5 100644 --- a/arch/sparc/kernel/ftrace.c +++ b/arch/sparc/kernel/ftrace.c @@ -63,7 +63,8 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long ad return ftrace_modify_code(ip, old, new); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long ip = rec->ip; u32 old, new; diff --git a/arch/tile/kernel/ftrace.c b/arch/tile/kernel/ftrace.c index b827a41..749e50f 100644 --- a/arch/tile/kernel/ftrace.c +++ b/arch/tile/kernel/ftrace.c @@ -136,7 +136,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ret; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long new, old; unsigned long ip = rec->ip; diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 01ebcb6..389f15c 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -162,7 +162,8 @@ int ftrace_make_nop(struct module *mod, return -EINVAL; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned const char *new, *old; unsigned long ip = rec->ip; diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 9c3c9a3..1e8c421 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -536,6 +536,7 @@ extern int ftrace_make_nop(struct module *mod, /** * ftrace_make_call - convert a nop call site into a call to addr + * @mod: module structure if called by module load initialization * @rec: the mcount call site record * @addr: the address that the call site should call * @@ -554,7 +555,8 @@ extern int ftrace_make_nop(struct module *mod, * -EPERM on error writing to the location * Any other value will be considered a failure. */ -extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr); +extern int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr); #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS /** diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index eac9ce2..d32f2f5 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2421,7 +2421,7 @@ unsigned long ftrace_get_addr_curr(struct dyn_ftrace *rec) } static int -__ftrace_replace_code(struct dyn_ftrace *rec, int enable) +__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable) { unsigned long ftrace_old_addr; unsigned long ftrace_addr; @@ -2442,7 +2442,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) case FTRACE_UPDATE_MAKE_CALL: ftrace_bug_type = FTRACE_BUG_CALL; - return ftrace_make_call(rec, ftrace_addr); + return ftrace_make_call(mod, rec, ftrace_addr); case FTRACE_UPDATE_MAKE_NOP: ftrace_bug_type = FTRACE_BUG_NOP; @@ -2470,7 +2470,7 @@ void __weak ftrace_replace_code(int enable) if (rec->flags & FTRACE_FL_DISABLED) continue; - failed = __ftrace_replace_code(rec, enable); + failed = __ftrace_replace_code(NULL, rec, enable); if (failed) { ftrace_bug(failed, rec); /* Stop processing */ From patchwork Fri Feb 23 16:58:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander A Sverdlin X-Patchwork-Id: 877325 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zp66R43Zkz9s7T for ; Sat, 24 Feb 2018 09:56:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="jeG/4IGF"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zp66R2hYszF13f for ; Sat, 24 Feb 2018 09:56:47 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="jeG/4IGF"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nokia.com (client-ip=40.107.0.128; helo=eur02-am5-obe.outbound.protection.outlook.com; envelope-from=alexander.sverdlin@nokia.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="jeG/4IGF"; dkim-atps=neutral Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00128.outbound.protection.outlook.com [40.107.0.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3znyC53GnqzF1lF for ; Sat, 24 Feb 2018 04:00:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sKOJKG/Q/zf2ycKrpGT2EIhM3a1c5rpmTKZdlOq6yzA=; b=jeG/4IGFx4zGaztt4/X8ObR+BWz/irdpQ5RxRwdoRKvYlH/pnEmwqiTdF7ZQ+BaLullGUFnsXts7AWKVDF4cOqgLaplJ5Pm9rbG0YYSKQB1ypIOuLsFykZGmN3qZ8nzCdbRitdSkyJDm+RbJIO42k6r60RlNKkTCsfhg6kn5Wfw= Received: from ulegcpsvdell.emea.nsn-net.net (131.228.2.20) by AM4PR07MB1316.eurprd07.prod.outlook.com (2a01:111:e400:59ec::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.548.6; Fri, 23 Feb 2018 17:00:04 +0000 From: Alexander Sverdlin To: Steven Rostedt , Ingo Molnar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ARM: PLT: Move struct plt_entries definition to header Date: Fri, 23 Feb 2018 17:58:48 +0100 Message-Id: <20180223165849.16388-3-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180223165849.16388-1-alexander.sverdlin@nokia.com> References: <20180223165849.16388-1-alexander.sverdlin@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.20] X-ClientProxiedBy: VI1PR0202CA0036.eurprd02.prod.outlook.com (2603:10a6:803:14::49) To AM4PR07MB1316.eurprd07.prod.outlook.com (2a01:111:e400:59ec::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 79bc3cf2-13c1-4635-6e8d-08d57adee484 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7193020); SRVR:AM4PR07MB1316; X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 3:7Q8Jh8QPnLmRs29Ipk1+WyeIYskGVh1MOLr/d51RyVl+Hli4zYTAXKnZnJCbQnQsIWctwE9x6C8+LfHeANpA0l4mvCAprY+kgdmBCzGSxBCNTosvPfxh9EGBkONGPF+BmviofEAk06moNFNDd98j1ple77PkXFmDhLYXnTC2lg04hOzQpuEy3s6kGBWarWzbpMCTHLABqiY4PFBj3GMt/OPCZl4QigxarfB9rqavxwjlXdZRQrT1/g6wejGWnxXz; 25:rfJk7hwNw5R+Z2BYJcwezb5Tg49LS0v16gdpVDuxx7zAh2Iw7TWAH9jQIC4nWIzj0yzZrGId0aV966gnoone1mNljVGnhqo5qSG4btIlXwjzUyX5iEOboP6a+ems2KiyfystOwCwyHHekN+Ho2DGt+VRdJHC6sipZ8rqQISKTSDn2ZPG1vwtMYb0tPsoqRt6fA2jf4iSBCyOffXF/QHuuYJTgnXjM3Axt9S36SHDH81Au9U1ntU1U01EO6g/ueOm+UkwlMBeS7dK80xNxHCtilMR7rTe/B6OxNf0tRitw8ZZqZ4Qhih9YIiIx+paegisrVeXYo/sP9ZY6Q59QTyzQg==; 31:BK0K15Rie0YWI/V7bZZ/A7fe7Jk8pdoyjDrzRiMtC6jJtJPyNwSJpOi1vuBV98ts4mN5r7U4A9Y5gRlBOJZiUhlB2leutpBRGuaNhkurK2KwA8ii7SZeYzTTqLGJcnxhXsLLm1xHEgzg81tjThW05dNiIVreRMGMjd5W6acSE1Nsu3exDpLwESqdIeRygv+p+DSkPPUvkl3V+i/+pBn2TdjrTL1cUxsAR9Si7O/V53E= X-MS-TrafficTypeDiagnostic: AM4PR07MB1316: X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 20:ergzrdy9bFJTepNR3AVFpMgUbzzrfJXxK0Ys1YXMx3QXU8k4u61dkYI91mIRXpbcPtW7CV/o6HShh9D3K/ADtDkx5nQyT/7tVW7VF4AEQ2DETb8p8tTbbWOI9jL/lWnsBJ5CQFrcehbmxcNcCiL9GbBS/B8rTaNgK5qSamR0RR4RbN3jticmxkkMr7sFFDo+fYR1AQ/nfIWBGislBle0VI+js7vaVL8LrTAbol5V8s3TJ9SwFej5NGIfDRZgED9L7V7GqPc96d9KW/mHQUy27WxxuTIpJEAg7Twwmui2u+ba11BfsMQMsknLAAVOFspdcTOvqhvBdUoM0S0RK6Vdf8XyWtfUGOcKIawKpy1ZvIbUBP2XcPOId1+R1JkH7QU8sUnP2nBIlx8W6I8BSArVUailhNEBtvam/RNd1dgRhqnyGTvxGL9mzIWx5n4/K5iYJ2PW6yXD43f9EmhGjuEppXQojK3N9SD4U7NMe4Ai+OclZ4/Dzi71XUWrAgTqmOudFX54714NKmxKujBVe1o90Fnpul01+6wUQmEZ/KXITp9qvDqOZIhN10qULC+EI8FMuxdoBYYCZ1gdW/mFuoiKzELJFnylkw8n0jugfISc6IE=; 4:PEcAxu+kFLBwQBVx1hs8vusmCPnbIwhb/RqQUNVfFLVje2yjsFpD+ZxUdqX9EUn/h+XkZZKWU5CDRgLMiX4bHWdCnn9xEQHxB60LcEVQ5i94hvKD8aWOgv0phcnt8U4QYNrvJVFZqRJAaK5eN7uHH6+BbFU2O0ES7KPWY59tX4d1/+PqBTYi9ME0EbnPTJGVJbVBRtJCErXdiXhf5FkaV/6qi60/FhjwEIrPzmk/fmo6Sv/Qzan8qBEs1bXchRFJV/PIIfRX3U281hqSYJVRtJ8/2wMORpP76uamq5qoDmx9kgwl1n3vQ7ccKldndkJq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231192)(11241501184)(806099)(944501161)(52105095)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:AM4PR07MB1316; BCL:0; PCL:0; RULEID:; SRVR:AM4PR07MB1316; X-Forefront-PRVS: 0592A9FDE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39860400002)(39380400002)(366004)(346002)(199004)(189003)(52116002)(6506007)(386003)(7736002)(305945005)(2950100002)(76176011)(1076002)(7406005)(7416002)(97736004)(5660300001)(6666003)(6116002)(39060400002)(3846002)(16526019)(186003)(50226002)(105586002)(478600001)(106356001)(81166006)(81156014)(66066001)(6346003)(8936002)(47776003)(68736007)(26005)(8676002)(86362001)(575784001)(50466002)(4326008)(53936002)(51416003)(25786009)(6486002)(48376002)(54906003)(110136005)(16586007)(6512007)(316002)(2906002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM4PR07MB1316; H:ulegcpsvdell.emea.nsn-net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alexander.sverdlin@nokia.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR07MB1316; 23:2dQ9vo/Yb3QFqmThYwu36D/IP78Y83yUppaRD+74q?= XIlkSJZsOnGeS1tn2JH3xuNk/vezro85EigYRNiZDM8YkWDoDetiATohQebj9BjCgzppI1A3Y84cIOUxPv/VJa8ltZnlJML3oZmQG2vAivyCJ1mo6tpuorbMdvR3NNHCe1ErETiwhZBYqvNpzzKbjUINBpqHABkpldzAkjLW7JSe+tN2maeyAx6QYfMb8UmdJNSlDvUDt0Wuj35NwfnibxvfvDZzNshF5TqY7BG0vNMaPvl37P1h8WJ78HUXxty8jOzftZsrTO3RIwBv/E9b68yj+vzntU36TueIlCvoCPfTRtLgtlx9cLJXsnUw4PU1I9uCaKXBaeMjhfzPXG4x3OF2EvTqtJ5sWGAOHen7TeiziUySlJS6aFu5cHEOfEpjVYsz+g2D4ZzqzuTHeuJ5mFo0Zn+KER2vBhm1gDIAD3hz9tS+vtCwnKat8qrir1r/5PSZolpX+Jpou9cSrWx3hWXExGa7DcMKbEHQaVl+9pWZDVenMg3iMdSiTioLk3jJEYKbV5F2cW/PBFF5gyK7/xp4ejYyEy0OMczPZj9t1sL7a4hdBFBT3yPehxNg/Qom733gf2FGM9+qo79Wg2I2ngb3XT8hd8zRF9Ksc17d3Eff9zTfOkNUzWM8ZSDhHSrc6StTAsf21+FZm2Eq1Tw+9Jd01MY+9H57I9IbwQAzVx22xVYXgTeIetFaGC7wz7+OQ+/J6su5xZrW1sKOs4fWovYAzerxyr/KlPQ5oDIJG4d7Zf1/IJOkSo5q+XItfokpQkOU57rcK283rZwECGfMLMUiK+8f67dNLf58tHMUE0my/rR0Qcd0jCuwiKrmpH7kZNwHl7Hy7t4zGUEqUDel1wZ6NmBKIkDid2jjo5621fk/ZnNvM7JAy5V4ccMcM1IYrRRNVkmaZjyitSOIV84bs3aODo9dXO8wPa1/147Rybp9EXdZJO84sBudrHe/7JY3tj+5tAvqESv2h2nI687xi+WodSUMB3CFWTx0Hu3x0dEtZ4OKcxSoxVVgZ9WQv1Q/dpjnheBRAvPLdXPjfrLzfu5HhIf7wMNfnnbfdEYGQBQEGHfUURLeByKFeMJeO9ZkHOnwcvx3f5fzcQwE2CmbL75lFgOwS21G4WEJ4SmsJIz+IL1eLWdSkugy2ORZ/s8Xjg7QexwGQPpCGbbcxcCMFYsrO4VK5/LN0ZFeRc6Qumw/yojVpaWAumB2BcIObPFCh0= X-Microsoft-Antispam-Message-Info: FyXxymlteNzITjb92QjiuuuC/1tmTakZAIz+DfV2fV8pmI/BkeUoGN8F2pfjrF1SxxSIPB08BakhNK17gjVhvA== X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 6:3nHDfInwYhbdZr0yD6JjrbfAjnmwppmRL3rPQIf300ohaEItiwL4F60fGCqHsrweoB0Z/lMK7AwGkgto2D4GTwyZQjq/wQZcrxFCJ6a2P9KmFk7C//sa66S1Qsng2TnVfMMlz3gE+7M8thghu5/Akpdf9IGWJHoRya4kiiv+Z/zFNW2q4vWi8z5efsbSsp4D2wbMRUW7omFHHL1bauylocOFifozkAiDLoFUqyivPkfjNYwSn7o1JzNzDY7PZq81j+82+TlxdmU0fuLUMIyFNTV2l6copRaSF7D7uxD6lZ4piXfntcPG1sGgRJby5pUih8RZi9mk+DmBo798BG+o1d2c+i/iYd6qsj3qEh52KDY=; 5:NuUUM4lvXxnrAr/nvFZbe6hLc/8lYUVzHSmfUkdZR+RiTnots5oXdnlBSYN4ZNFCGaz7CvfstGhG/Dl7gZtzLVwwe+t3bcubl2UARrm3+JGsrzU8GT9M+jnb+7pZLY+KzPSct6PCLpL5SHrQGCW36HhIJLY/TIiMC06uXfE0e94=; 24:cGo9FHurz9C7iw443mL3nt650Cuv/3ltbhbfIoMADD+WeAmHPW23glaSXFZuCNtNKX/mGP3R8ztqAA8sZ5G3MDnBo3i2W4/AqNLns0uVl2c=; 7:7sv+CWo1iPGqnnZFb1KUJ4CaqPwmtgJo79W3KITKE9Le7vF8xePJRVmaLyjWQNaZfhxSwdznxA0VfyGhM1BnQoSmgvuR/McB25O5b1PKHtqz8MbBo9qTSlGZ1Debmsp4X++RWVONODh6qgBXa1qZwQmeq/VoPKR/tS1OCGl0wxyAiufECzjKkRhQgB9CochzD5IK+88mS1Gn7Hj63kMxTO0XlNB2N3ByFLMyidTgrNmlzq4RJhRmpB0gImXA55xW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2018 17:00:04.3036 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79bc3cf2-13c1-4635-6e8d-08d57adee484 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR07MB1316 X-Mailman-Approved-At: Sat, 24 Feb 2018 09:51:07 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Rich Felker , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Heiko Carstens , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Yoshinori Sato , x86@kernel.org, Russell King , Catalin Marinas , James Hogan , Fenghua Yu , Chris Metcalf , Steven Miao , Will Deacon , adi-buildroot-devel@lists.sourceforge.net, Alexander Sverdlin , Thomas Gleixner , linux-metag@vger.kernel.org, Michal Simek , Tony Luck , Ralf Baechle , Martin Schwidefsky , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" No functional change, later it will be re-used in several files. Signed-off-by: Alexander Sverdlin --- arch/arm/include/asm/module.h | 9 +++++++++ arch/arm/kernel/module-plts.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 89ad059..6996405 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -19,6 +19,15 @@ enum { }; #endif +#define PLT_ENT_STRIDE L1_CACHE_BYTES +#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) +#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) + +struct plt_entries { + u32 ldr[PLT_ENT_COUNT]; + u32 lit[PLT_ENT_COUNT]; +}; + struct mod_plt_sec { struct elf32_shdr *plt; int plt_count; diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index 3d0c2e4..f272711 100644 --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -14,10 +14,6 @@ #include #include -#define PLT_ENT_STRIDE L1_CACHE_BYTES -#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) -#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) - #ifdef CONFIG_THUMB2_KERNEL #define PLT_ENT_LDR __opcode_to_mem_thumb32(0xf8dff000 | \ (PLT_ENT_STRIDE - 4)) @@ -26,11 +22,6 @@ (PLT_ENT_STRIDE - 8)) #endif -struct plt_entries { - u32 ldr[PLT_ENT_COUNT]; - u32 lit[PLT_ENT_COUNT]; -}; - static bool in_init(const struct module *mod, unsigned long loc) { return loc - (u32)mod->init_layout.base < mod->init_layout.size; From patchwork Fri Feb 23 16:58:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander A Sverdlin X-Patchwork-Id: 877326 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zp6920Ffcz9s00 for ; Sat, 24 Feb 2018 09:59:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="Eo21EtUT"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zp6913bc5zF17T for ; Sat, 24 Feb 2018 09:59:01 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="Eo21EtUT"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nokia.com (client-ip=40.107.0.128; helo=eur02-am5-obe.outbound.protection.outlook.com; envelope-from=alexander.sverdlin@nokia.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="Eo21EtUT"; dkim-atps=neutral Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00128.outbound.protection.outlook.com [40.107.0.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3znyC65p4zzF1lF for ; Sat, 24 Feb 2018 04:00:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ex+s8ImYVwo780MQmHTOw1Z3Dl7NC59PlaeU0uovORc=; b=Eo21EtUTU9d46Qi8pnDbRk/xelkVZlWxoHgnn3GtStVXFSglDoqgVO4gwiEfn8Se2PDMdDZdFae29QYFO8ek83q2lHfklfiS4mFmletjnU/hjq1NjZxxyjlR7Cyqs/Lvm+EyHwjV9x5AotxXjMk/1N+QyFzsF+823pA8EWxkspI= Received: from ulegcpsvdell.emea.nsn-net.net (131.228.2.20) by AM4PR07MB1316.eurprd07.prod.outlook.com (2a01:111:e400:59ec::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.548.6; Fri, 23 Feb 2018 17:00:08 +0000 From: Alexander Sverdlin To: Steven Rostedt , Ingo Molnar , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ftrace: Add MODULE_PLTS support Date: Fri, 23 Feb 2018 17:58:49 +0100 Message-Id: <20180223165849.16388-4-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180223165849.16388-1-alexander.sverdlin@nokia.com> References: <20180223165849.16388-1-alexander.sverdlin@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.20] X-ClientProxiedBy: VI1PR0202CA0036.eurprd02.prod.outlook.com (2603:10a6:803:14::49) To AM4PR07MB1316.eurprd07.prod.outlook.com (2a01:111:e400:59ec::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ad8ab03b-157a-48eb-3c85-08d57adee6e4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7193020); SRVR:AM4PR07MB1316; X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 3:ZU7++AHDVV8eQYPq8iXhvsiDsMT7OHbkQC7fjSfVnGrdRSm2PEPuTW4R7tcKr23it+j+m86d20v1FzWJ8QGlYhF6yGNlZkHvHLjmQeHf44xVjqsWFGryqXI2PO0jxIflkXZaa+ge3/t2aSFx1Wdbxv/PYNoABWK1xXev5CjOtOoJqCmaprT94GdGgH5w1Gm5NzEmEYm6pjwnpxJWm74+jAaaUQkBpXp67yDQqfjRZEoJPn+GeXDUSQRsXy4AkNNs; 25:xf/uVsHx5xTTcLcaV7gPTo0Ge0nLi9XMEwucFD8TkvyklLOs4yGzGp+ZGswBXbVv8EzfscBHJokuGV7IlF33p26jSTjQZHQATn0avmnFi+UNYPPdjE5nmBUhwI/kaWhiHZEeCSjq0kDVv2j4bAr3e9/kYAN/Vws6NcTvzFcCsqQ9GQtRBxwsu2pfhjZgC7kc22bLqmE192Imv5pJAANPEDFSrIm6OgK1Mnhq8ynVWjtpaKObqzAcKJEPUQDNNezMkzB6IU4hZMhccLIZ/2Y9E2U+6njJrm5Y1Fm/crFgWJ6ptIEG9oGO/+6nzLSlbh22nDxdJIZliKkP++MZX0F5rw==; 31:uPgiGPAkMjhxm0F6PbRZJv+iztDSiP/MpkiyM51UxmikpfRUjkY8kyLX6GkralDjXCOpebI85hP2miBvTxQ0dN3fzPwrEcBSH99G1ry3c9Y3ewC7uCpbDs5comp4sgeHW25OJtawCt10YnW84ICGCNYk6I4HsiRBQOVBqQcP8GQHxKJkr6+2GdRzV1kt2D8p2lHp5ZTYpQqIXh4DuOn6xZ3uN4CttwgIRydkF0nM3Vw= X-MS-TrafficTypeDiagnostic: AM4PR07MB1316: X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 20:gY74JIjsr10Kf6EGTYKQ72zXIHeIF/mYu4sS2sX4Ktj3BvfGVVzUFLX3jC9Y1lw4QKcGBlKINy71SVuEQZv8cBqQjE3a4KpJf0A2Ot+bl2FlmmRw5q8W6C3GvcmigS5MuLdHEjZJcJ0dBA5ChQte4IV/fkBMPfMB+eDlkTliI5tyXxAPoOCWFtt4zXM2PqMHgikf4dd0+QoZ2t6TjXX0buvt1SWlb3u+y+R8U7c9wtNLb2VpZY3su4Smfge/qEANlvvQfBrAYWSKSSIari5CvSsJxrFiXhb2czY61LPnZVg94exV5HnuIV3PrR6XKVTkthcfrwkcEGKBkjRxsigRd70nFMaBBpzJAjjmdqfIDOGW6QEVrXtcL/8JoYal8fx6C9gi9R3h9Ot8VSxlCL+1s2ualzQBQ0fyTvrPQCASufGZpOd15ApnyLHXKHwMcEahZAk39SzY4+wIVX92U5nGFDbmNE1cIXk9k36ZztptpOQQK0WgKE/GU76Qdfj/KKXiZVEYujwVHdtalWXidnGDIx0sKlvou1nx7qMfhXUn3T8ALmilKvIyUV7xT5PZZ6I9ahdlKLAR7XXsNrAjNX96LbwmUYwcY1x+vack9Uswce0=; 4:7oZ0K/nBw16mh6R2Up/Wz1lOStmIv4NEiPq61hCBjHVyAgxWWOeyaW3I4hvqees2FfeJ4O/vo8Qug0NzJPeysn3CtB/j4z0TB2iht92u11UHqz1iqsfN2syS6t3mKHMz2icn/KC786d8ePJvFKMVf3HTGRRkt3tSo+GaQ9ajRUd8Grc5crl5pS8l+YMVHa0eNL7FMmyJAag7x8JgSzwVfzxqsiw+HdEzY8jWVyaXpbkapkroYTnMOElKJVpEV/LvYcmINgej1LPesexrz1grA/YQmBTllNECP0az+20Vzh4P/qeYGN6iFDRTJgI8stmD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231192)(11241501184)(806099)(944501161)(52105095)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:AM4PR07MB1316; BCL:0; PCL:0; RULEID:; SRVR:AM4PR07MB1316; X-Forefront-PRVS: 0592A9FDE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39860400002)(39380400002)(366004)(346002)(199004)(189003)(52116002)(6506007)(386003)(7736002)(305945005)(2950100002)(76176011)(1076002)(7406005)(7416002)(97736004)(5660300001)(6666003)(6116002)(59450400001)(39060400002)(3846002)(16526019)(186003)(50226002)(105586002)(478600001)(106356001)(81166006)(81156014)(66066001)(6346003)(8936002)(47776003)(68736007)(26005)(8676002)(86362001)(575784001)(50466002)(4326008)(53936002)(51416003)(25786009)(6486002)(48376002)(54906003)(110136005)(16586007)(6512007)(316002)(2906002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM4PR07MB1316; H:ulegcpsvdell.emea.nsn-net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alexander.sverdlin@nokia.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM4PR07MB1316; 23:zPwnB84J8MIwli2yRrwsWlLtSSCv/Wx7yoKpkSJzu?= MKmqs2GeybZMTTZxcX7+ySr2XKgkVnuPi1OlGpmzq/IFwaQUQfcXvakeYhqkEC2gG7+PPT8UIZtn+GPKbmanMB0bSnmSHrRVY8MnMRFzeK8m7GMNvTc5oVT4BeAjnckTI37RzxL+mIB2021MQBut+S4AbcFRc9B/KlLnFVddqxLlXb6cfaT/Q3XHvyXgPrb57Up0QXl8rgYmisuOdWwwHxYPHqm8h7OMINNZHHP5m/sDQoXEXKCa0JSz4wC3Df8nO8vDOak1dguVY2566DvT0Lg35hvifaPHGqDY9Qioxg23ClFfsE8us6CDBXD8BcvYE0akJJgf8Hso4ZvSQo1fWZeEX0R5mx/NtecgrKKCwKxGKQIewFxzIGB/TtdICabdOTYKmVraBfOIucBn2dK8kXsFx/vx05AcX/tr85ljjKJ4kavkk7kNKOl+h0ZzElVLhD5HuwMJu2w18Jf9DS3lZS9CA2ycTNijnMOauEkNFxBB1zcwYj6AExVBc/1rRpExNfUOFa4sOOceyCIRNzchRa6fr2xse0CN7Yl2Umt58IUTsTpYiWCnlsjP5RoenpEXaLrYlniHhE1Ld3f9PG53LHFSeTIHSuOCTnKWgyqnKG8XO8QN4JbeokwWL096vsSrzkhz+DuAlhlFFhQVGTcRA7vG3RwG6BW7DTj8Pu8KmkOjf6VEhQja0n9HPRdN90A4boVLq8uMp0X2NLttbqGwz+46msBuVtDCo6Lj9kUfFrTiyRbRo36sstKvAw6KReLDfLo1l5USU4ti/i8Ban8i5nO1RoTRfI/apDBwag6YLP5HVLQoTmfRS7AtL1IP8L6rMKvUwk0B6PIUkui0nkteSsmXpKX6McZmFIO4rIb3j+GsxrhFqTUDwMBfB8PbJ1FhI1Z5iFSly48le0wJnV6oTA8Ie5xWIN12vJGqOqDYZYjZpc4QGzBb69CbpRX3PhGl/91QXgEzqhBFTPTjr/7RL5ZHcMf0IZROLAYPdAb4IrnDctAARQTdYnzAQJNqCEXQjK7kx2fiRow+P/H7j4cI61IWDQgp+/d8z3MkLj357BzOn7Y0d3uul8nVJQkspHW7lxyKWPj0E1aovC3taWJ2LFUHjhuN/DUjGCLJ03fNSRQY8GYtRm+Pn5I1kPkaagF9cHcXgc3u6qDFM2IBEY6eiyoKXinIjvyBT9vfRDODUgefHRUP7WPXJCDtzRwuk3X9nN2Ojw/1zgSmOP8d9zjiEun X-Microsoft-Antispam-Message-Info: 8CeGaz9UXEEDCj7kxcwydKgGBEwKun2zebrqB+doT0QRoqSHLwDypqgXQmUI+44nGa2F5mqVv4qbXYaNurdOow== X-Microsoft-Exchange-Diagnostics: 1; AM4PR07MB1316; 6:Y/rpW58nS0YTD7q50lt0PxgYSUhx3i5a8UccKNi9G4Ev/Y+nb9kee3U/UOP8Vpq3pwP/pIbO0v3kKuVGeKmcBcPJVgIOP9EVykbicvHXpb3nKj2LiGzoDO6MFrWy8oVKiOrvD91nC3BpdHc2bN0i/oio84nCW5bL77dNPIG6w94WrtADVC1WrPK1mwpwvnLplJOoyaTiQmN5HVTzTf1t73u0lS7AlszEhsNLY4jZ75sHne3S4qBY8SZeb4xp9FlCdBvRbJw0r0vz5Qc75g4Yu/uFup/aNf79AkBTgRiiakUO9vD+wiwwYZv4W5TXGzEDDtx3lP5ksYmkFMtOfxCp8X/2Azbehk2JQzeyPiWkTRk=; 5:tfj3FOJ4uyajhYKSrVxSng+yFyX2EK1x86XXqFORIYVl8+jot/bbLjyf97Dfcb2yo2ntkXwX6aVhrbtYXF0AtURDBuK4QBDaaODjdhVtaavrVDyCi0XUMkhYN2ch+jN5Q3Hrqj7biIbK9XllKX/cW55N3HychgqRIpEhgLZDw1A=; 24:PPsFI/2HJAaQmE5uvtflCnEff1mVHlZ+VUD/NLtRs1hvkS5F0FY89bWsKEScsbFVS0VRjFMzkZIDdedt9WsteqkepYW6kcsJNcPHFtLXIzU=; 7:523f2042B0LVzaDqujB0cB4kiqsv9sy6hH86jCENqfFIei38HCr0lNI9j2s6kS/t2GzKfixx8L0dbeYpX0OH6P4rIaY44CKjqQB1klNI25/hmvw3ZHWUormM7OAYVn/+C1IbnJYz7qOyxDOR9ecuxprW4QqD2hhRLWzK7NWR3vusNxA6o4Dpz6ivkqTYqN9nxxt7CIiLfpIHb8iZLzgmv/ulodQNAlx5OP0JaWXSG2WhxSpm5Rp2QJ3E04QUZGEo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2018 17:00:08.2849 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad8ab03b-157a-48eb-3c85-08d57adee6e4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR07MB1316 X-Mailman-Approved-At: Sat, 24 Feb 2018 09:51:07 +1100 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, Rich Felker , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, Heiko Carstens , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Yoshinori Sato , x86@kernel.org, Russell King , Catalin Marinas , James Hogan , Fenghua Yu , Chris Metcalf , Steven Miao , Will Deacon , adi-buildroot-devel@lists.sourceforge.net, Alexander Sverdlin , Thomas Gleixner , linux-metag@vger.kernel.org, Michal Simek , Tony Luck , Ralf Baechle , Martin Schwidefsky , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Teach ftrace_make_call() and ftrace_make_nop() about PLTs. Teach PLT code about FTRACE and all its callbacks. Otherwise the following might happen: ------------[ cut here ]------------ WARNING: CPU: 14 PID: 2265 at .../arch/arm/kernel/insn.c:14 __arm_gen_branch+0x83/0x8c() ... Hardware name: LSI Axxia AXM55XX [] (unwind_backtrace) from [] (show_stack+0x11/0x14) [] (show_stack) from [] (dump_stack+0x81/0xa8) [] (dump_stack) from [] (warn_slowpath_common+0x69/0x90) [] (warn_slowpath_common) from [] (warn_slowpath_null+0x17/0x1c) [] (warn_slowpath_null) from [] (__arm_gen_branch+0x83/0x8c) [] (__arm_gen_branch) from [] (ftrace_make_nop+0xf/0x24) [] (ftrace_make_nop) from [] (ftrace_process_locs+0x27b/0x3e8) [] (ftrace_process_locs) from [] (load_module+0x11e9/0x1a44) [] (load_module) from [] (SyS_finit_module+0x59/0x84) [] (SyS_finit_module) from [] (ret_fast_syscall+0x1/0x18) ---[ end trace e1b64ced7a89adcc ]--- ------------[ cut here ]------------ WARNING: CPU: 14 PID: 2265 at .../kernel/trace/ftrace.c:1979 ftrace_bug+0x1b1/0x234() ... Hardware name: LSI Axxia AXM55XX [] (unwind_backtrace) from [] (show_stack+0x11/0x14) [] (show_stack) from [] (dump_stack+0x81/0xa8) [] (dump_stack) from [] (warn_slowpath_common+0x69/0x90) [] (warn_slowpath_common) from [] (warn_slowpath_null+0x17/0x1c) [] (warn_slowpath_null) from [] (ftrace_bug+0x1b1/0x234) [] (ftrace_bug) from [] (ftrace_process_locs+0x285/0x3e8) [] (ftrace_process_locs) from [] (load_module+0x11e9/0x1a44) [] (load_module) from [] (SyS_finit_module+0x59/0x84) [] (SyS_finit_module) from [] (ret_fast_syscall+0x1/0x18) ---[ end trace e1b64ced7a89adcd ]--- ftrace failed to modify [] 0xe9ef7006 actual: 02:f0:3b:fa ftrace record flags: 0 (0) expected tramp: c0314265 Signed-off-by: Alexander Sverdlin --- arch/arm/include/asm/module.h | 1 + arch/arm/kernel/ftrace.c | 70 ++++++++++++++++++++++++++++++++++++------- arch/arm/kernel/module-plts.c | 53 ++++++++++++++++++++++++-------- 3 files changed, 101 insertions(+), 23 deletions(-) diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 6996405..e3d7a51 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -30,6 +30,7 @@ struct plt_entries { struct mod_plt_sec { struct elf32_shdr *plt; + struct plt_entries *plt_ent; int plt_count; }; diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index be20adc..0a0da25 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c @@ -98,6 +98,19 @@ int ftrace_arch_code_modify_post_process(void) static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr) { + s32 offset = addr - pc; + s32 blim = 0xfe000008; + s32 flim = 0x02000004; + + if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) { + blim = 0xff000004; + flim = 0x01000002; + } + + if (IS_ENABLED(CONFIG_ARM_MODULE_PLTS) && + (offset < blim || offset > flim)) + return 0; + return arm_gen_branch_link(pc, addr); } @@ -167,10 +180,27 @@ int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, { unsigned long new, old; unsigned long ip = rec->ip; + unsigned long aaddr = adjust_address(rec, addr); old = ftrace_nop_replace(rec); - new = ftrace_call_replace(ip, adjust_address(rec, addr)); + new = ftrace_call_replace(ip, aaddr); + +#ifdef CONFIG_ARM_MODULE_PLTS + if (!new) { + /* + * mod is only supplied during module loading, later we have to + * search for it + */ + if (!mod) + mod = __module_address(ip); + + if (mod) { + aaddr = get_module_plt(mod, ip, aaddr); + new = ftrace_call_replace(ip, aaddr); + } + } +#endif return ftrace_modify_code(rec->ip, old, new, true); } @@ -200,20 +230,40 @@ int ftrace_make_nop(struct module *mod, unsigned long new; int ret; - old = ftrace_call_replace(ip, adjust_address(rec, addr)); - new = ftrace_nop_replace(rec); - ret = ftrace_modify_code(ip, old, new, true); - -#ifdef CONFIG_OLD_MCOUNT - if (ret == -EINVAL && addr == MCOUNT_ADDR) { - rec->arch.old_mcount = true; + for (;;) { + unsigned long aaddr = adjust_address(rec, addr); + + old = ftrace_call_replace(ip, aaddr); + +#ifdef CONFIG_ARM_MODULE_PLTS + if (!old) { + /* + * mod is only supplied during module loading, later we + * have to search for it + */ + if (!mod) + mod = __module_address(ip); + + if (mod) { + aaddr = get_module_plt(mod, ip, aaddr); + old = ftrace_call_replace(ip, aaddr); + } + } +#endif - old = ftrace_call_replace(ip, adjust_address(rec, addr)); new = ftrace_nop_replace(rec); ret = ftrace_modify_code(ip, old, new, true); - } + +#ifdef CONFIG_OLD_MCOUNT + if (ret == -EINVAL && !rec->arch.old_mcount) { + rec->arch.old_mcount = true; + continue; + } #endif + break; + } + return ret; } diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index f272711..a216256 100644 --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -22,6 +23,15 @@ (PLT_ENT_STRIDE - 8)) #endif +static u32 fixed_plts[] = { + FTRACE_ADDR, + MCOUNT_ADDR, +#ifdef CONFIG_OLD_MCOUNT + (unsigned long)ftrace_caller_old, + (unsigned long)mcount, +#endif +}; + static bool in_init(const struct module *mod, unsigned long loc) { return loc - (u32)mod->init_layout.base < mod->init_layout.size; @@ -31,26 +41,43 @@ u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val) { struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core : &mod->arch.init; + int idx; + struct plt_entries *plt; + + /* Pre-allocate entries in the first plt */ + if (!pltsec->plt_count) { + plt = (struct plt_entries *)pltsec->plt->sh_addr; + for (idx = 0; idx < ARRAY_SIZE(plt->ldr); ++idx) + plt->ldr[idx] = PLT_ENT_LDR; + memcpy(plt->lit, fixed_plts, sizeof(fixed_plts)); + pltsec->plt_count = ARRAY_SIZE(fixed_plts); + /* + * cache the address, + * ELF header is available only during module load + */ + pltsec->plt_ent = plt; + } + plt = pltsec->plt_ent; - struct plt_entries *plt = (struct plt_entries *)pltsec->plt->sh_addr; - int idx = 0; + idx = ARRAY_SIZE(fixed_plts); + while (idx) + if (plt->lit[--idx] == val) + return (u32)&plt->ldr[idx]; /* * Look for an existing entry pointing to 'val'. Given that the * relocations are sorted, this will be the last entry we allocated. * (if one exists). */ - if (pltsec->plt_count > 0) { - plt += (pltsec->plt_count - 1) / PLT_ENT_COUNT; - idx = (pltsec->plt_count - 1) % PLT_ENT_COUNT; + plt += (pltsec->plt_count - 1) / PLT_ENT_COUNT; + idx = (pltsec->plt_count - 1) % PLT_ENT_COUNT; - if (plt->lit[idx] == val) - return (u32)&plt->ldr[idx]; + if (plt->lit[idx] == val) + return (u32)&plt->ldr[idx]; - idx = (idx + 1) % PLT_ENT_COUNT; - if (!idx) - plt++; - } + idx = (idx + 1) % PLT_ENT_COUNT; + if (!idx) + plt++; pltsec->plt_count++; BUG_ON(pltsec->plt_count * PLT_ENT_SIZE > pltsec->plt->sh_size); @@ -182,8 +209,8 @@ static unsigned int count_plts(const Elf32_Sym *syms, Elf32_Addr base, int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings, struct module *mod) { - unsigned long core_plts = 0; - unsigned long init_plts = 0; + unsigned long core_plts = ARRAY_SIZE(fixed_plts); + unsigned long init_plts = ARRAY_SIZE(fixed_plts); Elf32_Shdr *s, *sechdrs_end = sechdrs + ehdr->e_shnum; Elf32_Sym *syms = NULL;