From mboxrd@z Thu Jan 1 00:00:00 1970 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 E0EC6CDB47E for ; Fri, 13 Oct 2023 19:05:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82C1E80064; Fri, 13 Oct 2023 15:05:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DCFA8D0015; Fri, 13 Oct 2023 15:05:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A43B80064; Fri, 13 Oct 2023 15:05:20 -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 580158D0015 for ; Fri, 13 Oct 2023 15:05:20 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 138971204FD for ; Fri, 13 Oct 2023 19:05:20 +0000 (UTC) X-FDA: 81341366400.18.9895E19 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id DCD8D80070 for ; Fri, 13 Oct 2023 19:04:13 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="XEw9/oil"; spf=pass (imf02.hostedemail.com: domain of audra@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=audra@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697223854; 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=zR5p3ioGj44ReczmQkXwckrYVMKEAFkp4XWCVgfnl84=; b=VORIi1LDszME/vcWiNmI/T//TKstZGZCWQNiO6Ql2DEd+Sf72hTrT+lJozTEL7a8Pf3Kdr YkYs5C4GAFkI/BbRQFTrxBypyPXsvoTvvAwzU3ZjPIr2VJtHTDiqLoPgmqJCqFzd+f8LGF p9LBL4KnYxfXxLqDfCZIxFENQiYNrSA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697223854; a=rsa-sha256; cv=none; b=w5m5lhqCCiTnIJLIc3doZ2sccJmvv7rRUmqeQwrHN0oyvIKNO0Y4+VtNvFCHCFuratJ6ED UtECIPDEyO4IUmI49Eh100tXzkIojCp0V3EnP/akNaZXaad8AeavxzSfIA5/YIDa/5eT+b tIgOsSfXcGKHU6kBlERGmKRNfAvuk90= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="XEw9/oil"; spf=pass (imf02.hostedemail.com: domain of audra@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=audra@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697223853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zR5p3ioGj44ReczmQkXwckrYVMKEAFkp4XWCVgfnl84=; b=XEw9/oileG3ngCaLJ4o9++QqYlaMBLeYKVqINX7Xi6JkFY3c9kLRW6lmczJ4okSIzh6W24 huvVQXnzF7fKLLt+TxRHAAAKfHE+dqAzRpPyi5KWTwHfYk/wVhlvhfMh4aPhu1sar5HyKk WGOeazcPvETMK2Zz3wGOEDpEvLaDcTA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-275-TnrzPz-tMWW8slqjaMdDHg-1; Fri, 13 Oct 2023 15:04:10 -0400 X-MC-Unique: TnrzPz-tMWW8slqjaMdDHg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82CEF185A795; Fri, 13 Oct 2023 19:04:06 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.33.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 482022157F5A; Fri, 13 Oct 2023 19:04:06 +0000 (UTC) From: Audra Mitchell To: linux-mm@kvack.org Cc: raquini@redhat.com, akpm@linux-foundation.org, djakov@kernel.org, vbabka@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] tools/mm: Filter out timestamps for correct collation Date: Fri, 13 Oct 2023 15:03:47 -0400 Message-ID: <20231013190350.579407-4-audra@redhat.com> In-Reply-To: <20231013190350.579407-1-audra@redhat.com> References: <20231013190350.579407-1-audra@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspamd-Queue-Id: DCD8D80070 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 4osxefht441qiuxacp6iqt9qndyzamj4 X-HE-Tag: 1697223853-126451 X-HE-Meta: U2FsdGVkX1+u9kI2dkYERPnHPQf8pj/CNO4guFd2G4YMUmYXxu9lWr72UAbUYNTepOeH4HsTtglW/brNPdnlufzcm0rFhRKz6mAFBTaQcLHE0FgSfNf1iyLQGWM90EX6oGdfL41VzzwGiJYhlT2AecOYk5nD8xjEB3Z3BfNEbo34JlBhV2KhcaIVlGlbHlFDs7eTLiLHPJRkJziTVe2SbpQArgXGtu1198U1ZNSkdZM15utzEr4iaGeGh9IpVUOm7ciZQ5MTMdHWQPsB5NDY8/qA/setXsnwvJzLxEoQQIraoX6UCd3l0EvflxwOmwW/NBcOTc6/6gVHxYJv+Q5kT94hKdE8ynK3vNCMS50ylYFknsdr65g4ddiswnd8eCnm4/DLgJdybys2knopQK4IHRY8HC/RhiR9teIPAobfgCPosTanB+nTuv2soP05kEtRF3a99MdJUPPyVc4JxzJ3mQHWJQPmNtC7yg6UV/U+ZWohfnIBN/ETqktgx96kfSX8tG9Dc6hGnF86FcxGuDYx9Vxv3LZ0LvSMuLobVXZY8wBidZ4VbtJY/WBh/VzqC14ttRuvGEoMualWvoGBZL6GHMHZtewlfa17DqZ0XMoRHIZr9v/67dMi6NGyvIdabAqHggMKpYU7EngMPNKSyMMdYDVTRRroP2tvPaLF4qmL/+b6mljyEQx5hF+hrl4CPtN3xLjkBr/mdUAds0yIbaJ5+ROApkXKx+BviFrDEy9lCs+gt8Nn2skd3tLqSdxqbYJ+uzU/uX2Ea8JNRFjCXLxwmrh2Qt6g9S/z2pEOrOl0jqBFyR73TwU8j/gOadR/ZmaLiIG3x1MkUMmw8M7EWetjwvHh/2+s1u/2x39q8Os2PCSf2e5ZJYSO78895uu4c4/ZfSGvQ7D6cPXx1LRXK/JjrfsnTyWXoLww46fJiaPRgY0pAd5O2f+jekYK1T7LJKXmedrhvsmWEqP7GGWfmEo 9C0OQLKw 6bsyYD7N4994ra53cYVOQ9VfEt5k0aNg8HxrjeS2RjFFFdPNUaCHpPzFcGZp74NMb2L4pfJvCKnO7MMizFkZn4pT67CleB/P6B2kPzQmYshaM9TJKDQe0H6L4CSd3X5xIia17ArM6EHUJhM8OuphgGvg3/T4txzbjmoVYUjbuMx5Dr2E= 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: With the introduction of allocation timestamps being included in page_owner output, each record becomes unique due to the timestamp nanosecond granularity. Remove the check in add_list that tries to collate each record during processing as the memcmp() is just additional overhead at this point. Also keep the allocation timestamps, but allow collation to occur without consideration of the allocation timestamp except in the case were allocation timestamps are requested by the user (the -a option). Signed-off-by: Audra Mitchell --- tools/mm/page_owner_sort.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/tools/mm/page_owner_sort.c b/tools/mm/page_owner_sort.c index 9c93f3f4514f..7ddabcb3a073 100644 --- a/tools/mm/page_owner_sort.c +++ b/tools/mm/page_owner_sort.c @@ -203,6 +203,21 @@ static int compare_sort_condition(const void *p1, const void *p2) return cmp; } +static int remove_pattern(regex_t *pattern, char *buf, int len) +{ + regmatch_t pmatch[2]; + int err; + + err = regexec(pattern, buf, 2, pmatch, REG_NOTBOL); + if (err != 0 || pmatch[1].rm_so == -1) + return len; + + memcpy(buf + pmatch[1].rm_so, + buf + pmatch[1].rm_eo, len - pmatch[1].rm_eo); + + return len - (pmatch[1].rm_eo - pmatch[1].rm_so); +} + static int search_pattern(regex_t *pattern, char *pattern_str, char *buf) { int err, val_len; @@ -443,13 +458,6 @@ static bool is_need(char *buf) static bool add_list(char *buf, int len, char *ext_buf) { - if (list_size != 0 && - len == list[list_size-1].len && - memcmp(buf, list[list_size-1].txt, len) == 0) { - list[list_size-1].num++; - list[list_size-1].page_num += get_page_num(buf); - return true; - } if (list_size == max_size) { fprintf(stderr, "max_size too small??\n"); return false; @@ -465,6 +473,9 @@ static bool add_list(char *buf, int len, char *ext_buf) return false; } memcpy(list[list_size].txt, buf, len); + if (sc.cmps[0] != compare_ts) { + len = remove_pattern(&ts_nsec_pattern, list[list_size].txt, len); + } list[list_size].txt[len] = 0; list[list_size].len = len; list[list_size].num = 1; -- 2.41.0