From patchwork Sat May 13 00:35:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 9287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5480235vqo; Fri, 12 May 2023 17:37:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5W2HFsO74fNNy0aawEvwsHxPesgqtuxOeVhyRCyC7Bm3cRRTFrP69qBkNt/Gf/zQjyAECa X-Received: by 2002:a17:90b:1c86:b0:250:461:ae65 with SMTP id oo6-20020a17090b1c8600b002500461ae65mr26637478pjb.5.1683938235223; Fri, 12 May 2023 17:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683938235; cv=none; d=google.com; s=arc-20160816; b=vrHz6Yv7Bhgk0fWQlTbiCFJC2ijiPHeBrUMyAhzgr9BqQ+WGUQv7i5N0HKNNRvurEt sUznhWO67da9KFhgvvby3lfCoqSrQz9W8QczfyftPTeEfO7tk4GS4ycVBfmwP8USpP5q zzMlc9ijnOcuqTycd9agZ+iVzqlAfceYk999ycVCbnwSWvSiZmEqLvyKhwSTma5L/IuZ FlF6UC6pRn3Ed/fTZfQ23VhY5X8vK/zGI5hGbwGRvuOY/sfoqaLJAI36v08jLy6NNiqc h88ma6EeuPml0XUZU4eD2JUzVBniuupfGsfQ6Sc3N2qiIMWaBW1ebsQLPhZzK1ObEj38 vGsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :reply-to:dkim-signature; bh=U1Ge3/d9lA0wDaa4KjBcDxtmuRNcZOWTUCAWw0gE6gI=; b=owNm2/0FettKvcSF3SHQ8Ha8RHfciv6aQccemUPkMeBU3QGSLxJZGExsXI8qpFIxG6 zFn1Y36smBXmPHjPZNA2Imyny5m5oPrdr2ywfMyLy/sRUWL/qvDV350b/X9HYwcRGVHn PmAxeGzH8dCPMLgTyYZ3kEBZfMqj28g31YHd1PxMF3nr1QTCeHh6KqpdvScKnnkIJQA3 A3dcA4jUcr/hn78+VO7XDrdZcSE6H94QAI3K2pSPkKxEyRyzfsyv06Vtg/WFOHG5HGah 9oBTjZ4QCgM2DIHZoNc7G0isrgNPyLKtBAr6OrFeK6FKaErg2RV7PFxMcEfIBHbB8QaC oxhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=oetF2r1M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s68-20020a632c47000000b005302f84fe3asi10296921pgs.803.2023.05.12.17.37.02; Fri, 12 May 2023 17:37:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=oetF2r1M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240942AbjEMAgL (ORCPT + 99 others); Fri, 12 May 2023 20:36:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240883AbjEMAgI (ORCPT ); Fri, 12 May 2023 20:36:08 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72E125581 for ; Fri, 12 May 2023 17:36:06 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-6439bc1e3aaso6263755b3a.2 for ; Fri, 12 May 2023 17:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938166; x=1686530166; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=U1Ge3/d9lA0wDaa4KjBcDxtmuRNcZOWTUCAWw0gE6gI=; b=oetF2r1M5UiBxGIcL8zFJt3KZzPc4fIcwMDdhX/l57bLLJh7cM3X4mNNADBirTiMsw tno7AR+Dvgh3Vw4uuqw6BiGqojcKm9HdP5GJEjmyW5fgNQ3uH9GfWcik8X9l8Il8yj/F JDSdCnCk453r2ImEA+XEqnVZNEGK62kt196UdpjOQTLp5m6ljRH7LbmbsKQcW1JkZLWL eTI/tPiSeCVE0Ra8n1OkKzP9IuDY0/KphXTBaOaj5Ytdy2EoJjClJKVr2vKk22PnetQj TQ1WL518q999Tr/FzyV0uLw0cE55dRKp34tT4WPlBaPORkpnV8W5J1MOW7nmEVxQABm9 gj1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938166; x=1686530166; 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=U1Ge3/d9lA0wDaa4KjBcDxtmuRNcZOWTUCAWw0gE6gI=; b=aoj0SogZy3hjaLQ5VVK4hFgqAED0EeAJNqDwjo5WW3egXWimU5Khi8ZmRoaYpUv6XT DDd4/aTx5gBaGlX415gc8gD+dWE68hAlJyd5/DAI1dKinG4bHnVpJq2QBXtdhxPXFzaO wgr1TSvwFxeJpqsP83M5b7XK9JbJ3MxIzelhtEGDJsPMZksxY1pn/MCrO9z2Wj33MikS KnJgfjFee3CbiLpSvxotCuZhdB1oB6Mg2zgv8L9JDo4vGaffRA0/aT8rqTvwvHFb8hu4 zG2gHxCGIqScIdAq6hlorFEpkXw3DpEvOuBPUrK/xIX2jOFYKsTyuHkzGQdQyfNaer7c mAmA== X-Gm-Message-State: AC+VfDz/XvkcF+BRBIgB3pzUAoSPT9vg5rdJfDxmBEqb/rXirUUqVCil Bp1QTm9uvoldzz+PH5b5K7ghl9Yctic= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:d5a:b0:643:536b:e764 with SMTP id n26-20020a056a000d5a00b00643536be764mr7181548pfv.4.1683938166027; Fri, 12 May 2023 17:36:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:32 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230513003600.818142-1-seanjc@google.com> Subject: [PATCH v3 00/28] 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765737218742840345?= X-GMAIL-MSGID: =?utf-8?q?1765737218742840345?= 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 always for this series, the KVMGT changes are compile tested only. Based on "git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-6.4-1". v3: - Collect reviewed/tested tags (I apologize if I missed any, I manually gathered them this time due to a goof in my workflow). [Yan] - Drop check on max KVM paging size from KVMGT. [Yan] - Drop the explicit change on THP pages, and instead validate that the pfns (not struct page pointers) are contiguous. [Yan] - Fix buggy intel_gvt_dma_map_guest_page() usage by eliminating a helper for shadowing 2MiB GTT entries. [Yan] - Move kvm_arch_flush_shadow_{all,memslot}() to mmu.c instead of exposing kvm_mmu_zap_all_fast() outside of mmu.c. [Yan] - Fix an alignment goof in hlist_for_each_entry_srcu() usage. [Yan] - Wrap full definition of external page track structures with CONFIG_KVM_EXTERNAL_WRITE_TRACKING. [Yan] v2: - https://lore.kernel.org/all/20230311002258.852397-1-seanjc@google.com - 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 (24): drm/i915/gvt: Verify pfn is "valid" before dereferencing "struct page" drm/i915/gvt: Verify hugepages are contiguous in physical address space drm/i915/gvt: Put the page reference obtained by KVM's gfn_to_pfn() drm/i915/gvt: Explicitly check that vGPU is attached before shadowing drm/i915/gvt: Error out on an attempt to shadowing an unknown GTT entry type 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: Move kvm_arch_flush_shadow_{all,memslot}() to mmu.c 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 | 73 +++----- arch/x86/kvm/mmu.h | 2 + arch/x86/kvm/mmu/mmu.c | 51 +++-- arch/x86/kvm/mmu/page_track.c | 256 +++++++++++++------------- arch/x86/kvm/mmu/page_track.h | 58 ++++++ arch/x86/kvm/x86.c | 22 +-- drivers/gpu/drm/i915/gvt/gtt.c | 102 ++-------- drivers/gpu/drm/i915/gvt/gtt.h | 1 - drivers/gpu/drm/i915/gvt/gvt.h | 3 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 117 +++++------- drivers/gpu/drm/i915/gvt/page_track.c | 10 +- 12 files changed, 320 insertions(+), 391 deletions(-) create mode 100644 arch/x86/kvm/mmu/page_track.h base-commit: b3c98052d46948a8d65d2778c7f306ff38366aac Tested-by: Yongwei Ma