From patchwork Fri Sep 8 03:16:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 112002 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp939872qge; Thu, 7 Sep 2017 20:15:33 -0700 (PDT) X-Received: by 10.98.252.150 with SMTP id e144mr1657265pfh.148.1504840533767; Thu, 07 Sep 2017 20:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504840533; cv=none; d=google.com; s=arc-20160816; b=OMbot6BqHZY4ENak1bi4lEyXT6e6sPIr8tBrqB6NZ8DfgmZAB4kQ7Le/rJNwELGZYb bH0GXR+EQgD0sxpFTe97+HplKicwNa3Ka6sV2kS6r5SXoNa+BJGRiSqXtPE4J6qT/6i9 RIBRX2wR/jrVv2VF6mbi8YctERk2HEI8PnYj0PdzblAsGoJIxgBjx1j+A8HkaltdeEjw vSrAhzT4NDGvtKI5Pr2c8Ih4pFKiOOee1bBOP5E5NwV2QvcuoeRzmoWODwy7tV2zqQ7H LAMMBcUe5G8OEERAV/Kb2tei+oIMGgmKwDNu9qWZu9C2iJLHdJOa1+OcEiOspAHJh4RA eNCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=NSjHwXn+tfTD758pxg7Zazb8a28hjhqimLLE7KC9lkg=; b=OHD4qc4nBv2Ed6cX0Wtl3IpoKWKV9sUxUuav21XQsrP7jEhYEa3fARe2PwUdy371PM nGMB4m6tKQFhUKJiEN9W0Wi+n+5uwhr8CmfD8bRnOgBlxyGKgh1MU5ZS8XM980D05hAE RL0SSnmOktuR4Eafk1P9GykmOxQfjHMfsXTCCNwWnIrUl1lEmxCjtR9DjVEaoXPSwLHG CMDCPNjlDsw6N7NJ78BVPfPY9hMEH/GkR8kWaBxxrYz2oLmXTVpTmnDPYs6GQDFXiqx+ nz1E+083IH+ppHWGRVME6/B5doIKkNmi1GYa96Jhif7QCFQC2i7GaO25M0g2w/g9mhbI x5mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H7N3/nJU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n9si805110plk.34.2017.09.07.20.15.33; Thu, 07 Sep 2017 20:15:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H7N3/nJU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754434AbdIHDPa (ORCPT + 26 others); Thu, 7 Sep 2017 23:15:30 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:36985 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753804AbdIHDPZ (ORCPT ); Thu, 7 Sep 2017 23:15:25 -0400 Received: by mail-pg0-f46.google.com with SMTP id d8so2760834pgt.4 for ; Thu, 07 Sep 2017 20:15:25 -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=NSjHwXn+tfTD758pxg7Zazb8a28hjhqimLLE7KC9lkg=; b=H7N3/nJUjfoax+Fs3sJwtqJh5iXyBPPIC6VqDWGscz5CKUTliOaj/fz6hsXrtODMGF A1MdcYy8nQuQWORb2o2bMaNPvWtXDH2jmKuLVH6yHLTaSvgX7hSJBq3fpKzz/jFaUlmO t5e98LNYZWiMWzRWYISCfXSagtrrWtFaBwORw= 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=NSjHwXn+tfTD758pxg7Zazb8a28hjhqimLLE7KC9lkg=; b=jRtWCX2weFKwCzi1RTR4TCNtK8RfBP2C2wPrMldaWJjHND1GuMk8UWj92SSr09JCiQ 4E3kItg5mppg3slJpL5xdaYY6vTNWWIbGGdRoahB7yGsF9rHLhCbBW7lWHy2bsjzQQWb lOJAUYf5yTKJB01qAIJEBXW+YHJ4DrcXhTBf3BJOVv3ppC/eE9eMJ4rCsxghBxx0jhAT aDoIeEI8rOHJtqwJBQpDQerbYBBvfSvmbB4RmcSVN+NPW/clNy7GwGbg2CO1Mo34ia1S aXx/7ZV0dAHGGRTTWettE85HxS1+VaYZ0DbNVxAXQfrJ5P87g4fJZf1GbjkpKzPHsl2x Zc8Q== X-Gm-Message-State: AHPjjUh873MK5uWJA7PIWeQ2cUsZlSClsPxTNaK/yty7CXlpiD52swiB +bYxcsCtv+OLykuS X-Google-Smtp-Source: ADKCNb6LGkoIQuZpQ/i8LKgwiiIUYbGutPvFhANcv0rN9QzDJTiBEdZrqXQBGZU9RX1t0dRpKxIBlA== X-Received: by 10.98.149.68 with SMTP id p65mr1543562pfd.301.1504840525121; Thu, 07 Sep 2017 20:15:25 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id y6sm1225074pfg.150.2017.09.07.20.15.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2017 20:15:24 -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 Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH 5/9] arm64: kexec_file: create purgatory Date: Fri, 8 Sep 2017 12:16:12 +0900 Message-Id: <20170908031616.17916-6-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170908031616.17916-1-takahiro.akashi@linaro.org> References: <20170908031616.17916-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/Makefile | 1 + arch/arm64/kernel/Makefile | 1 + arch/arm64/purgatory/Makefile | 24 +++++++++++++++++++ arch/arm64/purgatory/entry.S | 55 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 arch/arm64/purgatory/Makefile create mode 100644 arch/arm64/purgatory/entry.S -- 2.14.1 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 9b41f1e3b1a0..429f60728c0a 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -105,6 +105,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/kernel/Makefile b/arch/arm64/kernel/Makefile index f2b4e816b6de..16e9f56b536a 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -50,6 +50,7 @@ arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ cpu-reset.o +arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 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)