From nobody Tue Feb 10 03:44:59 2026 Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) (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 E84E3207E1F for ; Sat, 25 Jan 2025 06:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787606; cv=none; b=GrZDrBWwBW26/m/d/JfKqeMnL0Un6vGk8NN7Q9nzwBZSk5OVT34o3fcZN6OWtFFLyTtcE+r4fdAPjL//INFOmC9Su1pbFEKwIqAVx1OZlEEL2WE3PmwzSHfqqCqlrTWxGasySUD2FSVNc0PYMzCQTtpdhvHp3oQ9PmitkoFHP+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787606; c=relaxed/simple; bh=EIYhbxTUMhRw3ToPItoiDCqkJRHa7xfxgNYYKsW5p8I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e6x/rlMWB3r6p0DWP1EIgI6+iWpu7odKuO+qJ+mHpGEV8xidLiJiK409MxEzwqT9/AVeXp9vTDOWN+EFX5d2rX8CrDftTP67uwQki/Q0dQPQgUtkb6D6QnllxJAiJeWm8aN1YaIKeBwCTjw1bqMdR1aTmc+dmiWMKm6y5nuy2H4= 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=XJP5m2M+; arc=none smtp.client-ip=209.85.166.169 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="XJP5m2M+" Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3a8146a8ddaso7563575ab.1 for ; Fri, 24 Jan 2025 22:46:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787603; x=1738392403; 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=sV/JSNgUN2kOhspoJIscYn3MOHKykltv8W9GFMXLDKA=; b=XJP5m2M+OGJIaQiaq8QcY3yj/9HUNFKVq26876RFwnFPAv1fDZdxzz/d8vH09ax9QR mYy4rjK552OK4Qc66f4cFWDUwK9ESb9ie0JrfbkogR6u9KAQ8Hcr6pi0xCMr0bV+q0JC dnKd6iTvdEd5955bzPhJSapCKL65zJPy2ksK744fvUQBnqU75ymSQtK9xEoSvWgi6I5q PYGzIVfNcOLecyJ/+GNOeSJYxAC+FvL7G61CGYGP1E6yFy0tTWs/+wEztySSwqUfIlZI PWvejNs3/s0VsrnGm8yA47tKVkbPDq+XKAkFsRbVkNPjp7BRG8VNU6rt0One/Z+qv3CH lJTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787603; x=1738392403; 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=sV/JSNgUN2kOhspoJIscYn3MOHKykltv8W9GFMXLDKA=; b=oX6u2exZeWRjNhsdWsfkzy7doN/eQ6fXw24iw4baJgnKgVkbZVklJziVIAMsNwcnG5 EW5ZGr9BFGEuFreLSsi3bDzsOIm+EcZZQCrh2GXiW9aSm/vHkf+boQuRieK44rkhp7J1 c12hLWkxqTajLs9cOCSE1MoUp327/OwDdPWQct0omUaIfgcZ8JfiTx7rYUtV7VJqnbWg gm4VN+IACqGUBx5JePvCUvhaKjiYRBxKoQ/WY5PlYaoaPqVA6NTQAgkhImjPFWl6YLag gazggEROMnX5AbEo5/psxNcWJVGrmLfbb95T8TK9SjEhXZ3RW/SR1zI+Q0Fi4xA6jcC+ KiAg== X-Gm-Message-State: AOJu0YxpYLt7OvR8s5rt66/92iQ2307E6ZufnEybU8NCbCKdW0ZITpSq NjWwA77JVHPf+uAj9SfZJbtRjgQGJZbB6gWYD0jFGGW7XRH4UO1cWjamgw== X-Gm-Gg: ASbGncuhuMoFgrEP86xrahHsJ5HAxRHqbFmCx3rWghXE814Cktxc9nle1hL8pFBraG7 SOQ2VwcpM0WRMl1651i8nw8VoCy7jd+8zi+J1DV5Ny6W4wr+Npm2eUhstfAzS88Vm6tAD5Byb7Z T/yDX6YDvNAGpoRkQd014JWDnb8URsB0ZfocFYWaTBY3NajsCQvhWYV9DRMfyIWXL0GOYDguYIA VJALDXaSqje8clGUSiuuVc5cdbVDYfxeDy7mVJUPLtj0Oe1FmFE7Rfr8J8pxaASTe4pfbURzOUL RWjEyMGeytpwNG0DsRS+7BxrkjwIsBULYf+M1A== X-Google-Smtp-Source: AGHT+IH54SsfpEYFO4ra8A4an4dLcvoG9wSBjoRiIYetoUV1RolCgaxWz0ul0FtpQ0GQuZ5n6MM7Gg== X-Received: by 2002:a05:6602:2d83:b0:847:22a7:2412 with SMTP id ca18e2360f4ac-851b623bb6cmr3299746039f.8.1737787601748; Fri, 24 Jan 2025 22:46:41 -0800 (PST) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id 8926c6da1cb9f-4ec1da476fesm1174144173.58.2025.01.24.22.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:46:41 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org Cc: intel-gfx-trybot@lists.freedesktop.org, 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 05/63] dyndbg: replace classmap list with a vector Date: Fri, 24 Jan 2025 23:45:19 -0700 Message-ID: <20250125064619.8305-6-jim.cromie@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250125064619.8305-1-jim.cromie@gmail.com> References: <20250125064619.8305-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" Classmaps are stored in an elf section/array, but are individually list-linked onto dyndbg's per-module ddebug_table for operation. This is unnecessary; even when ddebug_attach_classmap() is handling the builtin section (with classmaps for multiple builtin modules), its contents are ordered, so a module's possibly multiple classmaps will be consecutive in the section, and could be treated as a vector/block, since both start-address and subrange length are in the ddebug_info arg. IOW, this treats classmaps similarly to _ddebugs, which are already kept as vector-refs (address+len). So this changes: struct ddebug_class_map drops list-head link. struct ddebug_table drops the list-head maps, and gets: classes & num_classes for the start-address and num_classes, placed to improve struct packing. The loading: in ddebug_attach_module_classes(), replace the for-the-modname list-add loop, with a forloop that finds the module's subrange (start,length) of matching classmaps within the possibly builtin classmaps vector, and saves those to the ddebug_table. The reading/using: change list-foreach loops in ddebug_class_name() & ddebug_find_valid_class() to walk the array from start to length. Also: Move #define __outvar up, above an added use in a fn-prototype. Simplify ddebug_attach_module_classes args, ref has both address & len. no functional changes Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 1 - lib/dynamic_debug.c | 61 ++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index b9afc7731b7c..2b0057058ecf 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -83,7 +83,6 @@ enum class_map_type { }; =20 struct ddebug_class_map { - struct list_head link; struct module *mod; const char *mod_name; /* needed for builtins */ const char **class_names; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 55df35df093b..41cbaa96f83d 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -45,10 +45,11 @@ extern struct ddebug_class_map __start___dyndbg_classes= []; extern struct ddebug_class_map __stop___dyndbg_classes[]; =20 struct ddebug_table { - struct list_head link, maps; + struct list_head link; const char *mod_name; - unsigned int num_ddebugs; struct _ddebug *ddebugs; + struct ddebug_class_map *classes; + unsigned int num_ddebugs, num_classes; }; =20 struct ddebug_query { @@ -147,13 +148,15 @@ static void vpr_info_dq(const struct ddebug_query *qu= ery, const char *msg) query->first_lineno, query->last_lineno, query->class_string); } =20 +#define __outvar /* filled by callee */ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_tabl= e const *dt, - const char *class_string, int *class_id) + const char *class_string, + __outvar int *class_id) { struct ddebug_class_map *map; - int idx; + int i, idx; =20 - list_for_each_entry(map, &dt->maps, link) { + for (map =3D dt->classes, i =3D 0; i < dt->num_classes; i++, map++) { idx =3D match_string(map->class_names, map->length, class_string); if (idx >=3D 0) { *class_id =3D idx + map->base; @@ -164,7 +167,6 @@ static struct ddebug_class_map *ddebug_find_valid_class= (struct ddebug_table cons return NULL; } =20 -#define __outvar /* filled by callee */ /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -1114,9 +1116,10 @@ static void *ddebug_proc_next(struct seq_file *m, vo= id *p, loff_t *pos) =20 static const char *ddebug_class_name(struct ddebug_iter *iter, struct _dde= bug *dp) { - struct ddebug_class_map *map; + struct ddebug_class_map *map =3D iter->table->classes; + int i, nc =3D iter->table->num_classes; =20 - list_for_each_entry(map, &iter->table->maps, link) + for (i =3D 0; i < nc; i++, map++) if (class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; =20 @@ -1200,30 +1203,31 @@ static const struct proc_ops proc_fops =3D { .proc_write =3D ddebug_proc_write }; =20 -static void ddebug_attach_module_classes(struct ddebug_table *dt, - struct ddebug_class_map *classes, - int num_classes) +static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _= ddebug_info *di) { struct ddebug_class_map *cm; - int i, j, ct =3D 0; + int i, nc =3D 0; =20 - for (cm =3D classes, i =3D 0; i < num_classes; i++, cm++) { + /* + * Find this module's classmaps in a subrange/wholerange of + * the builtin/modular classmap vector/section. Save the start + * and length of the subrange at its edges. + */ + for (cm =3D di->classes, i =3D 0; i < di->num_classes; i++, cm++) { =20 if (!strcmp(cm->mod_name, dt->mod_name)) { - - v2pr_info("class[%d]: module:%s base:%d len:%d ty:%d\n", i, - cm->mod_name, cm->base, cm->length, cm->map_type); - - for (j =3D 0; j < cm->length; j++) - v3pr_info(" %d: %d %s\n", j + cm->base, j, - cm->class_names[j]); - - list_add(&cm->link, &dt->maps); - ct++; + if (!nc) { + v2pr_info("start subrange, class[%d]: module:%s base:%d len:%d ty:%d\n= ", + i, cm->mod_name, cm->base, cm->length, cm->map_type); + dt->classes =3D cm; + } + nc++; } } - if (ct) - vpr_info("module:%s attached %d classes\n", dt->mod_name, ct); + if (nc) { + dt->num_classes =3D nc; + vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); + } } =20 /* @@ -1256,10 +1260,9 @@ static int ddebug_add_module(struct _ddebug_info *di= , const char *modname) dt->num_ddebugs =3D di->num_descs; =20 INIT_LIST_HEAD(&dt->link); - INIT_LIST_HEAD(&dt->maps); =20 if (di->classes && di->num_classes) - ddebug_attach_module_classes(dt, di->classes, di->num_classes); + ddebug_attach_module_classes(dt, di); =20 mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); @@ -1372,8 +1375,8 @@ static void ddebug_remove_all_tables(void) mutex_lock(&ddebug_lock); while (!list_empty(&ddebug_tables)) { struct ddebug_table *dt =3D list_entry(ddebug_tables.next, - struct ddebug_table, - link); + struct ddebug_table, + link); ddebug_table_free(dt); } mutex_unlock(&ddebug_lock); --=20 2.48.1