From patchwork Thu Mar 28 11:56:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 13608432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D1590C54E67 for ; Thu, 28 Mar 2024 11:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3OLVhlyiuO4QO30ilAe/bOu8SJDRfkVRnx0MaXnT43k=; b=00Ca9mTNBVG40J CkLtEQWvuApfGfCG8aGZ5EBzxSIolwpD8DryCdzMWPtWEMomevq7ggXO3Cr1vr72MraNoWInffe82 vnbINifgPlPseYx/NUQb82XU1FfdnOPD0aRHO6eu2/i4OYA5TKYwxI+dRCXERt6WhDqaZ5+NhgPGY r8BoevU4K9SsWOP+voi6kClNijK0ifVw5XjvM+LMbgRCoXMpf2lyblI/+ZNrcXn3PQG8lk0prTXVc nxQ5eSa7CjLqg2cJ1+U8Hq/at8uHULKPJEQpAa1Hrb9mSIe5Sjv3xC0WUF7u1ul+2+paBL2vDT4Nf P3dgAgpy0pI3dsAs0QLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpoNw-0000000DoA4-1z4P; Thu, 28 Mar 2024 11:57:32 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpoNn-0000000Do7h-0ygD for linux-arm-kernel@lists.infradead.org; Thu, 28 Mar 2024 11:57:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711627042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LDvvlSiiNqqQGe3YWm4ASYGqgYaSsgxZc0/sS+9WImg=; b=GwcYemkve3Q9j/IJWHgnPFAPvnA044eqSSbfCMVzN00JUeyj9oqgH6e0qY6BdGthCTA8mN lFmmop3TXuJf/Y8aLWmVSO925A1V4Enqr6SIcEdCZjech9Mtxr1ahYBXBQVE7HYfJJdK18 SmthcB7wa24D4BN3ABpuDe4KVXnfQPQ= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-158-fCzg0PKiOTqM1WSr5Gdhtg-1; Thu, 28 Mar 2024 07:57:18 -0400 X-MC-Unique: fCzg0PKiOTqM1WSr5Gdhtg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2BC793815EF6; Thu, 28 Mar 2024 11:57:18 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13F5A1C06834; Thu, 28 Mar 2024 11:57:14 +0000 (UTC) From: Pingfan Liu To: linux-arm-kernel@lists.infradead.org Cc: Pingfan Liu , Catalin Marinas , Will Deacon , Ard Biesheuvel , Kees Cook , Mark Rutland , Pasha Tatashin Subject: [PATCH 1/4] arm64: relocate: Let __relocate_new_kernel_start align on SZ_4K Date: Thu, 28 Mar 2024 19:56:51 +0800 Message-ID: <20240328115656.24090-2-piliu@redhat.com> In-Reply-To: <20240328115656.24090-1-piliu@redhat.com> References: <20240328115656.24090-1-piliu@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240328_045723_443775_065DDBB8 X-CRM114-Status: GOOD ( 11.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org For upcoming C implement, let this section align on SZ_4K, so that it makes potential instruction pairs 'adrp, add' work. Signed-off-by: Pingfan Liu Cc: Catalin Marinas Cc: Will Deacon Cc: Ard Biesheuvel Cc: Kees Cook Cc: Mark Rutland Cc: Pasha Tatashin To: linux-arm-kernel@lists.infradead.org --- arch/arm64/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 3cd7e76cc562..51eb382ab3a4 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -103,7 +103,7 @@ jiffies = jiffies_64; #ifdef CONFIG_KEXEC_CORE #define KEXEC_TEXT \ - ALIGN_FUNCTION(); \ + . = ALIGN(SZ_4K); \ __relocate_new_kernel_start = .; \ *(.kexec_relocate.text) \ __relocate_new_kernel_end = .;