From patchwork Wed Sep 27 21:29:57 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: 145629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2954932vqu; Wed, 27 Sep 2023 16:10:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRx1vSJlFSveqAdAF36z2d8ZMHIIF0xWpwcavM1T06RUFRedSUkhbFb3Yud/gQn7Mlq3w0 X-Received: by 2002:a17:903:2386:b0:1c7:248e:7cb1 with SMTP id v6-20020a170903238600b001c7248e7cb1mr2554965plh.36.1695856226985; Wed, 27 Sep 2023 16:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695856226; cv=none; d=google.com; s=arc-20160816; b=yJvhUqQiG9Bflxbr4oKj+QvDYFyR3j2aU+rbqZkdsm6SE2ouLYheGUe3ObmBaso+sH 4zyH6ZKgzvRukEgj7qVsGVxMWBPIMSZLp6z6d+D/bnuEkOf25zh8+51521VMaDrjr4Jb r1PXm1vYvhuCQYnyglJzJMO6X0YppsBK6ie92jY8FZK98so4SIYjrowiSbA7p7q94uvc k32gvHMppj1IG7E9xdEplLEOzxjPJdp/aYzmY75dBRqD2N3c18oZpZ6PMsYylaNqIvgq 4QPDkjAdOehLE316M3KX1iTAizdZtw2EU8gkKAx/C9rl4BKFgaS2HHD2AYXuRb1ka2SR bDOA== 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=DAdEzuMd29tITOfryVLqz3TPEZkl2xerkS3VI5fJZQ0=; fh=oafDi+4LBrMFegKu/vIn55zDZSRk5yV7iqXSiz6vip8=; b=Cxoy6Qm7yMvmgpwQ0yukRE5CsHRbijGPUyzxL78yzVBWrF1BhgbH7LeeEs1LVVJaRB bbiR5WdIMl10cG+9cn2lrNi5WW8Tjtx9PexyfF3N5ZfSqcl7+3Al4wB8awrUAR/TLK5k Dr/AffT7bC6JXWXyq+yyq8lg9PpEQxFq3kFBiqwlPcfrVcRquLcQ5KfyeXOPDGinWo3/ xfaTh2OkiBUxRY720NkitgKPxZE3XDtB7HOGZGmewYxfW+yXiN9gZXHm06S231g/OO9k bPa4Y8WtLHbxvbbvewO3joTyibjLwk86BuOZME1ftYXCOUPqGChkAX3VBxY3dsEWy8l+ xhKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="n/WJOOWY"; 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id t4-20020a17090340c400b001bf5c12e9a5si16808047pld.166.2023.09.27.16.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 16:10:26 -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="n/WJOOWY"; 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 ADDF2823F52A; Wed, 27 Sep 2023 14:32:18 -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 S229993AbjI0Vbt (ORCPT + 20 others); Wed, 27 Sep 2023 17:31:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjI0Vbp (ORCPT ); Wed, 27 Sep 2023 17:31:45 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5225E121; Wed, 27 Sep 2023 14:31:44 -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 EAC84660730F; Wed, 27 Sep 2023 22:31:42 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1695850303; bh=mvhqb0CR6dg+aT5ABbf9mgbY6p04NC3vkFwd67Q25UM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/WJOOWYA0jMTcEte7L0DvoL4Bx+GIHlQlk9KBfyfwV3YByqyYaBaMdJtO9oIBwDZ PcUO77y+bkA7Sojp7KAB+GytNVAgeCuq/m5v6eoCDgAmqEtdd+Cp41XIVvLO2WPMe1 3pBG8npwG2oq0yMitIYWSJ8uY9Uw0bNoIbb7zgFIX4LnsboxD+xIEFwc3TWfO/pbRM +RxQu46BYqHdUhQVu/DrFj+K5tkE+mWxc/KENCpxQQ9ln1uX75xGEWq/lma26pCTpE G50AmEUQ2Svu8JGrzKD7JB1LCGANS4wD9i8WOZq8Mr+T6k6ByDyNjlFW5VCLJI4arV pXlwoAtwKFfcg== 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, tvrtko.ursulin@linux.intel.com, boris.brezillon@collabora.com Subject: [PATCH v7 3/5] drm/panfrost: Add fdinfo support for memory stats Date: Wed, 27 Sep 2023 22:29:57 +0100 Message-ID: <20230927213133.1651169-4-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230927213133.1651169-1-adrian.larumbe@collabora.com> References: <20230927213133.1651169-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 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 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]); Wed, 27 Sep 2023 14:32:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778234139405384494 X-GMAIL-MSGID: 1778234139405384494 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 Reviewed-by: AngeloGioacchino Del Regno --- 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 97e5bc4a82c8..b834777b409b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -568,6 +568,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, };