From: Paul Jackson <pj@sgi.com>
To: linux-kernel@vger.kernel.org
Cc: mbligh@aracnet.com, akpm@osdl.org, wli@holomorphy.com,
haveblue@us.ibm.com, colpatch@us.ibm.com
Subject: [PATCH] mask ADT: other arch changes from Matthew's nodemask_t Patch 7/7 [16/22]
Date: Mon, 29 Mar 2004 04:15:44 -0800 [thread overview]
Message-ID: <20040329041544.1f36b518.pj@sgi.com> (raw)
Patch_16_of_22 - Matthew Dobson's [PATCH]_nodemask_t_other_arch_changes_[7_7]
Changes to other arch-specific code (alpha, arm, mips,
sparc64 & sh). Untested. Code review & testing requested.
diffstat Patch_16_of_22:
arch/alpha/mm/numa.c | 12 ++++++------
arch/arm/mm/init.c | 33 ++++++++++++++-------------------
arch/arm/mm/mm-armv.c | 2 +-
arch/arm26/mm/init.c | 3 ++-
arch/mips/sgi-ip27/ip27-init.c | 27 +++++++++++++--------------
arch/mips/sgi-ip27/ip27-klnuma.c | 8 ++++----
arch/mips/sgi-ip27/ip27-memory.c | 8 ++++----
arch/mips/sgi-ip27/ip27-nmi.c | 8 ++++----
arch/mips/sgi-ip27/ip27-reset.c | 4 ++--
arch/mips/sgi-ip27/ip27-smp.c | 10 +++++-----
arch/sparc64/mm/hugetlbpage.c | 9 ++++-----
include/asm-mips/sn/sn_private.h | 4 ++--
include/asm-sh/mmzone.h | 2 +-
13 files changed, 62 insertions(+), 68 deletions(-)
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1722 -> 1.1723
# arch/mips/sgi-ip27/ip27-nmi.c 1.4 -> 1.5
# arch/alpha/mm/numa.c 1.13 -> 1.14
# arch/arm/mm/init.c 1.24 -> 1.25
# arch/mips/sgi-ip27/ip27-memory.c 1.8 -> 1.9
# arch/mips/sgi-ip27/ip27-klnuma.c 1.5 -> 1.6
# arch/mips/sgi-ip27/ip27-reset.c 1.2 -> 1.3
# arch/mips/sgi-ip27/ip27-smp.c 1.1 -> 1.2
# arch/arm/mm/mm-armv.c 1.26 -> 1.27
# arch/sparc64/mm/hugetlbpage.c 1.10 -> 1.11
# include/asm-mips/sn/sn_private.h 1.3 -> 1.4
# include/asm-sh/mmzone.h 1.2 -> 1.3
# arch/arm26/mm/init.c 1.5 -> 1.6
# arch/mips/sgi-ip27/ip27-init.c 1.10 -> 1.11
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/28 pj@sgi.com 1.1723
# Matthew Dobson's [PATCH]_nodemask_t_other_arch_changes_[7_7] of 18 Mar 2004:
# Changes to other arch-specific code (alpha, arm, mips,
# sparc64 & sh). Untested. Code review & testing requested.
# --------------------------------------------
#
diff -Nru a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
--- a/arch/alpha/mm/numa.c Mon Mar 29 01:03:59 2004
+++ b/arch/alpha/mm/numa.c Mon Mar 29 01:03:59 2004
@@ -244,7 +244,7 @@
reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(bootmap_start), bootmap_size);
printk(" reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size));
- numnodes++;
+ node_set_online(nid);
}
void __init
@@ -254,11 +254,11 @@
show_mem_layout();
- numnodes = 0;
+ nodes_clear(node_online_map);
min_low_pfn = ~0UL;
max_low_pfn = 0UL;
- for (nid = 0; nid < MAX_NUMNODES; nid++)
+ for_each_node(nid)
setup_memory_node(nid, kernel_end);
#ifdef CONFIG_BLK_DEV_INITRD
@@ -301,7 +301,7 @@
*/
dma_local_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
- for (nid = 0; nid < numnodes; nid++) {
+ for_each_online_node(nid) {
unsigned long start_pfn = node_bdata[nid].node_boot_start >> PAGE_SHIFT;
unsigned long end_pfn = node_bdata[nid].node_low_pfn;
@@ -330,7 +330,7 @@
high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
reservedpages = 0;
- for (nid = 0; nid < numnodes; nid++) {
+ for_each_online_node(nid) {
/*
* This will free up the bootmem, ie, slot 0 memory
*/
@@ -370,7 +370,7 @@
printk("\nMem-info:\n");
show_free_areas();
printk("Free swap: %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
- for (nid = 0; nid < numnodes; nid++) {
+ for_each_online_node(nid) {
struct page * lmem_map = node_mem_map(nid);
i = node_spanned_pages(nid);
while (i-- > 0) {
diff -Nru a/arch/arm/mm/init.c b/arch/arm/mm/init.c
--- a/arch/arm/mm/init.c Mon Mar 29 01:03:59 2004
+++ b/arch/arm/mm/init.c Mon Mar 29 01:03:59 2004
@@ -69,7 +69,7 @@
show_free_areas();
printk("Free swap: %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
struct page *page, *end;
page = NODE_MEM_MAP(node);
@@ -172,7 +172,7 @@
{
unsigned int i, bootmem_pages = 0, memend_pfn = 0;
- for (i = 0; i < MAX_NUMNODES; i++) {
+ for_each_node(i) {
np[i].start = -1U;
np[i].end = 0;
np[i].bootmap_pages = 0;
@@ -192,18 +192,13 @@
node = mi->bank[i].node;
- if (node >= numnodes) {
- numnodes = node + 1;
-
- /*
- * Make sure we haven't exceeded the maximum number
- * of nodes that we have in this configuration. If
- * we have, we're in trouble. (maybe we ought to
- * limit, instead of bugging?)
- */
- if (numnodes > MAX_NUMNODES)
- BUG();
- }
+ /*
+ * Make sure we haven't exceeded the maximum number of nodes
+ * that we have in this configuration. If we have, we're in
+ * trouble.
+ */
+ if (!node_online(node) && node_possible(node))
+ node_set_online(node);
/*
* Get the start and end pfns for this bank
@@ -225,7 +220,7 @@
* Calculate the number of pages we require to
* store the bootmem bitmaps.
*/
- for (i = 0; i < numnodes; i++) {
+ for_each_online_node(i) {
if (np[i].end == 0)
continue;
@@ -388,8 +383,8 @@
* (we could also do with rolling bootmem_init and paging_init
* into one generic "memory_init" type function).
*/
- np += numnodes - 1;
- for (node = numnodes - 1; node >= 0; node--, np--) {
+ np += num_online_nodes() - 1;
+ for (node = num_online_nodes() - 1; node >= 0; node--, np--) {
/*
* If there are no pages in this node, ignore it.
* Note that node 0 must always have some pages.
@@ -457,7 +452,7 @@
/*
* initialise the zones within each node
*/
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
unsigned long zone_size[MAX_NR_ZONES];
unsigned long zhole_size[MAX_NR_ZONES];
struct bootmem_data *bdata;
@@ -567,7 +562,7 @@
create_memmap_holes(&meminfo);
/* this will put all unused low memory onto the freelists */
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
pg_data_t *pgdat = NODE_DATA(node);
if (pgdat->node_spanned_pages != 0)
diff -Nru a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
--- a/arch/arm/mm/mm-armv.c Mon Mar 29 01:03:59 2004
+++ b/arch/arm/mm/mm-armv.c Mon Mar 29 01:03:59 2004
@@ -653,6 +653,6 @@
{
int node;
- for (node = 0; node < numnodes; node++)
+ for_each_online_node(node)
free_unused_memmap_node(node, mi);
}
diff -Nru a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
--- a/arch/arm26/mm/init.c Mon Mar 29 01:03:59 2004
+++ b/arch/arm26/mm/init.c Mon Mar 29 01:03:59 2004
@@ -156,7 +156,8 @@
{
unsigned int memend_pfn = 0;
- numnodes = 1;
+ nodes_clear(node_online_map);
+ node_set_online(0);
np->bootmap_pages = 0;
diff -Nru a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
--- a/arch/mips/sgi-ip27/ip27-init.c Mon Mar 29 01:03:59 2004
+++ b/arch/mips/sgi-ip27/ip27-init.c Mon Mar 29 01:03:59 2004
@@ -10,7 +10,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/sched.h>
-#include <linux/mmzone.h> /* for numnodes */
+#include <linux/nodemask.h> /* for node_online_map */
#include <linux/mm.h>
#include <linux/cpumask.h>
#include <asm/cpu.h>
@@ -56,14 +56,13 @@
return COMPACT_TO_NASID_NODEID(cnode) >> NASID_TO_COARSEREG_SHFT;
}
-static void gen_region_mask(hubreg_t *region_mask, int maxnodes)
+static void gen_region_mask(hubreg_t *region_mask)
{
cnodeid_t cnode;
(*region_mask) = 0;
- for (cnode = 0; cnode < maxnodes; cnode++) {
+ for_each_online_node(cnode)
(*region_mask) |= 1ULL << get_region(cnode);
- }
}
static int is_fine_dirmode(void)
@@ -168,7 +167,7 @@
int port;
/* Figure out which routers nodes in question are connected to */
- for (cnode = 0; cnode < numnodes; cnode++) {
+ for_each_online_node(cnode) {
nasid = COMPACT_TO_NASID_NODEID(cnode);
if (nasid == -1) continue;
@@ -235,9 +234,9 @@
for (col = 0; col < MAX_COMPACT_NODES; col++)
node_distances[row][col] = -1;
- for (row = 0; row < numnodes; row++) {
+ for_each_online_node(row) {
nasid = COMPACT_TO_NASID_NODEID(row);
- for (col = 0; col < numnodes; col++) {
+ for_each_online_node(col) {
nasid2 = COMPACT_TO_NASID_NODEID(col);
node_distances[row][col] = node_distance(nasid, nasid2);
}
@@ -257,17 +256,17 @@
printk("************** Topology ********************\n");
printk(" ");
- for (col = 0; col < numnodes; col++)
+ for_each_online_node(col)
printk("%02d ", col);
printk("\n");
- for (row = 0; row < numnodes; row++) {
+ for_each_online_node(row) {
printk("%02d ", row);
- for (col = 0; col < numnodes; col++)
+ for_each_online_node(col)
printk("%2d ", node_distances[row][col]);
printk("\n");
}
- for (cnode = 0; cnode < numnodes; cnode++) {
+ for_each_online_node(cnode) {
nasid = COMPACT_TO_NASID_NODEID(cnode);
if (nasid == -1) continue;
@@ -323,14 +322,14 @@
init_topology_matrix();
dump_topology();
- gen_region_mask(®ion_mask, numnodes);
+ gen_region_mask(®ion_mask);
- setup_replication_mask(numnodes);
+ setup_replication_mask();
/*
* Set all nodes' calias sizes to 8k
*/
- for (i = 0; i < numnodes; i++) {
+ for_each_online_node(i) {
nasid_t nasid;
nasid = COMPACT_TO_NASID_NODEID(i);
diff -Nru a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c
--- a/arch/mips/sgi-ip27/ip27-klnuma.c Mon Mar 29 01:03:59 2004
+++ b/arch/mips/sgi-ip27/ip27-klnuma.c Mon Mar 29 01:03:59 2004
@@ -27,7 +27,7 @@
* kernel. For example, we should never put a copy on a headless node,
* and we should respect the topology of the machine.
*/
-void __init setup_replication_mask(int maxnodes)
+void __init setup_replication_mask(void)
{
static int numa_kernel_replication_ratio;
cnodeid_t cnode;
@@ -44,7 +44,7 @@
numa_kernel_replication_ratio = 1;
#endif
- for (cnode = 1; cnode < numnodes; cnode++) {
+ for (cnode = 1; cnode < num_online_nodes(); cnode++) {
/* See if this node should get a copy of the kernel */
if (numa_kernel_replication_ratio &&
!(cnode % numa_kernel_replication_ratio)) {
@@ -92,7 +92,7 @@
memcpy((void *)dest_kern_start, (void *)source_start, kern_size);
}
-void __init replicate_kernel_text(int maxnodes)
+void __init replicate_kernel_text(void)
{
cnodeid_t cnode;
nasid_t client_nasid;
@@ -103,7 +103,7 @@
/* Record where the master node should get its kernel text */
set_ktext_source(master_nasid, master_nasid);
- for (cnode = 1; cnode < maxnodes; cnode++) {
+ for (cnode = 1; cnode < num_online_nodes(); cnode++) {
client_nasid = COMPACT_TO_NASID_NODEID(cnode);
/* Check if this node should get a copy of the kernel */
diff -Nru a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
--- a/arch/mips/sgi-ip27/ip27-memory.c Mon Mar 29 01:03:59 2004
+++ b/arch/mips/sgi-ip27/ip27-memory.c Mon Mar 29 01:03:59 2004
@@ -137,7 +137,7 @@
pfn_t slot0sz = 0, nodebytes; /* Hack to detect problem configs */
int ignore;
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
numslots = node_getnumslots(node);
ignore = nodebytes = 0;
for (slot = 0; slot < numslots; slot++) {
@@ -183,7 +183,7 @@
num_physpages = szmem();
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
pfn_t slot_firstpfn = slot_getbasepfn(node, 0);
pfn_t slot_lastpfn = slot_firstpfn + slot_getsize(node, 0);
pfn_t slot_freepfn = node_getfirstfree(node);
@@ -225,7 +225,7 @@
pagetable_init();
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
pfn_t start_pfn = slot_getbasepfn(node, 0);
pfn_t end_pfn = node_getmaxclick(node) + 1;
@@ -245,7 +245,7 @@
high_memory = (void *) __va(num_physpages << PAGE_SHIFT);
- for (node = 0; node < numnodes; node++) {
+ for_each_online_node(node) {
unsigned slot, numslots;
struct page *end, *p;
diff -Nru a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
--- a/arch/mips/sgi-ip27/ip27-nmi.c Mon Mar 29 01:03:59 2004
+++ b/arch/mips/sgi-ip27/ip27-nmi.c Mon Mar 29 01:03:59 2004
@@ -183,7 +183,7 @@
{
cnodeid_t cnode;
- for(cnode = 0 ; cnode < numnodes; cnode++)
+ for_each_online_node(cnode)
nmi_node_eframe_save(cnode);
}
@@ -214,13 +214,13 @@
* send NMIs to all cpus on a 256p system.
*/
for (i=0; i < 1500; i++) {
- for (node=0; node < numnodes; node++)
+ for_each_online_node(node)
if (NODEPDA(node)->dump_count == 0)
break;
- if (node == numnodes)
+ if (node == num_online_nodes())
break;
if (i == 1000) {
- for (node=0; node < numnodes; node++)
+ for_each_online_node(node)
if (NODEPDA(node)->dump_count == 0) {
cpu = CNODE_TO_CPU_BASE(node);
for (n=0; n < CNODE_NUM_CPUS(node); cpu++, n++) {
diff -Nru a/arch/mips/sgi-ip27/ip27-reset.c b/arch/mips/sgi-ip27/ip27-reset.c
--- a/arch/mips/sgi-ip27/ip27-reset.c Mon Mar 29 01:03:59 2004
+++ b/arch/mips/sgi-ip27/ip27-reset.c Mon Mar 29 01:03:59 2004
@@ -43,7 +43,7 @@
smp_send_stop();
#endif
#if 0
- for (i = 0; i < numnodes; i++)
+ for_each_online_node(i)
REMOTE_HUB_S(COMPACT_TO_NASID_NODEID(i), PROMOP_REG,
PROMOP_REBOOT);
#else
@@ -59,7 +59,7 @@
#ifdef CONFIG_SMP
smp_send_stop();
#endif
- for (i = 0; i < numnodes; i++)
+ for_each_online_node(i)
REMOTE_HUB_S(COMPACT_TO_NASID_NODEID(i), PROMOP_REG,
PROMOP_RESTART);
LOCAL_HUB_S(NI_PORT_RESET, NPR_PORTRESET | NPR_LOCALRESET);
diff -Nru a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
--- a/arch/mips/sgi-ip27/ip27-smp.c Mon Mar 29 01:03:59 2004
+++ b/arch/mips/sgi-ip27/ip27-smp.c Mon Mar 29 01:03:59 2004
@@ -108,18 +108,18 @@
for (i = 0; i < MAXCPUS; i++)
cpuid_to_compact_node[i] = INVALID_CNODEID;
- numnodes = 0;
+ nodes_clear(node_online_map);
for (i = 0; i < MAX_COMPACT_NODES; i++) {
nasid_t nasid = gdap->g_nasidtable[i];
if (nasid == INVALID_NASID)
break;
compact_to_nasid_node[i] = nasid;
nasid_to_compact_node[nasid] = i;
- numnodes++;
+ node_set_online(i);
highest = do_cpumask(i, nasid, highest);
}
- printk("Discovered %d cpus on %d nodes\n", highest + 1, numnodes);
+ printk("Discovered %d cpus on %d nodes\n", highest + 1, num_online_nodes());
}
void __init prom_build_cpu_map(void)
@@ -155,13 +155,13 @@
{
cnodeid_t cnode;
- for (cnode = 0; cnode < numnodes; cnode++)
+ for_each_online_node(cnode)
intr_clear_all(COMPACT_TO_NASID_NODEID(cnode));
/* Master has already done per_cpu_init() */
install_ipi();
- replicate_kernel_text(numnodes);
+ replicate_kernel_text();
/*
* Assumption to be fixed: we're always booted on logical / physical
diff -Nru a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
--- a/arch/sparc64/mm/hugetlbpage.c Mon Mar 29 01:03:59 2004
+++ b/arch/sparc64/mm/hugetlbpage.c Mon Mar 29 01:03:59 2004
@@ -39,12 +39,11 @@
struct page *page = NULL;
if (list_empty(&hugepage_freelists[nid])) {
- for (nid = 0; nid < MAX_NUMNODES; ++nid)
+ for_each_node(nid)
if (!list_empty(&hugepage_freelists[nid]))
break;
}
- if (nid >= 0 && nid < MAX_NUMNODES &&
- !list_empty(&hugepage_freelists[nid])) {
+ if (node_possible(nid) && !list_empty(&hugepage_freelists[nid])) {
page = list_entry(hugepage_freelists[nid].next,
struct page, list);
list_del(&page->list);
@@ -57,7 +56,7 @@
static int nid = 0;
struct page *page;
page = alloc_pages_node(nid, GFP_HIGHUSER, HUGETLB_PAGE_ORDER);
- nid = (nid + 1) % numnodes;
+ nid = (nid + 1) % num_online_nodes();
return page;
}
@@ -464,7 +463,7 @@
int i;
struct page *page;
- for (i = 0; i < MAX_NUMNODES; ++i)
+ for_each_node(i)
INIT_LIST_HEAD(&hugepage_freelists[i]);
for (i = 0; i < htlbpage_max; ++i) {
diff -Nru a/include/asm-mips/sn/sn_private.h b/include/asm-mips/sn/sn_private.h
--- a/include/asm-mips/sn/sn_private.h Mon Mar 29 01:03:59 2004
+++ b/include/asm-mips/sn/sn_private.h Mon Mar 29 01:03:59 2004
@@ -13,8 +13,8 @@
extern void per_hub_init(cnodeid_t cnode);
extern void install_cpu_nmi_handler(int slice);
extern void install_ipi(void);
-extern void setup_replication_mask(int);
-extern void replicate_kernel_text(int);
+extern void setup_replication_mask(void);
+extern void replicate_kernel_text(void);
extern pfn_t node_getfirstfree(cnodeid_t);
#endif /* __ASM_SN_SN_PRIVATE_H */
diff -Nru a/include/asm-sh/mmzone.h b/include/asm-sh/mmzone.h
--- a/include/asm-sh/mmzone.h Mon Mar 29 01:03:59 2004
+++ b/include/asm-sh/mmzone.h Mon Mar 29 01:03:59 2004
@@ -46,7 +46,7 @@
{
unsigned int i;
- for (i = 0; i < MAX_NUMNODES; i++) {
+ for_each_node(i) {
if (page >= NODE_MEM_MAP(i) &&
page < NODE_MEM_MAP(i) + NODE_DATA(i)->node_size)
return 1;
--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@sgi.com> 1.650.933.1373
reply other threads:[~2004-03-29 13:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040329041544.1f36b518.pj@sgi.com \
--to=pj@sgi.com \
--cc=akpm@osdl.org \
--cc=colpatch@us.ibm.com \
--cc=haveblue@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbligh@aracnet.com \
--cc=wli@holomorphy.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).