From patchwork Tue Aug 13 20:02:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghavendra K T X-Patchwork-Id: 2843987 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 238FBBF546 for ; Tue, 13 Aug 2013 19:56:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BDBC20501 for ; Tue, 13 Aug 2013 19:56:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60F85204F7 for ; Tue, 13 Aug 2013 19:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758774Ab3HMT4L (ORCPT ); Tue, 13 Aug 2013 15:56:11 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:44716 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758177Ab3HMT4J (ORCPT ); Tue, 13 Aug 2013 15:56:09 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Aug 2013 13:56:08 -0600 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 13 Aug 2013 13:56:06 -0600 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 06A2838C8071; Tue, 13 Aug 2013 15:56:00 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7DJu1Bt152256; Tue, 13 Aug 2013 15:56:01 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r7DJttiV024401; Tue, 13 Aug 2013 16:56:00 -0300 Received: from kernel.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r7DJttk2024349; Tue, 13 Aug 2013 16:55:55 -0300 Received: from linux.vnet.ibm.com (unknown [9.77.121.154]) by kernel.stglabs.ibm.com (Postfix) with SMTP id C732C240315; Tue, 13 Aug 2013 12:55:44 -0700 (PDT) Date: Wed, 14 Aug 2013 01:32:11 +0530 From: Raghavendra K T To: Ingo Molnar Cc: "H. Peter Anvin" , Raghavendra K T , linux-kernel@vger.kernel.org, x86@kernel.org, jeremy@goop.org, konrad.wilk@oracle.com, gleb@redhat.com, pbonzini@redhat.com, gregkh@suse.de, peterz@infradead.org, tglx@linutronix.de, agraf@suse.de, riel@redhat.com, avi.kivity@gmail.com, habanero@linux.vnet.ibm.com, chegu_vinod@hp.com, ouyang@cs.pitt.edu, drjones@redhat.com, attilio.rao@citrix.com, linux-doc@vger.kernel.org, torvalds@linux-foundation.org, kvm@vger.kernel.org, andi@firstfloor.org, xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org, stefano.stabellini@eu.citrix.com, mtosatti@redhat.com, srivatsa.vaddagiri@gmail.com, Srivatsa Vaddagiri , Suzuki Poulose Subject: Re: [PATCH delta V13 14/14] kvm : Paravirtual ticketlocks support for linux guests running on KVM hypervisor Message-ID: <20130813200211.GA27811@linux.vnet.ibm.com> Reply-To: Raghavendra K T References: <1376058122-8248-1-git-send-email-raghavendra.kt@linux.vnet.ibm.com> <1376058122-8248-15-git-send-email-raghavendra.kt@linux.vnet.ibm.com> <20130810193849.GA25260@linux.vnet.ibm.com> <520A620B.6070702@zytor.com> <20130813165552.GA6795@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130813165552.GA6795@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13081319-3620-0000-0000-000003EC5024 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * Ingo Molnar [2013-08-13 18:55:52]: > Would be nice to have a delta fix patch against tip:x86/spinlocks, which > I'll then backmerge into that series via rebasing it. > There was a namespace collision of PER_CPU lock_waiting variable when we have both Xen and KVM enabled. Perhaps this week wasn't for me. Had run 100 times randconfig in a loop for the fix sent earlier :(. Ingo, below delta patch should fix it, IIRC, I hope you will be folding this back to patch 14/14 itself. Else please let me. I have already run allnoconfig, allyesconfig, randconfig with below patch. But will test again. This should apply on top of tip:x86/spinlocks. ---8<--- From: Raghavendra K T Fix Namespace collision for lock_waiting Signed-off-by: Raghavendra K T --- -- To unsubscribe from this list: send the line "unsubscribe kvm" 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/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index d442471..b8ef630 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -673,7 +673,7 @@ struct kvm_lock_waiting { static cpumask_t waiting_cpus; /* Track spinlock on which a cpu is waiting */ -static DEFINE_PER_CPU(struct kvm_lock_waiting, lock_waiting); +static DEFINE_PER_CPU(struct kvm_lock_waiting, klock_waiting); static void kvm_lock_spinning(struct arch_spinlock *lock, __ticket_t want) { @@ -685,7 +685,7 @@ static void kvm_lock_spinning(struct arch_spinlock *lock, __ticket_t want) if (in_nmi()) return; - w = &__get_cpu_var(lock_waiting); + w = &__get_cpu_var(klock_waiting); cpu = smp_processor_id(); start = spin_time_start(); @@ -756,7 +756,7 @@ static void kvm_unlock_kick(struct arch_spinlock *lock, __ticket_t ticket) add_stats(RELEASED_SLOW, 1); for_each_cpu(cpu, &waiting_cpus) { - const struct kvm_lock_waiting *w = &per_cpu(lock_waiting, cpu); + const struct kvm_lock_waiting *w = &per_cpu(klock_waiting, cpu); if (ACCESS_ONCE(w->lock) == lock && ACCESS_ONCE(w->want) == ticket) { add_stats(RELEASED_SLOW_KICKED, 1);