From patchwork Fri Jul 28 14:10:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9868891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B8A460382 for ; Fri, 28 Jul 2017 14:11:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3217128877 for ; Fri, 28 Jul 2017 14:11:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26B132888C; Fri, 28 Jul 2017 14:11:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 48B0C287CE for ; Fri, 28 Jul 2017 14:11:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject: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=VAf1T8hEUVWkDfJsokvyQcXE6fGkDNkd8d2L6UIiVBg=; b=Tyk rMylfR9ZIkvwOWpFf3UVOeyG7wCh6nWhLge9+6Q55vX5kWjEbORs+ud1Uirja0Fu/S3UEFiWVOehE qtqih2IWcPUWcQMPPfx8STr7k1N7q1lHoAOeJp//tBrwIsLN+K5OAzEsbf4QGZB4NPPx7H4gX2O6v X4YzvRduFE3Lj8VDU9vy8sqPg4x/HAzs1EmsvHtN4SEi9mCIEuzXFXVm6t2DJCTpVSmrENnoT5/W9 727YMGrwBNGDjtkdt0fB4Fv+oXNnA6NaYgypqgSq6mD1ZCTHHQZlRsaIcd32dQytWx3/Mu0QIc+uT hKrg+k2XEuqvE2r/0BWWLfqusHw4UMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1db5zd-0007i2-IR; Fri, 28 Jul 2017 14:11:53 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1db5zY-0007If-9L for linux-arm-kernel@lists.infradead.org; Fri, 28 Jul 2017 14:11:52 +0000 Received: from wuerfel.lan ([78.43.238.10]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ltibd-1dkowl15aX-0118hC; Fri, 28 Jul 2017 16:11:18 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] [RFC] ARM: move __bug_table into .data for XIP_KERNEL Date: Fri, 28 Jul 2017 16:10:49 +0200 Message-Id: <20170728141108.1283320-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:RiRCpkEgaga6B5H0aVWVkOElmqsWxa6zZy9W4k19b47gD77w/i7 YoWI1xUD+9aDqTw20SrgC0kxzLK1gOVnY/unH2IQFipL9N0/re1rwirtZ5/jVapVcYx4u2y y0iA0Xpz8J4HsaUlVOKPA/qi5IACdvTtpvO/6mW0ns+aY2Mhe2uB/FbdEI6YZ331UuOB27c FW0jCLw2FysKaihDNIl8w== X-UI-Out-Filterresults: notjunk:1; V01:K0:bT/qXh1YTZM=:aRWdSs5ngrKm3OQaqCiEPs GjkGLjv/3RppgigbIjcVObd5c2h1RwwjCW8zg4G3u/FSS1mW8EkPxLVfK+/KZ3iqL8HQx5J8J jS/yGgRQN9VvZN9wzTs+x3VMuhR5QjmmNAHsETCxVjPFoAGFSKqXfakhevVvnBu9gNBTCLwxY XJZoQoBlnsy9VqdZlHZe3EkDKNV+xF8jv4Gr7lQoYtbMlc+0RLIKLY0NzI9fzCcvOuZ7WcPDN Yla/6OSm16/JY9Hkvx0/Yybfdv7WDPbaOGmrWUzYkgAsFF+VhiZcITW4XhYKR0VRS9nNJN1qh E/Cthdou99R/+r3bEi3CjnW2PBQN9vBaqcHqaBoTIVKoLmveH2KBY/Uhv3qlthUQcqX7Vqgkm 8jgi7PJJMpXR1YZU4bS0n5cHlWwutyxOdt2ikLyZD9QKhPmgsvScmyWLVCabT7lhyEVkqb21I y3zNSQWrHLQvAaY/jQ2p/M3aYGTOSVJw0n0SCGXf7eZv3Tc+v8Xkb9mJaP3UmlvkvumwsG+GN yC8prMyYPLZxTe/xJQjpqdMPbMMaHQVypYckoQ0sRmLLcbvTe7zK3izlI43RIET7layLS95Km 6+ZjB4lOPI+J3hUfE3pFgk3X6E04QkGpnlY72ACmzGbXmTOH8FPdFwrtZj/Q55s1VGXF5d8dv NsMLjC50ATwrRJmYEEk4sOTqQz6cUb7DBj+7Xs3esJKthNbfmXu4qmjrgg9PWsZDqbeIXbAoK dmjv4Itj6egdEsvN73obeQpmJyP0zJflnbpU3Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170728_071148_667833_5418E79A X-CRM114-Status: GOOD ( 12.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Ard Biesheuvel , Peter Zijlstra , Nicolas Pitre , Russell King , Stefan Agner , linux-kernel@vger.kernel.org, Chris Brandt , Matt Hart , Russell King MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Matt Hart reports that vf610m4_defconfig kernels grew to 2GB xipImage size after the __bug_table change. I tried out a few things and found that moving the bug table into the .data section avoids this problem. However, the linker script magic is beyond my capabilities here, so this is almost certainly not correct. I've added a few people to Cc that understand this better than I do, hopefully someone can turn my bogus patch into a proper one. Fixes: b5effd3815cc ("debug: Fix __bug_table[] in arch linker scripts") Cc: Peter Zijlstra Cc: Matt Hart Cc: Stefan Agner Cc: Chris Brandt Cc: Ard Biesheuvel Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Arnd Bergmann --- arch/arm/kernel/vmlinux-xip.lds.S | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S index a8ceec3e0580..1ebb40ecf411 100644 --- a/arch/arm/kernel/vmlinux-xip.lds.S +++ b/arch/arm/kernel/vmlinux-xip.lds.S @@ -241,12 +241,17 @@ SECTIONS DATA_DATA CONSTRUCTORS +#ifdef CONFIG_GENERIC_BUG + __bug_table = ALIGN(8); + VMLINUX_SYMBOL(__start___bug_table) = .; + KEEP(*(__bug_table)) + VMLINUX_SYMBOL(__stop___bug_table) = .; +#endif + _edata = .; } _edata_loc = __data_loc + SIZEOF(.data); - BUG_TABLE - #ifdef CONFIG_HAVE_TCM /* * We align everything to a page boundary so we can