Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp2429744rdh; Sun, 29 Oct 2023 16:17:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvzZ+kS3m8wDmUlV7LNWif76j99jdoq81+iTGQLYl5SMuXY9GYaBp10WmrUV5cOr+5SaFs X-Received: by 2002:a05:6a21:a594:b0:163:9f1d:b464 with SMTP id gd20-20020a056a21a59400b001639f1db464mr8445103pzc.5.1698621474181; Sun, 29 Oct 2023 16:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698621474; cv=none; d=google.com; s=arc-20160816; b=bT3VRKg2XlzZBhf9GiIL/ed7B6Y7XZX09FwiGkTMxXnuzMAvi6SPpC2p7VZsx0tXey TYoAdL3W3iATpiYftJ/fRzn3Phcphm6zn0sEnJrkB/4oq7MihrQ5aODxErSBj+2un7oY xMXYKcG3SARac1Bwbd56Pv/7CPGbKsQplIMpl8XUxWBEGK3dWQCXSS5AwmfRXul4EAXt 81Sqprvpozf6DreQeHi025YeFHNO7y6JUec/XDnZpX+hgFrMk22A95/CZ1zE8L0/nMue T0F/nF9Sqlv2ZJ2RmhriVkM/o2uOHNxsIFTi+q0uY9N/oLq5X7D3e36Jij5qbtS0udTf EA0A== 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=K/dnoLHW2XIlpfYkUGyCNTDXHxDSNx6znb/bES6fPYc=; fh=5cel2jD5h+yPMXVwxbomyVhwojHUqATy6nFjd4aOh4o=; b=NuXjqiyIDCrpvMtCAdgbyjwyNmb72wMZ3JZB/nHBPIjBJnyVil2BmFgRh8NMisRodh yIUPJ6FHMZzqYJeu1E2F7TD6ezMF8WBwl8XEQNfyIyXOVhbP+22lHtoja9MvGM5vZtBG 4950pa9r4PI0hQxeooIbwiWKJ+UvGvLbStXQBOvaq6pj/h29LQQlGW155Br6Ax+4SN1V vFfXXVRWZ7JrXsQ1hd7DkzR6kAAoC4Dtt+QBh86YrOcksmpzTdNF44vCQjt0006eL/K5 rmVt8lkVEiQr+SD9CVLqdxTRQLUH+dCY7qT4cfmk7ZPpDCYQcEirdxAFe605QSAKYBIZ Sy1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YXhiSes4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k4-20020a170902d58400b001cae629cf10si4190942plh.544.2023.10.29.16.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 16:17:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YXhiSes4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 26B38804747B; Sun, 29 Oct 2023 16:17:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230519AbjJ2XRp (ORCPT + 99 others); Sun, 29 Oct 2023 19:17:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231488AbjJ2XRk (ORCPT ); Sun, 29 Oct 2023 19:17:40 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BF157AAF for ; Sun, 29 Oct 2023 16:04:17 -0700 (PDT) Received: from workpc.. (109-252-153-31.dynamic.spd-mgts.ru [109.252.153.31]) (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 7B5E266073A6; Sun, 29 Oct 2023 23:02:49 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698620570; bh=SLnQz6auxyR/8a6Jw3cAOBNHaot5EBQ+F2hZkkWgFME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YXhiSes4ej4iBjp3tJ08F0kFblMQpIxVWEDb27XR0MszMbc1rPVoczrip+8IBQLfg 1WZFmkRlA7ewY1CkHx4BmwZ3BEu5mdUPVamTUpW90A/p8+LRYV72yqyIQoq+mez+fN ftth/3zKXV028Fzvfz6L8dAi7NcvtfnqJdeBLN4Q8mT8opYpbxktyypLXQ0hR/o71X eFLiay7FDNtK1H6h8Xl8+nsJ+UkeMs2YZWzc8CChVWJ4QqLbdf7rE5vgm2D4Kswtgo CvqekgMbmzZPDyFKQ5zzriUnP9y9xgKauxoPpCZYh4hPN8PnJs/lBRc3wrnksDRUVu J+pZaiI0oCTzQ== 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=20K=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 v18 16/26] drm/virtio: Explicitly get and put drm-shmem pages Date: Mon, 30 Oct 2023 02:01:55 +0300 Message-ID: <20231029230205.93277-17-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231029230205.93277-1-dmitry.osipenko@collabora.com> References: <20231029230205.93277-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 29 Oct 2023 16:17:53 -0700 (PDT) We're moving away from implicit get_pages() that is done by get_pages_sgt() to simplify the refcnt handling. Drivers will have to pin pages while they use sgt. VirtIO-GPU doesn't support shrinker, hence pages are pinned and sgt is valid as long as pages' use-count > 0. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/virtio/virtgpu_object.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index ee5d2a70656b..998f8b05ceb1 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -67,6 +67,7 @@ void virtio_gpu_cleanup_object(struct virtio_gpu_object *bo) virtio_gpu_resource_id_put(vgdev, bo->hw_res_handle); if (virtio_gpu_is_shmem(bo)) { + drm_gem_shmem_put_pages(&bo->base); drm_gem_shmem_free(&bo->base); } else if (virtio_gpu_is_vram(bo)) { struct virtio_gpu_object_vram *vram = to_virtio_gpu_vram(bo); @@ -196,9 +197,13 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, return PTR_ERR(shmem_obj); bo = gem_to_virtio_gpu_obj(&shmem_obj->base); + ret = drm_gem_shmem_get_pages(shmem_obj); + if (ret) + goto err_free_gem; + ret = virtio_gpu_resource_id_get(vgdev, &bo->hw_res_handle); if (ret < 0) - goto err_free_gem; + goto err_put_pages; bo->dumb = params->dumb; @@ -243,6 +248,8 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, kvfree(ents); err_put_id: virtio_gpu_resource_id_put(vgdev, bo->hw_res_handle); +err_put_pages: + drm_gem_shmem_put_pages(shmem_obj); err_free_gem: drm_gem_shmem_free(shmem_obj); return ret; -- 2.41.0