From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793641531; b=CXMwtXn7g8kSQ/lJJa5k5nG3hUTVdOvLLynz3L4SGp6xsbF3RPDpVe5Iczntlc1R759M TkMS0QqBoaVx61Jq29dFkEgAwPOUzEjTyx+JOtSgIcDNEZwb4FH34AKYwMNI/JTBUk5cO bFLyKOUuKUvxsN6W6au2LEkaBEU1PP4oPc1WZ9AbN/qIZ+HzfpRN0OYM24oHtLd3rYtvO j4swggucEQkGLtVeiLXypGB/iZdozqB7KCifkIJHdFXcE+LozRWVDspskLzWaG1zS11zM 8e6+meiAd6sCtlCDUFk2D+80DARVwv0AZ+XsVJu3nrmGrfYFW/b/VKSxMLwb9lf97eg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793641531; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:Received:From:To:Cc:Subject:Date: Message-ID:In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding:X-Scanned-By; bh=eNiSWpnU8Lwgrp8cAZMrGw9BDm4Xqnl5gdC5H/nGJ6Y=; b=Z5Cs7BJ7pcCX18Z7W/OBAUyk+POx+ec3wJl86XCcS23onWsqrr8KUdqAnd6ygTYQxBbe yhpPzjYGNq5O/XK0nYHPXneb26Ml5N+FtrFZCU/OExb4BxDpU5byieGSohk4pShQhcOLQ Zu34Z652TE83yxFLZK9LLxxAJkE7ckL8xHGXDVlqWdavD6h2UJl+T9UyA9ZYid0Eb3P5+ 7u1W7CELgsS18QuS6QcLfR7yRh0y+eCz3tGQCXgZTojXA8YGekSIXwbS1/irw7/4iyG8Q mt34NAjD26Wt5gc6l6Ccm6Lw6mBomTjT3iTZUHfc9t+4Pd7EXfI8rGMhD1iPsYNVZug== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bcskjmyv; arc=none smtp.remote-ip=170.10.129.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FDD560B33C4 for ; Mon, 2 Nov 2026 17:45:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 8FDD560B33C4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bcskjmyv DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793641529; 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=eNiSWpnU8Lwgrp8cAZMrGw9BDm4Xqnl5gdC5H/nGJ6Y=; b=bcskjmyvoXRTR2ihg4GjvSTOQZfG9jD819L8G3eggn408BbOwbpnOe7bEUwT1LkH2PyTmi fjUVi+f98DfHF976/8A1o3FIocMXsLRlDVdMIbipYxOOr6JXi+6KRcsld7FfzcAbptYeXO EndD8mRCJ4ehzikI04vpPhlIeup/BdU= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-681-Qtmpe5q4NPqN0vnZgNdZSg-1; Mon, 02 Nov 2026 12:45:26 -0500 X-MC-Unique: Qtmpe5q4NPqN0vnZgNdZSg-1 X-Mimecast-MFC-AGG-ID: Qtmpe5q4NPqN0vnZgNdZSg_1793641524 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 637F91955F30; Mon, 2 Nov 2026 17:45:24 +0000 (UTC) Received: from virtlab1023.virt.eng.rdu2.dc.redhat.com (virtlab1023.virt.eng.rdu2.dc.redhat.com [10.18.48.26]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E4520433; Mon, 2 Nov 2026 17:45:23 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Nicolas Saenz Julienne Subject: [PATCH 33/45] KVM: x86: Allow page fault fixup to return errors Date: Mon, 2 Nov 2026 12:45:00 -0500 Message-ID: <20261102174512.8903-17-pbonzini@redhat.com> In-Reply-To: <20261102174130.8779-1-pbonzini@redhat.com> References: <20261102174130.8779-1-pbonzini@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 kvm_fixup_and_inject_pf_error() reflects intercepted hardware page faults into the guest, walking the guest page tables when necessary to obtain an error code consistent with the guest's paging rules. For example, a GPA that exceeds guest.MAXPHYADDR but fits within host.MAXPHYADDR must cause a reserved-bit fault, even though hardware does not report one. Allow the function's callers to propagate memory attribute failures from the page table walk; subsequent changes will return from kvm_fixup_and_inject_pf_error() any error from the page-table walk. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx/vmx.c | 15 +++++++++++---- arch/x86/kvm/x86.c | 3 ++- arch/x86/kvm/x86.h | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 27cb0d64fb5c..c4511f83d59b 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -5418,10 +5418,14 @@ static int vmx_handle_page_fault(struct kvm_vcpu *vcpu, u32 error_code) WARN_ON_ONCE(!IS_ENABLED(CONFIG_X86_SGX_KVM) || !cpu_feature_enabled(X86_FEATURE_SGX2)); - if (guest_cpu_cap_has(vcpu, X86_FEATURE_SGX2)) - kvm_fixup_and_inject_pf_error(vcpu, cr2, error_code); - else + if (guest_cpu_cap_has(vcpu, X86_FEATURE_SGX2)) { + int r = kvm_fixup_and_inject_pf_error(vcpu, cr2, error_code); + + if (r) + return r; + } else { kvm_inject_gp(vcpu, 0); + } return 1; } @@ -5431,7 +5435,10 @@ static int vmx_handle_page_fault(struct kvm_vcpu *vcpu, u32 error_code) * to the GPA being legal with respect to host.MAXPHYADDR). */ if (enable_ept) { - kvm_fixup_and_inject_pf_error(vcpu, cr2, error_code); + int r = kvm_fixup_and_inject_pf_error(vcpu, cr2, error_code); + + if (r) + return r; return 1; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5818101d1d8a..bb36ca1106e5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10811,7 +10811,7 @@ void kvm_arch_gmem_invalidate_range(struct kvm *kvm, struct kvm_gfn_range *range #endif #endif -void kvm_fixup_and_inject_pf_error(struct kvm_vcpu *vcpu, gva_t gva, u16 error_code) +int kvm_fixup_and_inject_pf_error(struct kvm_vcpu *vcpu, gva_t gva, u16 error_code) { struct kvm_pagewalk *gva_walk = &vcpu->arch.gva_walk; struct x86_exception fault; @@ -10833,6 +10833,7 @@ void kvm_fixup_and_inject_pf_error(struct kvm_vcpu *vcpu, gva_t gva, u16 error_c fault.async_page_fault = false; } gva_walk->inject_page_fault(vcpu, &fault, true); + return 0; } EXPORT_SYMBOL_FOR_KVM_INTERNAL(kvm_fixup_and_inject_pf_error); diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index cfe96962a4e4..4239765629b0 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -368,7 +368,7 @@ void kvm_deliver_exception_payload(struct kvm_vcpu *vcpu, struct kvm_queued_exception *ex); void kvm_handle_exception_payload_quirk(struct kvm_vcpu *vcpu); -void kvm_fixup_and_inject_pf_error(struct kvm_vcpu *vcpu, gva_t gva, u16 error_code); +int kvm_fixup_and_inject_pf_error(struct kvm_vcpu *vcpu, gva_t gva, u16 error_code); int x86_decode_emulated_instruction(struct kvm_vcpu *vcpu, int emulation_type, void *insn, int insn_len); int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, -- 2.52.0