From patchwork Sat Jul 29 01:35:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 128026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp897761vqg; Sat, 29 Jul 2023 00:32:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlFlIfyS1v25vUckNVLGlrzmwsLCZAxtWRMz69P6tefelamFbc9MtraMIFXC2byoxdOjZEt9 X-Received: by 2002:a17:906:5a6a:b0:99b:e04d:3079 with SMTP id my42-20020a1709065a6a00b0099be04d3079mr1432235ejc.19.1690615934339; Sat, 29 Jul 2023 00:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690615934; cv=none; d=google.com; s=arc-20160816; b=Z8OLhlLVErjXTx1j0HxLj6eeIVgUx6kKanTLaZa/XO3KNDwcb15SqWrm92ElpWgxM2 X6+bOCPKNho13lZyrKJ2Iehz1OWZgXmnbvvJxQadLr1ghg1znVUHiBQkB0FBnh488c01 2NhzwvbezTOCNwWYg1VpBGPBckkVtAIzvWNIH12Ta6Th32YUyuJgkHDgNf+0B2w8crJo CpE6doxvl5TOeuNyO+PbsC+GJlXmu5by7qvL0xoucP3ld65uQS97jIl1b8TKt4KCOYnq 19ab2MYipXlfdpoNhtckyeYvd/rpKyDaWqkrzoUfEicV6FBS6EtdCz6Y0VwnvIXyR4X4 5dKg== 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:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=NKdCtniWiAg1ywOiZ6YDPXm5HtZo7eRagpKdBNR7xpg=; fh=J37Q4aKtoxdyy+p3BpF2uV3z0maXFfn3A5M61jlSlO0=; b=0kL7h2nrvHgEKYyMeoYJW3RH1QvSWwa7qOYa8wB6F63owTdWzoW9UYDJGG3pjxlno/ tKUVOFtV6TrjHB8QFeQFVHljSRwNODtbFmcT5Q1RSZi/zPVQxV+si4xGx7mA9LpvYUEy xfEt7SLJmzvhLbBe0+pqtexlBJKm7eCAy8XBl8vT7W3hQfrHBDgpJXHGhLPIi77KtF3u nMnouMz9K74m0C3IxmYx+Gnm4UOW3qZBtPmhWBWouDhNuDa3+RHE94308b/Twmjs052t dRnC3Wn/6f37n676fH2gGFh1UNt0gU4mZPzihkdncy7silgAqMVFvAD6mdfL+lkmLAEi Ym3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=5Uv4EcFs; 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 n6-20020a170906688600b0098e15543465si3758690ejr.280.2023.07.29.00.31.49; Sat, 29 Jul 2023 00:32:14 -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=5Uv4EcFs; 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 S237690AbjG2Bhy (ORCPT + 99 others); Fri, 28 Jul 2023 21:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237670AbjG2BhX (ORCPT ); Fri, 28 Jul 2023 21:37:23 -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 F03E959D0 for ; Fri, 28 Jul 2023 18:37:05 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d1ebc896bd7so2540830276.2 for ; Fri, 28 Jul 2023 18:37:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690594577; x=1691199377; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=NKdCtniWiAg1ywOiZ6YDPXm5HtZo7eRagpKdBNR7xpg=; b=5Uv4EcFsDMD9NsYdJZO7/8bilal5ddhv5oXjy9nAKQerIStaoVew/onb+SGkfBqNof 2A3L/r6MHTGAjoy91PbYkNyIZqhSj+Rg5jo5GTtNjedp97sPqdaRQOHc7gwlvo5jU8vA kxfdHRIh4lvv6FD1geSFpk4NwkD+WEEwwGy3B85/dF9ect82C0iAl04aq+Y6Af05FV+X eXrW2treDagoJmIR73mRzrOOWVmuG7OOwd2Ma2xFq/LHuAyy666HGuXj9cqbQY3SU40h VSBG/8KN0SLJPWJ5J61UOibT5kgPqqUSxMYjl2PUOWixvTmfEoaYCwnesh8KVRoki6BH JQ0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690594577; x=1691199377; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NKdCtniWiAg1ywOiZ6YDPXm5HtZo7eRagpKdBNR7xpg=; b=Ahaxy6OlMSlVez0yNLpZcPOWMTt7zVNMjjCj5fnrr7YmgRwvYBAe2PZy+s9hVXc5yk h9mNW/n+17dwQwZTALsNKGw/F/OpO5IK/sx7y8CLWRB3Waw2SSKH95/i6cyu9RgV/f8w iI4JUlWBK9bA6rtxTHcZn4TF6XI2NIipTR54D5KsVeBKyLmrRV5vWKuPiwScYJKigp6d S5bP4s3dTs7y50SjNEHsgG3o9roSUouKiQ/crgegQvgFHdtxo5OnFxo+4hGMLzYIgz7a ze2+FoVX5HDtPsw1uI1B8MVBlVGMcEJDAMw91N/Y7LwdzA5c756ZiptKi0nT6qYzgCxS HNnA== X-Gm-Message-State: ABy/qLZzMA6YncuRkQXFv7D795lxbptbHVX9J2opOTdspxjdJziZUKQY eE2XaGOTj5baLZFdaONMFzsByj00ENA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:2086:0:b0:d07:a03b:38a2 with SMTP id g128-20020a252086000000b00d07a03b38a2mr19106ybg.10.1690594576926; Fri, 28 Jul 2023 18:36:16 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 18:35:23 -0700 In-Reply-To: <20230729013535.1070024-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729013535.1070024-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729013535.1070024-18-seanjc@google.com> Subject: [PATCH v4 17/29] drm/i915/gvt: Don't bother removing write-protection on to-be-deleted slot 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 , Yongwei Ma , 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=ham 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: INBOX X-GMAIL-THRID: 1772739293854809459 X-GMAIL-MSGID: 1772739293854809459 When handling a slot "flush", don't call back into KVM to drop write protection for gfns in the slot. Now that KVM rejects attempts to move memory slots while KVMGT is attached, the only time a slot is "flushed" is when it's being removed, i.e. the memslot and all its write-tracking metadata is about to be deleted. Reviewed-by: Yan Zhao Tested-by: Yongwei Ma Signed-off-by: Sean Christopherson Reviewed-by: Zhi Wang --- drivers/gpu/drm/i915/gvt/kvmgt.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index e9276500435d..3ea3cb9eb599 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1630,14 +1630,8 @@ static void kvmgt_page_track_flush_slot(struct kvm *kvm, for (i = 0; i < slot->npages; i++) { gfn = slot->base_gfn + i; - if (kvmgt_gfn_is_write_protected(info, gfn)) { - write_lock(&kvm->mmu_lock); - kvm_slot_page_track_remove_page(kvm, slot, gfn, - KVM_PAGE_TRACK_WRITE); - write_unlock(&kvm->mmu_lock); - + if (kvmgt_gfn_is_write_protected(info, gfn)) kvmgt_protect_table_del(info, gfn); - } } mutex_unlock(&info->vgpu_lock); }