From patchwork Tue Oct 24 06:23:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10023545 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 2FB3F60245 for ; Tue, 24 Oct 2017 06:24:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 281D42074F for ; Tue, 24 Oct 2017 06:24:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BFF720950; Tue, 24 Oct 2017 06:24:35 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 929852074F for ; Tue, 24 Oct 2017 06:24:34 +0000 (UTC) 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=6yNky+a97tyn2EhCpqSOBxvqRIMpw1WCPPDM1jOhZv0=; b=CDQdkcJKEDR69Phi/LU3vg+Ch7 jbUKvpAXCNR9dGRosxdCZc1IVIVMBIFJCLegJP0kgXYvxawQbRX6133Y5D0nhZC2kKaTr3GG7qVnA z3I6CDynRXPful25rS49O9wrKbPvUxWXcKnQ10ezVgLECr6vMqi1keHj4TrctYD5T+F5zOmZZyZE0 QpXYFv1M4wYljB1Qu+CYkDRt0nUKElFBKkAKJ/lSV4DuCaLrJOrKQNQ9HzIvnp/c5pmeW6kaArGcD quddCffcY7gWQfBSYz97BvoxGNJhZCl3d2FRlWfUQ/VkUIYaTMD5J09tI7cMtbDPk1tIk5LytSy8W BpuWscYA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e6sdb-00064n-1I; Tue, 24 Oct 2017 06:24:31 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6sbb-0004kx-W5 for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2017 06:22:49 +0000 Received: by mail-pg0-x242.google.com with SMTP id p9so13709938pgc.8 for ; Mon, 23 Oct 2017 23:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YaKBzkr/cIWgFVTBEsCUvwM4WhsObL1dHTAi6/jIrrg=; b=XhkNVxJX6OGyKQSDRfzpCTd5UAC+/mOAyYubQv28Q5h3QYenh+EWLvSOQNNDA1BNDX TbJCeaECtCO2aehrquPD0Gznuv5LIewLtZTwq3PdjTdf+XFfxUft2brutJlfKW/SouIS zGqG63ZzxrQa38ppE7nLH7Q7H+GSHD6eIspHA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YaKBzkr/cIWgFVTBEsCUvwM4WhsObL1dHTAi6/jIrrg=; b=Pj6mSlsU1L9+uIKZU6DdQjoMHj92GrKgwS6dugQsPF0GtHqjbK2r+CWhr3sRTAkRxE 8ouvltxoyMf7skOex746YIsZ1V4ZU/3lZLe0WP1DAOk7XGxFaJWtM9vSeJ1D9m0BsUaH nxzrgIs10K+Ypmoq36X2Gl5fG+I2ibnt5wqkMrxep07pt5aNw9POQJt6OLaN4axkuTpG KKbj/PyDRtdwOGKQ65PfkuH7Zp4ne2T3Y1q5+gl/lrkwbS8q5Ntg/A7799DCEj7/Gjh6 Q9GXswsIX5HO97gK7kbHdqg1mCqUJTP6sXkpS/VqQrIk7LLR2+eP4dNKNfzK0PyPqemu j7Tw== X-Gm-Message-State: AMCzsaU2SUDiwsLicnHztLV17QGZbJ8+EskT7jndcIuo4rtrYRIkdafh mViJ4zVHEnu8CUh8z1hZBC47DQ== X-Google-Smtp-Source: ABhQp+QTiQkyKVdXdgmlWjeMX4zBlvO0K+gW9zGtUrglMVNnpL71ee+Ac9tGN34BhAy/OkbDkQTUqA== X-Received: by 10.99.161.17 with SMTP id b17mr13740525pgf.292.1508826127494; Mon, 23 Oct 2017 23:22:07 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 9sm13409636pgg.42.2017.10.23.23.22.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 23:22:06 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, bauerman@linux.vnet.ibm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, akpm@linux-foundation.org, mpe@ellerman.id.au, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, ard.biesheuvel@linaro.org, julien.thierry@arm.com Subject: [PATCH v6 06/10] arm64: kexec_file: create purgatory Date: Tue, 24 Oct 2017 15:23:50 +0900 Message-Id: <20171024062354.22621-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171024062354.22621-1-takahiro.akashi@linaro.org> References: <20171024062354.22621-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171023_232228_863175_B5C1417C X-CRM114-Status: GOOD ( 17.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: AKASHI Takahiro , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 This is a basic purgatory, or a kind of glue code between the two kernels, for arm64. Since purgatory is assumed to be relocatable (not executable) object by kexec generic code, arch_kexec_apply_relocations_add() is required in general. Arm64's purgatory, however, is a simple asm and all the references can be resolved as local, no re-linking is needed here. Please note that even if we don't support digest check at purgatory we need purgatory_sha_regions and purgatory_sha256_digest as they are referenced by generic kexec code. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/Makefile | 1 + arch/arm64/purgatory/Makefile | 24 +++++++++++++++++++ arch/arm64/purgatory/entry.S | 55 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 arch/arm64/purgatory/Makefile create mode 100644 arch/arm64/purgatory/entry.S diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 939b310913cf..cf39ec3baf5a 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -110,6 +110,7 @@ core-$(CONFIG_XEN) += arch/arm64/xen/ core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ libs-y := arch/arm64/lib/ $(libs-y) core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a +core-$(CONFIG_KEXEC_FILE) += arch/arm64/purgatory/ # Default target when executing plain make boot := arch/arm64/boot diff --git a/arch/arm64/purgatory/Makefile b/arch/arm64/purgatory/Makefile new file mode 100644 index 000000000000..c2127a2cbd51 --- /dev/null +++ b/arch/arm64/purgatory/Makefile @@ -0,0 +1,24 @@ +OBJECT_FILES_NON_STANDARD := y + +purgatory-y := entry.o + +targets += $(purgatory-y) +PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) + +LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined \ + -nostdlib -z nodefaultlib +targets += purgatory.ro + +$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE + $(call if_changed,ld) + +targets += kexec_purgatory.c + +CMD_BIN2C = $(objtree)/scripts/basic/bin2c +quiet_cmd_bin2c = BIN2C $@ + cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@ + +$(obj)/kexec_purgatory.c: $(obj)/purgatory.ro FORCE + $(call if_changed,bin2c) + +obj-${CONFIG_KEXEC_FILE} += kexec_purgatory.o diff --git a/arch/arm64/purgatory/entry.S b/arch/arm64/purgatory/entry.S new file mode 100644 index 000000000000..fe6e968076db --- /dev/null +++ b/arch/arm64/purgatory/entry.S @@ -0,0 +1,55 @@ +/* + * kexec core purgatory + */ +#include +#include + +#define SHA256_DIGEST_SIZE 32 /* defined in crypto/sha.h */ + +.text + +ENTRY(purgatory_start) + /* Start new image. */ + ldr x17, __kernel_entry + ldr x0, __dtb_addr + mov x1, xzr + mov x2, xzr + mov x3, xzr + br x17 +END(purgatory_start) + +/* + * data section: + * kernel_entry and dtb_addr are global but also labelled as local, + * "__xxx:", to avoid unwanted re-linking. + * + * purgatory_sha_regions and purgatory_sha256_digest are referenced + * by kexec generic code and so must exist, but not actually used + * here because hash check is not that useful in purgatory. + */ +.align 3 + +.globl kernel_entry +kernel_entry: +__kernel_entry: + .quad 0 +END(kernel_entry) + +.globl dtb_addr +dtb_addr: +__dtb_addr: + .quad 0 +END(dtb_addr) + +.globl purgatory_sha_regions +purgatory_sha_regions: + .rept KEXEC_SEGMENT_MAX + .quad 0 + .quad 0 + .endr +END(purgatory_sha_regions) + +.globl purgatory_sha256_digest +purgatory_sha256_digest: + .skip SHA256_DIGEST_SIZE +END(purgatory_sha256_digest)