Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 41314790883c8ad2dfb2cb295eb8177069627044

Authored by Jack Steiner
Committed by Linus Torvalds
1 parent 54465dcc03
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

gru: check for correct GRU chiplet assignment 

Simplify the code that checks for correct assignment of GRU contexts to
users.

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>

Showing 1 changed file with 30 additions and 14 deletions Side-by-side Diff

drivers/misc/sgi-gru/grumain.c
Diff comments   View file @ 4131479
... ... @@ -53,12 +53,16 @@
53 53 */
54 54 int gru_cpu_fault_map_id(void)
55 55 {
  56 +#ifdef CONFIG_IA64
  57 + return uv_blade_processor_id() % GRU_NUM_TFM;
  58 +#else
56 59 int cpu = smp_processor_id();
57 60 int id, core;
58 61  
59 62 core = uv_cpu_core_number(cpu);
60 63 id = core + UV_MAX_INT_CORES * uv_cpu_socket_number(cpu);
61 64 return id;
  65 +#endif
62 66 }
63 67  
64 68 /*--------- ASID Management -------------------------------------------
65 69  
66 70  
... ... @@ -699,15 +703,34 @@
699 703 }
700 704  
701 705 /*
  706 + * Check if a GRU context is allowed to use a specific chiplet. By default
  707 + * a context is assigned to any blade-local chiplet. However, users can
  708 + * override this.
  709 + * Returns 1 if assignment allowed, 0 otherwise
  710 + */
  711 +static int gru_check_chiplet_assignment(struct gru_state *gru,
  712 + struct gru_thread_state *gts)
  713 +{
  714 + int blade_id;
  715 + int chiplet_id;
  716 +
  717 + blade_id = gts->ts_user_blade_id;
  718 + if (blade_id < 0)
  719 + blade_id = uv_numa_blade_id();
  720 +
  721 + chiplet_id = gts->ts_user_chiplet_id;
  722 + return gru->gs_blade_id == blade_id &&
  723 + (chiplet_id < 0 || chiplet_id == gru->gs_chiplet_id);
  724 +}
  725 +
  726 +/*
702 727 * Unload the gru context if it is not assigned to the correct blade or
703 728 * chiplet. Misassignment can occur if the process migrates to a different
704 729 * blade or if the user changes the selected blade/chiplet.
705   - * Return 0 if context correct placed, otherwise 1
706 730 */
707 731 void gru_check_context_placement(struct gru_thread_state *gts)
708 732 {
709 733 struct gru_state *gru;
710   - int blade_id, chiplet_id;
711 734  
712 735 /*
713 736 * If the current task is the context owner, verify that the
... ... @@ -718,13 +741,7 @@
718 741 if (!gru || gts->ts_tgid_owner != current->tgid)
719 742 return;
720 743  
721   - blade_id = gts->ts_user_blade_id;
722   - if (blade_id < 0)
723   - blade_id = uv_numa_blade_id();
724   -
725   - chiplet_id = gts->ts_user_chiplet_id;
726   - if (gru->gs_blade_id != blade_id ||
727   - (chiplet_id >= 0 && chiplet_id != gru->gs_chiplet_id)) {
  744 + if (!gru_check_chiplet_assignment(gru, gts)) {
728 745 STAT(check_context_unload);
729 746 gru_unload_context(gts, 1);
730 747 } else if (gru_retarget_intr(gts)) {
731 748  
... ... @@ -768,9 +785,9 @@
768 785 struct gru_state *gru, *gru0;
769 786 struct gru_thread_state *ngts = NULL;
770 787 int ctxnum, ctxnum0, flag = 0, cbr, dsr;
771   - int blade_id = gts->ts_user_blade_id;
772   - int chiplet_id = gts->ts_user_chiplet_id;
  788 + int blade_id;
773 789  
  790 + blade_id = gts->ts_user_blade_id;
774 791 if (blade_id < 0)
775 792 blade_id = uv_numa_blade_id();
776 793 cbr = gts->ts_cbr_au_count;
... ... @@ -788,7 +805,7 @@
788 805 ctxnum0 = ctxnum;
789 806 gru0 = gru;
790 807 while (1) {
791   - if (chiplet_id < 0 || chiplet_id == gru->gs_chiplet_id) {
  808 + if (gru_check_chiplet_assignment(gru, gts)) {
792 809 if (check_gru_resources(gru, cbr, dsr, GRU_NUM_CCH))
793 810 break;
794 811 spin_lock(&gru->gs_lock);
... ... @@ -853,7 +870,6 @@
853 870 struct gru_state *gru, *grux;
854 871 int i, max_active_contexts;
855 872 int blade_id = gts->ts_user_blade_id;
856   - int chiplet_id = gts->ts_user_chiplet_id;
857 873  
858 874 if (blade_id < 0)
859 875 blade_id = uv_numa_blade_id();
... ... @@ -861,7 +877,7 @@
861 877 gru = NULL;
862 878 max_active_contexts = GRU_NUM_CCH;
863 879 for_each_gru_on_blade(grux, blade_id, i) {
864   - if (chiplet_id >= 0 && chiplet_id != grux->gs_chiplet_id)
  880 + if (!gru_check_chiplet_assignment(grux, gts))
865 881 continue;
866 882 if (check_gru_resources(grux, gts->ts_cbr_au_count,
867 883 gts->ts_dsr_au_count,