From patchwork Tue Mar 14 02:26:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 69260 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1524896wrd; Mon, 13 Mar 2023 19:37:11 -0700 (PDT) X-Google-Smtp-Source: AK7set/bHvUvnj7m3Vov6XxOEtFnb/KUwue9BeFASyXyKIilZKx4+aO7rEDRRemkRj2h+qFm++9m X-Received: by 2002:a05:6a20:898f:b0:cd:f17:5292 with SMTP id h15-20020a056a20898f00b000cd0f175292mr36025758pzg.44.1678761431322; Mon, 13 Mar 2023 19:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678761431; cv=none; d=google.com; s=arc-20160816; b=gYbDoSloRtx3D5kihrQiB3QrgCBJmhgjHzIU84V3iAWTjwbLR1LiTWtr/Z4ibCDvKg 3fHB1OF6SgqGglf9HrqlZgYFro63Qjvu40YYUzTWoq6Wg46i6eDKFbd7leBTQFs15+9K 9vl1xKjXnll7lOCPrKYSdippt+zVyp/dQQxrtHScWwD3AaY4z/xr8Zf28R7wuvYll/ru OaQA5sPEE1DJgyJS6FUXBCnOxPJYy+5BmMlX4QjiMo90FrXlhtR/2iC9U4N4dNB9Vcjx 8GyxCxvDhNiaM7VGAGrVaGPu5IP0ciJighe9yaY0QoV3p2+hfGQ2KQofcLQJLMgi9XVD QwrA== 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=SfAR9NBRzd0AaLxRHJQXbU6Aeq1QCralNRpICAXKdAU=; b=J7QBDiGOKwuS7bIekwT+SSzN/sUcudswKa22U5V7taskYqKodjUghBsaLxOTW3RLHN Z3m6fL/puzdDyiwAvg0Y3YGmzNCJZtPAh8TOkvF/Wxv1I+jbk3xFVg2pXy3UwQ/QnRFi dSRLxPTZUWZ2f6YWfVh2dVI1syyoo02wT9sw8KMP4zShr3VYpCLWmRjVWI1jhUO1cf2v hpwcE595AdmCkJ4YwWojLo58yWGF/0MicJzkZh0wfltULkDjXKTxNydQImjutkbsK7Dt +PVGk/zHmByr/nEseCNR+8fron1rLgfl2mKFsgWuzsVQbRqn73akiLbEMfgjOTH1BGxj L7lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=IvYnyaGv; 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 m185-20020a6258c2000000b00624cfaddb05si1000728pfb.316.2023.03.13.19.36.58; Mon, 13 Mar 2023 19:37:11 -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=IvYnyaGv; 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 S230149AbjCNC2d (ORCPT + 99 others); Mon, 13 Mar 2023 22:28:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230097AbjCNC22 (ORCPT ); Mon, 13 Mar 2023 22:28:28 -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 913CB94F48 for ; Mon, 13 Mar 2023 19:28:15 -0700 (PDT) Received: from workpc.. (109-252-120-116.nat.spd-mgts.ru [109.252.120.116]) (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 81937660215E; Tue, 14 Mar 2023 02:28:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1678760894; bh=Psio9qhd6L6SasDscAeJJftdYb1YBRE8R/hg+dvDyKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IvYnyaGvKz679ZXMHXKuiS1DVL70ssLVONUvUSTVoV++sCEpJiAe3VfvoMHBPt+m3 Thj8J8U2RrypoJy8dzHIaVo14fwtKLVtwJYa3EHqTemIbNCkhaX7oubbh8J1dUY0ac vMBktcD8UGEVeeH3DWpeKha9trNhrOxVHRT+FZx5N/HxxdqodGkrQdE/iBoPZx5H1y 23GuvFBcSi/tU7YELCHa4cF3VoDCY9/ZGz2YsBqeQfDBU0kyMKgYUSjQxKes5UwU1E 8SObC4U6OOK4U15ix5TNhXO3HYOtaf9QNBJeo/FnFrXaUcrWVFenO3m8LmMXzaL5EM HubaXZamXs6aQ== From: Dmitry Osipenko To: David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Daniel Almeida , Gustavo Padovan , Daniel Stone , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Qiang Yu , Steven Price , Alyssa Rosenzweig , Rob Herring Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v13 04/10] drm/shmem-helper: Switch drm_gem_shmem_vmap/vunmap to use pin/unpin Date: Tue, 14 Mar 2023 05:26:53 +0300 Message-Id: <20230314022659.1816246-5-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314022659.1816246-1-dmitry.osipenko@collabora.com> References: <20230314022659.1816246-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,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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?1760308946363632295?= X-GMAIL-MSGID: =?utf-8?q?1760308946363632295?= The vmapped pages shall be pinned in memory. Previously get/put pages were implicitly pinning/unpinning the pages. This will no longer be the case with addition of memory shrinker because pages_use_count>0 won't determine whether pages are pinned anymore, while the new pages_pin_count will do that. Switch the vmap/vunmap to use pin/unpin functions in a preparation of addition of the memory shrinker support. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 81d61791f874..1fcb7d850cc7 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -380,7 +380,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, return 0; } - ret = drm_gem_shmem_get_pages(shmem); + ret = drm_gem_shmem_pin_locked(shmem); if (ret) goto err_zero_use; @@ -403,7 +403,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, err_put_pages: if (!obj->import_attach) - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_unpin_locked(shmem); err_zero_use: shmem->vmap_use_count = 0; @@ -440,7 +440,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, return; vunmap(shmem->vaddr); - drm_gem_shmem_put_pages(shmem); + drm_gem_shmem_unpin_locked(shmem); } shmem->vaddr = NULL;