From patchwork Mon Oct 2 06:14:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114556 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp326688qgn; Sun, 1 Oct 2017 23:14:25 -0700 (PDT) X-Received: by 10.84.229.1 with SMTP id b1mr3120413plk.405.1506924865080; Sun, 01 Oct 2017 23:14:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924865; cv=none; d=google.com; s=arc-20160816; b=pwvKkKp4b3wByr3SU9VmOW5h0DyYo5VslZXYUm/GILpxT4YC1+2L0JxiZdp9aA6YFo zG62qCb0ZWKhXFEbkA9oudbbw7ILIcv0PEvUBK58KdkN6vJrNafGuH5x9SGdAQIokE2A 4e5b6vGDCzFhpviwbpbAzQTsdN7zOli1EM+4uHfOjs2zFdDKpjnQgd0A/ucbzPZOwULN candx1VkNluVBI74iFRXRXusN3Yi69EUdb2AQzK4x1shKhIiITTCQCfEV+lm1Sd66RT1 ZiCsE3kRURxe5Qe1JzQ5EWngzPZrgwj/ckc1GR7e6xS6AK8RAtU0/0jWJTEW/odFDVAO KjIg== 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=YaKBzkr/cIWgFVTBEsCUvwM4WhsObL1dHTAi6/jIrrg=; b=qqbfTi/Dzap559QBVtFIL2zRm+lkU0rUOuvYqfjAdAKCk5UfxmqMxFrTbAviJQQZF+ fX2quLA3NGavD8T5syMcp16N6yVXtJqQB8SQPhMEch+WGpMjSIDwbzSZeOQ0U5/XrO8E dU5Z9mZ46gREAS6RoEpT3oWErzMEpi+lY+yJMJa2s+EG+X7j+zUyO7wKrFoHy5bUyK65 OwC4iE1sRPKYppcJbC7C41bhBy0TMANzSlwJZFsVMua2Fg9n4KZmGuIVdl4CqzRyTWtV IsVDVJsiwQec/5Kf73H+0Ldj85Xe6H2SYxE8hzyPtlLuzfM/jqiS//oyyeMrawHoksL0 QXJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XdVvYQ7F; 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 g2si7066291pgf.680.2017.10.01.23.14.24; Sun, 01 Oct 2017 23:14:25 -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=XdVvYQ7F; 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 S1751784AbdJBGOX (ORCPT + 26 others); Mon, 2 Oct 2017 02:14:23 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:50282 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbdJBGNC (ORCPT ); Mon, 2 Oct 2017 02:13:02 -0400 Received: by mail-pf0-f174.google.com with SMTP id m63so2437319pfk.7 for ; Sun, 01 Oct 2017 23:13:02 -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=XdVvYQ7FscC9a7iRQj/v96vgpBtbd7v1dQ82eYpctwcnn7NeuslKbZ9FLAqhfTwofV D/Xc5oz/xJVgnGq/dFDgp0HxlVrNU2STF0WNM0aMr2bGWYJqqFRpJBI4I3k0kwUUlYXa 8kcgmup/CpGq3P+c3ZhM/N7yiauBSbybXZ04o= 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=eBdRTdCklIuzmH2Ed471OR7UqN9rc8/BmWXPYrqStJAuh4G8E+u3Tx1KUyIchTa6Zz 6FBiTOQC5BmHdPJ4QkgOgiJ7FVzhhM89MP0oEfrq/YVosSbUsw687QcInImeWofsYEdJ wi5hBe6z5v4Yw4yzqwSpS4X/6PVcBP85fjKYej0PfOqnm2nC9EevPHNAGF2RvTaU+Ga9 dnSYAh2uVcCNSihk+IuCq/MmWBp5c8dr3hMij4lmfUqd7ggk7LsAl6yz6vis5XNhUlR0 gN5qbHz+RnVjq7k7CNyqjnF0wN+Y/4Q7KGAUyyK5iFq55sBy5geuk5RQph0WoajdeEvf +SaA== X-Gm-Message-State: AHPjjUjVCTW6ButQLchmzuPEnhsKzOcjVMaje3mi+rQJH4vyksRbd7Z8 sZ60gdhHnZ57zcBrnqZfkPo9IQ== X-Google-Smtp-Source: AOwi7QAaD7pmDFoBnY30zUJJQ+KOxUF5tu0IZDrOHpp+uGC3hQPRHAgPdlVvyaRa7t/3/kUxyJJ1bg== X-Received: by 10.84.235.198 with SMTP id m6mr13109390plt.57.1506924782078; Sun, 01 Oct 2017 23:13:02 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id n18sm14764393pfg.44.2017.10.01.23.13.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:13:01 -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 v4 06/10] arm64: kexec_file: create purgatory Date: Mon, 2 Oct 2017 15:14:27 +0900 Message-Id: <20171002061431.11117-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-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. 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 -- 2.14.1 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)