From patchwork Fri Sep 7 08:00:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 10591861 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 D51D95A4 for ; Fri, 7 Sep 2018 08:11:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C56532AE08 for ; Fri, 7 Sep 2018 08:11:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B75C82AE10; Fri, 7 Sep 2018 08:11:44 +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,RCVD_IN_DNSWL_NONE 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 249C82AE08 for ; Fri, 7 Sep 2018 08:11: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=t/m+3VDl30qm+GDL5rHctMHFg32Vs6yrN0L9UWn+fCE=; b=mU0MW4SrsQRDLAV2ymczOXzCPL Yrb9ss/ipPNVdERzxupyziO+WUwEO7vhuRCBCFYX+aZSAG6/o2PM2uJCtV8eaJngkEsE7c8kBDUMN Ux4HNnqV9y6Xk7TEH6UglUH771/cb0FuTHnPNb02HS2Ovx9mw579DT+Q3x1NiKlI+qEolR3awf/A7 gi1Ayg7VbcwGz6HM40JwozyNfRWHpVWHL+JCP5s2EbBVKz7su/YADlXgTF0GIdEDE2FMM6GNPTY4I XuA7mBs+LQsmcP6kVerO/tvVk4lyqn4FUkiIDCJKrF2SWXjaMoHwa1ZYbli2jvPiSjo+D0zbleGOj j2BscEdQ==; 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 1fyBrO-0000hg-Sz; Fri, 07 Sep 2018 08:11:22 +0000 Received: from mail-pl1-f195.google.com ([209.85.214.195]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fyBi7-000389-HL for linux-arm-kernel@lists.infradead.org; Fri, 07 Sep 2018 08:02:04 +0000 Received: by mail-pl1-f195.google.com with SMTP id b12-v6so6225694plr.8 for ; Fri, 07 Sep 2018 01:01: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=Wek53x727l+CC28Me3kZmv40INMNgym0MEOVv8aRsME=; b=aMLoGtcKbZtYcDTYknTxqNRmjzsz5TmpU8UWKlGEgq3ouS/mEmCdeUyli8+9dThfXm 331KELwilkTkuU7ES4+trm/OnppENYt26MmHYfI5U7PogvC7XuwianlCKX3lWU4pV42N hI0QmcAvNmIyFcxP0XBOj904YNTV9anFCZLtg= 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=Wek53x727l+CC28Me3kZmv40INMNgym0MEOVv8aRsME=; b=ZKa36Wl3e6zQe1bAeIEcQBx2efoKAJZkGqgs817JXGTnaZ0mS+/tmdVDURrdV64x4I pP7xjw/MYTbdFQtVE1PAoXnaqWZZYQ0A1zpnXZxd72q0KquG2HJGfrqvTOgjkjIU7TOw Xm9JNMOwqjX2bGi281TNXOEjP2dJy9gbhsA+fTU+12UXwAa7ikYWqudv6Ov/7q81Onza KFzYfJh+TGBUDlVa42ptADn4hIpvLB3pcauF1HnWzEIvXZCVAbKMjtD9fGyW5HByupiP FjViQP2K3wqp82mxWxU40zG1NuS+Ob4UZ/isP7jmogjIzM1ZSZp6rjFin4zLSTWKalR8 iVyw== X-Gm-Message-State: APzg51DDaz8nzlenJcOs5R1xdmOdHpPv//LJD+h12MD9/H1idzslH795 0yp80fCKKoa/dYvxYyqLX+CQDA== X-Google-Smtp-Source: ANB0VdaRLGOkhgdwdx5ZA853bM5ec5di05hYI5NIQX3kC/Mh1tlPBlsWe2J1CgjYl0U5po8U+DxUUA== X-Received: by 2002:a17:902:464:: with SMTP id 91-v6mr6757431ple.125.1536307243989; Fri, 07 Sep 2018 01:00:43 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id f6-v6sm9369907pgf.52.2018.09.07.01.00.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 01:00:43 -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 v14 09/16] arm64: enable KEXEC_FILE config Date: Fri, 7 Sep 2018 17:00:33 +0900 Message-Id: <20180907080040.4967-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180907080040.4967-1-takahiro.akashi@linaro.org> References: <20180907080040.4967-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180907_010147_649625_A229013A X-CRM114-Status: GOOD ( 14.61 ) 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 1b1a0e95c751..5eb18d0cb513 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -843,6 +843,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 +};