From patchwork Sat Mar 11 00:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67896 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp49178wrd; Fri, 10 Mar 2023 16:43:11 -0800 (PST) X-Google-Smtp-Source: AK7set9YALPQcGVxFUXymdQEQrFfgfMgVbHRdOQDzsai0STUhuyZ73+QjMZwcBSOJsC3pyeNXoBk X-Received: by 2002:a05:6a21:3288:b0:cc:9b29:f61d with SMTP id yt8-20020a056a21328800b000cc9b29f61dmr33708229pzb.6.1678495391105; Fri, 10 Mar 2023 16:43:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678495391; cv=none; d=google.com; s=arc-20160816; b=EZKaN8EHX/qRpbnlSW69SleQNaT4V2aZ7xY/LSAp/60c4BOWC9Umg5fGDinI+NQ0WF BPHrT9MBqUVyXv4K/vbvrWI76b0pv1C3MH4KTn/N8HpsMp70NYlfg0FR965uSSE0S073 nqZUQFBKjvZBUPEKilBGDBhuYwxN1I5aMUVZat4fvWm8HvHnCTtwY9Jjr47O2aNPdMmQ OlYOLXYhMh7c/ljX2QuJ1rmsGwZP7koenCboS25RauS4TsT1dX9rlKXqwIBN6JNOLIY7 G0tXnoTeZll4fsEkWdjmGFnbUrN2mVEUxaMzSSGty10Sgb9U29KGSk0wlMp0/qBbs3B2 hCHQ== 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=QHerbQhjH53h/ZHwU5QVI9hxX7GhCGiNGgQsrmW50t4=; b=qFRWDZ5jwKdQnDX2warg6F4q+P2YZ29M8UI/pIBiE5nULAy7KkahWWWi17qUBL5ghF N6iwjfXDzOenFp0ee9YXuBfvRG4Ia8mxu5+21VljHamPUWc1fjSSLSyifnN8Lzxy31pa mC5dI31yAxDo57x3YKnBrtVQKBAPXDImdJIeyfDrJ+abDmytCaRTdEocQ31nrYUnowU/ lfN5C+JiYgsqsqGJITW5Zuc6gsDMfpy68oFR3OJnUwdptmNtIZTG+sj7nliv8whMXkiW B07m/26IokDCz3rs4egC1Bj5fePMxvqCJljx5sP3XKoTBxwI+yA4K6kcudJpqFDHBYf9 NEEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=UOOoJWfU; 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 u1-20020a63d341000000b004fbba9a8fa0si940790pgi.420.2023.03.10.16.42.55; Fri, 10 Mar 2023 16:43:11 -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=UOOoJWfU; 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 S230181AbjCKAXv (ORCPT + 99 others); Fri, 10 Mar 2023 19:23:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbjCKAXi (ORCPT ); Fri, 10 Mar 2023 19:23:38 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28E342E0D7 for ; Fri, 10 Mar 2023 16:23:17 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id l10-20020a17090a598a00b0023b28afea55so470083pji.0 for ; Fri, 10 Mar 2023 16:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494197; 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=QHerbQhjH53h/ZHwU5QVI9hxX7GhCGiNGgQsrmW50t4=; b=UOOoJWfUcA7GC/99pLDncOCYw/ZSKy8cgsGXbxX58KzT3NzGZc7wH8lCmf0oAQfpKq hjcxQRGgLkPGKlCawvxwrkvukATCRtgPYnMbqSBD5uscgj39B0vmTkhnvMgcmdk9NbiB K64ViJd4ne0EYEYjfGG5d6kPwirzxEw5lqcOzrUdA91bj/3z7WW2O16cfG50mdYHyi+F 8belCrRQbBfaK2WzD/PQejUgzYcU2vR3vMegxSCF5ZB4v6jnYTOpdFATSuu9h0apkhxu Icms8xYjSzdS9QnEO7gSP/EblQydpusmTx4NQaAaKuJOjwYY/5w93+mXKPJyeqcneA5b krDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494197; 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=QHerbQhjH53h/ZHwU5QVI9hxX7GhCGiNGgQsrmW50t4=; b=nIL1sUBsxhlgo6m1XY5qBdCSk7cmELin26/0WvdFyAorp9YZqaOh81gPlIIaWv0KL/ e2cJcTaVIRIwn1dNEXwBpEF1ugGOGLWDF1Bl8dPe8VpZFlDcfw3OVygff2jcTWsR5E+i hlQgGn0gUKa7CzTtqSp2rMEVvHu9l2atVk70QLCfFs2P8gYn2P/T3h01pmQjXwVjXhEp SRTr8BffdFn/5IuohSlEMINj8YK9s4YX54cnqNd+txx3KWKdar7KPFPM4Mw3aRvc/YG4 Rpay1UPp3p4NA7InfBbdGAeuieitkPk7FudaHBxJJDWMcJuXo8jOgNYwKosqIcNaVsby KUgA== X-Gm-Message-State: AO0yUKU4Fvi2Bn6rGME5raVkqUNScMhWgoXNiA8AOJnMfptwdOIMTDhp 8mFO/iInEAqSpKJFbv1B7Ccf8Ztct/Y= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:ef8b:b0:19b:370:f7b3 with SMTP id iz11-20020a170902ef8b00b0019b0370f7b3mr10076584plb.6.1678494197458; Fri, 10 Mar 2023 16:23:17 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:37 -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-7-seanjc@google.com> Subject: [PATCH v2 06/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=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?1760029983332848455?= X-GMAIL-MSGID: =?utf-8?q?1760029983332848455?= 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 Reviewed-by: Yan Zhao --- 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 d59c7ab9d224..15848b041a0d 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c @@ -1160,6 +1160,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; @@ -1179,7 +1180,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,