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: 10483435 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 B9A0660388 for ; Sat, 23 Jun 2018 02:25:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3EC329067 for ; Sat, 23 Jun 2018 02:25:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94C0B29076; Sat, 23 Jun 2018 02:25:20 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 2B61F29067 for ; Sat, 23 Jun 2018 02:25:20 +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=YUjtCDuoQIhwTKFf6XGQ4c0sjd5hlG/yuLWIYMszcRs=; b=P4JgjZKQ1jixjtD0w+TMlukDgr jcdVqy/m6pNB6wjAffssxqbde89EiUYZEOVErcmAv+BHHoUwyeVl9+N8qgEh82zy4uCJ24T8CPpNQ fPecJczmbkWsBgddh2aZ0QPqM4kRF3dZtYRFa3o1YPMnJvWKA++liS7K6EfKr7HBqo22qVXQHjGWT gC/sSCjgGp1a/Qw2Qg2LPWHLqEv4fmD0gIPA3FGWtlupSgUB++xd/ez5Lc/nSLiOCxSzGJQaZLxtA PLk7Tm2HvK6M1NpqFsNnW8ZGYU5+i/GF9AGsuuXRHJovI3pFzC5BGyukgofXnvRs6rAs6fazE1kZl ZLU53WeA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWYEh-00069u-VR; Sat, 23 Jun 2018 02:25:11 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWYBC-0003Wq-1d for linux-arm-kernel@lists.infradead.org; Sat, 23 Jun 2018 02:22:41 +0000 Received: by mail-pf0-x244.google.com with SMTP id c22-v6so4001285pfi.2 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=oA1JZJt5ufdCfX3nkUF1iaRPS7Ueon7FxCA073jC4s6BRatozC6uw1iY0NIQxS+81m ++uh0h3WdJI3ywPqJpzVh6BCcH3T9cBEfaTwNh3gmrx+mp5TFn0fZmn3WTYJAUK1Plux 8Bo28zgH8Rk32yXPrE8NTsB5Phfe3wpRj3ewBVfWTy4fRPMnbOyKNXrfOWsSDuNnLRa2 nhDx8Pig8ndVZ1M/nuYQ/2sfjyFHhpz8FeY8b2U4JQsIeK7xiW9w0NRRu4KOvEqhJI0K aF0JiBWFLeJ9WHeWtS5Z8Hn+Jp5DwCFziNzNKVyqW0Otp/oUgIaIOeUHyXSO0LSXqcND o/8g== X-Gm-Message-State: APt69E2zPfFrVHbcyO73qcX4sN2J9xo2cX7Krag2Wssii/stLmmuqi2h LquY4CDSLoWW/Z02AvF1j+ZYIw== X-Google-Smtp-Source: ADUXVKIR9JtFUb6b8azXhN6KtovKBhEQATQbYubtsOE5EJPDw8wLuzl1KHwN4KXTcGt4avc+DP+g5g== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180622_192134_099685_0C14B21A X-CRM114-Status: GOOD ( 12.88 ) 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: ard.biesheuvel@linaro.org, bhsharma@redhat.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro , james.morse@arm.com, 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 Modify arm64/Kconfig to enable kexec_file_load support. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon Acked-by: James Morse --- 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 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 +};