From patchwork Sat Jun 23 02:20:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 139737 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1547879lji; Fri, 22 Jun 2018 19:21:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKSV2rrz4nlvWPBHHt8S7z+6GKVmhthR006+kzDJSSG8TjdojhUShQwYF2rCiviojhRxv2H X-Received: by 2002:a17:902:20ca:: with SMTP id v10-v6mr3817032plg.255.1529720488321; Fri, 22 Jun 2018 19:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529720488; cv=none; d=google.com; s=arc-20160816; b=z8bSL9owp775svR1TYeFxHEQZHcEw4PkcjgMkrkmJjJInqShDqBscFoOsY59glGzGF Pq4jv32W3vUyZiI+vAcXMQHXALmW2zSrjtXPkwqXHxK9x1JZ/SL+Epm2wLApb7m4kM6K c82ncu3vWfMU5SyhG1IsJ/JmDoxgV7qLVBG3EmRLlClxKUj7AvLXnOgrSMZefOVf/x9X guzUBepRptwI+oMFKBvFcip5q/fijCeRhp79kh23rBVK5Mf8huXonvvSaZYvJmlnvjD8 M1Dtw2XAm2B0KlB2gntMBzUqx58k5WIgQ4frE5dDZo49VmVkt6yiCq5QbnbnvMfhbII8 mdLA== 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=weunrdRlQMpf4fsyQKPE9LXV6t51796M/t4XNrNBMi8=; b=Nw1bO4iw5TSdDYNrmrOPmpIzKCXPVKmgiRR42FcHmZsr4qQIidcwkTApdpS2yXX/ZQ 1DrYXZHcTsGoQQfKY5e7/R2AFup6xN93xBy2WH6jPjlHBIeNLP3Fu2QpZ+A3Tgl5DVAl IdoKU4h0pyD9j1QvMWnQTy20Cxy8apusvY8qCGGeMqcwuzC0fZ0dabqdv/JWtlh/duDx T9WA3ubX8uYyfNYT4bkiAmUnXzOgIO+rs5f0/PX4Oly0/lfqiG5pHDY6OknjdoFKJDAi LfPBKnPcPQMpIyBucUg+ULM3uYX+2IrpVR4vCDkccvnxOLQaCbOOBFt9luv0ezPTMkjN an/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ALcrZEoX; 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 w4-v6si7186478pgp.10.2018.06.22.19.21.28; Fri, 22 Jun 2018 19:21:28 -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=ALcrZEoX; 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 S934814AbeFWCV0 (ORCPT + 31 others); Fri, 22 Jun 2018 22:21:26 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:38223 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934528AbeFWCVX (ORCPT ); Fri, 22 Jun 2018 22:21:23 -0400 Received: by mail-pf0-f193.google.com with SMTP id a1-v6so140813pfi.5 for ; Fri, 22 Jun 2018 19:21:23 -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=weunrdRlQMpf4fsyQKPE9LXV6t51796M/t4XNrNBMi8=; b=ALcrZEoXZgRbnSuE9eLW5pOQ/X3YEOUUMrmc5lclheR24mSmw24GbAwnLNi6+Nq8me n8CGVUZYjLU+huBlLIGjGsATxWgqpozlr5CSLciu2wJr/6p+4Ufjwlp7ppZKjZlcjfKq LdBthCqmIiW1L60Xjxj1sfg3ZobrDO9rKH00g= 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=weunrdRlQMpf4fsyQKPE9LXV6t51796M/t4XNrNBMi8=; b=Pt6u9d7sqsTxuedsOhtgOI2OEWtQlBQeKun8Mr5glR18w0X/317BMq+MJSEJMjVkAS NYLH1jx94RDkJ4q2cDoEkd3G4A6EmI/Jbp7YUBEIamUYEUyD8GMG67zitYrGDe5U0QyY aw3h0RjazNwCPbsIcox9/hYDij1L70hs7SMit7oUJVbm3ZfXDDa1XaG9AbjNq5P+f+3o LDgAlBbmiQJvZxfZG0pE8d4uTJ9bs2XB4X2/g+58nTQEsPiDM66eV2O9SR+uE21DqfFq FjMyJU9tB+z3okLwxfPxSIkXVrLkQDDoJHW7tQ3F3bSPOLk5vLR5x95MTHyi9Iz/De9q GewA== X-Gm-Message-State: APt69E2+acE44psfV6Q0hbGq+UffW786Wk7/VoKLoij6btAqqcRunGDw PFHeLS7OVQbIN8/pN74zfoBn/A== X-Received: by 2002:a63:6b86:: with SMTP id g128-v6mr2857010pgc.344.1529720483242; Fri, 22 Jun 2018 19:21:23 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id f30-v6sm22678679pgn.76.2018.06.22.19.21.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 19:21:22 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v10 07/14] arm64: enable KEXEC_FILE config Date: Sat, 23 Jun 2018 11:20:51 +0900 Message-Id: <20180623022058.10935-8-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180623022058.10935-1-takahiro.akashi@linaro.org> References: <20180623022058.10935-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Modify arm64/Kconfig to enable kexec_file_load support. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/Kconfig | 10 ++++++++++ arch/arm64/kernel/Makefile | 3 ++- arch/arm64/kernel/machine_kexec_file.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kernel/machine_kexec_file.c -- 2.17.0 Acked-by: James Morse diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 42c090cf0292..f68318f61c85 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -835,6 +835,16 @@ config KEXEC but it is independent of the system firmware. And like a reboot you can start any kernel with it, not just Linux. +config KEXEC_FILE + bool "kexec file based system call" + select KEXEC_CORE + select BUILD_BIN2C + help + This is new version of kexec system call. This system call is + file based and takes file descriptors as system call argument + for kernel and initramfs as opposed to list of segments as + accepted by previous system call. + config CRASH_DUMP bool "Build kdump crash kernel" help diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 0025f8691046..06281e1ad7ed 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -48,8 +48,9 @@ arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o 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 \ +arm64-obj-$(CONFIG_KEXEC_CORE) += 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/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c new file mode 100644 index 000000000000..c38a8048ed00 --- /dev/null +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * kexec_file for arm64 + * + * Copyright (C) 2018 Linaro Limited + * Author: AKASHI Takahiro + * + */ + +#define pr_fmt(fmt) "kexec_file: " fmt + +#include + +const struct kexec_file_ops * const kexec_file_loaders[] = { + NULL +};