From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179408-2-7456355774198121177 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179407; b=Ki4EBm7JiJyK4xsrvdmkSmWO0RNYejV3Q1g8WCHOKHtWm5u SLAP03n6F9dY0I2II9qiRmrVtc/WE3R4RNsyM65PNuDTCQg3BEleE5I5xhCXwbo8 cdZ8OP9gmqk0KhqzMwjdn4ZLN26kQ574ICuSAWg49ZgQrgH2FXPje0iBg+LzKed0 yrTsr6z51XMUbNUl/LBWOIg63XyyvMvWM17/rM3VthIaWkk2ptnHJMS21T3jmJkF 6+EweWD1ubJm/CoHoSFrJS5R1b+o1Tlgr/8LB0/PFR/s8LGQRagNsb10jBUzX4Co g1HzflIo0+Px5ccuYJK/+6tjGRJ4FCSh5CpCrDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179407; bh=Z219dB /RGL+a/AEGIhpBl990bSQZm/30x6S6xjrt5fc=; b=ibUda5fnCYfgqsLON3fNEC SxD2YyvWQK+RVedcSUNX72YLWkHVwfv6z+CvsRoqZ9j+CT0FbetPPrZOJnFTew0f NgVbz7bdSDW7KkpFrlii5737aCxrVZTbtdv0YItLKtYLYA8WURArMWMFI0UIfuUI oF/P++B7/r3g516iKTzTICbi4kGJ6G++VFjF03kmKv+q+LgLQ0JtRwLfXkkGKhx6 vhy6PyrsCpzzKHmBHggbfiSQTf2t4rlFMa/iqyPGWjsXA/uZyFp2mzsCBpT9KX9n RNYSX5g6I5AOpLg00csxXMRGy4thhF3SeuKGiDRjnjb18vhlHa++44cbq9eYPz+g == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=aF1vsT7+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=aF1vsT7+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932476AbeA1WnO (ORCPT ); Sun, 28 Jan 2018 17:43:14 -0500 Received: from mail-bn3nam01on0104.outbound.protection.outlook.com ([104.47.33.104]:34771 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932407AbeA1W3y (ORCPT ); Sun, 28 Jan 2018 17:29:54 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Greg Ungerer , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 13/36] m68k: add missing SOFTIRQENTRY_TEXT linker section Thread-Topic: [PATCH AUTOSEL for 4.4 13/36] m68k: add missing SOFTIRQENTRY_TEXT linker section Thread-Index: AQHTmIdT9AFsEJmZoE6yiy68dQQD5A== Date: Sun, 28 Jan 2018 22:28:31 +0000 Message-ID: <20180128222815.29479-13-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1115;7:19TY+/gZY4s0zgRftTxv5CIXe7Hig4gP9JgPqouhD922KXP/CDA06O7keVz9nPrC6fS8llmOVJvahXSaKJiYkG3ipYa5T1OTZlpWNcqaNWZ5O/yjQ2kSkjf73uqI8vtHIx/6nngOPJy5rcQlFo4QLOrxWs+BA7+tLS8iBwbD8BXQfsePEZoS6O0LhR92QxXXDrW2UkSN31mq/+8xA2i+9RoSW8PhlYmz4ks/C5dI2TbaNFwPwf25yJeDrxPK5xQJ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f7bc88aa-1ad6-4c9f-80fd-08d5669ea2b2 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1115; x-ms-traffictypediagnostic: MW2PR2101MB1115: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1115;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1115; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(979002)(376002)(346002)(39860400002)(396003)(366004)(39380400002)(199004)(189003)(3280700002)(2906002)(4326008)(6486002)(6512007)(102836004)(53936002)(97736004)(1076002)(3660700001)(105586002)(3846002)(54906003)(110136005)(186003)(66066001)(25786009)(26005)(305945005)(6116002)(99286004)(107886003)(6436002)(81156014)(5250100002)(81166006)(8676002)(22452003)(86362001)(2950100002)(36756003)(316002)(478600001)(106356001)(8936002)(2501003)(5660300001)(7736002)(575784001)(6666003)(72206003)(10090500001)(68736007)(10290500003)(86612001)(2900100001)(14454004)(76176011)(59450400001)(6506007)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1115;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 3SyxM/FkSm4ahH+ETAXKbYZvIJktH0DT08YYQ/PHNmnPmUNRsTnsrQWTjM6PNC7YCcIQ5okBsVeDq3fOJ24cxg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7bc88aa-1ad6-4c9f-80fd-08d5669ea2b2 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:31.7647 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1115 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Greg Ungerer [ Upstream commit 969de0988b77e5a57aac2f7270191a3c50540c52 ] Commit be7635e7287e ("arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections") added a new linker section, SOFTIRQENTRY_TEXT, to the linker scripts for most architectures. It didn't add it to any of the linker scripts for the m68k architecture. This was not really a problem because it is only defined if either of CONFIG_FUNCTION_GRAPH_TRACER or CONFIG_KASAN are enabled - which can never be true for m68k. However commit 229a71860547 ("irq: Make the irqentry text section unconditional") means that SOFTIRQENTRY_TEXT is now always defined. So on m68k we now end up with a separate ELF section for .softirqentry.text instead of it being part of the .text section. On some m68k targets in some configurations this can also cause a fatal link error: LD vmlinux /usr/local/bin/../m68k-uclinux/bin/ld.real: section .softirqentry.text load= ed at [0000000010de10c0,0000000010de12dd] overlaps section .rodata loaded a= t [0000000010de10c0,0000000010e0fd67] To fix add in the missing SOFTIRQENTRY_TEXT section into the m68k linker scripts. I noticed that m68k is also missing the IRQENTRY_TEXT section, so this patch also adds an entry for that too. Signed-off-by: Greg Ungerer Signed-off-by: Sasha Levin --- arch/m68k/kernel/vmlinux-nommu.lds | 2 ++ arch/m68k/kernel/vmlinux-std.lds | 2 ++ arch/m68k/kernel/vmlinux-sun3.lds | 2 ++ 3 files changed, 6 insertions(+) diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-= nommu.lds index 06a763f49fd3..30115ba7783d 100644 --- a/arch/m68k/kernel/vmlinux-nommu.lds +++ b/arch/m68k/kernel/vmlinux-nommu.lds @@ -44,6 +44,8 @@ SECTIONS { .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT LOCK_TEXT *(.fixup) diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-st= d.lds index d0993594f558..c95b4d306023 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -15,6 +15,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT LOCK_TEXT *(.fixup) diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-s= un3.lds index 8080469ee6c1..b8da085cf38d 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -15,6 +15,8 @@ SECTIONS .text : { HEAD_TEXT TEXT_TEXT + IRQENTRY_TEXT + SOFTIRQENTRY_TEXT SCHED_TEXT LOCK_TEXT *(.fixup) --=20 2.11.0