From patchwork Thu Oct 12 19:47:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 13419730 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA984CDB47E for ; Thu, 12 Oct 2023 19:47:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68B728D0141; Thu, 12 Oct 2023 15:47:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63BE08D0002; Thu, 12 Oct 2023 15:47:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B50B8D0141; Thu, 12 Oct 2023 15:47:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 33E9E8D0002 for ; Thu, 12 Oct 2023 15:47:29 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1251312087E for ; Thu, 12 Oct 2023 19:47:29 +0000 (UTC) X-FDA: 81337843818.29.14C5AA8 Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by imf23.hostedemail.com (Postfix) with ESMTP id 3BCDA140022 for ; Thu, 12 Oct 2023 19:47:27 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=emN5PePt; spf=pass (imf23.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.47 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697140047; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EdFWb7R/lDvUnWmGrNZ1doFLmbR1Cvf7k7ETF/HiAfA=; b=wNGrCStIlJfqoUyP2jUdmRndQxOqlKd+7xaBRIv9WCae1WHdceb7KxfvardFG3zSjFisWA zOBT9VSlLVjDEyKTCjuo4MRhpwfRbZHh/1tVcVxtf73lG3yhtaW58n7j5SI3EJARJ+osvv 2bclrxIlHaXReqpxSFF6+2OZ+C3JPi4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697140047; a=rsa-sha256; cv=none; b=bJz3YTk0P8UxzyoFu9IqjA53aT9agra7pVxgy01YRfzcPjWHUSFmS/18C/P7QJGAGrDrp5 lzeFxa2dfMt5E47txx3Y/YbSl/X1x6UiwJCAiauD6Kf/JFegH5euBRTDLnzxN5ygchKpUA ZcjUFwbQWdRfoWGkXSGfzN4mv7zJPXM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=emN5PePt; spf=pass (imf23.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.47 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-79f8e4108c3so56664439f.3 for ; Thu, 12 Oct 2023 12:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697140046; x=1697744846; darn=kvack.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=EdFWb7R/lDvUnWmGrNZ1doFLmbR1Cvf7k7ETF/HiAfA=; b=emN5PePtkI5atPaR/1coBpwy3PdizC+/Kzd6NUAX1pg1plBX0t2UTTOTTezwFFfQEC l4oIzzZhJ7O2FMOZRRG04TJe7QJLx62eEjWtH+/8gIfsyJCA3eG0I7nKZS2+3Fnc26Mk dYlyYFBDc3CVjnl+YK15VbQMXuKkz5yCNHcS74ynbzhxbCN7PTkrNeOXCAcPvjfidu8v cGmJF0DickHsZslPM2tyGHBGTOFZMY6aLByuPMib2VwM263ujS87E+2pTbRnpQJmNUcw LeTTBy6QSOUczYiR9wNeFxSc3Q6OL9HO2utNRhVbRUdYKnxxteybD2cgMTvrzgfwUGBs C1Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697140046; x=1697744846; 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=EdFWb7R/lDvUnWmGrNZ1doFLmbR1Cvf7k7ETF/HiAfA=; b=OqpoMnj2wZbwpbiYMqRq3BsIUTHnF0FCutS+QmHOHd6XLHEXIIlPD8mJzQWqb7tn+I nie/PuWPNKOMCi4nFp1+eHDPGICx+9y8+O1IY9djDKM+IcbbiyStQd9pXSL0jafSKllN +l2nEbRzOzZQ0rZWurfjGoiSa2Skiegx2Xnxu16sW5/4Q9je7r+hWRrrdyLCl+IVOdus gPj80wIggVcIb2pUyr8dgjzfqg0cIgQWxOfbMjvh2a/J3SZCKwd2o16MFkn5aqKwHLA8 RzQUqyV4q3/cMG/a5X/3Mio0UPtdk8k9+2opAFQl6nOX7Om3gLwW97B6gR3jJC0ojFtq EhHw== X-Gm-Message-State: AOJu0YwP5lF8sbl7bJu5UJIAmznEu8W25upg/4h//eBDHgQduJ/lM/4W b7kk2EIrZUhpEGBr9TIJE0Y= X-Google-Smtp-Source: AGHT+IH0UOfRQ4ikz9Hk4rM8RmqNySf3YxcTrIhFIo+68DbLkG/CP9qB7HHORAuGhOuprlMeJ8JdHQ== X-Received: by 2002:a05:6602:2012:b0:787:1568:5df7 with SMTP id y18-20020a056602201200b0078715685df7mr27961322iod.9.1697140046416; Thu, 12 Oct 2023 12:47:26 -0700 (PDT) Received: from frodo.. (c-73-78-62-130.hsd1.co.comcast.net. [73.78.62.130]) by smtp.googlemail.com with ESMTPSA id z7-20020a5ec907000000b0079fbb834232sm4351002iol.19.2023.10.12.12.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 12:47:25 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: david@redhat.com, Liam.Howlett@Oracle.com, linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH 05/10] dyndbg: avoid _ddebug.site in ddebug_condense_sites Date: Thu, 12 Oct 2023 13:47:06 -0600 Message-ID: <20231012194711.3288031-6-jim.cromie@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012194711.3288031-1-jim.cromie@gmail.com> References: <20231012194711.3288031-1-jim.cromie@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 3BCDA140022 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: p7d175thce8x9h77gaycedcwqznwhgkw X-HE-Tag: 1697140047-503967 X-HE-Meta: U2FsdGVkX1+uaQf94rIsLlvBlxWPQDn+dEnDhGtI8sLDSi5l1fn6oaOWajB7VwRkhnwuHyH4TEoajUNKw4q50L94k3zniq7LnU6p3t62iP6e7asNZq/OmujDxgCeR6DVBGBOrtbgKc8n4Dy4TZNz6Zpy66/gNC1KJh6P//h6O6ntvvlUIO9B7QH9dU5topHbeK6PaI5YkhhNLUwHP5x1GR5Qi/x+lZ9OWCC07lAd519fTniYtJw+w5x874uxjwYLOqoGvgo+eBS+TQFOXOLU78WE1pITPqyQkTYYJPmT4ONLj/YKxP9TwvExd/Dhc99cDdBYHq9o/1wlaYQWnIT+Vo5f6YM9SfHBR8Cs7pSTJHXbXu2vNMUM/0DvnnOG3SkxJNHHb5YJ4lZKi81GbkzxMzoBZbC/0perKp8gSUN0EP/wfmZJYKCzVi3yFu29M29PCZgjiYnjyGj6/0OcZ8imdRlT5RkfKEfIUhzIEalX4isL6xAQD8uC7YPIabn9kQnE18tGFDypycoesnJ1S55a41nHoWkdCBui4QoWwB6Pw0VZIu7+dAzW+LbtHyOx6xTQNYizzZuR7vkzTvzXC/I7spZ+JZ3hR7IQ1r+MWEZwdC3j6B4x0eG1Sp9wXux6L4J/tU03p4xmeItzD6C+CqsIv5l5h6eXfE9bpXxn50/9sDTg0xgjAzkchmDQiaDc1HMN+hVpZgbnl08WB+qgHG57EQ/98BPd7FVvDkT1Jr/XOYxkqCXogMFFgL7p8sCbm30yUkZpStmQ+uo2rsLmbVE20ffWZJ34njL8zEoJ0N9ALZ5nONAVTFnR3pHvkUJLNWEXOvZ5aPWnug8QIoZmqap/jttT30/++IJTQXNWc24DPPsfKOsPuOtf0pIa1cqLFoIyi9/5yI7WR5TOYO8n1OdqXZhHz0ia7bWH175JBdCPLEctOePKKrauLBj10lDTetICmVm8xwtMvJKAVZjnWkn IuDnIW/x kZKpWt8LJrKM18q4BXpQULE77/REN2gan6X9kcsnoRE40nWTS8ggEqy4HRUV+rYqBw459Bl1EhALHiREoG8YnHLqIlSrXNr4EzIbwV4avRZsl/OD6+3Ct3oLOm27CLTc0cCXQgj4lhTbSQATckvJUCXzIrr53mYbZcLvnSuZbUPtO2buEIdEXJD1KyjEqrWnWW2RA7Jh54cznrOJFWmGRzOvJKdPlyJj9zqidXMSorVzQukl6/ChwDPPV+2UslIpglD+SYucpROqLX0dKbIlJMJl5rypMTYBsXOPbnB5NHda5ovgh4xJYyN0gKtN+jrWlkunxuKwDePe4Eq2rXhswaKL/PlnSPra7pamFKcZTrYG5ViR4QRTs+hyRMtvImKTwLhW7QsI0ZUvYyeinG/sm0r6N9ENWKjl1X0NWAUp3tGsmVQkvNaRIC6XHbebSNRMfrk9tf9+YZkv0qXlHTirqgkX+u8sFG8h/G8O+GVVkKa+uy5GpuwKF3XABo+wk3hvxxy/UfOZ3vVCTRoccnIjZhHehL0A/Zf3Zr1sAkTuB6hD3REnZVX6CEmxToO3V8Wb7y70FxA/8wWEG20NmrkuudMkT3Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000006, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Modify the for-loop in ddebug_condense_sites() to walk thru both vectors: descs, sites in parallel. This requires a 2nd set of cursor variables (*_ds) that mark the start-of-range in the sites vector for the intervals to be dd_store_range()d. So also rename the old cursors (*_dd) for better consistency and readability. This is a partial step. It still uses the desc_*() macros to provide the values, and the macros use the site pointer. Next, we replace the macros with site_*(), passing the *_ds vars. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 3dc17922a1d1..563d373224ba 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1426,32 +1426,41 @@ static void dd_store_range(struct maple_tree *mt, const struct _ddebug *start, v4pr_info(" ok %s at %lx\n", val, first); } + static void ddebug_condense_sites(struct _ddebug_info *di) { - struct _ddebug *cur, *funcp, *filep, *modp; + struct _ddebug_site *cur_ds, *func_ds, *file_ds, *mod_ds; + struct _ddebug *cur_dd, *func_dd, *file_dd, *mod_dd; int i; - funcp = filep = modp = di->descs; - for_each_boxed_vector(di, descs, num_descs, i, cur) { + cur_dd = func_dd = file_dd = mod_dd = di->descs; + cur_ds = func_ds = file_ds = mod_ds = di->sites; + i = 0; + for (; i < di->num_descs; i++, cur_dd++, cur_ds++) { + + BUG_ON(site_function(cur_ds) != desc_function(cur_dd)); - if (!strcmp(desc_function(cur), desc_function(funcp))) + if (!strcmp(desc_function(cur_dd), desc_function(func_dd))) continue; - dd_store_range(&mt_funcs, funcp, cur, "func", desc_function(funcp)); - funcp = cur; + dd_store_range(&mt_funcs, func_dd, cur_dd, "func", desc_function(func_dd)); + func_dd = cur_dd; + func_ds = cur_ds; - if (!strcmp(desc_filename(cur), desc_filename(filep))) + if (!strcmp(desc_filename(cur_dd), desc_filename(file_dd))) continue; - dd_store_range(&mt_files, filep, cur, "file", desc_filename(filep)); - filep = cur; + dd_store_range(&mt_files, file_dd, cur_dd, "file", desc_filename(file_dd)); + file_dd = cur_dd; + file_ds = cur_ds; - if (!strcmp(desc_modname(cur), desc_modname(modp))) + if (!strcmp(desc_modname(cur_dd), desc_modname(mod_dd))) continue; - dd_store_range(&mt_mods, modp, cur, "mod", desc_modname(modp)); - modp = cur; + dd_store_range(&mt_mods, mod_dd, cur_dd, "mod", desc_modname(mod_dd)); + mod_dd = cur_dd; + mod_ds = cur_ds; } - dd_store_range(&mt_funcs, funcp, cur, "func:", desc_function(funcp)); - dd_store_range(&mt_files, filep, cur, "file:", desc_filename(filep)); - dd_store_range(&mt_mods, modp, cur, "mod:", desc_modname(modp)); + dd_store_range(&mt_funcs, func_dd, cur_dd, "func:", desc_function(func_dd)); + dd_store_range(&mt_files, file_dd, cur_dd, "file:", desc_filename(file_dd)); + dd_store_range(&mt_mods, mod_dd, cur_dd, "mod:", desc_modname(mod_dd)); } /*