From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517179981-2-9914717348740866784 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=1517179981; b=Qluper/6OkMxiZEbQAmh/DUrkI3DRoKKpDbFkT7Sj6llBy0 HOx1rn5KYMV5NnzC8dmdxWjR4F3+A5kVq0A0Bl1CYAoIoZq7t5hyzE4s6sVQTMPF CiVOyjCYT75sIMXTpctWvfib1PN5zIF6ifnfhaWyUM3ZXtSh3oLh/dtaa+/erBOs XTa5waD9dBrIc3N/GUWCNMAP370Vsnpgeq6OBt4yZ5Qry5Ao4Na3MvmRxdqGUpnk DRQe/9tQvkYZ2xovc5vWZnSCgYj5MZqKPX7iAGd67FRDL+uVkBW++GPkkoASwqQd xQyZucw4TWs+rsvPdj4qIvT+dg0LLbxf/zS1vBg== 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=1517179981; bh=TF6RrT XzEPZp9/1xYQuSQOuR51zJ4nXVN5BCW336Mwo=; b=nokLijsNDRjzzPeml95eZo YRXahbJEaD2qcZ5MIDtpnJZoVFKl3F6EXh3I/buGmXws1GCNZ06Ayr0B8tfZSkBV XmshayJ9Xl4whsUcPmn0K5ob/T+B+37TmdWCQ3JeWcQu+OYF4hCG9Xar+xvw1ww4 kxsCQX6tgGC4IqtU2tnUzf5hy5Bfg+gXRu5bJ4hsGMOXoBOr6KjWF+BxZikUf72D F+MJxRRTKU2/dVSkM1b8fNqFrZcjk8l1ClRnkCSup+UfxhuzO1epXQyvV66OLihc 1hncjfmVuHhNhW3Ik1RmN6HEK2fz2fszc4a4cikAZJ3HW1PAEhrWC+Syk31a4TLA == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=K5OTOzhX 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: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=K5OTOzhX 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 S932386AbeA1Wwq (ORCPT ); Sun, 28 Jan 2018 17:52:46 -0500 Received: from mail-dm3nam03on0095.outbound.protection.outlook.com ([104.47.41.95]:55532 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753697AbeA1W2f (ORCPT ); Sun, 28 Jan 2018 17:28:35 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Greg Ungerer , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 19/49] m68k: add missing SOFTIRQENTRY_TEXT linker section Thread-Topic: [PATCH AUTOSEL for 4.9 19/49] m68k: add missing SOFTIRQENTRY_TEXT linker section Thread-Index: AQHTmIc5Yc1HufzcAkqRUwH1fHc+gg== Date: Sun, 28 Jan 2018 22:27:48 +0000 Message-ID: <20180128222727.22404-19-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-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;MW2PR2101MB1097;7:CIfD3fg7svo+oxttvTFP2TSFVvOR7fHLBQzNY0FpD01lktb0rDsakyJ3RKNdrC6vR/kYIBUr4S4+bFhxU7zwWFqr0QbaHWre6EbprNp/1ZMrwbiXEHddTfYG5sN+QDBAEW7q3ZHzoC7tVjSlkiZfsIMdgO61ThV2kJFHWH1bDBnvyQTxnsC09WV+S3tLXlGPE2mhJtyxbXmo+G+0f5lrcOPz4Lr4m8Mkn/03GOu/mAAoxJzd1PxaveTe4bC2LUMZ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9b5c863c-7aa0-48a8-e868-08d5669e7429 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: 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)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(59450400001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(575784001)(99286004)(110136005)(54906003)(107886003)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 9VltxZfrcSbZosbqqrMfJxUuzHmn5WVOxJ60ImIIVvAscQ/DZzDN7FTxbFDNvs3KSUUZhz1+6tEqshCJFjxA5A== 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: 9b5c863c-7aa0-48a8-e868-08d5669e7429 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:48.2658 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 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 d2c8abf1c8c4..e958abe0f51e 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 CPUIDLE_TEXT LOCK_TEXT diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-st= d.lds index 5b5ce1e4d1ed..1656ae8a145d 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 CPUIDLE_TEXT LOCK_TEXT diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-s= un3.lds index fe5ea1974b16..07b9818b3176 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 CPUIDLE_TEXT LOCK_TEXT --=20 2.11.0