From patchwork Thu Mar 19 09:14:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 11446759 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9974414B4 for ; Thu, 19 Mar 2020 09:14:48 +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 662B920754 for ; Thu, 19 Mar 2020 09:14:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="n1mkptLC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 662B920754 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=remlab.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=+jK5zY24USqdb7+dkWalUVZgeNBHjp6eXPdk9fYi6Po=; b=n1mkptLC6EWiHo K98B14BrASa98RYNcZN6IVhc6/t7Q0XN6l1OMCSwPLVAp9ALAsQpn+S1FAJ8/F7vzJurDJCdoaRVp jHTn5ZIy1ZIbzpEcPUNclYk4LupnRSFam845FzZFklPrYo/K0EyvzIMHyVbY+CsgHqsxeZCgnMzNJ Nw9y8RyxHa87gXk+RnaMrcQjs2Kg1yBsmOlYzste1/Y+rrCJeEQmvnriTKqwKcQGK5dHXqYeytfGI 91S+t51+kPj0jnZRVe1+/Z9QteXgjBvQsxnbur+eqH8+NVAI0L57iS0fdvilSXrBjU0NTfLhFzJpf ebkh9t/59S3R0IOOkrlA==; 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 1jErGF-0006RL-Me; Thu, 19 Mar 2020 09:14:43 +0000 Received: from poy.remlab.net ([2001:41d0:2:5a1a::] helo=ns207790.ip-94-23-215.eu) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jErFh-0005vD-BU for linux-arm-kernel@lists.infradead.org; Thu, 19 Mar 2020 09:14:10 +0000 Received: from basile.remlab.net (ip6-localhost [IPv6:::1]) by ns207790.ip-94-23-215.eu (Postfix) with ESMTP id 6534E5FDA2; Thu, 19 Mar 2020 10:14:08 +0100 (CET) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] arm64: reduce trampoline data alignment Date: Thu, 19 Mar 2020 11:14:07 +0200 Message-Id: <20200319091407.51449-3-remi@remlab.net> X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <1938400.7m7sAWtiY1@basile.remlab.net> References: <1938400.7m7sAWtiY1@basile.remlab.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200319_021409_531585_0F5D2602 X-CRM114-Status: GOOD ( 11.07 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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, james.morse@arm.com, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rémi Denis-Courmont The trampoline data, currently consisting of two relocated pointers, must be within a single page. However, there are no needs for it to start a page. This reduces the alignment to 16 bytes, which is sufficient to ensure that the data is entirely within a single page of the fixmap. Signed-off-by: Rémi Denis-Courmont --- arch/arm64/kernel/entry.S | 2 +- arch/arm64/mm/mmu.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index c36733d8cd75..ecad15443655 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -858,7 +858,7 @@ SYM_CODE_END(tramp_exit_compat) .popsection // .entry.tramp.text #ifdef CONFIG_RANDOMIZE_BASE .pushsection ".rodata", "a" - .align PAGE_SHIFT + .align 4 // all .rodata must be in a single fixmap page SYM_DATA_START(__entry_tramp_data_start) .quad vectors SYM_DATA_END(__entry_tramp_data_start) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 9b08f7c7e6f0..6a0e75f48e7b 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -599,9 +599,8 @@ static int __init map_entry_trampoline(void) if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) { extern char __entry_tramp_data_start[]; - __set_fixmap(FIX_ENTRY_TRAMP_DATA, - __pa_symbol(__entry_tramp_data_start), - PAGE_KERNEL_RO); + pa_start = __pa_symbol(__entry_tramp_data_start) & PAGE_MASK; + __set_fixmap(FIX_ENTRY_TRAMP_DATA, pa_start, PAGE_KERNEL_RO); } return 0;