From patchwork Mon Feb 27 18:23:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 143241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2ECD6B6FD6 for ; Tue, 28 Feb 2012 05:23:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754557Ab2B0SXb (ORCPT ); Mon, 27 Feb 2012 13:23:31 -0500 Received: from cantor2.suse.de ([195.135.220.15]:37965 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753422Ab2B0SX3 (ORCPT ); Mon, 27 Feb 2012 13:23:29 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 895EF8FE2D; Mon, 27 Feb 2012 19:23:28 +0100 (CET) Message-ID: <4F4BCA1F.5040905@suse.de> Date: Mon, 27 Feb 2012 19:23:27 +0100 From: Alexander Graf User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.14) Gecko/20110221 SUSE/3.1.8 Thunderbird/3.1.8 MIME-Version: 1.0 To: Bhushan Bharat-R65777 Cc: "kvm-ppc@vger.kernel.org" , "kvm@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , Wood Scott-B07421 Subject: Re: [PATCH 24/37] KVM: PPC: booke: rework rescheduling checks References: <1330093591-19523-1-git-send-email-agraf@suse.de> <1330093591-19523-25-git-send-email-agraf@suse.de> <6A3DF150A5B70D4F9B66A25E3F7C888D141083@039-SN2MPN1-023.039d.mgd.msft.net> <4F4BBE55.6020204@suse.de> In-Reply-To: <4F4BBE55.6020204@suse.de> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org On 02/27/2012 06:33 PM, Alexander Graf wrote: > On 02/27/2012 05:34 PM, Bhushan Bharat-R65777 wrote: >> >>> +} >>> + >>> +/* >>> + * Common checks before entering the guest world. Call with >>> interrupts >>> + * disabled. >>> + * >>> + * returns !0 if a signal is pending and check_signal is true */ >>> +static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu, bool >>> +check_signal) { >>> + int r = 0; >>> + >>> + WARN_ON_ONCE(!irqs_disabled()); >>> + while (true) { >>> + if (need_resched()) { >>> + local_irq_enable(); >>> + cond_resched(); >>> + local_irq_disable(); >>> + continue; >>> + } >>> + >>> + if (kvmppc_core_prepare_to_enter(vcpu)) { >> kvmppc_prepare_to_enter() is called even on heavyweight_exit. Should >> not this be called only on lightweight_exit? > > Yeah, we don't need to call it when exiting anyways. That's a > functional change though, which this patch is trying not to introduce. > So we should rather do that as a patch on top. So how about this (warning! broken whitespace)? @@ -483,7 +483,7 @@ static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu, bool check_signal) continue; } - if (check_signal && signal_pending(current)) + if (signal_pending(current)) r = 1; break; @@ -507,7 +507,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) } local_irq_disable(); - if (kvmppc_prepare_to_enter(vcpu, true)) { + if (kvmppc_prepare_to_enter(vcpu)) { kvm_run->exit_reason = KVM_EXIT_INTR; ret = -EINTR; goto out; @@ -941,13 +941,16 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, * To avoid clobbering exit_reason, only check for signals if we * aren't already exiting to userspace for some other reason. */ - local_irq_disable(); - if (kvmppc_prepare_to_enter(vcpu, !(r & RESUME_HOST))) { - run->exit_reason = KVM_EXIT_INTR; - r = (-EINTR << 2) | RESUME_HOST | (r & RESUME_FLAG_NV); - kvmppc_account_exit(vcpu, SIGNAL_EXITS); + if (!(r & RESUME_HOST)) { + local_irq_disable(); + if (kvmppc_prepare_to_enter(vcpu)) { + run->exit_reason = KVM_EXIT_INTR; + r = (-EINTR << 2) | RESUME_HOST | (r & RESUME_FLAG_NV); + kvmppc_account_exit(vcpu, SIGNAL_EXITS); + } } +out: return r; } --- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 7a16b56..616aa2d 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -464,7 +464,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) * * returns !0 if a signal is pending and check_signal is true */ -static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu, bool check_signal) +static int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) { int r = 0;