From patchwork Wed Aug 1 07:58:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10551897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CAE51708 for ; Wed, 1 Aug 2018 08:53:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BC822A00D for ; Wed, 1 Aug 2018 08:53:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E9E32B194; Wed, 1 Aug 2018 08:53:45 +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=ham 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 E21612A00D for ; Wed, 1 Aug 2018 08:53:44 +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=LWBLemz9smKlBQxgMkYHuz7JASv1qAW/xe7j7uClVQ4=; b=RGTguJX4xG7uGmlkO62myYKmZt wToUzSLjReUfadk80wrLFPYTvvnvRxfQvK0APtH+man/vf6LkqeQaYntP7Zgwj6+b91nI6+IVCwtb 9K51YiMaWgyxPz4S6NCSqaV6+v5rUdpdZP+u3wdFCUT5x/IIZsw+HiVwl7+zjiKNigUd9Ozi5UWaf e06hYURzVBTn5Db15wJzpNJG/Z0M2pCaZmsgDNM59kzWE536mq+Hv/siVO9alH1zoANug3ZAe+fpX KKhuTRMAA4BVGdSYxoSae1Bi0vBFcEq4KoVVj5TvccTnXo5qDVI9/LNUqrHROEc1zQo8LETj71YVK odCnjLJA==; 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 1fkmt3-0007e4-5i; Wed, 01 Aug 2018 08:53:41 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkmsd-00071q-Cw for linux-arm-kernel@bombadil.infradead.org; Wed, 01 Aug 2018 08:53:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=zriOn+WEEg9EazqAOYJi2TzU71K/MV/o6JIIMj34rno=; b=fZrfKMPvNGBcbTQZ8748cordw xlbKjt1bUzCehuHPjFi5lS8If2w8ANNNun3UdBFIoCDq1LTvoYSZ4/MM+cf3f274yo0E86phg+Do/ 1qxIP7wFOUGugG0bu308CBRp+7r+Jgun1u7WxrWxJ29mLvs2OFmvErlCOH2SD6rXHZonxuW+vdPJo E7SM/3w76Dbh/I9Hc1d1BNsKRVVXZmnLtoJHb+nJeiVz68Qr0d/j6FNxyOS1mXK0geJz+HI/U6/Q7 s92LzJfqC9R+TgXNUJCZlBWDpzQmGcI1JwvXhW0Yw76/bGQD5A+wkZGI1dE4/5AulZGQ2NvCLnxad WCOpOowpA==; Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkm3z-0002Sy-7h for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 08:01:00 +0000 Received: by mail-pg1-x543.google.com with SMTP id n7-v6so10427564pgq.4 for ; Wed, 01 Aug 2018 01:00:44 -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=zriOn+WEEg9EazqAOYJi2TzU71K/MV/o6JIIMj34rno=; b=bvGOQIkvBmDgcU5RI5ZqVEOSB5GvKJdRU1fhcJKLV93+axy/cZ1PiiD3NNZDl/ziPl /6/wtfG6wc1FpL/b8nhxTUIIZ/s1R1Z5dokBhrcy8Tv/u8vTLYP9e/byweReQ7xqAfTx JkW3v0bv6J4jpyBeUp9+Xx+wJceiTDXkts/F4= 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=zriOn+WEEg9EazqAOYJi2TzU71K/MV/o6JIIMj34rno=; b=UNbktyL6/snykvf4cH17V0W2QtUpy9gQU/GrtNHB8ZeGslkgJLh9ELTttaoocTdCEm MvtJ32xT+NmDk9ZEE9ellWlzDD1V4Edbywr54CSjAPRuiWwLn28lKE/QTOpATg+j1FT8 OkOR3HZI7GdTzMipOAevnGvwICZpnPu/axrVzZWNc+T5b9SberY4g4W34b+9iZe+z1h6 /MMiDqRHK8G8kYYniFYspLK+8xaT4qJflm/H6xBiR4xY9d6QbTWHmBauHbEAOQlUwHr1 w0sXFMGTbwtveWmu8vYskookiZlsNv6CcMJGIGFfeWdRyq4hH0K3uSrEX5TkjWKb7eFo vD7Q== X-Gm-Message-State: AOUpUlGikqx5OnQNaT68bsB1Tw3hIOlWJ4rXZ+e4zYLktBLfxtUKb/Ey LyK7mUrN2V8do/JhaL5TmVZn3Q== X-Google-Smtp-Source: AAOMgpdHFSgMIc0zWHMtsZGoCFGeEUhlkYGC6U/A20hTg3Ps7VQI585rzqHHoAHkb4/8n1FRB7QHaQ== X-Received: by 2002:a63:5d58:: with SMTP id o24-v6mr23983744pgm.349.1533110442712; Wed, 01 Aug 2018 01:00:42 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id g5-v6sm5201850pfh.63.2018.08.01.01.00.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Aug 2018 01:00:42 -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, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com Subject: [PATCH v13 09/16] arm64: enable KEXEC_FILE config Date: Wed, 1 Aug 2018 16:58:13 +0900 Message-Id: <20180801075820.3753-10-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801075820.3753-1-takahiro.akashi@linaro.org> References: <20180801075820.3753-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_040055_294720_60973253 X-CRM114-Status: GOOD ( 18.24 ) 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, prudo@linux.ibm.com, 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 | 9 +++++++++ arch/arm64/kernel/Makefile | 3 ++- arch/arm64/kernel/machine_kexec_file.c | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kernel/machine_kexec_file.c diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1494d5cfd681..5988e767526f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -852,6 +852,15 @@ 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 + 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 95ac7374d723..8f1326b2d327 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -49,8 +49,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 +};