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

Commit ceca5db1 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpumask: Add cpu isolation support"

parents e591e3ee 7a74af63

include/linux/cpumask.h

+17 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ extern unsigned int nr_cpu_ids; 
 *     cpu_present_mask - has bit 'cpu' set iff cpu is populated

 *     cpu_online_mask  - has bit 'cpu' set iff cpu available to scheduler

 *     cpu_active_mask  - has bit 'cpu' set iff cpu available to migration

 *     cpu_isolated_mask- has bit 'cpu' set iff cpu isolated

 *

 *  If !CONFIG_HOTPLUG_CPU, present == possible, and active == online.

 *
@@ -90,29 +91,35 @@ extern struct cpumask __cpu_possible_mask; 
extern struct cpumask __cpu_online_mask;

extern struct cpumask __cpu_present_mask;

extern struct cpumask __cpu_active_mask;

extern struct cpumask __cpu_isolated_mask;

#define cpu_possible_mask ((const struct cpumask *)&__cpu_possible_mask)

#define cpu_online_mask   ((const struct cpumask *)&__cpu_online_mask)

#define cpu_present_mask  ((const struct cpumask *)&__cpu_present_mask)

#define cpu_active_mask   ((const struct cpumask *)&__cpu_active_mask)

#define cpu_isolated_mask ((const struct cpumask *)&__cpu_isolated_mask)



#if NR_CPUS > 1

#define num_online_cpus()	cpumask_weight(cpu_online_mask)

#define num_possible_cpus()	cpumask_weight(cpu_possible_mask)

#define num_present_cpus()	cpumask_weight(cpu_present_mask)

#define num_active_cpus()	cpumask_weight(cpu_active_mask)

#define num_isolated_cpus()	cpumask_weight(cpu_isolated_mask)

#define cpu_online(cpu)		cpumask_test_cpu((cpu), cpu_online_mask)

#define cpu_possible(cpu)	cpumask_test_cpu((cpu), cpu_possible_mask)

#define cpu_present(cpu)	cpumask_test_cpu((cpu), cpu_present_mask)

#define cpu_active(cpu)		cpumask_test_cpu((cpu), cpu_active_mask)

#define cpu_isolated(cpu)	cpumask_test_cpu((cpu), cpu_isolated_mask)

#else

#define num_online_cpus()	1U

#define num_possible_cpus()	1U

#define num_present_cpus()	1U

#define num_active_cpus()	1U

#define num_isolated_cpus()	0U

#define cpu_online(cpu)		((cpu) == 0)

#define cpu_possible(cpu)	((cpu) == 0)

#define cpu_present(cpu)	((cpu) == 0)

#define cpu_active(cpu)		((cpu) == 0)

#define cpu_isolated(cpu)	((cpu) != 0)

#endif



static inline void cpu_max_bits_warn(unsigned int cpu, unsigned int bits)
@@ -777,6 +784,7 @@ extern const DECLARE_BITMAP(cpu_all_bits, NR_CPUS); 
#define for_each_possible_cpu(cpu) for_each_cpu((cpu), cpu_possible_mask)

#define for_each_online_cpu(cpu)   for_each_cpu((cpu), cpu_online_mask)

#define for_each_present_cpu(cpu)  for_each_cpu((cpu), cpu_present_mask)

#define for_each_isolated_cpu(cpu) for_each_cpu((cpu), cpu_isolated_mask)



/* Wrappers for arch boot code to manipulate normally-constant masks */

void init_cpu_present(const struct cpumask *src);
@@ -824,6 +832,15 @@ set_cpu_active(unsigned int cpu, bool active) 
		cpumask_clear_cpu(cpu, &__cpu_active_mask);

}



static inline void

set_cpu_isolated(unsigned int cpu, bool isolated)

{

	if (isolated)

		cpumask_set_cpu(cpu, &__cpu_isolated_mask);

	else

		cpumask_clear_cpu(cpu, &__cpu_isolated_mask);

}





/**

 * to_cpumask - convert an NR_CPUS bitmap to a struct cpumask *

kernel/cpu.c

+8 −0
Original line number Diff line number Diff line
@@ -2231,6 +2231,9 @@ EXPORT_SYMBOL(__cpu_present_mask); 
struct cpumask __cpu_active_mask __read_mostly;

EXPORT_SYMBOL(__cpu_active_mask);



struct cpumask __cpu_isolated_mask __read_mostly;

EXPORT_SYMBOL(__cpu_isolated_mask);



void init_cpu_present(const struct cpumask *src)

{

	cpumask_copy(&__cpu_present_mask, src);
@@ -2246,6 +2249,11 @@ void init_cpu_online(const struct cpumask *src) 
	cpumask_copy(&__cpu_online_mask, src);

}



void init_cpu_isolated(const struct cpumask *src)

{

	cpumask_copy(&__cpu_isolated_mask, src);

}



/*

 * Activate the first processor.

 */