From patchwork Sat May 13 00:35:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5480477vqo; Fri, 12 May 2023 17:37:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5MoggYSy05PKPe8GCx/VOH/ONFWRuiuhtIB+1DcXflsMnJkFWkwCnhx9pY6aUEr42jMZVJ X-Received: by 2002:a05:6a20:8f09:b0:100:6f8f:7793 with SMTP id b9-20020a056a208f0900b001006f8f7793mr26682036pzk.3.1683938273723; Fri, 12 May 2023 17:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683938273; cv=none; d=google.com; s=arc-20160816; b=qolPlPO/4+qPPO+kGSS8ulW9FjHCRLWSAEBq5Rz2uoX5cZnWOHGbR4cvcb6I/+yCPn 2uLX/yELKsYb4mA3XnNdm5IqCfkTH0n5To/wyRiv6/h4WS5F/TsYdtoxFq6Ig9qQf+0+ Kr/p1eSw/aBmbeqWxE6wUBa6FyvuMql+m5qXXn34i0A44fIbzAgaIWwFWhS7ZAvgBMn+ N4tb51M3mS169rKAEu4YzgsP/ZbRIDIATzLe5iriG/CViINrrEuFkyepszm7DhtMFQ0i MTkzEFZBjQnHjbF4uRLw3GTbPovjeJHvNrNQcUWvO0m6bzGwm/W3Ux3l1bLrEgcdRjsy PdPA== 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=yTF+WvdTXOp88OUwMxHsF/SYvL5GAznXpvvOJVXr590=; b=SOEQswRu+4Pg3t6ay2wV8q50zzpNXdclyGGb6ZQjig6BbMEPjd9B1gr89piSsKbjqe DFU2G4bNsTuGPhDmSws43C4mnt2CbZL7MnShVeO85nuxC9cWCYTf0cxpZ193ubtNzuk6 QF5mWpKUIC24SaDpc1UTZOd/h+CifAIJFC99VgMSF0jMJC0EXK1pV2urpPIPTDYhoWHH O4luelTuX8WOQ8Bb5A4qsdGWOyVNrQE093mH+MH0w2M6c+X3LdJ80QD4/ynKeXg+qSTc aWvMgYanw1dx7qKe9sUx+Fiz/Z7HCKlUZAm0JDYqwyJChRrz1eBiU9SKjTl9xOFrlirU nv9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=6clpcNXw; 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 c17-20020a056a00009100b0063b6bc7df13si11285289pfj.209.2023.05.12.17.37.41; Fri, 12 May 2023 17:37:53 -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=6clpcNXw; 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 S241485AbjEMAga (ORCPT + 99 others); Fri, 12 May 2023 20:36:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240999AbjEMAgV (ORCPT ); Fri, 12 May 2023 20:36:21 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D83659ED for ; Fri, 12 May 2023 17:36:14 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a829a3de0so23525847276.2 for ; Fri, 12 May 2023 17:36:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938173; x=1686530173; 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=yTF+WvdTXOp88OUwMxHsF/SYvL5GAznXpvvOJVXr590=; b=6clpcNXwWNgtNSBv1Zuk/HmYC1Ks8Z/956BRzb0731I1kGR3sHKzRDOs8rAs55Rngl YjLuzIFPVOaWwOFhxj00mGWX5v6Y5zmAsUVKlXW9dSMnUWfihfWcGbsxx/I2Mc2dFlCS J+3sFb2ZQuySk4Nr8M3GUZT5mX/9hDwI6MGTbwWBC9pmh8tpW0cK1X1J7mShS6THXi8A gBFUR3R4cpv0GkJSakzcRj3FUOW+uJnd5/aAId1JxY0rey3Jwz0QtMgu91VHfSOlNnIq HDHMzpGoJrm3I37RuzzTHm+5Y46vQHC2/CO+XFbFRbayyHmQIA4qNF6KOlI4W61gzbsK 1aVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938173; x=1686530173; 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=yTF+WvdTXOp88OUwMxHsF/SYvL5GAznXpvvOJVXr590=; b=gy5ET/m/c2mTVhxliTjL8dJLVcf2HljS2Gf8PHwve5HyPpYs0Wk1Efc97cFQKgzJLr G7+stasbTiKMcmYm9GI/a9/kGcXvSzCddod/4AykzlhSGINKFTlM1fPRMSDZx9L635cV 0b0LJFWTFeH8/QT2A6hVNquKMlUt/mi//PS5KNG+cHy+82AIbtp7o+ZF1iuSh3yZNEhU KVdkl3pZTI31gIrNJENiDhdcsZOdH00aK0lB/j/sq0XKG9uOU7VfmWRQfM7VnLCoo1wT 67U4wiTCB4R6Ykv7sFunVx9b5fpGQzYaFmyVfvXt/XWBt161OE7ZwwbSMjULsMOtcnlE wz5Q== X-Gm-Message-State: AC+VfDyNRt25K5KSfBQtxWQX5ZIEj2cN7iHxogKjp8GRlTuC7nspT7c0 n/otOxrOLMjwaLLOC7vlka6f4MpFt7Y= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:824f:0:b0:b92:25bf:a6ba with SMTP id d15-20020a25824f000000b00b9225bfa6bamr12046826ybn.6.1683938173689; Fri, 12 May 2023 17:36:13 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:35:36 -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-5-seanjc@google.com> Subject: [PATCH v3 04/28] 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,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?1765737258989962445?= X-GMAIL-MSGID: =?utf-8?q?1765737258989962445?= 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") Reviewed-by: Yan Zhao 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 f30922c55a0c..5426a27c1b71 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1158,6 +1158,7 @@ static int is_2MB_gtt_possible(struct intel_vgpu *vgpu, { const struct intel_gvt_gtt_pte_ops *ops = vgpu->gvt->gtt.pte_ops; kvm_pfn_t pfn; + int ret; if (!HAS_PAGE_SIZES(vgpu->gvt->gt->i915, I915_GTT_PAGE_SIZE_2M)) return 0; @@ -1171,7 +1172,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,