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 A4F1EC43334 for ; Wed, 20 Jul 2022 14:06:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7950B6B0078; Wed, 20 Jul 2022 10:06:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 746526B007B; Wed, 20 Jul 2022 10:06:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54ABC6B007D; Wed, 20 Jul 2022 10:06:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 460336B0078 for ; Wed, 20 Jul 2022 10:06:27 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 24188140545 for ; Wed, 20 Jul 2022 14:06:27 +0000 (UTC) X-FDA: 79707653214.13.E2526C1 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf11.hostedemail.com (Postfix) with ESMTP id 9FE72400AE for ; Wed, 20 Jul 2022 14:06:26 +0000 (UTC) Received: by mail-pf1-f201.google.com with SMTP id b11-20020aa7810b000000b0052aeb125cb3so5852846pfi.11 for ; Wed, 20 Jul 2022 07:06:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=MiQGLn0ozPDq7MLM//IzrZBoVTKI/HOaHFEX3CjUgQg=; b=jVg0Dm01NAz27++UGQ3UXHVO9ybrNwu5lN2ejCDWHcMnNKZkWsR9Zh9t4XTaNLKILI Gq0drMEzzIQlknQ+DVPwBEZj5dmm9TDeHsYhKBSD1caYXA1b0XV6cF6Tehkf6P2XtiNT 6eAxUWc/9JkZjOpnUBfgqfHDemcI+IiHFWPL4yjfg6/iiAJC88d3ju6EBPxIXTY8WG+M JxmMiCuaxHxj+jDlB2h2u0rHaVetglXfmmQhNlWBhSDH9FRTCveS5/z+jxAi7wyWAm/J oodbOLFrSVJBghOg0XtXwRVNOXF/o3XzJbcnUTsVx3JihDptWbc5cPW/OaMA3m9QWRs7 mBKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=MiQGLn0ozPDq7MLM//IzrZBoVTKI/HOaHFEX3CjUgQg=; b=Ha4bKpJiRLwu4xqTSStJlMlYze2SehlBisTrIzNMjt/oZU74DzCbh6GSbj3KbfCrCt CTlToFL9RIkxHohKSskY1TP96U3TBLawJggTQDITJQka3yoJnbx4QKjmxK6Dp4gpt7vt K9F5gjab/Fud8okbYJC+OIx1d4OPnciVeDxz0utWIw1pQ0ojfCP3+NaQsQx8+pIBqC4N WC56NIWtXEIXqvzVhe7066uhICfUqZ5xlYYy5IjgLi0c6PY5mg40lhh4tvnKlWVOCiOi qk2QHPPWl9efIKRb3SDY/UkU/t14m97fHlIwUCfDbPrUYKkr1Pla6aV21Z2XCHVAaE+e bsWw== X-Gm-Message-State: AJIora8PgajgHyu574OF8iDiSY71uHeHrIZrsnQHWEeK3Mq2Rv1PdifV uhQAbhqzZ+i/MS1ITfZ22l5rNC59ZB2F X-Google-Smtp-Source: AGRyM1uTPV9Q11QoL+UpkBS7D/Dw7Q8pIpTSQMSA3oZYUyXM6y9YkmQPGz+cvhzirteZzpWhyMkQFgtDRV+n X-Received: from zokeefe3.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1b6]) (user=zokeefe job=sendgmr) by 2002:a05:6a00:2410:b0:528:be6e:8c2e with SMTP id z16-20020a056a00241000b00528be6e8c2emr39214970pfh.31.1658325985602; Wed, 20 Jul 2022 07:06:25 -0700 (PDT) Date: Wed, 20 Jul 2022 07:06:03 -0700 In-Reply-To: <20220720140603.1958773-1-zokeefe@google.com> Message-Id: <20220720140603.1958773-5-zokeefe@google.com> Mime-Version: 1.0 References: <20220720140603.1958773-1-zokeefe@google.com> X-Mailer: git-send-email 2.37.0.170.g444d1eabd0-goog Subject: [PATCH mm-unstable 4/4] Revert "mm/madvise: add huge_memory:mm_madvise_collapse tracepoint" From: "Zach O'Keefe" To: Andrew Morton Cc: linux-mm@kvack.org, Hugh Dickins , Yang Shi , Miaohe Lin , "Zach O'Keefe" Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658325986; a=rsa-sha256; cv=none; b=EY3ln36sz2vuXn3g8kMF/wETG2oDVsDzKhRLj22Fx8dhhXBhvMepF8X/215ku+V8rQ2gxU QZCzT/+XPxXUvOojo4VgfuIxXhSbTfd1muXISuhfvtfheV9CoBGJx80CZMswrBoLbjkwap HUsQgB9hJyEZppH6h4VhBzH1zbGiZaA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jVg0Dm01; spf=pass (imf11.hostedemail.com: domain of 34QvYYgcKCHYtieYYZYaiiafY.Wigfchor-ggepUWe.ila@flex--zokeefe.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=34QvYYgcKCHYtieYYZYaiiafY.Wigfchor-ggepUWe.ila@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658325986; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MiQGLn0ozPDq7MLM//IzrZBoVTKI/HOaHFEX3CjUgQg=; b=8BXu1Y6D4XqFn6RWrec7XlATQ/NvUX+KzqlppV7KJiexlOMii6ofChNAyWSztJ8HZ/CY0t dt+MtQEaNnI/aN/wVzVLB3y0U9YdALOurC+cD/8mAvUAxa9U0Fr2URFEJjdtSrh/ij5BAV ouksZKd9hRTRE3alphbZfBJH/AyjzvA= X-Stat-Signature: 7hm1pikmmdj5136jmxbh9wdpb4sghybd X-Rspamd-Queue-Id: 9FE72400AE Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jVg0Dm01; spf=pass (imf11.hostedemail.com: domain of 34QvYYgcKCHYtieYYZYaiiafY.Wigfchor-ggepUWe.ila@flex--zokeefe.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=34QvYYgcKCHYtieYYZYaiiafY.Wigfchor-ggepUWe.ila@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1658325986-106427 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: In the anonymous collapse path, huge_memory:mm_khugepaged_scan_pmd can be used to get roughly the same information as this proposed tracepoint. Remove it. Fixes: 0fff8a0de881 ("mm/madvise: add huge_memory:mm_madvise_collapse tracepoint") Link: https://lore.kernel.org/linux-mm/Ys2vzYyVFmljt+B8@google.com/ Signed-off-by: Zach O'Keefe --- include/trace/events/huge_memory.h | 22 ---------------------- mm/khugepaged.c | 2 -- 2 files changed, 24 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 38d339ffdb16..55392bf30a03 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -167,27 +167,5 @@ TRACE_EVENT(mm_collapse_huge_page_swapin, __entry->ret) ); -TRACE_EVENT(mm_madvise_collapse, - - TP_PROTO(struct mm_struct *mm, unsigned long addr, int result), - - TP_ARGS(mm, addr, result), - - TP_STRUCT__entry(__field(struct mm_struct *, mm) - __field(unsigned long, addr) - __field(int, result) - ), - - TP_fast_assign(__entry->mm = mm; - __entry->addr = addr; - __entry->result = result; - ), - - TP_printk("mm=%p addr=%#lx result=%s", - __entry->mm, - __entry->addr, - __print_symbolic(__entry->result, SCAN_STATUS)) -); - #endif /* __HUGE_MEMORY_H */ #include diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 70e9d9950415..28cb8429dad4 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2452,8 +2452,6 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, if (!mmap_locked) *prev = NULL; /* Tell caller we dropped mmap_lock */ - trace_mm_madvise_collapse(mm, addr, result); - switch (result) { case SCAN_SUCCEED: case SCAN_PMD_MAPPED: -- 2.37.0.170.g444d1eabd0-goog