diff options
| author | Jack Steiner | 2009-12-16 01:48:05 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-12-16 16:20:15 +0100 |
| commit | 55484c45dbeca2eec7642932ec3f60f8a2d4bdbf (patch) | |
| tree | 4927e959a656def901bb105605df4ab6977ab2d1 /drivers/misc/sgi-gru/grufault.c | |
| parent | gru: allow users to specify gru chiplet 1 (diff) | |
| download | kernel-qcow2-linux-55484c45dbeca2eec7642932ec3f60f8a2d4bdbf.tar.gz kernel-qcow2-linux-55484c45dbeca2eec7642932ec3f60f8a2d4bdbf.tar.xz kernel-qcow2-linux-55484c45dbeca2eec7642932ec3f60f8a2d4bdbf.zip | |
gru: allow users to specify gru chiplet 2
Add support to the GRU driver to allow users to specify the blade &
chiplet for allocation of GRU contexts. Add new statistics for context
loading/unloading/retargeting. Also deleted a few GRU stats that were no
longer being unused.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-gru/grufault.c')
| -rw-r--r-- | drivers/misc/sgi-gru/grufault.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index a69d119921ff..321ad809f345 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -546,17 +546,7 @@ int gru_handle_user_call_os(unsigned long cb) if (ucbnum >= gts->ts_cbr_au_count * GRU_CBR_AU_SIZE) goto exit; - /* - * If force_unload is set, the UPM TLB fault is phony. The task - * has migrated to another node and the GSEG must be moved. Just - * unload the context. The task will page fault and assign a new - * context. - */ - if (gts->ts_tgid_owner == current->tgid && gts->ts_blade >= 0 && - gts->ts_blade != uv_numa_blade_id()) { - STAT(call_os_offnode_reference); - gts->ts_force_unload = 1; - } + gru_check_context_placement(gts); /* * CCH may contain stale data if ts_force_cch_reload is set. @@ -771,6 +761,7 @@ int gru_set_context_option(unsigned long arg) } else { gts->ts_user_blade_id = req.val1; gts->ts_user_chiplet_id = req.val0; + gru_check_context_placement(gts); } break; case sco_gseg_owner: |