From patchwork Fri Jun 2 16:19:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anish Moorthy X-Patchwork-Id: 13265648 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 0A250C7EE24 for ; Fri, 2 Jun 2023 16:20:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235860AbjFBQUW (ORCPT ); Fri, 2 Jun 2023 12:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236876AbjFBQUA (ORCPT ); Fri, 2 Jun 2023 12:20:00 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CCE8132 for ; Fri, 2 Jun 2023 09:19:59 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-babb76a9831so2945702276.2 for ; Fri, 02 Jun 2023 09:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685722798; x=1688314798; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uBjGdxZGKqeTkEhLIRcA2ijpoB4ObDOso7jT09Bdmyk=; b=tgIJe4LUodVd8sWxyV+CkHwf0yCW7CfowcU4dW/0jY/jUCD8U6qotmarbTupMGnEXK Pimz2/Z158ToWRqHqrGh53nmsETixzBUMqGP55QlX8XqM4WclLWl00PCtOHlGHVDZniw pi+KwqT1viiO9avRcfyJAHSDIKKcSAk94XnvZmTCClhJsoxAoCyEC7+LS2D8O7lTJ+Wm hJvCeN60aNWM6dIc3oqPqGbLwzebcVF/WcwH3eVVVnUd/BewHuZbNX6v+mce7bTNIz69 y2+8XWWJli8LU0ko9/K+1Kp6PjLZ8sCqrH2OcH4ugUs6/Yr2YfDXZmIr90rhSeuK6QXl arWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685722798; x=1688314798; 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=uBjGdxZGKqeTkEhLIRcA2ijpoB4ObDOso7jT09Bdmyk=; b=DZ4wG7d0AVmfJAwtAJBWAFhT1cJzbvN9aXl44EY43tdnSHTOxM520r0lmX2YqKX3Lc W0PZH6BmKTJM6pgZc5qzkFRozGk/TkIKBtIN/mFx3j1Onigaa7rD0RE5IdZJGJwe9ZBk XO3nOn5cjVQh0DSQgtJOFSGR0bRSCfznSwIMpkR534hmigJGxx5decqy6Ns6iL7uNLaN 6e1a1XvCRYMeRZY4HHsJv91/9wakFd9BS5sXruMqpszsDWJS1zl5ZYmc6ITqNn0/vhY9 aZu0HKv4lUOH7XhOL0V/Bw7YZOo6lu6P7WAlO275+62xVnXpfnNle8v1npJS/1kePV7x xNjQ== X-Gm-Message-State: AC+VfDy+pBAGiweV4lrYU0rze0OhowQlfeGUzjC2tjn/52QxV4CrAB/K auBngI58KNSRUA2WFzlUC6Wlan6pJLBixQ== X-Google-Smtp-Source: ACHHUZ6hqKP9JyWyo3n6zvDrZCg7oqkFbVaKZzaVMEn43NzxaLbbSVdUk5kev4pbduM0axca+nM241uku9ASRA== X-Received: from laogai.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:2c9]) (user=amoorthy job=sendgmr) by 2002:a25:bc7:0:b0:ba8:cbd2:61b3 with SMTP id 190-20020a250bc7000000b00ba8cbd261b3mr1233071ybl.5.1685722798429; Fri, 02 Jun 2023 09:19:58 -0700 (PDT) Date: Fri, 2 Jun 2023 16:19:13 +0000 In-Reply-To: <20230602161921.208564-1-amoorthy@google.com> Mime-Version: 1.0 References: <20230602161921.208564-1-amoorthy@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Message-ID: <20230602161921.208564-9-amoorthy@google.com> Subject: [PATCH v4 08/16] 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, bgardon@google.com, dmatlack@google.com, ricarkol@google.com, axelrasmussen@google.com, peterx@redhat.com, nadav.amit@gmail.com, isaku.yamahata@gmail.com Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 c8961f45e3b1..cb71aae9aaec 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3291,6 +3291,10 @@ 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) { + uint64_t rounded_gfn; + uint64_t fault_size; + uint64_t fault_flags; + if (is_sigpending_pfn(fault->pfn)) { kvm_handle_signal_exit(vcpu); return -EINTR; @@ -3309,6 +3313,15 @@ static int kvm_handle_error_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fa return RET_PF_RETRY; } + fault_size = KVM_HPAGE_SIZE(fault->goal_level); + rounded_gfn = round_down(fault->gfn * PAGE_SIZE, fault_size); + + fault_flags = 0; + if (fault->write) + fault_flags |= KVM_MEMORY_FAULT_FLAG_WRITE; + if (fault->exec) + fault_flags |= KVM_MEMORY_FAULT_FLAG_EXEC; + kvm_populate_efault_info(vcpu, rounded_gfn, fault_size, fault_flags); return -EFAULT; }