Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 123 insertions, 127 deletions

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index bcef00766a64..0cd340b72632 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -17,159 +17,140 @@
 #include <linux/smp.h>
 #include <linux/cpuset.h>
 #include <asm/delay.h>
-#include <asm/s390_ext.h>
-#include <asm/sysinfo.h>
-
-#define CPU_BITS 64
-#define NR_MAG 6
 
 #define PTF_HORIZONTAL  (0UL)
 #define PTF_VERTICAL    (1UL)
 #define PTF_CHECK       (2UL)
 
-struct tl_cpu {
-        unsigned char reserved0[4];
-        unsigned char :6;
-        unsigned char pp:2;
-        unsigned char reserved1;
-        unsigned short origin;
-        unsigned long mask[CPU_BITS / BITS_PER_LONG];
-};
-
-struct tl_container {
-        unsigned char reserved[7];
-        unsigned char id;
-};
-
-union tl_entry {
-        unsigned char nl;
-        struct tl_cpu cpu;
-        struct tl_container container;
-};
-
-struct tl_info {
-        unsigned char reserved0[2];
-        unsigned short length;
-        unsigned char mag[NR_MAG];
-        unsigned char reserved1;
-        unsigned char mnest;
-        unsigned char reserved2[4];
-        union tl_entry tle[0];
-};
-
-struct core_info {
-        struct core_info *next;
+struct mask_info {
+        struct mask_info *next;
         unsigned char id;
         cpumask_t mask;
 };
 
-static int topology_enabled;
+static int topology_enabled = 1;
 static void topology_work_fn(struct work_struct *work);
-static struct tl_info *tl_info;
-static struct core_info core_info;
-static int machine_has_topology;
+static struct sysinfo_15_1_x *tl_info;
 static struct timer_list topology_timer;
 static void set_topology_timer(void);
 static DECLARE_WORK(topology_work, topology_work_fn);
 /* topology_lock protects the core linked list */
 static DEFINE_SPINLOCK(topology_lock);
 
+static struct mask_info core_info;
 cpumask_t cpu_core_map[NR_CPUS];
 unsigned char cpu_core_id[NR_CPUS];
 
-static cpumask_t cpu_coregroup_map(unsigned int cpu)
+#ifdef CONFIG_SCHED_BOOK
+static struct mask_info book_info;
+cpumask_t cpu_book_map[NR_CPUS];
+unsigned char cpu_book_id[NR_CPUS];
+#endif
+
+static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
 {
-        struct core_info *core = &core_info;
-        unsigned long flags;
         cpumask_t mask;
 
-        cpus_clear(mask);
-        if (!topology_enabled || !machine_has_topology)
-                return cpu_possible_map;
-        spin_lock_irqsave(&topology_lock, flags);
-        while (core) {
-                if (cpu_isset(cpu, core->mask)) {
-                        mask = core->mask;
+        cpumask_clear(&mask);
+        if (!topology_enabled || !MACHINE_HAS_TOPOLOGY) {
+                cpumask_copy(&mask, cpumask_of(cpu));
+                return mask;
+        }
+        while (info) {
+                if (cpumask_test_cpu(cpu, &info->mask)) {
+                        mask = info->mask;
                         break;
                 }
-                core = core->next;
+                info = info->next;
         }
-        spin_unlock_irqrestore(&topology_lock, flags);
-        if (cpus_empty(mask))
-                mask = cpumask_of_cpu(cpu);
+        if (cpumask_empty(&mask))
+                cpumask_copy(&mask, cpumask_of(cpu));
         return mask;
 }
 
-const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
-{
-        return &cpu_core_map[cpu];
-}
-
-static void add_cpus_to_core(struct tl_cpu *tl_cpu, struct core_info *core)
+static void add_cpus_to_mask(struct topology_cpu *tl_cpu,
+                             struct mask_info *book, struct mask_info *core)
 {
         unsigned int cpu;
 
-        for (cpu = find_first_bit(&tl_cpu->mask[0], CPU_BITS);
-             cpu < CPU_BITS;
-             cpu = find_next_bit(&tl_cpu->mask[0], CPU_BITS, cpu + 1))
+        for (cpu = find_first_bit(&tl_cpu->mask[0], TOPOLOGY_CPU_BITS);
+             cpu < TOPOLOGY_CPU_BITS;
+             cpu = find_next_bit(&tl_cpu->mask[0], TOPOLOGY_CPU_BITS, cpu + 1))
         {
                 unsigned int rcpu, lcpu;
 
-                rcpu = CPU_BITS - 1 - cpu + tl_cpu->origin;
+                rcpu = TOPOLOGY_CPU_BITS - 1 - cpu + tl_cpu->origin;
                 for_each_present_cpu(lcpu) {
-                        if (cpu_logical_map(lcpu) == rcpu) {
-                                cpu_set(lcpu, core->mask);
-                                cpu_core_id[lcpu] = core->id;
-                                smp_cpu_polarization[lcpu] = tl_cpu->pp;
-                        }
+                        if (cpu_logical_map(lcpu) != rcpu)
+                                continue;
+#ifdef CONFIG_SCHED_BOOK
+                        cpumask_set_cpu(lcpu, &book->mask);
+                        cpu_book_id[lcpu] = book->id;
+#endif
+                        cpumask_set_cpu(lcpu, &core->mask);
+                        cpu_core_id[lcpu] = core->id;
+                        smp_cpu_polarization[lcpu] = tl_cpu->pp;
                 }
         }
 }
 
-static void clear_cores(void)
+static void clear_masks(void)
 {
-        struct core_info *core = &core_info;
+        struct mask_info *info;
 
-        while (core) {
-                cpus_clear(core->mask);
-                core = core->next;
+        info = &core_info;
+        while (info) {
+                cpumask_clear(&info->mask);
+                info = info->next;
         }
+#ifdef CONFIG_SCHED_BOOK
+        info = &book_info;
+        while (info) {
+                cpumask_clear(&info->mask);
+                info = info->next;
+        }
+#endif
 }
 
-static union tl_entry *next_tle(union tl_entry *tle)
+static union topology_entry *next_tle(union topology_entry *tle)
 {
-        if (tle->nl)
-                return (union tl_entry *)((struct tl_container *)tle + 1);
-        else
-                return (union tl_entry *)((struct tl_cpu *)tle + 1);
+        if (!tle->nl)
+                return (union topology_entry *)((struct topology_cpu *)tle + 1);
+        return (union topology_entry *)((struct topology_container *)tle + 1);
 }
 
-static void tl_to_cores(struct tl_info *info)
+static void tl_to_cores(struct sysinfo_15_1_x *info)
 {
-        union tl_entry *tle, *end;
-        struct core_info *core = &core_info;
+#ifdef CONFIG_SCHED_BOOK
+        struct mask_info *book = &book_info;
+#else
+        struct mask_info *book = NULL;
+#endif
+        struct mask_info *core = &core_info;
+        union topology_entry *tle, *end;
+
 
         spin_lock_irq(&topology_lock);
-        clear_cores();
+        clear_masks();
         tle = info->tle;
-        end = (union tl_entry *)((unsigned long)info + info->length);
+        end = (union topology_entry *)((unsigned long)info + info->length);
         while (tle < end) {
                 switch (tle->nl) {
-                case 5:
-                case 4:
-                case 3:
+#ifdef CONFIG_SCHED_BOOK
                 case 2:
+                        book = book->next;
+                        book->id = tle->container.id;
                         break;
+#endif
                 case 1:
                         core = core->next;
                         core->id = tle->container.id;
                         break;
                 case 0:
-                        add_cpus_to_core(&tle->cpu, core);
+                        add_cpus_to_mask(&tle->cpu, book, core);
                         break;
                 default:
-                        clear_cores();
-                        machine_has_topology = 0;
+                        clear_masks();
                         goto out;
                 }
                 tle = next_tle(tle);
@@ -206,7 +187,7 @@ int topology_set_cpu_management(int fc)
         int cpu;
         int rc;
 
-        if (!machine_has_topology)
+        if (!MACHINE_HAS_TOPOLOGY)
                 return -EOPNOTSUPP;
         if (fc)
                 rc = ptf(PTF_VERTICAL);
@@ -221,24 +202,43 @@ int topology_set_cpu_management(int fc)
 
 static void update_cpu_core_map(void)
 {
+        unsigned long flags;
         int cpu;
 
-        for_each_possible_cpu(cpu)
-                cpu_core_map[cpu] = cpu_coregroup_map(cpu);
+        spin_lock_irqsave(&topology_lock, flags);
+        for_each_possible_cpu(cpu) {
+                cpu_core_map[cpu] = cpu_group_map(&core_info, cpu);
+#ifdef CONFIG_SCHED_BOOK
+                cpu_book_map[cpu] = cpu_group_map(&book_info, cpu);
+#endif
+        }
+        spin_unlock_irqrestore(&topology_lock, flags);
+}
+
+void store_topology(struct sysinfo_15_1_x *info)
+{
+#ifdef CONFIG_SCHED_BOOK
+        int rc;
+
+        rc = stsi(info, 15, 1, 3);
+        if (rc != -ENOSYS)
+                return;
+#endif
+        stsi(info, 15, 1, 2);
 }
 
 int arch_update_cpu_topology(void)
 {
-        struct tl_info *info = tl_info;
+        struct sysinfo_15_1_x *info = tl_info;
         struct sys_device *sysdev;
         int cpu;
 
-        if (!machine_has_topology) {
+        if (!MACHINE_HAS_TOPOLOGY) {
                 update_cpu_core_map();
                 topology_update_polarization_simple();
                 return 0;
         }
-        stsi(info, 15, 1, 2);
+        store_topology(info);
         tl_to_cores(info);
         update_cpu_core_map();
         for_each_online_cpu(cpu) {
@@ -275,9 +275,9 @@ static void set_topology_timer(void)
 
 static int __init early_parse_topology(char *p)
 {
-        if (strncmp(p, "on", 2))
+        if (strncmp(p, "off", 3))
                 return 0;
-        topology_enabled = 1;
+        topology_enabled = 0;
         return 0;
 }
 early_param("topology", early_parse_topology);
@@ -287,7 +287,7 @@ static int __init init_topology_update(void)
         int rc;
 
         rc = 0;
-        if (!machine_has_topology) {
+        if (!MACHINE_HAS_TOPOLOGY) {
                 topology_update_polarization_simple();
                 goto out;
         }
@@ -299,41 +299,37 @@ out:
 }
 __initcall(init_topology_update);
 
+static void alloc_masks(struct sysinfo_15_1_x *info, struct mask_info *mask,
+                        int offset)
+{
+        int i, nr_masks;
+
+        nr_masks = info->mag[TOPOLOGY_NR_MAG - offset];
+        for (i = 0; i < info->mnest - offset; i++)
+                nr_masks *= info->mag[TOPOLOGY_NR_MAG - offset - 1 - i];
+        nr_masks = max(nr_masks, 1);
+        for (i = 0; i < nr_masks; i++) {
+                mask->next = alloc_bootmem(sizeof(struct mask_info));
+                mask = mask->next;
+        }
+}
+
 void __init s390_init_cpu_topology(void)
 {
-        unsigned long long facility_bits;
-        struct tl_info *info;
-        struct core_info *core;
-        int nr_cores;
+        struct sysinfo_15_1_x *info;
         int i;
 
-        if (stfle(&facility_bits, 1) <= 0)
-                return;
-        if (!(facility_bits & (1ULL << 52)) || !(facility_bits & (1ULL << 61)))
+        if (!MACHINE_HAS_TOPOLOGY)
                 return;
-        machine_has_topology = 1;
-
         tl_info = alloc_bootmem_pages(PAGE_SIZE);
         info = tl_info;
-        stsi(info, 15, 1, 2);
-
-        nr_cores = info->mag[NR_MAG - 2];
-        for (i = 0; i < info->mnest - 2; i++)
-                nr_cores *= info->mag[NR_MAG - 3 - i];
-
+        store_topology(info);
         pr_info("The CPU configuration topology of the machine is:");
-        for (i = 0; i < NR_MAG; i++)
+        for (i = 0; i < TOPOLOGY_NR_MAG; i++)
                 printk(" %d", info->mag[i]);
         printk(" / %d\n", info->mnest);
-
-        core = &core_info;
-        for (i = 0; i < nr_cores; i++) {
-                core->next = alloc_bootmem(sizeof(struct core_info));
-                core = core->next;
-                if (!core)
-                        goto error;
-        }
-        return;
-error:
-        machine_has_topology = 0;
+        alloc_masks(info, &core_info, 2);
+#ifdef CONFIG_SCHED_BOOK
+        alloc_masks(info, &book_info, 3);
+#endif
 }