aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* bootmem, x86: Add weak version of reserve_bootmem_genericYinghai Lu2010-08-27
| | | | | | | | | | | | It will be used memblock_x86_to_bootmem converting It is an wrapper for reserve_bootmem, and x86 64bit is using special one. Also clean up that version for x86_64. We don't need to take care of numa path for that, bootmem can handle it how Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* x86, memblock: Add memblock_x86_find_in_range_size()Yinghai Lu2010-08-27
| | | | | | | | | | size is returned according free range. Will be used to find free ranges for early_memtest and memory corruption check Do not mess it up with lib/memblock.c yet. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* memblock: Add memblock_free/reserve_reserved_regions()Yinghai Lu2010-08-27
| | | | | | | | | | | So we can avoid export memblock_reserved_init_regions() Suggested by Ben. -v2: use __init_memblock attribute Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* memblock: Add memblock_find_in_range()Yinghai Lu2010-08-04
| | | | | | | | | This is a wrapper for memblock_find_base() using slightly different arguments (start,end instead of start,size for example) in order to make it easier to convert existing arch/x86 code. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Option for the architecture to put memblock into the .init sectionYinghai Lu2010-08-04
| | | | | | | | | | | | | Arch code can define ARCH_DISCARD_MEMBLOCK in asm/memblock.h, which in turns causes memblock code and data to go respectively into the .init and .initdata sections. This will be used by the x86 architecture. If ARCH_DISCARD_MEMBLOCK is defined, the debugfs files to inspect the memblock arrays after boot are not created. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCKYinghai Lu2010-08-04
| | | | | | | | This should make it easier to catch/debug incorrect use when the CONFIG_ option isn't set. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Make MEMBLOCK_ERROR be 0Benjamin Herrenschmidt2010-08-04
| | | | | | | And ensure we don't hand out 0 as a valid allocation. We put the low limit at PAGE_SIZE arbitrarily. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Export MEMBLOCK_ERRORYinghai Lu2010-08-04
| | | | | | | will used by x86 memblock_x86_find_in_range_node and nobootmem replacement Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Improve debug output when resizing the reserve arrayYinghai Lu2010-08-04
| | | | | | | | | Print out the location info in addition to which array is being resized. Also use memblocK_dbg() to put that under control of the memblock_debug flag. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Expose some memblock bits for use by x86Yinghai Lu2010-08-04
| | | | | | | | | This exposes memblock_debug and associated memblock_dbg() macro, along with memblock_can_resize so that x86 can use these when ported to use memblock Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Add debugfs files to dump the arrays contentBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHEREBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | | | | | | | | memblock_alloc_nid() used to fallback to allocating anywhere by using memblock_alloc() as a fallback. However, some of my previous patches limit memblock_alloc() to the region covered by MEMBLOCK_ALLOC_ACCESSIBLE which is not quite what we want for memblock_alloc_try_nid(). So we fix it by explicitely using MEMBLOCK_ALLOC_ANYWHERE. Not that so far only sparc uses memblock_alloc_nid() and it hasn't been updated to clamp the accessible zone yet. Thus the temporary "breakage" should have no effect. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid()Benjamin Herrenschmidt2010-08-04
| | | | | | | | The former is now strict, it will fail if it cannot honor the allocation within the node, while the later implements the previous semantic which falls back to allocating anywhere. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: NUMA allocate can now use early_pfn_mapBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | | | | | | | We now provide a default (weak) implementation of memblock_nid_range() which uses the early_pfn_map[] if CONFIG_ARCH_POPULATES_NODE_MAP is set. Sparc still needs to use its own method due to the way the pages can be scattered between nodes. This implementation is inefficient due to our main algorithm and callback construct wanting to work on an ascending addresses bases while early_pfn_map[] would rather work with nid's (it's unsorted at that stage). But it should work and we can look into improving it subsequently, possibly using arch compile options to chose a different algorithm alltogether. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Add "start" argument to memblock_find_base()Benjamin Herrenschmidt2010-08-04
| | | | | | | To constraint the search of a region between two boundaries, which will be used by the new NUMA aware allocator among others. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Add arch function to control coalescing of memblock memory regionsBenjamin Herrenschmidt2010-08-04
| | | | | | | | | Some archs such as ARM want to avoid coalescing accross things such as the lowmem/highmem boundary or similar. This provides the option to control it via an arch callback for which a weak default is provided which always allows coalescing. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Add array resizing supportBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | | | When one of the array gets full, we resize it. After much thinking and a few iterations of that code, I went back to on-demand resizing using the (new) internal memblock_find_base() function, which is pretty much what Yinghai initially proposed, though there some differences in the details. To work this relies on the default alloc limit being set sensibly by the architecture. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Move functions around into a more sensible orderBenjamin Herrenschmidt2010-08-04
| | | | | | | | Some shuffling is needed for doing array resize so we may as well put some sense into the ordering of the functions in the whole memblock.c file. No code change. Added some comments. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: split memblock_find_base() out of __memblock_alloc_base()Benjamin Herrenschmidt2010-08-04
| | | | | | | | | | | | | This will be used by the array resize code and might prove useful to some arch code as well at which point it can be made non-static. Also add comment as to why aligning size is important Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- v2. Fix loss of size alignment v3. Fix result code
* memblock: Move memblock_init() to the bottom of the fileBenjamin Herrenschmidt2010-08-04
| | | | | | It's a real PITA to have to search for it in the middle Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0Benjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Make memblock_find_region() out of memblock_alloc_region()Benjamin Herrenschmidt2010-08-04
| | | | | | | | | | This function will be used to locate a free area to put the new memblock arrays when attempting to resize them. memblock_alloc_region() is gone, the two callsites now call memblock_add_region(). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- v2. Fix membase_alloc_nid_region() conversion
* memblock: Add debug markers at the end of the arrayBenjamin Herrenschmidt2010-08-04
| | | | | | | Since we allocate one more than needed, why not do a bit of sanity checking here to ensure we don't walk past the end of the array ? Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Move memblock arrays to static storage in memblock.c and make ↵Benjamin Herrenschmidt2010-08-04
| | | | | | | | | | | their size a variable This is in preparation for having resizable arrays. Note that we still allocate one more than needed, this is unchanged from the previous implementation. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Remove memblock_type.size and add memblock.memory_size insteadBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | Right now, both the "memory" and "reserved" memblock_type structures have a "size" member. It represents the calculated memory size in the former case and is unused in the latter. This moves it out to the main memblock structure instead Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Remove unused memblock.debug struct memberBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Change u64 to phys_addr_tBenjamin Herrenschmidt2010-08-04
| | | | | | | Let's not waste space and cycles on archs that don't support >32-bit physical address space. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Remove rmo_size, burry it in arch/powerpc where it belongsBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | | | | The RMA (RMO is a misnomer) is a concept specific to ppc64 (in fact server ppc64 though I hijack it on embedded ppc64 for similar purposes) and represents the area of memory that can be accessed in real mode (aka with MMU off), or on embedded, from the exception vectors (which is bolted in the TLB) which pretty much boils down to the same thing. We take that out of the generic MEMBLOCK data structure and move it into arch/powerpc where it belongs, renaming it to "RMA" while at it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Introduce default allocation limit and use it to replace explicit onesBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | | | | | | | | | | | | This introduce memblock.current_limit which is used to limit allocations from memblock_alloc() or memblock_alloc_base(..., MEMBLOCK_ALLOC_ACCESSIBLE). The old MEMBLOCK_ALLOC_ANYWHERE changes value from 0 to ~(u64)0 and can still be used with memblock_alloc_base() to allocate really anywhere. It is -no-longer- cropped to MEMBLOCK_REAL_LIMIT which disappears. Note to archs: I'm leaving the default limit to MEMBLOCK_ALLOC_ANYWHERE. I strongly recommend that you ensure that you set an appropriate limit during boot in order to guarantee that an memblock_alloc() at any time results in something that is accessible with a simple __va(). The reason is that a subsequent patch will introduce the ability for the array to resize itself by reallocating itself. The MEMBLOCK core will honor the current limit when performing those allocations. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Expose MEMBLOCK_ALLOC_ANYWHEREBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Factor the lowest level alloc functionBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Remove nid_range argument, arch provides memblock_nid_range() insteadBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Remove memblock_find()Benjamin Herrenschmidt2010-08-04
| | | | | | Nobody uses it anymore. It's semantics were ... weird Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Remove obsolete accessorsBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/arm: Use new accessorsBenjamin Herrenschmidt2010-08-04
| | | | | CC: Russell King <linux@arm.linux.org.uk> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/powerpc: Use new accessorsBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/sparc: Use new accessorsBenjamin Herrenschmidt2010-08-04
| | | | | CC: David S. Miller <davem@davemloft.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/sh: Use new accessorsBenjamin Herrenschmidt2010-08-04
| | | | | CC: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/microblaze: Use new accessorsBenjamin Herrenschmidt2010-08-04
| | | | | CC: Michal Simek <monstr@monstr.eu> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Introduce for_each_memblock() and new accessorsBenjamin Herrenschmidt2010-08-04
| | | | | | | Walk memblock's using for_each_memblock() and use memblock_region_base/end_pfn() for getting to PFNs. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/arm: Use memblock_region_is_memory() for omap fbBenjamin Herrenschmidt2010-08-04
| | | | | | Instead of the deprecated memblock_find() Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock/arm: pfn_valid uses memblock_is_memory()Benjamin Herrenschmidt2010-08-04
| | | | | | | | | | | The implementation is pretty much similar. There is a -small- added overhead by having another function call and the address shift. If that becomes a concern, I suppose we could actually have memblock itself expose a memblock_pfn_valid() which then ARM can use directly with an appropriate #define... Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Implement memblock_is_memory and memblock_is_region_memoryBenjamin Herrenschmidt2010-08-04
| | | | | | | | To make it fast, we steal ARM's binary search for memblock_is_memory() and we use that to also the replace existing implementation of memblock_is_reserved(). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: No reason to include asm/memblock.h lateBenjamin Herrenschmidt2010-08-04
| | | | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Rename memblock_region to memblock_type and memblock_property to ↵Benjamin Herrenschmidt2010-08-04
| | | | | | memblock_region Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* memblock: Fix memblock_is_region_reserved() to return a booleanBenjamin Herrenschmidt2010-08-04
| | | | | | | | | | | All callers expect a boolean result which is true if the region overlaps a reserved region. However, the implementation actually returns -1 if there is no overlap, and a region index (0 based) if there is. Make it behave as callers (and common sense) expect. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2010-08-03
|\ | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: Fix recovery stuck bug (try #2) GFS2: Fix typo in stuffed file data copy handling Revert "GFS2: recovery stuck on transaction lock" GFS2: Make "try" lock not try quite so hard GFS2: remove dependency on __GFP_NOFAIL GFS2: Simplify gfs2_write_alloc_required GFS2: Wait for journal id on mount if not specified on mount command line GFS2: Use nobh_writepage
| * GFS2: Fix recovery stuck bug (try #2)Steven Whitehouse2010-08-02
| | | | | | | | | | | | | | | | | | This is a clean up of the code which deals with LM_FLAG_NOEXP which aims to remove any possible race conditions by using gl_spin to cover the gap between testing for the LM_FLAG_NOEXP and the GL_FROZEN flag. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * GFS2: Fix typo in stuffed file data copy handlingAbhijith Das2010-07-30
| | | | | | | | | | | | | | | | | | trunc_start() in bmap.c incorrectly uses sizeof(struct gfs2_inode) instead of sizeof(struct gfs2_dinode). Signed-off-by: Abhi Das <adas@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * Revert "GFS2: recovery stuck on transaction lock"Steven Whitehouse2010-07-29
| | | | | | | | | | | | | | | | | | | | This reverts commit b7dc2df5725fe7355fd76000ead7e39728e1b8a9. The initial patch didn't quite work since it doesn't cover all the possible routes by which the GLF_FROZEN flag might be set. A revised fix is coming up in the next patch. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-26 13:48:50 -0500