lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, UV: Initialize BAU hub map

Browse Source 
Fix uninitialized uvhub_mask:

- An unitialized bit map variable was causing initialization of
  non-existant hubs (this one causes boot panics).

- And the bit map was too small for large machines.  This patch
  makes it dynamic in size.

- Fix the case where socket 0 has no enabled cpu's. Don't assume
  every hub has a socket 0.

- uv_init_per_cpu() should be __init.

Signed-off-by: Cliff Wickman <cpw@sgi.com>
Cc: <stable@kernel.org> # for .35.x
LKML-Reference: <E1Oeuyt-0004XS-0y@eag09.americas.sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cliff Wickman
2010-07-30 14:10:55 -05:00
committed by Ingo Molnar
parent 5edd19af18
commit c4026cfd8f
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
arch/x86/kernel/tlb_uv.c
View File

@ -1484,15 +1484,16 @@ calculate_destination_timeout(void)
/* /*
* initialize the bau_control structure for each cpu * initialize the bau_control structure for each cpu
*/ */
static void uv_init_per_cpu(int nuvhubs) static void __init uv_init_per_cpu(int nuvhubs)
{ {
int i; int i;
int cpu; int cpu;
int pnode; int pnode;
int uvhub; int uvhub;
int have_hmaster;
short socket = 0; short socket = 0;
unsigned short socket_mask; unsigned short socket_mask;
unsigned int uvhub_mask; unsigned char *uvhub_mask;
struct bau_control *bcp; struct bau_control *bcp;
struct uvhub_desc *bdp; struct uvhub_desc *bdp;
struct socket_desc *sdp; struct socket_desc *sdp;
@ -1516,28 +1517,29 @@ static void uv_init_per_cpu(int nuvhubs)
uvhub_descs = (struct uvhub_desc *) uvhub_descs = (struct uvhub_desc *)
kmalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL); kmalloc(nuvhubs * sizeof(struct uvhub_desc), GFP_KERNEL);
memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc)); memset(uvhub_descs, 0, nuvhubs * sizeof(struct uvhub_desc));
uvhub_mask = kzalloc((nuvhubs+7)/8, GFP_KERNEL);
for_each_present_cpu(cpu) { for_each_present_cpu(cpu) {
bcp = &per_cpu(bau_control, cpu); bcp = &per_cpu(bau_control, cpu);
memset(bcp, 0, sizeof(struct bau_control)); memset(bcp, 0, sizeof(struct bau_control));
pnode = uv_cpu_hub_info(cpu)->pnode; pnode = uv_cpu_hub_info(cpu)->pnode;
uvhub = uv_cpu_hub_info(cpu)->numa_blade_id; uvhub = uv_cpu_hub_info(cpu)->numa_blade_id;
uvhub_mask |= (1 << uvhub); *(uvhub_mask + (uvhub/8)) |= (1 << (uvhub%8));
bdp = &uvhub_descs[uvhub]; bdp = &uvhub_descs[uvhub];
bdp->num_cpus++; bdp->num_cpus++;
bdp->uvhub = uvhub; bdp->uvhub = uvhub;
bdp->pnode = pnode; bdp->pnode = pnode;
/* kludge: 'assuming' one node per socket, and assuming that /* kludge: 'assuming' one node per socket, and assuming that
disabling a socket just leaves a gap in node numbers */ disabling a socket just leaves a gap in node numbers */
socket = (cpu_to_node(cpu) & 1);; socket = (cpu_to_node(cpu) & 1);
bdp->socket_mask |= (1 << socket); bdp->socket_mask |= (1 << socket);
sdp = &bdp->socket[socket]; sdp = &bdp->socket[socket];
sdp->cpu_number[sdp->num_cpus] = cpu; sdp->cpu_number[sdp->num_cpus] = cpu;
sdp->num_cpus++; sdp->num_cpus++;
} }
uvhub = 0; for (uvhub = 0; uvhub < nuvhubs; uvhub++) {
while (uvhub_mask) { if (!(*(uvhub_mask + (uvhub/8)) & (1 << (uvhub%8))))
if (!(uvhub_mask & 1)) continue;
goto nexthub; have_hmaster = 0;
bdp = &uvhub_descs[uvhub]; bdp = &uvhub_descs[uvhub];
socket_mask = bdp->socket_mask; socket_mask = bdp->socket_mask;
socket = 0; socket = 0;
@ -1551,8 +1553,10 @@ static void uv_init_per_cpu(int nuvhubs)
bcp->cpu = cpu; bcp->cpu = cpu;
if (i == 0) { if (i == 0) {
smaster = bcp; smaster = bcp;
if (socket == 0) if (!have_hmaster) {
have_hmaster++;
hmaster = bcp; hmaster = bcp;
}
} }
bcp->cpus_in_uvhub = bdp->num_cpus; bcp->cpus_in_uvhub = bdp->num_cpus;
bcp->cpus_in_socket = sdp->num_cpus; bcp->cpus_in_socket = sdp->num_cpus;
@ -1566,11 +1570,9 @@ nextsocket:
socket++; socket++;
socket_mask = (socket_mask >> 1); socket_mask = (socket_mask >> 1);
} }
nexthub:
uvhub++;
uvhub_mask = (uvhub_mask >> 1);
} }
kfree(uvhub_descs); kfree(uvhub_descs);
kfree(uvhub_mask);
for_each_present_cpu(cpu) { for_each_present_cpu(cpu) {
bcp = &per_cpu(bau_control, cpu); bcp = &per_cpu(bau_control, cpu);
bcp->baudisabled = 0; bcp->baudisabled = 0;