From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE674C432BE for ; Sat, 31 Jul 2021 21:42:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5CC060F46 for ; Sat, 31 Jul 2021 21:42:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231903AbhGaVnA (ORCPT ); Sat, 31 Jul 2021 17:43:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231679AbhGaVm7 (ORCPT ); Sat, 31 Jul 2021 17:42:59 -0400 Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31A93C061796 for ; Sat, 31 Jul 2021 14:42:52 -0700 (PDT) Received: by mail-il1-x12a.google.com with SMTP id r5so12991140ilc.13 for ; Sat, 31 Jul 2021 14:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6viyI1lb5x1+xx5Qj63RWr1BY09/zfid8qOfXD+1kAU=; b=ZurrzBVjqIJ0KIJFYo7Rh5RtFtEyvrQ8/M+1bqOqTvF7ePYZHi1JnfT4s3Z4hHVqQx dKH0Uc0BCha5Fq88ofKm2kIFRZC6keu7HzpcCaH2IWPS/ejSWvAR/53keFwhaSOTrJ2G SwCwPp4IIka9x5SlTg3SyHollTD/qppNu0cBZZ9mOIDmPKE5fUegv337ZaCY61arEHak uBA8xva673w7iW4R8Eq98A6QDqFkC7gMNouatlPYK6j05GndIqtcxOEHyb71n1ijoP5N 60eKtiW7BySlxiALK3U16WY07KvpGOI2f6/MsvqHwss79z1vbvruWU9kuRzNu2o03kOS gQhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6viyI1lb5x1+xx5Qj63RWr1BY09/zfid8qOfXD+1kAU=; b=qlvYQJS6fCJnq+oi9ZyDg1GUA7wCp0y8ZX0RFl8VrjMMlQxf4YEDBe1/7SBAT5LBf0 0qufGZNAR0RsHT++13A5GkwNzZt0sbNi3u1BUC344A4mgfTh137gwmx6bWwNpj5ubN8g DTOLsF1VXwXPyIkVb7TGkNvwfKy0uLBtc0L1jft4VNDBwe3iySbMi1DhnIfiL/t+WtOa Neou6U5iB6mPe6zNoSW+eFv21pIcifIS2NwFIWYWEJnNF8BpLs7EZarkHz+jidazKSY4 EPEr6m9HKnDy3KbHTdo2IQ9NJIaRdVQItYzvV22C2qQ6V2G9s7LdB20B95loExr1i1aw sDeQ== X-Gm-Message-State: AOAM530aFPw9GJ51PZCtKyxowWTCxJVG9dR+r2GoT2r+aup4euJKNH4g sw30i7VAv0szWzQ7Jm0Wcsg= X-Google-Smtp-Source: ABdhPJzOfp+MdZuDQLTjYPCAaNpyh2MChjD+OMYZKUx9oS5oEezg5v1vuzPLHhZiyVxCn0639TBOWw== X-Received: by 2002:a92:dc06:: with SMTP id t6mr6555546iln.231.1627767771591; Sat, 31 Jul 2021 14:42:51 -0700 (PDT) Received: from frodo.. (c-24-9-77-57.hsd1.co.comcast.net. [24.9.77.57]) by smtp.googlemail.com with ESMTPSA id q10sm3721040ion.3.2021.07.31.14.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Jul 2021 14:42:51 -0700 (PDT) From: Jim Cromie To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Harry Wentland , Leo Li , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , Zhenyu Wang , Zhi Wang , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Jason Baron , Ashley Thomas , Qingqing Zhuo , Aurabindo Pillai , Wyatt Wood , Jim Cromie , Jessica Yu , Johan Hovold , Miguel Ojeda , Nick Desaulniers , Joe Perches , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v4 5/7] i915/gvt: control pr_debug("gvt:")s with bits in parameters/debug_gvt Date: Sat, 31 Jul 2021 15:42:02 -0600 Message-Id: <20210731214211.657280-6-jim.cromie@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210731214211.657280-1-jim.cromie@gmail.com> References: <20210731214211.657280-1-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The gvt component of this driver has ~120 pr_debugs, in 9 "classes". Following the interface model of drm.debug, add a parameter to map bits to these classes. If CONFIG_DRM_USE_DYNAMIC_DEBUG=y (and CONFIG_DYNAMIC_DEBUG_CORE), add -DDYNAMIC_DEBUG_MODULE into Makefile. TBD: maybe add a separate CONFIG_I915_USE_DYNAMIC_DEBUG to more fully optionalize this. this is close to our target: DYNDBG_BITMAP_DESC(__gvt_debug, "dyndbg bitmap desc", { "gvt: cmd: ", "command processing" }, { "gvt: core: ", "core help" }, { "gvt: dpy: ", "display help" }, { "gvt: el: ", "help" }, { "gvt: irq: ", "help" }, { "gvt: mm: ", "help" }, { "gvt: mmio: ", "help" }, { "gvt: render: ", "help" }, { "gvt: sched: " "help" }); actual patch has a few details different, helper macros mainly. Signed-off-by: Jim Cromie --- drivers/gpu/drm/i915/gvt/Makefile | 4 ++++ drivers/gpu/drm/i915/i915_params.c | 34 ++++++++++++++++++++++++++++++ include/drm/drm_print.h | 3 ++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gvt/Makefile b/drivers/gpu/drm/i915/gvt/Makefile index ea8324abc784..846ba73b8de6 100644 --- a/drivers/gpu/drm/i915/gvt/Makefile +++ b/drivers/gpu/drm/i915/gvt/Makefile @@ -7,3 +7,7 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ ccflags-y += -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/ i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE)) + +#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG +ccflags-y += -DDYNAMIC_DEBUG_MODULE +#endif diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index e07f4cfea63a..c951ef76454f 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -265,3 +265,37 @@ void i915_params_free(struct i915_params *params) I915_PARAMS_FOR_EACH(FREE); #undef FREE } + +/* POC for callback -> dynamic_debug_exec_queries */ +unsigned long __gvt_debug; +EXPORT_SYMBOL(__gvt_debug); + +#define _help(key) "\t\"" key "\"\t: help for " key "\n" +#define cmd_help(key) { .prefix = key, .help = key ": help for " key } + +#define I915_DYNDBG_PARM_DESC(name) \ + "Enable debug output via /sys/module/i915/parameters/" #name \ + ", where each bit enables a debug category.\n" \ + _help("gvt:cmd:") \ + _help("gvt:core:") \ + _help("gvt:dpy:") \ + _help("gvt:el:") \ + _help("gvt:irq:") \ + _help("gvt:mm:") \ + _help("gvt:mmio:") \ + _help("gvt:render:") \ + _help("gvt:sched:") + +MODULE_PARM_DESC(debug_gvt, I915_DYNDBG_PARM_DESC(debug_gvt)); + +DEFINE_DYNDBG_BITMAP(debug_gvt, &__gvt_debug, + I915_DYNDBG_PARM_DESC(debug_gvt), + cmd_help("gvt:cmd:"), + cmd_help("gvt:core:"), + cmd_help("gvt:dpy:"), + cmd_help("gvt:el:"), + cmd_help("gvt:irq:"), + cmd_help("gvt:mm:"), + cmd_help("gvt:mmio:"), + cmd_help("gvt:render:"), + cmd_help("gvt:sched:")); diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 15a089a87c22..47803c64b144 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -530,7 +530,8 @@ void __drm_err(const char *format, ...); const struct drm_device *drm_ = (drm); \ \ if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_)) \ - drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__); \ + drm_dev_dbg((drm_) ? (drm_)->dev : NULL, \ + DRM_DBG_CLASS_ ## category, fmt, ##__VA_ARGS__); \ }) #define drm_dbg_kms_ratelimited(drm, fmt, ...) \ -- 2.31.1