From patchwork Fri Sep 28 06:48:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 147770 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp371036lji; Thu, 27 Sep 2018 23:48:16 -0700 (PDT) X-Google-Smtp-Source: ACcGV61ju3sm2Oad2P4RJ6rZoMxVjjHDZiNjVPAKU2VUXeq16hHrcHQkPcAjRNGT77d4gLSgderO X-Received: by 2002:a63:a362:: with SMTP id v34-v6mr13705663pgn.261.1538117296265; Thu, 27 Sep 2018 23:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538117296; cv=none; d=google.com; s=arc-20160816; b=MXtQe6KfHdqcdvvsJVBL5fMZD0MdjGA+mz8e99xU16kEKAK5LISyOrOe6SWwrdsdl3 NrSuINww2xcMZ2tAPontn8l3M1xt3pUcguptbT8QmXTAKHvdkLS0kb8PmZqGNuwx1W+a 5todA8u8v8QnGbaKEHserQJ3wcuT41Bm61rYvs+1mBkaGMxBpNtvRmuLNpECAE+g2jDc EzHr5DvOMLYKYhn2XOQnHZHa0jPfz9zNZG4sjRzq1eFcjiQQiuldjWlc8vy2HmKi00mv vuHsNBsdWbn29Y+ujwQGGDJqi3643bPM7sXxXH5d+HfGrV5RnaULzQNx+Quo2sH6dlHx m2iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QZGnKdcuU+QxzJqLLsvEp1lZ/3WCKPgonwBfWd5z9t4=; b=mfhB22p5Sib6hMseUVVPXP8U4U+duggxrxU8UlypPeunfeW4Mxtyux4BYbKecid086 NDDi6HfPgIlB9cM5TgMr+J67wu2GPLODQzITjI+4cdlTwhtOFRGdRLjci/NqkjyMIoWL aqyPyCU3WLAWDDJahObfELbfPJedJkh13wCBcJzqN+/JqUQ1K4Ib9/zt9ti2H1+0Wznm zh51t81XucUVIdYrSkHXfz1fwk79eSRTcatWS0vSE9m/khG68pBsVzvu9grBy9jLGZaX jvwWVftd8rt1RqiuQHJy4HPezKjXZzSO3F33z1C9zcyNIV1su1mZBf/nF4O6rvO4VBJi Nxtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GMRI5rLS; 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 e184-v6si4510234pfa.206.2018.09.27.23.48.16; Thu, 27 Sep 2018 23:48:16 -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=GMRI5rLS; 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 S1729044AbeI1NK2 (ORCPT + 32 others); Fri, 28 Sep 2018 09:10:28 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45715 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726473AbeI1NK2 (ORCPT ); Fri, 28 Sep 2018 09:10:28 -0400 Received: by mail-pg1-f196.google.com with SMTP id t70-v6so3705488pgd.12 for ; Thu, 27 Sep 2018 23:48:14 -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 :mime-version:content-transfer-encoding; bh=QZGnKdcuU+QxzJqLLsvEp1lZ/3WCKPgonwBfWd5z9t4=; b=GMRI5rLStlj7z2WUaq7i+r7ic6z6h9eBlRzw1ReZKo6ppfjuzhpOVMpKl9vprH6VwN 5YcbxBbgpvKbosfXHGoKfpemYdL0BN7elOum100H/l032dciAePfu9SaOGOm3ge+QBUD hOMbaE4k29aNaEyiAz7RgfdHQndFToGVjTWg0= 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:mime-version:content-transfer-encoding; bh=QZGnKdcuU+QxzJqLLsvEp1lZ/3WCKPgonwBfWd5z9t4=; b=nIEhMXOcvboKWLJlkTHPMiLvsWjTJXWsUdjqAISgEz+/VY8uemoK1UmEpa39LUZW2P ul/VyXlDduHynHGe+HiDuZOFye5LQFSeV30IhtCEPqTRlvkVm64EDu7lVpG8D2d8X1wz sKEPxKQSVpgalyq7nLpbtIoh8pXq44z82jbZnA5R96U6kFkIRbe5ejTuAdqzqWS6Yhks KlYgEMhdeDihyZWQ5NbSRyf0PdjZhU+8QC0xi0+yqtrJ6IT0kbQerAWVEo9vbJyEFa/6 Ru0/eO5YvQwUWFsR/nOgRDO7EWsBzDCNcBrgDLGwga8qcMdFgXldpxbu2eu004dcohBV 7tBQ== X-Gm-Message-State: ABuFfojnWTnUJIaL2dJvyxDqPxgfHaaTd0tbl9AgHXba0/KRB073h++0 MUifSeeCWsBIkcfxoghhIjiDCg== X-Received: by 2002:a17:902:5a0f:: with SMTP id q15-v6mr14788388pli.253.1538117293618; Thu, 27 Sep 2018 23:48:13 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id d7-v6sm1761775pfm.23.2018.09.27.23.48.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 23:48:12 -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 v15 04/16] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() Date: Fri, 28 Sep 2018 15:48:29 +0900 Message-Id: <20180928064841.14117-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180928064841.14117-1-takahiro.akashi@linaro.org> References: <20180928064841.14117-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 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.19.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; }