* [Qemu-devel] s390x: fix memory detection for guests > 64GB
@ 2011-05-10 12:49 Christian Borntraeger
2011-05-11 22:36 ` Alexander Graf
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2011-05-10 12:49 UTC (permalink / raw)
To: Alexander Graf; +Cc: Carsten Otte, qemu-devel@nongnu.org
Alex,
the s390 memory detection has a 16bit field that specifies the amount of
increments. This patch adopts the memory size to always fit into that
scheme. This also fixes virtio detection for these guests, since the
descriptor page is located after the main memory.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -2361,6 +2361,7 @@ static void ext_interrupt(CPUState *env, int type, uint32_t param,
int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
{
int r = 0;
+ int shift = 0;
#ifdef DEBUG_HELPER
printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);
@@ -2375,8 +2376,10 @@ int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
switch(code) {
case SCLP_CMDW_READ_SCP_INFO:
case SCLP_CMDW_READ_SCP_INFO_FORCED:
- stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20);
- stb_phys(sccb + SCP_INCREMENT, 1);
+ while ((ram_size >> (20 + shift)) > 65535)
+ shift++;
+ stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift));
+ stb_phys(sccb + SCP_INCREMENT, 1 << shift);
stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);
if (kvm_enabled()) {
diff --git a/vl.c b/vl.c
index 68c3b53..7b4adff 100644
--- a/vl.c
+++ b/vl.c
@@ -2962,6 +2962,16 @@ int main(int argc, char **argv, char **envp)
if (ram_size == 0)
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
+ /* s390x ram size detection needs a 16bit multiplier + an increment. So
+ guests > 64GB can be specified in 2MB steps etc */
+ if (strstr(machine->name, "s390")) {
+ int shift = 0;
+
+ while ((ram_size >> (20 + shift)) > 65535)
+ shift++;
+ ram_size = ram_size >> (20 + shift) << (20 + shift);
+ }
+
/* init the dynamic translator */
cpu_exec_init_all(tb_size * 1024 * 1024);
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Qemu-devel] s390x: fix memory detection for guests > 64GB
2011-05-10 12:49 [Qemu-devel] s390x: fix memory detection for guests > 64GB Christian Borntraeger
@ 2011-05-11 22:36 ` Alexander Graf
2011-05-12 7:50 ` [Qemu-devel] [PatchV2] " Christian Borntraeger
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Graf @ 2011-05-11 22:36 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Carsten Otte, qemu-devel@nongnu.org
On 10.05.2011, at 14:49, Christian Borntraeger wrote:
> Alex,
>
> the s390 memory detection has a 16bit field that specifies the amount of
> increments. This patch adopts the memory size to always fit into that
> scheme. This also fixes virtio detection for these guests, since the
> descriptor page is located after the main memory.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>
> --- a/target-s390x/op_helper.c
> +++ b/target-s390x/op_helper.c
> @@ -2361,6 +2361,7 @@ static void ext_interrupt(CPUState *env, int type, uint32_t param,
> int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
> {
> int r = 0;
> + int shift = 0;
>
> #ifdef DEBUG_HELPER
> printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);
> @@ -2375,8 +2376,10 @@ int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
> switch(code) {
> case SCLP_CMDW_READ_SCP_INFO:
> case SCLP_CMDW_READ_SCP_INFO_FORCED:
> - stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20);
> - stb_phys(sccb + SCP_INCREMENT, 1);
> + while ((ram_size >> (20 + shift)) > 65535)
> + shift++;
Please run scripts/checkpatch.pl on your patch.
Alex
^ permalink raw reply [flat|nested] 9+ messages in thread* [Qemu-devel] [PatchV2] s390x: fix memory detection for guests > 64GB
2011-05-11 22:36 ` Alexander Graf
@ 2011-05-12 7:50 ` Christian Borntraeger
2011-05-12 7:55 ` Alexander Graf
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2011-05-12 7:50 UTC (permalink / raw)
To: Alexander Graf; +Cc: Carsten Otte, qemu-devel@nongnu.org
the s390 memory detection has a 16bit field that specifies the amount of
increments. This patch adopts the memory size to always fit into that
scheme. This also fixes virtio detection for these guests, since the
descriptor page is located after the main memory.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
target-s390x/op_helper.c | 8 ++++++--
vl.c | 11 +++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
Index: b/target-s390x/op_helper.c
===================================================================
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -2361,6 +2361,7 @@ static void ext_interrupt(CPUState *env,
int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
{
int r = 0;
+ int shift = 0;
#ifdef DEBUG_HELPER
printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);
@@ -2375,8 +2376,11 @@ int sclp_service_call(CPUState *env, uin
switch(code) {
case SCLP_CMDW_READ_SCP_INFO:
case SCLP_CMDW_READ_SCP_INFO_FORCED:
- stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20);
- stb_phys(sccb + SCP_INCREMENT, 1);
+ while ((ram_size >> (20 + shift)) > 65535) {
+ shift++;
+ }
+ stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift));
+ stb_phys(sccb + SCP_INCREMENT, 1 << shift);
stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);
if (kvm_enabled()) {
Index: b/vl.c
===================================================================
--- a/vl.c
+++ b/vl.c
@@ -2962,6 +2962,17 @@ int main(int argc, char **argv, char **e
if (ram_size == 0)
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
+ /* s390x ram size detection needs a 16bit multiplier + an increment. So
+ guests > 64GB can be specified in 2MB steps etc */
+ if (strstr(machine->name, "s390")) {
+ int shift = 0;
+
+ while ((ram_size >> (20 + shift)) > 65535) {
+ shift++;
+ }
+ ram_size = ram_size >> (20 + shift) << (20 + shift);
+ }
+
/* init the dynamic translator */
cpu_exec_init_all(tb_size * 1024 * 1024);
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PatchV2] s390x: fix memory detection for guests > 64GB
2011-05-12 7:50 ` [Qemu-devel] [PatchV2] " Christian Borntraeger
@ 2011-05-12 7:55 ` Alexander Graf
2011-05-12 7:59 ` Christian Borntraeger
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Graf @ 2011-05-12 7:55 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Carsten Otte, qemu-devel@nongnu.org
On 12.05.2011, at 09:50, Christian Borntraeger wrote:
> the s390 memory detection has a 16bit field that specifies the amount of
> increments. This patch adopts the memory size to always fit into that
> scheme. This also fixes virtio detection for these guests, since the
> descriptor page is located after the main memory.
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
>
> ---
> target-s390x/op_helper.c | 8 ++++++--
> vl.c | 11 +++++++++++
> 2 files changed, 17 insertions(+), 2 deletions(-)
>
> Index: b/target-s390x/op_helper.c
> ===================================================================
> --- a/target-s390x/op_helper.c
> +++ b/target-s390x/op_helper.c
> @@ -2361,6 +2361,7 @@ static void ext_interrupt(CPUState *env,
> int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
> {
> int r = 0;
> + int shift = 0;
>
> #ifdef DEBUG_HELPER
> printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);
> @@ -2375,8 +2376,11 @@ int sclp_service_call(CPUState *env, uin
> switch(code) {
> case SCLP_CMDW_READ_SCP_INFO:
> case SCLP_CMDW_READ_SCP_INFO_FORCED:
> - stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20);
> - stb_phys(sccb + SCP_INCREMENT, 1);
> + while ((ram_size >> (20 + shift)) > 65535) {
> + shift++;
> + }
> + stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift));
> + stb_phys(sccb + SCP_INCREMENT, 1 << shift);
> stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);
>
> if (kvm_enabled()) {
> Index: b/vl.c
> ===================================================================
> --- a/vl.c
> +++ b/vl.c
> @@ -2962,6 +2962,17 @@ int main(int argc, char **argv, char **e
> if (ram_size == 0)
> ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
>
> + /* s390x ram size detection needs a 16bit multiplier + an increment. So
> + guests > 64GB can be specified in 2MB steps etc */
> + if (strstr(machine->name, "s390")) {
> + int shift = 0;
> +
> + while ((ram_size >> (20 + shift)) > 65535) {
> + shift++;
> + }
> + ram_size = ram_size >> (20 + shift) << (20 + shift);
This one really belongs to hw/s390-virtio.c. Just move the same code to s390_init there and it should work out. The less hacks we can have in generic code, the better :).
Alex
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PatchV2] s390x: fix memory detection for guests > 64GB
2011-05-12 7:55 ` Alexander Graf
@ 2011-05-12 7:59 ` Christian Borntraeger
2011-05-12 8:01 ` Alexander Graf
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2011-05-12 7:59 UTC (permalink / raw)
To: Alexander Graf; +Cc: Carsten Otte, qemu-devel@nongnu.org
On 12/05/11 09:55, Alexander Graf wrote:
>> + /* s390x ram size detection needs a 16bit multiplier + an increment. So
>> + guests > 64GB can be specified in 2MB steps etc */
>> + if (strstr(machine->name, "s390")) {
>> + int shift = 0;
>> +
>> + while ((ram_size >> (20 + shift)) > 65535) {
>> + shift++;
>> + }
>> + ram_size = ram_size >> (20 + shift) << (20 + shift);
>
> This one really belongs to hw/s390-virtio.c. Just move the same code to s390_init there and it should work out. The less hacks we can have in generic code, the better :).
Unfortunately this does not work. The slcp op helper uses the global variable
ram_size fro vl.c. I could change the global ram_size in s390_init, but this
is also pretty ugly.
Christian
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PatchV2] s390x: fix memory detection for guests > 64GB
2011-05-12 7:59 ` Christian Borntraeger
@ 2011-05-12 8:01 ` Alexander Graf
2011-05-12 8:50 ` [Qemu-devel] [PatchV3] " Christian Borntraeger
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Graf @ 2011-05-12 8:01 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Carsten Otte, qemu-devel@nongnu.org
On 12.05.2011, at 09:59, Christian Borntraeger wrote:
> On 12/05/11 09:55, Alexander Graf wrote:
>>> + /* s390x ram size detection needs a 16bit multiplier + an increment. So
>>> + guests > 64GB can be specified in 2MB steps etc */
>>> + if (strstr(machine->name, "s390")) {
>>> + int shift = 0;
>>> +
>>> + while ((ram_size >> (20 + shift)) > 65535) {
>>> + shift++;
>>> + }
>>> + ram_size = ram_size >> (20 + shift) << (20 + shift);
>>
>> This one really belongs to hw/s390-virtio.c. Just move the same code to s390_init there and it should work out. The less hacks we can have in generic code, the better :).
>
> Unfortunately this does not work. The slcp op helper uses the global variable
> ram_size fro vl.c. I could change the global ram_size in s390_init, but this
> is also pretty ugly.
I'd definitely prefer that over the change on vl.c :)
Alex
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PatchV3] s390x: fix memory detection for guests > 64GB
2011-05-12 8:01 ` Alexander Graf
@ 2011-05-12 8:50 ` Christian Borntraeger
2011-05-17 13:16 ` Alexander Graf
0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2011-05-12 8:50 UTC (permalink / raw)
To: Alexander Graf; +Cc: Carsten Otte, qemu-devel@nongnu.org
> I'd definitely prefer that over the change on vl.c :)
the s390 memory detection has a 16bit field that specifies the amount of
increments. This patch adopts the memory size to always fit into that
scheme. This also fixes virtio detection for these guests, since the
descriptor page is located after the main memory.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
hw/s390-virtio.c | 20 +++++++++++++++-----
target-s390x/op_helper.c | 8 ++++++--
2 files changed, 21 insertions(+), 7 deletions(-)
Index: b/hw/s390-virtio.c
===================================================================
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -133,7 +133,7 @@ int s390_virtio_hypercall(CPUState *env,
}
/* PC hardware initialisation */
-static void s390_init(ram_addr_t ram_size,
+static void s390_init(ram_addr_t my_ram_size,
const char *boot_device,
const char *kernel_filename,
const char *kernel_cmdline,
@@ -145,19 +145,29 @@ static void s390_init(ram_addr_t ram_siz
ram_addr_t kernel_size = 0;
ram_addr_t initrd_offset;
ram_addr_t initrd_size = 0;
+ int shift = 0;
uint8_t *storage_keys;
int i;
+ /* s390x ram size detection needs a 16bit multiplier + an increment. So
+ guests > 64GB can be specified in 2MB steps etc. */
+ while ((my_ram_size >> (20 + shift)) > 65535) {
+ shift++;
+ }
+ my_ram_size = my_ram_size >> (20 + shift) << (20 + shift);
+
+ /* lets propagate the changed ram size into the global variable. */
+ ram_size = my_ram_size;
/* get a BUS */
- s390_bus = s390_virtio_bus_init(&ram_size);
+ s390_bus = s390_virtio_bus_init(&my_ram_size);
/* allocate RAM */
- ram_addr = qemu_ram_alloc(NULL, "s390.ram", ram_size);
- cpu_register_physical_memory(0, ram_size, ram_addr);
+ ram_addr = qemu_ram_alloc(NULL, "s390.ram", my_ram_size);
+ cpu_register_physical_memory(0, my_ram_size, ram_addr);
/* allocate storage keys */
- storage_keys = qemu_mallocz(ram_size / TARGET_PAGE_SIZE);
+ storage_keys = qemu_mallocz(my_ram_size / TARGET_PAGE_SIZE);
/* init CPUs */
if (cpu_model == NULL) {
Index: b/target-s390x/op_helper.c
===================================================================
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -2361,6 +2361,7 @@ static void ext_interrupt(CPUState *env,
int sclp_service_call(CPUState *env, uint32_t sccb, uint64_t code)
{
int r = 0;
+ int shift = 0;
#ifdef DEBUG_HELPER
printf("sclp(0x%x, 0x%" PRIx64 ")\n", sccb, code);
@@ -2375,8 +2376,11 @@ int sclp_service_call(CPUState *env, uin
switch(code) {
case SCLP_CMDW_READ_SCP_INFO:
case SCLP_CMDW_READ_SCP_INFO_FORCED:
- stw_phys(sccb + SCP_MEM_CODE, ram_size >> 20);
- stb_phys(sccb + SCP_INCREMENT, 1);
+ while ((ram_size >> (20 + shift)) > 65535) {
+ shift++;
+ }
+ stw_phys(sccb + SCP_MEM_CODE, ram_size >> (20 + shift));
+ stb_phys(sccb + SCP_INCREMENT, 1 << shift);
stw_phys(sccb + SCP_RESPONSE_CODE, 0x10);
if (kvm_enabled()) {
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PatchV3] s390x: fix memory detection for guests > 64GB
2011-05-12 8:50 ` [Qemu-devel] [PatchV3] " Christian Borntraeger
@ 2011-05-17 13:16 ` Alexander Graf
2011-05-17 14:03 ` Alexander Graf
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Graf @ 2011-05-17 13:16 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Carsten Otte, qemu-devel@nongnu.org
On 12.05.2011, at 10:50, Christian Borntraeger wrote:
>> I'd definitely prefer that over the change on vl.c :)
>
> the s390 memory detection has a 16bit field that specifies the amount of
> increments. This patch adopts the memory size to always fit into that
> scheme. This also fixes virtio detection for these guests, since the
> descriptor page is located after the main memory.
How did you test the patch?
agraf@s390t27:/home/agraf/git/qemu> ./s390x-softmmu/qemu-system-s390x -snapshot -nographic /media/studio/images/SUSE/s390/sles11.raw -kernel /boot/image -m 3600 -enable-kvm
[works]
agraf@s390t27:/home/agraf/git/qemu> ./s390x-softmmu/qemu-system-s390x -snapshot -nographic /media/studio/images/SUSE/s390/sles11.raw -kernel /boot/image -m 3700 -enable-kvm
qemu_madvise: Invalid argument
Need MADV_DONTFORK in absence of synchronous KVM MMU
agraf@s390t27:/home/agraf/git/qemu> ./s390x-softmmu/qemu-system-s390x -snapshot -nographic /media/studio/images/SUSE/s390/sles11.raw -kernel /boot/image -m 3700 Segmentation fault
Alex
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PatchV3] s390x: fix memory detection for guests > 64GB
2011-05-17 13:16 ` Alexander Graf
@ 2011-05-17 14:03 ` Alexander Graf
0 siblings, 0 replies; 9+ messages in thread
From: Alexander Graf @ 2011-05-17 14:03 UTC (permalink / raw)
To: Alexander Graf; +Cc: Christian Borntraeger, qemu-devel@nongnu.org, Carsten Otte
On 17.05.2011, at 15:16, Alexander Graf wrote:
>
> On 12.05.2011, at 10:50, Christian Borntraeger wrote:
>
>>> I'd definitely prefer that over the change on vl.c :)
>>
>> the s390 memory detection has a 16bit field that specifies the amount of
>> increments. This patch adopts the memory size to always fit into that
>> scheme. This also fixes virtio detection for these guests, since the
>> descriptor page is located after the main memory.
>
> How did you test the patch?
>
> agraf@s390t27:/home/agraf/git/qemu> ./s390x-softmmu/qemu-system-s390x -snapshot -nographic /media/studio/images/SUSE/s390/sles11.raw -kernel /boot/image -m 3600 -enable-kvm
>
> [works]
>
> agraf@s390t27:/home/agraf/git/qemu> ./s390x-softmmu/qemu-system-s390x -snapshot -nographic /media/studio/images/SUSE/s390/sles11.raw -kernel /boot/image -m 3700 -enable-kvm
> qemu_madvise: Invalid argument
> Need MADV_DONTFORK in absence of synchronous KVM MMU
>
> agraf@s390t27:/home/agraf/git/qemu> ./s390x-softmmu/qemu-system-s390x -snapshot -nographic /media/studio/images/SUSE/s390/sles11.raw -kernel /boot/image -m 3700 Segmentation fault
Ah, my fault - I had too little swap space :). Now I can even run an emulated VM with >64GB of RAM - yay!
Alex
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-05-17 14:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-10 12:49 [Qemu-devel] s390x: fix memory detection for guests > 64GB Christian Borntraeger
2011-05-11 22:36 ` Alexander Graf
2011-05-12 7:50 ` [Qemu-devel] [PatchV2] " Christian Borntraeger
2011-05-12 7:55 ` Alexander Graf
2011-05-12 7:59 ` Christian Borntraeger
2011-05-12 8:01 ` Alexander Graf
2011-05-12 8:50 ` [Qemu-devel] [PatchV3] " Christian Borntraeger
2011-05-17 13:16 ` Alexander Graf
2011-05-17 14:03 ` Alexander Graf
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).