From patchwork Tue Jul 24 06:57:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 142690 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp6918196ljj; Mon, 23 Jul 2018 23:57:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeMzB9sHQaXnOcDe9SFfRfkoeiL7KdLSs5oWEhQBx1TppDU6baNI/aN0m5EvASKcwj1OCoS X-Received: by 2002:a65:64d7:: with SMTP id t23-v6mr15405846pgv.207.1532415463341; Mon, 23 Jul 2018 23:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532415463; cv=none; d=google.com; s=arc-20160816; b=snk5UkNlW42HHTby7tvwSLntO+H/zTUyiTuPbkyNFHOIJ9lHqg/Ltg2v0rYPJ5AkGr 3oozdLDenRZu5gNQszcLYRjhwQiutkgvdYUIkI/l0U63qzi4XOyDgj+lbDNQ0/f49Edf fP7r9RsFrroGApE5O1TnBR/7Nh0kXNS9F0b/9KrVq9vrxAaD7gg8xdLbIroBfyhIyeLk YQosetTfChccYne7j3TwUZyWuxx7MCVU7WjpvS+dbfvDeHd29hijkufpgSC2CWb3P2Iq 1aYOF/iH+fxQTfyFKlczqXVZDC+ZUYH+qVBpf77+AHmExyfrMxhoprsJ5/7L0MO7OZur 9nxg== 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=n4HcoP+WTvAeoAsFm19FwxSxHpLoU20/JAibgnpWWF0=; b=qNMJPe8I3gd7Nv/NqZnxuxcVbP4aLazBAQbxzAycsUD+JeihluNerGNVWZ0WD6EnbL uiMqTDuZUvD4IUUqcGJoa4XyPNBZpWrIHPFB8LMKPjVDnOrt6xSFOnQhiLn5r/haL+lW V/E1BYnZPwXreosVMjzIQsCwFmh5duRfUvByXGjNLu7iFsqJ4cZB5ZRr/u5M4VnAcUcj rNvoOfLDax1VHtPZep49s4FQhGpZ+FyredPQ+qIVMl0h0dKqY16//WNdccAn33fTH2iS ghr4gO/4fLdwsIh6oSYo2tzU17+ZO0l6btuQtlhGuE/y6yWlvjq33cwoA0Eh0Q9CAidC zrXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Wryl1us2; 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 v32-v6si10142418plb.273.2018.07.23.23.57.43; Mon, 23 Jul 2018 23:57:43 -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=Wryl1us2; 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 S2388470AbeGXICh (ORCPT + 31 others); Tue, 24 Jul 2018 04:02:37 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44379 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388274AbeGXICh (ORCPT ); Tue, 24 Jul 2018 04:02:37 -0400 Received: by mail-pl0-f67.google.com with SMTP id m16-v6so1323877pls.11 for ; Mon, 23 Jul 2018 23:57:39 -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=n4HcoP+WTvAeoAsFm19FwxSxHpLoU20/JAibgnpWWF0=; b=Wryl1us2gO6DrmNmMtIVXaVWLAGWibT0SJZxo5ygw9YEyEXizgGaX/hljMl37iwOxL O9fQo9u5/A8HDRUbRPleQc50NZxrE901vGIOJT7LTwof20aDo1HBDWb+BAxzXeT/e2YC +iwCjOzQGUwiEKvwOzW1iq4kUFe9chIOTcI9I= 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=n4HcoP+WTvAeoAsFm19FwxSxHpLoU20/JAibgnpWWF0=; b=OgDmMIytfKuDeggDLVHgLIKpUO/iEiHE+2dsK02SnK8aUQStTTADW/KfxwjUejpVGD /ag3t4ewDXBjplZvndvn+dURh7BdtIWdKAyLC+2d4wWP0stYTJ7KhZhGbtaLcpqvnmJS 5lboR8GiFbal9RTJutHX72CwZL1IfsfnMD6wzcSz+cSH7hWRVxU3RdBMY7BP+/1jyM8w VzobS3AsfM5TSGlUy+L+fl27MEOoKGKDo4YCyHEvXgtv0Cg+31Wv1rwcZ5+bti4IF976 MfeqQNNFKlnJuRoUvhLaR6/S2KeHmC0iR0yj5MFhcjnWhntzgYSnwvm5cS2Q3xMVRFXt Pbxg== X-Gm-Message-State: AOUpUlGZMlur/jZdq/bv33QTfoeywKgYN6Gik7y/PBX6ZVnoco1X3XWR T3WGl5wsKbbe4N3WTYbZLYpKEg== X-Received: by 2002:a17:902:e3:: with SMTP id a90-v6mr16099122pla.227.1532415459458; Mon, 23 Jul 2018 23:57:39 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 14-v6sm17684945pft.93.2018.07.23.23.57.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 23:57:38 -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: 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 v12 04/16] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() Date: Tue, 24 Jul 2018 15:57:47 +0900 Message-Id: <20180724065759.19186-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724065759.19186-1-takahiro.akashi@linaro.org> References: <20180724065759.19186-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(). kexec_walk_memblock() will not work for kdump in this form, this will be fixed in the next patch. Signed-off-by: AKASHI Takahiro Cc: "Eric W. Biederman" Cc: 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 | 58 ++++++++++++++++++++- 3 files changed, 56 insertions(+), 58 deletions(-) -- 2.18.0 Acked-by: Dave Young diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c index 0bd23dc789a4..5357b09902c5 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 49ab758f4d91..c196bfd11bee 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -184,8 +184,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 bf39df5e5bb9..2f0691b0f8ad 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,7 +560,7 @@ 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, +static int arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(struct resource *, void *)) { if (kbuf->image->type == KEXEC_TYPE_CRASH) @@ -538,7 +588,11 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf) if (kbuf->mem) 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 = arch_kexec_walk_mem(kbuf, locate_mem_hole_callback); return ret == 1 ? 0 : -EADDRNOTAVAIL; }