From patchwork Fri Dec 23 00:57:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 36033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp69507wrn; Thu, 22 Dec 2022 16:59:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXtlCE9Mp5OF7EPHs4F47YddxQWmeUuvvQ/n0L5dn6gyk4D/PU+uV2nbqClGyU4pr7lsr1Rp X-Received: by 2002:a17:907:8c0c:b0:7c1:1901:a445 with SMTP id ta12-20020a1709078c0c00b007c11901a445mr6201661ejc.20.1671757169724; Thu, 22 Dec 2022 16:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671757169; cv=none; d=google.com; s=arc-20160816; b=iTxo7MNFRRAdzhbjRhVveo67k+kmf6M+oY4urcLC48CfZFDByHB9kiEVyaKBjHjWIh 9VwBSET2vWMARad8+3rJMwulv8g1lUDDUZWqcAocW2rk6Kbj7rZ/cRvdTXvpe1ifoiKC LUyXsyKtjK1qWQxqDzozbpu9TGpzAs/7pVlESKIDJARUufSurfiKxINpK59y/IEMd5jL KOsIQC/hlXJsrl7J4jQsLMAmPERhpmsubhXxVUVatsxioKOu7VjDXaUdRx7DbGGtmTnY 9wNlLNTu10jqNaa/mtas3Fkc7e6ospOztM8RmLIkkPCQgnMe7d7Ua+mmqcWwyyDcXs+r 1gEg== 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=NBTVXhB5C1LBSgUVZgx9DDnSqNxpCLvQp+2Tt7daAzY=; b=bgMucoyD/L8HQlPhlpV5R5IiQVW5FBvHW2Fnr4faJl8P//dJsT4P/6BAxvWNXf+wup DQjASulJTCsDCydnFmNNML6NI+RITqc5h+5fRbSRfDJiOgXsMlzf/Emb7U+xZSzKd1u4 jBCoOz7L6PX4YbH/0aoDWOvSSh+cO/BocA638H1kuX36Z333WOkn727AMC7kSOQ93IZO vcpXIODiB+U1U5aDM/vROWKysXdkROSDsBXERiWrRl8u9aKEPEBt10MdO4VMAUfejRNw i1rlDfeZR5/JlifdhWQOn6P9wQUYVpoGAnUnVzMW1HFfwkbybEEbaAcn24nqftw7X210 YP6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=PlfdJuIN; 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 hv9-20020a17090760c900b007c08bfea555si1485013ejc.121.2022.12.22.16.59.06; Thu, 22 Dec 2022 16:59:29 -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=PlfdJuIN; 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 S235679AbiLWA6L (ORCPT + 99 others); Thu, 22 Dec 2022 19:58:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbiLWA54 (ORCPT ); Thu, 22 Dec 2022 19:57:56 -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 641682250F for ; Thu, 22 Dec 2022 16:57:54 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id t16-20020aa79390000000b0057fd4bf27fbso1849784pfe.4 for ; Thu, 22 Dec 2022 16:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=NBTVXhB5C1LBSgUVZgx9DDnSqNxpCLvQp+2Tt7daAzY=; b=PlfdJuINIz79VbNXj96aWe6+xyqOcNWgoFfBKXO69TEmccmX1942p1Kyzpar864asr XDLlrV4h/z3yt7ub3l4JawTQViMgB+vso07ZoO5qPG8HZ8ZwZ79n9sNsdI9q2RoIwbeG AbHqwyDWwx9IAhFNAoqcInUGxLMtyU01VX9lvM0rmbSOQgWKiNnfERh1rh/elzAovs+8 3y70iyzOvz/NxL9S/TaVq/aBs6+nmTg/gOUzTp23eWU84817bdw4cPSr/sXHXzdSEx8S P4Mp5+sUcRqXpTl/uiqPGeug+OSUTglz8ISXwjwtbnXBQir9/d83nYa1sF0t6p/+TDh4 ciOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=NBTVXhB5C1LBSgUVZgx9DDnSqNxpCLvQp+2Tt7daAzY=; b=aEWndq5wX2/7m3HU2cWNRwJhUXdxUtn0oKmRezOjiYtsqrky0DoCeLKUp1ZaOjbH1k jrYJ5xWZ4j6sRJc2Gm4PJEgR0rcYgkMOjXdezyMXfdJSEVrjLqMrBE+h76N61kfhoi94 6mghMyH4biOQQ7gIHfys6MZh0G2k+w1j9I5s6GLeIEDYNNSoO8pRFhy5fQN/EN1EaQ9r /hZlGFf7WiTEOBuNcPxaty6gMUS94y3ghnOv0RjBDvcbU9CcQ46x+eRSSVJJO6VAMxLJ n6I6qwcKktxQ90h0+aCPLlHdxERoJqSit7CcwoKNshrRbd0aesbsi98f1nUISYLUmR5Y Iyyw== X-Gm-Message-State: AFqh2kpgiddd3OfnRtQJORgw479d20weYWIcNuKWpGSfKIzh4TOpjROD rjr3yY8N8JYsyOy8RjWyssrW2/jc1J0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:c155:b0:189:9a71:109b with SMTP id 21-20020a170902c15500b001899a71109bmr561626plj.171.1671757073922; Thu, 22 Dec 2022 16:57:53 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 23 Dec 2022 00:57:17 +0000 In-Reply-To: <20221223005739.1295925-1-seanjc@google.com> Mime-Version: 1.0 References: <20221223005739.1295925-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221223005739.1295925-6-seanjc@google.com> Subject: [PATCH 05/27] drm/i915/gvt: Put the page reference obtained by KVM's gfn_to_pfn() 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?1752964446093710053?= X-GMAIL-MSGID: =?utf-8?q?1752964446093710053?= Put the struct page reference acquired by gfn_to_pfn(), KVM's API is that the caller is ultimately responsible for dropping any reference. Note, kvm_release_pfn_clean() ensures the pfn is actually a refcounted struct page before trying to put any references. Fixes: b901b252b6cf ("drm/i915/gvt: Add 2M huge gtt support") Signed-off-by: Sean Christopherson --- drivers/gpu/drm/i915/gvt/gtt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index 6736d7bd94ea..9936f8bd19af 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1181,6 +1181,7 @@ static int is_2MB_gtt_possible(struct intel_vgpu *vgpu, unsigned long gfn = ops->get_pfn(entry); kvm_pfn_t pfn; int max_level; + int ret; if (!HAS_PAGE_SIZES(vgpu->gvt->gt->i915, I915_GTT_PAGE_SIZE_2M)) return 0; @@ -1200,7 +1201,9 @@ static int is_2MB_gtt_possible(struct intel_vgpu *vgpu, if (!pfn_valid(pfn)) return -EINVAL; - return PageTransHuge(pfn_to_page(pfn)); + ret = PageTransHuge(pfn_to_page(pfn)); + kvm_release_pfn_clean(pfn); + return ret; } static int split_2MB_gtt_entry(struct intel_vgpu *vgpu,