From: David Gibson <david@gibson.dropbear.id.au>
To: benh@kernel.crashing.org, aik@ozlabs.ru, agraf@suse.de
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCHv2 4/7] pseries: Add helper to calculate recommended hash page table size
Date: Tue, 9 Feb 2016 12:12:23 +1000 [thread overview]
Message-ID: <1454983946-32073-5-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1454983946-32073-1-git-send-email-david@gibson.dropbear.id.au>
At present we calculate the recommended hash page table (HPT) size for a
pseries guest just once in ppc_spapr_init() before allocating the HPT.
In future patches we're going to want this calculation in other places, so
this splits it out into a helper function. While we're at it, change the
calculation to use ctz() instead of an explicit loop.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
hw/ppc/spapr.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c315715..2a81e8f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1050,6 +1050,19 @@ static void close_htab_fd(sPAPRMachineState *spapr)
spapr->htab_fd = -1;
}
+static int spapr_hpt_shift_for_ramsize(uint64_t ramsize)
+{
+ int shift;
+
+ /* We aim for a hash table of size 1/128 the size of RAM (rounded
+ * up). The PAPR recommendation is actually 1/64 of RAM size, but
+ * that's much more than is needed for Linux guests */
+ shift = ctz64(pow2ceil(ramsize)) - 7;
+ shift = MAX(shift, 18); /* Minimum architected size */
+ shift = MIN(shift, 46); /* Maximum architected size */
+ return shift;
+}
+
static void spapr_alloc_htab(sPAPRMachineState *spapr)
{
long shift;
@@ -1790,16 +1803,7 @@ static void ppc_spapr_init(MachineState *machine)
/* Setup a load limit for the ramdisk leaving room for SLOF and FDT */
load_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD;
- /* We aim for a hash table of size 1/128 the size of RAM. The
- * normal rule of thumb is 1/64 the size of RAM, but that's much
- * more than needed for the Linux guests we support. */
- spapr->htab_shift = 18; /* Minimum architected size */
- while (spapr->htab_shift <= 46) {
- if ((1ULL << (spapr->htab_shift + 7)) >= machine->maxram_size) {
- break;
- }
- spapr->htab_shift++;
- }
+ spapr->htab_shift = spapr_hpt_shift_for_ramsize(machine->maxram_size);
spapr_alloc_htab(spapr);
/* Set up Interrupt Controller before we create the VCPUs */
--
2.5.0
next prev parent reply other threads:[~2016-02-09 2:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 2:12 [Qemu-devel] [PATCHv2 0/7] Cleanups to Hash Page Table handling David Gibson
2016-02-09 2:12 ` [Qemu-devel] [PATCHv2 1/7] target-ppc: Remove unused kvmppc_update_sdr1() stub David Gibson
2016-02-09 2:12 ` [Qemu-devel] [PATCHv2 2/7] target-ppc: Include missing MMU models for SDR1 in info registers David Gibson
2016-02-09 2:12 ` [Qemu-devel] [PATCHv2 3/7] pseries: Simplify handling of the hash page table fd David Gibson
2016-02-09 2:12 ` David Gibson [this message]
2016-02-09 2:12 ` [Qemu-devel] [PATCHv2 5/7] pseries: Move hash page table allocation to reset time David Gibson
2016-02-09 2:59 ` Alexey Kardashevskiy
2016-02-09 2:12 ` [Qemu-devel] [PATCHv2 6/7] target-ppc: Remove hack for ppc_hash64_load_hpte*() with HV KVM David Gibson
2016-02-09 2:12 ` [Qemu-devel] [PATCHv2 7/7] target-ppc: Add helpers for updating a CPU's SDR1 and external HPT David Gibson
2016-02-11 0:51 ` [Qemu-devel] [PATCHv2 0/7] Cleanups to Hash Page Table handling David Gibson
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=1454983946-32073-5-git-send-email-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=benh@kernel.crashing.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.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;
as well as URLs for NNTP newsgroup(s).