From patchwork Tue Apr 4 10:13:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9661131 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 7D42D6032D for ; Tue, 4 Apr 2017 10:13:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E0FD2766D for ; Tue, 4 Apr 2017 10:13:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6267E2841D; Tue, 4 Apr 2017 10:13:42 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 EFE8B2766D for ; Tue, 4 Apr 2017 10:13:41 +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=ipIud8VsivlMheuXq+rdI0z/D9Is6rPVmSCsUqpsxSw=; b=kXiwV83sc3O0f4 9ZHnt3OclP4+zylP8SmiUSOrU1ZOGa8EBEMi9kyCrLs1RAZTOn3b42oXIXquBQ7fwRz/PtxIqhMWr 4X5o73CF+tVVW/PYcku8uVH54bt+HpqjQOcHAdHmdPlnvcV1PYEfn+hz4JKNZmYwSobLtTgdbLuw9 XmtvN8OrS1MpDiHnsU1AI2PrfAheHknYEiM79arExh1C8h05vD0dmEgdBMGWaiJtl2lXJByXYMJ3V ew6id1kfmf5f/nHMyVxeI57yaJicYsXddJUMAFESIeGVaUAiUGET94jeFYGepT2z5jxz/i/XwuTpd 85QG8d1zLU4SLKr041Nw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cvLT1-0004H3-7g; Tue, 04 Apr 2017 10:13:39 +0000 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvLSx-0004Ed-MY for linux-arm-kernel@lists.infradead.org; Tue, 04 Apr 2017 10:13:37 +0000 Received: by mail-wr0-x231.google.com with SMTP id w43so206896681wrb.0 for ; Tue, 04 Apr 2017 03:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ztBiO3FxgsElg/f61BrPGxcnD4L9+HvaCuDO4EHXnAI=; b=OIp/M25OAi2N2ML6A/77gbI7cAk6CcePn7g1zpJwP/Y7+LRUeS0XWEuE0k73aKgyqj snGqnBp8D1sY2I8o4jdncUXDXwosynGIxzuFsYJxMzMGPnQH3JQi80JifZModjcWqDtH IB240C/Ty9HBH5WCKHGs9qfGvuCKE2Ybkx2Hs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ztBiO3FxgsElg/f61BrPGxcnD4L9+HvaCuDO4EHXnAI=; b=nP1z4sOkXhTBNQ7DJ29BxQ123YneduSaPCIc/ngNO2JyEjcqm0uTwa+bxV5xjxs7h9 t8ma1DbPWqTsHZxdPmqnIEA+PnqRhrDePZOj145slht89nTwOMq1p+K8IPM+VmP8+a/e QoPgBVjB/Js1dxweC35TFwx0aV2pXDLM85kK24WBs1QedcabakrWnXyvzJC37KMel1/0 Nbo+xTNsJoLxfa/wFPOe1xebMC56/aGL28gs/rh41bjai98jUx5MZb6OxRjYYVusd4+3 SkVjmsep4E6zqPVRVr0H46sqItzx718oPyfk+vpOC8QXTbq79zp4ZyRaqG6T4P/xdg/w 7Vxw== X-Gm-Message-State: AFeK/H0i1bWjP1WSrJ7zi3rVSZabNfk02qbGc2JN0ovz0GS3zxePnlyI h/e7jq5SfgpJati1 X-Received: by 10.28.225.69 with SMTP id y66mr14303268wmg.84.1491300793591; Tue, 04 Apr 2017 03:13:13 -0700 (PDT) Received: from localhost (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id g41sm21629632wrg.53.2017.04.04.03.13.12 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 04 Apr 2017 03:13:12 -0700 (PDT) Date: Tue, 4 Apr 2017 12:13:16 +0200 From: Christoffer Dall To: Suzuki K Poulose Subject: Re: [PATCH v3] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd Message-ID: <20170404101316.GF11752@cbox> References: <1491228763-23450-1-git-send-email-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1491228763-23450-1-git-send-email-suzuki.poulose@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170404_031335_913171_D35ED2ED X-CRM114-Status: GOOD ( 23.41 ) 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: linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com, kvm@vger.kernel.org, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, andreyknvl@google.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org, kcc@google.com, syzkaller@googlegroups.com, dvyukov@google.com, catalin.marinas@arm.com, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.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 Hi Suzuki, On Mon, Apr 03, 2017 at 03:12:43PM +0100, Suzuki K Poulose wrote: > In kvm_free_stage2_pgd() we don't hold the kvm->mmu_lock while calling > unmap_stage2_range() on the entire memory range for the guest. This could > cause problems with other callers (e.g, munmap on a memslot) trying to > unmap a range. And since we have to unmap the entire Guest memory range > holding a spinlock, make sure we yield the lock if necessary, after we > unmap each PUD range. > > Fixes: commit d5d8184d35c9 ("KVM: ARM: Memory virtualization setup") > Cc: stable@vger.kernel.org # v3.10+ > Cc: Paolo Bonzini > Cc: Marc Zyngier > Cc: Christoffer Dall > Cc: Mark Rutland > Signed-off-by: Suzuki K Poulose > [ Avoid vCPU starvation and lockup detector warnings ] > Signed-off-by: Marc Zyngier > Signed-off-by: Suzuki K Poulose > This unfortunately fails to build on 32-bit ARM, and I also think we intended to check against S2_PGDIR_SIZE, not S2_PUD_SIZE. How about adding this to your patch (which includes a rename of S2_PGD_SIZE which is horribly confusing as it indicates the size of the first level stage-2 table itself, where S2_PGDIR_SIZE indicates the size of address space mapped by a single entry in the same table): Thanks, -Christoffer > --- > Changes since V2: > - Restrict kvm->mmu_lock relaxation to bigger ranges in unmap_stage2_range(), > to avoid possible issues like [0] > > [0] http://lists.infradead.org/pipermail/linux-arm-kernel/2017-March/498210.html > > Changes since V1: > - Yield the kvm->mmu_lock if necessary in unmap_stage2_range to prevent > vCPU starvation and lockup detector warnings. > --- > arch/arm/kvm/mmu.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c > index 13b9c1f..db94f3a 100644 > --- a/arch/arm/kvm/mmu.c > +++ b/arch/arm/kvm/mmu.c > @@ -292,8 +292,15 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size) > phys_addr_t addr = start, end = start + size; > phys_addr_t next; > > + assert_spin_locked(&kvm->mmu_lock); > pgd = kvm->arch.pgd + stage2_pgd_index(addr); > do { > + /* > + * If the range is too large, release the kvm->mmu_lock > + * to prevent starvation and lockup detector warnings. > + */ > + if (size > S2_PUD_SIZE) > + cond_resched_lock(&kvm->mmu_lock); > next = stage2_pgd_addr_end(addr, end); > if (!stage2_pgd_none(*pgd)) > unmap_stage2_puds(kvm, pgd, addr, next); > @@ -831,7 +838,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm) > if (kvm->arch.pgd == NULL) > return; > > + spin_lock(&kvm->mmu_lock); > unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE); > + spin_unlock(&kvm->mmu_lock); > + > /* Free the HW pgd, one page at a time */ > free_pages_exact(kvm->arch.pgd, S2_PGD_SIZE); > kvm->arch.pgd = NULL; > -- > 2.7.4 > diff --git a/arch/arm/include/asm/stage2_pgtable.h b/arch/arm/include/asm/stage2_pgtable.h index 460d616..c997f2d 100644 --- a/arch/arm/include/asm/stage2_pgtable.h +++ b/arch/arm/include/asm/stage2_pgtable.h @@ -35,10 +35,13 @@ #define stage2_pud_huge(pud) pud_huge(pud) +#define S2_PGDIR_SIZE PGDIR_SIZE +#define S2_PGDIR_MASK PGDIR_MASK + /* Open coded p*d_addr_end that can deal with 64bit addresses */ static inline phys_addr_t stage2_pgd_addr_end(phys_addr_t addr, phys_addr_t end) { - phys_addr_t boundary = (addr + PGDIR_SIZE) & PGDIR_MASK; + phys_addr_t boundary = (addr + S2_PGDIR_SIZE) & S2_PGDIR_MASK; return (boundary - 1 < end - 1) ? boundary : end; } diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index db94f3a..6e79a4c 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -41,7 +41,7 @@ static unsigned long hyp_idmap_start; static unsigned long hyp_idmap_end; static phys_addr_t hyp_idmap_vector; -#define S2_PGD_SIZE (PTRS_PER_S2_PGD * sizeof(pgd_t)) +#define S2_PGD_TABLE_SIZE (PTRS_PER_S2_PGD * sizeof(pgd_t)) #define hyp_pgd_order get_order(PTRS_PER_PGD * sizeof(pgd_t)) #define KVM_S2PTE_FLAG_IS_IOMAP (1UL << 0) @@ -299,7 +299,7 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size) * If the range is too large, release the kvm->mmu_lock * to prevent starvation and lockup detector warnings. */ - if (size > S2_PUD_SIZE) + if (size > S2_PGDIR_SIZE) cond_resched_lock(&kvm->mmu_lock); next = stage2_pgd_addr_end(addr, end); if (!stage2_pgd_none(*pgd)) @@ -747,7 +747,7 @@ int kvm_alloc_stage2_pgd(struct kvm *kvm) } /* Allocate the HW PGD, making sure that each page gets its own refcount */ - pgd = alloc_pages_exact(S2_PGD_SIZE, GFP_KERNEL | __GFP_ZERO); + pgd = alloc_pages_exact(S2_PGD_TABLE_SIZE, GFP_KERNEL | __GFP_ZERO); if (!pgd) return -ENOMEM; @@ -843,7 +843,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm) spin_unlock(&kvm->mmu_lock); /* Free the HW pgd, one page at a time */ - free_pages_exact(kvm->arch.pgd, S2_PGD_SIZE); + free_pages_exact(kvm->arch.pgd, S2_PGD_TABLE_SIZE); kvm->arch.pgd = NULL; }