[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] static-memory: Fix incorrect tot_size calculation



commit d6a6ea77e1cf50b200ea54f28a852a9492c4206d
Author:     Michal Orzel <michal.orzel@xxxxxxx>
AuthorDate: Wed Feb 4 13:42:35 2026 +0100
Commit:     Michal Orzel <michal.orzel@xxxxxxx>
CommitDate: Thu Feb 5 09:34:53 2026 +0100

    static-memory: Fix incorrect tot_size calculation
    
    When a physical memory bank spans multiple guest RAM banks, the variable
    psize is modified inside the allocation loop, but the modified value
    (instead of the original bank size) is added to tot_size. This causes an
    incorrect total size calculation leading to false panic. Move the
    tot_size calculation right after acquire_static_memory_bank().
    
    Fixes: 487975df53b5 ("xen/arm: introduce allocate_static_memory")
    Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
    Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
 xen/common/device-tree/static-memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/common/device-tree/static-memory.c 
b/xen/common/device-tree/static-memory.c
index 0774d06806..ffbc12aa24 100644
--- a/xen/common/device-tree/static-memory.c
+++ b/xen/common/device-tree/static-memory.c
@@ -118,6 +118,8 @@ void __init allocate_static_memory(struct domain *d, struct 
kernel_info *kinfo,
         if ( mfn_eq(smfn, INVALID_MFN) )
             goto fail;
 
+        tot_size += psize;
+
         printk(XENLOG_INFO "%pd: STATIC BANK[%u] %#"PRIpaddr"-%#"PRIpaddr"\n",
                d, bank, pbase, pbase + psize);
 
@@ -158,8 +160,6 @@ void __init allocate_static_memory(struct domain *d, struct 
kernel_info *kinfo,
                 mem->bank[gbank].start = rambase[gbank];
             }
         }
-
-        tot_size += psize;
     }
 
     mem->nr_banks = ++gbank;
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.