Received: by 2002:a05:7412:a9a2:b0:e2:908c:2ebd with SMTP id o34csp2431543rdh; Sun, 29 Oct 2023 16:24:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEx1ShOcIBCJ4MNqDcmIYp7xVKUMFgNVrpc90mJvTUPeL4MLNF4510F33jXmiYuMfzpXbNv X-Received: by 2002:a17:903:228e:b0:1cc:47c1:c2cb with SMTP id b14-20020a170903228e00b001cc47c1c2cbmr2462981plh.2.1698621882599; Sun, 29 Oct 2023 16:24:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698621882; cv=none; d=google.com; s=arc-20160816; b=nxdy9dIf9IWt1BVIc/jGirtWTKs5yq6rfUOnzTShB8R6RfDHPussC0C4yxE9hRA9jm tyK7mrymK6VasFFuUFwGimGWeh9dEqgiG9KlSpd/ah8EvNm0BboLQAsQcB8+610nyAZh EvonvsAYrCdvwKMqxCcr1hCIiV/E8IZSzcUogNOcbb0ugAZFhnaXvdFaZs/sbUiPZpGH 8UCajLIdjHo3Dhbn2bACDZCEb0WzD15LLVb5Nv0+PjgD67PBmJzt1vQcKzQJv6DePdqv Ewm402rd1J91+KrsIcREI7y7p5CfMQ+Vzo2B0zrq7jcCiYWOJtNk3lNQAy54A9APmLbT mWAQ== 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=1AW6X5nKzH8SYfrsGQ3wkWYfyfDdlxZOFbUPbk7+7b8=; fh=5cel2jD5h+yPMXVwxbomyVhwojHUqATy6nFjd4aOh4o=; b=VNdKXwENelZdU1WgAB+6f3nLKK/vgqe3ZAqkUQncxYjF73p7TCRc/Tpk98xGLsRIRc XKC3mi9IqHbi89IEAido0LeaBhtsLyOKEynrbMY1YoUc7qjFwuU2NlkNzApe8RUEkrLQ mfIHEQCiyriyE3pbpN5DBV/GI7Sz7kXmfFHuqlnafGOlReNm+Ty3MiVtutbYCrE0/0lx szUT0iB5/QXM0SXl8A5Gawx59uC2SyN8j8X9+jezzxBY7NW8eRlwaGKBIw+lT6YZxV5k Dr1segHMAXBmRAbjOmu3bu2iS+4E5ChkBl7buzPQdmwaJWfx7KNzlm+VMXxB2asOnMr/ paOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="ai/cGL3k"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id jb19-20020a170903259300b001cc2aac0ac9si3242152plb.442.2023.10.29.16.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 16:24:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="ai/cGL3k"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 80EEA8053671; Sun, 29 Oct 2023 16:24:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232400AbjJ2XYL (ORCPT + 99 others); Sun, 29 Oct 2023 19:24:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232531AbjJ2XX5 (ORCPT ); Sun, 29 Oct 2023 19:23:57 -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 8714355A9 for ; Sun, 29 Oct 2023 16:03:57 -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 20C78660738B; Sun, 29 Oct 2023 23:02:37 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698620558; bh=h4go9B82Nk180l48F9rwDYUgJr4iX1WNyzYSJFvLmGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ai/cGL3kQ3X9JcBQlCwzwCqNsvIu2/SK3aEtzWguJbmsCKFc7avh6sOGJIDzLVkJY B1tayakBaplIuNSZkdH0lsaUKx70mUIluW4GjdHsMTM6JiZMhW78iDI9GdrWqokMZN l35trduagrYUstl7w46uURKgpDaj8O/chjIF4xKry4/fAEbswwpnlol1wcjZ0M1wdZ aZoh1x/nvokYl3exc37aRNPZy0IzO+m71TVwOYSZmWwejLLe/3VT2M2F7I5beNUhkg fwVUUDEliNQOTURyk9tVMmoVCepeQ+AbFEeEs6eLqlo2g6PvBhLFP4ljR5/hcHNfMg 3a2CRoftwIQSA== 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 08/26] drm/shmem-helper: Add and use lockless drm_gem_shmem_get_pages() Date: Mon, 30 Oct 2023 02:01:47 +0300 Message-ID: <20231029230205.93277-9-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=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Sun, 29 Oct 2023 16:24:39 -0700 (PDT) Add lockless drm_gem_shmem_get_pages() helper that skips taking reservation lock if pages_use_count is non-zero, leveraging from atomicity of the refcount_t. Make drm_gem_shmem_mmap() to utilize the new helper. Reviewed-by: Boris Brezillon Suggested-by: Boris Brezillon Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/drm_gem_shmem_helper.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 6e02643ed87e..41b749bedb11 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -226,6 +226,20 @@ void drm_gem_shmem_put_pages_locked(struct drm_gem_shmem_object *shmem) } EXPORT_SYMBOL_GPL(drm_gem_shmem_put_pages_locked); +static int drm_gem_shmem_get_pages(struct drm_gem_shmem_object *shmem) +{ + int ret; + + if (refcount_inc_not_zero(&shmem->pages_use_count)) + return 0; + + dma_resv_lock(shmem->base.resv, NULL); + ret = drm_gem_shmem_get_pages_locked(shmem); + dma_resv_unlock(shmem->base.resv); + + return ret; +} + static int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem) { int ret; @@ -609,10 +623,7 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct return ret; } - dma_resv_lock(shmem->base.resv, NULL); - ret = drm_gem_shmem_get_pages_locked(shmem); - dma_resv_unlock(shmem->base.resv); - + ret = drm_gem_shmem_get_pages(shmem); if (ret) return ret; -- 2.41.0