From patchwork Mon Aug 14 10:52:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 109981 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4170769qge; Mon, 14 Aug 2017 03:53:37 -0700 (PDT) X-Received: by 10.99.122.28 with SMTP id v28mr23749263pgc.98.1502708017733; Mon, 14 Aug 2017 03:53:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502708017; cv=none; d=google.com; s=arc-20160816; b=Koe5YIMWkvBOK/Vt81v7xzEvGPLl1ec7Tn1hhZCmRDVw8wYAh5TKV5+tL+Y8DWMT7k tpRS9jXNQZ5S5aifjfZ/SGuLtl61cJW+3+ke9E6C7Ie2xDSF+3KfQpXkGpRoJXi4yWqw kCOQTJS8lAocOwNScv0mtsEzxjZLT6D2Nola05V0bYLIzD1C+yldRUQFlig2JJZnPMmT pJPILVPYbaQtkvKpsdtzIUYLswX9lfwC2p+VFRa9WTjt+PEJLDv5CdW+Ln/HXTy1w389 b2vEAn2xl74z8wAvu1VOXHEwpWhYK675heOfNMlFBf9wGAZubcpa6CrE/xxe+gD4TPvt jMJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=TjGcqIftzqzs+2R1IOUAN5tRwF3sOEXGjb79whz3uHA=; b=YFYwCr/kDNQfSQd00Lf7ohN6NISRQ/hHMa1OrBUYDlFdBWR9NjlpEWo4IaB7ObhB87 iP3QZpRCeyzabMA7Ec2kN9+LMGq3wZw4SSi76xsPhtfMK8uYV8hY7NzTQgGkL07a3k1n GVYTyCQOnTkcR2DtTIqxcrfDUZAzB/TH+b90U8xMevZrlgmAPKWO/deO8sQcE02kJLgd rjdBFdmCAVuWEazN+K3kbN+EKDt53cNJ06ZwSvaya3CH9TGZbtcXw8gm4nHfk6K8iOE1 zxwXrapHqiNK0FOpyvPYUnD6qTdZDmxrqHBNVVQmjEoZiihCao22G3r035anRPnpH9+9 MLGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VW0ZglyM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m3si4434508pld.47.2017.08.14.03.53.37; Mon, 14 Aug 2017 03:53:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VW0ZglyM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753061AbdHNKxc (ORCPT + 25 others); Mon, 14 Aug 2017 06:53:32 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:37125 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753020AbdHNKx1 (ORCPT ); Mon, 14 Aug 2017 06:53:27 -0400 Received: by mail-wr0-f177.google.com with SMTP id 33so33156955wrz.4 for ; Mon, 14 Aug 2017 03:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TjGcqIftzqzs+2R1IOUAN5tRwF3sOEXGjb79whz3uHA=; b=VW0ZglyMMFjtxin3p/n/BbzMJQ0EI+4o7gh5+O34u+6R74bJ0A2iq8xNAjVVPp5da4 MPpv82Y14CQstkFTT2M0b8I9qqSUPR1OWxTkVMSdQy/uSNta8h/D0dgX8pxN89Q5nC0j Mjn81q0S99V/6rDqXZRocJ9s1Y1T9xqwgx49o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TjGcqIftzqzs+2R1IOUAN5tRwF3sOEXGjb79whz3uHA=; b=XyDNOl+MzKkYfoCCkACjC92Cyuk/lW8TqY5Mgh09Ph/2pYItIRp27TNeBJfaTtgLIg yV3DijdK3Sixv+EOpaviSnQTlMEUYmV58x0OvNWrkBafa6IZUioU72UWGNNnkNkvSiQh N1/HJWMyaWP6uF7uPKFQbA+IjPTKhGUSSa5lxbK2pLr9wCRQCbjTITbb4sBP2oFi7IvW HfFWfaU4vJnNvRIHWv8WZzsHEaTdSB5koNGW4us4FHuwB6Mitd7Qsr/0VBHy/Uw1B65L R0b0345uqRQNIe+aSfmz/P0hXbuyMN7A86vmu96Cip1VR6NpHqtzXFSj7k/3oOxTGUhT YpeA== X-Gm-Message-State: AHYfb5g+fwwA8bhlwnCMiknqfpjw2pguUyAaXCOCSrNY48+ix91iX42y 7uOLhVJ6xUoj7HcCk83L/g== X-Received: by 10.223.130.100 with SMTP id 91mr2179781wrb.34.1502708006266; Mon, 14 Aug 2017 03:53:26 -0700 (PDT) Received: from localhost.localdomain ([154.146.161.128]) by smtp.gmail.com with ESMTPSA id b15sm1490732wra.68.2017.08.14.03.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Aug 2017 03:53:25 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Ard Biesheuvel , "H. Peter Anvin" , Arnd Bergmann , Heiko Carstens , Kees Cook , Will Deacon , Michael Ellerman , Thomas Garnier , Thomas Gleixner , "Serge E. Hallyn" , Bjorn Helgaas , Benjamin Herrenschmidt , Paul Mackerras , Catalin Marinas , Petr Mladek , Ingo Molnar , James Morris , Andrew Morton , Nicolas Pitre , Steven Rostedt , Martin Schwidefsky , Sergey Senozhatsky , Jessica Yu Subject: [PATCH 5/5] kernel: tracepoints: add support for relative references Date: Mon, 14 Aug 2017 11:52:31 +0100 Message-Id: <20170814105231.14608-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814105231.14608-1-ard.biesheuvel@linaro.org> References: <20170814105231.14608-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid the need for relocating absolute references to tracepoint structures at boot time when running relocatable kernels (which may take a disproportionate amount of space), add the option to emit these tables as relative references instead. Cc: Steven Rostedt Cc: Ingo Molnar Signed-off-by: Ard Biesheuvel --- include/linux/tracepoint.h | 19 +++++++++++++++---- kernel/tracepoint.c | 19 ++++++++++++++----- 2 files changed, 29 insertions(+), 9 deletions(-) -- 2.11.0 diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index a26ffbe09e71..d02bf1a695e8 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -228,6 +228,19 @@ extern void syscall_unregfunc(void); return static_key_false(&__tracepoint_##name.key); \ } +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS +#define __TRACEPOINT_ENTRY(name) \ + asm(" .section \"__tracepoints_ptrs\", \"a\" \n" \ + " .balign 4 \n" \ + " .long " VMLINUX_SYMBOL_STR(__tracepoint_##name) " - .\n" \ + " .previous \n") +#else +#define __TRACEPOINT_ENTRY(name) \ + static struct tracepoint * const __tracepoint_ptr_##name __used \ + __attribute__((section("__tracepoints_ptrs"))) = \ + &__tracepoint_##name +#endif + /* * We have no guarantee that gcc and the linker won't up-align the tracepoint * structures, so we create an array of pointers that will be used for iteration @@ -237,11 +250,9 @@ extern void syscall_unregfunc(void); static const char __tpstrtab_##name[] \ __attribute__((section("__tracepoints_strings"))) = #name; \ struct tracepoint __tracepoint_##name \ - __attribute__((section("__tracepoints"))) = \ + __attribute__((section("__tracepoints"), used)) = \ { __tpstrtab_##name, STATIC_KEY_INIT_FALSE, reg, unreg, NULL };\ - static struct tracepoint * const __tracepoint_ptr_##name __used \ - __attribute__((section("__tracepoints_ptrs"))) = \ - &__tracepoint_##name; + __TRACEPOINT_ENTRY(name); #define DEFINE_TRACE(name) \ DEFINE_TRACE_FN(name, NULL, NULL); diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 685c50ae6300..1c6689603764 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c @@ -28,8 +28,8 @@ #include #include -extern struct tracepoint * const __start___tracepoints_ptrs[]; -extern struct tracepoint * const __stop___tracepoints_ptrs[]; +extern const unsigned char __start___tracepoints_ptrs[]; +extern const unsigned char __stop___tracepoints_ptrs[]; /* Set to 1 to enable tracepoint debug output */ static const int tracepoint_debug; @@ -503,17 +503,26 @@ static __init int init_tracepoints(void) __initcall(init_tracepoints); #endif /* CONFIG_MODULES */ -static void for_each_tracepoint_range(struct tracepoint * const *begin, - struct tracepoint * const *end, +static void for_each_tracepoint_range(const void *begin, const void *end, void (*fct)(struct tracepoint *tp, void *priv), void *priv) { +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS + const signed int *iter; + + if (!begin) + return; + for (iter = begin; iter < (signed int *)end; iter++) { + fct((struct tracepoint *)((unsigned long)iter + *iter), priv); + } +#else struct tracepoint * const *iter; if (!begin) return; - for (iter = begin; iter < end; iter++) + for (iter = begin; iter < (struct tracepoint * const *)end; iter++) fct(*iter, priv); +#endif } /**