From patchwork Mon May 30 02:52:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 9140209 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 8698A60755 for ; Mon, 30 May 2016 02:56:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B7D21FFC7 for ; Mon, 30 May 2016 02:56:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7050A28066; Mon, 30 May 2016 02:56:51 +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 ECEBA1FFC7 for ; Mon, 30 May 2016 02:56:50 +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 1b7DMe-0000sT-GG; Mon, 30 May 2016 02:55:36 +0000 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7DLC-0006nW-CL for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2016 02:54:07 +0000 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1lrp0016.outbound.protection.outlook.com [213.199.154.16]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-5-eVN4Ehn6TNylTlzYoEdEZw-1; Mon, 30 May 2016 03:53:46 +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=HLyrHbj5mhBsZm8YS3bZsjxzLZWy+nNQ39KVIGLDKXU=; b=D6oRhBe1AdMQe62A3pKd+xX8hM6YdGNy8DLQPe/evVWyP0WoFqRMUCEio5HbfpYXcITiHmLV2v4Nogk1V5Om4PNLHv2nBVteFZnxsg6+QJTF/mlehXDG6s0QLohHkDTsGgZnUnAMSIBUM5rW8hsk5ZncI02/VGjKONSuxxSzWs0= Received: from AM2PR08CA0014.eurprd08.prod.outlook.com (10.162.32.24) by DB5PR08MB0519.eurprd08.prod.outlook.com (10.161.245.20) with Microsoft SMTP Server (TLS) id 15.1.506.9; Mon, 30 May 2016 02:53:45 +0000 Received: from AM1FFO11FD005.protection.gbl (2a01:111:f400:7e00::153) by AM2PR08CA0014.outlook.office365.com (2a01:111:e400:843e::24) with Microsoft SMTP Server (TLS) id 15.1.497.12 via Frontend Transport; Mon, 30 May 2016 02:53:45 +0000 Received: from nebula.arm.com (217.140.96.140) by AM1FFO11FD005.mail.protection.outlook.com (10.174.64.87) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Mon, 30 May 2016 02:53:44 +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:23 +0100 From: Huang Shijie To: Subject: [PATCH 9/9] arm64: entry: remove the duplicated hardirq flags trace code Date: Mon, 30 May 2016 10:52:30 +0800 Message-ID: <1464576750-25160-10-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)(45074003)(189002)(199003)(2351001)(4326007)(8936002)(33646002)(86362001)(19580405001)(189998001)(36756003)(229853001)(5003940100001)(110136002)(11100500001)(106466001)(1220700001)(48376002)(92566002)(5003600100002)(19580395003)(8676002)(586003)(47776003)(6806005)(77096005)(50986999)(104016004)(2950100001)(50226002)(2906002)(87936001)(5008740100001)(76176999); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR08MB0519; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM1FFO11FD005; 1:6ZV2l6QTQbLwl1K39qi/B+KR92EFOroYtjb3TmwAJGt2bYTGdUwSTh09+fEdrE7RJzWIqs9MssWDBeRuaTIMmECXUqy2uuqFnEK+aHITrFUll8mFckEB1e3a/6dv2M0KioosK+xodxehIS/yIvguQv8EYyYGmkduu3tfAdkiBGMVjHJkds17g3Iy+UwTFt1n6LGsS0sRmt8mZi6tVQlwWCt6jyGebM4sQi/mD4H6Teptj73KyYDpKjeAcI98LnU6ISblzWhnSrs8YvitgrWPV2H2HFXFdQ7fiwRPaWJqbd+3bjDjkiX2ECcPQ5Ttq6VYJd1yO2itMRZFjWoPdcGU/IfZwJw9GS9RBHYlrHXa0QiuhEjU1YEZYQZLJ1sRGy3YKDedSCyfCCAsNSwHQOG+RJnu+z+BEyEWrx4ipfs/VxnlUGiuUCaeb06IU+wXZ6tgNZyyPXvq7KE041Pr/mazA+Mx2hlQZex8deVnuJh8FkJDXdrIjG+Fc426MRU35mrguT1wHvA54HVzBYP0ZgeJPJZeCkvlJ9bCtLHGkW+HSMuhteuvutIyKdRUMGpdS8sZ X-MS-Office365-Filtering-Correlation-Id: 34d33b9e-a09e-4fa5-dda1-08d388359db9 X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0519; 2:NAcmh8LotWrSYhrLQl+ruWfSb9hIU4EaG0VKNG7mwHmr19upT7B1HpOmy+MYnUHNGFAT6UBKAA2wSc/xj1oSBqQMZlFlHoq3TaPESDq0a6cWATqRUJIvywWOYeTGsBj+lP8zyHWDrSmw1rOF3Mi83nWxVvxLs9lq5R3K3MUt/J+ec9z8u37CBye+CCd0NppZ; 3:sEdc0E0Sj1RrezbzhUWBmfubIJxXdGLhWpkPAgNwf9mDKc9EpGf2LfesXYV10/uWLHF7vBQON7zLsvM6qHFxdGG4N1wrboFaDT19Yttsift9Ea/Z56Rz+P4PAfEQE0PxLJcINncSZISdkqGN/YPA6zq2FbFmw64bAMPNC7e9ZETng+4m6PdfkT+dJ4+RX7KA44rN7Ky2anVOYjC6OJdRSdUxRZlvR3tSR1q3rkuvOG2h7VvUbqw5n5dPzl4/vuiVyJw6h89kR6/9/X81RMK+gA== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:DB5PR08MB0519; X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0519; 25:QfEnaHwyWCJ+i8UCaF5DdIs+b7xfyhsGeZRsJwR7WNbGglre6tQriBZ+huDxsIFqsLKEoI4h54qY5ozzQQclT27Ac/Ms/Gb0pLlRFqbvpM74UXkXNkB2Qo68IoESkU4f1sk22XZxU9cChU+r9QU9FdDY3xJ4uVfkK43/S8oX1UHCtIxp69Rl5kWo2KB94OV+qVnJSWLJEiuwii3mQKTjM1DIxDDTZWscHRUFx6mtYI5v5cqXwItrJC71DBBF2Wuz3CTq8ETA7xadIw4EAy73+lFh8eEvv6yr9i+Nnj095SX3oNx7I8cy3QgSOyMFUddx4EhQV8rQ7x+XRTsVuXVTb/q9ZDzixuxPJm+wHHwcA2oCnSn92edWeRwFk2LUJVJmkKCxyeFe9cNda/nItV0Soww8CNmjsH6NdnYnvTpDcnJjWzAHP/G5/gd9uZXe7IQQZLg7YbcWEwNxud+09N1pQvvS9AelPu4M2mpG4iKKW0etsDaMgq7ZAEekZKK/0oaYrJ1+jZKz0WzyAehbp56M/nBJi5uoi/6y5npzhahovgNky27wXhxhFzgk5fbDufUn1DVUPuAFZtfk2Cxi58e6+EfP63Be3hQkaf0+TXAPxFGyFKseK1cDowCbHbZx2KBuhHruCNRBzNpgTuo20fBmyapsMkCa+QZo4mGz09yXC6orhdddM8o9sR8Vx5z0dUJz3ByB+phcQIhzZ5dIyXz5QJ01tRzsTB7nvZHuNwx8mKqerHbiDUFwgy4z7Us80xSa1Mkq3KAwKQZwTmfsqkl7ow== NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0519; 20:OjeryulXWZYtTxv29SMHAsobJdPAT3UPEyIOVITWdJgkgNuosiccw0QFl+nRA6gsu+r7aQ5nkB/tm14mZI4rr+d5GnRAcHKipAa/fOCUMqrOurRtppK5tLka7s57C7d8Xv/6W2E0AT9mUB6eXC8OXjEj16b8189ssvq4WIQt9KkvJIhS01jASH3/CPAIVNnGGfBlILWp9naPdo576jur4FeexK5RfE5D6cHKe/hspXFGkTtByfqbgPZH9LsGz1kr; 4:oN5NngOINsXzaEE5JZxNftTk6WZiOTPqVLOrhIADZOzQTf1ffA+ndEYE0mPPIAMVwOhdFc5ba9lMqPn77js8YvUQfh/QaZ3SU7TTOh/kvPHRGDEv0tmbt7iyQ+bLG2HuITLFQWpi87DNpBgSIIrpMz+MPJjxQvCJKJqSoLD8IHAMFv8WcQ7xj1MLXKuONezLY8Wd8FI/dggr1Li4sq3KjrXfIRjLBJ8ExybGd3Aef+u3xBEx5eVHM475RjVPf5sSJR30XLJxydXbhqKRUzK+xq8S0ReDzOGhHM1td+1ruZommNo16s9eGKe8BIxkPSnh0s593QHnQRtEPOv4NjRgW2pVaCavsq3BJj+q1UEpyG/OKw1o44PmBk1wWKwpHqCxU3+o/yenLcwKvOXjAWVTXclSRjdL2OGFrAp6gAeqFwwvw6BTIRb78bnhY5scdw1FUywiXN4/ETIi8I47ck2bKPPj0WLFqfbX0/Qdx1vpNanMoHQsqy1WT8PHP8L1mNIZ 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:DB5PR08MB0519; BCL:0; PCL:0; RULEID:; SRVR:DB5PR08MB0519; X-Forefront-PRVS: 09583628E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR08MB0519; 23:KDO2VGuB9MFuQxaynBEKmhtIL3SZ8qJWkqgiUez2k?= =?us-ascii?Q?xOiVRjcQG3jSFp4KPo6JojoOBWAxFqwxAAaBejaTfKk/f0hBff4jABrZJG/s?= =?us-ascii?Q?ICS842lhS8iYS0Z6lqlKncc5vrNuqc9iphECSJM0D8o0A+nUkjvWAFoKk3AL?= =?us-ascii?Q?rdG5lTd8G6cngq9NZN8kvYxfIbL0+iRe2EQ9UVkjJgXWFJ9pNH6oKkx9FaPJ?= =?us-ascii?Q?PVmMID/Yuk24HzvxGcpdd/k8w6fOT+nidGnHPS0XAMeA0qyxwNS6NXCpGqQh?= =?us-ascii?Q?Ee0gtd0+R2y6QLkE4vHNAP8dvA/3LMe+J1uGAxaoJBgMMIJB2fzBv0VWBuuN?= =?us-ascii?Q?DaXomuvEsFpySMGu1J0QXxcn47HhiJhGpkNt1OLsQ/bI85UxlZh6P2i088iY?= =?us-ascii?Q?SN+KwVpv32qSU14AoXYJgkPnsMWsdOfCV+R90G3Dkc3TDqUauVhKxWQQJgYG?= =?us-ascii?Q?6B6Y90smF6b9+Vv4i/TvJJTPbLH8CtX6mcwkpOvV5jSfIpeL6qyz1Lniqal2?= =?us-ascii?Q?MCm7k/x3SeKbJ6OJet0ZraeWJxwF+vj+p8aP1kTUfUiWoxZx1uPsRLEu6ExZ?= =?us-ascii?Q?TiMviLjEFq/Q3Fqbb9hK6YUhoRtr2+DHyNHzzkAD1jXHnvU++/2uprczmtJ3?= =?us-ascii?Q?G2paYb1Yrw3V78fiR8g83EcxcrRKOjjTRG2qW7iOwoIKgs+24mDVjlkFf/z6?= =?us-ascii?Q?ZJVo3YEh4gPZ4f8zUw5pM5fx9LLYEc/OXNzFgPHtPwrXm55/cMMetZDB3X6C?= =?us-ascii?Q?m1oH57vpnhsrJiHLlG5nxysGwzKqxtbuwdLC5Qn5QlB2tjZTd1HTG0vICS0I?= =?us-ascii?Q?jiOgMW8DK0Y2C0Iv79weOB1Z2UM7gqzpTScGqyWjW3FSeVPH/iJ5W8EYa5sc?= =?us-ascii?Q?TovJNSMc2GMCeDvB9GvL1WhcXMYhVXYPZ2L4I6aCjUwdQ6/Wz+p5av4xFzq8?= =?us-ascii?Q?OqyCJqqkz6BTSu1bhIgcFm1LtJfTxG+tqWvq+8iTFh++VcdKMnziYpjFB6nj?= =?us-ascii?Q?Ow=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR08MB0519; 5:3ptuXsmb+xX2LbF7Qx6vMcB3P5cBJOIRZhQ5sKiNzgdjd6so7ZR8JeGGPXPWP3XhCdsTcavm5RXlcqmstHjCrwboOLyZuyCEgo6frP+d1rmWlG4e081j68ljvGP1lAvKA+4EOTL4mUpnAQEze2EzzQ==; 24:QXT7s5ih5eMZALrsTIf65WkbDaCtdcnkhGvn/0fe5ztmuXWfcT+XRgNOhlAMB0KDCY+VLbKumLzNspO17lU/qtqcZ4Djs5/oWI+54Z2Eixk=; 7:tNzpcK1NOsnSea4PVfu0/tjkjaC9oxVW1CeEQxrEHyg+rkEd1DmSB4GejT9TG9f/JNEp5oC7rbIbnE+SLWWWHKexgmctRWlvaFZl0k9nS6EJAnc6ISaM+3UCj0ZJjrHOrjGK3jV2fv56H9ioGEnpBB1dqVehRQCHYBc7NcLZRXE1yQKTJOwoTkvsGS22O71j; 20:r7G7pfV+e75efPo0F4Hheq9ivEI0qWEQ7jkfmytFZn3dKkXwsxO+0/M9QpmM91+htveM+qKq9JmmBTDnNkQEOUb3va+aWlQHj4OgT7rEr1hUHa0GSjrp77Ga4D++U2KfX3BAR2G1GoYXY6mhDqSt+DJVGAnklOAiXMeQuroj0+0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2016 02:53:44.7723 (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: DB5PR08MB0519 X-MC-Unique: eVN4Ehn6TNylTlzYoEdEZw-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160529_195406_836439_D7D45911 X-CRM114-Status: UNSURE ( 7.35 ) 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 have added the trace code to the interrupt enable/disable macros, so the trace code in work_pending and do_notify_resume are duplicated, just remove them. Signed-off-by: Huang Shijie --- arch/arm64/kernel/entry.S | 3 --- arch/arm64/kernel/signal.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 7005789..b6edb55 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -691,9 +691,6 @@ ret_fast_syscall_trace: work_pending: mov x0, sp // 'regs' bl do_notify_resume -#ifdef CONFIG_TRACE_IRQFLAGS - bl trace_hardirqs_on // enabled while in userspace -#endif ldr x1, [tsk, #TI_FLAGS] // re-check for single-step b finish_ret_to_user /* diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 404dd67..56fdcb2 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -402,12 +402,6 @@ static void do_signal(struct pt_regs *regs) asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int thread_flags) { - /* - * The assembly code enters us with IRQs off, but it hasn't - * informed the tracing code of that for efficiency reasons. - * Update the trace code with the current status. - */ - trace_hardirqs_off(); do { if (thread_flags & _TIF_NEED_RESCHED) { schedule();