From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keir Fraser Subject: Re: [PATCH v9 1/2] xen: introduce vcpu_block Date: Mon, 29 Apr 2013 11:29:19 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Stefano Stabellini Cc: "xen-devel@lists.xensource.com" , Keir Fraser , Ian Campbell , "Tim (Xen.org)" , Julien Grall List-Id: xen-devel@lists.xenproject.org On 29/04/2013 11:15, "Stefano Stabellini" wrote: > forgot to CC the Xen maintainers on this one Acked-by: Keir Fraser > On Tue, 23 Apr 2013, Stefano Stabellini wrote: >> Rename do_block to vcpu_block. >> >> Move the call to local_event_delivery_enable out of vcpu_block, to a new >> static function called vcpu_block_enable_events. >> >> Use vcpu_block_enable_events instead of do_block throughout in >> schedule.c >> >> >> Changes in v9: >> - return void from vcpu_block and vcpu_block_enable_events; >> - make vcpu_block_enable_events static. >> >> Changes in v8: >> - rename do_block to vcpu_block; >> - move local_event_delivery_enable out of vcpu_block to >> vcpu_block_enable_events. >> >> Changes in v7: >> - introduce a event_delivery_enable parameter to make the call to >> local_event_delivery_enable conditional; >> - export do_block as is. >> >> Signed-off-by: Stefano Stabellini >> --- >> xen/common/schedule.c | 13 ++++++++----- >> xen/include/xen/sched.h | 1 + >> 2 files changed, 9 insertions(+), 5 deletions(-) >> >> diff --git a/xen/common/schedule.c b/xen/common/schedule.c >> index c1cd3d0..e526602 100644 >> --- a/xen/common/schedule.c >> +++ b/xen/common/schedule.c >> @@ -677,11 +677,10 @@ int vcpu_set_affinity(struct vcpu *v, const cpumask_t >> *affinity) >> } >> >> /* Block the currently-executing domain until a pertinent event occurs. */ >> -static long do_block(void) >> +void vcpu_block(void) >> { >> struct vcpu *v = current; >> >> - local_event_delivery_enable(); >> set_bit(_VPF_blocked, &v->pause_flags); >> >> /* Check for events /after/ blocking: avoids wakeup waiting race. */ >> @@ -694,8 +693,12 @@ static long do_block(void) >> TRACE_2D(TRC_SCHED_BLOCK, v->domain->domain_id, v->vcpu_id); >> raise_softirq(SCHEDULE_SOFTIRQ); >> } >> +} >> >> - return 0; >> +static void vcpu_block_enable_events(void) >> +{ >> + local_event_delivery_enable(); >> + vcpu_block(); >> } >> >> static long do_poll(struct sched_poll *sched_poll) >> @@ -870,7 +873,7 @@ long do_sched_op_compat(int cmd, unsigned long arg) >> >> case SCHEDOP_block: >> { >> - ret = do_block(); >> + vcpu_block_enable_events(); >> break; >> } >> >> @@ -907,7 +910,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) >> arg) >> >> case SCHEDOP_block: >> { >> - ret = do_block(); >> + vcpu_block_enable_events(); >> break; >> } >> >> diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h >> index ad971d2..beadc42 100644 >> --- a/xen/include/xen/sched.h >> +++ b/xen/include/xen/sched.h >> @@ -690,6 +690,7 @@ static inline int vcpu_runnable(struct vcpu *v) >> atomic_read(&v->domain->pause_count)); >> } >> >> +void vcpu_block(void); >> void vcpu_unblock(struct vcpu *v); >> void vcpu_pause(struct vcpu *v); >> void vcpu_pause_nosync(struct vcpu *v); >> -- >> 1.7.2.5 >>