Enable usage of larger LMB ( > 4G)
Subsystems (2)
PATCH v3 1/4 powerpc/drmem: Make lmb_size 64 bit
In reply to Aneesh Kumar K.VSimilar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") make sure different variables tracking lmb_size are updated to be 64 bit.
This was found by code audit.
--- arch/powerpc/include/asm/drmem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/drmem.h +2 -2
@@ -20,7 +20,7 @@ struct drmem_lmb {struct drmem_lmb_info {struct drmem_lmb *lmbs;int n_lmbs; -u32 lmb_size; +u64 lmb_size; };extern struct drmem_lmb_info *drmem_info;
@@ -80,7 +80,7 @@ struct of_drconf_cell_v2 {#define DRCONF_MEM_RESERVED 0x00000080#define DRCONF_MEM_HOTREMOVABLE 0x00000100 -static inline u32 drmem_lmb_size (void ) +static inline u64 drmem_lmb_size (void ) {return drmem_info->lmb_size; }
Signature · 1 line
2.26.2
PATCH v3 2/4 powerpc/memhotplug: Make lmb size 64bit
In reply to Aneesh Kumar K.VSimilar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") make sure different variables tracking lmb_size are updated to be 64 bit.
This was found by code audit.
--- .../platforms/pseries/hotplug-memory.c | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-)
arch/powerpc/platforms/pseries/hotplug-memory.c +29 -14
@@ -277,7 +277,7 @@ static int dlpar_offline_lmb(struct drmem_lmb *lmb)return dlpar_change_lmb_state (lmb, false); } -static int pseries_remove_memblock (unsigned long base,unsigned int memblock_size) +static int pseries_remove_memblock (unsigned long base,unsigned long memblock_size) {unsigned long block_sz, start_pfn;int sections_per_block;
@@ -308,10 +308,11 @@ static int pseries_remove_memblock(unsigned long base, unsigned int memblock_sizstatic int pseries_remove_mem_node (struct device_node *np) { -const __be32 *regs; +const __be32 *prop;unsigned long base; -unsigned int lmb_size; +unsigned long lmb_size;int ret = -EINVAL ; +int addr_cells, size_cells;/* * Check to see if we are actually removing memory
@@ -322,12 +323,19 @@ static int pseries_remove_mem_node(struct device_node *np)/* * Find the base address and size of the memblock */ - regs =of_get_property (np,"reg" ,NULL ); -if (!regs) + prop =of_get_property (np,"reg" ,NULL ); +if (!prop)return ret; - base =be64_to_cpu (*(unsigned long *)regs); - lmb_size =be32_to_cpu (regs[3 ]); + addr_cells =of_n_addr_cells (np); + size_cells =of_n_size_cells (np); + +/* +* "reg" property represents (addr,size) tuple. +*/ + base =of_read_number (prop, addr_cells); + prop += addr_cells; + lmb_size =of_read_number (prop, size_cells);pseries_remove_memblock (base, lmb_size);return 0 ;
@@ -564,7 +572,7 @@ static int dlpar_memory_remove_by_ic(u32 lmbs_to_remove, u32 drc_index)#else static inline int pseries_remove_memblock (unsigned long base, -unsigned int memblock_size) +unsigned long memblock_size) {return -EOPNOTSUPP ; }
@@ -886,10 +894,11 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)static int pseries_add_mem_node (struct device_node *np) { -const __be32 *regs; +const __be32 *prop;unsigned long base; -unsigned int lmb_size; +unsigned long lmb_size;int ret = -EINVAL ; +int addr_cells, size_cells;/* * Check to see if we are actually adding memory
@@ -900,12 +909,18 @@ static int pseries_add_mem_node(struct device_node *np)/* * Find the base and size of the memblock */ - regs =of_get_property (np,"reg" ,NULL ); -if (!regs) + prop =of_get_property (np,"reg" ,NULL ); +if (!prop)return ret; - base =be64_to_cpu (*(unsigned long *)regs); - lmb_size =be32_to_cpu (regs[3 ]); + addr_cells =of_n_addr_cells (np); + size_cells =of_n_size_cells (np); +/* +* "reg" property represents (addr,size) tuple. +*/ + base =of_read_number (prop, addr_cells); + prop += addr_cells; + lmb_size =of_read_number (prop, size_cells);/* * Update memory region to represent the memory add
Signature · 1 line
2.26.2
v3 cover Enable usage of larger LMB ( > 4G)
Changes from v2:
* Don't use root addr and size cells during runtime. Walk up the device tree and use the first addr and size cells value (of_n_addr_cells()/ of_n_size_cells())
Aneesh Kumar K.V (4):
powerpc/drmem: Make lmb_size 64 bit
powerpc/memhotplug: Make lmb size 64bit powerpc/book3s64/radix: Make radix_mem_block_size 64bit powerpc/lmb-size: Use addr #size-cells value when fetching lmb-size
arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- arch/powerpc/include/asm/drmem.h | 4 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 9 +-- .../platforms/pseries/hotplug-memory.c | 56 +++++++++++++------ 4 files changed, 46 insertions(+), 25 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 3/4 powerpc/book3s64/radix: Make radix_mem_block_size 64bit
Similar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") make sure different variables tracking lmb_size are updated to be 64 bit.
--- arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/book3s/64/mmu.h +1 -1
@@ -70,7 +70,7 @@ extern unsigned int mmu_base_pid;/* * memory block size used with radix translation. */ -extern unsigned int __ro_after_init radix_mem_block_size; +extern unsigned long __ro_after_init radix_mem_block_size;#define PRTB_SIZE_SHIFT (mmu_pid_bits + 4)#define PRTB_ENTRIES (1ul << mmu_pid_bits)
arch/powerpc/mm/book3s64/radix_pgtable.c +1 -1
@@ -34,7 +34,7 @@unsigned int mmu_pid_bits;unsigned int mmu_base_pid; -unsigned int radix_mem_block_size__ro_after_init ; +unsigned long radix_mem_block_size__ro_after_init ;static __ref void *early_alloc_pgtable (unsigned long size,int nid,unsigned long region_start,unsigned long region_end)
Signature · 1 line
2.26.2
PATCH v3 4/4 powerpc/lmb-size: Use addr #size-cells value when fetching lmb-size
In reply to Aneesh Kumar K.VMake it consistent with other usages.
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 7 ++++--- arch/powerpc/platforms/pseries/hotplug-memory.c | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +4 -3
@@ -498,7 +498,7 @@ static int __init probe_memory_block_size(unsigned long node, const char *uname, depth, void *data) {unsigned long *mem_block_size = (unsigned long *)data; -const __be64 *prop; +const __be32 *prop;int len;if (depth !=1 )
@@ -508,13 +508,14 @@ static int __init probe_memory_block_size(unsigned long node, const char *uname,return 0 ; prop =of_get_flat_dt_prop (node,"ibm,lmb-size" , &len); -if (!prop || len <sizeof (__be64)) + +if (!prop || len < dt_root_size_cells *sizeof (__be32))/* * Nothing in the device tree */ *mem_block_size =MIN_MEMORY_BLOCK_SIZE ;else - *mem_block_size =be64_to_cpup (prop); + *mem_block_size =of_read_number (prop, dt_root_size_cells);return 1 ; }
arch/powerpc/platforms/pseries/hotplug-memory.c +9 -4
@@ -30,12 +30,17 @@ unsigned long pseries_memory_block_size(void) np =of_find_node_by_path ("/ibm,dynamic-reconfiguration-memory" );if (np) { -const __be64 *size; +int len; +int size_cells; +const __be32 *prop; - size =of_get_property (np,"ibm,lmb-size" ,NULL ); -if (size) - memblock_size =be64_to_cpup (size); + size_cells =of_n_size_cells (np); + + prop =of_get_property (np,"ibm,lmb-size" , &len); +if (prop && len >= size_cells *sizeof (__be32)) + memblock_size =of_read_number (prop, size_cells);of_node_put (np); + }else if (machine_is (pseries)) {/* This fallback really only applies to pseries */ unsigned int memzero_size =0 ;
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 5 lines · Aneesh Kumar K.V
Changes from v2:
* Don't use root addr and size cells during runtime. Walk up the device tree and use the first addr and size cells value (of_n_addr_cells()/of_n_size_cells())
Quoted 7 lines
Aneesh Kumar K.V (4):
powerpc/drmem: Makelmb_size64 bit
powerpc/memhotplug: Make lmb size 64bit powerpc/book3s64/radix: Makeradix_mem_block_size64bit powerpc/lmb-size: Use addr #size-cells value when fetching lmb-size[...]
Applied to powerpc/next.
[1/4] powerpc/drmem: Make lmb_size 64 bit
https://git.kernel.org/powerpc/c/ec72024e35dddb88a81e40071c87ceb18b5ee835 [2/4] powerpc/memhotplug: Make lmb size 64bit https://git.kernel.org/powerpc/c/301d2ea6572386245c5d2d2dc85c3b5a737b85ac [3/4] powerpc/book3s64/radix: Make radix_mem_block_size 64bit https://git.kernel.org/powerpc/c/950805f4d90eda14325ceab56b0f00d034baa8bc [4/4] powerpc/lmb-size: Use addr #size-cells value when fetching lmb-size https://git.kernel.org/powerpc/c/fbf2f134c8c312d3166534a8bd6a1aaee6e9c7ef
cheers