From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FSL_HELO_FAKE, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6818AC43381 for ; Tue, 12 Mar 2019 02:40:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 385E6214D8 for ; Tue, 12 Mar 2019 02:40:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AtpVyH91"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="uwUIrLKO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 385E6214D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=a4TEqGeabiuC6n1QWCdacfuRVQFbD4A/Zd0FW67PDnc=; b=AtpVyH91zAzjr+ 7dmqWF2lVUFiXO2uqhFdRo4qGOARgNT7kgs7X2Hois+9OoepzXzSL4lLOn+lo2+ZyPkGXiYmSpR9r RQjrn3F/29Ol81+JjIOkYNLKhm2tVH97yYdEz5BCKHYVNOEI7Hm18ljduQNVrGdBe57b2Bv2kaJiP ZN4TVn45qQlUPadWU1kGM8YrIWKc80yQ+reuuzrbxSa477DW0f0ysSM4n1x39qP2LRMUcAfnLXGl4 RksXQCl6GPtjAPz106kWpKGZniLv6X5b3LaZQPISL4Plt47Fp0FhZ6luaBNIhdk6lqdDuzFTgDFjd 837B8PLI3PoToiDvbSyg==; 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 1h3XLK-0007HC-MN; Tue, 12 Mar 2019 02:40:38 +0000 Received: from mail-it1-x143.google.com ([2607:f8b0:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h3XLH-0007Gt-8U for linux-arm-kernel@lists.infradead.org; Tue, 12 Mar 2019 02:40:36 +0000 Received: by mail-it1-x143.google.com with SMTP id x189so2008952itd.3 for ; Mon, 11 Mar 2019 19:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=L9iir7i/e3/qeKL34wiPGqGD8PwT3V1ZJYro/HToDss=; b=uwUIrLKOOruuHHRSpKG3MCRJJRm9faUNyNOUBlKpxvxjmShRf7K4RDRu1z3LF8yR9A u+iioP8qjpyAB0o/YkF5BYras6qxj7Bc4v/9Obu9EysHmXF33yCLjyLbLMFEiq/mVDOK lqHjFZol+dsEyAvrgHXb3qlFKhFWsOlFSgB+OmKxeJEgdCXPpSU+JzGkehHYVaymROff b+5VlUYc2gdPeq8w8VsYc+oKpp6svbDVPHOPRsoN1OWrdxxreB0hWlvrETvLfOi+j/Cb oNhXXSjyFRLqd60Iop5zLSiuiY3ji8qCsQckMVlhLYqrEGlXw8b+xbkZovJ5PXFb6rom 9BBQ== 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=L9iir7i/e3/qeKL34wiPGqGD8PwT3V1ZJYro/HToDss=; b=Fv4fnSpBxOHPW5WpKrbEz8qQgItoylSHKfCtKozcQqbplYdUyV3WV/bcOX+81CmJbw rUjYHBxLQ+ovSPePceIBZwmA6I267NK3+x3hA4LibOtCeuCdM0HSVYP9Vw0hSWp1d3Uc BVN/i7tNXQ79Nyy8ynOAHSPuOIPWEetRWUW5QAwfSanUGAv4PThVkFOR/Xr1w5/z9INx +X88GP52x+1ow0P953CNnuRbML9soxoWnOYa+A7Wha8tynOGfEsvo12nYZNPXLNgRGG/ 4jiIh+6R1jquLD6wIHdi2CDWNCC945Fa/0SFw3L7/v25xvcVS92iuTxzVSTJsc9RRW5J bFVQ== X-Gm-Message-State: APjAAAVGLJ8X1UqgGbhLCZESn7/RYyGpIHb06JlVVlqhDvCqr+SpRR8T ofMpiJlj2BTuffeO3c8KqbfCrw== X-Google-Smtp-Source: APXvYqx8p49hveKiwSXfrf8jM5CqYcRXU6BMuH8to0YaypBP5elF2zN0YWb50ixT+i39FW6zJnVR+w== X-Received: by 2002:a24:7002:: with SMTP id f2mr676540itc.99.1552358434187; Mon, 11 Mar 2019 19:40:34 -0700 (PDT) Received: from google.com ([2620:15c:183:0:a0c3:519e:9276:fc96]) by smtp.gmail.com with ESMTPSA id g24sm569103itk.14.2019.03.11.19.40.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 11 Mar 2019 19:40:33 -0700 (PDT) Date: Mon, 11 Mar 2019 20:40:29 -0600 From: Yu Zhao To: Anshuman Khandual Subject: Re: [PATCH] KVM: ARM: Remove pgtable page standard functions from stage-2 page tables Message-ID: <20190312024029.GA125957@google.com> References: <20190312005749.30166-3-yuzhao@google.com> <1552357142-636-1-git-send-email-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1552357142-636-1-git-send-email-anshuman.khandual@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190311_194035_325711_5A9218EE X-CRM114-Status: GOOD ( 15.81 ) 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: mark.rutland@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Mar 12, 2019 at 07:49:02AM +0530, Anshuman Khandual wrote: > ARM64 standard pgtable functions are going to use pgtable_page_[ctor|dtor] > or pgtable_pmd_page_[ctor|dtor] constructs. At present KVM guest stage-2 > PUD|PMD|PTE level page tabe pages are allocated with __get_free_page() > via mmu_memory_cache_alloc() but released with standard pud|pmd_free() or > pte_free_kernel(). These will fail once they start calling into pgtable_ > [pmd]_page_dtor() for pages which never originally went through respective > constructor functions. Hence convert all stage-2 page table page release > functions to call buddy directly while freeing pages. This is apparently cleaner than what I have done. Acked-by: Yu Zhao > Signed-off-by: Anshuman Khandual > --- > arch/arm/include/asm/stage2_pgtable.h | 4 ++-- > arch/arm64/include/asm/stage2_pgtable.h | 4 ++-- > virt/kvm/arm/mmu.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/include/asm/stage2_pgtable.h b/arch/arm/include/asm/stage2_pgtable.h > index de2089501b8b..417a3be00718 100644 > --- a/arch/arm/include/asm/stage2_pgtable.h > +++ b/arch/arm/include/asm/stage2_pgtable.h > @@ -32,14 +32,14 @@ > #define stage2_pgd_present(kvm, pgd) pgd_present(pgd) > #define stage2_pgd_populate(kvm, pgd, pud) pgd_populate(NULL, pgd, pud) > #define stage2_pud_offset(kvm, pgd, address) pud_offset(pgd, address) > -#define stage2_pud_free(kvm, pud) pud_free(NULL, pud) > +#define stage2_pud_free(kvm, pud) free_page((unsigned long)pud) > > #define stage2_pud_none(kvm, pud) pud_none(pud) > #define stage2_pud_clear(kvm, pud) pud_clear(pud) > #define stage2_pud_present(kvm, pud) pud_present(pud) > #define stage2_pud_populate(kvm, pud, pmd) pud_populate(NULL, pud, pmd) > #define stage2_pmd_offset(kvm, pud, address) pmd_offset(pud, address) > -#define stage2_pmd_free(kvm, pmd) pmd_free(NULL, pmd) > +#define stage2_pmd_free(kvm, pmd) free_page((unsigned long)pmd) > > #define stage2_pud_huge(kvm, pud) pud_huge(pud) > > diff --git a/arch/arm64/include/asm/stage2_pgtable.h b/arch/arm64/include/asm/stage2_pgtable.h > index 5412fa40825e..915809e4ac32 100644 > --- a/arch/arm64/include/asm/stage2_pgtable.h > +++ b/arch/arm64/include/asm/stage2_pgtable.h > @@ -119,7 +119,7 @@ static inline pud_t *stage2_pud_offset(struct kvm *kvm, > static inline void stage2_pud_free(struct kvm *kvm, pud_t *pud) > { > if (kvm_stage2_has_pud(kvm)) > - pud_free(NULL, pud); > + free_page((unsigned long)pud); > } > > static inline bool stage2_pud_table_empty(struct kvm *kvm, pud_t *pudp) > @@ -192,7 +192,7 @@ static inline pmd_t *stage2_pmd_offset(struct kvm *kvm, > static inline void stage2_pmd_free(struct kvm *kvm, pmd_t *pmd) > { > if (kvm_stage2_has_pmd(kvm)) > - pmd_free(NULL, pmd); > + free_page((unsigned long)pmd); > } > > static inline bool stage2_pud_huge(struct kvm *kvm, pud_t pud) > diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c > index e9d28a7ca673..00bd79a2f0b1 100644 > --- a/virt/kvm/arm/mmu.c > +++ b/virt/kvm/arm/mmu.c > @@ -191,7 +191,7 @@ static void clear_stage2_pmd_entry(struct kvm *kvm, pmd_t *pmd, phys_addr_t addr > VM_BUG_ON(pmd_thp_or_huge(*pmd)); > pmd_clear(pmd); > kvm_tlb_flush_vmid_ipa(kvm, addr); > - pte_free_kernel(NULL, pte_table); > + __free_page(virt_to_page(pte_table)); > put_page(virt_to_page(pmd)); > } > > -- > 2.20.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel