From patchwork Thu Jan 12 16:56:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 42682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4015430wrt; Thu, 12 Jan 2023 09:42:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXu+riLNYDmsXlRTW/cQbhPynX6ZECYoQWI50Df7jUvtAjKDMWRd0musWeBEvSuzSIXtKtoB X-Received: by 2002:a17:903:1d0:b0:192:4f32:3ba7 with SMTP id e16-20020a17090301d000b001924f323ba7mr96165751plh.18.1673545362188; Thu, 12 Jan 2023 09:42:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673545362; cv=none; d=google.com; s=arc-20160816; b=FVYci147pNX32flaAZ3HUiABgI4aqwXBnLqktuoih3fqtNKm4Hxs9Oq2U+RHu1s0/7 rPmaUcBSBlNKvPkIvtV6gxvh0iCQbkQorUz6L96tSjxsQR63rjX610b5q3Hl+D+GodQo tN59QUPd29PVCogdIAaEIXuPPgP2WvqJeYFudkJA7kuwBSx1FavTeG5EQc6mmoEDkO9l jtYpW1/B+pfQiZwJqCxNE3VKTqUyeF6kHV38i5pNZYmNb4Tf/he1+Ei8Dy6JpYEZK+/E BVs853vg4gQXTqz1qyQirSg4Wj2D3tqOD8uti0/5Tp5yFbVgw5vQ02S8nPN3WwPurROu 4e4Q== 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=ZDB+TONHufzf2v14ED7ooI/qBkErj0BfG/cV+hO8IzA=; b=0qOjb9l3hmt16s9LIDQvVwJd8Btk4tgeniCpgCsihHe/8vNBxs6XheUhcv42O+WZZE 62jtji+CJ+r1n8xUVnCgyQBo3REcck0L4FRQslklcLqYUx2SR0KjmJvbJSVajce5HpCt /nG+SzgAC9DBg3XJvOjoCdo5vDEE8wmx85q2tf/2goSZgDWqBJ3U+rTJpJ84oUj59fFn GCD/NDTOBEzcmPjKZwYyPPJ+u0kDVL1GaSUdWwnkM1lYfXGAZ2CtRNddRPD+15RP921c s1Y4bWKTMiFDHEHCczVdmtc3Lp6YUafR0NvBwUOnJ6LTLiy3Oep7lG8nevnJ7UvFqmFF lStA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="atQ/BoH/"; 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=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v1-20020a170902b7c100b001873a81f2d1si16472013plz.87.2023.01.12.09.42.26; Thu, 12 Jan 2023 09:42:42 -0800 (PST) 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=@intel.com header.s=Intel header.b="atQ/BoH/"; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234131AbjALRie (ORCPT + 99 others); Thu, 12 Jan 2023 12:38:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231433AbjALRhU (ORCPT ); Thu, 12 Jan 2023 12:37:20 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BE226B5F0; Thu, 12 Jan 2023 08:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673542692; x=1705078692; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wO4vq8DTSbSrK6Q8SSiu3RWC+/DM/VhnYEUQ6NLXXx0=; b=atQ/BoH/MvOMXw6PXRNKUJCHXLZMhXRGGNwi10Q/DVYJqWtX/6d8npE+ GONl/vKMP+kS5vVFk1Q+JG5JBifFhYVsVMvfB7h+Bj6o5XtazbLgGL1Nl vnwpDUNJPWaM1QJoZ26F+1mgMN+J0Q91VIpy18LlKE7Tl4uTHEdVuCSBH 9/DXucs9xgMWnv9s9hNGmmQRM1UFM4VnQJSMM2yOcrUF+jsEywF3xFfmh MLHaIHEB0nUUskWuF+tmx9tolTCfu9xQFCCNKeF49Rh+gOwOZggh8RVGA notdwk4ziuFKDHjHWiLgPRdVznZnsU4t4IbYAfJTiim+FWH11/dzXJiml w==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="325016545" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="325016545" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:57:03 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="651232910" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="651232910" Received: from jacton-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.213.195.171]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:56:59 -0800 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Tejun Heo , Johannes Weiner , Zefan Li , Dave Airlie , Daniel Vetter , Rob Clark , =?utf-8?q?St=C3=A9phane_Marchesin?= , "T . J . Mercier" , Kenny.Ho@amd.com, =?utf-8?q?Chris?= =?utf-8?q?tian_K=C3=B6nig?= , Brian Welty , Tvrtko Ursulin Subject: [RFC 09/12] cgroup/drm: Client exit hook Date: Thu, 12 Jan 2023 16:56:06 +0000 Message-Id: <20230112165609.1083270-10-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230112165609.1083270-1-tvrtko.ursulin@linux.intel.com> References: <20230112165609.1083270-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,HK_RANDOM_ENVFROM,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_NONE 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?1754839501669621343?= X-GMAIL-MSGID: =?utf-8?q?1754839501669621343?= From: Tvrtko Ursulin We need the ability for DRM core to inform the cgroup controller when a client has closed a DRM file descriptor. This will allow us not needing to keep state relating to GPU time usage by tasks sets in the cgroup controller itself. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/drm_cgroup.c | 9 +++++++++ include/linux/cgroup_drm.h | 4 ++++ kernel/cgroup/drm.c | 13 +++++++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/gpu/drm/drm_cgroup.c b/drivers/gpu/drm/drm_cgroup.c index 09249f795af3..ea1479d05355 100644 --- a/drivers/gpu/drm/drm_cgroup.c +++ b/drivers/gpu/drm/drm_cgroup.c @@ -3,6 +3,8 @@ * Copyright © 2022 Intel Corporation */ +#include + #include #include #include @@ -32,6 +34,7 @@ void drm_clients_close(struct drm_file *file_priv) { struct drm_device *dev = file_priv->minor->dev; struct drm_pid_clients *clients; + struct task_struct *task; struct pid *pid; lockdep_assert_held(&dev->filelist_mutex); @@ -44,6 +47,12 @@ void drm_clients_close(struct drm_file *file_priv) if (drm_WARN_ON_ONCE(dev, !clients)) return; + task = get_pid_task(pid, PIDTYPE_PID); + if (task) { + drmcgroup_client_exited(task); + put_task_struct(task); + } + __del_clients(clients, file_priv, (unsigned long)pid); } diff --git a/include/linux/cgroup_drm.h b/include/linux/cgroup_drm.h index bf8abc6b8ebf..2f755b896136 100644 --- a/include/linux/cgroup_drm.h +++ b/include/linux/cgroup_drm.h @@ -6,4 +6,8 @@ #ifndef _CGROUP_DRM_H #define _CGROUP_DRM_H +struct task_struct; + +void drmcgroup_client_exited(struct task_struct *task); + #endif /* _CGROUP_DRM_H */ diff --git a/kernel/cgroup/drm.c b/kernel/cgroup/drm.c index 48a8d646a094..3e7f165806de 100644 --- a/kernel/cgroup/drm.c +++ b/kernel/cgroup/drm.c @@ -22,6 +22,11 @@ css_to_drmcs(struct cgroup_subsys_state *css) return container_of(css, struct drm_cgroup_state, css); } +static inline struct drm_cgroup_state *get_task_drmcs(struct task_struct *task) +{ + return css_to_drmcs(task_get_css(task, drm_cgrp_id)); +} + static struct drm_root_cgroup_state root_drmcs; static void drmcs_free(struct cgroup_subsys_state *css) @@ -46,6 +51,14 @@ drmcs_alloc(struct cgroup_subsys_state *parent_css) return &drmcs->css; } +void drmcgroup_client_exited(struct task_struct *task) +{ + struct drm_cgroup_state *drmcs = get_task_drmcs(task); + + css_put(&drmcs->css); +} +EXPORT_SYMBOL_GPL(drmcgroup_client_exited); + struct cftype files[] = { { } /* Zero entry terminates. */ };