From patchwork Tue Nov 20 18:58:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ho, Kenny" X-Patchwork-Id: 10691497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B285514BD for ; Wed, 21 Nov 2018 01:09:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C8772AF74 for ; Wed, 21 Nov 2018 01:09:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D21E2AFB6; Wed, 21 Nov 2018 01:09:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D227B2AF74 for ; Wed, 21 Nov 2018 01:09:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 035E26E11B; Wed, 21 Nov 2018 01:09:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680054.outbound.protection.outlook.com [40.107.68.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 31F626E375; Tue, 20 Nov 2018 18:59:00 +0000 (UTC) Received: from CY4PR1201CA0018.namprd12.prod.outlook.com (2603:10b6:910:16::28) by SN1PR12MB0752.namprd12.prod.outlook.com (2a01:111:e400:c45b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.21; Tue, 20 Nov 2018 18:58:58 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::201) by CY4PR1201CA0018.outlook.office365.com (2603:10b6:910:16::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1361.14 via Frontend Transport; Tue, 20 Nov 2018 18:58:58 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Tue, 20 Nov 2018 18:58:57 +0000 Received: from kho-5039A.amd.com (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Nov 2018 12:58:56 -0600 From: Kenny Ho To: , , , , , Date: Tue, 20 Nov 2018 13:58:10 -0500 Message-ID: <20181120185814.13362-2-Kenny.Ho@amd.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120185814.13362-1-Kenny.Ho@amd.com> References: <20181120185814.13362-1-Kenny.Ho@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(2980300002)(428003)(199004)(189003)(126002)(2201001)(1076002)(476003)(575784001)(478600001)(2616005)(11346002)(97736004)(86362001)(446003)(104016004)(217873002)(14444005)(5024004)(186003)(26005)(77096007)(53936002)(39060400002)(50466002)(47776003)(48376002)(486006)(316002)(7696005)(51416003)(6346003)(2870700001)(76176011)(356004)(6666004)(305945005)(110136005)(53416004)(426003)(336012)(8936002)(68736007)(72206003)(105586002)(106466001)(81156014)(36756003)(2906002)(5660300001)(81166006)(8676002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0752; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT025; 1:HPwHI09rod2hzYpImCLbGhIIpQQ6FoBsnQayFkJeooJuZPoK4vow6RP4rG0ud6vLi7QppZey5JpSQwcdfeU0kWN0+m7OcOgWqwQZd6dUEND3eo0ArA++OjvPOIJojchn X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ebf9dc29-d0fb-4cdb-7ad9-08d64f1a39ed X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:SN1PR12MB0752; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 3:GccYtE4F4q9fbHjwpPdkS1BJOksHTxzI/7JdUvP3abu3tbn0jGDrCdK2Nwk0kSCAMd+bfWTL4oyPxukG58Yh9IKqFDbiHc62ucdeXnpNhtdpwb1lDPNwKaItphtbQe7WQuz7Yuj5O6FL6fsnKVqIkbdll7lHI9uCisQW9uHF7UkUzaAooFleuKbRvorSnEu/K11cnkvQeom9t3n5aoH410+WAVZCb7F3yS0gZ1hvN501Le4o1JyfjMHXyMSEn6kV2G6HAGvtkC6IIOuPB+FHrkNBxnqOFIYdVlFJbz+7YN1QLEhlaknnwvLqVSPqZqWSSoECobZBsVH9hYJ0pvTlxCV4bgKnIaqjWsM5akkiw0w=; 25:bQmXOFdQcOnuLc9WFZbcJorGMfVd6OB+xGIKT3FHiCyrB5g3C9t25YynGBNhPtG+vXgmYJcagq0uVO8CjBX+Ery41jjbrIjHi+pyM4dZJIvuj+vkuDfe+wltzJd+BsW1L7Shbkj8iixb0+kgHZ4zNcOSg/jhguifFlS3wVlY2SxGhzkHpjRGvBfu6Yrb3FygUacRaSmMtmmn1YvB+dBg+b2XmxlKdOzVtZEsjveiyPfL7cqjFhwDrdTHm0vC4pbdkxWFqJbhpVahivZgIBLYRQ+2pY3o+Yl+YwNIGb86KAGBPDPpM+MJTBlSBAh81R2GM74wv0GHi0fAfFX4fNERKQwpcv7xQ270sBjQ0UzNzzA= X-MS-TrafficTypeDiagnostic: SN1PR12MB0752: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 31:9BN6vZa1u+glPEFKSKbeWtNzBacSCJF6eAhcG3wrorPZ2T8xxB1yHQjLJN5N5HHaC/wbAqwqYwYSxZ0YAME4HhOKU8+IIwrOHr71oU9JKqYJmRgmYkn9z5hXGsyr+2JjzXFtkGncp5sV4OOEfrgxFc4B7YFfx45BPJFRLfweJldqj+ATYD0vfrbaYZaDXH8L9NijqYGistiQOE8ipoJhHxOZZAZTnZj4FhhRAphNON4=; 20:/7x+8S1zzxX9l9sQ01NlPbs34SzGerxRzlJAOEhwNXWQ9w46oNbbufic4ZUwQt+UUuC+QgrvS1YpzhBLe2mA3sJbLEMWzKqn64sPhT5psFFjtLn3ivE+ZHhvlck2Lc399k71y6AawaTb3WYoxzgyqtGm2H7LMusc+VKQLGPO8x/B7LU3aVNSuKb8yUhYq8oz/Af6mjyugg98VvPjaAXkyvxpOaKyfRhcHba+MPe0UiPn/l0T41V2fEbkxrr2NJzlo4xWBPIfgFzx0biiTIiySXLn2FMHQpbp4N/PRI5OPkpF7OMqL9q89KBvag20dQWHMVdFJ4ZNWdyOvGMvGGxvuSmVkkRZ1GTrhIOdyAur1I/F2/YNa/x2dGhwYZ8S64MYtciMlxRK24btzESWVZZy/MLT1CMsbd117rHeNwLixJTckuet8lvcj/Z7Y1ePe2mNipYG4w84M+9+3+iG5XflTlBCFrco0jmZkj73mdGkqmLOLCUaYuRM+6Q/qbY2JH0x X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231442)(944501410)(52105112)(93006095)(93003095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:SN1PR12MB0752; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0752; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 4:FFJUQNZXxr35239LFAsagD9pXD/Cif2MOtM0771cvivjzGdpesKPcHl65OUMi7OwFSIjj8r6piPalBEWmCaK9/OKIP1c5moC7abKd7M4a/+sPwbw5ZLMrz2kZhTMC6jbk5kYJ4qGyYpMe9KCskpHnKTJWSyK7Zf2RpCFeKB3HzcA+vkGQTpl/f16XNbu7+kPlbcF4vYPZboom2+xL9Uv7vNjhLBLO+R6ou+cERdaKnJW+9N7WozSc+UDdaPmxKUmT7E56smXktrXgd4q10bWkQ== X-Forefront-PRVS: 08626BE3A5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0752; 23:Vd2ELo04dbCj9a7sB9zoBRj9m4T1xNGAC8WbG+j3C?= 8mYEhIqWldl+f1LMNsxpbvl7M39eoLrfk4W6fLb8qUtv2MjvZ+6F/6G6n500URa4OX0AQsEqNQuy3wRd6MFt+CbMDMKnIRDogfDKBi0TcNXagn7xS/EHhRBuMiJD1uoZ8E6vxUl4G8IgpUsaOzo+NNaK5PE0SgXrXeDNJH2fXHVl0mHyN0zIcaUJF9b5PhDMc/tlmaJ01P6+85MzcI4y0+UxUNBWFkXMR/0qmq6kwid9VDKkCamET0qYBT4LcSrDboEGjMZkK/ev5NpZ/jTAvUIEdi2RyaGhajOFIj7IMMhj7LPe42aWHyAGdXdft9b5gZwReTAJ3Ojhx+dY7jiUJk3umvmRVR9SXfI6ORzhYFSLtab9uOPsh6sNLWWSmRT8dfIEupPu7q6VhGuhQnaSNJma+KrCYvsJIE0mXu1vlR4TN/Y45HtWVeIvDT5vuivQmLLVbcOHKJqQHc9RpL5ku7RKeu+RaJl0BlwDV/c7nWBX8zaQUfk+E/0GxBINxKbVKcCka6mBECp/8o23diyDlnfZzvH10ciFiW2vT8iRnXt7+5E1cidjgouj6HVtVXDNfdQy7gT1ZtX4BMcEEVqJwHaTiLnJGuzbWEibpZHr9WZGQQzjtdG1h96jFUg/WGODE4IAoi8E7Bd/UwrGU3Tg0AjnljVyvjvaNIjPQr2IaSxImpUcIniEzLZ3QhnGrJ+6wwWT79CzHLQkGKMyIIHANTVf09hD6/JXAzNW3MApAG3tXKWXxae7+nyvzidRpGq4wAGvbVLZunmFIRGN3k4WzrBa0KU73/msqI5/EG0dDIHzGdxbGVsVUxUhdqsoHIaecH7a4lRR6vszBFaYEW7APJcgSMOuR7gceOGHbGyWC3+/R/Q4D1pWHmmTl5rgWAXfCVYEZKmDjoYHXGEHzgvB2BVAIvVo2shwSDE8gfuDL6bNuR2JdtnPlr/OAzw6Q6kx0HHrZUAfphQ+PQhSo0PR0BXg2UhE62/luNxjWWFEePN0ibElJZ9tdVm9Pm8ZDKyOdsdYVY/mBNpgsccCA3GEZthvXYHzjZMhJZGyIX774/vvKfGbgd6XkO/0I+jBrIsQE1aOisM+ppJ0Lbh+GSGLUslgals9zxlOlOECHu5zmHbmIZcgwQPEGxK+nvelGqo4paanP9mU5HzgrX6S+jdk0DR+zl46tX20J64nBQMs4bCvw7edRR5X161RP84l8jfjGvc5zw5+XnWqJag9pEoGx3YN4ehGRfWkyN5U4iaaX1X5A== X-Microsoft-Antispam-Message-Info: FIoNtRWZpdPq98238HbudK3PqMXNcbjsLVeV7jTOi4EU9AJ8aLsmw/uiHWrehJqVaPXvYXWdUjb8HlKhnGll0ANzIqw0Rr5J7kVEBcKoJ6xaVZI2/8CccImcQUDgyzMX9y5didnfDGudMybeg2PVzqFpMRCpzHYmPUSOldBmmW6a/6F9qFVyaJm/nO1nBB0DE+q7OvoE66FGEzOUAGWUxOR9QbOFALYlf/F+piZa0ZjgtmUwQj7szT2TBF/ylaoQMJkbTspR3YkfVr5jEEb6o4bJ9wtW0sgCcudZ2zcUwY3AK79J4wqqJO53b5KNpwcl1z4nS1de+oMo1wCzNQ9BtdkOeB/flD0woa3ATAlnUs0= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 6:6itMU+gFSklVPLNEHUyx20F0/pquosVWOg4uW8Ej2UMsYwjkeSZYKo3xPOh/6lFk1EDRUwS/tQy+a5TueFuQo9gc6X6deLFqa5vVgHMFhQP0wrE8Eira97LW/xTfphSZVjieHF6U/EECiynSksBQlrF/CcpvQ+8Hvg9n8lMBX0G8GQ3qOwCKEQTwEe+l8kwhb9uZeGe/npnTK8jy+a9PQHqaft/mBXlogHnGFK8oYc8YwGCi3j2tdtAGUaf51dKaUA/U0YVI8+YgiTNRFV3PpljSu8YMdmB3s3XzLzMuBS5mp2PlZnOehgBt6R2cer+OTVFqzBaWxqSyl6dU2g1hAwFO5eAImJm3AKtMxw7+4VPBywRwpiCKWiIdC92yNOrc3E4RVL9lz4/mI9smZgohLx1j8rEKL9zDCnQ+T+p+pCZGUCauF5+DlUnqX5Dyz/8sccefLS8qCilf8f28bsNNMA==; 5:T45xBkg1iuqQ5jTcJCLFHnO2KhRTfYfQt72HjZfkkgmGlcR9GwRKbdONO8jfqGrVLTACSYYqHeJU+mfURLhJPHMKoUyUwkKRo2REMQPiQqvyjJX+eCC1NO139nmokq3yjrefzsvFbO2gq2qQtU35c6RYUNV3QhO6v/4Htk0fOTs=; 7:ihI+lubX4XS5dkG/R2Pn3+184XyiVwHr1ymjOzeOmSN58Ij0Qd2vi8fmFuSWxszDSmUsppRHiih3QIqUcsLHCWuvxJ6wPdr8ZSkGIS4d/2snr4/zsutJoQ443Aj5BNwq5HLdZckBf/Gi5kF/MVtDVg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 20:6uT+orSZvM5t5I5JK755MgtE3yiSSAsMINOXFzQQX62qxZl7QPiYkUTcau6kF0UiqeIbuThBSiMm10ydS/KQFZfMSBDKbapok8L06sOJbY8qTbh0Ao9I0setJadx+ueLUrKIGkGwxN3j3wrO9F40ROoMEpMPcjE7w5/U/730yvrIQrL049DuzmaaMQtrHk+hXryZcRHs2ZF9i2T49dwjJ6brG4WFzvyk+LRHxCqMJuBkQGo1Hwhdq8Bs5zXryBE+ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2018 18:58:57.7081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebf9dc29-d0fb-4cdb-7ad9-08d64f1a39ed X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0752 X-Mailman-Approved-At: Wed, 21 Nov 2018 01:09:32 +0000 Subject: [Intel-gfx] [PATCH RFC 1/5] cgroup: Introduce cgroup for drm subsystem X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Change-Id: I6830d3990f63f0c13abeba29b1d330cf28882831 Signed-off-by: Kenny Ho --- include/linux/cgroup_drm.h | 32 ++++++++++++++++++++++++ include/linux/cgroup_subsys.h | 4 +++ init/Kconfig | 5 ++++ kernel/cgroup/Makefile | 1 + kernel/cgroup/drm.c | 46 +++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 include/linux/cgroup_drm.h create mode 100644 kernel/cgroup/drm.c diff --git a/include/linux/cgroup_drm.h b/include/linux/cgroup_drm.h new file mode 100644 index 000000000000..79ab38b0f46d --- /dev/null +++ b/include/linux/cgroup_drm.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: MIT + * Copyright 2018 Advanced Micro Devices, Inc. + */ +#ifndef _CGROUP_DRM_H +#define _CGROUP_DRM_H + +#ifdef CONFIG_CGROUP_DRM + +#include + +struct drmcgrp { + struct cgroup_subsys_state css; +}; + +static inline struct drmcgrp *css_drmcgrp(struct cgroup_subsys_state *css) +{ + return css ? container_of(css, struct drmcgrp, css) : NULL; +} + +static inline struct drmcgrp *get_drmcgrp(struct task_struct *task) +{ + return css_drmcgrp(task_get_css(task, drm_cgrp_id)); +} + + +static inline struct drmcgrp *parent_drmcgrp(struct drmcgrp *cg) +{ + return css_drmcgrp(cg->css.parent); +} + +#endif /* CONFIG_CGROUP_DRM */ +#endif /* _CGROUP_DRM_H */ diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index acb77dcff3b4..ddedad809e8b 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h @@ -61,6 +61,10 @@ SUBSYS(pids) SUBSYS(rdma) #endif +#if IS_ENABLED(CONFIG_CGROUP_DRM) +SUBSYS(drm) +#endif + /* * The following subsystems are not supported on the default hierarchy. */ diff --git a/init/Kconfig b/init/Kconfig index a4112e95724a..bee1e164443a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -836,6 +836,11 @@ config CGROUP_RDMA Attaching processes with active RDMA resources to the cgroup hierarchy is allowed even if can cross the hierarchy's limit. +config CGROUP_DRM + bool "DRM controller (EXPERIMENTAL)" + help + Provides accounting and enforcement of resources in the DRM subsystem. + config CGROUP_FREEZER bool "Freezer controller" help diff --git a/kernel/cgroup/Makefile b/kernel/cgroup/Makefile index bfcdae896122..6af14bd93050 100644 --- a/kernel/cgroup/Makefile +++ b/kernel/cgroup/Makefile @@ -4,5 +4,6 @@ obj-y := cgroup.o rstat.o namespace.o cgroup-v1.o obj-$(CONFIG_CGROUP_FREEZER) += freezer.o obj-$(CONFIG_CGROUP_PIDS) += pids.o obj-$(CONFIG_CGROUP_RDMA) += rdma.o +obj-$(CONFIG_CGROUP_DRM) += drm.o obj-$(CONFIG_CPUSETS) += cpuset.o obj-$(CONFIG_CGROUP_DEBUG) += debug.o diff --git a/kernel/cgroup/drm.c b/kernel/cgroup/drm.c new file mode 100644 index 000000000000..d9e194b9aead --- /dev/null +++ b/kernel/cgroup/drm.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: MIT +// Copyright 2018 Advanced Micro Devices, Inc. +#include +#include +#include + +static u64 drmcgrp_test_read(struct cgroup_subsys_state *css, + struct cftype *cft) +{ + return 88; +} + +static void drmcgrp_css_free(struct cgroup_subsys_state *css) +{ + struct drmcgrp *drmcgrp = css_drmcgrp(css); + + kfree(css_drmcgrp(css)); +} + +static struct cgroup_subsys_state * +drmcgrp_css_alloc(struct cgroup_subsys_state *parent_css) +{ + struct drmcgrp *drmcgrp; + + drmcgrp = kzalloc(sizeof(struct drmcgrp), GFP_KERNEL); + if (!drmcgrp) + return ERR_PTR(-ENOMEM); + + return &drmcgrp->css; +} + +struct cftype files[] = { + { + .name = "drm_test", + .read_u64 = drmcgrp_test_read, + }, + { } /* terminate */ +}; + +struct cgroup_subsys drm_cgrp_subsys = { + .css_alloc = drmcgrp_css_alloc, + .css_free = drmcgrp_css_free, + .early_init = false, + .legacy_cftypes = files, + .dfl_cftypes = files, +}; From patchwork Tue Nov 20 18:58:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ho, Kenny" X-Patchwork-Id: 10691509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FA4214BD for ; Wed, 21 Nov 2018 01:09:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C07E2AFC9 for ; Wed, 21 Nov 2018 01:09:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F96E2AFDA; Wed, 21 Nov 2018 01:09:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E4C382AFC9 for ; Wed, 21 Nov 2018 01:09:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5622E6E4EC; Wed, 21 Nov 2018 01:09:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from NAM05-DM3-obe.outbound.protection.outlook.com (mail-eopbgr730089.outbound.protection.outlook.com [40.107.73.89]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EB7F6E3D1; Tue, 20 Nov 2018 18:59:01 +0000 (UTC) Received: from CY4PR1201CA0022.namprd12.prod.outlook.com (2603:10b6:910:16::32) by SN1PR12MB0751.namprd12.prod.outlook.com (2a01:111:e400:c45b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.26; Tue, 20 Nov 2018 18:58:58 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::209) by CY4PR1201CA0022.outlook.office365.com (2603:10b6:910:16::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.23 via Frontend Transport; Tue, 20 Nov 2018 18:58:58 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Tue, 20 Nov 2018 18:58:58 +0000 Received: from kho-5039A.amd.com (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Nov 2018 12:58:56 -0600 From: Kenny Ho To: , , , , , Date: Tue, 20 Nov 2018 13:58:11 -0500 Message-ID: <20181120185814.13362-3-Kenny.Ho@amd.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120185814.13362-1-Kenny.Ho@amd.com> References: <20181120185814.13362-1-Kenny.Ho@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(136003)(346002)(2980300002)(428003)(189003)(199004)(50466002)(478600001)(48376002)(426003)(186003)(575784001)(86362001)(217873002)(47776003)(26005)(2906002)(72206003)(77096007)(2201001)(51416003)(7696005)(50226002)(76176011)(2870700001)(8936002)(336012)(8676002)(81166006)(446003)(68736007)(81156014)(14444005)(126002)(476003)(2616005)(110136005)(11346002)(486006)(53416004)(104016004)(53936002)(1076002)(305945005)(105586002)(6666004)(36756003)(97736004)(356004)(5660300001)(316002)(106466001)(39060400002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0751; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT025; 1:XQalNFINAH9EcP9YuscZkO3cmEB1FuFHE8S0Y67xhZf1BhidZiQAwG/0CbQrg9dndjD/uEzE8xykMl7cfSUbqdwPNV65QbHEkxmVAWAS601vvx7tgivZfagdk0A/87x4 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9785fbf-f1bf-4551-272d-08d64f1a3a5b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:SN1PR12MB0751; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0751; 3:Q6Nounuvh+sDYXcntK0KxxH9gnWINJNokxX+ekLGCpdYRKrCsYzvDmEJdMNuztbl7iqrd/i1iqYAXY6ybep5S8tROyIpFxikkucIUo39A7mGPu0mmRLNsB0jE9xRGwltp2OqJSkH5B4OfnoY2LTUzkXYPr8dkw82ruLeKCC7mXJkiEkrPZheNfY+aQ0dhWMJ9txOJIXdXsuruwP03fMwQQQWgBs+3OF9HDw+++fVAEwNrYnC+RQlWlvj2I0OqlKvIBBr8Y3N3xWnpiZxBamFFRTuw7qtOGj0IpvkmmSOfvegXjnD1XzJXF2SHLgyB43WeCLkzQwvxERgSNmqY/kN0CI3TNz4SfXggXL7nG18rSw=; 25:jUmEfpfkv1PFRE+kxr2kp4rjctC8yPI5h6dTTDJ7TS6dW2sFLXrDWC24wkzOanQ3dFoiCJTh/wdaru4xA2L4SiwXOBPj3jKncqOeH4juvz0k7WDYhjcmFl+pspD+Vw+QJoa47CPWtinGtgF5V2Gy8RG2U98lvY8fecRL5MaPHSRXJiGPSh5KJCEgg8FfkZ0OxYlUxEncjwglomEdZSDlrz2V23UkHLvDjhLhGwxeGhw/zZyaBH7TGf43y6r/BG2ix1r8xqA5yUjwuG0ccWyXpMX6o7SGanSeE35pK8pknxC6Jfwt/cd202AUwFHqyo4fAn9/+YG54eqK2KiOHDY1dmYuuWk3VCXWjX3TkPlh9Gk= X-MS-TrafficTypeDiagnostic: SN1PR12MB0751: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0751; 31:uORcmyxpybwYKT+jcRJet/wTH5RJoPkIfKORLSDVzk0uZ5JRnbUMgfLyWN/BqCuX5JK4f326NO+vcymUIdUM4veQPLyeop9xhRaEW2SwpsYay3c6FwSV1+nGAx2q4LxCsjhRoToCZ/tNOqCySPQWFG73mFhjT3+vk1iFu2YVe+pEAGlHSekdsRuxzrCasAmgTNJ4U2pgFNTDzLK+0R0yXe5THrmLSTsshXCzcfs9Gwk=; 20:LdNi35vWFIXntm+t3JSyktpFlxRp/YaxH/dSpjoNtu9mh26vdY0Z90I5U2Ylm1fq1WTpkASGK+LSzw476HvTsiTsQXPvEhCAidu7XK6kDUdtkoz2wo6FIEge8vnejdam/S9hKs1eO1r50ooh9g0kteT9sbiulURCJl+8cyN4NsxpWwQ4RbeqFtLJNIroNpgnFno79cRECa3xrq1PUWnLEDksVpAN8HRaGsCmq66F1TeTsJ0P1vfhoFtxcKfazKInyjM4EEcTwVr3iyVpkYKvAxCfq6qyehBAJAhElQ4S4b25mKbho8Zj5Yuc6RZn8N0qGgwQneja2VIEV6Fej7/FriUTgnicTb8pFGRzG/d2wpXFbbLrDIu6OfJ0rbrytGQwD9hF+VD3KwyAkabl4PUrZtmvKg1Dfj2LAByDenAPJStX2HkArgkiXLx9x1ETzB4du5K8UlNS+MCzBeaH1q0bzK/1B4nYX6TA9kFVhGY9/mlzmdu7wXABYJi65SN0ATCN X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(3231442)(944501410)(52105112)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:SN1PR12MB0751; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0751; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0751; 4:p7b0SV3+ULOQhRTmne5ulM1de8pwxenZDtSqIH11j910HgWztUZuyrcBslYLGp9isAg/0tJIBSorbDlvERdMk46lVS8xp0a3J7WDol8wLoifLTKkCIeMbexoR77m9t6I5EjUxWcbNJB+R4QBsnKQNG3sDYdg0bU71pJo8bO/XcnxLJHkgvFc03H3MqihjQOc1BzIgtD1/362YA970oaRSx9UE38rJzGXJRi7gwQgBQ8QYofzyKI01zpV/FZUmNFz7/OhOZ6Qp8mRfP0rL85pdQ== X-Forefront-PRVS: 08626BE3A5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0751; 23:FZyV1oJlM2nde7qeF/hFHgxML+hkwUs4suPC57bzt?= vLmck9eo10rfhLlS+Tdf4fGUUEmKRuUsWFZaATubSuIgmRCH3efn9VwXSGp4MwLxy0uJXNwllkYfXmcQBSR7E2OTkZ8BhlwPRltmk0nPHbNiCfcOzUUnd1EqzilWy2/xenI3l91lVtr8qtQ8tsKtgdutwGuDhCUgEll7xh+oANYkirZQkJGF6R3KCSqTcYqKSOK7Bj7CJg2bqGfwId/dobYwhdZ0BEEABBlYbGHWYtXxYn0IHjjfzpkZ3ilqMkErcIhH4rhqqiFJ9HyNKediBL1P8fztCuiXLaC5cYoeHYcvZxoAvkWiMkN64uRlZUL5l92Qe0ek1Xl7SBjbUVwSAe0Il3xtQr0za6sqsi4C8qqLcWADWe/v1njquK5QmfR58AdSEriXFu3/Tk8/Irza0oxYx74/8xjJFlr50vlIEj0IHKRTsZbeHsSN1laCKWFCjT3KcpOzqReC/taos7VSgZUL8mGBKhlbwXiVM7Mkxt2IPMn8WxX9QrlUjNPn231iqUaaAH00dptw0e9dLWezYnB1r0Z0hgqPoW8YlwNtLxlwTsMmJTzp9Qrf7ykACl9gGct7BPSuxgdsOHDgdev4CLvX86HaWmFMm0AYOI7tQalClXOhFgOEpMNE8IfmmLpAr9qbZZqSNTyWvQbn4LS3USRNS0clOJGUAQ/pdgfmb6IRpnUwyyoucQbC3uhQzuBIrbFP9yqs7p0NW0LAsd7Kro14UB4x872e93TNHcjA8euds2OaqfBfeu65Denyx6od/RRJf8U75yeMgsMtR+pIq0x4V5zqABR1DSKSYSQlY5jUvg5n72lZ2DxpZqAcNBSa21CCTt+nK+du/4vlZUJGzinV4mKTrPabmzHTqmKjR2fF3I+yPcLmaJCNV8b32CFB+GW/Qug4T1TwT0MVmZIhZD0K04YrlV6eGcS6Ji436F9d0+GKgrl4n2jMgLUF46S4W8NP+4mT/Fex+iTqKIrU95sK7nDGEGZqhDbS8gDoOxVzE61Io/3tWB0c0Ue/dMnkDSdWFjMsI0ly0euiwG7AFEsPKDY183gqFAZhcuI2x4iKN76Ub5Tsd7/jtVLN8h1q2IcIo83I5DEgXMqZZMyoU5Xz7DVC225LNfJoJ0lM9TZnP2HI+w4HkqgfOBf3QGJhwNS64TgP04jcCMyQaYLP0QIQ2RSzM/oFOU8anVoM+Kns7VUFPckbXP3rqVCwTmVq6g= X-Microsoft-Antispam-Message-Info: r8WoLvOiIDHmQHM1pis0BbFqoNHBP1KWW9mepmQCSukq86Fudqo0+3rDRd8XJO3kA/BiX9VelKPlVTAYwSLwlgmVzxAEXN4qBRWoQ51zJSbCBYnunbSMkfGvjRQCKX2HTOnnuAN0kNk1JLAdsOt3oHrIRYUVCPjtXQSFyapvHXA/a88FV+t6tsHLTzseWbsyLgfOi3peN9aUR4VkXf7J0LqxvbCdsGkOeSBdZGQdN1v/SxdPkqHy0w5H8tcC+HTYDqw4MvKaB+20+2P/lmgT0JNvoHxwUyggb20BrpDkcO+Fv7E2D5hpj+eswO2MGr53hij9Izx1fwlRDDuMbVtG+IAYhzO+FZkv1hc67zyRoII= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0751; 6:F+BtzcSWoF14s/BDLTNZaLXq0mTJC3uDT6SCUVU1SKrW0g4vfiakdAi4ClFE5E3ppZpuNxAIGbbHlL/vkGEDaUhTsJiHfJgozGhfjS+ChG1BDoai5pzeDDIEyAGPgY1kSjvnbkXnkLPOLDphI9jKHAdM3OdMTNOmuTKFBSvTz7C1GeSjekSZU101SprD3pn3Bnl3sbl2N7LkXdc7jmyt8GnKLFHWGro2JjF01QJymhYkZhkzo1BREBbqkyx4bPczfThKj8wWJcMrpYf5wLoc4bauq0kMpJUxB3WB/qj6osM4j0WXhuVc5ieionAIWK4ANf4QEYBm/yNktJTWMcGXWwmZXfKedhCQE7OmwrjO/hBh/N3dtxjitAacu4KKoTLHcU8psjbbD1MaY6BUu8a0ZsIKBqZtasntEsZ2oaqowte8SPKp1C+Pg7rYR5STWQ4Ar0qtCDw+5AHrSZraLIkKDg==; 5:Y617rodYDvvKUYDsKCWC7iJoRYyGnBhR/vzg069BvUhvgPO02DauS8HJfSTAe1zoMsQK4Zch1jDzd7aaVNCrQG1o99XDy954MJ9YEinc4HjQph6fr66wrPIU2BMpLc8UXMFQ1I3Y7ROKtECe5edhbgp0EPuemendX3R8DqXZYEk=; 7:BE72pHe+L478RN2YnhgBPGYR6UWd/zRqcji/44U8V7QaXBXOTQCQ5hUM/aSWRKKbxR0VHB/3SHVgclC79gAyqaMdUVH+5ZN0SeQqX2elQkLvR8XN3jlgF5HV5wq++lP4NzcdT5TU0M99C1RKJmlEKA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0751; 20:OWAcjSvM4DnwuVv/0dTzzAYZI1+zv88S1iArtYx3uhnBopmMUbRRm/asAP6utaRIud9eRYRzts3f9l/VgdHi7MzdmSfIY9k2R5lkcnR2puigErRpLCgSCqcCBdLR1hMP3BW5ZcsqFhlf6CxOhE88cFxGe0oAEH9n7BRvwOV0cVNyN5vqFgTaFkJyfWWifwXZU0ARAENW3NIbqxR6LMICR8cuXSpVOgHyHukd33MxU4WQwqYdCP2oNHQeb/SguBEB X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2018 18:58:58.4425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9785fbf-f1bf-4551-272d-08d64f1a3a5b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0751 X-Mailman-Approved-At: Wed, 21 Nov 2018 01:09:32 +0000 Subject: [Intel-gfx] [PATCH RFC 2/5] cgroup: Add mechanism to register vendor specific DRM devices X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Since many parts of the DRM subsystem has vendor-specific implementations, we introduce mechanisms for vendor to register their specific resources and control files to the DRM cgroup subsystem. A vendor will register itself with the DRM cgroup subsystem first before registering individual DRM devices to the cgroup subsystem. In addition to the cgroup_subsys_state that is common to all DRM devices, a device-specific state is introduced and it is allocated according to the vendor of the device. Change-Id: I908ee6975ea0585e4c30eafde4599f87094d8c65 Signed-off-by: Kenny Ho --- include/drm/drm_cgroup.h | 39 ++++++++++++++++ include/drm/drmcgrp_vendors.h | 7 +++ include/linux/cgroup_drm.h | 26 +++++++++++ kernel/cgroup/drm.c | 84 +++++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 include/drm/drm_cgroup.h create mode 100644 include/drm/drmcgrp_vendors.h diff --git a/include/drm/drm_cgroup.h b/include/drm/drm_cgroup.h new file mode 100644 index 000000000000..26cbea7059a6 --- /dev/null +++ b/include/drm/drm_cgroup.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: MIT + * Copyright 2018 Advanced Micro Devices, Inc. + */ +#ifndef __DRM_CGROUP_H__ +#define __DRM_CGROUP_H__ + +#define DRMCGRP_VENDOR(_x) _x ## _drmcgrp_vendor_id, +enum drmcgrp_vendor_id { +#include + DRMCGRP_VENDOR_COUNT, +}; +#undef DRMCGRP_VENDOR + +#define DRMCGRP_VENDOR(_x) extern struct drmcgrp_vendor _x ## _drmcgrp_vendor; +#include +#undef DRMCGRP_VENDOR + + + +#ifdef CONFIG_CGROUP_DRM + +extern struct drmcgrp_vendor *drmcgrp_vendors[]; + +int drmcgrp_register_vendor(struct drmcgrp_vendor *vendor, enum drmcgrp_vendor_id id); +int drmcgrp_register_device(struct drm_device *device, enum drmcgrp_vendor_id id); + +#else +static int drmcgrp_register_vendor(struct drmcgrp_vendor *vendor, enum drmcgrp_vendor_id id) +{ + return 0; +} + +static int drmcgrp_register_device(struct drm_device *device, enum drmcgrp_vendor_id id) +{ + return 0; +} + +#endif /* CONFIG_CGROUP_DRM */ +#endif /* __DRM_CGROUP_H__ */ diff --git a/include/drm/drmcgrp_vendors.h b/include/drm/drmcgrp_vendors.h new file mode 100644 index 000000000000..b04d8649851b --- /dev/null +++ b/include/drm/drmcgrp_vendors.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: MIT + * Copyright 2018 Advanced Micro Devices, Inc. + */ +#if IS_ENABLED(CONFIG_CGROUP_DRM) + + +#endif diff --git a/include/linux/cgroup_drm.h b/include/linux/cgroup_drm.h index 79ab38b0f46d..a776662d9593 100644 --- a/include/linux/cgroup_drm.h +++ b/include/linux/cgroup_drm.h @@ -6,10 +6,36 @@ #ifdef CONFIG_CGROUP_DRM +#include #include +#include +#include + +/* limit defined per the way drm_minor_alloc operates */ +#define MAX_DRM_DEV (64 * DRM_MINOR_RENDER) + +struct drmcgrp_device { + enum drmcgrp_vendor_id vid; + struct drm_device *dev; + struct mutex mutex; +}; + +/* vendor-common resource counting goes here */ +/* this struct should be included in the vendor specific resource */ +struct drmcgrp_device_resource { + struct drmcgrp_device *ddev; +}; + +struct drmcgrp_vendor { + struct cftype *(*get_cftypes)(void); + struct drmcgrp_device_resource *(*alloc_dev_resource)(void); + void (*free_dev_resource)(struct drmcgrp_device_resource *dev_resource); +}; + struct drmcgrp { struct cgroup_subsys_state css; + struct drmcgrp_device_resource *dev_resources[MAX_DRM_DEV]; }; static inline struct drmcgrp *css_drmcgrp(struct cgroup_subsys_state *css) diff --git a/kernel/cgroup/drm.c b/kernel/cgroup/drm.c index d9e194b9aead..f9630cc389bc 100644 --- a/kernel/cgroup/drm.c +++ b/kernel/cgroup/drm.c @@ -1,8 +1,30 @@ // SPDX-License-Identifier: MIT // Copyright 2018 Advanced Micro Devices, Inc. +#include #include #include +#include +#include +#include #include +#include +#include + +/* generate an array of drm cgroup vendor pointers */ +#define DRMCGRP_VENDOR(_x)[_x ## _drmcgrp_vendor_id] = NULL, +struct drmcgrp_vendor *drmcgrp_vendors[] = { +#include +}; +#undef DRMCGRP_VENDOR +EXPORT_SYMBOL(drmcgrp_vendors); + +static DEFINE_MUTEX(drmcgrp_mutex); + +/* indexed by drm_minor for access speed */ +static struct drmcgrp_device *known_drmcgrp_devs[MAX_DRM_DEV]; + +static int max_minor; + static u64 drmcgrp_test_read(struct cgroup_subsys_state *css, struct cftype *cft) @@ -13,6 +35,12 @@ static u64 drmcgrp_test_read(struct cgroup_subsys_state *css, static void drmcgrp_css_free(struct cgroup_subsys_state *css) { struct drmcgrp *drmcgrp = css_drmcgrp(css); + int i; + + for (i = 0; i <= max_minor; i++) { + if (drmcgrp->dev_resources[i] != NULL) + drmcgrp_vendors[known_drmcgrp_devs[i]->vid]->free_dev_resource(drmcgrp->dev_resources[i]); + } kfree(css_drmcgrp(css)); } @@ -21,11 +49,27 @@ static struct cgroup_subsys_state * drmcgrp_css_alloc(struct cgroup_subsys_state *parent_css) { struct drmcgrp *drmcgrp; + int i; drmcgrp = kzalloc(sizeof(struct drmcgrp), GFP_KERNEL); if (!drmcgrp) return ERR_PTR(-ENOMEM); + for (i = 0; i <= max_minor; i++) { + if (known_drmcgrp_devs[i] != NULL) { + struct drmcgrp_device_resource *ddr = + drmcgrp_vendors[known_drmcgrp_devs[i]->vid]->alloc_dev_resource(); + + if (IS_ERR(ddr)) { + drmcgrp_css_free(&drmcgrp->css); + return ERR_PTR(-ENOMEM); + } + + drmcgrp->dev_resources[i] = ddr; + drmcgrp->dev_resources[i]->ddev = known_drmcgrp_devs[i]; + } + } + return &drmcgrp->css; } @@ -44,3 +88,43 @@ struct cgroup_subsys drm_cgrp_subsys = { .legacy_cftypes = files, .dfl_cftypes = files, }; + +int drmcgrp_register_vendor(struct drmcgrp_vendor *vendor, enum drmcgrp_vendor_id id) +{ + int rc = 0; + struct cftype *cfts; + + // TODO: root css created before any registration + if (drmcgrp_vendors[id] == NULL) { + drmcgrp_vendors[id] = vendor; + cfts = vendor->get_cftypes(); + if (cfts != NULL) + rc = cgroup_add_legacy_cftypes(&drm_cgrp_subsys, cfts); + } + return rc; +} +EXPORT_SYMBOL(drmcgrp_register_vendor); + + +int drmcgrp_register_device(struct drm_device *dev, enum drmcgrp_vendor_id id) +{ + struct drmcgrp_device *ddev; + + ddev = kzalloc(sizeof(struct drmcgrp_device), GFP_KERNEL); + if (!ddev) + return -ENOMEM; + + mutex_lock(&drmcgrp_mutex); + + ddev->vid = id; + ddev->dev = dev; + mutex_init(&ddev->mutex); + + known_drmcgrp_devs[dev->primary->index] = ddev; + + max_minor = max(max_minor, dev->primary->index); + + mutex_unlock(&drmcgrp_mutex); + return 0; +} +EXPORT_SYMBOL(drmcgrp_register_device); From patchwork Tue Nov 20 18:58:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ho, Kenny" X-Patchwork-Id: 10691503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00C9F1926 for ; Wed, 21 Nov 2018 01:09:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E27A72B019 for ; Wed, 21 Nov 2018 01:09:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6EC62AFCF; Wed, 21 Nov 2018 01:09:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 259322AF79 for ; Wed, 21 Nov 2018 01:09:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E93A6E4E9; Wed, 21 Nov 2018 01:09:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-eopbgr740075.outbound.protection.outlook.com [40.107.74.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9BB496E3EA; Tue, 20 Nov 2018 18:59:01 +0000 (UTC) Received: from CY4PR1201CA0018.namprd12.prod.outlook.com (2603:10b6:910:16::28) by CY1PR12MB0742.namprd12.prod.outlook.com (2a01:111:e400:59d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.28; Tue, 20 Nov 2018 18:58:59 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::201) by CY4PR1201CA0018.outlook.office365.com (2603:10b6:910:16::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1361.14 via Frontend Transport; Tue, 20 Nov 2018 18:58:59 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Tue, 20 Nov 2018 18:58:59 +0000 Received: from kho-5039A.amd.com (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Nov 2018 12:58:57 -0600 From: Kenny Ho To: , , , , , Date: Tue, 20 Nov 2018 13:58:12 -0500 Message-ID: <20181120185814.13362-4-Kenny.Ho@amd.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120185814.13362-1-Kenny.Ho@amd.com> References: <20181120185814.13362-1-Kenny.Ho@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39860400002)(376002)(136003)(346002)(2980300002)(428003)(199004)(189003)(2201001)(7696005)(51416003)(47776003)(72206003)(86362001)(478600001)(76176011)(48376002)(5660300001)(476003)(104016004)(2616005)(426003)(486006)(36756003)(336012)(97736004)(11346002)(446003)(217873002)(39060400002)(126002)(356004)(14444005)(6666004)(2906002)(110136005)(8936002)(316002)(8676002)(68736007)(81166006)(81156014)(53936002)(305945005)(2870700001)(50226002)(77096007)(26005)(53416004)(105586002)(1076002)(50466002)(186003)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0742; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT025; 1:8BwZnQjt2Udsv7e33r2+nf9GxbumHU2lANJyHf/J1mqVkyiSCnFo+7sO6qNgAN7wD1lbDZ8v99/1j3ke1wg4aBCmuwSMfKtIoGK+k+32qFK76/rF0bgnq6v/tYQ/Rxs4 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08c88c83-8711-4dad-e659-08d64f1a3adb X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:CY1PR12MB0742; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0742; 3:jUqGc5mzsb7LAm9EtSrK08GZDNratMZm+Eo5qOgjaFyGaH79HBpSfQ5MY2C8SzIlScQ0ZdKMDDd8mIQwsUbq9JUmKM//Vsx02PYyvnzD4/slKOIDy+urej2GDzL97y+kdCdUQntB6tJyolyI3RODG5uuZZSh1JYFFRq1Ngx2kByS6EHtqjdruStNcQvZCHp0vHRujNEUb+YPyIgDYtj5nKfK40nBextVUKCekpEih0IrvreUmo5pcTpUuDJPDGDzBZfi9BR30Z+bO69RSk8PLA7MLUHxSO2Wvf1OCkui2yxrLWDxV0eHDhW0NWvXnk1NzS6Qnj4nI7yj3HdY8JaUEwVwsCGBbNlK8OD4ELnig1o=; 25:cMrIJRJAX2GcP4WtxX70KfwGs8SMYs290EwtL2Mn+ObaYgZxFqttD0ArUFA7keg9HX5/hpgq/g+uxZcAHW35bAAcFNnKeScTlwJ8iESgO3FtbBMWx/+srxXiadIGpjjIDHOz/E/nL2YknQDpqHbvnCJqtMio0GEjC63KmKhaQnAHnUzs1CfpB2FVeCSKf/c592veZNyoA4TxOAL/7nW/6Hq/mVlfKE17mXLWCefyWE9rh8LHlF6jFkWcOaQ8e1OiY5FALhH/+mnPvdEMZXDf07EGRL2wpq6Ab1pTHPNrzkZC8E0KwaUPhQerPqTGWD4/BU+C+kLXXfiYCQI1fUTS+SJc+V5Vb2rpEWvwXsxEsZ4= X-MS-TrafficTypeDiagnostic: CY1PR12MB0742: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0742; 31:vqpYborFp5MyusksFgY7jsl8nuTtiS0AWsNX6yEVX8wi/qNn3DSUqc/ldk2Jd31oMnIfcvE1lrzajzPQPDHO9DCYX1uw9H8mgUYobBlO0mzdUDCngn6ktVyVYOy34fEHCBoaoAeRBes9JUT4VO1TEXzlTtmz8Gc3NljiDlc+fLVfb/yuFa1JAUfOxYvzpie2b9qUcSdGn6pDOMCEHRxU0O7C/gLQpewafH5MeDeOfJk=; 20:mdBJQ6VZOQzNkdhia0hX0ONqDhgudWIOrOShAxPGoeDqRQRioS1UCd23a75BZpYbbneJW/WUJpzege6YN5EWtJ65kgQOAZiv+AhFG7lbpkuLCMGXsaRxtMf6IpNShK+BIp5u+1tf1wdo3AIb6Jv3YqFQF4E5+hRMaxlKw/ifmtjEub8XzcgYF7vHBcDjxoX3k83VIyKpsEbmQaiC/utLGKlaEw9wzPSjG968by+HfLcVJabKmzpJkDIOdymzuJjEWvPkKrGUPzgAtApKGvmN5QUIArskw37Er97PJWayxK+i9+grHJDZVudBXKnxWL2w6xmPjiEqeBacGAvXsjJiJ05t0nf8ARlRN0BKfR9axS3AAvsluChlx2PdCpk84Lc1zm0MGiFUSU0qFc52SVLtb+r/aFUq7VurJM7sjThsE+e+2zNp9ZDoVdgRpnnlHHuWtUSqfudsvkK3Sv11xGeEcBXZQ7Y85n64xKmOIHJkTiTpPoA4HzZv3LqCKniVP9Yc X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231442)(944501410)(52105112)(3002001)(10201501046)(93006095)(93003095)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0742; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0742; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0742; 4:B5bcMPf0t16vcuy63nM2/igZKxeN7HKVUmIiD4RYhXW7tYMSkpWT/YZS/bw/Xn7LSRD+xkU4LnqalhsKyoeAcsFtUJTbURIQcARkN+ab952Mp8IRC4uQry+/LpJMD1SqCaDmPcWJzHd8z4NttXs1i4KP0o6hxvuYzaNUzYtt+Px0NkRmIuQqIPTWrdcmyhXyNYBC61wc82YUhIHeo4oNjGtHWgKfaQawHiWOLM7P8GWfmfqVniui0Mic+sVipoKQCwdrMuPz8Rrito6Tz5M5NA== X-Forefront-PRVS: 08626BE3A5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0742; 23:BKVkVGhH0dDU99t1XDEhMNBsrIIyqUQOXg9j4hf5A?= FdAS3d2F7xxDyf8OLj2VfuDK0UtZGkmwTeT7n8UXBeajDRQHLk5omxvrq8nr0XU0fqesI8KKXfLfCaTZJZKHZvd6ekv/JM/RIPktAAqYjnM5dpnDV/B0m6OpRbxUMVpD8JDEHLguYpq9vhCcXILbpCVrP7745aozqDXtb8LmgME7H/aG5ad6FG6QOnaFBMlbX5u6BiGcPVpexToBDcU5yK0OhrD88icggmXSDkIylsD8/IwOORwFE35dVKOJkh6cpTdyLcchMeHllo0gkHo2S4c511Pp0iK18BPHd8VIM2xsrYmR+/0zCE/HLHVOjoZCXnFtX+D4HYgG9s/GbQRbVPqMy8+7yjxZA+BbubSNN/UWVJXTZxEjr1C2P/4ZphdEHeqYElPa99ChFoSiuiO3g910M3+cOdUsLhMuwzPtZCmAwJFn9N3T1BxZGiKZ0t6OUCsfWkC4B0VByLcUcUdE2y4pMIlq7uJjQpSPPJh0wWvOU01JrrMv8mtVM7kdzab2sbG1rUE2hoB/IxjEJhEYbTkfkpxO6sxcYqsfkSAi1QczEK1HjbEJMZPwPCo1nl/JXjy8ZbpwqTS93FqQjI6+qytUEERjzwzSwhJHjT95oNHMT/U0W7eEb1Bd5QlvPrDukumHxbCkv2CB7+V/0/HZJCiNEKMWz9+QqIw/9CLJlZdzu6diyx562eJ6Mt7Ew6PKt5hJSqwwX7oDERqM2K/YhadoVENVoUsdAxT9nazZUfzFnmLKNZs3jK+qEFQCcnBfsfBydSqHAF9k43rewrqUTPwtr8b18EG265ESQfcOJrzXrlKpN1YhqGIVA3DeXTMeekTThJtw/bkViPe4sUBqeb0XrlB5zR6TS9eMxs+D/00GWW4Byou8jkXiH628SFtcbvxtFtha6TOon05R4SgwAefX56Nf3YyFegqvePRwyG2EnFf5BF6Ewzl8CH1gjCc8e42TEGcX2vXBFMcw/FXwarZlQxnz6PSTNffeBnE9uQd2eV00W5F88OeYSawTE8UGPk5Un3LBEv5bh1L1U0dBZc1LMHBdOfKapAD9pTeAdyvU78vugsnMj00ZcjImWdXA+cOfCwDkUQzESfWqasBgs9I78//FiGyc8hH6SKOMk1NebWyEWgg8V1LgjcamXH7UoU9p2aiONmcOL+9YBK5va6VtoflmYrsIRNtynQ1oDUrAQ== X-Microsoft-Antispam-Message-Info: MkXSQnPvMRPT05qr6QYLwAMyyX+BVuLxroGuKppmIH+nNLcPMvhUHWEJSbsUjURLtlyZkOw6weYOss2uKk5d/ACsWcdJfUe2+qfgdpDyacGQ0KDDODwIXzlDLYfFJCuDG8e0VVYILzD9mFk3uJMqmauHEj4FaFex0T90NFt3dlgguwoRXd6KE5cDZDuRL+ksq6GWkYIlpSFQs7O/G9e7NgqqaqCjXXVOOX4MNWzv/yKG8mQh20+dfsnIr01kc5aNTs7hlXa7IhN9QWPRl8UuNWvuEosuC1PWZfXleJ2jceRIvOyKo6kAYAbZRQ8NFUXpURJr0QVZNsV/vw6447SePgNkNwCAA1yWlm1m60wsh+0= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0742; 6:d1KNXBSWLrDzE7b29fnda7j6C4avPF10KrAqwGtwsCovPn+oJ/lebS36tLG1Ho1+Is2348MWrMTJlKuDAWmByIH0WtuEXBd72OtbUf81ZgxifeRFNd6OAn0kewBGUs8uKkYF0B/9bU6QsClwK79ZSjDtyY/91SqWHqAqYYvJBs8XvX8DkkZT7TnVo1GvSZPKInk5q3uzbV8ISx2JeyksKVBWJHgBrlwoLuI87T0O8d5CcmCY+I4s4gB5//9l8acoUl3Th1UanbpquQWer0tD8XGzVMLbO0sKcw89AMkxOO5FUk5nb+2g4cugWc4eOac17JwODTEa2BVufi2/9yd9187WIyghIohBwq5UbtDWHIBDPyAdh9CmyrOIruRrGEw5cRmJ3eclBHb3hr4vEcDIl5Cg/EYG8U1ED7kCjpeD9gLKjvzG37YGlaylENCdWQlytVdAkzTZlv0JZii+l6ajMw==; 5:3+DNc2GDmjaUurdI8gu7XIQF0rTQ8/TSidu1I3OwCqaF7dWpeQ26Vd1QSBTaJmnUoJdYbIUZ+AIhLDtkqFbKVTZyjYQgINvJ5Sc7PiUxdJKCO1fHzGfBgSFJnS6HB6HpKrV7t2mFBZp2QxXdzErbgEdPygsr91lCweyoK5gYSi4=; 7:Kem91/GkGrE5BramZIb1su14rO3D1t53SUiGXRJaz+esWKZIh09Q40vBAKyA9q+i1Dve7n5GdWDTkt59qbhyVW7jIcyEDKqMxM+JJYs/2VjkdKe/e/FY+1/UmBw0a097Trw5h+MsWPzwZCAGKYI3KA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0742; 20:VCFgr1uxloGwP0HmJjGfg0eu2PerBmiiA4b2bKVhZFaxcPWzQiiSUcSqV2V+LWWXFzmk8v1aOeDA834dvvMHTRG4EifyfHn4k/dltqhuMbaV0zYUvBa0EwhNotGNq1Cn4otF96vUUQS12EjEqjhOrGfKQESH6sj1FRjmDatAqH6ZTI6N1EBGFVEWBer7qc9tCipPSR7bCNHRK3gxE2gnGzoJv8r6ncEP2u/VM8MCljcv+T5Ta1pp5GAKya4xI9vX X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2018 18:58:59.2862 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08c88c83-8711-4dad-e659-08d64f1a3adb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0742 X-Mailman-Approved-At: Wed, 21 Nov 2018 01:09:32 +0000 Subject: [Intel-gfx] [PATCH RFC 3/5] drm/amdgpu: Add DRM cgroup support for AMD devices X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Change-Id: Ib66c44ac1b1c367659e362a2fc05b6fbb3805876 Signed-off-by: Kenny Ho --- drivers/gpu/drm/amd/amdgpu/Makefile | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c | 37 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h | 19 +++++++++++ include/drm/drmcgrp_vendors.h | 1 + 5 files changed, 67 insertions(+) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 138cb787d27e..5cf8048f2d75 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -186,4 +186,7 @@ amdgpu-y += $(AMD_DISPLAY_FILES) endif +#DRM cgroup controller +amdgpu-y += amdgpu_drmcgrp.o + obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 30bc345d6fdf..ad0373f83ed3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -2645,6 +2646,12 @@ int amdgpu_device_init(struct amdgpu_device *adev, goto failed; } + /* TODO:docs */ + if (drmcgrp_vendors[amd_drmcgrp_vendor_id] == NULL) + drmcgrp_register_vendor(&amd_drmcgrp_vendor, amd_drmcgrp_vendor_id); + + drmcgrp_register_device(adev->ddev, amd_drmcgrp_vendor_id); + return 0; failed: diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c new file mode 100644 index 000000000000..ed8aac17769c --- /dev/null +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: MIT +// Copyright 2018 Advanced Micro Devices, Inc. +#include +#include +#include +#include "amdgpu_drmcgrp.h" + +struct cftype files[] = { + { } /* terminate */ +}; + +struct cftype *drmcgrp_amd_get_cftypes(void) +{ + return files; +} + +struct drmcgrp_device_resource *amd_drmcgrp_alloc_dev_resource(void) +{ + struct amd_drmcgrp_dev_resource *a_ddr; + + a_ddr = kzalloc(sizeof(struct amd_drmcgrp_dev_resource), GFP_KERNEL); + if (!a_ddr) + return ERR_PTR(-ENOMEM); + + return &a_ddr->ddr; +} + +void amd_drmcgrp_free_dev_resource(struct drmcgrp_device_resource *ddr) +{ + kfree(ddr_amdddr(ddr)); +} + +struct drmcgrp_vendor amd_drmcgrp_vendor = { + .get_cftypes = drmcgrp_amd_get_cftypes, + .alloc_dev_resource = amd_drmcgrp_alloc_dev_resource, + .free_dev_resource = amd_drmcgrp_free_dev_resource, +}; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h new file mode 100644 index 000000000000..e2934b7a49f5 --- /dev/null +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: MIT + * Copyright 2018 Advanced Micro Devices, Inc. + */ +#ifndef _AMDGPU_DRMCGRP_H +#define _AMDGPU_DRMCGRP_H + +#include + +/* for AMD specific DRM resources */ +struct amd_drmcgrp_dev_resource { + struct drmcgrp_device_resource ddr; +}; + +static inline struct amd_drmcgrp_dev_resource *ddr_amdddr(struct drmcgrp_device_resource *ddr) +{ + return ddr ? container_of(ddr, struct amd_drmcgrp_dev_resource, ddr) : NULL; +} + +#endif /* _AMDGPU_DRMCGRP_H */ diff --git a/include/drm/drmcgrp_vendors.h b/include/drm/drmcgrp_vendors.h index b04d8649851b..6cfbf1825344 100644 --- a/include/drm/drmcgrp_vendors.h +++ b/include/drm/drmcgrp_vendors.h @@ -3,5 +3,6 @@ */ #if IS_ENABLED(CONFIG_CGROUP_DRM) +DRMCGRP_VENDOR(amd) #endif From patchwork Tue Nov 20 18:58:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ho, Kenny" X-Patchwork-Id: 10691501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EDCF813AD for ; Wed, 21 Nov 2018 01:09:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA7792AF74 for ; Wed, 21 Nov 2018 01:09:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE84E2AFDA; Wed, 21 Nov 2018 01:09:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D24D2AF74 for ; Wed, 21 Nov 2018 01:09:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 948C36E4EA; Wed, 21 Nov 2018 01:09:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680078.outbound.protection.outlook.com [40.107.68.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CAD16E3D1; Tue, 20 Nov 2018 18:59:02 +0000 (UTC) Received: from CY4PR1201CA0018.namprd12.prod.outlook.com (2603:10b6:910:16::28) by SN1PR12MB0752.namprd12.prod.outlook.com (2a01:111:e400:c45b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.21; Tue, 20 Nov 2018 18:59:00 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::201) by CY4PR1201CA0018.outlook.office365.com (2603:10b6:910:16::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1361.14 via Frontend Transport; Tue, 20 Nov 2018 18:59:00 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Tue, 20 Nov 2018 18:58:59 +0000 Received: from kho-5039A.amd.com (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Nov 2018 12:58:58 -0600 From: Kenny Ho To: , , , , , Date: Tue, 20 Nov 2018 13:58:13 -0500 Message-ID: <20181120185814.13362-5-Kenny.Ho@amd.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120185814.13362-1-Kenny.Ho@amd.com> References: <20181120185814.13362-1-Kenny.Ho@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(2980300002)(428003)(199004)(189003)(126002)(2201001)(1076002)(476003)(575784001)(478600001)(2616005)(11346002)(97736004)(86362001)(446003)(104016004)(15650500001)(217873002)(14444005)(186003)(26005)(77096007)(53936002)(39060400002)(50466002)(47776003)(48376002)(486006)(316002)(7696005)(51416003)(6346003)(2870700001)(76176011)(356004)(6666004)(305945005)(110136005)(53416004)(426003)(336012)(8936002)(68736007)(72206003)(105586002)(106466001)(81156014)(36756003)(2906002)(5660300001)(81166006)(8676002)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0752; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT025; 1:txAL+d3N1y02zN2rddkGGCHhkAoqxsOXhnClSQs8Ohzid6lOOf7sgbB0ipF7/vD1Y091sV9nGaFfYeqZAYuIC5c8nELZQUCS4hqJI9UCt96q3FEhuPl2biWEv7JnUcTE X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 601e444d-7080-4b95-094e-08d64f1a3b40 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060); SRVR:SN1PR12MB0752; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 3:PctyVJ5q9v42PHS9LtBYTJ+dYQVUL1tXCTMvN3o7dERoFySr8lHKH90D4NqLEOQcTFCmiBC47/sBltWLqiOW+VSIid8df8hYZsZjs5h/MG+f1xYDmy2klCZFKzH4oHvUesVUoYwqupB9C14vgeMBmNckTswd21wnkAcEfcpcQ1cptSRlp9mjVayWuC1C4S8SK3NiDkqweNxpgPL/fx6kEXLHR8idFHeo6D51iGXff9SOL3IiWoVt+Q8fC2rQl6Gqm2UCTu5QNeRZLaGNf/QU7rFXExo8Hvxq9NVBKPrJuTW8OiZgyBSJBC9H8Hzm8DsRYrY6+4TPvUbTKe0CwYEhH5tyGSQYtYy0c+Ud5f3jVlU=; 25:HpsvP2X3AKpDm25a2EkvPG7hwQ186TLahFLy2ft1AOCH8tk9kMnk7JPigWSD7HRGemZO8Gds5U77UoiojImhkX8qYXTp/eU0SKdHXv2pJltV1jYloJqEcqC5PdjXy7Arl5xSpATJmdXNiwdNqRzIngr5FkgV+btqjk+AC5LHzpVZWSQ7Q5oGF4OrZ7ZyG6Z6mEeCKzLK7R0e1Ap6R4WmdQ+eWJFuCI2CX7EbGVuuqJzvnt3xvPjrwajUy3k/WKR3StV/uQQ4a7h1hSsh4KjmT65UaQC8rMz0E8nY1vpLc+HWOHMJirCmB9HFag9FT9gbD5N5UFGuDGtPR3t0eQ4ET++Eo4kDjvwuqa0sibaTeE8= X-MS-TrafficTypeDiagnostic: SN1PR12MB0752: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 31:4snptGbWfLCrXRBi6Vq+L0Xshhn8hFmfxFI1EZvmJO2CbrNxOtPhRZE2PUGm4pTkth7TdJW0PEoFPUDWVqz2b4TE/wL+DwDwrCf+EOFllD+3LpK8ge2hMbpPyxlczuTSO2UNJniSWmd5/5SaPmny/tXaYH17hlwGcWdx+qe2eVemvPns0Mguc+nmvRJg6tJVBDRfVr+28QM2ospU3LTioEln8+laglaZcDzAlgZVNGo=; 20:YuwWbQzQk1VCqM1dg3k6EWLksMXJsY4+3gZwEQke2NSXsh8TaLZibSj86xjpsCMxcuFnB6TONr+OlIeifgR1TxTFk9a8TZ5WIN6bdq9RcmBMWuE4MZtF3eLOMpEgGZenr4YpeEfMWHLzuQ/A7XkmCTjh/3PV6gsD543soUArM6TnauOnEMWiJyA0eQkqcbgJMmhclOGK+mpeG+uRYUan1Q2FVRAhXqa3xMtzt5OddmU+0/ArTC3PTq50kRZgUz+ksOa7iR+jDvMBJj9lVr7pm9lvuHDX0X1wfY9gOVZ0vWRfcCRvCKe9DoeQBjxij1bThoYvVst7X1OGu/vdtrm1ZJDSFftMihKU5Inr6KOWEWdhL4K1AwU2iaaJqL87uRgra2My90mt0RfxksIXDxCIgNISw+ex2mp8YXFz94DLP5VLhpywr2kOTeHcAze4A+mxcWTHZvXqf7UNRs+/lFpX+EMUq1XYyyBcTLyBRq9rOS9a7Gyb3j9NIVgHgW2b+0Kp X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231442)(944501410)(52105112)(93006095)(93003095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:SN1PR12MB0752; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0752; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 4:8zTBAKu0O1d9PdN12N8PCAfpH8sv3wLuLNVk0YqcwXhVoyJs4RymQP+Il54OzvbHj8K02bXkrY8PoeJ9nUfxPTZw7vlI8L7Xzoraed7dWWvKZc/Ievu0lnyv+nUatePLWlLqbL471Aeuo1tuuEry87CNrruoi/1wjRSiYyqIdSM4C38Vcl/9zAWaQkIEy9K6zbl1zb9zNc9gFdB5d+D6hK2VqKecp95ZZu4QZiJyhmCfQN3eoX4Sde1hsIVFg8zvmgsFAGlLkGOxD0iUJQWUVQ== X-Forefront-PRVS: 08626BE3A5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR12MB0752; 23:4K4Cww5I6LQYCiVRTINchtRkxubDIv4YjkXpQMNfk?= l8ZlWtV2OOKJ2JnbB6MEE2tqxNF+QQwzdiLfLgOvuVVAeuMghR7aK1jrACFnYMi7i5mmQmG83VFa1DQIYd5/1zV364Nv+ht0JoLskVog0pUdwns0oo+f+zLO4Islz/mksjwRPzTRcfUXBfSKQmSH1MhS/TV96bRcGPyeDJSyIwQLV0yhifLlh1vgBcUNStHBY7DUqNP9FwJZXH1s8uUgf/du2b6SSYSSI58CUwiJK1vBmfzAD7aACuJtkW6S3bUT+OeYmzuOE5N/ZyoHVeZl+X5XdnEcTod+wJaGfsaocSkS0o5R+TsuT46ujZzNaNZkILt0t81kXM3CYgC1ub/DS9nBURrnFdNO0uJRp76ePmY6JeOkf406TNzUwCebr2FhYHVZVoK4K6sLekZwbsm1bEFJTmFSjI3NfZeDC+8SakhcKxLhnOMOms3X3Pt05slD2TCEfIjnr8nKgg1gFd0IzuYTiQmImW079Kgdf6WxTxejGChUt2L7EIh8/8U1FinZ5KzlX5NH0FlYSU642jtq69KUUpHUKpS2NG6Ohjq2dVB20BfpnJo1Sw86ezgVgPzr4AenjmgU2vshzstib+ebkMNnzneX1Nvr/WB6cNuzxBPhLJ+eKJ29MXMjtqZxNoUnU9b4Uqf25aUM2BeqzLDzxbE4rcA9ugFGBVn5PjJqaj0IFLBh5Q2aud8xnONNDcFUwUloZHo4w0D1roNTUC8ltd+wzqD7P5n6uZdk7Y3zF404R/YcOymyZFOXeKyEPVaWo8JsWVAFnUfkSXXLfoxlY55EwakqT85350VAasbJS0pNdm8qKJtMDJze9Dvo9rF94jHzGwChw10bYGRmh9CFakvmznlAeHjEw6x5KOziKbX7afDIlXx/pAwa/iC4XH9Vxe80CqTdIlj7eBVjwfLEnIF13ZWJw+mDtFDQiqR8Ykf2Isl9fyNaAW6aQPVuTs0MKYd8pmyv7GV4KiJa7v8CnncESjV4uWNY6yCh+ycVj/RR5e2SY831yw7wmFa+7bb9X2D0yK/7ht7cmGQVE9mJgEFnOQIHhiK7/abezAQidVQ4pCB6qVMuSo6zU5GSGMyj5mCA9PPsC84nFKPGJ6O2rOj3bjTL/1WdY4xiBx+zoTNtJ8IMvMrc1gZpIIxoZP4YnZ6mRxiyWd9URvgeJ3pxO5MMmyjkzNxqHJslOYVdkwPkCnUVuKOu4UBxW+c982vPGDgenryjj/Q+beSsXD3ZjztF6tUMuRj5HjSFUg2/UUUHg== X-Microsoft-Antispam-Message-Info: QkZpByoAwZVakcYzd2rcIaR1Tbz5k9i38n6wwmPLpexWAl/2YS/fTat+hwExrn1sq6FwiH1hlKZgZDRpiQGA0NA8CL2KiY8MCnyNqq7ToB59mZnBJBwqK/lPb2V/NJJNoOYsD8R85SQYWkVzLod2fOGhvxCNvl0QYtKqOepIcZgtB5MU9Jb/qVs699B2ry5IfYRU7M68CyFsp0RHX0HMOMwDbwpc9z8C/LaJkDEGYAm7IBPxqwZw4EPPQsuIgbRrP3y2lo17eZnxk0yL950veybA7pUg/oPEbvDyXsC+GjLKMy3uspsaXGdzcd8vVQZN9Ty1El0q30AE8+WKK10zA14/Jj0Vm7HS10ZjKpDcwhU= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 6:blbDBUg3F3NviwvdNgfAKSIhhC3LgneSm7jnFqf5t1ghrepRRUTb0kwt7rHky0Wksrxie97FGtFtLjQ53MiT+jchDrHhcZ2EULp7TXGfbfoMpfbkngQ9XkPJTApfdAjlbTbqASWBvFd83oMJvHjI+zZ6TXjq74W01Bmjn4Redn512QUu8WBtF1qZYdGAzFZ0VvrhmMib0A+od+d1gl7yVuH+TUV4wGW9yhhrWtUOZviJ0jzUFH7fZvW1mD9wRw0WN5OlUVDpTorIBFsivA5gywj1mI5DpYV2WamZcnSeggXVFNYY6DnjD6S0rUKW4hyBbW5RXY2lDDTm3xDHpCyB00keImpsL4oO9lU3Kpr5qtZz16hh7w6ZKyvk87gMv28H3MIWkwxaJnwen1er+NaLe8LTUZH6uORy954bK2h1k/JBQDVJrocXDAZ7Vrvbi1Q9sD/EDjc/YtlOq9/MY/bWJA==; 5:5pn4FliYSHuVPbs/mzIv5WHyQeUPD2WA9s1JVNn5yHFiaRHQO9A84jzNKDr000u23FxN9wS5iLmviZIzH7BPkRWYP7u+teCOAKaDQE5oa7dgm73gz//aHexPVhD/exK1pqYDJKj3ETISI7fVwzOxV5TZy6Ty2BdRRnfHmaXn3Lc=; 7:h5aOZN6xRa61DppSjlcXnvwQMhicuaMuonSkYllU8eWEg7TccasW2pJCaXq3F4jWV0WcBj+MONKAaPAl+MR6/wh00vG1tuCbXxy5a6yAbbA0FesmFHu4bOm4yLPgjA9YBN91dR6ZjyZoddDnEoDhLA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0752; 20:9fc0KFmns+JPrM8fpH3pfaQux2rJmceRlKAUBee7kg5XyoTqzBbS/JWttyNF6hXlqAKbcQof91i1rT1bBG58Cy91W8WU9e0KZYxeRoZbFATYubCQvFnEY8VC/raQEVASd14YgB10ksm5pOqh02S/b2P4GeOGNV/EupaemuGVftTY4vpf6k8FSITd7h2FlQco9lG7/3gZEkbngg+8UZXge5MgKdy7O42A9JNZJkN7Ownsc/Tif3G6I7bg4q2Dmj8j X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2018 18:58:59.9581 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 601e444d-7080-4b95-094e-08d64f1a3b40 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0752 X-Mailman-Approved-At: Wed, 21 Nov 2018 01:09:32 +0000 Subject: [Intel-gfx] [PATCH RFC 4/5] drm/amdgpu: Add accounting of command submission via DRM cgroup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Account for the number of command submitted to amdgpu by type on a per cgroup basis, for the purpose of profiling/monitoring applications. x prefix in the control file name x.cmd_submitted.amd.stat signify experimental. Change-Id: Ibc22e5bda600f54fe820fe0af5400ca348691550 Signed-off-by: Kenny Ho --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c | 54 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h | 5 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 15 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- 5 files changed, 83 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 663043c8f0f5..b448160aed89 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -33,6 +33,7 @@ #include "amdgpu_trace.h" #include "amdgpu_gmc.h" #include "amdgpu_gem.h" +#include "amdgpu_drmcgrp.h" static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, struct drm_amdgpu_cs_chunk_fence *data, @@ -1275,6 +1276,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) union drm_amdgpu_cs *cs = data; struct amdgpu_cs_parser parser = {}; bool reserved_buffers = false; + struct amdgpu_ring *ring; int i, r; if (!adev->accel_working) @@ -1317,6 +1319,9 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) if (r) goto out; + ring = to_amdgpu_ring(parser.entity->rq->sched); + amdgpu_drmcgrp_count_cs(current, dev, ring->funcs->type); + r = amdgpu_cs_submit(&parser, cs); out: diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c index ed8aac17769c..853b77532428 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c @@ -1,11 +1,65 @@ // SPDX-License-Identifier: MIT // Copyright 2018 Advanced Micro Devices, Inc. #include +#include #include #include +#include "amdgpu_ring.h" #include "amdgpu_drmcgrp.h" +void amdgpu_drmcgrp_count_cs(struct task_struct *task, struct drm_device *dev, + enum amdgpu_ring_type r_type) +{ + struct drmcgrp *drmcgrp = get_drmcgrp(task); + struct drmcgrp_device_resource *ddr; + struct drmcgrp *p; + struct amd_drmcgrp_dev_resource *a_ddr; + + if (drmcgrp == NULL) + return; + + ddr = drmcgrp->dev_resources[dev->primary->index]; + + mutex_lock(&ddr->ddev->mutex); + for (p = drmcgrp; p != NULL; p = parent_drmcgrp(drmcgrp)) { + a_ddr = ddr_amdddr(p->dev_resources[dev->primary->index]); + + a_ddr->cs_count[r_type]++; + } + mutex_unlock(&ddr->ddev->mutex); +} + +int amd_drmcgrp_cmd_submit_accounting_read(struct seq_file *sf, void *v) +{ + struct drmcgrp *drmcgrp = css_drmcgrp(seq_css(sf)); + struct drmcgrp_device_resource *ddr = NULL; + struct amd_drmcgrp_dev_resource *a_ddr = NULL; + int i, j; + + seq_puts(sf, "---\n"); + for (i = 0; i < MAX_DRM_DEV; i++) { + ddr = drmcgrp->dev_resources[i]; + + if (ddr == NULL || ddr->ddev->vid != amd_drmcgrp_vendor_id) + continue; + + a_ddr = ddr_amdddr(ddr); + + seq_printf(sf, "card%d:\n", i); + for (j = 0; j < __MAX_AMDGPU_RING_TYPE; j++) + seq_printf(sf, " %s: %llu\n", amdgpu_ring_names[j], a_ddr->cs_count[j]); + } + + return 0; +} + + struct cftype files[] = { + { + .name = "x.cmd_submitted.amd.stat", + .seq_show = amd_drmcgrp_cmd_submit_accounting_read, + .flags = CFTYPE_NOT_ON_ROOT, + }, { } /* terminate */ }; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h index e2934b7a49f5..f894a9a1059f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h @@ -5,12 +5,17 @@ #define _AMDGPU_DRMCGRP_H #include +#include "amdgpu_ring.h" /* for AMD specific DRM resources */ struct amd_drmcgrp_dev_resource { struct drmcgrp_device_resource ddr; + u64 cs_count[__MAX_AMDGPU_RING_TYPE]; }; +void amdgpu_drmcgrp_count_cs(struct task_struct *task, struct drm_device *dev, + enum amdgpu_ring_type r_type); + static inline struct amd_drmcgrp_dev_resource *ddr_amdddr(struct drmcgrp_device_resource *ddr) { return ddr ? container_of(ddr, struct amd_drmcgrp_dev_resource, ddr) : NULL; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index b70e85ec147d..1606f84d2334 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -34,6 +34,21 @@ #include "amdgpu.h" #include "atom.h" +char const *amdgpu_ring_names[] = { + [AMDGPU_RING_TYPE_GFX] = "gfx", + [AMDGPU_RING_TYPE_COMPUTE] = "compute", + [AMDGPU_RING_TYPE_SDMA] = "sdma", + [AMDGPU_RING_TYPE_UVD] = "uvd", + [AMDGPU_RING_TYPE_VCE] = "vce", + [AMDGPU_RING_TYPE_KIQ] = "kiq", + [AMDGPU_RING_TYPE_UVD_ENC] = "uvd_enc", + [AMDGPU_RING_TYPE_VCN_DEC] = "vcn_dec", + [AMDGPU_RING_TYPE_VCN_ENC] = "vcn_enc", + [AMDGPU_RING_TYPE_VCN_JPEG] = "vcn_jpeg", + [__MAX_AMDGPU_RING_TYPE] = "_max" + +}; + /* * Rings * Most engines on the GPU are fed via ring buffers. Ring diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h index 4caa301ce454..e292b7e89c6a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h @@ -56,9 +56,12 @@ enum amdgpu_ring_type { AMDGPU_RING_TYPE_UVD_ENC, AMDGPU_RING_TYPE_VCN_DEC, AMDGPU_RING_TYPE_VCN_ENC, - AMDGPU_RING_TYPE_VCN_JPEG + AMDGPU_RING_TYPE_VCN_JPEG, + __MAX_AMDGPU_RING_TYPE }; +extern char const *amdgpu_ring_names[]; + struct amdgpu_device; struct amdgpu_ring; struct amdgpu_ib; From patchwork Tue Nov 20 18:58:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ho, Kenny" X-Patchwork-Id: 10691499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B5C1914BD for ; Wed, 21 Nov 2018 01:09:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0AB12AF74 for ; Wed, 21 Nov 2018 01:09:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 94A212AFB6; Wed, 21 Nov 2018 01:09:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DA5E2AF74 for ; Wed, 21 Nov 2018 01:09:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 506606E4E4; Wed, 21 Nov 2018 01:09:33 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from NAM05-BY2-obe.outbound.protection.outlook.com (mail-eopbgr710062.outbound.protection.outlook.com [40.107.71.62]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F2056E3D1; Tue, 20 Nov 2018 18:59:03 +0000 (UTC) Received: from CY4PR1201CA0014.namprd12.prod.outlook.com (2603:10b6:910:16::24) by CY1PR12MB0426.namprd12.prod.outlook.com (2a01:111:e400:5191::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1339.23; Tue, 20 Nov 2018 18:59:01 +0000 Received: from BY2NAM03FT025.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e4a::208) by CY4PR1201CA0014.outlook.office365.com (2603:10b6:910:16::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1361.14 via Frontend Transport; Tue, 20 Nov 2018 18:59:00 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV02.amd.com (165.204.84.17) by BY2NAM03FT025.mail.protection.outlook.com (10.152.84.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1339.10 via Frontend Transport; Tue, 20 Nov 2018 18:59:00 +0000 Received: from kho-5039A.amd.com (10.180.168.240) by SATLEXCHOV02.amd.com (10.181.40.72) with Microsoft SMTP Server id 14.3.389.1; Tue, 20 Nov 2018 12:58:58 -0600 From: Kenny Ho To: , , , , , Date: Tue, 20 Nov 2018 13:58:14 -0500 Message-ID: <20181120185814.13362-6-Kenny.Ho@amd.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181120185814.13362-1-Kenny.Ho@amd.com> References: <20181120185814.13362-1-Kenny.Ho@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(376002)(39860400002)(136003)(396003)(2980300002)(428003)(189003)(199004)(336012)(126002)(36756003)(217873002)(76176011)(110136005)(7696005)(316002)(53936002)(2870700001)(39060400002)(356004)(6666004)(106466001)(51416003)(486006)(14444005)(476003)(2616005)(105586002)(72206003)(11346002)(426003)(305945005)(81156014)(8676002)(81166006)(446003)(47776003)(8936002)(50226002)(97736004)(2201001)(5660300001)(50466002)(478600001)(86362001)(48376002)(68736007)(104016004)(1076002)(15650500001)(2906002)(186003)(77096007)(53416004)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0426; H:SATLEXCHOV02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BY2NAM03FT025; 1:jgCB4c+Kt54ZvCOiP91ABh+PJ1YH+Jgka0bExkd4fRMGWCoB3H7sE/M0DJKvU0igi51jkVSoyvkJSmWAVqt6c3gc90i2jcrXNvKx/WFmGLSqrg94RDLK+cx2hWkfniT6 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a3a4c3e-4e5b-4855-b596-08d64f1a3bad X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060); SRVR:CY1PR12MB0426; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 3:QGmtoRQCD9qeckZ6jYxmZZSLFVxEyDv6+YGa73SHqtFra4BDvvqU4TcpmejAnWw7jgYkECXO8ObwyBwbxnsLH/ZZdZ08f+2rgWjsfNK2MXfW5NI4WVNwWBxG2PjUvfE3uaRDIJL/aiYC6eups3HohONa6goOBRYVc4lmvPn8EiUqT/pT2uNeEIzoIztt81nhAzJVn0vIw1kBzK/rKykENOsuj5RCgykjeJOuAqVRRuHOD3eePlJ73JX5upxRzjZL8aFnNjnqZhYzyhY7zEteMACRAOsTe3gnGQkAoKYnE7aiRl3DTbdNg6o7xEH2JIrQAiqhKLz+eVTpGN4RMTX3hpD7xxYNRxiYWWnrnafN7fI=; 25:LyTGZ3jJ78nGxK9PpGRUcu+R0UlzTt0/aLcAM+kWkOnuzCvW2/d59w9mlNj/bgHiHb8cGnnXmB9NJSVG8NOxnmhTkTvoi76WF+3yiaAxpjjTwDyY1/Umlx4gNrCNpVyLZNnJcjL9ZK3AdXiJZGZbTWbhyOXTN70r9HbfXPhcxvfIPkAyb6VtZ/166avLMQCnYGuFEk0HpFsAyqlneODmvvRxEydHkeDAnzriI5W+Btwap7xFbHW3JCYXwn7b0xrRswUClbsazG5pLj7HprrbR+PA5LFAKBvC1wyDlQcArOP6rr+1ZXArS17dIDm1WfUmtOVzBFcKR3SugpVI1pSklJ31AB9HjGNiAmLx8wiO8OQ= X-MS-TrafficTypeDiagnostic: CY1PR12MB0426: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 31:a0LPZM0GVKE59Wr3X3zNHUR1ukIIQ/kofNY0ZMweIYhiXMYnBv00uINIuh1TVju6N6VoB9PaOm/oLJiWTvEDGolWI+5sfy6p/EUMFNvGkHKCH6c4FGmy6kpzEotaYydwyNASBsrLaKuu8w6NjR1cMgiVeV/KceWLK98FnZKuSFEdwGkSodX5gLTWs1gj+x2mOA6HjjnKV0aiYIun6SuTy8ZUXAhFeZ7i7eXqdrGwub8=; 20:Go56m0RaiQ6vsqTlRrgkJzPvZyg/ceGWClTi+qKY8l8B7VtQETd9Ti/wwuUq+cDA7jGEDX6Ylri0O14+zcIhh4jSfh4yX/H8sNzc5w11A5bSPY8Vg951Y1bvnV3kiZO9eg32SsHHHOjdVHT1DadhpyelCFhLBdedhecrhmLjXLLxXZU+wrQ10J+yExbPRl+hID34CUJ8rFvO4koyvuAQGpkTvUOofj+J8uLuz01hPZJA7hViWHvrdfqpTTXxD6rinpC4v/4pux4NubFmYwoccvPStJD7ls11EgQFlmd9ylMV9FPzVv95iFfhuxEpFm3gbwMHhw+KfFFIXLpk6g4OO11cJSH/xMOqPoxsn38mqUHOpSGVklegljd9YBFbbixw6ODqj+TTgtnnuK5mvmVK4jwHCf8kQnyaSGaNF4QbJGXTEFITUxgsyjvYtWpBICDoaWA/DbjzEuD4CaBq+L5+kjIev/4YK/AlG1FcUIlGEAwwm0nvShgHWd9TefxzxXMJ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231442)(944501410)(52105112)(10201501046)(3002001)(93006095)(93003095)(6055026)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:CY1PR12MB0426; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0426; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 4:ecksN9LcClDWyWFCAlIv4LvC2sw5U9kY595nAmBzYJMozYEFDLFWH0KP0va2W+r++qbkRms7j5T6NM7UtiBAeNSDThfx8Zau+QtXrUqi0/TUQce1o2IqMD3qKAQ94Ff3fpusM2I3QBWnnRO2TFkHeuT6n7OhNtF1seLFokE5wwNsqGdZwCS/994CxgKVmjbU2Z76jKE9b8HfVLYadQ2lqhR/s0b23/WQIpI900iDNgRhEQ6IojdMlzBVfTdHdIA1M1z0QXVIUzQ6la9DYx6QWA== X-Forefront-PRVS: 08626BE3A5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0426; 23:kgRvxoBfaZ8QFld9wL0YRVchcgyFAv3yPW/d5cmw0?= RdjDx1IgfbBg8zBzqZW/helmLz7aTPlaQZEX4wUKZe547/nBbE6HnYCblUhkLy3Ti5twbpyWmmpX7FAI7yip6hDrHLqW0JTnSc23N9ivYuoBd3aJxBQCAixzEiiosZdYxr3nqmHLhakubN5Rj2ZUVtAv4X5VzZ6wQPKcLKVFvnnqflJlTDbDKL0yU5BT1j0MgwAh4l6TLmVK0ohdyjZEBcis8/S+ImhU0PwEW77NDZPtclKnX+skcesthEVK/8RNp+4cl/GYTe5i0R8QWi9ifCdA8DLfq0Sv6Pp1tBwETEhwEQDcDySg4eyL6I446sv68IfNOqxNIohzhkF9gqOGSjGr4I/WlP5r41kiE6wPvMRQgg/TvI5K1Tg+TolnocPFrs8jFPIpGxG2IyGhBFfuf43hAGl7bW5lRtX4JU1INKWQJmOTbuAmQ/jUSrfA6iLx1DRRFFHxz6n/rUn/w81qZfUygzg0XfKTVx0Pe/FC+4uUWR35R+560+I2fUmdvVcHNIPrpy7Wr5YjeY1lysg3+YibhzWaxoFLiFdxDn+Gw2zwLayd8+CKjjXG79Pm7Dqng8oWRv239mOWMQ28qpBEk67D8HcalpIszDDdNV+IpEFTJnXTLVtryBz/hKTdJmxnIT1G9fwgviQVq2ole14M6lydbo/hnDLxy2RrbaY3XizUwHS/t4l4kZbpVnAz4cdBzPSvxQFA26w7ojRkQqTpQVSBWP2SIdat5WoKOqwsAnh6jyfZ0/07m4EV4fc2y5s2O5MjzZyHfz7uPd5nvrmhfGDlvS/M0wThlyTXRc8V8Jc2GXxjxfYuuT2Ww2Qv3wLGQ081Gy9QLajRUWGPOtGlLH5h9Cg9SpJfjlWp/VKZAC8aILnKtsbGTu8UOYb9lBB6UiPumOxprb9af8GQO6ALOTEzcZe3eA7JhRRijNqqJv9HZ3h2pqmIAslnj+w/7bFZd2Jux5FY3JQbjh+Ig8bh/2ed50s2nTx/bXCBhVGjF9AsOb2m340WMctzsXnAi7IWqEADFJ42SaMV+vRt+GPqozKeqvLekF0TcK+8o0/CPuoSWGB2V3p5+rio6aYKbTSed0CP6iOvBXhssSF9grMUZz8inrG7OOb5n56io6madyMQ/aDZGWn+lBRGb6B2J/ZJ7PLEHAQuciOy7DgG3+7thL63yN/tCC3N2oEEgWKu+z+WMy5Ey4cDCikGkNQlG5NJ6w= X-Microsoft-Antispam-Message-Info: oFb8fDulTwvi5LGaVXMA7BELy0S+j3PkLZg/pmqyZ6L5QBF/mm1wM8xQ/kzoiZDgEVoX25QcCctU+ya9uFVWXTKvjAWhHkwI/hrmTSQA2/rzWHMRWbT9XmZtwMWc/5QIjAmBZU9CYc4tf9VxRzHGNPF6+2G/Ooe6pToRRPXIFEKIvX3jg0geE0D+4mQxS6ksv56IDuT1pRha0KfehMVjHqX4+BV8Fi/Mk+qvr9EAQ9dK4tPcuTYgU3VkqW+KqkGbpEMDgdsJ0cC2eu/u5N2dE4Ohxd+VP8d2iOhoMPSCRPurIhjs91P7XPASkl0MTrJ39s3xYRscQgWtvKafxTsLFaUDnWmt66FYs3FB63d1nPA= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 6:o1MrNhV+cEo1QIqjdq2eZsHniNkyP29KJ7PAgOSNfDyGJIImQwJ+Gn/SEz7mn1tOvwpLBMXTF1jPFQTvlMWmQGrVp2cNKHKqptsHF+8U7An3SJzWk6schzH3jM9rVOIDYybdh4Ft+ft73qaanlUlFeVc/LKBeWrpeAE5qR8lPDQLui6DZC+cGjVxmhcXP/2rVaovzEZ/9m0SdwRpJSYttMZgI9mBtkFk3mH9zGe6rmxUbHlp6SYpkH2lKiLIuYYr5s9oDRgELK+Knen2BVV3cAJ0wnoS1dktDkzW8tXCJqBFp8Ppx3DCZkESHC9D/mxTButGr9I1bWergfrtNvpjFhnzJpvKtFlTpYTWpHrIbJDEC/KIrMq0DPCCSx35KNaR1oV8kAFB0EfFmYoL0IKsXH6ijZpt4+YTrXK6ygaahKK2KziABVJfNrh8GXK2mXG+euPOyB7705GgNoVuWX4PFw==; 5:9GMxOVD2h5zt1IS8HkhpaqEQiRfD4JCRC9k/oEekrx4GrXJaqkFhIYKY3bd1YD0GP6Sw/OeMNkTuflUcdxI1S9L1ZMeds1sNJp5Zs5pOkK4XVtOdsAvGTAJ11ESspw4RYuZToTGiwOg6GSHIttdoBpTwROoq3/b89cMAXtaGwu8=; 7:legcTCgrZ36QtDpD0NTOHAa5RCMLELhEstCpc0VTBdJ4AxaZVX8OP6dD4OW8TWzixJIYGsL+9AxW0mwnBs6d3nev+Suyf5RqkxVuydV93l+tc6bhygXhRcy2p78yTsD2yoVV+Qn9njjVhz5MUbvLEQ== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0426; 20:pM/Slpw7GdasOf7fZVMgO4R8YB81QpDMg+V0mT3sVVVNXXgtvIlzTfdL9BwQujQ/hCfEa0CSDpnzhbIHzdvK+xWeSWMiPIuaQXXhDo/DLSu0grI6PMcCFz2MsLfkvapyLXH1kfcb8Wk4uXeC4r8zXJ/BhMszkjr4Srs3WnqR+t/Az5psx/y34u1CC8+DLptoCmVGirPazGT7HsuZ8s7lwmhNsKzBrEeBt05Gaitt1WZVvvP//2rMF9EJmne94NlX X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2018 18:59:00.6612 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a3a4c3e-4e5b-4855-b596-08d64f1a3bad X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0426 X-Mailman-Approved-At: Wed, 21 Nov 2018 01:09:32 +0000 Subject: [Intel-gfx] [PATCH RFC 5/5] drm/amdgpu: Add accounting of buffer object creation request via DRM cgroup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Account for the total size of buffer object requested to amdgpu by buffer type on a per cgroup basis. x prefix in the control file name x.bo_requested.amd.stat signify experimental. Change-Id: Ifb680c4bcf3652879a7a659510e25680c2465cf6 Signed-off-by: Kenny Ho --- drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c | 56 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 13 +++++ include/uapi/drm/amdgpu_drm.h | 24 ++++++--- 4 files changed, 90 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c index 853b77532428..e3d98ed01b79 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.c @@ -7,6 +7,57 @@ #include "amdgpu_ring.h" #include "amdgpu_drmcgrp.h" +void amdgpu_drmcgrp_count_bo_req(struct task_struct *task, struct drm_device *dev, + u32 domain, unsigned long size) +{ + struct drmcgrp *drmcgrp = get_drmcgrp(task); + struct drmcgrp_device_resource *ddr; + struct drmcgrp *p; + struct amd_drmcgrp_dev_resource *a_ddr; + int i; + + if (drmcgrp == NULL) + return; + + ddr = drmcgrp->dev_resources[dev->primary->index]; + + mutex_lock(&ddr->ddev->mutex); + for (p = drmcgrp; p != NULL; p = parent_drmcgrp(drmcgrp)) { + a_ddr = ddr_amdddr(p->dev_resources[dev->primary->index]); + + for (i = 0; i < __MAX_AMDGPU_MEM_DOMAIN; i++) + if ( (1 << i) & domain) + a_ddr->bo_req_count[i] += size; + } + mutex_unlock(&ddr->ddev->mutex); +} + +int amd_drmcgrp_bo_req_stat_read(struct seq_file *sf, void *v) +{ + struct drmcgrp *drmcgrp = css_drmcgrp(seq_css(sf)); + struct drmcgrp_device_resource *ddr = NULL; + struct amd_drmcgrp_dev_resource *a_ddr = NULL; + int i, j; + + seq_puts(sf, "---\n"); + for (i = 0; i < MAX_DRM_DEV; i++) { + ddr = drmcgrp->dev_resources[i]; + + if (ddr == NULL || ddr->ddev->vid != amd_drmcgrp_vendor_id) + continue; + + a_ddr = ddr_amdddr(ddr); + + seq_printf(sf, "card%d:\n", i); + for (j = 0; j < __MAX_AMDGPU_MEM_DOMAIN; j++) + seq_printf(sf, " %s: %llu\n", amdgpu_mem_domain_names[j], a_ddr->bo_req_count[j]); + } + + return 0; +} + + + void amdgpu_drmcgrp_count_cs(struct task_struct *task, struct drm_device *dev, enum amdgpu_ring_type r_type) { @@ -55,6 +106,11 @@ int amd_drmcgrp_cmd_submit_accounting_read(struct seq_file *sf, void *v) struct cftype files[] = { + { + .name = "x.bo_requested.amd.stat", + .seq_show = amd_drmcgrp_bo_req_stat_read, + .flags = CFTYPE_NOT_ON_ROOT, + }, { .name = "x.cmd_submitted.amd.stat", .seq_show = amd_drmcgrp_cmd_submit_accounting_read, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h index f894a9a1059f..8b9d61e47dde 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drmcgrp.h @@ -11,10 +11,13 @@ struct amd_drmcgrp_dev_resource { struct drmcgrp_device_resource ddr; u64 cs_count[__MAX_AMDGPU_RING_TYPE]; + u64 bo_req_count[__MAX_AMDGPU_MEM_DOMAIN]; }; void amdgpu_drmcgrp_count_cs(struct task_struct *task, struct drm_device *dev, enum amdgpu_ring_type r_type); +void amdgpu_drmcgrp_count_bo_req(struct task_struct *task, struct drm_device *dev, + u32 domain, unsigned long size); static inline struct amd_drmcgrp_dev_resource *ddr_amdddr(struct drmcgrp_device_resource *ddr) { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 7b3d1ebda9df..339e1d3edad8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -31,6 +31,17 @@ #include #include "amdgpu.h" #include "amdgpu_display.h" +#include "amdgpu_drmcgrp.h" + +char const *amdgpu_mem_domain_names[] = { + [AMDGPU_MEM_DOMAIN_CPU] = "cpu", + [AMDGPU_MEM_DOMAIN_GTT] = "gtt", + [AMDGPU_MEM_DOMAIN_VRAM] = "vram", + [AMDGPU_MEM_DOMAIN_GDS] = "gds", + [AMDGPU_MEM_DOMAIN_GWS] = "gws", + [AMDGPU_MEM_DOMAIN_OA] = "oa", + [__MAX_AMDGPU_MEM_DOMAIN] = "_max" +}; void amdgpu_gem_object_free(struct drm_gem_object *gobj) { @@ -52,6 +63,8 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, struct amdgpu_bo_param bp; int r; + amdgpu_drmcgrp_count_bo_req(current, adev->ddev, initial_domain, size); + memset(&bp, 0, sizeof(bp)); *obj = NULL; /* At least align on page size */ diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index 370e9a5536ef..531726443104 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -72,6 +72,18 @@ extern "C" { #define DRM_IOCTL_AMDGPU_FENCE_TO_HANDLE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_FENCE_TO_HANDLE, union drm_amdgpu_fence_to_handle) #define DRM_IOCTL_AMDGPU_SCHED DRM_IOW(DRM_COMMAND_BASE + DRM_AMDGPU_SCHED, union drm_amdgpu_sched) +enum amdgpu_mem_domain { + AMDGPU_MEM_DOMAIN_CPU, + AMDGPU_MEM_DOMAIN_GTT, + AMDGPU_MEM_DOMAIN_VRAM, + AMDGPU_MEM_DOMAIN_GDS, + AMDGPU_MEM_DOMAIN_GWS, + AMDGPU_MEM_DOMAIN_OA, + __MAX_AMDGPU_MEM_DOMAIN +}; + +extern char const *amdgpu_mem_domain_names[]; + /** * DOC: memory domains * @@ -95,12 +107,12 @@ extern "C" { * %AMDGPU_GEM_DOMAIN_OA Ordered append, used by 3D or Compute engines * for appending data. */ -#define AMDGPU_GEM_DOMAIN_CPU 0x1 -#define AMDGPU_GEM_DOMAIN_GTT 0x2 -#define AMDGPU_GEM_DOMAIN_VRAM 0x4 -#define AMDGPU_GEM_DOMAIN_GDS 0x8 -#define AMDGPU_GEM_DOMAIN_GWS 0x10 -#define AMDGPU_GEM_DOMAIN_OA 0x20 +#define AMDGPU_GEM_DOMAIN_CPU (1 << AMDGPU_MEM_DOMAIN_CPU) +#define AMDGPU_GEM_DOMAIN_GTT (1 << AMDGPU_MEM_DOMAIN_GTT) +#define AMDGPU_GEM_DOMAIN_VRAM (1 << AMDGPU_MEM_DOMAIN_VRAM) +#define AMDGPU_GEM_DOMAIN_GDS (1 << AMDGPU_MEM_DOMAIN_GDS) +#define AMDGPU_GEM_DOMAIN_GWS (1 << AMDGPU_MEM_DOMAIN_GWS) +#define AMDGPU_GEM_DOMAIN_OA (1 << AMDGPU_MEM_DOMAIN_OA) #define AMDGPU_GEM_DOMAIN_MASK (AMDGPU_GEM_DOMAIN_CPU | \ AMDGPU_GEM_DOMAIN_GTT | \ AMDGPU_GEM_DOMAIN_VRAM | \