From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 4A0B1A936 for ; Wed, 12 Apr 2023 21:35:25 +0000 (UTC) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-54efad677cbso123307667b3.6 for ; Wed, 12 Apr 2023 14:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681335324; x=1683927324; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=fXIZH8fY83vgfwH8POrr//89XoSgOMitG1Dp++mIiPs=; b=YisQpRnBOeAwg9ZX219UZQMhQxuyDfMdNDGwIM7kYemLzsSfZ/SGeZjelJTvKZTX01 h+3Mva+AsoeDLPkEZfXti0QYJCd0Gnxtx2iPS46KcZYJMbtNIpccXd1nkV7JjclKAgOT ZZgzQxYVQewWug5Hu/GM9rA5g0xIWgk9PTD6gv8RLkgLSKnFdVu0S2i0SZwpYwJwRWHr M4RMrS3cKuQowbs4mv/G49o/rXgk/U+bWQ1jnOSm37UF5tkUkoqwpaqgy25/jiVwm4S5 dK6aGhjypYDdse2/jDhX7vXjaJhm5k+2X10ISVVE0X24dQw/ZwqzdXc93uctIAQ/wiBy t+PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681335324; x=1683927324; 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=fXIZH8fY83vgfwH8POrr//89XoSgOMitG1Dp++mIiPs=; b=MDFg9msJvplQf5Q+SYOnTWG8lBJgtfH6iY0wludKWCxOTZMH/zWdkXpdY30GieZpAj IcHzOEjd887Ti/Yw/Qrr/hwLlcHSrzrAVFcqrtWH1rszKGfqyIUrRUj1ztmPYN6VPwck ayeDljVyOjMuPLIZXvfjvKQQfIM37g5Ra9/fzA7wAXg6oMhsq2KHhQU4Y/ErChqIPyNP B9IQESTT+MU1juP3P2Me8ImBF3pI1qaULzJ8ZMObmMILPbspQKzFMZMTEDloNWhejkHj k9lK6/LoJPB07SiTO7hbKIHh3BSSb9QW+btkT2agR+zgyyZVA+Lk8RVDdtJaELCqHg9m ZKwg== X-Gm-Message-State: AAQBX9ckqJDp4t47V/xe2s7PtpqgKOEGNzCh99N5jfl4/DSiyunbjCwB YDYrQz/zJC0ca+Tlt2yTfEnVPwd7ovOGzw== X-Google-Smtp-Source: AKy350bhXrkwYHL2oiwHoVZPq1a1kZqsww17x6UiZcbBFdt3mgWFNOOcT1fYEgc+pglz1McVDcJD24DYEi1ceQ== X-Received: from laogai.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:2c9]) (user=amoorthy job=sendgmr) by 2002:a0d:ec02:0:b0:54c:2723:560d with SMTP id q2-20020a0dec02000000b0054c2723560dmr8663ywn.3.1681335324351; Wed, 12 Apr 2023 14:35:24 -0700 (PDT) Date: Wed, 12 Apr 2023 21:34:58 +0000 In-Reply-To: <20230412213510.1220557-1-amoorthy@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230412213510.1220557-1-amoorthy@google.com> X-Mailer: git-send-email 2.40.0.577.gac1e443424-goog Message-ID: <20230412213510.1220557-11-amoorthy@google.com> Subject: [PATCH v3 10/22] KVM: x86: Annotate -EFAULTs from kvm_mmu_page_fault() From: Anish Moorthy To: pbonzini@redhat.com, maz@kernel.org Cc: oliver.upton@linux.dev, seanjc@google.com, jthoughton@google.com, amoorthy@google.com, bgardon@google.com, dmatlack@google.com, ricarkol@google.com, axelrasmussen@google.com, peterx@redhat.com, kvm@vger.kernel.org, kvmarm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" Implement KVM_CAP_MEMORY_FAULT_INFO for efaults generated by kvm_mmu_page_fault(). Signed-off-by: Anish Moorthy --- arch/x86/kvm/mmu/mmu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 144c5a01cd778..7391d1f75149d 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5670,6 +5670,9 @@ int noinline kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 err return -EIO; } + if (r == -EFAULT) + kvm_populate_efault_info(vcpu, round_down(cr2_or_gpa, PAGE_SIZE), + PAGE_SIZE); if (r < 0) return r; if (r != RET_PF_EMULATE) -- 2.40.0.577.gac1e443424-goog