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 9BD0DC6FD1F for ; Sat, 11 Mar 2023 00:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230128AbjCKAXQ (ORCPT ); Fri, 10 Mar 2023 19:23:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230098AbjCKAXL (ORCPT ); Fri, 10 Mar 2023 19:23:11 -0500 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 EDE8A1C312 for ; Fri, 10 Mar 2023 16:23:07 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id k6-20020a25e806000000b00a623fca0d0aso7384942ybd.16 for ; Fri, 10 Mar 2023 16:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494186; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=MpOVAI38bTLuJNgBk8GaHxc8e/Jb/LnD+AZKWhWvJwE=; b=XbW093+rMa2pnpJH37lZhmJyqngdEGL3lguHJGCWEBwilzA+wyvQt83zBMXyMuuQGf Zx5zugscYQo2UdBFHyXFHyx9/iwj64Z7TtwQufmO7Zli8+GW4yHJEuiYmrWyRO6vPvOg sRK/Hf1kIIMY+eWvy7sBdDbqe7ZDL/iC/SaSbAl2vv0kDvDinu9Mk0bedUrGM03u/ctT am44Vfn0d2y1QncBgkbGgAv8UJyeRhV77NraNPxWlWYvZ7tzz8U3zWlAAAojZaEqPNhX gBYhK3YffcD8NX9mh+OZvBdlMFrmUuG6f/19q5NuvRDbpiHf/FaycV6IXWqbuQaMMzbi w2lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494186; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MpOVAI38bTLuJNgBk8GaHxc8e/Jb/LnD+AZKWhWvJwE=; b=LSEkXnySjqLXftzldGxS1lS2adRjAgeubdTwmCrBbZBbssTBwuOzwYvSshwKNg1hPw gqoGZTnW23JRtVXM7RQ0o1ZcFInKgS3DODzyPrHWsTgDV68Ot6dfwmHyONWONxWkwds+ ncarcKryMySTMInr3aM0nISJnd5e1xmc3VKixiNqkwGNLNVXD3Yvk9UithCgLd8MKjWq MvbJpfB9RPl1SjgYyHgdGbPIKIAkpIHvTB3fFxBNVx3dFlYSkAuhECSrYc9d4z9ai1xQ MDpETxtI2NA4MaoTSUH9LzMGBi500GWrViLHcRgCgv7l+JsIurqOAK/QuAAG640d7lDj nzCQ== X-Gm-Message-State: AO0yUKV68qoDB7+xrNWWau8CmGB17xeAdLvVU1ajvzojgLOfEvaf1oX4 SljQdGK/2LuXWm5e3HuqQHaOte+DY/I= X-Google-Smtp-Source: AK7set8vTaIMU+K6m3Cl6okYM4t5eXk0ZFL+RJCT155s18NnCaDpzit2dXYYj9lDkW1y/PA+UEBTWwlw5xU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:188:b0:a99:de9d:d504 with SMTP id t8-20020a056902018800b00a99de9dd504mr16642957ybh.12.1678494186436; Fri, 10 Mar 2023 16:23:06 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:31 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311002258.852397-1-seanjc@google.com> Subject: [PATCH v2 00/27] drm/i915/gvt: KVM: KVMGT fixes and page-track cleanups From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix a variety of found-by-inspection bugs in KVMGT, and overhaul KVM's page-track APIs to provide a leaner and cleaner interface. The motivation for this series is to (significantly) reduce the number of KVM APIs that KVMGT uses, with a long-term goal of making all kvm_host.h headers KVM-internal. As was the case in v1, tThe KVMGT changes are compile tested only. Based on "git://git.kernel.org/pub/scm/virt/kvm/kvm.git next". v2: - Reuse vgpu_lock to protect gfn hash instead of introducing a new (and buggy) mutext. [Yan] - Remove a spurious return from kvm_page_track_init(). [Yan] - Take @kvm directly in the inner __kvm_page_track_write(). [Yan] - Delete the gfn sanity check that relies on kvm_is_visible_gfn() instead of providing a dedicated interface. [Yan] v1: https://lore.kernel.org/lkml/20221223005739.1295925-1-seanjc@google.com Sean Christopherson (23): drm/i915/gvt: Verify pfn is "valid" before dereferencing "struct page" KVM: x86/mmu: Factor out helper to get max mapping size of a memslot drm/i915/gvt: Incorporate KVM memslot info into check for 2MiB GTT entry drm/i915/gvt: Verify VFIO-pinned page is THP when shadowing 2M gtt entry drm/i915/gvt: Put the page reference obtained by KVM's gfn_to_pfn() drm/i915/gvt: Don't rely on KVM's gfn_to_pfn() to query possible 2M GTT drm/i915/gvt: Use an "unsigned long" to iterate over memslot gfns drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt() drm/i915/gvt: Protect gfn hash table with vgpu_lock KVM: x86/mmu: Don't rely on page-track mechanism to flush on memslot change KVM: x86/mmu: Don't bounce through page-track mechanism for guest PTEs KVM: drm/i915/gvt: Drop @vcpu from KVM's ->track_write() hook KVM: x86: Reject memslot MOVE operations if KVMGT is attached drm/i915/gvt: Don't bother removing write-protection on to-be-deleted slot KVM: x86/mmu: Move KVM-only page-track declarations to internal header KVM: x86/mmu: Use page-track notifiers iff there are external users KVM: x86/mmu: Drop infrastructure for multiple page-track modes KVM: x86/mmu: Rename page-track APIs to reflect the new reality KVM: x86/mmu: Assert that correct locks are held for page write-tracking KVM: x86/mmu: Bug the VM if write-tracking is used but not enabled KVM: x86/mmu: Drop @slot param from exported/external page-track APIs KVM: x86/mmu: Handle KVM bookkeeping in page-track APIs, not callers drm/i915/gvt: Drop final dependencies on KVM internal details Yan Zhao (4): drm/i915/gvt: remove interface intel_gvt_is_valid_gfn KVM: x86: Add a new page-track hook to handle memslot deletion drm/i915/gvt: switch from ->track_flush_slot() to ->track_remove_region() KVM: x86: Remove the unused page-track hook track_flush_slot() arch/x86/include/asm/kvm_host.h | 16 +- arch/x86/include/asm/kvm_page_track.h | 66 +++---- arch/x86/kvm/mmu.h | 2 + arch/x86/kvm/mmu/mmu.c | 61 +++--- arch/x86/kvm/mmu/mmu_internal.h | 2 + arch/x86/kvm/mmu/page_track.c | 270 ++++++++++++++------------ arch/x86/kvm/mmu/page_track.h | 58 ++++++ arch/x86/kvm/x86.c | 13 +- drivers/gpu/drm/i915/gvt/gtt.c | 88 ++------- drivers/gpu/drm/i915/gvt/gtt.h | 1 - drivers/gpu/drm/i915/gvt/gvt.h | 3 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 132 ++++++------- drivers/gpu/drm/i915/gvt/page_track.c | 10 +- 13 files changed, 361 insertions(+), 361 deletions(-) create mode 100644 arch/x86/kvm/mmu/page_track.h base-commit: 45dd9bc75d9adc9483f0c7d662ba6e73ed698a0b -- 2.40.0.rc1.284.g88254d51c5-goog