From: "Jan Beulich" Subject: [PATCH v2] introduce and use relaxed cpumask bitops Date: Wed, 11 Feb 2015 13:42:26 +0000 Message-ID: <54DB6A52020000780005F0DF@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartE9DC6B52.2__=" Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YLXYl-0005Mn-Eu for xen-devel@lists.xenproject.org; Wed, 11 Feb 2015 13:42:31 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel Cc: Keir Fraser , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Ian Campbell List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartE9DC6B52.2__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Using atomic (LOCKed on x86) bitops for certain of the operations on cpumask_t is overkill when the variables aren't concurrently accessible (e.g. local function variables, or due to explicit locking). Introduce alternatives using non-atomic bitops and use them where appropriate. Note that this - adds a volatile qualifier to cpumask_test_and_{clear,set}_cpu() (should have been there from the beginning, like is the case for cpumask_{clear,set}_cpu()) - replaces several cpumask_clear()+cpumask_set_cpu(, n) pairs by the simpler cpumask_copy(, cpumask_of(n)) (or just cpumask_of(n) if we can do without copying) Signed-off-by: Jan Beulich Acked-by: George Dunlap --- v2: Make naming of new functions consistent with exisiting ones. --- a/xen/arch/x86/hpet.c +++ b/xen/arch/x86/hpet.c @@ -158,7 +158,7 @@ static void evt_do_broadcast(cpumask_t * { unsigned int cpu =3D smp_processor_id(); =20 - if ( cpumask_test_and_clear_cpu(cpu, mask) ) + if ( __cpumask_test_and_clear_cpu(cpu, mask) ) raise_softirq(TIMER_SOFTIRQ); =20 cpuidle_wakeup_mwait(mask); @@ -197,7 +197,7 @@ again: continue; =20 if ( deadline <=3D now ) - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); else if ( deadline < next_event ) next_event =3D deadline; } --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1450,7 +1450,7 @@ void desc_guest_eoi(struct irq_desc *des =20 cpumask_copy(&cpu_eoi_map, action->cpu_eoi_map); =20 - if ( cpumask_test_and_clear_cpu(smp_processor_id(), &cpu_eoi_map) ) + if ( __cpumask_test_and_clear_cpu(smp_processor_id(), &cpu_eoi_map) ) { __set_eoi_ready(desc); spin_unlock(&desc->lock); --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3216,7 +3216,7 @@ long do_mmuext_op( for_each_online_cpu(cpu) if ( !cpumask_intersects(&mask, per_cpu(cpu_sibling_mask, = cpu)) ) - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); flush_mask(&mask, FLUSH_CACHE); } else --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -489,7 +489,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PA =20 if ( !idletime ) { - cpumask_clear_cpu(cpu, cpumap); + __cpumask_clear_cpu(cpu, cpumap); continue; } =20 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -179,7 +179,7 @@ static void smp_send_timer_broadcast_ipi =20 if ( cpumask_test_cpu(cpu, &mask) ) { - cpumask_clear_cpu(cpu, &mask); + __cpumask_clear_cpu(cpu, &mask); raise_softirq(TIMER_SOFTIRQ); } =20 --- a/xen/common/core_parking.c +++ b/xen/common/core_parking.c @@ -75,11 +75,10 @@ static unsigned int core_parking_perform if ( core_weight < core_tmp ) { core_weight =3D core_tmp; - cpumask_clear(&core_candidate_map); - cpumask_set_cpu(cpu, &core_candidate_map); + cpumask_copy(&core_candidate_map, cpumask_of(cpu)); } else if ( core_weight =3D=3D core_tmp ) - cpumask_set_cpu(cpu, &core_candidate_map); + __cpumask_set_cpu(cpu, &core_candidate_map); } =20 for_each_cpu(cpu, &core_candidate_map) @@ -88,11 +87,10 @@ static unsigned int core_parking_perform if ( sibling_weight < sibling_tmp ) { sibling_weight =3D sibling_tmp; - cpumask_clear(&sibling_candidate_map); - cpumask_set_cpu(cpu, &sibling_candidate_map); + cpumask_copy(&sibling_candidate_map, cpumask_of(cpu)); } else if ( sibling_weight =3D=3D sibling_tmp ) - cpumask_set_cpu(cpu, &sibling_candidate_map); + __cpumask_set_cpu(cpu, &sibling_candidate_map); } =20 cpu =3D cpumask_first(&sibling_candidate_map); @@ -135,11 +133,10 @@ static unsigned int core_parking_power(u if ( core_weight > core_tmp ) { core_weight =3D core_tmp; - cpumask_clear(&core_candidate_map); - cpumask_set_cpu(cpu, &core_candidate_map); + cpumask_copy(&core_candidate_map, cpumask_of(cpu)); } else if ( core_weight =3D=3D core_tmp ) - cpumask_set_cpu(cpu, &core_candidate_map); + __cpumask_set_cpu(cpu, &core_candidate_map); } =20 for_each_cpu(cpu, &core_candidate_map) @@ -148,11 +145,10 @@ static unsigned int core_parking_power(u if ( sibling_weight > sibling_tmp ) { sibling_weight =3D sibling_tmp; - cpumask_clear(&sibling_candidate_map); - cpumask_set_cpu(cpu, &sibling_candidate_map); + cpumask_copy(&sibling_candidate_map, cpumask_of(cpu)); } else if ( sibling_weight =3D=3D sibling_tmp ) - cpumask_set_cpu(cpu, &sibling_candidate_map); + __cpumask_set_cpu(cpu, &sibling_candidate_map); } =20 cpu =3D cpumask_first(&sibling_candidate_map); --- a/xen/common/cpu.c +++ b/xen/common/cpu.c @@ -192,7 +192,7 @@ int disable_nonboot_cpus(void) break; } =20 - cpumask_set_cpu(cpu, &frozen_cpus); + __cpumask_set_cpu(cpu, &frozen_cpus); } =20 BUG_ON(!error && (num_online_cpus() !=3D 1)); --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1337,7 +1337,7 @@ static int __init find_non_smt(unsigned=20 if ( cpumask_intersects(dest, per_cpu(cpu_sibling_mask, i)) ) continue; cpu =3D cpumask_first(per_cpu(cpu_sibling_mask, i)); - cpumask_set_cpu(cpu, dest); + __cpumask_set_cpu(cpu, dest); } return cpumask_weight(dest); } @@ -1449,7 +1449,7 @@ void __init scrub_heap_pages(void) cpus =3D find_non_smt(best_node, &node_cpus); if ( cpus =3D=3D 0 ) { - cpumask_set_cpu(smp_processor_id(), &node_cpus); + __cpumask_set_cpu(smp_processor_id(), &node_cpus); cpus =3D 1; } /* We already have the node information from round #0. */ --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -372,7 +372,7 @@ __runq_tickle(unsigned int cpu, struct c { if ( cur->pri !=3D CSCHED_PRI_IDLE ) SCHED_STAT_CRANK(tickle_idlers_none); - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); } else if ( !idlers_empty ) { @@ -422,7 +422,7 @@ __runq_tickle(unsigned int cpu, struct c SCHED_VCPU_STAT_CRANK(cur, migrate_r); SCHED_STAT_CRANK(migrate_kicked_away); set_bit(_VPF_migrating, &cur->vcpu->pause_flags); - cpumask_set_cpu(cpu, &mask); + __cpumask_set_cpu(cpu, &mask); } else if ( !new_idlers_empty ) { @@ -432,7 +432,7 @@ __runq_tickle(unsigned int cpu, struct c { this_cpu(last_tickle_cpu) =3D cpumask_cycle(this_cpu(last_tickle_cpu), = &idle_mask); - cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask); + __cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask); } else cpumask_or(&mask, &mask, &idle_mask); @@ -675,7 +675,7 @@ _csched_cpu_pick(const struct scheduler=20 */ cpumask_and(&idlers, &cpu_online_map, CSCHED_PRIV(ops)->idlers); if ( vc->processor =3D=3D cpu && IS_RUNQ_IDLE(cpu) ) - cpumask_set_cpu(cpu, &idlers); + __cpumask_set_cpu(cpu, &idlers); cpumask_and(&cpus, &cpus, &idlers); =20 /* @@ -692,7 +692,7 @@ _csched_cpu_pick(const struct scheduler=20 */ if ( !cpumask_test_cpu(cpu, &cpus) && !cpumask_empty(&cpus) ) cpu =3D cpumask_cycle(cpu, &cpus); - cpumask_clear_cpu(cpu, &cpus); + __cpumask_clear_cpu(cpu, &cpus); =20 while ( !cpumask_empty(&cpus) ) { @@ -1536,7 +1536,7 @@ csched_load_balance(struct csched_privat /* Find out what the !idle are in this node */ cpumask_andnot(&workers, online, prv->idlers); cpumask_and(&workers, &workers, &node_to_cpumask(peer_node)); - cpumask_clear_cpu(cpu, &workers); + __cpumask_clear_cpu(cpu, &workers); =20 peer_cpu =3D cpumask_first(&workers); if ( peer_cpu >=3D nr_cpu_ids ) --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -663,7 +663,7 @@ burn_budget(const struct scheduler *ops, * lock is grabbed before calling this function */ static struct rt_vcpu * -__runq_pick(const struct scheduler *ops, cpumask_t *mask) +__runq_pick(const struct scheduler *ops, const cpumask_t *mask) { struct list_head *runq =3D rt_runq(ops); struct list_head *iter; @@ -780,10 +780,7 @@ rt_schedule(const struct scheduler *ops, } else { - cpumask_t cur_cpu; - cpumask_clear(&cur_cpu); - cpumask_set_cpu(cpu, &cur_cpu); - snext =3D __runq_pick(ops, &cur_cpu); + snext =3D __runq_pick(ops, cpumask_of(cpu)); if ( snext =3D=3D NULL ) snext =3D rt_vcpu(idle_vcpu[cpu]); =20 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -88,7 +88,7 @@ void cpumask_raise_softirq(const cpumask if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && cpu !=3D this_cpu && !arch_skip_send_event_check(cpu) ) - cpumask_set_cpu(cpu, raise_mask); + __cpumask_set_cpu(cpu, raise_mask); =20 if ( raise_mask =3D=3D &send_mask ) smp_send_event_check_mask(raise_mask); @@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int cpu, if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); else - set_bit(nr, &per_cpu(batch_mask, this_cpu)); + __cpumask_set_cpu(nr, &per_cpu(batch_mask, this_cpu)); } =20 void cpu_raise_softirq_batch_begin(void) @@ -122,7 +122,7 @@ void cpu_raise_softirq_batch_finish(void ASSERT(per_cpu(batching, this_cpu)); for_each_cpu ( cpu, mask ) if ( !softirq_pending(cpu) ) - cpumask_clear_cpu(cpu, mask); + __cpumask_clear_cpu(cpu, mask); smp_send_event_check_mask(mask); cpumask_clear(mask); --per_cpu(batching, this_cpu); --- a/xen/include/xen/cpumask.h +++ b/xen/include/xen/cpumask.h @@ -103,11 +103,21 @@ static inline void cpumask_set_cpu(int c set_bit(cpumask_check(cpu), dstp->bits); } =20 +static inline void __cpumask_set_cpu(int cpu, cpumask_t *dstp) +{ + __set_bit(cpumask_check(cpu), dstp->bits); +} + static inline void cpumask_clear_cpu(int cpu, volatile cpumask_t *dstp) { clear_bit(cpumask_check(cpu), dstp->bits); } =20 +static inline void __cpumask_clear_cpu(int cpu, cpumask_t *dstp) +{ + __clear_bit(cpumask_check(cpu), dstp->bits); +} + static inline void cpumask_setall(cpumask_t *dstp) { bitmap_fill(dstp->bits, nr_cpumask_bits); @@ -122,16 +132,26 @@ static inline void cpumask_clear(cpumask #define cpumask_test_cpu(cpu, cpumask) \ test_bit(cpumask_check(cpu), (cpumask)->bits) =20 -static inline int cpumask_test_and_set_cpu(int cpu, cpumask_t *addr) +static inline int cpumask_test_and_set_cpu(int cpu, volatile cpumask_t = *addr) { return test_and_set_bit(cpumask_check(cpu), addr->bits); } =20 -static inline int cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr) +static inline int __cpumask_test_and_set_cpu(int cpu, cpumask_t *addr) +{ + return __test_and_set_bit(cpumask_check(cpu), addr->bits); +} + +static inline int cpumask_test_and_clear_cpu(int cpu, volatile cpumask_t = *addr) { return test_and_clear_bit(cpumask_check(cpu), addr->bits); } =20 +static inline int __cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr) +{ + return __test_and_clear_bit(cpumask_check(cpu), addr->bits); +} + static inline void cpumask_and(cpumask_t *dstp, const cpumask_t *src1p, const cpumask_t *src2p) { --=__PartE9DC6B52.2__= Content-Type: text/plain; name="cpumask-relax.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="cpumask-relax.patch" introduce and use relaxed cpumask bitops=0A=0AUsing atomic (LOCKed on x86) = bitops for certain of the operations on=0Acpumask_t is overkill when the = variables aren't concurrently accessible=0A(e.g. local function variables, = or due to explicit locking). Introduce=0Aalternatives using non-atomic = bitops and use them where appropriate.=0A=0ANote that this=0A- adds a = volatile qualifier to cpumask_test_and_{clear,set}_cpu()=0A (should have = been there from the beginning, like is the case for=0A cpumask_{clear,set}= _cpu())=0A- replaces several cpumask_clear()+cpumask_set_cpu(, n) pairs by = the=0A simpler cpumask_copy(, cpumask_of(n)) (or just cpumask_of(n) if = we=0A can do without copying)=0A=0ASigned-off-by: Jan Beulich =0AAcked-by: George Dunlap =0A---=0Av2:= Make naming of new functions consistent with exisiting ones.=0A=0A--- = a/xen/arch/x86/hpet.c=0A+++ b/xen/arch/x86/hpet.c=0A@@ -158,7 +158,7 @@ = static void evt_do_broadcast(cpumask_t *=0A {=0A unsigned int cpu =3D = smp_processor_id();=0A =0A- if ( cpumask_test_and_clear_cpu(cpu, mask) = )=0A+ if ( __cpumask_test_and_clear_cpu(cpu, mask) )=0A = raise_softirq(TIMER_SOFTIRQ);=0A =0A cpuidle_wakeup_mwait(mask);=0A@@ = -197,7 +197,7 @@ again:=0A continue;=0A =0A if ( = deadline <=3D now )=0A- cpumask_set_cpu(cpu, &mask);=0A+ = __cpumask_set_cpu(cpu, &mask);=0A else if ( deadline < = next_event )=0A next_event =3D deadline;=0A }=0A--- = a/xen/arch/x86/irq.c=0A+++ b/xen/arch/x86/irq.c=0A@@ -1450,7 +1450,7 @@ = void desc_guest_eoi(struct irq_desc *des=0A =0A cpumask_copy(&c= pu_eoi_map, action->cpu_eoi_map);=0A =0A- if ( cpumask_test_and_clear_cp= u(smp_processor_id(), &cpu_eoi_map) )=0A+ if ( __cpumask_test_and_clear_= cpu(smp_processor_id(), &cpu_eoi_map) )=0A {=0A __set_eoi_ready= (desc);=0A spin_unlock(&desc->lock);=0A--- a/xen/arch/x86/mm.c=0A++= + b/xen/arch/x86/mm.c=0A@@ -3216,7 +3216,7 @@ long do_mmuext_op(=0A = for_each_online_cpu(cpu)=0A if ( !cpumask_inte= rsects(&mask,=0A per_cpu(cpu_s= ibling_mask, cpu)) )=0A- cpumask_set_cpu(cpu, = &mask);=0A+ __cpumask_set_cpu(cpu, &mask);=0A = flush_mask(&mask, FLUSH_CACHE);=0A }=0A = else=0A--- a/xen/arch/x86/platform_hypercall.c=0A+++ b/xen/arch/x86/platfor= m_hypercall.c=0A@@ -489,7 +489,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_P= A=0A =0A if ( !idletime )=0A {=0A- = cpumask_clear_cpu(cpu, cpumap);=0A+ __cpumask_clear_cpu(cpu,= cpumap);=0A continue;=0A }=0A =0A--- = a/xen/arch/x86/time.c=0A+++ b/xen/arch/x86/time.c=0A@@ -179,7 +179,7 @@ = static void smp_send_timer_broadcast_ipi=0A =0A if ( cpumask_test_cpu(c= pu, &mask) )=0A {=0A- cpumask_clear_cpu(cpu, &mask);=0A+ = __cpumask_clear_cpu(cpu, &mask);=0A raise_softirq(TIMER_SOFTIRQ);= =0A }=0A =0A--- a/xen/common/core_parking.c=0A+++ b/xen/common/core_par= king.c=0A@@ -75,11 +75,10 @@ static unsigned int core_parking_perform=0A = if ( core_weight < core_tmp )=0A {=0A = core_weight =3D core_tmp;=0A- cpumask_clear(&core_candidate= _map);=0A- cpumask_set_cpu(cpu, &core_candidate_map);=0A+ = cpumask_copy(&core_candidate_map, cpumask_of(cpu));=0A = }=0A else if ( core_weight =3D=3D core_tmp )=0A- = cpumask_set_cpu(cpu, &core_candidate_map);=0A+ = __cpumask_set_cpu(cpu, &core_candidate_map);=0A }=0A =0A = for_each_cpu(cpu, &core_candidate_map)=0A@@ -88,11 +87,10 @@ static = unsigned int core_parking_perform=0A if ( sibling_weight < = sibling_tmp )=0A {=0A sibling_weight =3D = sibling_tmp;=0A- cpumask_clear(&sibling_candidate_map);=0A- = cpumask_set_cpu(cpu, &sibling_candidate_map);=0A+ = cpumask_copy(&sibling_candidate_map, cpumask_of(cpu));=0A = }=0A else if ( sibling_weight =3D=3D sibling_tmp )=0A- = cpumask_set_cpu(cpu, &sibling_candidate_map);=0A+ = __cpumask_set_cpu(cpu, &sibling_candidate_map);=0A }=0A =0A = cpu =3D cpumask_first(&sibling_candidate_map);=0A@@ -135,11 +133,10 @@ = static unsigned int core_parking_power(u=0A if ( core_weight > = core_tmp )=0A {=0A core_weight =3D core_tmp;=0A= - cpumask_clear(&core_candidate_map);=0A- = cpumask_set_cpu(cpu, &core_candidate_map);=0A+ cpumask_copy(= &core_candidate_map, cpumask_of(cpu));=0A }=0A = else if ( core_weight =3D=3D core_tmp )=0A- cpumask_set_cpu(= cpu, &core_candidate_map);=0A+ __cpumask_set_cpu(cpu, = &core_candidate_map);=0A }=0A =0A for_each_cpu(cpu, = &core_candidate_map)=0A@@ -148,11 +145,10 @@ static unsigned int core_parki= ng_power(u=0A if ( sibling_weight > sibling_tmp )=0A = {=0A sibling_weight =3D sibling_tmp;=0A- = cpumask_clear(&sibling_candidate_map);=0A- cpumask_set_cpu(c= pu, &sibling_candidate_map);=0A+ cpumask_copy(&sibling_candi= date_map, cpumask_of(cpu));=0A }=0A else if ( = sibling_weight =3D=3D sibling_tmp )=0A- cpumask_set_cpu(cpu,= &sibling_candidate_map);=0A+ __cpumask_set_cpu(cpu, = &sibling_candidate_map);=0A }=0A =0A cpu =3D cpumask_first(= &sibling_candidate_map);=0A--- a/xen/common/cpu.c=0A+++ b/xen/common/cpu.c= =0A@@ -192,7 +192,7 @@ int disable_nonboot_cpus(void)=0A = break;=0A }=0A =0A- cpumask_set_cpu(cpu, &frozen_cpus);=0A+ = __cpumask_set_cpu(cpu, &frozen_cpus);=0A }=0A =0A BUG_ON(!er= ror && (num_online_cpus() !=3D 1));=0A--- a/xen/common/page_alloc.c=0A+++ = b/xen/common/page_alloc.c=0A@@ -1337,7 +1337,7 @@ static int __init = find_non_smt(unsigned =0A if ( cpumask_intersects(dest, per_cpu(cpu= _sibling_mask, i)) )=0A continue;=0A cpu =3D cpumask_fi= rst(per_cpu(cpu_sibling_mask, i));=0A- cpumask_set_cpu(cpu, = dest);=0A+ __cpumask_set_cpu(cpu, dest);=0A }=0A return = cpumask_weight(dest);=0A }=0A@@ -1449,7 +1449,7 @@ void __init scrub_heap_p= ages(void)=0A cpus =3D find_non_smt(best_node, &node_cpus);=0A = if ( cpus =3D=3D 0 )=0A {=0A- cpumask_set_cpu(smp_pr= ocessor_id(), &node_cpus);=0A+ __cpumask_set_cpu(smp_processor_i= d(), &node_cpus);=0A cpus =3D 1;=0A }=0A /* We = already have the node information from round #0. */=0A--- a/xen/common/sche= d_credit.c=0A+++ b/xen/common/sched_credit.c=0A@@ -372,7 +372,7 @@ = __runq_tickle(unsigned int cpu, struct c=0A {=0A if ( cur->pri = !=3D CSCHED_PRI_IDLE )=0A SCHED_STAT_CRANK(tickle_idlers_none);= =0A- cpumask_set_cpu(cpu, &mask);=0A+ __cpumask_set_cpu(cpu, = &mask);=0A }=0A else if ( !idlers_empty )=0A {=0A@@ -422,7 = +422,7 @@ __runq_tickle(unsigned int cpu, struct c=0A = SCHED_VCPU_STAT_CRANK(cur, migrate_r);=0A SCHED_STAT_CRANK(= migrate_kicked_away);=0A set_bit(_VPF_migrating, &cur->vcpu= ->pause_flags);=0A- cpumask_set_cpu(cpu, &mask);=0A+ = __cpumask_set_cpu(cpu, &mask);=0A }=0A = else if ( !new_idlers_empty )=0A {=0A@@ -432,7 +432,7 @@ = __runq_tickle(unsigned int cpu, struct c=0A {=0A = this_cpu(last_tickle_cpu) =3D=0A = cpumask_cycle(this_cpu(last_tickle_cpu), &idle_mask);=0A- = cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask);=0A+ = __cpumask_set_cpu(this_cpu(last_tickle_cpu), &mask);=0A = }=0A else=0A cpumask_or(&mask, &mask, = &idle_mask);=0A@@ -675,7 +675,7 @@ _csched_cpu_pick(const struct scheduler = =0A */=0A cpumask_and(&idlers, &cpu_online_map, CSCHED_PRI= V(ops)->idlers);=0A if ( vc->processor =3D=3D cpu && IS_RUNQ_IDLE(c= pu) )=0A- cpumask_set_cpu(cpu, &idlers);=0A+ = __cpumask_set_cpu(cpu, &idlers);=0A cpumask_and(&cpus, &cpus, = &idlers);=0A =0A /*=0A@@ -692,7 +692,7 @@ _csched_cpu_pick(const = struct scheduler =0A */=0A if ( !cpumask_test_cpu(cpu, = &cpus) && !cpumask_empty(&cpus) )=0A cpu =3D cpumask_cycle(cpu,= &cpus);=0A- cpumask_clear_cpu(cpu, &cpus);=0A+ __cpumask_cle= ar_cpu(cpu, &cpus);=0A =0A while ( !cpumask_empty(&cpus) )=0A = {=0A@@ -1536,7 +1536,7 @@ csched_load_balance(struct csched_privat=0A = /* Find out what the !idle are in this node */=0A = cpumask_andnot(&workers, online, prv->idlers);=0A cpumask_and(&= workers, &workers, &node_to_cpumask(peer_node));=0A- cpumask_cle= ar_cpu(cpu, &workers);=0A+ __cpumask_clear_cpu(cpu, &workers);= =0A =0A peer_cpu =3D cpumask_first(&workers);=0A = if ( peer_cpu >=3D nr_cpu_ids )=0A--- a/xen/common/sched_rt.c=0A+++ = b/xen/common/sched_rt.c=0A@@ -663,7 +663,7 @@ burn_budget(const struct = scheduler *ops,=0A * lock is grabbed before calling this function=0A = */=0A static struct rt_vcpu *=0A-__runq_pick(const struct scheduler *ops, = cpumask_t *mask)=0A+__runq_pick(const struct scheduler *ops, const = cpumask_t *mask)=0A {=0A struct list_head *runq =3D rt_runq(ops);=0A = struct list_head *iter;=0A@@ -780,10 +780,7 @@ rt_schedule(const struct = scheduler *ops,=0A }=0A else=0A {=0A- cpumask_t = cur_cpu;=0A- cpumask_clear(&cur_cpu);=0A- cpumask_set_cpu(cpu= , &cur_cpu);=0A- snext =3D __runq_pick(ops, &cur_cpu);=0A+ = snext =3D __runq_pick(ops, cpumask_of(cpu));=0A if ( snext =3D=3D = NULL )=0A snext =3D rt_vcpu(idle_vcpu[cpu]);=0A =0A--- = a/xen/common/softirq.c=0A+++ b/xen/common/softirq.c=0A@@ -88,7 +88,7 @@ = void cpumask_raise_softirq(const cpumask=0A if ( !test_and_set_bit(= nr, &softirq_pending(cpu)) &&=0A cpu !=3D this_cpu &&=0A = !arch_skip_send_event_check(cpu) )=0A- cpumask_set_cpu(c= pu, raise_mask);=0A+ __cpumask_set_cpu(cpu, raise_mask);=0A =0A = if ( raise_mask =3D=3D &send_mask )=0A smp_send_event_check_mas= k(raise_mask);=0A@@ -106,7 +106,7 @@ void cpu_raise_softirq(unsigned int = cpu,=0A if ( !per_cpu(batching, this_cpu) || in_irq() )=0A = smp_send_event_check_cpu(cpu);=0A else=0A- set_bit(nr, = &per_cpu(batch_mask, this_cpu));=0A+ __cpumask_set_cpu(nr, = &per_cpu(batch_mask, this_cpu));=0A }=0A =0A void cpu_raise_softirq_batch_b= egin(void)=0A@@ -122,7 +122,7 @@ void cpu_raise_softirq_batch_finish(void= =0A ASSERT(per_cpu(batching, this_cpu));=0A for_each_cpu ( cpu, = mask )=0A if ( !softirq_pending(cpu) )=0A- cpumask_clear= _cpu(cpu, mask);=0A+ __cpumask_clear_cpu(cpu, mask);=0A = smp_send_event_check_mask(mask);=0A cpumask_clear(mask);=0A = --per_cpu(batching, this_cpu);=0A--- a/xen/include/xen/cpumask.h=0A+++ = b/xen/include/xen/cpumask.h=0A@@ -103,11 +103,21 @@ static inline void = cpumask_set_cpu(int c=0A set_bit(cpumask_check(cpu), dstp->bits);=0A= }=0A =0A+static inline void __cpumask_set_cpu(int cpu, cpumask_t = *dstp)=0A+{=0A+ __set_bit(cpumask_check(cpu), dstp->bits);=0A+}=0A+=0A = static inline void cpumask_clear_cpu(int cpu, volatile cpumask_t *dstp)=0A = {=0A clear_bit(cpumask_check(cpu), dstp->bits);=0A }=0A =0A+static = inline void __cpumask_clear_cpu(int cpu, cpumask_t *dstp)=0A+{=0A+ = __clear_bit(cpumask_check(cpu), dstp->bits);=0A+}=0A+=0A static inline = void cpumask_setall(cpumask_t *dstp)=0A {=0A bitmap_fill(dstp->bits, = nr_cpumask_bits);=0A@@ -122,16 +132,26 @@ static inline void cpumask_clear(= cpumask=0A #define cpumask_test_cpu(cpu, cpumask) \=0A test_bit(cpumask_ch= eck(cpu), (cpumask)->bits)=0A =0A-static inline int cpumask_test_and_set_cp= u(int cpu, cpumask_t *addr)=0A+static inline int cpumask_test_and_set_cpu(i= nt cpu, volatile cpumask_t *addr)=0A {=0A return test_and_set_bit(cpu= mask_check(cpu), addr->bits);=0A }=0A =0A-static inline int cpumask_test_an= d_clear_cpu(int cpu, cpumask_t *addr)=0A+static inline int __cpumask_test_a= nd_set_cpu(int cpu, cpumask_t *addr)=0A+{=0A+ return __test_and_set_bit(c= pumask_check(cpu), addr->bits);=0A+}=0A+=0A+static inline int cpumask_test_= and_clear_cpu(int cpu, volatile cpumask_t *addr)=0A {=0A return = test_and_clear_bit(cpumask_check(cpu), addr->bits);=0A }=0A =0A+static = inline int __cpumask_test_and_clear_cpu(int cpu, cpumask_t *addr)=0A+{=0A+ = return __test_and_clear_bit(cpumask_check(cpu), addr->bits);=0A+}=0A+=0A = static inline void cpumask_and(cpumask_t *dstp, const cpumask_t *src1p,=0A = const cpumask_t *src2p)=0A {=0A --=__PartE9DC6B52.2__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --=__PartE9DC6B52.2__=--