From patchwork Sat Mar 11 00:22:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp48588wrd; Fri, 10 Mar 2023 16:41:23 -0800 (PST) X-Google-Smtp-Source: AK7set+d3bOLF2AlX2/3XBzEGJNJSpcUgqP5hviYB9sXLto/IM3xTKK+mQ6GHsa8fmaTB2L1MQwB X-Received: by 2002:a17:902:d4cd:b0:19e:675b:a40f with SMTP id o13-20020a170902d4cd00b0019e675ba40fmr31909143plg.8.1678495283217; Fri, 10 Mar 2023 16:41:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678495283; cv=none; d=google.com; s=arc-20160816; b=cgSr/4SakdhJnkPs7VRzI2k8zc6Pi5NRauzK5GBCIdLnxFtxmft2nVd79ySam64pjM B3oUqE3DSPAgn7ICbEkkNp7ZxTbmQd3cfWXpSN06YUxXggMQXIWyn0+xny70+sj8cwo5 wpUszcVAEq7Ez+/lo256hEqcWTUo8kjt10kORf4d/9gTkJuNVuSEQ73l+cVHBmDVzMPy 8+vStOjfTMn2Y4IDx27BfTvx4KcBc+1Ac+BGmfmN7WYZ/u0rHOLy6eiL9scfD+5K0f2N AyihM7VdS3GZRjhuSGomsTGzKNPOgKkwIn8ma9HvkyhB0p6/N9budx6iRICJV7EuT6+I a6zQ== 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=Dl93qHhMLxKPHFQ6pWyH1Q53L+c+frE+R34SS4aDFMI=; b=vMEveKRlkcB8TnOX22NskktMbhHDjvUDtWupOL6tHnhhsca/le87nfgKBd06cafppo wKoKmdbPLml0Hd3NqdCz2S2bTwKUl0ojcN70Q38vR0SPhz/DIsRR3uOZoGS1UU3IgHHp ONMj6OzzbMunf9F1X2tSeh/gMmoVgZfvvtshdhxTk6KQHIKhj4mu8BnKUzvI5SYjecPm dHvsakpYINNT0c5dkV1GUV9VjIvFOm3BDcKDdKoR1SDdQWzCSlSBVZ8iHGb2p4WKYyo4 i5AbeardE4ZLCBdvK62ePV1kelpn8A9OTmgV3vWGKcydVnU6+xpi0NFda9iJu5VIa6VV M4Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=A5bTxFpK; 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 d18-20020a170902ced200b001994711ddfbsi1288388plg.127.2023.03.10.16.41.08; Fri, 10 Mar 2023 16:41:23 -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=A5bTxFpK; 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 S231281AbjCKAYO (ORCPT + 99 others); Fri, 10 Mar 2023 19:24:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230409AbjCKAXm (ORCPT ); Fri, 10 Mar 2023 19:23:42 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 197A15DC94 for ; Fri, 10 Mar 2023 16:23:27 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id a10-20020a056a000c8a00b005fc6b117942so3599145pfv.2 for ; Fri, 10 Mar 2023 16:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494203; 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=Dl93qHhMLxKPHFQ6pWyH1Q53L+c+frE+R34SS4aDFMI=; b=A5bTxFpKv+szN66TzCvK19Ft/76A37Tb4WVt01WT+cWiPfjrtrU6V1LalIMKYB3vWj ahwkahPbFFRuYQ445gPRNRQVd2F+wQjsbyOSuuqsNtmiCkidRkFo5DFY21I9BaQKcean RIRti0nwCel+5OGumdPl+/xlnhiYx6omnIN/W6UtHdN4BNfSwvQ008OchTLboAurnPh/ 8pxe+MncULYhV5yvIt0yo+RdceNc/KoEmZbj/GQ7dhEloJRuBk3xjGAKj8+3Sz5SfLoD WY0JV5dsRGiY9Kztz2yk+BaVx5kLBKuomQBRTk504BCjSrzFojBQgcdgeD7GMaoJ27I4 CgJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494203; 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=Dl93qHhMLxKPHFQ6pWyH1Q53L+c+frE+R34SS4aDFMI=; b=5aoDKFyqEs8WmaMEcCN4Iokcm2A3cuv5FE0eOdRlnlvdjzG+GFFfPn/dZBjIxs7I3g b7FFefuurJeM+phXrF48p0isIyc6+sVwVFrHBzl0JDBvvzDc7gmgK7vVK/wERzO9bzq+ BdfNrTKVy6X2cLJEr3cxllBiTgbZGsZVxRHje1m/EozoX9ksNWt6bV2ovNTIYLS9Sayx I1NHSlUZVqEl5z1jiHQsoZbTgrHsukj77J+fmdORmDhsssMLxhNB8F2/jiMzUzwL0Azw oOvUhwWkIuBPaSKV8qLlvv/uiZJbtT4QCdrqIDUmQVzrjZNd+abazM8NoDsNC4sQHTQ/ paqA== X-Gm-Message-State: AO0yUKUjAOv1ptQtBFh5CSzSsljjTi43BzzZMdIqQWgYB4FrBkImVO4f +Y4G0GHgW3p25oKaigrFxdQ0qHCQOiA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:a3cc:b0:199:4a1b:c5f4 with SMTP id q12-20020a170902a3cc00b001994a1bc5f4mr10345631plb.2.1678494203093; Fri, 10 Mar 2023 16:23:23 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:40 -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-10-seanjc@google.com> Subject: [PATCH v2 09/27] 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,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?1760029869865992164?= X-GMAIL-MSGID: =?utf-8?q?1760029869865992164?= 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.") Signed-off-by: Sean Christopherson Reviewed-by: Yan Zhao --- 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 e60bcce241f8..293bb2292021 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -2845,24 +2845,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,