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 mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49123C433EF for ; Thu, 30 Dec 2021 19:31:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B5E7A49EBD; Thu, 30 Dec 2021 14:31:03 -0500 (EST) 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 pBuYTJZmHfMZ; Thu, 30 Dec 2021 14:31:02 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id A7FD149EB3; Thu, 30 Dec 2021 14:31:02 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id F07FA49E43 for ; Thu, 30 Dec 2021 14:31:01 -0500 (EST) 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 mKnxxNZm8CUc for ; Thu, 30 Dec 2021 14:31:01 -0500 (EST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 08A4C49E16 for ; Thu, 30 Dec 2021 14:31:00 -0500 (EST) Received: by mail-pl1-f171.google.com with SMTP id l16so6773593plg.10 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=BtSdy8xreMmJ34OXf2IIp+a5tz6msjAjSuc7xcuu2J4rIQvWqVI37KaYRGOHbKoF5p jrDjkcMYgPwmkoOTBw4z2wvmYoD27t0sA4FDGm6/rEQVCgkNECSlTQQwHIz1fGLuddfA A7GqfozQ4q79UnVfpaMu0arq67kGiO+BKHcrWdhHKZvviZ2gyC/eJaoy5ynD7f95HvNb uD/X2AhzQ8E1tN8ebqQ5YEz5Hega3bEhuyL9YdAxsAb22lAw7JoczNf4cYBtPKdq6gvn W5WWLnynwQnNnk2uRuji77TzmfXx4K3BrLUVEQbZ3Y3ipCsPGjnGnS9arEGonlIj+X/v egVw== X-Gm-Message-State: AOAM533kcADZWbQ/1I9SjhtRNM0VCV9D7988j2QE4k1U4t9CGeMlvUUy t55QUbSVlOzWOUV+HMvhxuUqBA== 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 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-Disposition: inline In-Reply-To: <20211129034317.2964790-3-stevensd@google.com> Cc: Wanpeng Li , kvm@vger.kernel.org, Marc Zyngier , Joerg Roedel , linux-kernel@vger.kernel.org, Paolo Bonzini , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Jim Mattson 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 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; > _______________________________________________ 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DD675C433F5 for ; Thu, 30 Dec 2021 19:46:58 +0000 (UTC) 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=55DBuaMRucBPTryPTYMDW7D753Xz6XmPr3Sil6a8MtA=; b=WyUDgt6BIzQ8hV K5ZrA9+we4OL9dfELU4p9PWqPYDEqxlen0YWNNHg7cll/ru2grdiBINjUp8Jp9HH3OCA6hI31m+9w eHFhlJoJ9gCIzVHZQtZ6Mm5ep4hJyRkhylyk3Nc6p88xuTpey3OS2nWnoq95TkZh7TYlzLXu7lswS SfbgrpZzWbZYNqwbrUUWZ2I+Hl7Udv7JH93KKSTPYvrOLvo9cTJzDWo8RV+sQ/GL3+f763WOb3/fo KkC88aOrQC/ZX2R09aD4F+ln0ZFSNGYZIOKBvwJD3atCrBM37jufV0Vvr+Acgnzn8GeSTZ6G1+g+x 6+E5Bnt0xRksqwLryauA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n31MV-0058Z5-9c; Thu, 30 Dec 2021 19:45:19 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n318f-00523Q-5h for linux-arm-kernel@lists.infradead.org; Thu, 30 Dec 2021 19:31:02 +0000 Received: by mail-pj1-x1030.google.com with SMTP id lr15-20020a17090b4b8f00b001b19671cbebso23961502pjb.1 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=N7IYLmNfSsXOJlZCA19W0l2uMt0ta8SNGdiYRaw/sz0CfP2Hs0PUNUd3bJjv1ms3La r7EGtHuotm+3KjJpxD8Swsn8WRhzRyXTNzWAiUGc3B+EW4A3Llr2D2TAvrJgFkGQPXQy uPL5a/m/R2IG9vyrGLNOyoEK0EbHHanf/DQOB4qohdpcVtKPs6h9+U9rv0LM9sgUoZ+K 0OdfvKhVlBSSoJFaHfIKBQSsIYxcr4xmJzmZZUGYWlpu1DTCazmodBZ/uL93pkQ+eATz Wx/PreDKlC9k53YKIk/o0EKvSEnJHEJQwtOKP69n9Kd7uXajymf60+xbL7VCSw0gaNlz hsPw== X-Gm-Message-State: AOAM530zvwjJEZTLXnyKTmck0g5ii3GmSQ7ejub+bMmrnlIBXlyQsvkp Ea7LnxCbyHL+pZYTfm1XZyYqLSFT6u+phQ== 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-Disposition: inline In-Reply-To: <20211129034317.2964790-3-stevensd@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211230_113101_267266_B2BDAFC7 X-CRM114-Status: GOOD ( 17.54 ) 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 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; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 B71E1C433F5 for ; Thu, 30 Dec 2021 19:31:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240511AbhL3TbB (ORCPT ); Thu, 30 Dec 2021 14:31:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237012AbhL3TbA (ORCPT ); Thu, 30 Dec 2021 14:31:00 -0500 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1310C061574 for ; Thu, 30 Dec 2021 11:31:00 -0800 (PST) Received: by mail-pj1-x102e.google.com with SMTP id o63-20020a17090a0a4500b001b1c2db8145so28776260pjo.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=Fx4wECzO0i/az1Y99x7ts68K73BRikjqbRlY1CYZiwWcWKUVjsK5rcfoe+7Je8l9lC YdXuI6/YpWmMQEskM73+kQ/j1ZxlxbGHFb7DiPUkEngWOPlbR3js8GkQTAvlyxiFHTFx QKIVW0oKCjJuxl42vcgqHnHaVGPiDECumbl7foJXFzbfzmEIHwyNtAdH9zWcNRH7ymD6 QGmJ48ppEZe0kQeVDz0rV0UP+KMRoQA5y/YnnU4TvY7BhR7pbsxu0gW07gRVp64W0GNu IaOzba/2iHfUfTmSh/es86oNUQ+KIVCXuc7Je9hljRZaqc3Rk9+fpPdD63AdXdrIs+JC DAMw== X-Gm-Message-State: AOAM531NtB/007WqFUI9fW0jRAg4+KeJLvKni+2tEI3MUjIDqbDLZ9lp AjUsw8e38OOKulhlRYPGK5SzJQ== 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: kvm@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; >