From patchwork Thu Oct 12 19:48:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 13419745 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 4B523CDB46E for ; Thu, 12 Oct 2023 19:49:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AAC8D8D0150; Thu, 12 Oct 2023 15:48:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A5A6F8D0002; Thu, 12 Oct 2023 15:48:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D5928D0150; Thu, 12 Oct 2023 15:48:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 734178D0002 for ; Thu, 12 Oct 2023 15:48:48 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 48385404F4 for ; Thu, 12 Oct 2023 19:48:48 +0000 (UTC) X-FDA: 81337847136.16.E0DEAA1 Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) by imf05.hostedemail.com (Postfix) with ESMTP id 69386100010 for ; Thu, 12 Oct 2023 19:48:46 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GdXi+GfS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.53 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697140126; 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=Jr8tQe/cDXue74QN3U0cEdutzIhNedVe/s3FJQcenu4=; b=xETNo15tXaIHndQvti+vLiy51/Vmyjl3HJk0utfDPZ+nLUsbX/b7VykYYfyo/RpKqnBIYS bByfLAOoBTBoI8WR/+SLr5SEDQJak2rd6nwH8CrzAWIIOFsS+ybad8ECeKdydlC7YdN+CY 0ngbysmjQNiezybJxoZ1VukZs/7hFXo= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GdXi+GfS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.53 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697140126; a=rsa-sha256; cv=none; b=ePlj5i3iqvRco+A4WUaWH2P0wHjs1lrgFhPnYzxecbbdaex0APqk3LAYXEaeMVjXbcID3Q 1Ac2RTTsYFtsvxII0mHZaZR+L2j1geZTgkPSM1RU3HzFiEGSZvnkIjk1+ycen21EF0eF20 1VN50dG067m6iZpOdVV0RGePpOKszWY= Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-7a25040faffso57296039f.1 for ; Thu, 12 Oct 2023 12:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697140125; x=1697744925; 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=Jr8tQe/cDXue74QN3U0cEdutzIhNedVe/s3FJQcenu4=; b=GdXi+GfSY7ngdbxK46Ch2YC+yB37BLMn/UOIaGkIifHmx5bzZsO+0g3VENWi/jKvlu m03/WBeSgnDepH5d5gAvLFmiMwimK/XIfdrZLjuPzpJFDjzbDpwdAIRaDw13iOrTFNwi 8u78YdR8g4D62buYnoDFNUYySp81DN84/SlogMv8wClZyKHhOCrOdJcW+k0cll8EAZVy ePJYvSyBpcK0WOK1SVGmGNMDdm2kRGQQY9sMVl8TNq7t3ZME1DAxEt7p/1KCajg5ljOE e7/OpJMMXMC4G7Uy0+D8+e4pSsnEJXGLofmG1Oj7tIRHQCXnTeCHw+cyaviHKuLiI8CG pK3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697140125; x=1697744925; 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=Jr8tQe/cDXue74QN3U0cEdutzIhNedVe/s3FJQcenu4=; b=B2uiIwNRTt370DiUN1U6WSUSWopPU4ITWuHW4QylLdl6S5/IZmrHqG7sFXl/O9Nwot VFIeGQ+otYiT2Xt5HMhK+g75mGsExmpen3Qseu4XneetLqIQ/sFuLHKoBXeg6UtRKYU7 K+uIDJNtpcEc3lMBjWQkR+qT3zmLmgC6HqY0YK/zIy0rXegiZsECpzdrhekuQ35FJ8xq 1+amkiTSwZxL+Ezr+6/k7mQP+VBT89nNQeDG09ZuJD01mrBxCM9tZ81jsM7OJKb/Pu1T UC0VllKwIRbRXYjl75npfsQOH22HVHzhSvlXWxtYwvKRMkk5TaaWrU27DiQZPzndCTlq KgZQ== X-Gm-Message-State: AOJu0YztK9uCGglzKF1UGTU9XvoC6tfzMDVgPg9xFN+SwaZQHqm5jXkG 5g+skav+5k2G5VxhlpuVNPM= X-Google-Smtp-Source: AGHT+IHSgCsSwzNOOD//3NxBGQTn9DS6okKVdysyhOSJ8KPygFQuinuZSyiQbCPBvDKULEXLusF2+g== X-Received: by 2002:a5d:9ac4:0:b0:79f:d195:5384 with SMTP id x4-20020a5d9ac4000000b0079fd1955384mr27521944ion.17.1697140125638; Thu, 12 Oct 2023 12:48:45 -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 h6-20020a5d9e06000000b007a25540c49bsm4307891ioh.27.2023.10.12.12.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 12:48:45 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org Cc: david@redhat.com, lb@semihalf.com, linux@rasmusvillemoes.dk, joe@perches.com, mcgrof@kernel.org, Liam.Howlett@Oracle.com, linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH 09/10] dyndbg: add dd_clear_range to prune mtrees Date: Thu, 12 Oct 2023 13:48:33 -0600 Message-ID: <20231012194834.3288085-10-jim.cromie@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012194834.3288085-1-jim.cromie@gmail.com> References: <20231012194834.3288085-1-jim.cromie@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 69386100010 X-Stat-Signature: bcmx5bsks8geur8x9zq3mot6q7ssp45h X-HE-Tag: 1697140126-329811 X-HE-Meta: U2FsdGVkX18JPTC4l9fcPHREJ2kyGOSJPHbLD35wtFWoB5LVt5ygiBsQsC+f3JcrBnRKKgkbaFS/OIR6v2zcAuuHuX8VxXn/g6D1Vv9O/0loDMoHVr3YZ2UuAdvPyjc2K+IpZHTSLqnC84Gt3XGpSZ0YrqZc459CusV8PeskYaWNvzMl0Man6DFY0PrJN+VtEDH+XQaYLFaaZjA7axHWbIJl4X1bM7J1KcfO3JISpz41Twl2rfnQ0QIdyWQv7iX9kioXRVXXZ571Lt8sFhi8+x28jBG9qdkESZG3soacXULjfw+AcZU0Di+DOsOtjyrRO0SeevkU05NSn5bDiZPQlIryMZELg65yrkNSPYWup+jvpLUhqCMH6q3H5LM8qrzkmR43YG8gdzMTQVOhqBccz9qE7aZfyRJ3eIkLIjbNnFCvwi+9xT7QOOi0STVmjlQr4eQBjkKtYvRKefTKQ8+VNYf/8m+/tSwhmwNTEkwEgbt16eTrfsPlyQDRO5IgKFTtJNfNAPK/221YMFxKNGrdyuOn03HMjTciWxnJx3gHA2iojApUKrkqvmBEbltuB/KbdhdwUzSEwf37kt9eFRrT18EhNlax8alWK6IrnUNUjZB7T27PhxXroO32+1uHrLLw6PvK2LYiY9PqvAnnV5JSgXOIwvyML8EqUo4HTYj6FMSEgTdqdG10hfj5AFFjJVisc77HlBYfQ0SvFgNYuUSb6Ghm4dq36NYX99TiwG+iB5Jlw3rZ+2jCVV2qHguVMr5ciAtwfQa22jLPpINbBjWBxmkFYxhxZmDxqtULmry+CYX1+NCtSzgs5JSQ7qEl88uqsfS/+cU4kOnSuHp8AdjEjCsMWyPE51olRGzBvsfsyhDz2JbsQO5BRVryF7rF9fXG6vtt8HYvrZP6U0eglRa7c6myp+KS68J77fCXHHguy0/9lO2f3/f9l3sPP7gesNNXWSG/52bKDmNOeab5zTO ItSNpZJR 9z7wA1dd6KCn+IfN+LMjX6qgHyLVV6B9lDnWZiZaK0zvbAFnESmG3WOs47gG3inkGJiAT+EpubDUzeua1TJFBhmkhHPbyzHORWvdeOxTV5WCEPTWI7hXE0goxSoqNMfXmXUi5Ed7zJNQzVcaShItu45sHETbrjwwGbVCSz3aXCtTIC6m3teF8lwBPOk/itHpIhr2XCrUbEvpN9W+a4jbphjfsoF+Vw97rrGxS1Be1apWCE45cam+VKkPJ8UDLLA2aEMdvE0EI7mIF9dtUl2Y+/qxaX9iQOfgceFac/PImwuZSJdGA81nT778Xd+Vlo7DQ004+EEcbxK73aPWFAXXIiPl4NOIHeq6IObYYnP/PoL7HVmDKwK4HP2P27GzcKePjxhFGXUkOHtF3zTr0wXF218S677IJ97KqSOTAJ8MlzzwDKnBMOrXS1K3b2FbP2VI3Gv4/0MjdQOe129PejvjgcVdWbmnpMueJzeDCg22lwq3K6dPgnTc0uqImHbPQeiNFvuc8OBOuEpeX5sisj6RTnwgoAzZy4lO3425D76IrcEgeL22SacBZSl7kLXsqu7TvfmCIqds+Y5FTvDj1xrHhIDY+/RYr37PcPlGVXQnsuDEzhn70uRbLP7Fo+gFE+JMr7HGTMUQC/ORIHKhGQqrxAh5gb87rZLeneN43EaHSUItx3T4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Call new dd_clear_range() from ddebug_remove_module(). It calls mtree_erase() on the trees storing the function, filename, modname intervals, and passing the 1st descriptor of the interval (ie the index used on the insert). dd_clear_range() should properly undo the 3 mtree_insert_ranges done by dd_store_range. RFC: it doesnt work as I expected. What am I missing ? The following log shows that 'rmmod amdgpu' only removes 1 entry from each maple-tree, not the whole interval. My index is the 1st descriptor in each interval. ISTM (naive reader) this contradicts the documented behavior. void *mtree_erase(struct maple_tree *mt, unsigned long index) Find an index and erase the entire range. what is my "entire range" ? bash-5.2# modprobe amdgpu .... [ 74.256006] dyndbg: attach-client-module: module:amdgpu nd:4652 nc:0 nu:1 [ 74.256968] dyndbg: 4652 debug prints in module amdgpu bash-5.2# echo 2 > /sys/module/dynamic_debug/parameters/do_scan [ 81.370509] dyndbg: cache: funcs has 3741 entries [ 81.371233] dyndbg: cache: files has 911 entries [ 81.371819] dyndbg: cache: mods has 323 entries bash-5.2# rmmod amdgpu [ 102.325851] dyndbg: removed module "amdgpu" bash-5.2# echo 2 > /sys/module/dynamic_debug/parameters/do_scan [ 105.277439] dyndbg: cache: funcs has 3740 entries [ 105.278163] dyndbg: cache: files has 910 entries [ 105.278756] dyndbg: cache: mods has 322 entries cc: Liam R. Howlett cc: linux-mm@kvack.org Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index fb72a7b05b01..92ffd70a07de 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1426,6 +1426,14 @@ static void dd_store_range(struct maple_tree *mt, const struct _ddebug *start, v4pr_info(" ok %s at %lx\n", val, first); } +static void dd_clear_range(const struct _ddebug *start) +{ + v3pr_info("clearing %px\n", start); + mtree_erase(&mt_funcs, (unsigned long)start); + mtree_erase(&mt_files, (unsigned long)start); + mtree_erase(&mt_mods, (unsigned long)start); +} + #define site_function(s) (s)->_function #define site_filename(s) (s)->_filename #define site_modname(s) (s)->_modname @@ -1578,6 +1586,8 @@ static int ddebug_remove_module(const char *mod_name) mutex_lock(&ddebug_lock); list_for_each_entry_safe(dt, nextdt, &ddebug_tables, link) { if (dt->mod_name == mod_name) { + /* free mtree entries on descs */ + dd_clear_range(dt->ddebugs); ddebug_table_free(dt); ret = 0; break;