From patchwork Wed Jan 25 20:37:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 48316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp476238wrn; Wed, 25 Jan 2023 12:42:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXuic//ePAMmgkn8cLGZl9VeW5a/dB4Yhm1f698V/m7n8WA6rF1iAiceg3CJj0/5VqLirvJz X-Received: by 2002:a17:907:6281:b0:7c4:f752:e95c with SMTP id nd1-20020a170907628100b007c4f752e95cmr42444416ejc.1.1674679330568; Wed, 25 Jan 2023 12:42:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674679330; cv=none; d=google.com; s=arc-20160816; b=yM8DVrVPG3AvbRV989+0ZsnMYQ3AeMAbeokF80rD2SZKryyasBJJmNYQHvrWRiHE4n 2M4+YtoH4pUawjkO7QEyJF8q3T6cjlU2OLCzSMVGVIiAk80tsFYXSt5XFjOeCYF/+7Hh O61CR6+mQGTu3e5igOMB0BidgKGN6t+IU4jdsvIGZ2wnSMEl23ZqKrbYfS4Ch8iYZBE/ escf78z0yyn8+9DFXuvsyNTx5v017kW+knOKxEMjAkF3vFpsLcfX3c3+ycnIcawDi5CH PLw/u67ZVfnFAVGNRZW6WDMRe7oqHwibQ97Ey6ZFvoNedseTpoab70ryfd8wgqrx6Phy NDYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lmICmx8JMsrPEyZD0UfJ2dJUv7tB5QyYX/9ZKERJ9yQ=; b=Bai8ycba+MdSyusRmtcSk5yQuNP++eEf3xKRK25sXEbzHyV75EGvQIGQ+R7UgC7Diy VafqMYxfDWlXV+Z6tX+a+/hNfexPFvJcxGh5csbXRvzysM0WTDwx5WPdkMUo4vxWymej Nt/OUI8nqImyh2MxWAjjrEkV3dYWCsWywZ2TjjvlcqcwsSu0lyba3OY9gzSWu8twBgfD Ce5kibWDdMGy8jyBDDQRpqqc/4FeCTfb0Wxp8G3pGVZz6pE8U+GYS051RCn9PR+LxSn7 1BFHVCPjW53jHi0ORUYpLYbi041CsRQcXZKsu0RVZJQxb3mS1WkorIS4jwyvj0lz5yRh +nnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=heHysJy9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mf8-20020a1709071a4800b0087766403eb3si7061529ejc.893.2023.01.25.12.41.46; Wed, 25 Jan 2023 12:42:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=heHysJy9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236484AbjAYUiN (ORCPT + 99 others); Wed, 25 Jan 2023 15:38:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236452AbjAYUiF (ORCPT ); Wed, 25 Jan 2023 15:38:05 -0500 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 4596E5D129 for ; Wed, 25 Jan 2023 12:38:01 -0800 (PST) Received: by mail-il1-x12a.google.com with SMTP id m8so8471ili.7 for ; Wed, 25 Jan 2023 12:38:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=lmICmx8JMsrPEyZD0UfJ2dJUv7tB5QyYX/9ZKERJ9yQ=; b=heHysJy9nOikw8D0HM4KNNPkRveqBvCDur7cwxB6Oz6QmhneSUoQzDrgiFcl9XTrw4 zjJ5XODiqNPWqNIZu2POqav/Paih0hlhArix5pV1kSb+rgmPtsa83JMDYzSmeE0b4iF6 vYCzP6BqFBNyS6XxC4BTsQejw76Uzl19CqSV806k3egZTJ8AP/vmFjiNKyXbdIxAZT3K GxVd0erJMT+cGtWuNJ50GwVGMJaaR9t5RxZqB5w28QYcY15e+XEckP/8idVJryMNwwYw 9QHcfmtyva5sPm3ucGZotzo76pqiNlQNHUgAN7SP/wAGtmrXmUFDzHmNjbsZta2KDzDd 7YSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=lmICmx8JMsrPEyZD0UfJ2dJUv7tB5QyYX/9ZKERJ9yQ=; b=6U4XWtVwrzRCsx1QLqaMoB6rcYFwWt10Ut+24FxkWWB68+h+mRKzSTl2oSMnPDkRzZ 9KOgNeKWvlnaLoZUrGO0XrKx4wabf2QePqzVjRn4C6g3NexYOqozykhffFxJZIMDMVQ9 RZh6de9tMvr3v6Cw2KCk1zlmA++QFd9pYhZkGEhsw5CdEbyRgMSFWw2bTqVgNqxZGemO SxaBlDI4G/nbMGz1RtTqzg5BNsV9gZQuBr0dZpssXGMrNOE/4WQKT+FGqspz4jxsBb12 0ygCpTJ2b8aPyo9hl31V2yyxfTxJJ+VAP12tO9BdXQ28iPNHlD+1EzOU3XLqDCCN6JhH nVkw== X-Gm-Message-State: AFqh2kqkp+l+Xjqb6RWAj1FlVbfdEgbGqlWbBr0x4C+SWZG9Dj2SKFiN kMeqRD1ll/RHF31TI9/MuGQG7PKB20U= X-Received: by 2002:a05:6e02:1d08:b0:30f:545e:730b with SMTP id i8-20020a056e021d0800b0030f545e730bmr18337835ila.24.1674679080189; Wed, 25 Jan 2023 12:38:00 -0800 (PST) Received: from frodo.. (c-73-78-62-130.hsd1.co.comcast.net. [73.78.62.130]) by smtp.googlemail.com with ESMTPSA id y11-20020a056e02128b00b00310a599fd43sm665104ilq.46.2023.01.25.12.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 12:37:59 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com, daniel.vetter@ffwll.ch, seanpaul@chromium.org, robdclark@gmail.com, Jim Cromie Subject: [PATCH v3 03/19] dyndbg: replace classmap list with a vector Date: Wed, 25 Jan 2023 13:37:27 -0700 Message-Id: <20230125203743.564009-4-jim.cromie@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230125203743.564009-1-jim.cromie@gmail.com> References: <20230125203743.564009-1-jim.cromie@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756028553526220296?= X-GMAIL-MSGID: =?utf-8?q?1756028553526220296?= Classmaps are stored/linked in a section/array, but are each added to the module's ddebug_table.maps list-head. 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-addy and subrange length are in the ddebug_info arg. 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-addy 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 addy,len. This isn't technically a bugfix, but IMO simplifies later fixes for the chicken-egg post-init enablement regression. 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 41682278d2e8..bf47bcfad8e6 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -81,7 +81,6 @@ enum class_map_type { }; 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 009f2ead09c1..823190094350 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[]; 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; }; struct ddebug_query { @@ -146,13 +147,15 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg) query->first_lineno, query->last_lineno, query->class_string); } +#define __outvar /* filled by callee */ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table 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; - list_for_each_entry(map, &dt->maps, link) { + for (map = dt->classes, i = 0; i < dt->num_classes; i++, map++) { idx = match_string(map->class_names, map->length, class_string); if (idx >= 0) { *class_id = idx + map->base; @@ -163,7 +166,6 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons return NULL; } -#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 @@ -1107,9 +1109,10 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos) static const char *ddebug_class_name(struct ddebug_iter *iter, struct _ddebug *dp) { - struct ddebug_class_map *map; + struct ddebug_class_map *map = iter->table->classes; + int i, nc = iter->table->num_classes; - list_for_each_entry(map, &iter->table->maps, link) + for (i = 0; i < nc; i++, map++) if (class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; @@ -1193,30 +1196,31 @@ static const struct proc_ops proc_fops = { .proc_write = ddebug_proc_write }; -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 = 0; + int i, nc = 0; - for (cm = classes, i = 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 = di->classes, i = 0; i < di->num_classes; i++, cm++) { 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 = 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 = cm; + } + nc++; } } - if (ct) - vpr_info("module:%s attached %d classes\n", dt->mod_name, ct); + if (nc) { + dt->num_classes = nc; + vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); + } } /* @@ -1250,10 +1254,9 @@ static int __ddebug_add_module(struct _ddebug_info *di, unsigned int base, dt->num_ddebugs = di->num_descs; INIT_LIST_HEAD(&dt->link); - INIT_LIST_HEAD(&dt->maps); if (di->classes && di->num_classes) - ddebug_attach_module_classes(dt, di->classes, di->num_classes); + ddebug_attach_module_classes(dt, di); mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); @@ -1342,8 +1345,8 @@ static void ddebug_remove_all_tables(void) mutex_lock(&ddebug_lock); while (!list_empty(&ddebug_tables)) { struct ddebug_table *dt = list_entry(ddebug_tables.next, - struct ddebug_table, - link); + struct ddebug_table, + link); ddebug_table_free(dt); } mutex_unlock(&ddebug_lock);