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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 5C126C49EB9 for ; Fri, 18 Jun 2021 09:30:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 428E8613D6 for ; Fri, 18 Jun 2021 09:30:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233887AbhFRJdC (ORCPT ); Fri, 18 Jun 2021 05:33:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233560AbhFRJc2 (ORCPT ); Fri, 18 Jun 2021 05:32:28 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6666CC061767 for ; Fri, 18 Jun 2021 02:30:17 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id k10-20020a056830168ab029044d922f6a45so710437otr.7 for ; Fri, 18 Jun 2021 02:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=77mzIJgsnd6fd7VLB24yLdWxFauCP3v4BC+3010BcoI=; b=splN4F0W2+ZYXW8DQ+07l5RKaruWT5ZPxUWsjzNl0oY2XTzTCR6O8vimbufSv6f3vL PdIdB2fFYw/cg01yOh2vFuNnt9hjIKDpyHEYO71Hc+iwk6TfEmRw0y9B3tIGcgXeHo+c N6E2cG8vYoY/4zV02vTQ1kqMVPzdus88HcTB+hxJIGCc1O6QG+R2p+toipCf9CjfkhKZ Ndy7h6uRN1EYXnhOI8K0E3syWmJGpVfs4IARtSp07Z4tMQ0TPasM2HPJs6pNWLtuZy3+ y3euoAub9b+8Y/e3HycDRmitzm0NAHM7fpEtcqTCAsNuzrL158zM4nLnYpdDHv8SuSPc 77DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=77mzIJgsnd6fd7VLB24yLdWxFauCP3v4BC+3010BcoI=; b=DIqN/qe+cPhQRzBP4ONzNi5QqjU1kUZ0XzNdAFPZWSjSren+8SgHUPqobGyMU/gOd4 vqIzOhoDPywD5iv99wqASkJVbwo2eySS6AgMigZmlEn78S+WB4Q3F08lI7uO2lRkZwKQ GZAysun98yQx/eh1MMnPx7lEkwDUvzn17AORvyMMxPB192PhwmAywvyoWZmVaphJCvQv E/ApPuJ14xVBW4sGYlLKN4BIoga5Aet0KmiM4kcSqYymdLj/ew2c71yyWJM5BSMzFDML JqbiVh9nktZnfxk8gXB5rhwidyZpNxwrcvvf+o6KrzuaecCVy5Yp8X0UBHQOontnN7vC rcEg== X-Gm-Message-State: AOAM5304nM3NH3PO+w8ylO9MSInL2vGlsinHNdacMcTk/uSeGT4+CUnF /AFOWcv6C2SMyk9Oh6MXoRZGC/RIyzJn3kPPApLYQw== X-Google-Smtp-Source: ABdhPJyIgn+m9LaLC8tfpgMI6o5DwNs431a/XgStcK+ZHToBxiaKuPwfiAkwxBcEas0/uG7N+C3oGG+BgIoYjsXskfY= X-Received: by 2002:a05:6830:1002:: with SMTP id a2mr8203403otp.144.1624008616648; Fri, 18 Jun 2021 02:30:16 -0700 (PDT) MIME-Version: 1.0 References: <20210617105824.31752-1-wangyanan55@huawei.com> <20210617105824.31752-4-wangyanan55@huawei.com> In-Reply-To: <20210617105824.31752-4-wangyanan55@huawei.com> From: Fuad Tabba Date: Fri, 18 Jun 2021 10:29:40 +0100 Message-ID: Subject: Re: [PATCH v7 3/4] KVM: arm64: Tweak parameters of guest cache maintenance functions To: Yanan Wang Cc: Marc Zyngier , Will Deacon , Quentin Perret , Alexandru Elisei , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin Marinas Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Yanan, On Thu, Jun 17, 2021 at 11:58 AM Yanan Wang wrote: > > Adjust the parameter "kvm_pfn_t pfn" of __clean_dcache_guest_page > and __invalidate_icache_guest_page to "void *va", which paves the > way for converting these two guest CMO functions into callbacks in > structure kvm_pgtable_mm_ops. No functional change. > > Signed-off-by: Yanan Wang > --- > arch/arm64/include/asm/kvm_mmu.h | 9 ++------- > arch/arm64/kvm/mmu.c | 28 +++++++++++++++------------- > 2 files changed, 17 insertions(+), 20 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h > index 25ed956f9af1..6844a7550392 100644 > --- a/arch/arm64/include/asm/kvm_mmu.h > +++ b/arch/arm64/include/asm/kvm_mmu.h > @@ -187,10 +187,8 @@ static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu) > return (vcpu_read_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101; > } > > -static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > +static inline void __clean_dcache_guest_page(void *va, size_t size) > { > - void *va = page_address(pfn_to_page(pfn)); > - > /* > * With FWB, we ensure that the guest always accesses memory using > * cacheable attributes, and we don't have to clean to PoC when > @@ -203,16 +201,13 @@ static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > kvm_flush_dcache_to_poc(va, size); > } > > -static inline void __invalidate_icache_guest_page(kvm_pfn_t pfn, > - unsigned long size) > +static inline void __invalidate_icache_guest_page(void *va, size_t size) > { > if (icache_is_aliasing()) { > /* any kind of VIPT cache */ > __flush_icache_all(); > } else if (is_kernel_in_hyp_mode() || !icache_is_vpipt()) { > /* PIPT or VPIPT at EL2 (see comment in __kvm_tlb_flush_vmid_ipa) */ > - void *va = page_address(pfn_to_page(pfn)); > - > invalidate_icache_range((unsigned long)va, > (unsigned long)va + size); > } > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 5742ba765ff9..b980f8a47cbb 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -126,6 +126,16 @@ static void *kvm_host_va(phys_addr_t phys) > return __va(phys); > } > > +static void clean_dcache_guest_page(void *va, size_t size) > +{ > + __clean_dcache_guest_page(va, size); > +} > + > +static void invalidate_icache_guest_page(void *va, size_t size) > +{ > + __invalidate_icache_guest_page(va, size); > +} > + > /* > * Unmapping vs dcache management: > * > @@ -693,16 +703,6 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, > kvm_mmu_write_protect_pt_masked(kvm, slot, gfn_offset, mask); > } > > -static void clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > -{ > - __clean_dcache_guest_page(pfn, size); > -} > - > -static void invalidate_icache_guest_page(kvm_pfn_t pfn, unsigned long size) > -{ > - __invalidate_icache_guest_page(pfn, size); > -} > - > static void kvm_send_hwpoison_signal(unsigned long address, short lsb) > { > send_sig_mceerr(BUS_MCEERR_AR, (void __user *)address, lsb, current); > @@ -1013,11 +1013,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > prot |= KVM_PGTABLE_PROT_W; > > if (fault_status != FSC_PERM && !device) > - clean_dcache_guest_page(pfn, vma_pagesize); > + clean_dcache_guest_page(page_address(pfn_to_page(pfn)), > + vma_pagesize); > > if (exec_fault) { > prot |= KVM_PGTABLE_PROT_X; > - invalidate_icache_guest_page(pfn, vma_pagesize); > + invalidate_icache_guest_page(page_address(pfn_to_page(pfn)), > + vma_pagesize); > } > > if (device) > @@ -1219,7 +1221,7 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) > * We've moved a page around, probably through CoW, so let's treat it > * just like a translation fault and clean the cache to the PoC. > */ > - clean_dcache_guest_page(pfn, PAGE_SIZE); > + clean_dcache_guest_page(page_address(pfn_to_page(pfn), PAGE_SIZE); > > /* > * The MMU notifiers will have unmapped a huge PMD before calling > -- > 2.23.0 Reviewed-by: Fuad Tabba Thanks, /fuad > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 84BD7C49EA2 for ; Fri, 18 Jun 2021 09:30:21 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 1FAB0613D6 for ; Fri, 18 Jun 2021 09:30:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FAB0613D6 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 9415340821; Fri, 18 Jun 2021 05:30:20 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZfuKdqXCQOo5; Fri, 18 Jun 2021 05:30:19 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 511554A4A3; Fri, 18 Jun 2021 05:30:19 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id A7A4040821 for ; Fri, 18 Jun 2021 05:30:18 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zPIjEKIXO-xz for ; Fri, 18 Jun 2021 05:30:17 -0400 (EDT) Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 6C0FF4A4A0 for ; Fri, 18 Jun 2021 05:30:17 -0400 (EDT) Received: by mail-ot1-f50.google.com with SMTP id h24-20020a9d64180000b029036edcf8f9a6so9097776otl.3 for ; Fri, 18 Jun 2021 02:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=77mzIJgsnd6fd7VLB24yLdWxFauCP3v4BC+3010BcoI=; b=splN4F0W2+ZYXW8DQ+07l5RKaruWT5ZPxUWsjzNl0oY2XTzTCR6O8vimbufSv6f3vL PdIdB2fFYw/cg01yOh2vFuNnt9hjIKDpyHEYO71Hc+iwk6TfEmRw0y9B3tIGcgXeHo+c N6E2cG8vYoY/4zV02vTQ1kqMVPzdus88HcTB+hxJIGCc1O6QG+R2p+toipCf9CjfkhKZ Ndy7h6uRN1EYXnhOI8K0E3syWmJGpVfs4IARtSp07Z4tMQ0TPasM2HPJs6pNWLtuZy3+ y3euoAub9b+8Y/e3HycDRmitzm0NAHM7fpEtcqTCAsNuzrL158zM4nLnYpdDHv8SuSPc 77DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=77mzIJgsnd6fd7VLB24yLdWxFauCP3v4BC+3010BcoI=; b=Me2LveyrXmdvzgTTCl8j18Tzte3sztLNRSBuYBtP7H/EeEuK9kbKsfnWKfSUQgY5nH 1HgZS1eNuE5WgdJzKCnxmno0ZOObysU+FR69/LfCUXXkpxZaSWR1o6PVlvAgBeVmZ1Sx E+EtwCPYI1MIk1aq/5zDr6d/H8qr044bLdzYhbBuWCLP0bJiowL2fnJw/pk16iM6vOjI eMThqvLuYlcMxaPjpncgoKpEvFZAd7CDkTW38xeevLiS+YVaOqrBYUvtYzgBACphHXXD hiWPnCJL1yp470/UHuW3nvrxALFfMmllZp7Qk1igWY5zuKHBKJPuH8zcEbt04pPJB3L6 jv+g== X-Gm-Message-State: AOAM531vQUBByMMbB+xZPMyQQhaLKf/XyYphlQQgITkusEhsEDThGiL6 BIzSFHkSS8kfRb3i3k9WznstSJ0gmYuGgb9yg6XVJg== X-Google-Smtp-Source: ABdhPJyIgn+m9LaLC8tfpgMI6o5DwNs431a/XgStcK+ZHToBxiaKuPwfiAkwxBcEas0/uG7N+C3oGG+BgIoYjsXskfY= X-Received: by 2002:a05:6830:1002:: with SMTP id a2mr8203403otp.144.1624008616648; Fri, 18 Jun 2021 02:30:16 -0700 (PDT) MIME-Version: 1.0 References: <20210617105824.31752-1-wangyanan55@huawei.com> <20210617105824.31752-4-wangyanan55@huawei.com> In-Reply-To: <20210617105824.31752-4-wangyanan55@huawei.com> From: Fuad Tabba Date: Fri, 18 Jun 2021 10:29:40 +0100 Message-ID: Subject: Re: [PATCH v7 3/4] KVM: arm64: Tweak parameters of guest cache maintenance functions To: Yanan Wang Cc: kvm@vger.kernel.org, Marc Zyngier , linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Yanan, On Thu, Jun 17, 2021 at 11:58 AM Yanan Wang wrote: > > Adjust the parameter "kvm_pfn_t pfn" of __clean_dcache_guest_page > and __invalidate_icache_guest_page to "void *va", which paves the > way for converting these two guest CMO functions into callbacks in > structure kvm_pgtable_mm_ops. No functional change. > > Signed-off-by: Yanan Wang > --- > arch/arm64/include/asm/kvm_mmu.h | 9 ++------- > arch/arm64/kvm/mmu.c | 28 +++++++++++++++------------- > 2 files changed, 17 insertions(+), 20 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h > index 25ed956f9af1..6844a7550392 100644 > --- a/arch/arm64/include/asm/kvm_mmu.h > +++ b/arch/arm64/include/asm/kvm_mmu.h > @@ -187,10 +187,8 @@ static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu) > return (vcpu_read_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101; > } > > -static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > +static inline void __clean_dcache_guest_page(void *va, size_t size) > { > - void *va = page_address(pfn_to_page(pfn)); > - > /* > * With FWB, we ensure that the guest always accesses memory using > * cacheable attributes, and we don't have to clean to PoC when > @@ -203,16 +201,13 @@ static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > kvm_flush_dcache_to_poc(va, size); > } > > -static inline void __invalidate_icache_guest_page(kvm_pfn_t pfn, > - unsigned long size) > +static inline void __invalidate_icache_guest_page(void *va, size_t size) > { > if (icache_is_aliasing()) { > /* any kind of VIPT cache */ > __flush_icache_all(); > } else if (is_kernel_in_hyp_mode() || !icache_is_vpipt()) { > /* PIPT or VPIPT at EL2 (see comment in __kvm_tlb_flush_vmid_ipa) */ > - void *va = page_address(pfn_to_page(pfn)); > - > invalidate_icache_range((unsigned long)va, > (unsigned long)va + size); > } > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 5742ba765ff9..b980f8a47cbb 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -126,6 +126,16 @@ static void *kvm_host_va(phys_addr_t phys) > return __va(phys); > } > > +static void clean_dcache_guest_page(void *va, size_t size) > +{ > + __clean_dcache_guest_page(va, size); > +} > + > +static void invalidate_icache_guest_page(void *va, size_t size) > +{ > + __invalidate_icache_guest_page(va, size); > +} > + > /* > * Unmapping vs dcache management: > * > @@ -693,16 +703,6 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, > kvm_mmu_write_protect_pt_masked(kvm, slot, gfn_offset, mask); > } > > -static void clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > -{ > - __clean_dcache_guest_page(pfn, size); > -} > - > -static void invalidate_icache_guest_page(kvm_pfn_t pfn, unsigned long size) > -{ > - __invalidate_icache_guest_page(pfn, size); > -} > - > static void kvm_send_hwpoison_signal(unsigned long address, short lsb) > { > send_sig_mceerr(BUS_MCEERR_AR, (void __user *)address, lsb, current); > @@ -1013,11 +1013,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > prot |= KVM_PGTABLE_PROT_W; > > if (fault_status != FSC_PERM && !device) > - clean_dcache_guest_page(pfn, vma_pagesize); > + clean_dcache_guest_page(page_address(pfn_to_page(pfn)), > + vma_pagesize); > > if (exec_fault) { > prot |= KVM_PGTABLE_PROT_X; > - invalidate_icache_guest_page(pfn, vma_pagesize); > + invalidate_icache_guest_page(page_address(pfn_to_page(pfn)), > + vma_pagesize); > } > > if (device) > @@ -1219,7 +1221,7 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) > * We've moved a page around, probably through CoW, so let's treat it > * just like a translation fault and clean the cache to the PoC. > */ > - clean_dcache_guest_page(pfn, PAGE_SIZE); > + clean_dcache_guest_page(page_address(pfn_to_page(pfn), PAGE_SIZE); > > /* > * The MMU notifiers will have unmapped a huge PMD before calling > -- > 2.23.0 Reviewed-by: Fuad Tabba Thanks, /fuad > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 E5568C48BDF for ; Fri, 18 Jun 2021 09:31:59 +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 A63F96054E for ; Fri, 18 Jun 2021 09:31:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A63F96054E 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+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.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=B8HqDAKQce+IOCt4HuujFBHctl9cHqZx7o+h0RtFCgY=; b=M0YLR1TaK5eguM DX5nrc47yCjso1/ugx1ggW/+2VNR+wi3vak6wfrG17uFEhWmAYWCUbCnjmlL+WjNEsC0yViJ7uqW2 2wDJAb7QazCzDgnXW0RXYeorbf6pQjOPbKULegy+4sJ9EUsWioT/THziVK6lNVE8fbPOeIEznXuo0 QbPwP4J+7ROpPigeN3O9Qrb7skMRFNmyKeRmjGTBKBGX6+HREGtdPfL2ZTAH8h1V2KAg2bQjf6x4e duBMd4uJTluuBG8LiVgRg0aEBHb3LTFvCG2uRuinHRHshUjmQWqW1F3Dr9QbaukMn5HHrKYEec8yS T0qNPZA6En9hyVHRBaGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1luApe-00DSzf-6U; Fri, 18 Jun 2021 09:30:34 +0000 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1luApO-00DSsC-Pd for linux-arm-kernel@lists.infradead.org; Fri, 18 Jun 2021 09:30:20 +0000 Received: by mail-ot1-x32c.google.com with SMTP id 5-20020a9d01050000b02903c700c45721so9086817otu.6 for ; Fri, 18 Jun 2021 02:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=77mzIJgsnd6fd7VLB24yLdWxFauCP3v4BC+3010BcoI=; b=splN4F0W2+ZYXW8DQ+07l5RKaruWT5ZPxUWsjzNl0oY2XTzTCR6O8vimbufSv6f3vL PdIdB2fFYw/cg01yOh2vFuNnt9hjIKDpyHEYO71Hc+iwk6TfEmRw0y9B3tIGcgXeHo+c N6E2cG8vYoY/4zV02vTQ1kqMVPzdus88HcTB+hxJIGCc1O6QG+R2p+toipCf9CjfkhKZ Ndy7h6uRN1EYXnhOI8K0E3syWmJGpVfs4IARtSp07Z4tMQ0TPasM2HPJs6pNWLtuZy3+ y3euoAub9b+8Y/e3HycDRmitzm0NAHM7fpEtcqTCAsNuzrL158zM4nLnYpdDHv8SuSPc 77DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=77mzIJgsnd6fd7VLB24yLdWxFauCP3v4BC+3010BcoI=; b=Z8oT7FeezOqtTHCvgEBkv2Rnp1sEiMnqwZaVAXrMF6zjqA+Wsoe7t4OZPHzkEZ/6m6 PM5GWazYaN66wOkctR/qDJI30OA1rKpBrgceuZQnwzTjheNFDHe27pv9lildmol69rYq r9Bts/NudV1u8GajwN/neZU9C6m9xYZEmvYUGTKF0IGHPmCMCwQtEatTDdhX/gIes3i2 gSZfFp/qaE1sbA6OtPHVGUl3sYNR673ksAe1XmmKVTJnfiCH4WzrJ/CqzezL0/YSECDd dfJbuv94jPUtZQ9/HJGLt41PyeDki0SbWvw0I0NTfJke3ilZsSaB/9pHMbwoE/Yc3l+S GAaA== X-Gm-Message-State: AOAM530fZ3ghJHvdegWcNQALu0UntzrGYJJ5taJAhgauHdBaVsMrama4 7B1CQwMGMoDFjYQAbtaZ7CSxmgxXXJvCOo8NHAGxvw== X-Google-Smtp-Source: ABdhPJyIgn+m9LaLC8tfpgMI6o5DwNs431a/XgStcK+ZHToBxiaKuPwfiAkwxBcEas0/uG7N+C3oGG+BgIoYjsXskfY= X-Received: by 2002:a05:6830:1002:: with SMTP id a2mr8203403otp.144.1624008616648; Fri, 18 Jun 2021 02:30:16 -0700 (PDT) MIME-Version: 1.0 References: <20210617105824.31752-1-wangyanan55@huawei.com> <20210617105824.31752-4-wangyanan55@huawei.com> In-Reply-To: <20210617105824.31752-4-wangyanan55@huawei.com> From: Fuad Tabba Date: Fri, 18 Jun 2021 10:29:40 +0100 Message-ID: Subject: Re: [PATCH v7 3/4] KVM: arm64: Tweak parameters of guest cache maintenance functions To: Yanan Wang Cc: Marc Zyngier , Will Deacon , Quentin Perret , Alexandru Elisei , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Catalin Marinas X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210618_023018_900599_05D65A17 X-CRM114-Status: GOOD ( 24.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Yanan, On Thu, Jun 17, 2021 at 11:58 AM Yanan Wang wrote: > > Adjust the parameter "kvm_pfn_t pfn" of __clean_dcache_guest_page > and __invalidate_icache_guest_page to "void *va", which paves the > way for converting these two guest CMO functions into callbacks in > structure kvm_pgtable_mm_ops. No functional change. > > Signed-off-by: Yanan Wang > --- > arch/arm64/include/asm/kvm_mmu.h | 9 ++------- > arch/arm64/kvm/mmu.c | 28 +++++++++++++++------------- > 2 files changed, 17 insertions(+), 20 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h > index 25ed956f9af1..6844a7550392 100644 > --- a/arch/arm64/include/asm/kvm_mmu.h > +++ b/arch/arm64/include/asm/kvm_mmu.h > @@ -187,10 +187,8 @@ static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu) > return (vcpu_read_sys_reg(vcpu, SCTLR_EL1) & 0b101) == 0b101; > } > > -static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > +static inline void __clean_dcache_guest_page(void *va, size_t size) > { > - void *va = page_address(pfn_to_page(pfn)); > - > /* > * With FWB, we ensure that the guest always accesses memory using > * cacheable attributes, and we don't have to clean to PoC when > @@ -203,16 +201,13 @@ static inline void __clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > kvm_flush_dcache_to_poc(va, size); > } > > -static inline void __invalidate_icache_guest_page(kvm_pfn_t pfn, > - unsigned long size) > +static inline void __invalidate_icache_guest_page(void *va, size_t size) > { > if (icache_is_aliasing()) { > /* any kind of VIPT cache */ > __flush_icache_all(); > } else if (is_kernel_in_hyp_mode() || !icache_is_vpipt()) { > /* PIPT or VPIPT at EL2 (see comment in __kvm_tlb_flush_vmid_ipa) */ > - void *va = page_address(pfn_to_page(pfn)); > - > invalidate_icache_range((unsigned long)va, > (unsigned long)va + size); > } > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 5742ba765ff9..b980f8a47cbb 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -126,6 +126,16 @@ static void *kvm_host_va(phys_addr_t phys) > return __va(phys); > } > > +static void clean_dcache_guest_page(void *va, size_t size) > +{ > + __clean_dcache_guest_page(va, size); > +} > + > +static void invalidate_icache_guest_page(void *va, size_t size) > +{ > + __invalidate_icache_guest_page(va, size); > +} > + > /* > * Unmapping vs dcache management: > * > @@ -693,16 +703,6 @@ void kvm_arch_mmu_enable_log_dirty_pt_masked(struct kvm *kvm, > kvm_mmu_write_protect_pt_masked(kvm, slot, gfn_offset, mask); > } > > -static void clean_dcache_guest_page(kvm_pfn_t pfn, unsigned long size) > -{ > - __clean_dcache_guest_page(pfn, size); > -} > - > -static void invalidate_icache_guest_page(kvm_pfn_t pfn, unsigned long size) > -{ > - __invalidate_icache_guest_page(pfn, size); > -} > - > static void kvm_send_hwpoison_signal(unsigned long address, short lsb) > { > send_sig_mceerr(BUS_MCEERR_AR, (void __user *)address, lsb, current); > @@ -1013,11 +1013,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > prot |= KVM_PGTABLE_PROT_W; > > if (fault_status != FSC_PERM && !device) > - clean_dcache_guest_page(pfn, vma_pagesize); > + clean_dcache_guest_page(page_address(pfn_to_page(pfn)), > + vma_pagesize); > > if (exec_fault) { > prot |= KVM_PGTABLE_PROT_X; > - invalidate_icache_guest_page(pfn, vma_pagesize); > + invalidate_icache_guest_page(page_address(pfn_to_page(pfn)), > + vma_pagesize); > } > > if (device) > @@ -1219,7 +1221,7 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range) > * We've moved a page around, probably through CoW, so let's treat it > * just like a translation fault and clean the cache to the PoC. > */ > - clean_dcache_guest_page(pfn, PAGE_SIZE); > + clean_dcache_guest_page(page_address(pfn_to_page(pfn), PAGE_SIZE); > > /* > * The MMU notifiers will have unmapped a huge PMD before calling > -- > 2.23.0 Reviewed-by: Fuad Tabba Thanks, /fuad > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel