From nobody Fri Apr 11 03:36:38 2025 Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 376201DC198 for ; Wed, 2 Apr 2025 17:42:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743615765; cv=none; b=nCBbwI7afi65GXcH7fKd9+ELWc3Z06b23+1K8s4JLOuBqeBzEJSQKOviIBMA5S7C39co/oz5qm62Y2RnfhzO1yqzyvz0z9q+CKibquMq2mZKXc79e32jWp469Vp6rkzSUIzwp9a8yFAgy3CRnmMI/1mUb4MCWGGpPq34oxOM7lQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743615765; c=relaxed/simple; bh=QWPwid7hpL/peutynHlmEFY2BNpuX5WSWbRsMqjsljM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NGlL5RrX6xgy19c01jf67LeRq8hV6AwH2YKrvliUgf2azmKLFtyCg6h7PHnLxTjIgBlSxJAxLEqL/nygNZaXU4J/Ms73LvR84F7grxA6ak+cC9qfjodPGzY4RTh5fbhIYX1QW1qjhsD3hsCiHpFMol/BF3xmT9J+ms4YlmdvtjM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=klByVPA1; arc=none smtp.client-ip=209.85.166.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="klByVPA1" Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3cfce97a3d9so563985ab.2 for ; Wed, 02 Apr 2025 10:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615762; x=1744220562; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3hWaDK0EyUbVT4OX3HvU/+LKgntx8pUOZGP1ac6BsDE=; b=klByVPA1X0+Eacw3IIU5g3bGfSYXjTTz6sSyNHFNZ7SHNwexdw4IMi7ZaWMiwZOgAI 22fnoOIC0koOJBRvBkb6NTkFm2J6DBspepI+QkwcS/EuDs6xUWIxMqeaNNUeHsYWuBRK lrPpl+KN5QOsQV/DsuL/QYYR9e6wOZI8cRzbb8rKAEwEximmMh+isF9Op5mKqBRIgtgC N9o95s9Tqm89s4CHorLNBByWfGjzNAMr575wby9q27TNpPhy2yeNSJH4u/iUvf2xr+vG 9ayg7Sw8J4zS8amKigqPx6OqxbXfESfMcFL0NTxqLjJUJl9lnrAEi808gEWfreEN0dOJ os2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615762; x=1744220562; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3hWaDK0EyUbVT4OX3HvU/+LKgntx8pUOZGP1ac6BsDE=; b=DQC3wtqJ1z97dtjbao7v0qeA3Qpucq0/9uLuvAYRwtY4/JyaZpQreqF2sDjhLuHTgH atnDX85Zf6Z9phBWXpu3vIbOJqTH6rzg9KKvhPavjY+36+pL7jjo0QGXSQea/7HJyHwx 1nOOUOE3G66amdrhJWBBVwci3hTELrG7iKBnJvTNHn4ApCPkpXN4dftLE+5N+4Nbush5 Ntc2fgfhVAGLpJl/zOkr1ODEBtHkdavll0ahfH3ZxNh0EXhqKuMGCPlE98aRrKKc98F+ kLPUz1tbvB9rWYncKpevAI9gmlcWy1jcl1zc2sGMJ1P2SrIUBGMq6RM2Jrf4G2pHTR+T 9X9w== X-Forwarded-Encrypted: i=1; AJvYcCWSQ7yHxHuMIxPw1alLsTWdWRutqYlap0dvklUcqS3/PNTxGYLRMrwqDIqdnCJjSHn5UIW9uI7QBSF2lUc=@vger.kernel.org X-Gm-Message-State: AOJu0YyU/UR4MAa36OSIZ9e6xbbTtxxqP/eyunGKJ7ceeg0uWcBVlfvr OHFi5K85MYz6/Tc8P2FytxIl38iHV6f/NTNlM524WZ/V9+2VlH69 X-Gm-Gg: ASbGncux0PgMOH/VijBsH2r4W0PlqRVmK3zxrmc26DGUz/vrptIUxQd6DGgIDAJTLki jIOlmrocmkweFYO20NPJOfC1HYRQaa5UY5Ej+vh5Yyux2pyUekKBAgmXeNPUsKIPTNQi1ET8tov +PrMsJVQy+Sr3eAFR6pgY/6A31YklfjsHDUFvrAex8MTllUIiIUWBPLp3nYe/3AmO++IBnzUP9/ caq2NzRphfvlBekwao2evrxZg/P9jNNPq9O88uk+2Rne4ugb+fBCq2iK3ZrWsSkLDBgmzd7pZve CRjea3Wqv/YeMDCNZU9Wt9ayPTkSRf22Nk/35cwFj0naCl+FW7lsmBrK95MRJXbLxbGGx26hh9V 4qg== X-Google-Smtp-Source: AGHT+IE26Lvgy1sz8+/s+cZ/TgAmF79C63fY2ih6ts7b4QxKP/HjJZzZedKoG0eLTxzU2s+MwTib5Q== X-Received: by 2002:a05:6e02:746:b0:3d3:f27a:9101 with SMTP id e9e14a558f8ab-3d5e08e9ec2mr217926285ab.1.1743615762203; Wed, 02 Apr 2025 10:42:42 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:41 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, Jim Cromie Subject: [PATCH v3 28/54] dyndbg: restore classmap protection when theres a controlling_param Date: Wed, 2 Apr 2025 11:41:30 -0600 Message-ID: <20250402174156.1246171-29-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" DRM has always had /sys/module/drm/parameters/debug (ie drm.debug). Without dyndbg, this is their only control point. One could presume they like it - in any case its a system/user interface, ie ABI. With dyndbg enabled, drm calls DYNAMIC_DEBUG_CLASSMAP_PARAM() to create the drm.debug kparam, wired to our param-handler, which writes a "class FOO" query for each bit in the classmap. Since no new interface was ever contemplated, this is using >control. Since drm.debug is ABI, we should not allow class-less queries to alter our implementation of its settings. This patch provides that protection, *only* when theres a PARAM. This is the user, expressing their wish for easy control of their entire classmap. They also wish to trust its settings. Classes without a PARAM are unprotected, allowing admins their shortcuts. No such use-cases exist yet. Anyway, this patch does: 1. adds struct _ddebug_class_map.controlling_param 2. set it in ddebug_match_apply_kparam(), during modprobe/init, when options like drm.debug are handled. 3. ddebug_class_has_param() checks .controlling_param 4. ddebug_class_wants_protection() macro renames 3. 5. ddebug_change() calls 4 when needed. IE when applying a class-less query to a class'd pr_debug / drm_dbg_ Historical Summary: -v0 - before classmaps. no special case keywords -v1 - "class DEFAULT" is assumed if not mentioned. this protects classes from class-less queries -v2.pre-this-patch - protection macro'd to false -v2.with-this-patch - sysfs knob decides -v2.speculative - module decides wrt classmap protection seems unneeded now, TBD NOTE: protection is only against class-less queries, explicit "class FOO" adjustments are allowed (that is the mechanism). Signed-off-by: Jim Cromie --- v3 - new patch --- include/linux/dynamic_debug.h | 3 +- lib/dynamic_debug.c | 55 ++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 2d87cca27544..d34a44ff961a 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -89,8 +89,9 @@ enum ddebug_class_map_type { * usually by stringifying the enum-vals. Modules with multiple * classmaps must arrange to share the 0..62 class_id space. */ - +struct _ddebug_class_param; struct _ddebug_class_map { + struct _ddebug_class_param *controlling_param; const struct module *mod; /* NULL for builtins */ const char *mod_name; const char **class_names; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 54f462cf41b0..3eb4a8abeb33 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -198,16 +198,26 @@ ddebug_find_valid_class(struct _ddebug_info const *di= , const char *query_class, } =20 /* - * classmaps-v1 protected classes from changes by legacy commands - * (those selecting _DPRINTK_CLASS_DFLT by omission), v2 undoes that - * special treatment. State so explicitly. Later we could give - * modules the choice to protect their classes or to keep v2 behavior. + * classmaps-V1 protected classes from changes by legacy commands + * (those selecting _DPRINTK_CLASS_DFLT by omission). This had the + * downside that saying "class FOO" for every change can get tedious. + * + * V2 is smarter, it protects class-maps if the defining module also + * calls DYNAMIC_DEBUG_CLASSMAP_PARAM to create a sysfs parameter. + * Since they want the knob, we should assume they intend to use it + * (in preference to "class FOO +p" >control), and want to trust its + * settings. + * This gives protection when its useful, and not when its just tedious. */ -static inline bool ddebug_client_module_protects_classes(const struct ddeb= ug_table *dt) +static inline bool ddebug_class_has_param(const struct _ddebug_class_map *= map) { - return false; + return !!(map->controlling_param); } =20 +/* re-framed as a policy choice */ +#define ddebug_class_wants_protection(map) \ + ddebug_class_has_param(map) + /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -250,7 +260,7 @@ static int ddebug_change(const struct ddebug_query *que= ry, struct flag_settings /* site.class !=3D given class */ continue; /* legacy query, class'd site */ - else if (ddebug_client_module_protects_classes(dt)) + else if (ddebug_class_wants_protection(map)) continue; /* allow change on class'd pr_debug */ } @@ -650,6 +660,7 @@ static int ddebug_exec_queries(char *query, const char = *modname) } =20 /* apply a new class-param setting */ + static int ddebug_apply_class_bitmap(const struct _ddebug_class_param *dcp, const unsigned long *new_bits, const unsigned long old_bits, @@ -1228,25 +1239,36 @@ static void ddebug_sync_classbits(const struct kern= el_param *kp, const char *mod } } =20 -static void ddebug_match_apply_kparam(const struct kernel_param *kp, - const struct _ddebug_class_map *map, - const char *mod_name) +static struct _ddebug_class_param * +ddebug_get_classmap_kparam(const struct kernel_param *kp, + const struct _ddebug_class_map *map) { struct _ddebug_class_param *dcp; =20 if (kp->ops !=3D ¶m_ops_dyndbg_classes) - return; + return false; =20 dcp =3D (struct _ddebug_class_param *)kp->arg; =20 - if (map =3D=3D dcp->map) { + return (map =3D=3D dcp->map) + ? dcp : (struct _ddebug_class_param *)NULL; +} + +static void ddebug_match_apply_kparam(const struct kernel_param *kp, + struct _ddebug_class_map *map, + const char *mod_name) +{ + struct _ddebug_class_param *dcp =3D ddebug_get_classmap_kparam(kp, map); + + if (dcp) { + map->controlling_param =3D dcp; v2pr_info(" kp:%s.%s =3D0x%lx", mod_name, kp->name, *dcp->bits); vpr_cm_info(map, " %s mapped to: ", mod_name); ddebug_sync_classbits(kp, mod_name); } } =20 -static void ddebug_apply_params(const struct _ddebug_class_map *cm, const = char *mod_name) +static void ddebug_apply_params(struct _ddebug_class_map *cm, const char *= mod_name) { const struct kernel_param *kp; #if IS_ENABLED(CONFIG_MODULES) @@ -1266,6 +1288,13 @@ static void ddebug_apply_params(const struct _ddebug= _class_map *cm, const char * } } =20 +/* + * called from add_module, ie early. it can find controlling kparams, + * which can/does? enable protection of this classmap from class-less + * queries, on the grounds that the user created the kparam, means to + * use it, and expects it to reflect reality. We should oblige him, + * and protect those classmaps from classless "-p" changes. + */ static void ddebug_apply_class_maps(const struct _ddebug_info *di) { struct _ddebug_class_map *cm; --=20 2.49.0