Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9628937d authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86: cleanup some remaining usages of NR_CPUS where s/b nr_cpu_ids 



Impact: Reduce future system panics due to cpumask operations using NR_CPUS

Insure that code does not look at bits >= nr_cpu_ids as when cpumasks are
allocated based on nr_cpu_ids, these extra bits will not be defined.

Also some other minor updates:

   * change in to use cpu accessor function set_cpu_present() instead of
     directly accessing cpu_present_map w/cpu_clear() [arch/x86/kernel/reboot.c]

   * use cpumask_of() instead of &cpumask_of_cpu() [arch/x86/kernel/reboot.c]

   * optimize some cpu_mask_to_apicid_and functions.

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6ca09dfc

arch/x86/include/asm/es7000/apic.h

+3 −29
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) 


	num_bits_set = cpumask_weight(cpumask);

	/* Return id to all */

	if (num_bits_set == NR_CPUS)

	if (num_bits_set == nr_cpu_ids)

		return 0xFF;

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not
@@ -190,7 +190,7 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 


	num_bits_set = cpus_weight(*cpumask);

	/* Return id to all */

	if (num_bits_set == NR_CPUS)

	if (num_bits_set == nr_cpu_ids)

		return cpu_to_logical_apicid(0);

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not
@@ -218,9 +218,6 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,

						  const struct cpumask *andmask)

{

	int num_bits_set;

	int cpus_found = 0;

	int cpu;

	int apicid = cpu_to_logical_apicid(0);

	cpumask_var_t cpumask;
@@ -229,31 +226,8 @@ static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask, 


	cpumask_and(cpumask, inmask, andmask);

	cpumask_and(cpumask, cpumask, cpu_online_mask);

	apicid = cpu_mask_to_apicid(cpumask);



	num_bits_set = cpumask_weight(cpumask);

	/* Return id to all */

	if (num_bits_set == NR_CPUS)

		goto exit;

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not

	 * on the same apicid cluster return default value of TARGET_CPUS.

	 */

	cpu = cpumask_first(cpumask);

	apicid = cpu_to_logical_apicid(cpu);

	while (cpus_found < num_bits_set) {

		if (cpumask_test_cpu(cpu, cpumask)) {

			int new_apicid = cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n", __func__);

				return cpu_to_logical_apicid(0);

			}

			apicid = new_apicid;

			cpus_found++;

		}

		cpu++;

	}

exit:

	free_cpumask_var(cpumask);

	return apicid;

}

arch/x86/include/asm/lguest.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define SHARED_SWITCHER_PAGES \

	DIV_ROUND_UP(end_switcher_text - start_switcher_text, PAGE_SIZE)

/* Pages for switcher itself, then two pages per cpu */

#define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * NR_CPUS)

#define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids)



/* We map at -4M for ease of mapping into the guest (one PTE page). */

#define SWITCHER_ADDR 0xFFC00000

arch/x86/include/asm/numaq/apic.h

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map) 
extern u8 cpu_2_logical_apicid[];

static inline int cpu_to_logical_apicid(int cpu)

{

       if (cpu >= NR_CPUS)

	if (cpu >= nr_cpu_ids)

		return BAD_APICID;

	return (int)cpu_2_logical_apicid[cpu];

}

arch/x86/include/asm/summit/apic.h

+8 −34
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline void init_apic_ldr(void) 
	int i;



	/* Create logical APIC IDs by counting CPUs already in cluster. */

	for (count = 0, i = NR_CPUS; --i >= 0; ) {

	for (count = 0, i = nr_cpu_ids; --i >= 0; ) {

		lid = cpu_2_logical_apicid[i];

		if (lid != BAD_APICID && apicid_cluster(lid) == my_cluster)

			++count;
@@ -97,7 +97,7 @@ static inline int apicid_to_node(int logical_apicid) 
static inline int cpu_to_logical_apicid(int cpu)

{

#ifdef CONFIG_SMP

       if (cpu >= NR_CPUS)

	if (cpu >= nr_cpu_ids)

		return BAD_APICID;

	return (int)cpu_2_logical_apicid[cpu];

#else
@@ -107,7 +107,7 @@ static inline int cpu_to_logical_apicid(int cpu) 


static inline int cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < NR_CPUS)

	if (mps_cpu < nr_cpu_ids)

		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);

	else

		return BAD_APICID;
@@ -146,7 +146,7 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 


	num_bits_set = cpus_weight(*cpumask);

	/* Return id to all */

	if (num_bits_set == NR_CPUS)

	if (num_bits_set >= nr_cpu_ids)

		return (int) 0xFF;

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not
@@ -173,42 +173,16 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) 
static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,

						  const struct cpumask *andmask)

{

	int num_bits_set;

	int cpus_found = 0;

	int cpu;

	int apicid = 0xFF;

	int apicid = cpu_to_logical_apicid(0);

	cpumask_var_t cpumask;



	if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC))

		return (int) 0xFF;

		return apicid;



	cpumask_and(cpumask, inmask, andmask);

	cpumask_and(cpumask, cpumask, cpu_online_mask);

	apicid = cpu_mask_to_apicid(cpumask);



	num_bits_set = cpumask_weight(cpumask);

	/* Return id to all */

	if (num_bits_set == nr_cpu_ids)

		goto exit;

	/*

	 * The cpus in the mask must all be on the apic cluster.  If are not

	 * on the same apicid cluster return default value of TARGET_CPUS.

	 */

	cpu = cpumask_first(cpumask);

	apicid = cpu_to_logical_apicid(cpu);

	while (cpus_found < num_bits_set) {

		if (cpumask_test_cpu(cpu, cpumask)) {

			int new_apicid = cpu_to_logical_apicid(cpu);

			if (apicid_cluster(apicid) !=

					apicid_cluster(new_apicid)){

				printk ("%s: Not a valid mask!\n", __func__);

				return 0xFF;

			}

			apicid = apicid | new_apicid;

			cpus_found++;

		}

		cpu++;

	}

exit:

	free_cpumask_var(cpumask);

	return apicid;

}

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ EXPORT_SYMBOL(acpi_map_lsapic); 
int acpi_unmap_lsapic(int cpu)

{

	per_cpu(x86_cpu_to_apicid, cpu) = -1;

	cpu_clear(cpu, cpu_present_map);

	set_cpu_present(cpu, false);

	num_processors--;



	return (0);