Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4377780rdb; Thu, 14 Sep 2023 23:25:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhXg6DsP30OQoexkUweGfWMzx0pTm4MzMadvs2+/jopDbfjLrQ60uJOMwhGV3EF4ZNZp8J X-Received: by 2002:a05:6a20:1581:b0:148:f16f:113f with SMTP id h1-20020a056a20158100b00148f16f113fmr1053003pzj.12.1694759121340; Thu, 14 Sep 2023 23:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694759121; cv=none; d=google.com; s=arc-20160816; b=ZnaLtEBZiUdkd1q2aXS69mlJYs5A8BOef/kT0huFyjl2L9U71ZEg9hUSiqOl7+VLji XzsghjcbKWG8X3ucI+WNoBazDHNHg6OkiW5d0oAEdP+WfZ0gy219c8TMqT638fva8GxU FBm/rHYaqxARTDAgd4DhivJryn1JuQYxIn4lSsud63H3nTfYWUQZyZSehSQBhW7lS17B 2kCh6dYhwD4UMXJh7EcCCklqnInLQ07fbOY94XsU/3FCaxwIsCpEmtBx56YUBzo4Okjk jvG4cmoE0g3fteiPr9U4JysB/D9V0Qn1TibKmnBRfzbrvZsHY0Z0e1gBcDL3eki0K7Q+ zx8A== 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=SeniQ0A8IeCYh20zcSzawFihtcfZkaKWowSktvTag3s=; fh=J6jIr4zQ7C+2dedjt84bZIf7pTpHxTiA88jNoeHaVQc=; b=Ec7asytd+20SDZvwgjZc54/Qz/WU2G9bstnYZN41XUOMvjvx4meA1f8Bnu6adaFQDK BHDnjrgG9DPKtpWFs+39FHKD524dpHoUinJkxOEC90xbAdyPALWbJZCqzZR4bbEQv+NQ mznPqdP4U8ItKaC5X9BlIr2sPca40MmNX4n9IQbFC71C9L+cZvWU3xLzgKYubWQTVThG RPQJnfEn4Gsjzt60Mpgt70+pbv0/6qNoAT1MiqKuWQB+Q6yLiXD4JAJ0+H+lv8r+sKZQ QSiq0623oqRNYuFJRiK9TS5cNUTWpPTHfECwu4+tkXis7WF3xVIU7kUbOXejHFwdCqoe a4ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=og8jgC1K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id t18-20020a056a0021d200b0068ff659af62si2909281pfj.106.2023.09.14.23.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 23:25:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=og8jgC1K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id D902C832CBC5; Thu, 14 Sep 2023 15:40:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230170AbjINWjt (ORCPT + 99 others); Thu, 14 Sep 2023 18:39:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230081AbjINWjo (ORCPT ); Thu, 14 Sep 2023 18:39:44 -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 CA1F0270E; Thu, 14 Sep 2023 15:39:39 -0700 (PDT) Received: from localhost.localdomain (unknown [IPv6:2a02:8010:65b5:0:1ac0:4dff:feee:236a]) (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: alarumbe) by madras.collabora.co.uk (Postfix) with ESMTPSA id 8602A6607353; Thu, 14 Sep 2023 23:39:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694731177; bh=de7MI4G2LHUGlhY5XCkpjmyq7P4J/cvAh5CrNUg9Ulc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=og8jgC1KsjK8+hJZjgSZb0Kj90LXczwyEhF5rXdMbdfHPtcxVHCd6Zp9MYTnZzNmL 3U7mdna6CHgPliKo19n4N2+KmKGKMMAsG3+by7RZncOPTPu7dxLxeUswsraxl6FuSF 1hCEscZV2hcsDnkIhV9YwiHAXzun2FlF3ABc8QKfytpl8soA3P9w3Ou8jNTHWtI+pG K3wwI2fOAJfHm7Lniid06ZFXZUzH78XU0b5d5OHWcRLP9tKYX7DHuyYP0QrS3Ymdgm Mpz3tyKJn8AdNsuiZhPgVQlRXFOTYFm9HN7P/iGr+lRlFRkHuh86+cIJPb9yW/0h8j Ogwcw+VTwNHag== From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, robdclark@gmail.com, quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org, sean@poorly.run, marijn.suijten@somainline.org, robh@kernel.org, steven.price@arm.com Cc: adrian.larumbe@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, healych@amazon.com, kernel@collabora.com, Boris Brezillon Subject: [PATCH v5 3/6] drm/panfrost: Add fdinfo support for memory stats Date: Thu, 14 Sep 2023 23:38:41 +0100 Message-ID: <20230914223928.2374933-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230914223928.2374933-1-adrian.larumbe@collabora.com> References: <20230914223928.2374933-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (morse.vger.email [0.0.0.0]); Thu, 14 Sep 2023 15:40:04 -0700 (PDT) X-Spam-Status: No, score=-0.9 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 morse.vger.email A new DRM GEM object function is added so that drm_show_memory_stats can provide more accurate memory usage numbers. Ideally, in panfrost_gem_status, the BO's purgeable flag would be checked after locking the driver's shrinker mutex, but drm_show_memory_stats takes over the drm file's object handle database spinlock, so there's potential for a race condition here. Signed-off-by: Adrián Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/panfrost/panfrost_drv.c | 2 ++ drivers/gpu/drm/panfrost/panfrost_gem.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index a8d02273afab..ef6563cf5f7e 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -567,6 +567,8 @@ static void panfrost_show_fdinfo(struct drm_printer *p, struct drm_file *file) struct panfrost_device *pfdev = dev->dev_private; panfrost_gpu_show_fdinfo(pfdev, file->driver_priv, p); + + drm_show_memory_stats(p, file); } static const struct file_operations panfrost_drm_driver_fops = { diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c index 3c812fbd126f..7d8f83d20539 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c @@ -195,6 +195,19 @@ static int panfrost_gem_pin(struct drm_gem_object *obj) return drm_gem_shmem_pin(&bo->base); } +static enum drm_gem_object_status panfrost_gem_status(struct drm_gem_object *obj) +{ + struct panfrost_gem_object *bo = to_panfrost_bo(obj); + enum drm_gem_object_status res = 0; + + res |= (bo->base.madv == PANFROST_MADV_DONTNEED) ? + DRM_GEM_OBJECT_PURGEABLE : 0; + + res |= (bo->base.pages) ? DRM_GEM_OBJECT_RESIDENT : 0; + + return res; +} + static const struct drm_gem_object_funcs panfrost_gem_funcs = { .free = panfrost_gem_free_object, .open = panfrost_gem_open, @@ -206,6 +219,7 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = { .vmap = drm_gem_shmem_object_vmap, .vunmap = drm_gem_shmem_object_vunmap, .mmap = drm_gem_shmem_object_mmap, + .status = panfrost_gem_status, .vm_ops = &drm_gem_shmem_vm_ops, }; -- 2.42.0