From patchwork Mon May 30 02:52:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9140187 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 D60E960755 for ; Mon, 30 May 2016 02:55:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB12E1FF6C for ; Mon, 30 May 2016 02:55:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C003A20120; Mon, 30 May 2016 02:55:15 +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=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6F5FC1FF6C for ; Mon, 30 May 2016 02:55:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7DL4-0006qR-J1; Mon, 30 May 2016 02:53:58 +0000 Received: from eu-smtp-delivery-143.mimecast.com ([207.82.80.143]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7DL1-0006lT-SB for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2016 02:53:56 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0240.outbound.protection.outlook.com [213.199.154.240]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-26-CCmfarx2TWyImKEYVn3q_g-1; Mon, 30 May 2016 03:53:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Q49tMOh4j/0/7fVRHoJlV+9OJleBVyhBZtPa1yEaquc=; b=AbWiAmvPBzEGlVDTKSggkCIBk+4s3w9P57/BAqfVdtObNtWcbCRyf3yLBir8MX+DserIAAmPOSoawiPDu0TtkHEDxoDPjwWAaqXJ2NIa2kcF3lb/WrVnJ3pcOOKQM1NySXYeCxurk/qXrpKZv/kOzTxeYhmPul3mV8nvvNq0gww= Received: from DB4PR08CA0017.eurprd08.prod.outlook.com (10.161.12.27) by VI1PR08MB0527.eurprd08.prod.outlook.com (10.162.16.19) with Microsoft SMTP Server (TLS) id 15.1.506.9; Mon, 30 May 2016 02:53:34 +0000 Received: from AM1FFO11FD021.protection.gbl (2a01:111:f400:7e00::124) by DB4PR08CA0017.outlook.office365.com (2a01:111:e400:9853::27) with Microsoft SMTP Server (TLS) id 15.1.506.9 via Frontend Transport; Mon, 30 May 2016 02:53:33 +0000 Received: from nebula.arm.com (217.140.96.140) by AM1FFO11FD021.mail.protection.outlook.com (10.174.64.210) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Mon, 30 May 2016 02:53:33 +0000 Received: from sha-win-210.asiapac.arm.com (10.1.2.79) by mail.arm.com (10.1.106.66) with Microsoft SMTP Server id 14.3.279.2; Mon, 30 May 2016 03:53:04 +0100 From: Huang Shijie To: Subject: [PATCH 4/9] arm64: entry: remove the duplicated code for tracing the IRQ flags Date: Mon, 30 May 2016 10:52:25 +0800 Message-ID: <1464576750-25160-5-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464576750-25160-1-git-send-email-shijie.huang@arm.com> References: <1464576750-25160-1-git-send-email-shijie.huang@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(11100500001)(48376002)(8676002)(2906002)(106466001)(76176999)(50986999)(5003940100001)(19580405001)(19580395003)(8936002)(2351001)(229853001)(36756003)(104016004)(86362001)(6806005)(586003)(110136002)(87936001)(1220700001)(2950100001)(4326007)(5008740100001)(189998001)(33646002)(77096005)(5003600100002)(92566002)(50226002)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB0527; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD021; 1:GK/9E8yXuPWxXVqHrY+ThZWW8X/5Tow2WYe3V/DFVMGjJxDHHtezdeBgzg3o9Zk75aRZPm6kAw61qkEtBAEfdNYXEwS5W/Oid7Pu64PMISQkKwcS5VgtZQrTQMo6ObyASq71l1ozp0kZtp4ALlta2u0JJGrLOYNhOOQj5xPr3VKEL4e2cDlNfyrxcFIyBKBuYFvDcKoVginK8BjMtgTx888Y6N0PDd+53aP2u1DftcwMJC5xhTpaGR2Aold+kB5tphg4J66r6wHyF+sMiQVeunQsDPihlWmBLUr36M73EaaaSiYPcumyGfZeQESIJLeVtv/0Y3DVo+1+/YrnyahldpNWi60j2mmhGq3/amauzv4Qm75qoXNFqxfWe0u5++Pr422pjgryaPlMFViUjTbT4dVb5Q60ary7p3rBavWNWn2HisgFW50syF4udHjkb8DgILYuvLKvxPRVf3wbkjylsnLWfTEXyCim4R3qxo7r5S09Bsvay1z/OcL1SJwHySaTP1wrn7ATzWHmBnrfBfyxmge75j2+i8RMZlmaozqn+0Ys9fGfHSE5qGLFNTNIGioW X-MS-Office365-Filtering-Correlation-Id: faf77d5d-ea5f-4e5a-1431-08d3883596d6 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0527; 2:L3i9SYitMfLf5Wqkz3GsfBxcEQREHAUc72tjCzh7Wn069oIdOVrt1I3HaG0eN5/PHiW2rD2HmhPvqWgetVPFFIf3Nxu8Rw0okgAFxc7/W4t24UMfi7ONeKX4YMCzWeVsqPatbhMvIBMLj6s5VDERNR9mUyrEjuLPw9rlcva4YAN89sE0oCkCo1mYE/deMeNN; 3:4VMiuMtRvrDIukKXYCCvAfJxjT+m0b8LBF+enSDMXKuzCPqeqYy8o3nBoI12/qHts8H+qsGFGXfguKaM4WGUObr3qV69N+DUn9H6aKxHXXObT4PeBXFPDsIIsWBu5kVKzyLLcTGkyfoUA505okwo4W0FxhQS5QUlDrTidOVmCtqiWs6RK1ZcRBP/iVYA1zFho8JV17Gk1OgNfVg3pKGeJrxtMgrPEmNpKW8xzmhTeapBPyTFxQNZM0S6D0JvKr5uFqXsn9RLnlLNNv2bUWcgWQ==; 25:fwy2CGIXWdd0xY10Eju5ee4f7neDRmuyxH5/5J+1Ar92MjEYD+a8hG4wxrtplkvfAdE+hWIvtObeDnui1RnSHaVnsrtUjzruCyAZ/xiv32KkuuW2/m2WSSbHxkryoHQieupljM8EAXpF5O2Z1DlmvO5R/iB4sB4PtJXCQ4B7ZQTBwT35NAxO0hnRCB6sAcLlYgnhRYvZ6fTbZ+wsUo3DA7JIgmBiQS+246K1tz0SD+VxqchQDKSEqpKC2MPpD8RdUlqQNx3R0TMNIGZamBYLQPdDwFumKS99Zzn0UaT/qvi77Oz/NKf5RpwpjQncNjTCYJJzHiBHTOwZOIqeaUnkBE/Z2fJKnq4A28u2eIW1YJtGdapBwFOXgVCRowObF8pNInuLaFH/xBLhdBjR+ob9bRkGW3eYEYfHs0dDAR1Xb0E= X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:VI1PR08MB0527; NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0527; 20:VItgBBj0UMv8Gtg1LVhFpklc/aGf4+kHAgkwzWr0cfHvJTjaC2JrOkAMKtv4w8jndSkot03dVzcCIMuPPn//2WkjmDWLQh4VlmI3BQNh2IAEllJNRiWJJhExviJJlpCze5+94bUQVaufrkQXCc5EaDThmICFpZ/6mEh7pEB0Ksmbw3Zfw5KADrDgfNvdHAX+JxJNPyE9td6vZy3fJ0AhzdXoh67BSkPFSFsmitILqx0vs7HYykEFq3uyQEpSfq1X; 4:2kfpk96rootKGNaYzU2xhU922hkKBj3G0rWAjtP0psmM1GA7NobarnhIRSJsNVRMgmTfseTyjK7ioTZZXDnrN8lWBq2j2790suxyzYrdjlK0RTKM9Wdu+goGWmMTAW4pe/XUzcc4LlqxxwznfMN9InEFJjrol9yXEZHUR22MAxmjgctgSO52yG2oGNfN+too+b2czxaNyeP9liPJhVrgIx+VCJcCRD0K/On3ymaGXmy7lr1apdDHALyOO9K06jRkJFzKcvyjsGJDc8j7anchIEmMxpwOowzpVQU/o7EZ1C0D9qjCJZEivk3tlYrgwzK5jrx6+iC/O/9QNXVM2FRgCG7HGS2cVQFdlQqLsuJMHFYUdhTSQJklq6zWAn/NiKRnnM44dPa697UOAjXRlNpx+j4T7w/tshs4bSBf0x3gytIcK4WLEiMYJCQCTy7Wr4G5+cJJE3ikfo8NVvtttv3K2dMBXV/xIN7V2uTK5sAhpRU76W3hvyF4RbOBPpusj0FZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(13013025)(13020025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:VI1PR08MB0527; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB0527; X-Forefront-PRVS: 09583628E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR08MB0527; 23:Q1y6TedEKEa4razpWtP/sWw4UxFePN8hDjE5SUMnS?= =?us-ascii?Q?mYK6wCCIuLzXYjWqtg3XfcI+anBGk3/G4700P7urNu23nS36pzLTgqPy1fV9?= =?us-ascii?Q?6PHKf2KLAS9sgZbniE40zQ7uQUb6GPcGmI30GJlZ13MpKF6hSzj+l9OMFw1c?= =?us-ascii?Q?2zhvUI7hyStBMnRIDNIfK+tmydFYY71rp00vX08poi9KIDGMVe7tQHY/G+5c?= =?us-ascii?Q?pq4Jl8h0VUsugS2xSRqMRqNgBw8W4X072Vr2LjvG8A6iqAZ8M17ZKTTUTWkV?= =?us-ascii?Q?dj9iKQzRCcZYA6kJPibnc32+kMh96b2OQ/u+mYh+0jMPioMJ/g9wQQwr9id6?= =?us-ascii?Q?W62ZF8KztgyZ6S2J9VftIFgX0rgfuBYyKENBB4SOrkndECVGvNBdwgMZm2aF?= =?us-ascii?Q?N4woJEPQxg1TRVKF2ErVU0HUia33CRSRB+Ypz4Mt9LTfV0Egjk6OtTIALzpP?= =?us-ascii?Q?Qb9oUsrhdvyOE+LGi8EbVw6SEMpzInOC4oeklqeIgzxRMGuwfOW+DdUxAAE2?= =?us-ascii?Q?+4BluQP3i0mLHYaCKxpzCfWAi9PPlcxaZSZG+PudrZAzQ6gGVzrUWTuUfTiD?= =?us-ascii?Q?az0SHr26WKD0nyoznA9wn6uZRJI2XGtgp6L7ioRQ2Cf9qKNpVC0+O+pWXhG1?= =?us-ascii?Q?SVTAvXwBiKXnl7h25mqQNdcPk4mBm60YXjkPCP/jZI4xJNmxwOqJPbhzImyU?= =?us-ascii?Q?rev1nh0s2bSHdfjUHbxw/AocuSFbskFTp9rbjyeMmB8y7iNC60LCM56ewtRo?= =?us-ascii?Q?okq0ABjc3dG/zlIeau9EoRt1mqtFTKjW65fSC5nMD0kwiCcxPpKl+fWVTZLN?= =?us-ascii?Q?qCGgjE8B2OFL4yRWobCOA0b/rFIRWYGQsr+UXrjSpxGMUX9NqIRNR5DnnMXs?= =?us-ascii?Q?iV7nnvB1rSZi6lMan3sbrkleGbTFatE7omhrOCje52PFwmJywVTWvsxV0idD?= =?us-ascii?Q?IqJpJgCbCYHrJv8eBmMosmg5Fe9ocIJGTl1XbPnyA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0527; 5:CLmZJm8Kmx2cGLZ+b0hvuUH+07uYzQmQMRBv06KTJ+P3G23QJi8m0UfMQuJRHcvWw8byeF498lemiKtA4ur7BNLk+UjuJDLqFyra/WvEjGAEz9D3qLhSKytzBWOFmdROj4cTtzVBuyizN8w9qHoxpA==; 24:fRtXwoBC1Owe0NR3dtbWqXgCukki1UFPr+qQkKLXw3OHtSm0AZ1kUqeT5esFWikDOCQYDVP/IpC8esknLcziMPo8yHl5AiEbe39ZktpP180=; 7:LlgO4Wp53ei2I9c5s/4qKsi7Xcz/mT+h32YXBQ/5ls4ZT69Ocf0+AqI0D/eZmGBVQ3XxMg3r/5CM50jPoM18df5BqT1dqrKIw+olww5MFDl4HXrDzdGc0mFGX9gRvIS903aYrovNQZ3lDvNLDd/k2LsxhsjbJhd8AHYnwhmEAPJOSQvHuOnapdF4zjHF/aXI; 20:v73g3uLyWP8sPTwfvcnKuw/xS5MZeStC9UvP2CNw2uPOF0/wHgscAZAS5A+jGJxr7/avOAPCxAlv16uQv1thG+4ffJSPPLc9vE5eD23WbDe6UWNoKaRtsIZosN0PXh5qKfN/ntJhsBgdQGegOvf8s2uqliAWxId+8MNgkgBx37w= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2016 02:53:33.2288 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0527 X-MC-Unique: CCmfarx2TWyImKEYVn3q_g-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160529_195356_216704_E9D60D81 X-CRM114-Status: UNSURE ( 7.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, cmetcalf@mellanox.com, steve.capper@arm.com, marc.zyngier@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, Huang Shijie , nd@arm.com, linux-arm-kernel@lists.infradead.org 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 We record the hardirq flags changes in the entry/exit code now, So the code becomes duplicated, just remove it. Signed-off-by: Huang Shijie --- arch/arm64/kernel/entry.S | 12 ------------ arch/arm64/mm/fault.c | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 4c67c56..102fd8b 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -428,9 +428,6 @@ ENDPROC(el1_sync) el1_irq: kernel_entry 1 enable_dbg -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_off -#endif get_thread_info tsk irq_handler @@ -443,9 +440,6 @@ el1_irq: bl el1_preempt 1: #endif -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_on -#endif kernel_exit 1 ENDPROC(el1_irq) @@ -632,16 +626,10 @@ el0_irq: kernel_entry 0 el0_irq_naked: enable_dbg -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_off -#endif ct_user_exit irq_handler -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_on -#endif b ret_to_user ENDPROC(el0_irq) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 5954881..f94e598 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -603,13 +603,6 @@ asmlinkage int __exception do_debug_exception(unsigned long addr, struct siginfo info; int rv; - /* - * Tell lockdep we disabled irqs in entry.S. Do nothing if they were - * already disabled to preserve the last enabled/disabled addresses. - */ - if (interrupts_enabled(regs)) - trace_hardirqs_off(); - if (!inf->fn(addr, esr, regs)) { rv = 1; } else { @@ -624,9 +617,6 @@ asmlinkage int __exception do_debug_exception(unsigned long addr, rv = 0; } - if (interrupts_enabled(regs)) - trace_hardirqs_on(); - return rv; }