From: Mike Rapoport <rppt@kernel.org>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH 01/15] KVM: PPC: Book3S HV: simplify kvm_cma_reserve()
Date: Tue, 28 Jul 2020 05:12:25 -0000 [thread overview]
Message-ID: <20200728051153.1590-2-rppt@kernel.org> (raw)
In-Reply-To: <20200728051153.1590-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
The memory size calculation in kvm_cma_reserve() traverses memblock.memory
rather than simply call memblock_phys_mem_size(). The comment in that
function suggests that at some point there should have been call to
memblock_analyze() before memblock_phys_mem_size() could be used.
As of now, there is no memblock_analyze() at all and
memblock_phys_mem_size() can be used as soon as cold-plug memory is
registerd with memblock.
Replace loop over memblock.memory with a call to memblock_phys_mem_size().
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/powerpc/kvm/book3s_hv_builtin.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index 7cd3cf3d366b..56ab0d28de2a 100644
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -95,22 +95,15 @@ EXPORT_SYMBOL_GPL(kvm_free_hpt_cma);
void __init kvm_cma_reserve(void)
{
unsigned long align_size;
- struct memblock_region *reg;
- phys_addr_t selected_size = 0;
+ phys_addr_t selected_size;
/*
* We need CMA reservation only when we are in HV mode
*/
if (!cpu_has_feature(CPU_FTR_HVMODE))
return;
- /*
- * We cannot use memblock_phys_mem_size() here, because
- * memblock_analyze() has not been called yet.
- */
- for_each_memblock(memory, reg)
- selected_size += memblock_region_memory_end_pfn(reg) -
- memblock_region_memory_base_pfn(reg);
+ selected_size = PHYS_PFN(memblock_phys_mem_size());
selected_size = (selected_size * kvm_cma_resv_ratio / 100) << PAGE_SHIFT;
if (selected_size) {
pr_debug("%s: reserving %ld MiB for global area\n", __func__,
--
2.26.2
next prev parent reply other threads:[~2020-07-28 5:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 5:12 [OpenRISC] [PATCH 00/15] memblock: seasonal cleaning^w cleanup Mike Rapoport
2020-07-28 5:12 ` Mike Rapoport [this message]
2020-07-28 5:12 ` [OpenRISC] [PATCH 02/15] dma-contiguous: simplify cma_early_percent_memory() Mike Rapoport
2020-07-28 6:37 ` Christoph Hellwig
2020-07-28 5:12 ` [OpenRISC] [PATCH 03/15] arm, xtensa: simplify initialization of high memory pages Mike Rapoport
2020-07-28 8:09 ` Max Filippov
2020-07-28 5:12 ` [OpenRISC] [PATCH 04/15] arm64: numa: simplify dummy_numa_init() Mike Rapoport
2020-07-29 8:31 ` Jonathan Cameron
2020-07-30 12:04 ` Catalin Marinas
2020-07-28 5:13 ` [OpenRISC] [PATCH 05/15] h8300, nds32, openrisc: simplify detection of memory extents Mike Rapoport
2020-07-29 11:42 ` Stafford Horne
2020-07-28 5:13 ` [OpenRISC] [PATCH 06/15] powerpc: fadamp: simplify fadump_reserve_crash_area() Mike Rapoport
2020-07-30 12:15 ` Michael Ellerman
2020-08-01 10:19 ` Mike Rapoport
2020-08-01 10:54 ` Hari Bathini
2020-08-02 13:14 ` Michael Ellerman
2020-07-28 5:13 ` [OpenRISC] [PATCH 07/15] riscv: drop unneeded node initialization Mike Rapoport
2020-07-28 5:13 ` [OpenRISC] [PATCH 08/15] mircoblaze: drop unneeded NUMA and sparsemem initializations Mike Rapoport
2020-07-28 5:13 ` [OpenRISC] [PATCH 09/15] memblock: make for_each_memblock_type() iterator private Mike Rapoport
2020-07-30 1:52 ` Baoquan He
2020-07-28 5:13 ` [OpenRISC] [PATCH 10/15] memblock: make memblock_debug and related functionality private Mike Rapoport
2020-07-30 1:54 ` Baoquan He
2020-07-28 5:14 ` [OpenRISC] [PATCH 11/15] memblock: reduce number of parameters in for_each_mem_range() Mike Rapoport
2020-07-30 2:22 ` Baoquan He
2020-07-28 5:14 ` [OpenRISC] [PATCH 12/15] arch, mm: replace for_each_memblock() with for_each_mem_pfn_range() Mike Rapoport
2020-07-28 5:14 ` [OpenRISC] [PATCH 13/15] arch, drivers: replace for_each_membock() with for_each_mem_range() Mike Rapoport
2020-07-28 15:03 ` Emil Renner Berthing
2020-07-28 5:14 ` [OpenRISC] [PATCH 14/15] x86/numa: remove redundant iteration over memblock.reserved Mike Rapoport
2020-07-28 10:44 ` Ingo Molnar
2020-07-28 10:56 ` Mike Rapoport
2020-07-28 11:31 ` Ingo Molnar
2020-07-28 11:03 ` Baoquan He
2020-07-28 14:15 ` Mike Rapoport
2020-07-28 14:24 ` Baoquan He
2020-07-28 5:14 ` [OpenRISC] [PATCH 15/15] memblock: remove 'type' parameter from for_each_memblock() Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728051153.1590-2-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=openrisc@lists.librecores.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox