From patchwork Sat Jul 22 23:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 124397 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1025879vqg; Sat, 22 Jul 2023 16:55:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGfzN4Ys54VRcAmy7rsLqkXuUO2I0B5hUCI0l9Nufgz30wO1qnNcEqR4Ezj5pDKWwVT079y X-Received: by 2002:aa7:d64a:0:b0:51e:ed6:df38 with SMTP id v10-20020aa7d64a000000b0051e0ed6df38mr5435026edr.13.1690070118373; Sat, 22 Jul 2023 16:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690070118; cv=none; d=google.com; s=arc-20160816; b=hLObCU9ptPf/pG48DNWtAqT4hON04JUpbOHKuE9C+NWjs/GZlTb+cv/U3EMtm/OT0l L542m6eIGmiVDXR94StmASRgzykLel91dL7HounXro9o4zVdS3AvYPIZgC2Pr6HPtJGE QZf1FBtNrQGQ8CZpkR//qF+CmmnVZGIa3MOlmSs/yb2gaW+lyorje60q/lh9J9IYHREC h4Ol9MwAP3GhzXEz2mVW0psL9/y1xTOd8qy5Wnbo+beTdsaQPJoaAZSKEsvCF1Q8b+ho 1xyaLOPOKBU7ycxG1dUY/lpGrDNkVhLt1VJlbgN3CVVbERG3dFWFcuWreYOgnWWJmyYK hlvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CKFY/Qjto0v1AXsiEp3G9KoCtl7L09jZ7ZMf229sNf8=; fh=HW3Ufk1vhKIUVKnU/E+oJKAnhVjAsUVyBQ2HXfnwBkM=; b=uc/FJh2A70thTTMzmGe1EYZ+DeMBqryJ29j+GI1TDKzk+T3RAUq55O17tcqyTP/QdO LwkhC2X9DYIMuRkDwBQ4RlvzrGVSk7hRli1PoEj/gWWPEW767WHqYh/yB9eouppSgf61 ylW42qoUKMDiumfrSvrEGts7yYaoFD58xpJVZANJR+jQU3w1j7J8P6tc+kixFUQ+EucW 9m3gK/7d+fIqY55K32mSZnEmWXFtr5ktowZMmxLNGWJnGS+mLH17zJfIyiyW2E8PloD0 7fAyrDXqrMVIB/8yBcFLtZLK3kpBcOqucSe+MC47HbUtuDoMK5w2jNcj5ielX9vGkppo K18Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=cdO4X8+I; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y2-20020aa7d502000000b005221dccb65csi1042919edq.391.2023.07.22.16.54.55; Sat, 22 Jul 2023 16:55:18 -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=@collabora.com header.s=mail header.b=cdO4X8+I; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbjGVXxI (ORCPT + 99 others); Sat, 22 Jul 2023 19:53:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbjGVXxF (ORCPT ); Sat, 22 Jul 2023 19:53:05 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0954F2 for ; Sat, 22 Jul 2023 16:53:03 -0700 (PDT) Received: from workpc.. (109-252-150-127.dynamic.spd-mgts.ru [109.252.150.127]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id 3D59B6606F70; Sun, 23 Jul 2023 00:53:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1690069982; bh=R/KWLJeil0SPnPW73TV+DYjxAwKz+vFYuorRLV+sj6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cdO4X8+I/slmcjC9tr4b+ZDmGqdcE1e6HGQ2saNr9LC9oM6XLppviTH0PNffcApWs UHaZKteCO5yi4a3519sDX0pYOLwk97fSAAH3p6QzcUqx8GqOE6sG/n3k+aGwvCzdXb X5HljTSAAqssSka12/biHB+r0ezQSokkJ6y9zdsahq3WQ1dPZoEONiiur+r60zkJdu YfF6Ba4jn+sKRwijuc76SRhyTfdUTNsb9fEBmA9lpkv5uUum4cryTfY/R1L7c6Ge9i KU/g9kkSrHuYObLCH3P4pNpPnu9CKcwhh4Ot0Fz2dLRNvuuHdmlQN/ZrD8BpwtY6qV E5TuAi66qdK+g== From: Dmitry Osipenko To: David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= , Qiang Yu , Steven Price , Boris Brezillon , Emma Anholt , Melissa Wen Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: [PATCH v14 01/12] drm/shmem-helper: Factor out pages alloc/release from drm_gem_shmem_get/put_pages() Date: Sun, 23 Jul 2023 02:47:35 +0300 Message-ID: <20230722234746.205949-2-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230722234746.205949-1-dmitry.osipenko@collabora.com> References: <20230722234746.205949-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772166964213955939 X-GMAIL-MSGID: 1772166964213955939 Factor out pages allocation from drm_gem_shmem_get_pages() into drm_gem_shmem_acquire_pages() function and similar for the put_pages() in a preparation for addition of shrinker support to drm-shmem. Once shrinker will be added, the pages_use_count>0 will no longer determine whether pages are pinned because pages could be swapped out by the shrinker and then pages_use_count will be greater than 0 in this case. We will add new pages_pin_count in a later patch. The new common drm_gem_shmem_acquire/release_pages() will be used by shrinker code for performing the page swapping. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/drm_gem_shmem_helper.c | 65 ++++++++++++++++++++------ 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index a783d2245599..267153853e2c 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -165,21 +165,26 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem) } EXPORT_SYMBOL_GPL(drm_gem_shmem_free); -static int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem) +static int +drm_gem_shmem_acquire_pages(struct drm_gem_shmem_object *shmem) { struct drm_gem_object *obj = &shmem->base; struct page **pages; dma_resv_assert_held(shmem->base.resv); - if (shmem->pages_use_count++ > 0) - return 0; + if (shmem->madv < 0) { + drm_WARN_ON(obj->dev, shmem->pages); + return -ENOMEM; + } + + if (drm_WARN_ON(obj->dev, !shmem->pages_use_count)) + return -EINVAL; pages = drm_gem_get_pages(obj); if (IS_ERR(pages)) { drm_dbg_kms(obj->dev, "Failed to get pages (%ld)\n", PTR_ERR(pages)); - shmem->pages_use_count = 0; return PTR_ERR(pages); } @@ -198,6 +203,48 @@ static int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem) return 0; } +static int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem) +{ + int err; + + dma_resv_assert_held(shmem->base.resv); + + if (shmem->madv < 0) + return -ENOMEM; + + if (shmem->pages_use_count++ > 0) + return 0; + + err = drm_gem_shmem_acquire_pages(shmem); + if (err) + goto err_zero_use; + + return 0; + +err_zero_use: + shmem->pages_use_count = 0; + + return err; +} + +static void +drm_gem_shmem_release_pages(struct drm_gem_shmem_object *shmem) +{ + struct drm_gem_object *obj = &shmem->base; + + dma_resv_assert_held(shmem->base.resv); + +#ifdef CONFIG_X86 + if (shmem->map_wc) + set_pages_array_wb(shmem->pages, obj->size >> PAGE_SHIFT); +#endif + + drm_gem_put_pages(obj, shmem->pages, + shmem->pages_mark_dirty_on_put, + shmem->pages_mark_accessed_on_put); + shmem->pages = NULL; +} + /* * drm_gem_shmem_put_pages - Decrease use count on the backing pages for a shmem GEM object * @shmem: shmem GEM object @@ -216,15 +263,7 @@ void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem) if (--shmem->pages_use_count > 0) return; -#ifdef CONFIG_X86 - if (shmem->map_wc) - set_pages_array_wb(shmem->pages, obj->size >> PAGE_SHIFT); -#endif - - drm_gem_put_pages(obj, shmem->pages, - shmem->pages_mark_dirty_on_put, - shmem->pages_mark_accessed_on_put); - shmem->pages = NULL; + drm_gem_shmem_release_pages(shmem); } EXPORT_SYMBOL(drm_gem_shmem_put_pages);