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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF182C433FE for ; Thu, 30 Dec 2021 19:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240423AbhL3TbC (ORCPT ); Thu, 30 Dec 2021 14:31:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240424AbhL3TbA (ORCPT ); Thu, 30 Dec 2021 14:31:00 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC258C06173E for ; Thu, 30 Dec 2021 11:31:00 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id rj2-20020a17090b3e8200b001b1944bad25so23927634pjb.5 for ; Thu, 30 Dec 2021 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=FYXvglbGqKa6MDTBbtApQcpspIcGTQNntrmktbwch7M=; b=q+u3LGjWTXF+/UkU1WEUFXFDVgUnuMGd98HfbtIuFtaohdCzdt1lUbN5XmbY/5A0Pc WkRa2/FXd9RP0uvpVenO/q7UTfL3MvHmp68TxNYmX5Atjg7huB0qoxS5800TvmF9hSVW MwnYHcWP5TdHI/YuNnMDpFJre/nJor6vhNEolXtYcWFd6zItCBwlOkZ4IOk4eydXyIJr jZ6R4cWla/pN3Fy8kjX/bxMwmotBloLDhJnjpNoys5aLPq/kXc5XYv3AeY6QH2IEUzGt k7oDX0VR+ABhKp3CynFnyI8H1hVvLh9uM+P/IujXOn6FqcxljG7ZnnXju7UJKLUUcrUk NyKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=FYXvglbGqKa6MDTBbtApQcpspIcGTQNntrmktbwch7M=; b=kiTiH1L9A5MT5YDKpXmcxIQ3KnSFrd1fMOchfprkb1Rjbu16u9oLHTeXrn9ADh38bu vP5YeaNiRanJCFUsYb5I+fOQX+E7vqKxUNTo7aDNCrxVEGmxsC5IjGPav9UCjvOzX5kl hZJ1WW49M8X5KedDjL324G/BmE9YkjWRIZ68QzBpPTUHE6rjRTqOtuUsfJddvfQQ4Ys9 s+WRkH6WbN/guSv0XaTvRzoM2WZmO8loMTH10KO2gMcNXBYk1J3xlY0cuD6ax44DOqcQ 80njxXlaoOLFHro7zr+LkfeO9mAaV82CX4ql6ksyjgRevQQPqcGiZs0Xm93OfYBrFl1o lSUg== X-Gm-Message-State: AOAM533ChYbVlSyO0Hr2NlXi1YmvZJgzc1lojBE50Q0vNcP6U71Hjz5b wmD0mDpQr7ESKK2sQAdEPFrFAA== X-Google-Smtp-Source: ABdhPJyYaGGC1njX1Al9c7/uvjjSt874CgyQ2TX9yQVKQldZnTwzxV1a5jQ+vjYlCk1TOSPZQNh8HA== X-Received: by 2002:a17:90b:20b:: with SMTP id fy11mr39658469pjb.238.1640892659992; Thu, 30 Dec 2021 11:30:59 -0800 (PST) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id e9sm23554274pgp.39.2021.12.30.11.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 11:30:59 -0800 (PST) Date: Thu, 30 Dec 2021 19:30:56 +0000 From: Sean Christopherson To: David Stevens Cc: Marc Zyngier , Paolo Bonzini , James Morse , Alexandru Elisei , Suzuki K Poulose , Will Deacon , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH v5 2/4] KVM: x86/mmu: use gfn_to_pfn_page Message-ID: References: <20211129034317.2964790-1-stevensd@google.com> <20211129034317.2964790-3-stevensd@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211129034317.2964790-3-stevensd@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 29, 2021, David Stevens wrote: > From: David Stevens > > Covert usages of the deprecated gfn_to_pfn functions to the new > gfn_to_pfn_page functions. > > Signed-off-by: David Stevens > --- > arch/x86/kvm/mmu.h | 1 + > arch/x86/kvm/mmu/mmu.c | 18 +++++++++++------- > arch/x86/kvm/mmu/paging_tmpl.h | 9 ++++++--- > arch/x86/kvm/x86.c | 6 ++++-- > 4 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h > index 9ae6168d381e..97d94a9612b6 100644 > --- a/arch/x86/kvm/mmu.h > +++ b/arch/x86/kvm/mmu.h > @@ -164,6 +164,7 @@ struct kvm_page_fault { > /* Outputs of kvm_faultin_pfn. */ > kvm_pfn_t pfn; > hva_t hva; > + struct page *page; > bool map_writable; > }; > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 04c00c34517e..0626395ff1d9 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -2891,6 +2891,9 @@ void kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault > if (unlikely(fault->max_level == PG_LEVEL_4K)) > return; > > + if (!fault->page) > + return; > + > if (is_error_noslot_pfn(fault->pfn) || kvm_is_reserved_pfn(fault->pfn)) These two checks can go away as they're made obsolete by the new !fault->page check. > return; >