From patchwork Sun Mar 12 23:30:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erico Nunes X-Patchwork-Id: 68602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp922699wrd; Sun, 12 Mar 2023 16:43:49 -0700 (PDT) X-Google-Smtp-Source: AK7set9z3jkONqu/cuZ5RU+gbaYvnEmaro/Jo3WlA1lYVOpRMhMhTsx8bPd87IKhIT2ZffQq7Lbd X-Received: by 2002:aa7:94bc:0:b0:5a9:c4d6:bfa6 with SMTP id a28-20020aa794bc000000b005a9c4d6bfa6mr29767209pfl.6.1678664629681; Sun, 12 Mar 2023 16:43:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678664629; cv=none; d=google.com; s=arc-20160816; b=Ok+98AJJYpEtqIsoR0pNLhEUbOagI5f7gSvrEF78zmKCkCLZlTx/5WfneoqrMrX3fS Ge5ZyyGkvJJZSuAgvy9YVf0QjXQ+JA7Ox7r6vE4jcHB87Wy0IE98KxA8xw97O6ZNooge 7uFJ1YKoZ9vUH1qo7dLt+gE5PE2SXn7D38VVuAglVwmJcwxYi1WELvFx+VvKw7Oa4CQL stkRiM88BPZKbBzO84OoknY62apxHfytqSmdj5TqvJr4bkKhy9lzoUJY0DsopdO7YdJV 54khMyVyu3FKl3NjbDm2tHOPQytkPRJd0XRPxp2zMgMEi9zixOxZwDxyKmSu39aHEoeA CLqQ== 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=ug0UWV1hH6yIQRdNc6r9G/GtUMEjsZqb/YaG3qyeq7U=; b=bLvLojOLOzHzix2R3qEqvnnjWbcqo7xOa2854juiBcXmLmahUElVE6PpqKP25+EfPu c8gO2zWjiYYOYuUi7JJzSv6jwAA3pnON7MgoYc/QK4xtI8hBu0Z4EjiCzjIP47JYWVUG KS0Ju1lbdkEmLsWC+43xlOtNcydHM9LPo7TmiYxNagvtR6QiOT/vvr49KCVc8s+JJhxg 1gXmL9fUtajb/rmxZCZtcDpCC+dZExQiFTJh7mE4Py1oHvUOxG1WFZuD571E+mP98jsH WQyu6h7fI0pTLINpFpZfxnfy0zKC+ct8JGKO3MlFyu+XGlJTZJPYGcc6SnOCuGpkHEMa NKYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=i5IFouup; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a19-20020a63d213000000b004fb3383abb2si5049918pgg.462.2023.03.12.16.43.35; Sun, 12 Mar 2023 16:43:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=i5IFouup; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbjCLXbx (ORCPT + 99 others); Sun, 12 Mar 2023 19:31:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229807AbjCLXbs (ORCPT ); Sun, 12 Mar 2023 19:31:48 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B00D22A162 for ; Sun, 12 Mar 2023 16:31:43 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id ek18so10809255edb.6 for ; Sun, 12 Mar 2023 16:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678663902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ug0UWV1hH6yIQRdNc6r9G/GtUMEjsZqb/YaG3qyeq7U=; b=i5IFouup19hffz23+1uI4jLWHgu99D6QbX66DDD5Btyk5eNuJR/EdQkH81hJKua6mn Z2KjCaHIMP4FMK8Z5eSwp5ihDp2pPnzTOFjWd6u9BlS/ZvJ5pM5r6/z3jmLdzK6dmXee 2PZnD379UbhZAwXFgpb5O4zHowm8ZtpcAfB128L85XoAkchYWjkg7fD7mPCYJkPxOKjJ Qj1uJzaFdW4WwApYHN08ERYvaGkv9O2ZDWXsfPtxcgQ4Pkc4mIlUVDvGLYHQyJRnu9/E xdyRXp4rZc81dCpWyi3rT9J+bgJ5lIMc20KwcIAW7g27aSamCAeVU6dPjCiturmY9Too mrHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678663902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ug0UWV1hH6yIQRdNc6r9G/GtUMEjsZqb/YaG3qyeq7U=; b=XEHNfkmHaN+/dzvNaC/kt4MXcbPtkY6pA+NmSauFnk9Rwg8oJAnZt42qDvUYoN1kAy IR79QYiMQ4OMPpyCs/CR3aR5BNHCEJkAMxhvxBaD/gTdppnvDeFomDFp4Inc6ah3Al6u K1jMEBiJvKg0tj3NMjo7mquU8m8RecMusnj3jPXGlL5/KWPfRy0h/yScPAgLWEtcha5s 1833AiFnuB9V3sJnqqFgzJAMzeTd8iW+gUbYSEIBIrZzzdh97hja8kEu4/tnHGxFyNki JrBvqt1iiLgZAcNYYoXT0Oc6HSpFAjhQrXMABhSdneVu1GSK5hBRtDz9lH3yI3BpS7eG ylNw== X-Gm-Message-State: AO0yUKUoky+L7jGFdJW0cv6yaYAZJZyEtwpG6qJIy2dOudjRvLsYWWu+ CxoeaSa0KVpMOc5SXoetws4= X-Received: by 2002:a17:907:6e01:b0:8e0:4baf:59d7 with SMTP id sd1-20020a1709076e0100b008e04baf59d7mr43197922ejc.31.1678663902296; Sun, 12 Mar 2023 16:31:42 -0700 (PDT) Received: from centennial.enunes.eu (ip-78-45-66-209.bb.vodafone.cz. [78.45.66.209]) by smtp.gmail.com with ESMTPSA id vv11-20020a170907a68b00b009226f644a07sm2009958ejc.139.2023.03.12.16.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 16:31:41 -0700 (PDT) From: Erico Nunes To: Qiang Yu , dri-devel@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Erico Nunes Subject: [PATCH 1/3] drm/lima: add usage counting method to ctx_mgr Date: Mon, 13 Mar 2023 00:30:50 +0100 Message-Id: <20230312233052.21095-2-nunes.erico@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230312233052.21095-1-nunes.erico@gmail.com> References: <20230312233052.21095-1-nunes.erico@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760207442294663807?= X-GMAIL-MSGID: =?utf-8?q?1760207442294663807?= lima maintains a context manager per drm_file, similar to amdgpu. In order to account for the complete usage per drm_file, all of the associated contexts need to be considered. Previously released contexts also need to be accounted for but their drm_sched_entity info is gone once they get released, so account for it in the ctx_mgr. Signed-off-by: Erico Nunes --- drivers/gpu/drm/lima/lima_ctx.c | 30 +++++++++++++++++++++++++++++- drivers/gpu/drm/lima/lima_ctx.h | 3 +++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c index 891d5cd5019a..e008e586fad0 100644 --- a/drivers/gpu/drm/lima/lima_ctx.c +++ b/drivers/gpu/drm/lima/lima_ctx.c @@ -15,6 +15,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id) if (!ctx) return -ENOMEM; ctx->dev = dev; + ctx->mgr = mgr; kref_init(&ctx->refcnt); for (i = 0; i < lima_pipe_num; i++) { @@ -42,10 +43,17 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id) static void lima_ctx_do_release(struct kref *ref) { struct lima_ctx *ctx = container_of(ref, struct lima_ctx, refcnt); + struct lima_ctx_mgr *mgr = ctx->mgr; int i; - for (i = 0; i < lima_pipe_num; i++) + for (i = 0; i < lima_pipe_num; i++) { + struct lima_sched_context *context = &ctx->context[i]; + struct drm_sched_entity *entity = &context->base; + + mgr->elapsed_ns[i] += entity->elapsed_ns; + lima_sched_context_fini(ctx->dev->pipe + i, ctx->context + i); + } kfree(ctx); } @@ -99,3 +107,23 @@ void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr) xa_destroy(&mgr->handles); mutex_destroy(&mgr->lock); } + +void lima_ctx_mgr_usage(struct lima_ctx_mgr *mgr, u64 usage[lima_pipe_num]) +{ + struct lima_ctx *ctx; + unsigned long id; + + for (int i = 0; i < lima_pipe_num; i++) + usage[i] = mgr->elapsed_ns[i]; + + mutex_lock(&mgr->lock); + xa_for_each(&mgr->handles, id, ctx) { + for (int i = 0; i < lima_pipe_num; i++) { + struct lima_sched_context *context = &ctx->context[i]; + struct drm_sched_entity *entity = &context->base; + + usage[i] += entity->elapsed_ns; + } + } + mutex_unlock(&mgr->lock); +} diff --git a/drivers/gpu/drm/lima/lima_ctx.h b/drivers/gpu/drm/lima/lima_ctx.h index 74e2be09090f..6068863880eb 100644 --- a/drivers/gpu/drm/lima/lima_ctx.h +++ b/drivers/gpu/drm/lima/lima_ctx.h @@ -12,6 +12,7 @@ struct lima_ctx { struct kref refcnt; struct lima_device *dev; + struct lima_ctx_mgr *mgr; struct lima_sched_context context[lima_pipe_num]; atomic_t guilty; @@ -23,6 +24,7 @@ struct lima_ctx { struct lima_ctx_mgr { struct mutex lock; struct xarray handles; + u64 elapsed_ns[lima_pipe_num]; }; int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id); @@ -31,5 +33,6 @@ struct lima_ctx *lima_ctx_get(struct lima_ctx_mgr *mgr, u32 id); void lima_ctx_put(struct lima_ctx *ctx); void lima_ctx_mgr_init(struct lima_ctx_mgr *mgr); void lima_ctx_mgr_fini(struct lima_ctx_mgr *mgr); +void lima_ctx_mgr_usage(struct lima_ctx_mgr *mgr, u64 usage[lima_pipe_num]); #endif From patchwork Sun Mar 12 23:30:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erico Nunes X-Patchwork-Id: 68597 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp921112wrd; Sun, 12 Mar 2023 16:37:25 -0700 (PDT) X-Google-Smtp-Source: AK7set+fnUZLgaSTd7ziUKVeOUgVK9ezJ/gyB+JC9fn0nM9Fn3rYbJku4v3LAoXtrbqpZc/YlmLF X-Received: by 2002:a05:6a20:3d86:b0:d3:6d54:7852 with SMTP id s6-20020a056a203d8600b000d36d547852mr7204568pzi.31.1678664244839; Sun, 12 Mar 2023 16:37:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678664244; cv=none; d=google.com; s=arc-20160816; b=PNJDd2lVvJjKoezcNXwHAqeKJWdtKm4gr2Md4QR+rGUIUZq1HxbYK11Pd10+ZtqzP+ evXIJAxnEVn2nq+ukDF+JWxpwN+1tSkZxdA9b+bN9Kfb/U+06nlTPj/3hsg8qR06VMH3 1m2wL+37hEhscILhY+tqLwdSUa/sq/3CN8+lYl+5otrro0qB6NUj7bq/meBZ9ZUq8BM5 NrarF/uYCWg2QI3XBvmvLpT8lcYatH8wsbtCUEZMcj5QYnQ2ypJvY6coRzlmo0W2aD/c DfM1j+KSTlGyDBuZwbmjuFye+4QoLOXbZRrT3r8JS82jvU/PJ08g5suyNf1vZPD0vq3N 7cXQ== 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=H0/tNTjxjj5Y4CDnyWnc8sLr+X7IlP2dT2pnrIFsJj4=; b=NEy3iQRzSqc/9MAqNBxGCEBUS0WsAOh6yPkFDgBKuraKzi63OQS2z0EtsIFvLJlcxN f04xvHHffVLpYq6ZckYB/PJfWMVB2S4smGLDPJom3lVqcwIQ3Jp0/oxIA6GVHzLGd7EB 5RSmRmBXdSuRSxz3vCee4d9C2phH/Y2EvVWZXe/hONDb/FC6gjC9Jn2TeMnNAXQF/lTQ j3ngaw2XDM9q2pawOQ3b3RM3/uSa6NdsSzyRR35bJGXZDeVstxKYxt2alcNzOCFoH+2h 2Ju0mZDupQW74n/KpgKh+rDM5Xr33nMvaF4mobqlaFT9IP+/r10OuW+p2v8I0GXhovSe gVuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Q1omTo4k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l193-20020a6391ca000000b004fb90f10ac7si5149961pge.812.2023.03.12.16.37.10; Sun, 12 Mar 2023 16:37:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Q1omTo4k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229877AbjCLXbz (ORCPT + 99 others); Sun, 12 Mar 2023 19:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229821AbjCLXbt (ORCPT ); Sun, 12 Mar 2023 19:31:49 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C46CC2F7AA for ; Sun, 12 Mar 2023 16:31:44 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id cy23so41829951edb.12 for ; Sun, 12 Mar 2023 16:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678663903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H0/tNTjxjj5Y4CDnyWnc8sLr+X7IlP2dT2pnrIFsJj4=; b=Q1omTo4kyCm1U6Y6EIoU6QS9Ka4/F1X6BERxWFXkhTkoTv4HqfptVZykp2rxOrwabh FqhHs5eBk3UI+ZdlJbUxAJ/fWDV5tJTUxnvuO8yAzPusQr6dZAqcMEp9iFAtFYg/+DzQ Kcp+bSuVYKhn5ym/vpDjkcuCxulmoYtp5Gp5MctBH9RgB4KzmL9CXUVu/7vppAscRChX Z1RPOWNkgW9TO94qilWVPEGDNqYvCwNFdPnz9gJ1xSOpSQjqEY9y1KlWa7YJrEz/k+XY UszavXltChrgzJiAWVewYybhxUser7zUv0O73C1iBEzFRy1dEMKYyvrPT3p73CKfOgYE D8ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678663903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H0/tNTjxjj5Y4CDnyWnc8sLr+X7IlP2dT2pnrIFsJj4=; b=jAPIweYbMCJVHZHJohAciXonJ9m3CC7unfPdZGTTID4mK0sNPdg7ZmAOIvYhJJ+Tic rKVyx+tr+jO8iVSH4KeOmJqxlMw9Xmp0p7WKg+bBXp+mNeO4ybq01guQ1iBU6W43wjvi lwKiDb3EwIcIC3ciEbgn44qQ+UqTqU6q8KeeXEKCKOIPuryM0aEeZiYbq/tcdLxyaoW7 W47Tu6dBhyhWb8UZCb6VWq1flRK7V037NsBIYGtFfKtOxcQL8qavpSKhXG0QGEFeu8tc Alx3R50mOY75wgO8FKrwZFwyDqU8HPwe7ouGsE+dWgWYimPxB/3dEJOTapLaaGxaILmY 6d+g== X-Gm-Message-State: AO0yUKVDv1eDKRWr6YE5bjC6omZn1lSPLA7c82GcSYWfpDxDIduj5jQ5 xl/ky75QfB0XgVjueDyVkR4= X-Received: by 2002:aa7:cb18:0:b0:4fb:fd22:29c0 with SMTP id s24-20020aa7cb18000000b004fbfd2229c0mr2260760edt.26.1678663903337; Sun, 12 Mar 2023 16:31:43 -0700 (PDT) Received: from centennial.enunes.eu (ip-78-45-66-209.bb.vodafone.cz. [78.45.66.209]) by smtp.gmail.com with ESMTPSA id vv11-20020a170907a68b00b009226f644a07sm2009958ejc.139.2023.03.12.16.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 16:31:42 -0700 (PDT) From: Erico Nunes To: Qiang Yu , dri-devel@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Erico Nunes Subject: [PATCH 2/3] drm/lima: allocate unique id per drm_file Date: Mon, 13 Mar 2023 00:30:51 +0100 Message-Id: <20230312233052.21095-3-nunes.erico@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230312233052.21095-1-nunes.erico@gmail.com> References: <20230312233052.21095-1-nunes.erico@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760207039099705921?= X-GMAIL-MSGID: =?utf-8?q?1760207039099705921?= To track if fds are pointing to the same execution context and export the expected information to fdinfo, similar to what is done in other drivers. Signed-off-by: Erico Nunes --- drivers/gpu/drm/lima/lima_device.h | 3 +++ drivers/gpu/drm/lima/lima_drv.c | 12 ++++++++++++ drivers/gpu/drm/lima/lima_drv.h | 1 + 3 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/lima/lima_device.h b/drivers/gpu/drm/lima/lima_device.h index 41b9d7b4bcc7..71b2db60d161 100644 --- a/drivers/gpu/drm/lima/lima_device.h +++ b/drivers/gpu/drm/lima/lima_device.h @@ -106,6 +106,9 @@ struct lima_device { struct lima_dump_head dump; struct list_head error_task_list; struct mutex error_task_list_lock; + + struct xarray active_contexts; + u32 next_context_id; }; static inline struct lima_device * diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index 7b8d7178d09a..d23c0b77a252 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -218,6 +218,11 @@ static int lima_drm_driver_open(struct drm_device *dev, struct drm_file *file) if (!priv) return -ENOMEM; + err = xa_alloc_cyclic(&ldev->active_contexts, &priv->id, priv, + xa_limit_32b, &ldev->next_context_id, GFP_KERNEL); + if (err < 0) + goto err_out0; + priv->vm = lima_vm_create(ldev); if (!priv->vm) { err = -ENOMEM; @@ -237,6 +242,9 @@ static int lima_drm_driver_open(struct drm_device *dev, struct drm_file *file) static void lima_drm_driver_postclose(struct drm_device *dev, struct drm_file *file) { struct lima_drm_priv *priv = file->driver_priv; + struct lima_device *ldev = to_lima_dev(dev); + + xa_erase(&ldev->active_contexts, priv->id); lima_ctx_mgr_fini(&priv->ctx_mgr); lima_vm_put(priv->vm); @@ -388,6 +396,8 @@ static int lima_pdev_probe(struct platform_device *pdev) ldev->dev = &pdev->dev; ldev->id = (enum lima_gpu_id)of_device_get_match_data(&pdev->dev); + xa_init_flags(&ldev->active_contexts, XA_FLAGS_ALLOC); + platform_set_drvdata(pdev, ldev); /* Allocate and initialize the DRM device. */ @@ -444,6 +454,8 @@ static int lima_pdev_remove(struct platform_device *pdev) struct lima_device *ldev = platform_get_drvdata(pdev); struct drm_device *ddev = ldev->ddev; + xa_destroy(&ldev->active_contexts); + sysfs_remove_bin_file(&ldev->dev->kobj, &lima_error_state_attr); drm_dev_unregister(ddev); diff --git a/drivers/gpu/drm/lima/lima_drv.h b/drivers/gpu/drm/lima/lima_drv.h index c738d288547b..e49b7ab651d0 100644 --- a/drivers/gpu/drm/lima/lima_drv.h +++ b/drivers/gpu/drm/lima/lima_drv.h @@ -20,6 +20,7 @@ struct lima_sched_task; struct drm_lima_gem_submit_bo; struct lima_drm_priv { + int id; struct lima_vm *vm; struct lima_ctx_mgr ctx_mgr; }; From patchwork Sun Mar 12 23:30:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erico Nunes X-Patchwork-Id: 68598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp921131wrd; Sun, 12 Mar 2023 16:37:27 -0700 (PDT) X-Google-Smtp-Source: AK7set9yGWKTaDE1ixTSI1M28wcndptoMkee3mNWDNnec3q9kxsdWZwe/Pr6svTn2jOTXRC632y0 X-Received: by 2002:a17:902:7794:b0:19f:3e33:b851 with SMTP id o20-20020a170902779400b0019f3e33b851mr3254436pll.43.1678664247107; Sun, 12 Mar 2023 16:37:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678664247; cv=none; d=google.com; s=arc-20160816; b=PdGMBIxyCx5OCRw4QPvPyf825M+zIyHJFZ9TDN39lhcmBhoaGaJ1jR0ix6EuBi9zLO X2NCY1FyHzZe23nmhGOH1i81zj+YsLWzjpAz2/KeKQhKTOrAS9NDE/x7aCHqfxwNeXvX jegEbSSq6gcDz6H4S7Kt/izBvjoyXgY8gByvzjg4R5QE6K6EHieSy1BlGIi4YGSz9ZcT mkgfB/GkxoGjn3SIxrUVIB9N6tE7vYxUuXRC7sCITfgwoCR8B/Ei/BlqEC2RgHNmlq3P kJNr8JRQDVQPoIuomrWYhQfAZ33eKTMIyh8qj+MGV0vL25ui1gcFI1AILbSRkUfJFygz 0tVQ== 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=fhdKUD0TAzd/uf+JAXT2IFzkYdIwo6ITZjySQ+D1PHE=; b=zXxZSvx0jOvgHHzIAl6ff3GXhawfYwha3swxlL/fAzlHK5r6MWhS+rll/GALZUuZek wpWQjhOd+4rczzG8gn+Be/Nkug9J2sE+GEetQ6gCGkWKH09VgWK3ySifBSNn4byT3dr8 4ekz5OOuDtx5LvscwaDy/OQVgAhCMyg5TtIWJP7NpMI18GYAQvkM9B1je2CIEevu0xbk fhKMm9O+aDDL+ZZlbH+7ptI/k/V718W0MXDKtWa9Ul1B40tL7mtXEMlTdOiDE1Qt8UCt hc6+Hf3STRuaOw7aeqpVS/14BwzrIj8p0BkbAAcWTn2cPQiIZhaIhfeOXEQVo72OPFct ofoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=azPy5XcG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ld6-20020a170902fac600b0019f3bf39426si2709368plb.518.2023.03.12.16.37.12; Sun, 12 Mar 2023 16:37:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=azPy5XcG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229910AbjCLXb5 (ORCPT + 99 others); Sun, 12 Mar 2023 19:31:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbjCLXbt (ORCPT ); Sun, 12 Mar 2023 19:31:49 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C1B631E2C for ; Sun, 12 Mar 2023 16:31:46 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id er25so13801585edb.5 for ; Sun, 12 Mar 2023 16:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678663905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fhdKUD0TAzd/uf+JAXT2IFzkYdIwo6ITZjySQ+D1PHE=; b=azPy5XcGlzr++jtHV3Dz2BfDG54xn1DZmdZVW/yrxOPDggNzgdJCe5NY/N53tgfy5y 5ylErCksi1wEOEr9GpO1WtOqQ+TYwO+/oHNzuwjvSoheLsq7bj9ZViSJdmWOX3okfz3O AYnYl64mFt4m/NqNtAzN8lRCzTQYp0jlwYR8S/ItddVUV5lyH5ACOVuo5/rmCol7a1dD R14jFVP+Fji9b/FiVFFwdP1ExLJPFKH6x2PTDnd/uIEFeOiyj5m7EoBjDmlspAqUveDD nWF1LYVIdpve7VMYQ5b/MM57G8ONaFV91d5kOWspMK2fl9SogHMYE9J5X1tm+cvjjZuI +MJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678663905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fhdKUD0TAzd/uf+JAXT2IFzkYdIwo6ITZjySQ+D1PHE=; b=0Ow1+U55FQWfnpaO5rN4/ln0YFqRoPKfsK2Xo2+7GbTBR0aBj0t/i8DOUg7t7AJEt3 bzJAoxEftz5Q8q9NISjunFoBMmenIFeoNRjqJeOlQyCneqYVeByK6Z61LcuMtJi+o5cl GdoCVXFNpLq91cHDRG0nrGRCBTVZMy7wHXLCuPufqBLl8iAGq1yznnyaGvlVJQRLlLoc KIfFF/PbzRhrb0mDiav4B0wCAV/hjSNtieImmzfsw89slJNVIEflOUifjltmkoBDl/x6 u4rfxchQEBYkICadR7OUOv/NsqBMZvHAvSUYQ2HyFl8Z9X5uwTsRxKZ70ACllwYD6JSi m5uA== X-Gm-Message-State: AO0yUKXxewQOAIe6FthFEJDIB1zZxgrYWI5ne7s8PwqdVb7OpXrC8sy9 eDlZvWx8oJ9mgE3OBjAcIEQ= X-Received: by 2002:a17:907:7f12:b0:928:d4f6:6f7b with SMTP id qf18-20020a1709077f1200b00928d4f66f7bmr2138268ejc.66.1678663904834; Sun, 12 Mar 2023 16:31:44 -0700 (PDT) Received: from centennial.enunes.eu (ip-78-45-66-209.bb.vodafone.cz. [78.45.66.209]) by smtp.gmail.com with ESMTPSA id vv11-20020a170907a68b00b009226f644a07sm2009958ejc.139.2023.03.12.16.31.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 16:31:43 -0700 (PDT) From: Erico Nunes To: Qiang Yu , dri-devel@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , lima@lists.freedesktop.org, linux-kernel@vger.kernel.org, Erico Nunes Subject: [PATCH 3/3] drm/lima: add show_fdinfo for drm usage stats Date: Mon, 13 Mar 2023 00:30:52 +0100 Message-Id: <20230312233052.21095-4-nunes.erico@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230312233052.21095-1-nunes.erico@gmail.com> References: <20230312233052.21095-1-nunes.erico@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760207041582679151?= X-GMAIL-MSGID: =?utf-8?q?1760207041582679151?= This exposes an accumulated active time per client via the fdinfo infrastructure per execution engine, following Documentation/gpu/drm-usage-stats.rst. In lima, the exposed execution engines are gp and pp. Signed-off-by: Erico Nunes --- drivers/gpu/drm/lima/lima_drv.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index d23c0b77a252..c044a31493a4 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -261,7 +261,36 @@ static const struct drm_ioctl_desc lima_drm_driver_ioctls[] = { DRM_IOCTL_DEF_DRV(LIMA_CTX_FREE, lima_ioctl_ctx_free, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_FOPS(lima_drm_driver_fops); +static void lima_drm_driver_show_fdinfo(struct seq_file *m, struct file *filp) +{ + struct drm_file *file = filp->private_data; + struct drm_device *dev = file->minor->dev; + struct lima_device *ldev = dev->dev_private; + struct lima_drm_priv *priv = file->driver_priv; + struct lima_ctx_mgr *ctx_mgr = &priv->ctx_mgr; + u64 usage[lima_pipe_num]; + + lima_ctx_mgr_usage(ctx_mgr, usage); + + /* + * For a description of the text output format used here, see + * Documentation/gpu/drm-usage-stats.rst. + */ + seq_printf(m, "drm-driver:\t%s\n", dev->driver->name); + seq_printf(m, "drm-client-id:\t%u\n", priv->id); + for (int i = 0; i < lima_pipe_num; i++) { + struct lima_sched_pipe *pipe = &ldev->pipe[i]; + struct drm_gpu_scheduler *sched = &pipe->base; + + seq_printf(m, "drm-engine-%s:\t%llu ns\n", sched->name, usage[i]); + } +} + +static const struct file_operations lima_drm_driver_fops = { + .owner = THIS_MODULE, + DRM_GEM_FOPS, + .show_fdinfo = lima_drm_driver_show_fdinfo, +}; /* * Changelog: