From patchwork Sat May 13 00:35:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5488365vqo; Fri, 12 May 2023 18:01:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6J0G8bEXOY2iZrPXvVrPuEvH/oUOP9/0rf5WqReEDbD24HUXq/uN+2RW7MQ0XfC4dCz058 X-Received: by 2002:a05:6a00:1882:b0:643:b8c2:b577 with SMTP id x2-20020a056a00188200b00643b8c2b577mr34735497pfh.22.1683939680973; Fri, 12 May 2023 18:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939680; cv=none; d=google.com; s=arc-20160816; b=VLmLrkiqHWPGbphxzUzCtvQYeB1MkO7kFnCCuU/iY0M5DiXjagOOvJF0yNQCD19ty0 g+HsbvAyOH/AoSiFypH+WmBS43h8peQU1ZZ7QQQ5usCcllktZ78ck5AxHKOk7/dIhzuW 9bq7hCenYTp/XuDtSPWApDk8MmOuefMjk5n8+dt4jQ8nC+qtk/LREcgX1m7hkk2st4AZ XVF38Vt9p/ujvABWet/macnCMdki5I7G8SPds75hjU8vWVhsOlTINXRAALSsJEoDlClp L2DwAaP4E2ZIu643c3N7/Tt6y7ARWzRCDdauedNuJYB0ZwLhIJl+MtWtVBPMq1RdE2Pq +SUQ== 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=9ozwCpjHnKuZzXt2q5sOivdZFc4Nc1/ByY918eytKG8=; b=K8tAkcs66RX1QHpaT80WygVwI9/myVDX0HO914LxSc2teoW6rykINaHo5CxCQjiFXi Z1kWWVjy4hb4dPRbom51lAMbvo4OSxga7h4Zb/lCS3eYC64GiB1qYcTS4E0oQh81G/r7 n6JTY23cX2q6+FH1bid3AMSZliD5Jhuv8RHkzv9zejSRi/SP/ofwqkvTJonY+KxtSSjo 1ciewqhv+JcfUaBexGNwbzk87ep0r8L2vK/WwgBrwRA0DI2J2lJL1s1fRYwxJnWmWo3I j9TVZ8+9e+yo4L9gjzs6nS9bV2Lkw92mvXnDcNzxVgQoRc8C0TXNUyjRJBxJVdo5/UI2 CtIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=D9PGBYXz; 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 g205-20020a6252d6000000b006452ad4ae32si11340739pfb.237.2023.05.12.18.01.05; Fri, 12 May 2023 18:01:20 -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=D9PGBYXz; 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 S241896AbjEMAhw (ORCPT + 99 others); Fri, 12 May 2023 20:37:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241759AbjEMAg6 (ORCPT ); Fri, 12 May 2023 20:36:58 -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 7DA7D8A69 for ; Fri, 12 May 2023 17:36:43 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a7766d220so13071423276.2 for ; Fri, 12 May 2023 17:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938196; x=1686530196; 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=9ozwCpjHnKuZzXt2q5sOivdZFc4Nc1/ByY918eytKG8=; b=D9PGBYXz14YFqZyr7IaovRbgDiR6WTvi3zlRF2wwdcP+lzW1RfSJxQO8VTuiPcnxEM CqTHM2DXnYP5uIsznTvGnaln6DkLckevCJYMK8R5xVAYe7Ve8MWuYBwF7qU2pJ7x5bJ2 CRKIfVxtWC6jP8UdqdKQbHUkXsag1bZanrjOwpVhT6xZYBGU3k5WoZP2fPkei9/38eGW yyfkF1CDlpWwIxUAYH6rvX28AYs+14C9GuWSgxLLOiczuTEko1ZHbXiJ2lsM9uaASBhD xMpec4KcBm5RcsTRAjtN6BzapbEqUqjwVe4DcS4kuDgcw19s1NGWMGBEMLpaOXWAk6cR zUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938196; x=1686530196; 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=9ozwCpjHnKuZzXt2q5sOivdZFc4Nc1/ByY918eytKG8=; b=XbDq0/igWXHHI63rd09X+kNcDSNj77tBenokKVHnmrcewUn9MmZkkNC1lIAj5l/FzH RFtxO23nFppxbina2d8cIp9dnEXYTKu02VFCO4UXugO5S22rNtTtwlkcySoah0u5mfgQ froJbhLnwzFK7d63CSaOXIC/TCWYRwTxDFVBSbiSJn3WPNQqiOmQQ6oxmL6vVRpXE+NG hvmkrgxzjFiAAekGrey/isNOY/pHE/F+pTRgkIFsK154SqtjXpOxRitO4f1juyb92CNt DNbSi9NRYSIi0Pc+9hndw7qELU61r8eLy1TYg9GQyLkwjJJWcaO3jmkFhPpvnJetQ66q KbaA== X-Gm-Message-State: AC+VfDw5qsJ3BBZcBJ0hjgCz5Zjf03aoMvNe0Sl7KOYDn+jEtzOkR8/Z qwXnm/Q4Sr4HUBkYHKmrwzurquII1n4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:5282:0:b0:ba6:3564:661a with SMTP id g124-20020a255282000000b00ba63564661amr7139261ybb.13.1683938196053; Fri, 12 May 2023 17:36:36 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:48 -0700 In-Reply-To: <20230513003600.818142-1-seanjc@google.com> Mime-Version: 1.0 References: <20230513003600.818142-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230513003600.818142-17-seanjc@google.com> Subject: [PATCH v3 16/28] 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765738734960505704?= X-GMAIL-MSGID: =?utf-8?q?1765738734960505704?= 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 Signed-off-by: Sean Christopherson --- 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 aaebb44c139f..c309a77f495f 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1629,14 +1629,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); }