From patchwork Fri Sep 15 10:59:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 112713 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp470807qgf; Fri, 15 Sep 2017 03:58:13 -0700 (PDT) X-Received: by 10.101.67.200 with SMTP id n8mr24629148pgp.317.1505473093293; Fri, 15 Sep 2017 03:58:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505473093; cv=none; d=google.com; s=arc-20160816; b=cN3njdz2xF7qz1gAnxGCRUb/NiqTvKtKkjRanLZRmZQK3Gd0rAcIiaFgke9xuuCIDw vX7Bo0FQKn/Fga8Ooo87/gVL5+iubMD5X8jqNUgBRX4ll49ufvfmI+VCn1JPh0p4nIQC 0VKGnhBkrEmspyjm9wLFEmimNL3c3xrqv1ajzsM6F6MwKZFxJVs/vgXOsNV3YYNi6W7l YcOQ0A4AhJVLTQi1IeSvf8zjQf5O4FSnfeMlyqHA6rPsE1+bxipISwqcUHbhKcNo7NjS b+j8XJUcD54RLX3yRrN9UJBaR9sKL6ecnFvDf6tKaSABXmdsyTTvJxmt5IldTZhnBsBD OA6A== 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=ugNphDrZSJ9HUfacLH26VEP3GzufqzwOhLppALZCmac=; b=eq+2iKpgiLEpoQ+sjetmiDwj1pQds0FBngjhMvupxo7jpIdZv83pWLyW2DD8+amuEU XE7lN7j5zdUsL0ouvoy4M9jNX5ocx9yAucGw3q1EPTL3oYrkxGBaxYkvuiRcq4ZuwcIr ZxgPUw/WNVvYaf368Un8dAxJSoNRG+Z2rk0nZ84EO2Cmp2oi9hetNHPJwE7ppAN4H4Bv MMSCDogQqFD3ZVgzNDWIc21wErKJTFJZjU6Md4K2IEzkqPwddpmiQsa2nPk3XgMXmnRr B5JlflPaPqn7NjLh+1Uv6C6Nquaa+dCpq8G1EuZ13liKc5HG4DbH3UDC9uzpyaCP/ZiM m+kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XnNDrJz3; 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 h63si450463pgc.833.2017.09.15.03.58.12; Fri, 15 Sep 2017 03:58:13 -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=XnNDrJz3; 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 S1751494AbdIOK6J (ORCPT + 26 others); Fri, 15 Sep 2017 06:58:09 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:49794 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751157AbdIOK6G (ORCPT ); Fri, 15 Sep 2017 06:58:06 -0400 Received: by mail-pf0-f169.google.com with SMTP id l188so1255665pfc.6 for ; Fri, 15 Sep 2017 03:58:06 -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=ugNphDrZSJ9HUfacLH26VEP3GzufqzwOhLppALZCmac=; b=XnNDrJz3hMH9f4sRNVZs3tfIberhkljpGxBjJz4ZSQaLzc5maEcNqXEvn1mXAgSEAw 9f5i2KbfT2zhcMK6/n9bosLm+A27I/WMm+YjBTipI14TdMbT02NllcTNachPqxOvSqyN hwFzWH4cicXlESHlUEq7bEpwPNznRBaESZkL4= 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=ugNphDrZSJ9HUfacLH26VEP3GzufqzwOhLppALZCmac=; b=oxME08NFRdrlEHIgNWhAKEj17Gw+rPcRxw8+HUqCS6J6MLUw3xELV+hUn7etVj5kPW CdAqmwvZ7Zpe/gvI/rHtPK8EmEpXg9nB/qSfU7p5mkk3GDEXQB4tPCc+yC9iX2S3dH5L ZDozZNZqsJNZBtZbkcVtGIqadhIB62s2OhGzW43YFfq6ylJXUJMng0MaXBtTUZaExFAO G7rvaaVa0Qs02Oz/kYW3qH7xLp/y/l2+L2ysV5lAoMqRDyBYHJ8izdL3V/zjxfAE5Tnl /A45XTeuBuGg1aNGfGbKdL6HYFoQ7WkqGxGzEhph9K/d0ovH0dWo0wMUo/KVU0BXltw1 JG9g== X-Gm-Message-State: AHPjjUhGaI3E8Afp5XTkw0RhvjNFEoddYX7qt/vrOejpfcNF+yRE7d8Y txU1qb3XpskSPs9Z X-Google-Smtp-Source: ADKCNb6R2CgHa7TMalGh9hVP1AVS6t1Hyy1PcfVQ6t0GRUR004F/b4CLKVmElrsB16BJ/GyH+Nsz3g== X-Received: by 10.84.130.35 with SMTP id 32mr26972920plc.368.1505473085673; Fri, 15 Sep 2017 03:58:05 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id i63sm2221006pfk.34.2017.09.15.03.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 03:58:04 -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 v3 03/10] kexec_file: factor out arch_kexec_kernel_*() from x86, powerpc Date: Fri, 15 Sep 2017 19:59:25 +0900 Message-Id: <20170915105932.25338-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170915105932.25338-1-takahiro.akashi@linaro.org> References: <20170915105932.25338-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arch_kexec_kernel_*() and arch_kimage_file_post_load_cleanup can now be duplicated among some architectures, so let's factor them out. Signed-off-by: AKASHI Takahiro Cc: Dave Young Cc: Vivek Goyal Cc: Baoquan He Cc: Michael Ellerman Cc: Thiago Jung Bauermann --- arch/powerpc/include/asm/kexec.h | 4 ++ arch/powerpc/kernel/machine_kexec_file_64.c | 36 ++---------------- arch/x86/kernel/machine_kexec_64.c | 59 +---------------------------- include/linux/kexec.h | 26 ++++++++++--- kernel/kexec_file.c | 52 +++++++++++++++++++------ 5 files changed, 70 insertions(+), 107 deletions(-) -- 2.14.1 diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 25668bc8cb2a..50810d24e38f 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -94,6 +94,10 @@ static inline bool kdump_in_progress(void) #ifdef CONFIG_KEXEC_FILE extern struct kexec_file_ops kexec_elf64_ops; +#define arch_kexec_kernel_image_probe arch_kexec_kernel_image_probe +int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, + unsigned long buf_len); + #ifdef CONFIG_IMA_KEXEC #define ARCH_HAS_KIMAGE_ARCH diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c index 992c0d258e5d..5b7c4a3fbb50 100644 --- a/arch/powerpc/kernel/machine_kexec_file_64.c +++ b/arch/powerpc/kernel/machine_kexec_file_64.c @@ -31,8 +31,9 @@ #define SLAVE_CODE_SIZE 256 -static struct kexec_file_ops *kexec_file_loaders[] = { +struct kexec_file_ops *kexec_file_loaders[] = { &kexec_elf64_ops, + NULL }; int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, @@ -45,38 +46,7 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, if (image->type == KEXEC_TYPE_CRASH) return -ENOTSUPP; - for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) { - fops = kexec_file_loaders[i]; - if (!fops || !fops->probe) - continue; - - ret = fops->probe(buf, buf_len); - if (!ret) { - image->fops = fops; - return ret; - } - } - - return ret; -} - -void *arch_kexec_kernel_image_load(struct kimage *image) -{ - if (!image->fops || !image->fops->load) - return ERR_PTR(-ENOEXEC); - - return image->fops->load(image, image->kernel_buf, - image->kernel_buf_len, image->initrd_buf, - image->initrd_buf_len, image->cmdline_buf, - image->cmdline_buf_len); -} - -int arch_kimage_file_post_load_cleanup(struct kimage *image) -{ - if (!image->fops || !image->fops->cleanup) - return 0; - - return image->fops->cleanup(image->image_loader_data); + return kexec_kernel_image_probe(image, buf, buf_len); } /** diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index cb0a30473c23..f4df8315d001 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -30,8 +30,9 @@ #include #ifdef CONFIG_KEXEC_FILE -static struct kexec_file_ops *kexec_file_loaders[] = { +struct kexec_file_ops *kexec_file_loaders[] = { &kexec_bzImage64_ops, + NULL }; #endif @@ -361,62 +362,6 @@ void arch_crash_save_vmcoreinfo(void) /* arch-dependent functionality related to kexec file-based syscall */ #ifdef CONFIG_KEXEC_FILE -int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, - unsigned long buf_len) -{ - int i, ret = -ENOEXEC; - struct kexec_file_ops *fops; - - for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) { - fops = kexec_file_loaders[i]; - if (!fops || !fops->probe) - continue; - - ret = fops->probe(buf, buf_len); - if (!ret) { - image->fops = fops; - return ret; - } - } - - return ret; -} - -void *arch_kexec_kernel_image_load(struct kimage *image) -{ - vfree(image->arch.elf_headers); - image->arch.elf_headers = NULL; - - if (!image->fops || !image->fops->load) - return ERR_PTR(-ENOEXEC); - - return image->fops->load(image, image->kernel_buf, - image->kernel_buf_len, image->initrd_buf, - image->initrd_buf_len, image->cmdline_buf, - image->cmdline_buf_len); -} - -int arch_kimage_file_post_load_cleanup(struct kimage *image) -{ - if (!image->fops || !image->fops->cleanup) - return 0; - - return image->fops->cleanup(image->image_loader_data); -} - -#ifdef CONFIG_KEXEC_VERIFY_SIG -int arch_kexec_kernel_verify_sig(struct kimage *image, void *kernel, - unsigned long kernel_len) -{ - if (!image->fops || !image->fops->verify_sig) { - pr_debug("kernel loader does not support signature verification."); - return -EKEYREJECTED; - } - - return image->fops->verify_sig(kernel, kernel_len); -} -#endif - /* * Apply purgatory relocations. * diff --git a/include/linux/kexec.h b/include/linux/kexec.h index dd056fab9e35..4a2b24d94e04 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -134,6 +134,26 @@ struct kexec_file_ops { #endif }; +int kexec_kernel_image_probe(struct kimage *image, void *buf, + unsigned long buf_len); +void *kexec_kernel_image_load(struct kimage *image); +int kexec_kernel_post_load_cleanup(struct kimage *image); +int kexec_kernel_verify_sig(struct kimage *image, void *buf, + unsigned long buf_len); + +#ifndef arch_kexec_kernel_image_probe +#define arch_kexec_kernel_image_probe kexec_kernel_image_probe +#endif +#ifndef arch_kexec_kernel_image_load +#define arch_kexec_kernel_image_load kexec_kernel_image_load +#endif +#ifndef arch_kimage_file_post_load_cleanup +#define arch_kimage_file_post_load_cleanup kexec_kernel_post_load_cleanup +#endif +#ifndef arch_kexec_kernel_verify_sig +#define arch_kexec_kernel_verify_sig kexec_kernel_verify_sig +#endif + /** * struct kexec_buf - parameters for finding a place for a buffer in memory * @image: kexec image in which memory to search. @@ -276,12 +296,6 @@ int crash_shrink_memory(unsigned long new_size); size_t crash_get_memory_size(void); void crash_free_reserved_phys_range(unsigned long begin, unsigned long end); -int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf, - unsigned long buf_len); -void * __weak arch_kexec_kernel_image_load(struct kimage *image); -int __weak arch_kimage_file_post_load_cleanup(struct kimage *image); -int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, - unsigned long buf_len); int __weak arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, unsigned int relsec); int __weak arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 9f48f4412297..6203b54e04c5 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -26,30 +26,60 @@ #include #include "kexec_internal.h" +__weak struct kexec_file_ops *kexec_file_loaders[] = {NULL}; + static int kexec_calculate_store_digests(struct kimage *image); -/* Architectures can provide this probe function */ -int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf, - unsigned long buf_len) +int kexec_kernel_image_probe(struct kimage *image, void *buf, + unsigned long buf_len) { - return -ENOEXEC; + int i, ret = -ENOEXEC; + struct kexec_file_ops *fops; + + for (i = 0; ; i++) { + fops = kexec_file_loaders[i]; + if (!fops || !fops->probe) + break; + + ret = fops->probe(buf, buf_len); + if (!ret) { + image->fops = fops; + return ret; + } + } + + return ret; } -void * __weak arch_kexec_kernel_image_load(struct kimage *image) +void *kexec_kernel_image_load(struct kimage *image) { - return ERR_PTR(-ENOEXEC); + if (!image->fops || !image->fops->load) + return ERR_PTR(-ENOEXEC); + + return image->fops->load(image, image->kernel_buf, + image->kernel_buf_len, image->initrd_buf, + image->initrd_buf_len, image->cmdline_buf, + image->cmdline_buf_len); } -int __weak arch_kimage_file_post_load_cleanup(struct kimage *image) +int kexec_kernel_post_load_cleanup(struct kimage *image) { - return -EINVAL; + if (!image->fops || !image->fops->cleanup) + return 0; + + return image->fops->cleanup(image->image_loader_data); } #ifdef CONFIG_KEXEC_VERIFY_SIG -int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, - unsigned long buf_len) +int kexec_kernel_verify_sig(struct kimage *image, void *buf, + unsigned long buf_len) { - return -EKEYREJECTED; + if (!image->fops || !image->fops->verify_sig) { + pr_debug("kernel loader does not support signature verification.\n"); + return -EKEYREJECTED; + } + + return image->fops->verify_sig(buf, buf_len); } #endif