From patchwork Sat May 13 00:35:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93454 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5485330vqo; Fri, 12 May 2023 17:52:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6n/LGdDgML2NEk+6mWUo/fxC7a7rGj+nLBQ85LcJ3I47Pxp0C+74DHj1aWsIuHXMo2yF0D X-Received: by 2002:a17:90a:62c2:b0:24b:66fe:6b4b with SMTP id k2-20020a17090a62c200b0024b66fe6b4bmr26299287pjs.47.1683939151241; Fri, 12 May 2023 17:52:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939151; cv=none; d=google.com; s=arc-20160816; b=BQmSaq36zkyYroNjwYP36kS0d/c6JpiQOSjowGVDnT7nWxNErRHk0AgFU9J52vqzNz ZbrEHILUkNRkW1QV/5MSbjIXEso19kZ0+mQgH07dpPrdHknnsa1eJUg5n93hto35oEyI 5ARQF5pUEsHxZoZlEGc14PVnw/IP5U89lP9OcWdLK1d7SQN2J5FlhGK/rUj4Mxj0Fux4 ZKXc0awPJo4KHh6MymZjlwp7zbfX9alcX4X06FOPGiT81LDduTlTip7wgmTC9KsuD6kD w7G4/txfEKEGJMGJI1h4ZpHZ+CmEHFMd6ZWa9fl+tmEPwHKZbzJIFMi4JNoeaX+k0FoZ qb/g== 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=kGWzOGNnYX/vPHab7hWTlXeNk8DC7e1HwcSSdi2i4zw=; b=kg+9Nvt3hUoHMXwYT9uFjyQ+d0LWIL/gIDfUQ5UAMbKeG+n33jU5+dDE3gb3LXAnF5 HGUmu8TGQW9//UL2BLqsdm+WaheMWrBbMh0HOdY/kzvzw9ERin5XHOVbgW/1htFWrKuL D0Dms0VUkYMLQDIWVK0l4e6Qq86IWWlkEHc+Q+YIaHI9vejUcIEnpde+aptDyYPH+fsI /j1AS+togNcLGjgkEw5pLTQu0U+lmhy9+2CIdTeoXnWRcX8Or/Rm561iIHmKfhqiscZz gPFWFY/nplh//aQn2ymztS7x1z5Hg7tfI3rzNFof5hx4Dqkzj0ous4QhqxVGd12Oe+s1 cT/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="cSZ/Vlxd"; 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 e5-20020a63aa05000000b00528595a1390si10882248pgf.588.2023.05.12.17.52.17; Fri, 12 May 2023 17:52:31 -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="cSZ/Vlxd"; 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 S241729AbjEMAg4 (ORCPT + 99 others); Fri, 12 May 2023 20:36:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241295AbjEMAgm (ORCPT ); Fri, 12 May 2023 20:36:42 -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 8B34D55B7 for ; Fri, 12 May 2023 17:36:24 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9e2b65f2eeso18968013276.2 for ; Fri, 12 May 2023 17:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938183; x=1686530183; 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=kGWzOGNnYX/vPHab7hWTlXeNk8DC7e1HwcSSdi2i4zw=; b=cSZ/VlxdW4Pvbsz3re6QAwL7WZtCGSlM3rK2fKtPlroG7b/uYLspYK3BUBxjTTVT5H rExIRgrg9h7XNVV7S8JfLCc6hKMFeVMPfqlR+bwL2034YQgp2h3wOyvRQhcjmYy/0CWV Tb+gGu3prYb0KrHv7Vpt1Y+ROsVp45lgtRd9usk1mFWD3GZrX5I8Fe1G/lbZAI8o3lEr mWJgGWPW0bvh34EiK1V42Nbd2UJvbVYh21LbBL0Z3RhkD6kdDit2UIz+fEakFenDOmre edXxYiugm9t9TfwtH8lYTgo0OpSfKkvacHAeaJpt4SGriTEuFWd6Nrv6Y3L/CUCP08tz nGqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938183; x=1686530183; 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=kGWzOGNnYX/vPHab7hWTlXeNk8DC7e1HwcSSdi2i4zw=; b=bNVpl3ayXxeYwVYRKSlwZKcORJOaI7ZQX778nigfwJO4mevSJfIXBFlBcFFy/LvKoL rmsP+pKXHo8XCPlrjHz0Q9xTiPUa6pyQw56zAY2vJYsGdCjeNV7nwyr+cpgdJQNg5mdG RIl1UbbkuX6JG8ANUqGfT3V3yLGAMbI5bm0xhlX2a5Z6GwrZa03Q/mlzGjeS7nKUnLO5 VJ6jRqnXmgc2m/h5c95MwjV9g5Mdvf4z91k44wvbWX9dPV2iUqNPgImivirS04O0ApxF 5RY70LduU3aqBDTaLvYKwwqWT/jmfKADKefYx5ezhVzEXiLxanoI6gq5D0Uk7f/d+Fr2 37SA== X-Gm-Message-State: AC+VfDwrmMiH6ckwD9o8vJteXlM7pY2QQgB6+fYHGBa4tIaH4TthrFwE aY22tOsBDQNx6GmeMGjOeCBiBBEYURs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:4a9:b0:ba7:6620:4caa with SMTP id r9-20020a05690204a900b00ba766204caamr88646ybs.4.1683938183796; Fri, 12 May 2023 17:36:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:41 -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-10-seanjc@google.com> Subject: [PATCH v3 09/28] drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt() 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?1765738179127267505?= X-GMAIL-MSGID: =?utf-8?q?1765738179127267505?= Drop intel_vgpu_reset_gtt() as it no longer has any callers. In addition to eliminating dead code, this eliminates the last possible scenario where __kvmgt_protect_table_find() can be reached without holding vgpu_lock. Requiring vgpu_lock to be held when calling __kvmgt_protect_table_find() will allow a protecting the gfn hash with vgpu_lock without too much fuss. No functional change intended. Fixes: ba25d977571e ("drm/i915/gvt: Do not destroy ppgtt_mm during vGPU D3->D0.") Reviewed-by: Yan Zhao Signed-off-by: Sean Christopherson --- drivers/gpu/drm/i915/gvt/gtt.c | 18 ------------------ drivers/gpu/drm/i915/gvt/gtt.h | 1 - 2 files changed, 19 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index f505be9e647a..c3c623b929ce 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -2817,24 +2817,6 @@ void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old) ggtt_invalidate(gvt->gt); } -/** - * intel_vgpu_reset_gtt - reset the all GTT related status - * @vgpu: a vGPU - * - * This function is called from vfio core to reset reset all - * GTT related status, including GGTT, PPGTT, scratch page. - * - */ -void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu) -{ - /* Shadow pages are only created when there is no page - * table tracking data, so remove page tracking data after - * removing the shadow pages. - */ - intel_vgpu_destroy_all_ppgtt_mm(vgpu); - intel_vgpu_reset_ggtt(vgpu, true); -} - /** * intel_gvt_restore_ggtt - restore all vGPU's ggtt entries * @gvt: intel gvt device diff --git a/drivers/gpu/drm/i915/gvt/gtt.h b/drivers/gpu/drm/i915/gvt/gtt.h index a3b0f59ec8bd..4cb183e06e95 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.h +++ b/drivers/gpu/drm/i915/gvt/gtt.h @@ -224,7 +224,6 @@ void intel_vgpu_reset_ggtt(struct intel_vgpu *vgpu, bool invalidate_old); void intel_vgpu_invalidate_ppgtt(struct intel_vgpu *vgpu); int intel_gvt_init_gtt(struct intel_gvt *gvt); -void intel_vgpu_reset_gtt(struct intel_vgpu *vgpu); void intel_gvt_clean_gtt(struct intel_gvt *gvt); struct intel_vgpu_mm *intel_gvt_find_ppgtt_mm(struct intel_vgpu *vgpu,