From patchwork Mon Jan 22 15:44:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 10178767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DCF2C60390 for ; Mon, 22 Jan 2018 15:44:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8E5828396 for ; Mon, 22 Jan 2018 15:44:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD8B4283C6; Mon, 22 Jan 2018 15:44:48 +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=-4.2 required=2.0 tests=BAYES_00, 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 F26A3283BB for ; Mon, 22 Jan 2018 15:44:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A6DA89DC2; Mon, 22 Jan 2018 15:44:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 094F489D8D; Mon, 22 Jan 2018 15:44:42 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2018 07:44:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,397,1511856000"; d="scan'208";a="12250343" Received: from mdroper-desk.fm.intel.com ([10.1.134.220]) by fmsmga008.fm.intel.com with ESMTP; 22 Jan 2018 07:44:42 -0800 From: Matt Roper To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH libdrm] tests: Add drm_set_cgrp_param Date: Mon, 22 Jan 2018 07:44:35 -0800 Message-Id: <20180122154435.18146-1-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180120015141.10118-1-matthew.d.roper@intel.com> References: <20180120015141.10118-1-matthew.d.roper@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_set_cgrp_param is a simple tool to set DRM parameters associated with a cgroup. It is intended to be called at system initialization time (e.g., from a sysv-init script or systemd service) to configure graphics policy and resource management according to the wishes of the system integrator. Signed-off-by: Matt Roper --- configure.ac | 1 + tests/Makefile.am | 2 +- tests/drm_set_cgrp_param/Makefile.am | 18 ++++++ tests/drm_set_cgrp_param/drm_set_cgrp_param.c | 80 +++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 tests/drm_set_cgrp_param/Makefile.am create mode 100644 tests/drm_set_cgrp_param/drm_set_cgrp_param.c diff --git a/configure.ac b/configure.ac index 35378b3384..9b5f340e2a 100644 --- a/configure.ac +++ b/configure.ac @@ -567,6 +567,7 @@ AC_CONFIG_FILES([ tests/nouveau/Makefile tests/etnaviv/Makefile tests/util/Makefile + tests/drm_set_cgrp_param/Makefile man/Makefile libdrm.pc]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index 0355a9255f..d77a8639c8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = util kms modeprint proptest modetest vbltest +SUBDIRS = util kms modeprint proptest modetest vbltest drm_set_cgrp_param if HAVE_LIBKMS SUBDIRS += kmstest diff --git a/tests/drm_set_cgrp_param/Makefile.am b/tests/drm_set_cgrp_param/Makefile.am new file mode 100644 index 0000000000..c32ec1c440 --- /dev/null +++ b/tests/drm_set_cgrp_param/Makefile.am @@ -0,0 +1,18 @@ +AM_CFLAGS = \ + $(WARN_CFLAGS)\ + -I$(top_srcdir)/include/drm \ + -I$(top_srcdir)/tests \ + -I$(top_srcdir) + +if HAVE_INSTALL_TESTS +bin_PROGRAMS = \ + drm_set_cgrp_param +else +noinst_PROGRAMS = \ + drm_set_cgrp_param +endif + +drm_set_cgrp_param_SOURCES = \ + drm_set_cgrp_param.c +drm_set_cgrp_param_LDADD = \ + $(top_builddir)/libdrm.la diff --git a/tests/drm_set_cgrp_param/drm_set_cgrp_param.c b/tests/drm_set_cgrp_param/drm_set_cgrp_param.c new file mode 100644 index 0000000000..987bd18e88 --- /dev/null +++ b/tests/drm_set_cgrp_param/drm_set_cgrp_param.c @@ -0,0 +1,80 @@ +/* + * \file drm_set_cgrp_prop.c + * Simple tool to set a DRM property for a cgroup. Intended for use in + * system-specific initialization handling (e.g., sysv init, systemd, etc.). + */ + +/* + * Copyright © 2018 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include +#include +#include +#include + +#include "xf86drm.h" +#include "xf86drmMode.h" + +#include "util/common.h" + +int main(int argc, char **argv) +{ + int drm_fd, cgrp_fd; + struct drm_cgroup_setparam req; + int ret; + + if (argc != 5) { + puts("Usage:"); + printf(" %s \n\n", argv[0]); + puts("Example:"); + printf(" %s /dev/dri/card0 /sys/fs/cgroup-2/highprio 1 10\n", + argv[0]); + return 1; + } + + drm_fd = open(argv[1], O_RDWR, 0); + if (drm_fd < 0) { + perror("Invalid DRM device"); + return 1; + } + + cgrp_fd = open(argv[2], O_RDONLY|O_DIRECTORY, 0); + if (cgrp_fd < 0) { + perror("Invalid cgroup directory"); + return 1; + } + + req.cgroup_fd = cgrp_fd; + req.reserved = 0; + req.param = (uint64_t)strtoul(argv[3], NULL, 0); + req.value = (int64_t)strtol(argv[4], NULL, 0); + + ret = drmIoctl(drm_fd, DRM_IOCTL_CGROUP_SETPARAM, &req); + if (ret) + perror("Failed to set cgroup parameter"); + + close(cgrp_fd); + close(drm_fd); + + return ret; +}