From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C76FC282DD for ; Wed, 8 Jan 2020 18:59:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D98E420705 for ; Wed, 8 Jan 2020 18:59:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RQcYkCaH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D98E420705 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:References: In-Reply-To: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:List-Owner; bh=9tWu59R8YQk4ZNpFRnr+nyIr7YdwpUctZ+Gl/ZuKugA=; b=RQcYkCaH0/VygR5sR8PGvNE/tS /rFoZifGK9Grf/He2wcQZXn+QhOllOKObXm9m5FN7CogFfs8MEG64agDpkuLiGS5954Opd8yGn++Q zavgHUzCrh7TWB7LQPi+NC5jAXRxlCrkRw9ue/7DVCK3o1c0Rn3Hu/eom10yW5sWURfgZQOT4mzC6 ad5alHm976D7+hHziRYqWXQBwU04dN/sflE1X+8BQvtWi6l+/BNo3fwku55m3/ITeBD2KuE02XSXc MDX27AMKLCqO8l84uzGN7j4NffOzFfCPBZpjva7Pb+lVkhLcS8s042OP+Mj4d5HcDHjmeZZ164Xzi S7hszghQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ipGYG-0001MO-4q; Wed, 08 Jan 2020 18:59:32 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ipGW0-0007cT-Gz for linux-arm-kernel@lists.infradead.org; Wed, 08 Jan 2020 18:57:15 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 09F2C328; Wed, 8 Jan 2020 10:57:12 -0800 (PST) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 79ECB3F534; Wed, 8 Jan 2020 10:57:10 -0800 (PST) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will@kernel.org, james.morse@arm.com Subject: [PATCH 10/17] arm64: entry: consolidate EL1 return paths Date: Wed, 8 Jan 2020 18:56:27 +0000 Message-Id: <20200108185634.1163-11-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200108185634.1163-1-mark.rutland@arm.com> References: <20200108185634.1163-1-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200108_105712_635776_59AC6983 X-CRM114-Status: UNSURE ( 9.97 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, keescook@chromium.org, maz@kernel.org, broonie@kernel.org, labbott@redhat.com, robin.murphy@arm.com, julien.thierry.kdev@gmail.com, alex.popov@linux.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Each of the EL1 exception handler stubs has an identical copy of the kernel_exit code. While each handler needs its own kernel_entry sequence, there's no need to duplicate this for each handler, and we can consolidate them for better I-cache usage. This patch makes the EL1 handlers all use a common kernel_exit stub called ret_to_kernel, matching the ret_to_user stub used by EL0 handlers. As with the handlers, ret_to_kenerl is aligned for better I-cache and brapnch predictor utilization, and for consistency the same alignment is applied to ret_to_user. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: James Morse Cc: Will Deacon --- arch/arm64/kernel/entry.S | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 35a8c56b0582..e76326feb1da 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -519,7 +519,7 @@ el1_sync: kernel_entry 1 mov x0, sp bl el1_sync_handler - kernel_exit 1 + b ret_to_kernel ENDPROC(el1_sync) .align 6 @@ -527,7 +527,7 @@ el1_irq: kernel_entry 1 mov x0, sp bl el1_irq_handler - kernel_exit 1 + b ret_to_kernel ENDPROC(el1_irq) .align 6 @@ -535,10 +535,18 @@ el1_error: kernel_entry 1 mov x0, sp bl el1_error_handler - kernel_exit 1 + b ret_to_kernel ENDPROC(el1_error) /* + * Common EL1 exception return path + */ + .align 6 +ret_to_kernel: + kernel_exit 1 +ENDPROC(ret_to_kernel) + +/* * EL0 mode handlers. */ .align 6 @@ -606,6 +614,7 @@ work_pending: /* * "slow" syscall return path. */ + .align 6 ret_to_user: disable_daif gic_prio_kentry_setup tmp=x3 -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel