Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20303B650 for ; Fri, 8 Sep 2023 22:29:55 +0000 (UTC) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-d7b9eb73dcdso2315872276.0 for ; Fri, 08 Sep 2023 15:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1694212194; x=1694816994; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LzMBBO3+QOcCxytQD9gvt8PFFPzKUty4hf8hE8hWFnE=; b=b/yawMAtOZ+Img2fcZ92sMNwbbjtikGvvtObML0HMXcrAg0Ow3hcHjUKCNrYs4VGUA 1CDr/yFLvpYmHIgrrpKeoDoIeGBAEOWdf1fAWKNhvxNVMCGCaUoCiHMFn3CGWwknlBFh aRDOxkc5jJTOMyZGyTj7TCnASXXLMOtlInzIJgiWKj3cr285puwKwlgAPAthlhkQebSi GIzCoTHxuCJj1tatR2F7T5qp9WR398Xr5i9cHKhj/SdE+UHF4NCCUvnP6KVV/v/bf745 qXi/3t2ofRx0fNpIeaY2HUzLA07Fho5tKKISmlylvUr8CrtG+ERdEQ6tcM7d2Z9Ge1/g HeeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694212194; x=1694816994; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LzMBBO3+QOcCxytQD9gvt8PFFPzKUty4hf8hE8hWFnE=; b=d+jMjHnlxKeBdShB4tLrY6aXX6infBex7QraSWuRfpmlKH6p6RICPGxnL4Uvd9KfV8 zBkwUh40Ol465CffUiO27Sa7yq1LWhuYw/okAhYZGf0E5zDezZXLQ5x+pDZ0FuQktoWV NOd3jUxqSAoI7eLWwPxe95DQjzaMVgy2DaHaW+W1qzOKO35XQAnuOGLahH2CHvpuIXL3 DeHZQOBsoSGVmkvpb4M+0skdE2H2RPFRbpJ1b/gaCP1X5JduyM/ognTBeNi8qMiT7HWk ko+4n/mUIwKIej03sbnKV/nLnr3JtSKqQgEl5cgC5ylUSErby70QVce7KtdXt1Rl8H+h pvqw== X-Gm-Message-State: AOJu0YyooVIw9x9+Odf8WD9D7LAFFdQAh3K7shdJnoCy8SvsPBnPkDZP G7kMvVVlCciF+S6qO0BOxW5KFRVemVbiEQ== X-Google-Smtp-Source: AGHT+IGgQ6+xByO+HkT24hG/yB9NqyYPbYWpx7ZIjBxm/QZKjr8AwVFmzf4mP+1g9/qAE5XNiwUyfp/6A4SM3Q== X-Received: from laogai.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:2c9]) (user=amoorthy job=sendgmr) by 2002:a05:6902:168b:b0:d80:cf4:7e80 with SMTP id bx11-20020a056902168b00b00d800cf47e80mr72394ybb.7.1694212194254; Fri, 08 Sep 2023 15:29:54 -0700 (PDT) Date: Fri, 8 Sep 2023 22:28:53 +0000 In-Reply-To: <20230908222905.1321305-1-amoorthy@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230908222905.1321305-1-amoorthy@google.com> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230908222905.1321305-7-amoorthy@google.com> Subject: [PATCH v5 06/17] KVM: x86: Annotate -EFAULTs from kvm_handle_error_pfn() From: Anish Moorthy To: seanjc@google.com, oliver.upton@linux.dev, kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: pbonzini@redhat.com, maz@kernel.org, robert.hoo.linux@gmail.com, jthoughton@google.com, amoorthy@google.com, ricarkol@google.com, axelrasmussen@google.com, peterx@redhat.com, nadav.amit@gmail.com, isaku.yamahata@gmail.com, kconsul@linux.vnet.ibm.com Content-Type: text/plain; charset="UTF-8" Implement KVM_CAP_MEMORY_FAULT_INFO for efaults generated by kvm_handle_error_pfn(). Signed-off-by: Anish Moorthy --- arch/x86/kvm/mmu/mmu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index e1d011c67cc6..deae8ac74d9a 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3267,6 +3267,8 @@ static void kvm_send_hwpoison_signal(struct kvm_memory_slot *slot, gfn_t gfn) static int kvm_handle_error_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) { + u64 fault_flags; + if (is_sigpending_pfn(fault->pfn)) { kvm_handle_signal_exit(vcpu); return -EINTR; @@ -3285,6 +3287,17 @@ static int kvm_handle_error_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fa return RET_PF_RETRY; } + WARN_ON_ONCE(fault->goal_level != PG_LEVEL_4K); + + fault_flags = 0; + if (fault->write) + fault_flags = KVM_MEMORY_FAULT_FLAG_WRITE; + else if (fault->exec) + fault_flags = KVM_MEMORY_FAULT_FLAG_EXEC; + else + fault_flags = KVM_MEMORY_FAULT_FLAG_READ; + kvm_handle_guest_uaccess_fault(vcpu, gfn_to_gpa(fault->gfn), PAGE_SIZE, + fault_flags); return -EFAULT; } -- 2.42.0.283.g2d96d420d3-goog