lkml.org 
[lkml]   [2002]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] memblk_online_map 2.5.45 (4/5)
Matthew Dobson wrote:
> Matthew Dobson wrote:
>
>>
>> Linus,
>> This series of patches creates a directory-based Topology in sysfs
>> (driverfs). This includes the per-node meminfo patch you wanted, as
>> well as UP/SMP/NUMA topology.
>> There were discussions between myself, Andrew, Rusty, and Patrick,
>> and these are what we agreed on.
>>
>> (1/5) Core sysfs Topology:
>> This patch creates the generic structures that are (will be)
>> embedded in the per-arch structures. Also creates calls to
>> register these generic structures (CPUs, MemBlks, & Nodes).
>>
>> Note that without arch-specific structures in which to embed
>> these structures, and an arch-specific initialization routine,
>> these functions/structures remain unused.
>>
>> (2/5) i386 sysfs Topology
>> This patch creates the i386 specific files/functions/structures
>> to implement driverfs Topology. These structures have the
>> generic CPU/MemBlk/Node structures embedded in them.
>>
>> This patch also creates the arch-specific initialization routine
>> to instantiate the topology.
>>
>> (3/5) per-node (NUMA) meminfo for sysfs Topology
>> This patch adds code to DriverFS Topology to expose per-node
>> memory statistics.
>> This information is exposed via the nodeX/meminfo file.
>>
>> The patch also adds 2 helper functions to gather per-node memory
>> info.
>>
>> (4/5) memblk_online_map
>> This patch creates a memblk_online_map, much like
>> cpu_online_map. It also creates the standard helper functions,
>> ie: memblk_online(), num_online_memblks(), memblk_set_online(),
>> memblk_set_offline().
>>
>> This is used by driverFS topology to keep track of which memory
>> blocks are in the system and online.
>>
>> (5/5) node_online_map
>> This patch creates a node_online_map, much like cpu_online_map.
>> It also creates the standard helper functions, ie:
>> node_online(), num_online_nodes(), node_set_online(),
>> node_set_offline().
>>
>> This is used by driverFS topology to keep track of which Nodes
>> are in the system and online.
>>
>> Cheers!
>>
>> -Matt
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.45-base/arch/i386/mach-generic/topology.c linux-2.5.45-memblk_online_map/arch/i386/mach-generic/topology.c
--- linux-2.5.45-base/arch/i386/mach-generic/topology.c Wed Oct 30 17:54:32 2002
+++ linux-2.5.45-memblk_online_map/arch/i386/mach-generic/topology.c Wed Oct 30 18:02:17 2002
@@ -48,7 +48,7 @@
arch_register_node(i);
for (i = 0; i < NR_CPUS; i++)
if (cpu_possible(i)) arch_register_cpu(i);
- for (i = 0; i < numnodes; i++)
+ for (i = 0; i < num_online_memblks(); i++)
arch_register_memblk(i);
return 0;
}
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.45-base/include/linux/mmzone.h linux-2.5.45-memblk_online_map/include/linux/mmzone.h
--- linux-2.5.45-base/include/linux/mmzone.h Wed Oct 30 16:41:34 2002
+++ linux-2.5.45-memblk_online_map/include/linux/mmzone.h Wed Oct 30 18:02:17 2002
@@ -279,6 +279,38 @@

#endif /* !CONFIG_DISCONTIGMEM */

+
+extern DECLARE_BITMAP(memblk_online_map, MAX_NR_MEMBLKS);
+
+#if defined(CONFIG_DISCONTIGMEM) || defined(CONFIG_NUMA)
+
+#define memblk_online(memblk) test_bit(memblk, memblk_online_map)
+#define memblk_set_online(memblk) set_bit(memblk, memblk_online_map)
+#define memblk_set_offline(memblk) clear_bit(memblk, memblk_online_map)
+static inline unsigned int num_online_memblks(void)
+{
+ int i, num = 0;
+
+ for(i = 0; i < MAX_NR_MEMBLKS; i++){
+ if (memblk_online(i))
+ num++;
+ }
+ return num;
+}
+
+#else /* !CONFIG_DISCONTIGMEM && !CONFIG_NUMA */
+
+#define memblk_online(memblk) \
+ ({ BUG_ON((memblk) != 0); test_bit(memblk, memblk_online_map); })
+#define memblk_set_online(memblk) \
+ ({ BUG_ON((memblk) != 0); set_bit(memblk, memblk_online_map); })
+#define memblk_set_offline(memblk) \
+ ({ BUG_ON((memblk) != 0); clear_bit(memblk, memblk_online_map); })
+#define num_online_memblks() 1
+
+#endif /* CONFIG_DISCONTIGMEM || CONFIG_NUMA */
+
+
#define MAP_ALIGN(x) ((((x) % sizeof(struct page)) == 0) ? (x) : ((x) + \
sizeof(struct page) - ((x) % sizeof(struct page))))

diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.45-base/mm/page_alloc.c linux-2.5.45-memblk_online_map/mm/page_alloc.c
--- linux-2.5.45-base/mm/page_alloc.c Wed Oct 30 17:56:28 2002
+++ linux-2.5.45-memblk_online_map/mm/page_alloc.c Wed Oct 30 18:02:17 2002
@@ -29,6 +29,9 @@
#include <linux/slab.h>
#include <linux/notifier.h>

+#include <asm/topology.h>
+
+DECLARE_BITMAP(memblk_online_map, MAX_NR_MEMBLKS);
struct pglist_data *pgdat_list;
unsigned long totalram_pages;
unsigned long totalhigh_pages;
@@ -1163,6 +1166,7 @@
pgdat->node_mem_map = node_mem_map;

free_area_init_core(pgdat, zones_size, zholes_size);
+ memblk_set_online(__node_to_memblk(nid));

calculate_zone_bitmap(pgdat, zones_size);
}
\
 
 \ /
  Last update: 2005-03-22 13:30    [from the cache]
©2003-2011 Jasper Spaans