Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp4377889rdb; Thu, 14 Sep 2023 23:25:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFbnwFkAyhtuIC7KWWuw5AfF/pHNJdL9Ytr6moMaHEpJOVU4woKo2Kmh8y8KtvRZ0U9uvJ X-Received: by 2002:a17:90b:33c7:b0:274:9be9:7ee3 with SMTP id lk7-20020a17090b33c700b002749be97ee3mr1035597pjb.8.1694759140490; Thu, 14 Sep 2023 23:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694759140; cv=none; d=google.com; s=arc-20160816; b=CytYZriC42buEZrgofLOhQ7X6TJK1T/T6usR6kdFt+S5TiYO3W6R4aiWp1hkroUKBR eRZJ6L3elTuzkpZU3rPh7BiJ81ZHb54KwUZJM0bFEYOYrGGhv3w9XkhbsvgZjEhrkE+M XMlXpaS+qKTNAWYKSg1LAku1og9JCXqcpD38OtDijFr8vv6m4/7JfN8HWp3RZuBYBjkc 3x8U8s5UrZzZsnz4C63moE0p5anro1JMHvQ12yjOI+ERS8PKzb814hEgX9/n7pgo3RLA CIOOht1VHmw7ctWRhyZf3QKwUdTx3uKh0b0R6PDrSUfuvUT2K+SDSLvivR17wa6k38Rp W4Ag== 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=yIGI8ul4uypXM15rn3CPMZba+HH9MtC93KeA/QxxYrM=; fh=J6jIr4zQ7C+2dedjt84bZIf7pTpHxTiA88jNoeHaVQc=; b=0WhboQr29Ila6zTYi4JGfI7vK9LH6qqQex4Y34mjbj2qPKwCeDRCb0Q+vbFXqmWWYX Cu68IN2cznsm7cQrYydbqCnjIEmQur4mR5+SbjUhqAUiOsSgID9QdVUC4ynRSWTTOlpf aGG7lhgkvvXhVKbE+apG0/GUvwGbfKhaJDCtiglIj5agyUyrid4PJXU8pHIsuDRvM2ep CD7kn7DO7EdjwUx1bHmLaAd3U9CHDs80KeV1o5cTj/WL3kOnjDiCo7s9pulSlXtKVSOc lTnfegh19INxScSER30zoV5Y1XWgN/zUa/3tcRZyZkTHAOjY0+oDh7x5p51mezAqO+1u mnUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PHV1oJSQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id oj14-20020a17090b4d8e00b00263d559dbf1si5236464pjb.55.2023.09.14.23.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 23:25:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PHV1oJSQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id B177E82D16DF; Thu, 14 Sep 2023 15:39:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230139AbjINWjq (ORCPT + 99 others); Thu, 14 Sep 2023 18:39:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230061AbjINWjo (ORCPT ); Thu, 14 Sep 2023 18:39:44 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C627726B7; 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 C2B956607354; 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=Jdh25YtuAbKOt5fTW39+W92sC7niIc+e4Omx5zuGqvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PHV1oJSQdp+3NCc9+54Dp0eC/KFNnxVQ1/u888gp5xaXpxfvZiwYaH9eT69TJm6Vh IvyG660ohjgGImdvyiEbnpYypnK5vQH68VXBQEF/d35jzvqQL7v410xIo27VNEXFKa 1N0KT+NuYC3vDPcIYrGAkKiCHwOmU6LmQG8NsjWJOpUsvEdyaY4WLgrHwpbm3dkjX+ Fr35OEBv/qF8thd6rlRIiFl2x+MlzFdbSwGiCRucveY3t4+bJNelOyecJnAWaWMzgK kL5izQsw6i2kxU14F90mwQhizrAFUHtoCYHHHAfiNBPx2ehizu954uhxsnUiRo7t5q fCY6UxKKtqnhA== 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 4/6] drm/drm_file: Add DRM obj's RSS reporting function for fdinfo Date: Thu, 14 Sep 2023 23:38:42 +0100 Message-ID: <20230914223928.2374933-5-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 (agentk.vger.email [0.0.0.0]); Thu, 14 Sep 2023 15:39:48 -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 agentk.vger.email Some BO's might be mapped onto physical memory chunkwise and on demand, like Panfrost's tiler heap. In this case, even though the drm_gem_shmem_object page array might already be allocated, only a very small fraction of the BO is currently backed by system memory, but drm_show_memory_stats will then proceed to add its entire virtual size to the file's total resident size regardless. This led to very unrealistic RSS sizes being reckoned for Panfrost, where said tiler heap buffer is initially allocated with a virtual size of 128 MiB, but only a small part of it will eventually be backed by system memory after successive GPU page faults. Provide a new DRM object generic function that would allow drivers to return a more accurate RSS size for their BOs. Signed-off-by: Adrián Larumbe Reviewed-by: Boris Brezillon --- drivers/gpu/drm/drm_file.c | 5 ++++- include/drm/drm_gem.h | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index 883d83bc0e3d..762965e3d503 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -944,7 +944,10 @@ void drm_show_memory_stats(struct drm_printer *p, struct drm_file *file) } if (s & DRM_GEM_OBJECT_RESIDENT) { - status.resident += obj->size; + if (obj->funcs && obj->funcs->rss) + status.resident += obj->funcs->rss(obj); + else + status.resident += obj->size; } else { /* If already purged or not yet backed by pages, don't * count it as purgeable: diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index bc9f6aa2f3fe..16364487fde9 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -208,6 +208,15 @@ struct drm_gem_object_funcs { */ enum drm_gem_object_status (*status)(struct drm_gem_object *obj); + /** + * @rss: + * + * Return resident size of the object in physical memory. + * + * Called by drm_show_memory_stats(). + */ + size_t (*rss)(struct drm_gem_object *obj); + /** * @vm_ops: * -- 2.42.0