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=-18.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 5FD23C07E96 for ; Tue, 6 Jul 2021 14:38:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4BFC061376 for ; Tue, 6 Jul 2021 14:38:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232434AbhGFOlR (ORCPT ); Tue, 6 Jul 2021 10:41:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25026 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232441AbhGFOlL (ORCPT ); Tue, 6 Jul 2021 10:41:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625582312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ooFOmAwzy+HfFOyvCt29aszDpkZZys9ivsOeIkFxqM=; b=a12eOlEf/m1Ev+gCa60zKrtM8IKl1WL07w73Rixn63Zp+zQYhQ45nwbnBCub0AK4k+adjQ xoc1+c/lFVVKrh27x64Ck9PNArASV6dmvc/JzhVH1esFar583gf1xRkReeIZhzGZk1pzMk UFwjqUcGV9AGcN27Mr/TUkM6r4fmUk0= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-460-IW9TRrjQPPuROJBZdUJnxA-1; Tue, 06 Jul 2021 09:48:18 -0400 X-MC-Unique: IW9TRrjQPPuROJBZdUJnxA-1 Received: by mail-ed1-f71.google.com with SMTP id w15-20020a05640234cfb02903951279f8f3so10848326edc.11 for ; Tue, 06 Jul 2021 06:48:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0ooFOmAwzy+HfFOyvCt29aszDpkZZys9ivsOeIkFxqM=; b=LO0c1xCUSS92xBq+WE2oFlabEtzDZM6rChSQC+15xPw5U5m+FJwBFf7iMYg+YGhfUk XkhfuPc3wo7/SAZcjT+eTveNSgxE/54Rr40L4AsBtf/fCjOTvYgEP34leYciDTQKksiz 57gsQLKUWIRFXyMVF7qZekdexYyv8m3YXsL2vHi5Gx/cbXzKzcHxO5tRVQsCu76VEI3H SYtWPUU6I0hVpEX1KlQ7z6wXPuktJIpzNSi7DrkAyOJ5TuErM6vrFgJr4Ls825qAPMBs ktjYjOj3swaxTDY+Ui9KzVG35aSCV3kRZWYTZKww1WZSloeMCsS1oJnJA38Z6Epw1+QO xE7w== X-Gm-Message-State: AOAM532DpuyCc9Gq0x/kocEiG9qXJ8hgFc5ex25gc0sDeTEMlzUfOLX7 HuzXuwY6GhRAY5CouGpgfq8iNp0BfEtyFiQvZ1qGvE7YIt8y6kgL5XSFLh6SXpXE//dTyvmr6Bj LXPNpwhsHs7lAiHfz2sD497qD X-Received: by 2002:a05:6402:406:: with SMTP id q6mr23046862edv.149.1625579296983; Tue, 06 Jul 2021 06:48:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGgl9DEawCZx7xuCpsoeuxmG5yr+usrtKWM4tItXUuTZW4Yz4Wcnjt/dgpWkDPxPJymUOcEA== X-Received: by 2002:a05:6402:406:: with SMTP id q6mr23046835edv.149.1625579296860; Tue, 06 Jul 2021 06:48:16 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id g8sm7282271edv.84.2021.07.06.06.48.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jul 2021 06:48:15 -0700 (PDT) Subject: Re: [RFC PATCH v2 20/69] KVM: x86/mmu: Mark VM as bugged if page fault returns RET_PF_INVALID To: isaku.yamahata@intel.com, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , erdemaktas@google.com, Connor Kuehl , Sean Christopherson , x86@kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: isaku.yamahata@gmail.com, Sean Christopherson References: <298980aa5fc5707184ac082287d13a800cd9c25f.1625186503.git.isaku.yamahata@intel.com> From: Paolo Bonzini Message-ID: Date: Tue, 6 Jul 2021 15:48:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <298980aa5fc5707184ac082287d13a800cd9c25f.1625186503.git.isaku.yamahata@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/07/21 00:04, isaku.yamahata@intel.com wrote: > From: Sean Christopherson > > Signed-off-by: Sean Christopherson > Signed-off-by: Isaku Yamahata > --- > arch/x86/kvm/mmu/mmu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 5b8a640f8042..0dc4bf34ce9c 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -5091,7 +5091,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code, > if (r == RET_PF_INVALID) { > r = kvm_mmu_do_page_fault(vcpu, cr2_or_gpa, > lower_32_bits(error_code), false); > - if (WARN_ON_ONCE(r == RET_PF_INVALID)) > + if (KVM_BUG_ON(r == RET_PF_INVALID, vcpu->kvm)) > return -EIO; > } > > Reviewed-by: Paolo Bonzini