From patchwork Tue Apr 10 15:05:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10333325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9B9F96053F for ; Tue, 10 Apr 2018 15:10:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8035E26D05 for ; Tue, 10 Apr 2018 15:10:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 562AC22A65; Tue, 10 Apr 2018 15:10:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F3E0326253 for ; Tue, 10 Apr 2018 15:06:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZAUHcu6D+ce+HvhnjiVX2fvJtke4lkWZRaVIIvo0jlA=; b=D6Y/+UYRdBaUnD xvZlmRwxk85CTp0kodaXzk94ATulstiEzuj8//60lzsao2bx9+hm1dgtmTFS1/kEgwrf13NKI0OHW hc2f9iI5FrHNC3FypdyV0UOM8JQR+YkQOxw1debTvICruIOKOI2vJrAtsjGmX0ucUHJ7qloXQgH2S jZ+alRLkSehgeiNFrtWknxo49gFiiV1U+zJ5niRu+dxjejr6b/nFIUeLR6vFKr7TC4A/4LM345Uzr u5Pdc175w7DSnNh6CxLLpIJmJ0P7+hWineE1x+xyQ+yt/OFgWcs1usEKwORANVRYyCqUASHHjcR99 Pzcnj9pS/vTK+o6DNu+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5uqN-0005H5-Ms; Tue, 10 Apr 2018 15:05:59 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f5uqJ-0005FC-BC for linux-arm-kernel@lists.infradead.org; Tue, 10 Apr 2018 15:05:57 +0000 Received: by mail-wm0-x243.google.com with SMTP id o23so22005178wmf.0 for ; Tue, 10 Apr 2018 08:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=christofferdall-dk.20150623.gappssmtp.com; s=20150623; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=/38sU1nLxw2PMNqdedPJo5+mHT69nWXkqGc68QY24wg=; b=Nor02yVf26EW520WgeW/ghfc1mSQw4932B+OdeNmfQSsovqA1cBDkruZxYOBedfJsM zGjqn/WJL0BTlkolgPJqOKl8p6v/KmvFe+VDIqXWupbm8MEkyO/ilTILY46hCFAkyRqd N8Mey5bpST0qKiVwW2dsZzdqyrFQLu8O/Z6dStVF9WCpu58px9heB/00gwflDyHfnt4t 5hCOwbg7FS/cLjYK00AWMJNpV+Re6nVS3D9YgE8zYWLKyMVQ0BtM+Uaq53IVW2uYxowm Vn/0vrcqDgm/ePYcJY2WkN2adQOb/NlO0Y8J/aKbZj3nPb6HiKJNAGn/VIJigCWZR3SD Fs1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=/38sU1nLxw2PMNqdedPJo5+mHT69nWXkqGc68QY24wg=; b=X+xLHQW2GZFkrkBlHZGsAzGcM1pvAWDWQBx2nKEPM/Q/iaTGBmUsrFecJ8q09mdZko Lw3eJzz8mCVANwMybc4W7F/S8RUc9+OeL9LujZUogEvUuGRPbz1ZwiioeQQKm8ameG5G Drbvb2z4wCRz7/YReImCf5mz0cqPZloKoPiOd/ShvANg2j1XD6Ou+9Tu8hYtQhrcsrAb SKuDGRuxFchgYSWOstd3lq/yz8Tdjgu7dabJERKn/BAZVt6856Vh4nvwi+hwjJCTtU2f luAwPJG2TB30P1dGQ7ueSyZTLkafN4CHIRsQPYjQ8pvQGJWjDbSrhBvT8+nKm+F9kCMX t/Gg== X-Gm-Message-State: ALQs6tBQxBOBUPr8gDmAKn9vD9wfYfeWQhDy0DZxMBR//VqysKvWGfzF yX6CnbtBHNrsOknZf3LIHdsC1w== X-Google-Smtp-Source: AIpwx484X7GlEWffMA/XE3MlAf0v+Vo+VWey+o/+Hv8i6NcDCHLRYFH0BGoQkPd4JPYuMprZ2bhdVA== X-Received: by 10.80.137.149 with SMTP id g21mr3906448edg.25.1523372742469; Tue, 10 Apr 2018 08:05:42 -0700 (PDT) Received: from localhost (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id f21sm854572edd.65.2018.04.10.08.05.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 08:05:41 -0700 (PDT) Date: Tue, 10 Apr 2018 17:05:40 +0200 From: Christoffer Dall To: Mark Rutland Subject: Re: [PATCH] KVM: arm/arm64: Close VMID generation race Message-ID: <20180410150540.GK10904@cbox> References: <20180409170706.23541-1-marc.zyngier@arm.com> <20180409205139.GH10904@cbox> <20180410105119.yzzzd4lyvlsvtbfy@lakrids.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180410105119.yzzzd4lyvlsvtbfy@lakrids.cambridge.arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180410_080555_383409_EB07E057 X-CRM114-Status: GOOD ( 36.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Shannon Zhao , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Apr 10, 2018 at 11:51:19AM +0100, Mark Rutland wrote: > On Mon, Apr 09, 2018 at 10:51:39PM +0200, Christoffer Dall wrote: > > On Mon, Apr 09, 2018 at 06:07:06PM +0100, Marc Zyngier wrote: > > > Before entering the guest, we check whether our VMID is still > > > part of the current generation. In order to avoid taking a lock, > > > we start with checking that the generation is still current, and > > > only if not current do we take the lock, recheck, and update the > > > generation and VMID. > > > > > > This leaves open a small race: A vcpu can bump up the global > > > generation number as well as the VM's, but has not updated > > > the VMID itself yet. > > > > > > At that point another vcpu from the same VM comes in, checks > > > the generation (and finds it not needing anything), and jumps > > > into the guest. At this point, we end-up with two vcpus belonging > > > to the same VM running with two different VMIDs. Eventually, the > > > VMID used by the second vcpu will get reassigned, and things will > > > really go wrong... > > > > > > A simple solution would be to drop this initial check, and always take > > > the lock. This is likely to cause performance issues. A middle ground > > > is to convert the spinlock to a rwlock, and only take the read lock > > > on the fast path. If the check fails at that point, drop it and > > > acquire the write lock, rechecking the condition. > > > > > > This ensures that the above scenario doesn't occur. > > > > > > Reported-by: Mark Rutland > > > Signed-off-by: Marc Zyngier > > > --- > > > I haven't seen any reply from Shannon, so reposting this to > > > a slightly wider audience for feedback. > > > > > > virt/kvm/arm/arm.c | 15 ++++++++++----- > > > 1 file changed, 10 insertions(+), 5 deletions(-) > > > > > > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > > > index dba629c5f8ac..a4c1b76240df 100644 > > > --- a/virt/kvm/arm/arm.c > > > +++ b/virt/kvm/arm/arm.c > > > @@ -63,7 +63,7 @@ static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu); > > > static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1); > > > static u32 kvm_next_vmid; > > > static unsigned int kvm_vmid_bits __read_mostly; > > > -static DEFINE_SPINLOCK(kvm_vmid_lock); > > > +static DEFINE_RWLOCK(kvm_vmid_lock); > > > > > > static bool vgic_present; > > > > > > @@ -473,11 +473,16 @@ static void update_vttbr(struct kvm *kvm) > > > { > > > phys_addr_t pgd_phys; > > > u64 vmid; > > > + bool new_gen; > > > > > > - if (!need_new_vmid_gen(kvm)) > > > + read_lock(&kvm_vmid_lock); > > > + new_gen = need_new_vmid_gen(kvm); > > > + read_unlock(&kvm_vmid_lock); > > > + > > > + if (!new_gen) > > > return; > > > > > > - spin_lock(&kvm_vmid_lock); > > > + write_lock(&kvm_vmid_lock); > > > > > > /* > > > * We need to re-check the vmid_gen here to ensure that if another vcpu > > > @@ -485,7 +490,7 @@ static void update_vttbr(struct kvm *kvm) > > > * use the same vmid. > > > */ > > > if (!need_new_vmid_gen(kvm)) { > > > - spin_unlock(&kvm_vmid_lock); > > > + write_unlock(&kvm_vmid_lock); > > > return; > > > } > > > > > > @@ -519,7 +524,7 @@ static void update_vttbr(struct kvm *kvm) > > > vmid = ((u64)(kvm->arch.vmid) << VTTBR_VMID_SHIFT) & VTTBR_VMID_MASK(kvm_vmid_bits); > > > kvm->arch.vttbr = kvm_phys_to_vttbr(pgd_phys) | vmid; > > > > > > - spin_unlock(&kvm_vmid_lock); > > > + write_unlock(&kvm_vmid_lock); > > > } > > > > > > static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) > > > -- > > > 2.14.2 > > > > > > > The above looks correct to me. I am wondering if something like the > > following would also work, which may be slightly more efficient, > > although I doubt the difference can be measured: > > [...] > > I think we also need to update kvm->arch.vttbr before updating > kvm->arch.vmid_gen, otherwise another CPU can come in, see that the > vmid_gen is up-to-date, jump to hyp, and program a stale VTTBR (with the > old VMID). > > With the smp_wmb() and update of kvm->arch.vmid_gen moved to the end of > the critical section, I think that works, modulo using READ_ONCE() and > WRITE_ONCE() to ensure single-copy-atomicity of the fields we access > locklessly. Indeed, you're right. I would look something like this, then: It's probably easier to convince ourselves about the correctness of Marc's code using a rwlock instead, though. Thoughts? Thanks, -Christoffer diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 2e43f9d42bd5..6cb08995e7ff 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -450,7 +450,9 @@ void force_vm_exit(const cpumask_t *mask) */ static bool need_new_vmid_gen(struct kvm *kvm) { - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen)); + u64 current_vmid_gen = atomic64_read(&kvm_vmid_gen); + smp_rmb(); /* Orders read of kvm_vmid_gen and kvm->arch.vmid */ + return unlikely(READ_ONCE(kvm->arch.vmid_gen) != current_vmid_gen); } /** @@ -500,7 +502,6 @@ static void update_vttbr(struct kvm *kvm) kvm_call_hyp(__kvm_flush_vm_context); } - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen); kvm->arch.vmid = kvm_next_vmid; kvm_next_vmid++; kvm_next_vmid &= (1 << kvm_vmid_bits) - 1; @@ -509,7 +510,10 @@ static void update_vttbr(struct kvm *kvm) pgd_phys = virt_to_phys(kvm->arch.pgd); BUG_ON(pgd_phys & ~VTTBR_BADDR_MASK); vmid = ((u64)(kvm->arch.vmid) << VTTBR_VMID_SHIFT) & VTTBR_VMID_MASK(kvm_vmid_bits); - kvm->arch.vttbr = pgd_phys | vmid; + WRITE_ONCE(kvm->arch.vttbr, pgd_phys | vmid); + + smp_wmb(); /* Ensure vttbr update is observed before vmid_gen update */ + kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen); spin_unlock(&kvm_vmid_lock); }