All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: kvm@vger.kernel.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Christian Borntraeger" <borntraeger@de.ibm.com>,
	"Cornelia Huck" <cohuck@redhat.com>,
	"David Hildenbrand" <david@redhat.com>
Subject: [PATCH kvm-unit-tests 6/9] s390x: detect installed memory
Date: Wed, 10 Jan 2018 22:53:45 +0100	[thread overview]
Message-ID: <20180110215348.315-7-david@redhat.com> (raw)
In-Reply-To: <20180110215348.315-1-david@redhat.com>

Unfortunately, there is no easy way to simply read out the amount
of installed memory. We have to probe (via TEST PROTECTION) for installed
memory in a given range.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 lib/s390x/asm/arch_def.h | 12 +++++++++++
 lib/s390x/io.c           |  1 +
 lib/s390x/sclp.c         | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/s390x/sclp.h         |  1 +
 s390x/Makefile           |  1 +
 5 files changed, 67 insertions(+)
 create mode 100644 lib/s390x/sclp.c

diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
index 72e5c60..ae27ab2 100644
--- a/lib/s390x/asm/arch_def.h
+++ b/lib/s390x/asm/arch_def.h
@@ -151,4 +151,16 @@ struct cpuid {
 	uint64_t reserved : 15;
 };
 
+static inline int tprot(unsigned long addr)
+{
+	int cc;
+
+	asm volatile(
+		"	tprot	%1,0\n"
+		"	ipm	%0\n"
+		"	srl	%0,28\n"
+		: "=d" (cc) : "Q" (addr) : "cc");
+	return cc;
+}
+
 #endif
diff --git a/lib/s390x/io.c b/lib/s390x/io.c
index 3121a78..eb4d171 100644
--- a/lib/s390x/io.c
+++ b/lib/s390x/io.c
@@ -43,6 +43,7 @@ void setup()
 	setup_args_progname(ipl_args);
 	setup_facilities();
 	sclp_ascii_setup();
+	sclp_memory_setup();
 }
 
 void exit(int code)
diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c
new file mode 100644
index 0000000..ee56820
--- /dev/null
+++ b/lib/s390x/sclp.c
@@ -0,0 +1,52 @@
+/*
+ * s390x SCLP driver
+ *
+ * Copyright (c) 2017 Red Hat Inc
+ *
+ * Authors:
+ *  David Hildenbrand <david@redhat.com>
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License version 2.
+ */
+
+#include <libcflat.h>
+#include <asm/page.h>
+#include <asm/arch_def.h>
+#include "sclp.h"
+
+static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
+static uint64_t storage_increment_size;
+static uint64_t max_ram_size;
+static uint64_t ram_size;
+
+void sclp_memory_setup(void)
+{
+	ReadInfo *ri = (void *)_sccb;
+	uint64_t rnmax, rnsize;
+
+	ri->h.length = SCCB_SIZE;
+	sclp_service_call(SCLP_CMDW_READ_SCP_INFO_FORCED, ri);
+
+	/* calculate the storage increment size */
+	rnsize = ri->rnsize;
+	if (!rnsize) {
+		rnsize = ri->rnsize2;
+	}
+	storage_increment_size = rnsize << 20;
+
+	/* calculate the maximum memory size */
+	rnmax = ri->rnmax;
+	if (!rnmax) {
+		rnmax = ri->rnmax2;
+	}
+	max_ram_size = rnmax * storage_increment_size;
+
+	/* lowcore is always accessible, so the first increment is accessible */
+	ram_size = storage_increment_size;
+
+	/* probe for r/w memory up to max memory size */
+	while (ram_size < max_ram_size &&
+	       tprot(ram_size + storage_increment_size - 1))
+		ram_size += storage_increment_size;
+}
diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h
index ec9dcb1..94ff74b 100644
--- a/lib/s390x/sclp.h
+++ b/lib/s390x/sclp.h
@@ -210,5 +210,6 @@ typedef struct ReadEventData {
 void sclp_ascii_setup(void);
 void sclp_print(const char *str);
 int sclp_service_call(unsigned int command, void *sccb);
+void sclp_memory_setup(void);
 
 #endif /* SCLP_H */
diff --git a/s390x/Makefile b/s390x/Makefile
index f585faf..ce63dd1 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -24,6 +24,7 @@ cflatobjs += lib/util.o
 cflatobjs += lib/alloc_phys.o
 cflatobjs += lib/s390x/io.o
 cflatobjs += lib/s390x/stack.o
+cflatobjs += lib/s390x/sclp.o
 cflatobjs += lib/s390x/sclp-ascii.o
 cflatobjs += lib/s390x/interrupt.o
 
-- 
2.14.3

  parent reply	other threads:[~2018-01-10 21:54 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-10 21:53 [PATCH kvm-unit-tests 0/9] s390x: vmalloc support David Hildenbrand
2018-01-10 21:53 ` [PATCH kvm-unit-tests 1/9] s390x: fix TEST BLOCK tests David Hildenbrand
2018-01-11  8:51   ` Thomas Huth
2018-01-11 15:56     ` Christian Borntraeger
2018-01-11 16:00       ` David Hildenbrand
2018-01-11 17:54         ` Andreas Krebbel
2018-01-11 19:11           ` David Hildenbrand
2018-01-11 20:33             ` Andreas Krebbel
2018-01-10 21:53 ` [PATCH kvm-unit-tests 2/9] s390x: use highest addresses for PGM_ADDRESSING errors David Hildenbrand
2018-01-11  8:57   ` Thomas Huth
2018-01-12  9:55     ` David Hildenbrand
2018-01-10 21:53 ` [PATCH kvm-unit-tests 3/9] s390x: increase the stack size David Hildenbrand
2018-01-11  9:19   ` Thomas Huth
2018-01-12  9:58     ` David Hildenbrand
2018-01-10 21:53 ` [PATCH kvm-unit-tests 4/9] s390x: add missing sclp definitions from QEMU David Hildenbrand
2018-01-11  9:31   ` Thomas Huth
2018-01-12 10:00     ` David Hildenbrand
2018-01-10 21:53 ` [PATCH kvm-unit-tests 5/9] s390x: rename sclp_setup() to sclp_ascii_setup() David Hildenbrand
2018-01-11  9:35   ` Thomas Huth
2018-01-10 21:53 ` David Hildenbrand [this message]
2018-01-11 10:23   ` [PATCH kvm-unit-tests 6/9] s390x: detect installed memory Thomas Huth
2018-01-12 10:06     ` David Hildenbrand
2018-01-11 20:54   ` David Hildenbrand
2018-01-10 21:53 ` [PATCH kvm-unit-tests 7/9] s390x: initialize the physical allocator David Hildenbrand
2018-01-11 10:29   ` Thomas Huth
2018-01-11 14:00     ` Paolo Bonzini
2018-01-11 15:16       ` Thomas Huth
2018-01-11 15:49         ` Paolo Bonzini
2018-01-11 21:08           ` David Hildenbrand
2018-01-10 21:53 ` [PATCH kvm-unit-tests 8/9] s390x: add vmalloc support David Hildenbrand
2018-01-11 11:51   ` Thomas Huth
2018-01-11 12:07     ` David Hildenbrand
2018-01-11 12:24       ` Thomas Huth
2018-01-11 14:03         ` Paolo Bonzini
2018-01-11 14:02       ` Paolo Bonzini
2018-01-11 20:08         ` David Hildenbrand
2018-01-11 14:01   ` Paolo Bonzini
2018-01-12 14:07     ` David Hildenbrand
2018-01-12 14:15     ` David Hildenbrand
2018-01-12 10:10   ` Paolo Bonzini
2018-01-12 10:33     ` David Hildenbrand
2018-01-12 12:17       ` Andrew Jones
2018-01-12 12:18         ` Paolo Bonzini
2018-01-10 21:53 ` [PATCH kvm-unit-tests 9/9] s390x: add test for (v)malloc David Hildenbrand
2018-01-11 12:09   ` Thomas Huth
2018-01-11 12:13     ` David Hildenbrand
2018-01-11 10:43 ` [PATCH kvm-unit-tests 0/9] s390x: vmalloc support Paolo Bonzini
2018-01-11 20:30   ` David Hildenbrand

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=20180110215348.315-7-david@redhat.com \
    --to=david@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.com \
    --cc=thuth@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.