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; };