From patchwork Tue Sep 19 23:34:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 142182 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3831913vqi; Tue, 19 Sep 2023 19:48:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBCd/zSHQ1tamb+d5pSWSL2nvA24dvPKOTxvIAnxDuUXd2EZgvKhysvgH8Zvdo57X/JnXS X-Received: by 2002:a05:6870:96a8:b0:1bf:4f42:de91 with SMTP id o40-20020a05687096a800b001bf4f42de91mr1534065oaq.33.1695178114733; Tue, 19 Sep 2023 19:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695178114; cv=none; d=google.com; s=arc-20160816; b=Mws7dxvfxriKrEB+2vp3g9OZDZ2CGOjOkDPVeh2LoTl2iKqS1ozIfRAu3aLaZAjghQ RvJtn603Nx8/3mOZ/wkEAvpKDzZNySY7gE5/g2qvQzmrSA2XyLiMqP3sYNi1TDlCU8qm ugUA73jr2F0sNO3FTWhVuwvneLiiJoIP1wDm/uE2XUtHZxbktlgI4lr1Jr4MURCgJqcw e3wA8N+RcRCiVeeLCq3H5EPJRneW+rs2N412h7SCh+I4M6ugeqBh1GNzMb0sdHkXcjH8 +RiRRMBL+7+x7+2UlN/bEeeT/XDyeqESOH0wI8psQZZqYJdQRdhDYprWYYB71ZQV3yU3 /71w== 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=kjT3eKGuu68O+331gKk9My6Go8SUBC0HlFFOAkWjgxw=; fh=J6jIr4zQ7C+2dedjt84bZIf7pTpHxTiA88jNoeHaVQc=; b=hDyU++jPiS9oAett174OZKJqvVBW9BhewLzfovjqiKwkrASTWxokZA+wtqUHypu2R4 wq2siSXcdKwOinEwcZSXKO3bnVfDP+EOUoR1GGVz//ZT2vHEr+YDqWCh11cBTbw5jYqp rJJTN90pJTQzClOX71qIT0/1k+e+Jie/z8IRQeAbkmtVgYQRiQGUX0RbwbPx19WXIeHw IdLiuPUoxFtpcD1xo3sjh5fQytuapee1CwBUZqLEyNWD0ojaFUNzGQPPBglsYHRT9jJS HC5JO7jencfORKBdcJcKpMjJ6KmedGna1Dt2KK5YlH+wDVHwBpip34QiUV4fT4/W9bYw NfDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=oDbGaUAY; 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id fa9-20020a056a002d0900b0068a3cb58334si10872014pfb.320.2023.09.19.19.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 19:48:34 -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=oDbGaUAY; 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 006A98028FFA; Tue, 19 Sep 2023 16:36:15 -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 S233555AbjISXgR (ORCPT + 26 others); Tue, 19 Sep 2023 19:36:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjISXgN (ORCPT ); Tue, 19 Sep 2023 19:36:13 -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 7753ACA; Tue, 19 Sep 2023 16:36:07 -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 E86106607079; Wed, 20 Sep 2023 00:36:05 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1695166566; bh=u9zb2652JL2f6qmKUKmSUATbYmPOsPigfj5Mh3FzMbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oDbGaUAYiTDxRbvOUDHTWaY6QujAh4lWkHllVe07qJV/6c1V/WinkUb7oHNa7UtP5 bY8ZjmcdYcKnyeThqrhVoCQSoOV4g7L5ptwAmMEgMxv+Pu8r0LHp1H2La0pv8F9pH+ QyM2U1h8fo2iM3EHsdMC9a7A7TyaWL7xzv1NLXeuFycvVpiyLG7iHEuftxFe4koZBR oe5PtEiJNAeHGEofWM/ucAY6ftRfctmW3fnzDflWFB9/apPG95zunvlI0B2ooTEFBl SP6T76Bt8yQjW2Ivf0Xs9zflo1yQOaEwknaS2rcooWTP35KelwKA5eE59Pt/iCOUhO qDzqYtvsz7sSQ== From: =?utf-8?q?Adri=C3=A1n_Larumbe?= 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 v6 3/6] drm/panfrost: Add fdinfo support for memory stats Date: Wed, 20 Sep 2023 00:34:51 +0100 Message-ID: <20230919233556.1458793-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230919233556.1458793-1-adrian.larumbe@collabora.com> References: <20230919233556.1458793-1-adrian.larumbe@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 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]); Tue, 19 Sep 2023 16:36:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777523086823899141 X-GMAIL-MSGID: 1777523086823899141 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 Reviewed-by: Steven Price --- 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 3c93a11deab1..8cd9331ac4b8 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, };