From patchwork Wed Apr 12 21:35:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anish Moorthy X-Patchwork-Id: 13209565 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 581BBC7619A for ; Wed, 12 Apr 2023 21:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230099AbjDLVfm (ORCPT ); Wed, 12 Apr 2023 17:35:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbjDLVfb (ORCPT ); Wed, 12 Apr 2023 17:35:31 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F051A83D7 for ; Wed, 12 Apr 2023 14:35:29 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-54f87e44598so46588517b3.5 for ; Wed, 12 Apr 2023 14:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681335329; x=1683927329; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=TMoObdMgGKK1Dm08+sln58kp5QBYq24ihR/AEV1awlI=; b=rh+/+zw3Za1gxuRrVQJEEjhupmhmknQ/4pC4YKJQPjw/IBRrbOGZRl6uPFNdSfQIAg rLRvo/QL7yxEQnzBbcuQBBulo8e4IqcIDuwrrNv3C0inbPr8YZJ3V2T0PMO7P/s2222w d01Y596uxKiYiIi8HMOCx+Gc6YGpSjv6bd5ixrhHyr4X9rQi/uIHGmOmrslt7LEJz9fo qX+bWNOFqUeXEe/rqEzR3O3uzwVf204tZ0Js1kWQJ/+NXNbBWyLxdRPaW1+XPkDRtZCw yW7FfsafpaPKaeAu5nHfz4+R6ula5hXzkCq8pZtMZha3Oq8Hmn5CgaruZT0WhQSxPx1A 7FJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681335329; x=1683927329; 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=TMoObdMgGKK1Dm08+sln58kp5QBYq24ihR/AEV1awlI=; b=f5QbsukO8eW6HtIvGiQtDw/W3YcFsGeJpUkRMEJMM9JgSHfLURUJ+5ll7a5vuP46x8 Uvs/Ttzs4Y9f1AoSAbAiPBWpTkHECAMQgf74LpqnegpZaLNSWYnTKvFjfGzPf/hSNuA/ uFtb2Gj8sLXsM9qqnH7LLJDvV8/PdGgOpZcQRtnXw1GG0pOhW/b+RlCLoJBj4EhVx2cA D9m3Jeh51sGecYUw708MCa2uJkU9YKAKsM9g4jyIz7+7C0/cEx8sc28RBuG4Jiq+RkJc FMzBTnV3I7D3BllMLDqTW5753vG5IkKAJxzZEqFpxj7c0fOgmvVCnwfSl5JEQ1QVW32E pMUw== X-Gm-Message-State: AAQBX9dkEu5hpHRE0l/6SO1aadD57KCVT7RCBF4IPy85GzNGcRluJjSv BCXLxxzhW4PiOO8n2B1ZUQuERDbqV5Oj+A== X-Google-Smtp-Source: AKy350awPEdXfzeyIZrkWycnGmb1wsYa+P7TPbbAsrvpvFBbHnKQbFgfxIvBnw6PFjQaDHuHgaXdgnJo4I8u5w== X-Received: from laogai.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:2c9]) (user=amoorthy job=sendgmr) by 2002:a0d:ec50:0:b0:54d:913b:c9e8 with SMTP id r16-20020a0dec50000000b0054d913bc9e8mr8999819ywn.5.1681335329588; Wed, 12 Apr 2023 14:35:29 -0700 (PDT) Date: Wed, 12 Apr 2023 21:35:04 +0000 In-Reply-To: <20230412213510.1220557-1-amoorthy@google.com> 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-17-amoorthy@google.com> Subject: [PATCH v3 16/22] KVM: x86: Annotate -EFAULTs from kvm_handle_error_pfn() 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 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index a965c048edde8..d83a3e1e3eff9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3218,6 +3218,9 @@ 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; + if (is_sigpending_pfn(fault->pfn)) { kvm_handle_signal_exit(vcpu); return -EINTR; @@ -3236,6 +3239,10 @@ 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); + + kvm_populate_efault_info(vcpu, rounded_gfn, fault_size); return -EFAULT; }