From patchwork Sat Jun 23 02:20: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: 10483437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6B07D60388 for ; Sat, 23 Jun 2018 02:25:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57BDA29067 for ; Sat, 23 Jun 2018 02:25:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49B6229076; Sat, 23 Jun 2018 02:25:52 +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 autolearn=unavailable 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 D297B29067 for ; Sat, 23 Jun 2018 02:25:51 +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=I8tq0wW/2d3wT/y9IV8Snor5w/0/HfGL+qcIbcFydJU=; b=r6WajJalUSF2jRtDNMQyeBl4Ko lv4Kzz1rf+wooiNRf0ON+xhic89wJZWRUOizUecNyAB8bEX8NTV+oE4z+1FnuqYrpOvvpwl5PPgui F8lVYc3iWDG5Uys8CkfJHiTVWQsC51dsZkxkaAix1xj06ISWTf4TZTwvZaVJlWuyDZ9ifrZQDU6Rk 2xVBYA8G8V6st6st3o0mB/P/HuyoTd1ah/2dDgnM6TGLi4gbox5dRrZf5BM/R9UL2RNqStPhrOXOK oBwLldvvgHc47k9jYPFYv0kBzmzzYYEGiCKcqg4sQO8S51u1Pw7oIIMiZqRV0SG9TzlUtSaEjxddJ oLM0Q8Jg==; 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 1fWYFA-00077i-Gn; Sat, 23 Jun 2018 02:25:40 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWYAj-0003Er-1d for linux-arm-kernel@lists.infradead.org; Sat, 23 Jun 2018 02:21:20 +0000 Received: by mail-pf0-x244.google.com with SMTP id w7-v6so3995133pfn.9 for ; Fri, 22 Jun 2018 19:20:54 -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=Ud5nvphvoW/NQdtNnrXCOa4yIIIYmgsYS/42liQ8pyI=; b=GpvK8BfYV/Y6hC58cz/x4l54QUgma8GnXGmM9l+ltwtLH8XQZBULAhfutql2zlZ8ob nam+DgHqkDzs9/ydCS6rdF5oouTRSV0YciQCjPZny3+UmnDwQljDnzEUSTjqQS4mAqCz a01qFgP1JINQyQJrWtNaYeJ/96n8m8XEZODjk= 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=Ud5nvphvoW/NQdtNnrXCOa4yIIIYmgsYS/42liQ8pyI=; b=DQ6bimwZwvf1QxxdhJLhXFhpGiuOPwHsoereWqsP+mjkiRmjOVhCmy5pnZ5wVXIggX lZ3c56kGZpQpp0zsQrVIt+v3McklXGftMukJj+K1xL7n8GQWemnJbIzDoBrB/pA3OTrv DhjzPXQsorgcGKBCOBclU2cDBcmU3gQM5W20Unj8708F6zYXathIKPzHRE0KIxp8xbn3 Cso1dFMEoC0sebveeveDXhIo09rBlMa+AbI8NOf2q/r72fvjLmzl1MQALqehNr+fBne/ f5aJFfYeeJKLpmg+L7bwP6LqtxrRjNWJjziQwJ62qcz+/zUbhTgdQ+4BfGToOPUiOOk8 4lGQ== X-Gm-Message-State: APt69E26a65PXws3+s5J0hyvub+VxCnqgZxatBgHkaTeDZKgCs6BQ50T SnNC9DDll9uNgJaM1qpbu8SDtw== X-Google-Smtp-Source: ADUXVKICHciX9Tt/2OOU2PwVTfRv+aeJSYPhV81QWp04EzyzrqAu/ONHNPMHwlJ+srEWCBMEQBmyCg== X-Received: by 2002:aa7:8058:: with SMTP id y24-v6mr4086982pfm.148.1529720454630; Fri, 22 Jun 2018 19:20:54 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id m5-v6sm32427449pfa.93.2018.06.22.19.20.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 19:20:54 -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 Subject: [PATCH v10 03/14] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() Date: Sat, 23 Jun 2018 11:20:47 +0900 Message-Id: <20180623022058.10935-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180623022058.10935-1-takahiro.akashi@linaro.org> References: <20180623022058.10935-1-takahiro.akashi@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180622_192105_286038_E189B9A4 X-CRM114-Status: GOOD ( 16.11 ) 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, AKASHI Takahiro , james.morse@arm.com, "Eric W. Biederman" , 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 Memblock list is another source for usable system memory layout. A merged new arch_kexec_walk_mem() will walk through either io resource list or memblock list depending on CONFIG_ARCH_DISCARD_MEMBLOCK so that arm64, in addition to powerpc, will be able to utilize this generic function for kexec_file. 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 | 53 --------------------- kernel/kexec_file.c | 52 ++++++++++++++++++++ 2 files changed, 52 insertions(+), 53 deletions(-) diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c index 0bd23dc789a4..3d4be91786ce 100644 --- a/arch/powerpc/kernel/machine_kexec_file_64.c +++ b/arch/powerpc/kernel/machine_kexec_file_64.c @@ -46,59 +46,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/kernel/kexec_file.c b/kernel/kexec_file.c index 63c7ce1c0c3e..563acd1c9a61 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,53 @@ 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 *)) +{ + u64 i; + phys_addr_t mstart, mend; + struct resource res = { }; + int ret = 0; + + if (kbuf->image->type == KEXEC_TYPE_CRASH) + return func(&crashk_res, kbuf); + + /* + * In memblock, end points to the first byte after the + * range while in kexec, end points to the last byte + * in the range. + */ + if (kbuf->top_down) { + for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0, + &mstart, &mend, NULL) { + 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) { + 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. @@ -513,6 +561,10 @@ static int locate_mem_hole_callback(struct resource *res, void *arg) int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(struct resource *, void *)) { + if (IS_ENABLED(CONFIG_HAVE_MEMBLOCK) && + !IS_ENABLED(CONFIG_ARCH_DISCARD_MEMBLOCK)) + return kexec_walk_memblock(kbuf, func); + if (kbuf->image->type == KEXEC_TYPE_CRASH) return walk_iomem_res_desc(crashk_res.desc, IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY,