From patchwork Fri Sep 7 07:56:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 146193 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp860178ljw; Fri, 7 Sep 2018 00:57:55 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYvcoVeEQWZfb72QSMolxiE/ahwgRcbk1eT/k6epTyyCkYjLSHBg38sU9+inj8b+7QUOcF2 X-Received: by 2002:a17:902:280a:: with SMTP id e10-v6mr6622595plb.187.1536307075465; Fri, 07 Sep 2018 00:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536307075; cv=none; d=google.com; s=arc-20160816; b=WSxM+pxl/vqeX+0sROtpuqqwsYbwWM+K6A0QKvBtfZMXBn6vZKISWSTZhuuVgV2b1m GXvREUhIKnCj2gKuRA0lybA3idgAQZDmw8nhC1xFhGaRWyeH4RwKO+ShJ0+qBAsy5GjO eQwGJOCcmKfdrx6c/VGGg/x+6hcoY4qVwIRaUNRuH0Irnihy8wpO43le67FYvh1h+Mjq 6fP4fT0G5iaBRETXVAA5/iuEcsuFJs+lJ88i1Q9Up6TN3Z5YSw/mEbsrEf9xAK5MtoS6 ReHOU5cht/smL1CDg84iVZUxkDOtST15dWtHgtCAfzF/XaIj/RWD+yxi7vjueSuw8MmV p0XQ== 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; bh=G9kYri4+HK/HIbj9APwd9ezqkNFakYGkDtWst37y2L8=; b=UNXUjHX5NUxuLnkchLW8r5hFOiprnMjoHgeDY/XgnoM7c9TWh5sLeJTC8qsmI9Nw23 IyxbD1x6BdRHk7lxvKo8ZmSQeHzzCi42nkzFT4/jrMwQlXs/yVbmtnX28cjl3YPDsWRn gW0ldbKXDRvAR1FiXh4HthqMFj3fXuP/9TkLN8/M6bKzvoC7WeysxCE7CHFeChhJnsXV 6cyVhxzFjws0DO21Rbr2bM/GsuKroZYQm7+XiVcklKfntBWqMuXQ0Yq7ZzG0h8rYU10W 4VqvPx9Atayor7s5r/i7JLpH6kVQFKkguL8BhZILFh2Q1sJD0RVJ1PIX/P9oisJXbZxb 5YHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kyWSI8rS; 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 e17-v6si6904562pgv.615.2018.09.07.00.57.55; Fri, 07 Sep 2018 00:57:55 -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=kyWSI8rS; 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 S1728052AbeIGMhg (ORCPT + 32 others); Fri, 7 Sep 2018 08:37:36 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:43484 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726334AbeIGMhg (ORCPT ); Fri, 7 Sep 2018 08:37:36 -0400 Received: by mail-pl1-f194.google.com with SMTP id h3-v6so2868935plh.10 for ; Fri, 07 Sep 2018 00:57:52 -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=G9kYri4+HK/HIbj9APwd9ezqkNFakYGkDtWst37y2L8=; b=kyWSI8rSFfgNg0CEdOxp9hp3SeZ3F0IwNKz8gD27leOk0eBv2DgXp9yNqdfEAqn1UP 4kb2MFG4MO6IssGsYHWe8obziOcqhHFLc6rNqvr+zJ5qN9GSh7mWtIdiJEyb6YH+dIr0 PwV43kQpA1KwSwB1Gu1EIvYH6DntwxvoOs4wY= 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=G9kYri4+HK/HIbj9APwd9ezqkNFakYGkDtWst37y2L8=; b=tblTHTE26wOImLVJSNcqtIhZDGFPiqf4ShqvvEsNsPJ7A7c+utsiH0BWz93xkCU4A+ pJkAriZUC+IF6dTEepCMZogUMzqBAwOdSLqWa2qG8pVXWVJXnisn8YzdCFmhqx8GYmZi GExF5XveBWmrv3TXlSptMlSdklKb70BQXX86foGwgJiQ6m1XR4Z5B2TjxD2whNysRnmn 6XMc5yGv13xHI7udiiPq1SA0DNEw6mnsJjsMn9edHuLyUdzKyNyNkdX9lp+3QEJuCrWO r0/yoXIsPKL+7zwebeb5MHTi86xx6xlT5SoBgwBcrN1yFtfmwl6Hp8XU2iBQ1fybnyDy +xMA== X-Gm-Message-State: APzg51BIvjFIVcZNgTKLX4lifHJkaAEMBfcopmA2HmVAxvdgh1NBq21A kk6efKI1DbTycrCbV/ruOAZUcA== X-Received: by 2002:a17:902:981:: with SMTP id 1-v6mr6659044pln.60.1536307072468; Fri, 07 Sep 2018 00:57:52 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id y18-v6sm8498519pfl.90.2018.09.07.00.57.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 00:57:51 -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 Cc: prudo@linux.ibm.com, 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 , "Eric W. Biederman" Subject: [PATCH v14 04/16] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() Date: Fri, 7 Sep 2018 16:56:41 +0900 Message-Id: <20180907075653.4696-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180907075653.4696-1-takahiro.akashi@linaro.org> References: <20180907075653.4696-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Memblock list is another source for usable system memory layout. So move powerpc's arch_kexec_walk_mem() to common code so that other memblock-based architectures, particularly arm64, can also utilise it. A moved function is now renamed to kexec_walk_memblock() and integrated into kexec_locate_mem_hole(), which will now be usable for all architectures with no need for overriding arch_kexec_walk_mem(). With this change, arch_kexec_walk_mem() need no longer be a weak function, and was now renamed to kexec_walk_resources(). Since powerpc doesn't support kdump in its kexec_file_load(), the current kexec_walk_memblock() won't work for kdump either in this form, this will be fixed in the next patch. Signed-off-by: AKASHI Takahiro Cc: "Eric W. Biederman" Acked-by: Dave Young Cc: Vivek Goyal Cc: Baoquan He Acked-by: James Morse --- arch/powerpc/kernel/machine_kexec_file_64.c | 54 ------------------- include/linux/kexec.h | 2 - kernel/kexec_file.c | 60 +++++++++++++++++++-- 3 files changed, 57 insertions(+), 59 deletions(-) -- 2.18.0 diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c index c77e95e9b384..0d20c7ad40fa 100644 --- a/arch/powerpc/kernel/machine_kexec_file_64.c +++ b/arch/powerpc/kernel/machine_kexec_file_64.c @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -46,59 +45,6 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, return kexec_image_probe_default(image, buf, buf_len); } -/** - * arch_kexec_walk_mem - call func(data) for each unreserved memory block - * @kbuf: Context info for the search. Also passed to @func. - * @func: Function to call for each memory block. - * - * This function is used by kexec_add_buffer and kexec_locate_mem_hole - * to find unreserved memory to load kexec segments into. - * - * Return: The memory walk will stop when func returns a non-zero value - * and that value will be returned. If all free regions are visited without - * func returning non-zero, then zero will be returned. - */ -int arch_kexec_walk_mem(struct kexec_buf *kbuf, - int (*func)(struct resource *, void *)) -{ - int ret = 0; - u64 i; - phys_addr_t mstart, mend; - struct resource res = { }; - - if (kbuf->top_down) { - for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0, - &mstart, &mend, NULL) { - /* - * In memblock, end points to the first byte after the - * range while in kexec, end points to the last byte - * in the range. - */ - res.start = mstart; - res.end = mend - 1; - ret = func(&res, kbuf); - if (ret) - break; - } - } else { - for_each_free_mem_range(i, NUMA_NO_NODE, 0, &mstart, &mend, - NULL) { - /* - * In memblock, end points to the first byte after the - * range while in kexec, end points to the last byte - * in the range. - */ - res.start = mstart; - res.end = mend - 1; - ret = func(&res, kbuf); - if (ret) - break; - } - } - - return ret; -} - /** * setup_purgatory - initialize the purgatory's global variables * @image: kexec image. diff --git a/include/linux/kexec.h b/include/linux/kexec.h index f378cb786f1b..d58d1f2fab10 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -192,8 +192,6 @@ int __weak arch_kexec_apply_relocations(struct purgatory_info *pi, const Elf_Shdr *relsec, const Elf_Shdr *symtab); -int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, - int (*func)(struct resource *, void *)); extern int kexec_add_buffer(struct kexec_buf *kbuf); int kexec_locate_mem_hole(struct kexec_buf *kbuf); diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 0fcaa86219d1..370d7eab49fe 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -501,6 +502,55 @@ static int locate_mem_hole_callback(struct resource *res, void *arg) return locate_mem_hole_bottom_up(start, end, kbuf); } +#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK) +static int kexec_walk_memblock(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + int ret = 0; + u64 i; + phys_addr_t mstart, mend; + struct resource res = { }; + + if (kbuf->top_down) { + for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0, + &mstart, &mend, NULL) { + /* + * In memblock, end points to the first byte after the + * range while in kexec, end points to the last byte + * in the range. + */ + res.start = mstart; + res.end = mend - 1; + ret = func(&res, kbuf); + if (ret) + break; + } + } else { + for_each_free_mem_range(i, NUMA_NO_NODE, 0, &mstart, &mend, + NULL) { + /* + * In memblock, end points to the first byte after the + * range while in kexec, end points to the last byte + * in the range. + */ + res.start = mstart; + res.end = mend - 1; + ret = func(&res, kbuf); + if (ret) + break; + } + } + + return ret; +} +#else +static int kexec_walk_memblock(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + return 0; +} +#endif + /** * arch_kexec_walk_mem - call func(data) on free memory regions * @kbuf: Context info for the search. Also passed to @func. @@ -510,8 +560,8 @@ static int locate_mem_hole_callback(struct resource *res, void *arg) * and that value will be returned. If all free regions are visited without * func returning non-zero, then zero will be returned. */ -int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, - int (*func)(struct resource *, void *)) +static int kexec_walk_resources(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) { if (kbuf->image->type == KEXEC_TYPE_CRASH) return walk_iomem_res_desc(crashk_res.desc, @@ -538,7 +588,11 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf) if (kbuf->mem != KEXEC_BUF_MEM_UNKNOWN) return 0; - ret = arch_kexec_walk_mem(kbuf, locate_mem_hole_callback); + if (IS_ENABLED(CONFIG_HAVE_MEMBLOCK) && + !IS_ENABLED(CONFIG_ARCH_DISCARD_MEMBLOCK)) + ret = kexec_walk_memblock(kbuf, locate_mem_hole_callback); + else + ret = kexec_walk_resources(kbuf, locate_mem_hole_callback); return ret == 1 ? 0 : -EADDRNOTAVAIL; }