From patchwork Wed Sep 27 21:29:54 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: 14620 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3008326vqu; Wed, 27 Sep 2023 18:30:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4EPnmiBX9nIDPL4F/RNu4E946XOlM3h3rBBrC+d9+UnlNqppH0fRSrjVzS7ZbvdPh3IbI X-Received: by 2002:a05:620a:2410:b0:774:16c3:bf2b with SMTP id d16-20020a05620a241000b0077416c3bf2bmr4397388qkn.50.1695864659059; Wed, 27 Sep 2023 18:30:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695864659; cv=none; d=google.com; s=arc-20160816; b=OKzEz6gEm0uza2PT1N+C7m6xuZGVJKpRltVvkCXYVktwpm0LMHSCRo2lZub4/r3Ea+ 1g0bK+Eb+/hfQmi1zPJjq/3DkfTluGAg7Em2SuVGw6kwPZSSLXu0viM8JTSdiascixLs +bCOixQCIooaAG10uyKFmyRIrjSf1kqPU2mEHQWqbgSTSia1pCUG2rq5CPOge6q/20L1 Sa9ZkiXqVflNB1ovn8w6c8ws+MHJkiVAfeneAHhcPfjYZn/CvqmP6JyhJLTelnEwrwKo qxw+aABS9uD5xv7jIkYNhFnGRApoKormUA9HDiaxVrDgjVgrP2oTdqiQi2ZLCTU38LDN bXMw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=4IzUyK0f/pCWc2r0G4X0PzkO3/u2rLsikFfPxgXE6DQ=; fh=oafDi+4LBrMFegKu/vIn55zDZSRk5yV7iqXSiz6vip8=; b=Xzgkkm9W/iYVSohwjLVqGgYl4WL8/tXkcGpTXG7WPpZz63/80o5GBzvyCUNlpuS0Z+ ai4pqrWADjQ4V8ROdmSFcD5+MdzX/dw/jz9uzz8+OhC6EOzr5sf8pNMYplBmNI2vDlmV ZoDup5tFLjwYk1U1sDEa76ZjO4Wga+ZawQmORysTsVMfaOSHii5j5CXyL8+F/vSlSO6n L6KU5OJWDC3RNEbUH2v/fEdK4VlwuZ4r8wm27DYKYMuwXonfpKR+UGNSnqy7XRHiS+SG lRS3P3mnlo/Guqbsm6gJ+goJIU56Dtrcg6Z9NlOlOWlPQ1fg+PjP77MTmVrmxwWFItep GRAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BczI9cp0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id p33-20020a056a0026e100b00690d79bafd9si15746967pfw.168.2023.09.27.18.30.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 18:30:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BczI9cp0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 8093D82698E8; Wed, 27 Sep 2023 14:32:10 -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 S229949AbjI0Vbr (ORCPT + 20 others); Wed, 27 Sep 2023 17:31:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229763AbjI0Vbp (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 D59B511D; Wed, 27 Sep 2023 14:31:43 -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 35CE166072C1; 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=1695850302; bh=abGO4qVbXavCbwSjN2zmFsd9RtUxOGTas692u8/WW7I=; h=From:To:Cc:Subject:Date:From; b=BczI9cp09MAmd3AeGVfnAnlvTX9pbPWgg5xUb8fqszZkajamLLc288xSJJahwrifo +mGY/28WQG3oeugxfeXHTWD2pYI1WQplNlj8R84piFVuuVmTlLHbp8nUZGrWHGpuwx etShr56hPD6j5IokMSWdYGoRDK0OwSDMCu1KNbjRNLnjuzUeK23OY8gjiPXqsstWVy OJ3lUq96c4OoVxH89dpUjpSPIB45Ca30zwtY7NJJ3J/pSgvjvaRp3ylKj2d5JoXOJJ kKCtcSBNKu4mJShZmQnYABu3MEf+fTmdSAUifdWBKCaT6LNHEV/3V7HDVFOVjkT1W1 zLTE/15M/EpNw== 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 0/5] Add fdinfo support to Panfrost Date: Wed, 27 Sep 2023 22:29:54 +0100 Message-ID: <20230927213133.1651169-1-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.42.0 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 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]); Wed, 27 Sep 2023 14:32:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778242980822747352 X-GMAIL-MSGID: 1778242980822747352 This patch series adds fdinfo support to the Panfrost DRM driver. It will display a series of key:value pairs under /proc/pid/fdinfo/fd for render processes that open the Panfrost DRM file. The pairs contain basic drm gpu engine and memory region information that can either be cat by a privileged user or accessed with IGT's gputop utility. Changelog: v1: https://lore.kernel.org/lkml/bb52b872-e41b-3894-285e-b52cfc849782@arm.com/T/ v2: https://lore.kernel.org/lkml/20230901084457.5bc1ad69@collabora.com/T/ - Changed the way gpu cycles and engine time are calculated, using GPU registers and taking into account potential resets. - Split render engine values into fragment and vertex/tiler ones. - Added more fine-grained calculation of RSS size for BO's. - Implemente selection of drm-memory region size units. - Removed locking of shrinker's mutex in GEM obj status function. v3: https://lore.kernel.org/lkml/20230905184533.959171-1-adrian.larumbe@collabora.com/ - Changed fdinfo engine names to something more descriptive.; - Mentioned GPU cycle counts aren't an exact measure. - Handled the case when job->priv might be NULL. - Handled 32 bit overflow of cycle register. - Kept fdinfo drm memory stats size unit display within 10k times the previous multiplier for more accurate BO size numbers. - Removed special handling of Prime imported BO RSS. - Use rss_size only for heap objects. - Use bo->base.madv instead of specific purgeable flag. - Fixed kernel test robot warnings. v4: https://lore.kernel.org/lkml/20230912084044.955864-1-adrian.larumbe@collabora.com/ - Move cycle counter get and put to panfrost_job_hw_submit and panfrost_job_handle_{err,done} for more accuracy. - Make sure cycle counter refs are released in reset path - Drop the model param for toggling cycle counting and do leave it down to the debugfs file. - Don't disable cycle counter when togglint debugfs file, let refcounting logic handle it instead. - Remove fdinfo data nested structure definion and 'names' field - When incrementing BO RSS size in GPU MMU page fault IRQ handler, assume granuality of 2MiB for every successful mapping. - drm-file picks an fdinfo memory object size unit that doesn't lose precision. v5: https://lore.kernel.org/lkml/20230914223928.2374933-1-adrian.larumbe@collabora.com/ - Removed explicit initialisation of atomic variable for profiling mode, as it's allocated with kzalloc. - Pass engine utilisation structure to jobs rather than the file context, to avoid future misusage of the latter. - Remove double reading of cycle counter register and ktime in job deqeueue function, as the scheduler will make sure these values are read over in case of requeuing. - Moved putting of cycle counting refcnt into panfrost job dequeue. function to avoid repetition. v6: https://lore.kernel.org/lkml/c73ad42b-a8db-23c2-86c7-1a2939dba044@linux.intel.com/T/ - Fix wrong swapped-round engine time and cycle values in fdinfo drm print statements. v7: - Make sure an object's actual RSS size is added to the overall fdinfo's purgeable and active size tally when it's both resident and purgeable or active. - Create a drm/panfrost.rst documentation file with meaning of fdinfo strings. - BUILD_BUG_ON checking the engine name array size for fdinfo. - Added copyright notices for Amazon in Panfrost's new debugfs files. - Discarded fdinfo memory stats unit size selection patch. Adrián Larumbe (5): drm/panfrost: Add cycle count GPU register definitions drm/panfrost: Add fdinfo support GPU load metrics drm/panfrost: Add fdinfo support for memory stats drm/drm_file: Add DRM obj's RSS reporting function for fdinfo drm/panfrost: Implement generic DRM object RSS reporting function Documentation/gpu/drm-usage-stats.rst | 1 + Documentation/gpu/panfrost.rst | 38 +++++++++++++ drivers/gpu/drm/drm_file.c | 8 +-- drivers/gpu/drm/panfrost/Makefile | 2 + drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 ++++++++ drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 +++++ drivers/gpu/drm/panfrost/panfrost_devfreq.c | 8 +++ drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 ++ drivers/gpu/drm/panfrost/panfrost_device.c | 2 + drivers/gpu/drm/panfrost/panfrost_device.h | 13 +++++ drivers/gpu/drm/panfrost/panfrost_drv.c | 60 ++++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 29 ++++++++++ drivers/gpu/drm/panfrost/panfrost_gem.h | 5 ++ drivers/gpu/drm/panfrost/panfrost_gpu.c | 41 ++++++++++++++ drivers/gpu/drm/panfrost/panfrost_gpu.h | 4 ++ drivers/gpu/drm/panfrost/panfrost_job.c | 24 +++++++++ drivers/gpu/drm/panfrost/panfrost_job.h | 5 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + drivers/gpu/drm/panfrost/panfrost_regs.h | 5 ++ include/drm/drm_gem.h | 9 ++++ 20 files changed, 289 insertions(+), 4 deletions(-) create mode 100644 Documentation/gpu/panfrost.rst create mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c create mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h base-commit: f45acf7acf75921c0409d452f0165f51a19a74fd