Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753943Ab1BGLfZ (ORCPT ); Mon, 7 Feb 2011 06:35:25 -0500 Received: from thoth.sbs.de ([192.35.17.2]:32979 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753508Ab1BGLfY (ORCPT ); Mon, 7 Feb 2011 06:35:24 -0500 Message-ID: <4D4FD8EE.6040009@siemens.com> Date: Mon, 07 Feb 2011 12:35:10 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Zachary Amsden CC: Avi Kivity , Marcelo Tosatti , kvm , Linux Kernel Mailing List Subject: Re: [PATCH] KVM: x86: Convert tsc_write_lock to raw_spinlock References: <4D4BCB97.6000900@siemens.com> <4D4C698A.4010201@redhat.com> In-Reply-To: <4D4C698A.4010201@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1733 Lines: 52 On 2011-02-04 22:03, Zachary Amsden wrote: > On 02/04/2011 04:49 AM, Jan Kiszka wrote: >> Code under this lock requires non-preemptibility. Ensure this also over >> -rt by converting it to raw spinlock. >> > > Oh dear, I had forgotten about that. I believe kvm_lock might have the > same assumption in a few places regarding clock. I only found a problematic section in kvmclock_cpufreq_notifier. Didn't see this during my tests as I have CPUFREQ disabled in my .config. We may need something like this as converting kvm_lock would likely be overkill: diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 36f54fb..971ee0d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4530,7 +4530,7 @@ static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long va struct cpufreq_freqs *freq = data; struct kvm *kvm; struct kvm_vcpu *vcpu; - int i, send_ipi = 0; + int i, me, send_ipi = 0; /* * We allow guests to temporarily run on slowing clocks, @@ -4583,9 +4583,11 @@ static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long va kvm_for_each_vcpu(i, vcpu, kvm) { if (vcpu->cpu != freq->cpu) continue; + me = get_cpu(); kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); - if (vcpu->cpu != smp_processor_id()) + if (vcpu->cpu != me) send_ipi = 1; + put_cpu(); } } spin_unlock(&kvm_lock); Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/