From patchwork Sat Mar 11 00:22:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67880 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp43890wrd; Fri, 10 Mar 2023 16:26:06 -0800 (PST) X-Google-Smtp-Source: AK7set8qPorsN2WKgUXo/ZD3gPs5EUeR0gYEih3aW09iv/7JrMotH8xuxIkRBrBszWP1/DOI+JqK X-Received: by 2002:a17:902:aa02:b0:19a:839d:b682 with SMTP id be2-20020a170902aa0200b0019a839db682mr24499493plb.17.1678494365962; Fri, 10 Mar 2023 16:26:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678494365; cv=none; d=google.com; s=arc-20160816; b=A7KyxNr6W2BzAzBrQ9KCWKskWfrV+oD/k+0ftWHTexLiD5NjVlRqg1Y7EExA9BZFzC 8h+aP7PFLHxMklKGiOeozOnFSb2lcIIN/N8az0uMToxCiPdxdonHlOmYhrYhUffwKAVZ TQ+u8OuzxsEbnccmGDq6IWw9mEpIAvFCky69LYbpUKAdG2LydBtXe2pKuhUsuw2sRnwH VtXj0/7SV6GB3Kk68mllGApoU3vYDyi3lhMrNaFjMQAGdU/HkVk6mJkPVkdABkinM5cP QUqbgFEeMAWCVbaSTDJrBUewOGUyTcQwpbl1uXHTtyn/e9UNd+5rVmuK0yC7X6GCA6YL YzUg== 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=ESyGipRYk4Ln/Kp6qC+rdgnoNy41fSsqxhODjzs0Phg=; b=Gveb9qJHkSRV0RLX/VTk2FJ/cq0cn3gpqpGVPj1MeXW197v5ft4Uwj7ANuSww8OCpt +MTk+SXwqXhwYag72upyLmPi3SzyaRbT+OWDioCqP9XHgJf9OoDrhImliyhBJgoIipKa yqUSWU7gpZXnAqnDsDxFhM5VjZvCh+bFivsOrPZ+2jkkbGQNoXkH5+ECTELIxvFa6NaH CzssKwgy0dKu3y2nqLOnDI/FEY25eBoGFVtdLwztxK8wWcUq4LMK5ngZJS9abJ6V2TOs c7fZNu6PSwwNWN2UHsS4STC0J5Laj5O1o6sjpGXfeQpDFCPQOExUQWXEUgfBGD9mwWzQ Pc8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=nrjkFrHs; 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 f12-20020a170902ce8c00b0019e88c42997si1220403plg.104.2023.03.10.16.25.51; Fri, 10 Mar 2023 16:26:05 -0800 (PST) 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=20210112 header.b=nrjkFrHs; 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 S230427AbjCKAZB (ORCPT + 99 others); Fri, 10 Mar 2023 19:25:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjCKAYb (ORCPT ); Fri, 10 Mar 2023 19:24:31 -0500 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 979C3111B2A for ; Fri, 10 Mar 2023 16:23:47 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id bx9-20020a056a00428900b005f077bc6e5eso3615753pfb.16 for ; Fri, 10 Mar 2023 16:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494214; 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=ESyGipRYk4Ln/Kp6qC+rdgnoNy41fSsqxhODjzs0Phg=; b=nrjkFrHs9nfahticnmpPuzM1CYGMtDvBGeJ80H++4AvdgBokB4ZvMSpboVXR6DnKwz rIrMxNOEpTJIbuDC451LiJD1sJD3A8vuRizVcYrS9DGK3p2ELkmjCt5Z04Ew7mYeQG99 abO3WqdodG/z7VlBDvMGTwDpoYnVcdAyUjfitCfgT/YOhex7js+4OGHeNDmUtaacWeFR lakQe7TmqrZXF1uwepDOEl2OXS6bzVd4Nf2hJUarjHWDJiq3nKrS93ZACBW4D6ZXsdik ggHfLj17lKdB6jzVaXg1+OIqfai9+ixjDr2YJPEQHHKfDgh2ts89Xy1knXUupwP/3zLt MYWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494214; 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=ESyGipRYk4Ln/Kp6qC+rdgnoNy41fSsqxhODjzs0Phg=; b=Ci3cmvqgI81F6voOjgnoa0C3vaU9MCk+eTrmo+Pun+Zek/PonA6qyN3+ARgMOnZB6c xW94hepFcyZ8qp3451+T+ML52We6LxFEHahLg31ldRhLQfCNJH9PIvwEknOTEr6IbK9e sD5bI2CEnk2IVAXCmKSEYimXU4NcJvzbb8lzzAxbO4Beyh60H9abzlvIyJIGqt4Lip/s CVk1SIY4lX42tRtBWO8Mm08N0O+KtsxVkOaaIZWsnUYBpvKpkHixP1RRZkGILaNyeFFt /sMFF/Pz7hLTEnRZht27MedfKkQbrH6dUu10sxTFHwXSqEADa8rcpMQyW8H4LJvCpWHy PV3g== X-Gm-Message-State: AO0yUKV3tpuHSvYAPGbmZW4PGRdY677l6x2qkAwZx98FVAxgA9MQa6E1 1qq9Pdt/gNu6ddzl/IxYXPIgmPl+2Og= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:1088:b0:237:6178:297d with SMTP id gj8-20020a17090b108800b002376178297dmr10196936pjb.2.1678494214249; Fri, 10 Mar 2023 16:23:34 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:46 -0800 In-Reply-To: <20230311002258.852397-1-seanjc@google.com> Mime-Version: 1.0 References: <20230311002258.852397-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311002258.852397-16-seanjc@google.com> Subject: [PATCH v2 15/27] 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 , 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760028908167614137?= X-GMAIL-MSGID: =?utf-8?q?1760028908167614137?= 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. Signed-off-by: Sean Christopherson Reviewed-by: Yan Zhao --- 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 292750dc819f..577712ea4893 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1644,14 +1644,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); }