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.4 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,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 C9B4CC43381 for ; Mon, 1 Apr 2019 18:34:42 +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 97AD5206C0 for ; Mon, 1 Apr 2019 18:34:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ha31aC9D"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="eDYAXQ27" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97AD5206C0 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=bwMJXSbUVwZRJUNLoiw46TMoJZTrroCjcnJe4sqtRkc=; b=Ha31aC9DjItkq1 C3Cv3qmnbXa6vs9HZof7Pfp0HvBv9wq5zbrF2fM2TkwHN7+7ByGmiAw0uce00fAz7aayjLTcLO/2/ 7KcPw3q6sd4G9B2g6H3aWL9sfQhV2Xhw2jrxTyb2mzC5ev4cj1et8z84v3FE1DEi9dRCssfddveHI NwJ171fM05LQV+pWPxd/vWy/L4Fj8dzSMaRmzt9la2dsYovkQ3h4BMlf7UjjuzQgM8F9MfkILR56j AetqDRxNKhrYGbWbL5d3xVMHDWQSk/a3am+XU8yysO/8QkRTBqkAcFH2UqJdqHjz2FwFXfGQOrgb5 xsxkJPD/SNgATz0MkyNA==; 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 1hB1lV-0004JR-FT; Mon, 01 Apr 2019 18:34:37 +0000 Received: from mail-it1-x142.google.com ([2607:f8b0:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hB1lR-0004Iv-Lu for linux-arm-kernel@lists.infradead.org; Mon, 01 Apr 2019 18:34:35 +0000 Received: by mail-it1-x142.google.com with SMTP id k64so722651itb.5 for ; Mon, 01 Apr 2019 11:34:30 -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=+53egRqiXPQZ9EJ7mGipuGA/l/Y4XVrW1UL2Rjyi1aY=; b=eDYAXQ27VoAC7+Qv2snc75BOR1No525mPjeUWUBN5ZQDYffbsqG/JAEpAH9plTZBA0 5QmkBdG4vPydgQz3g+pjFgQ4jijgIhtJyqRsUK5t/K4TAfbQZYzCrT65jMljFU3smoXr UKSrVqXcCFe1wRXufXWRK2iP3IMDew4disNuXDBwoAQQJy8U6LuDHjnfwAqC/z9XlC/8 HWrJWMHSvyu2n2yiznM6WDQnPb8F6iPT16jnODrqnMGVN5XL11J1qYeRVdQ4N/DPqWU0 R248eZh5XqtP72GF5x2vj0EQ4xoI8XZXcbt4Jw6T/DYJPyGnrOHJpr3tHK6mDdQKQCZE 2NcA== 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=+53egRqiXPQZ9EJ7mGipuGA/l/Y4XVrW1UL2Rjyi1aY=; b=RS7x1DOkEFq95gHioynrgsrcCMEz7oZ54Eoh45qjtkdGhfjCOhguULjvMnOjDuZc8D 1g5jzv0/uZBTHSUwc6DxBVV5IQBxeE3iSBmSt5Q9+/LW67BlWZj3sdzlJVT6djt0lzch OPn9VHeISxk2UNWqZizkRG6NjvWZnje60SYAlhhIRYN0PEYkMJoAnL5hsB4iR9hQiRpa AsUuIdPeuPIJZrRZeDxrxXCTtL4j5FZxQUHG3F7mwordt0klPFIIdJ+y5hYhaER7+EFg /CS8jBRPJMZHpvAMvTvfVm+uCD1Pv+PiiVlM524wenDJ0RCTdeR/P/TEkKrxLWIghkZq MgFw== X-Gm-Message-State: APjAAAUtzq3lS7lVndq4YDXSUTZQ9r91JpgLEFsu7aW2zpgeMkKtxmeP iOuWWJ+Zc/cAaKlJ6XqJHCSoyQ== X-Google-Smtp-Source: APXvYqzZTl9HjDi6RnxdmwsZz5YNWY2r4EgOJRkxEpWp2zd2bQ6DyUFaMDMtV9M2qFewuWS4RaLmhw== X-Received: by 2002:a02:938f:: with SMTP id z15mr9224027jah.108.1554143670032; Mon, 01 Apr 2019 11:34:30 -0700 (PDT) Received: from google.com ([2620:15c:183:0:a0c3:519e:9276:fc96]) by smtp.gmail.com with ESMTPSA id f9sm4571750ioo.24.2019.04.01.11.34.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Apr 2019 11:34:29 -0700 (PDT) Date: Mon, 1 Apr 2019 12:34:25 -0600 From: Yu Zhao To: Will Deacon Subject: Re: [PATCH V2] KVM: ARM: Remove pgtable page standard functions from stage-2 page tables Message-ID: <20190401183425.GA106130@google.com> References: <3be0b7e0-2ef8-babb-88c9-d229e0fdd220@arm.com> <1552397145-10665-1-git-send-email-anshuman.khandual@arm.com> <20190401161638.GB22092@fuggles.cambridge.arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190401161638.GB22092@fuggles.cambridge.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-20190401_113433_745731_3D04470A X-CRM114-Status: GOOD ( 20.80 ) 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, julien.thierry@arm.com, suzuki.poulose@arm.com, marc.zyngier@arm.com, catalin.marinas@arm.com, Anshuman Khandual , christoffer.dall@arm.com, linux-mm@kvack.org, james.morse@arm.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.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 Mon, Apr 01, 2019 at 05:16:38PM +0100, Will Deacon wrote: > [+KVM/ARM folks, since I can't take this without an Ack in place from them] > > My understanding is that this patch is intended to replace patch 3/4 in > this series: > > http://lists.infradead.org/pipermail/linux-arm-kernel/2019-March/638083.html Yes, and sorry for the confusion. I could send an updated series once this patch is merged. Thanks. > On Tue, Mar 12, 2019 at 06:55:45PM +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. > > > > Reviewed-by: Suzuki K Poulose > > Acked-by: Yu Zhao > > Signed-off-by: Anshuman Khandual > > --- > > Changes in V2: > > > > - Updated stage2_pud_free() with NOP as per Suzuki > > - s/__free_page/free_page/ in clear_stage2_pmd_entry() for uniformity > > > > 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..fed02c3b4600 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) do { } while (0) > > > > #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..cbfbdadca8a5 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((unsigned long)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