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 92EB3C43334 for ; Wed, 20 Jul 2022 17:30:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 153F78E0002; Wed, 20 Jul 2022 13:30:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 103828E0001; Wed, 20 Jul 2022 13:30:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F35FD8E0002; Wed, 20 Jul 2022 13:30:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E3E688E0001 for ; Wed, 20 Jul 2022 13:30:46 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C4FD9C064A for ; Wed, 20 Jul 2022 17:30:46 +0000 (UTC) X-FDA: 79708168092.22.3C76A97 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf16.hostedemail.com (Postfix) with ESMTP id 0C179180068 for ; Wed, 20 Jul 2022 17:30:45 +0000 (UTC) Received: by mail-pf1-f169.google.com with SMTP id 70so17097374pfx.1 for ; Wed, 20 Jul 2022 10:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wwJHvUk/LfzYzk+4FehlPYmcu3pOPVFkNzr9au4LTQI=; b=HNJw7xrEPkAEe2QRSYF/zpeCgiRdBn93Wwjb4TAvg8IZKBEkrjvpZ0+5SzlbvaspAB HvvPXPGYfIMTRaWMoVQQt+242vrUOU32fXs6Yirr39BarN4IphKm40iakyK1k0F+eqQj hZgF8WTNg6DzPOOHZgwowdC5ShZx22bOcKVvGiEE4avHi5gR/b41n6CNIGGXeO0GUrtN 9B+MxomXGj06yHX9MFzhUmzdH+32O0fWEFbaSG09qlJUD2RfOtMZf/ycBEc9iymyltQY k4Sts1I9ZWxH/dUde+HM9J5IFK9MneCAjzV3yTx16EjimivJ0IUnsSVRjVhjV7RqxKln mJBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wwJHvUk/LfzYzk+4FehlPYmcu3pOPVFkNzr9au4LTQI=; b=K4bJPvCHErxsLS68pzggxdC/uFYzLDq206+ZgyTqdgdzqsQn1jvsqE7wyhhkIseXv/ pfjxRQm3Hco8HY9a+X66fpOL3GXl3gZuTs8OLNU7OdnYPbPJ/+jWbVbkOKZG9O8ELtTF jBTXQS2/3H3+NT1njbLtkDSHX4KC1mjbVnRuwO6vBh2ehvnvAXbiZCs24GrIyjbyWknA z9TTItfuM4H8DXmN7IsyHgvmhkSCsfLQcfoJknYsEUPVAEfiYKuLMT66gyPMRmElkJrw zPLSFpcMwdYr0nsifI9eB8GUCCTihD6agPPp+fPDESQyp4mdH27RxVZCChzNEHkSosHb 9Ttw== X-Gm-Message-State: AJIora/jOZgPEr4WNAkyFa5RV4H0pwHXxNXv283/aZjBaOftzk2sofUn Ga5ByvTk4q0/K2iGZ1xuo59wxFpQSwsCuHzqKG9thA97 X-Google-Smtp-Source: AGRyM1uTcvYSltP3tye1v5AJZQLndNBSWB4josh1JRLc8iAQbdoemSgOHr0DCRTeVAXh0HaiuCpSYwyVns52F/BqW6Q= X-Received: by 2002:a63:9142:0:b0:412:b171:b6ac with SMTP id l63-20020a639142000000b00412b171b6acmr33668341pge.206.1658338245033; Wed, 20 Jul 2022 10:30:45 -0700 (PDT) MIME-Version: 1.0 References: <20220720140603.1958773-1-zokeefe@google.com> <20220720140603.1958773-5-zokeefe@google.com> In-Reply-To: <20220720140603.1958773-5-zokeefe@google.com> From: Yang Shi Date: Wed, 20 Jul 2022 10:30:32 -0700 Message-ID: Subject: Re: [PATCH mm-unstable 4/4] Revert "mm/madvise: add huge_memory:mm_madvise_collapse tracepoint" To: "Zach O'Keefe" Cc: Andrew Morton , Linux MM , Hugh Dickins , Miaohe Lin Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658338246; a=rsa-sha256; cv=none; b=yBOYGH5yal5JBbMThr5GLnFHsenGOJNzA5qIi/77PnaypZ5jtuQuFpd6WXYzXNvw4DAD3S lA8vOOVr+UaM0Mj90oZGyz5iFKzbhduZkahLYcjcAARe3riGP3ZL3QnHBwjgIzjHQPmD49 /yqY0ug0XJWFYidzcpOQvX38UnOgP7o= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=HNJw7xrE; spf=pass (imf16.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=shy828301@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=1658338246; 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=wwJHvUk/LfzYzk+4FehlPYmcu3pOPVFkNzr9au4LTQI=; b=xjKOlrUO6pjBULeMhTcFqIneHo+fBDPByYmToDYXWJy5+QsAgBWWo7MKVECAc9xcqf4Axn OLCCKQLu/76LE2LLn394DLQtv9ukmKdIZ0TkwxAy9hCz356hlSaEd0/DFSAKp2nZ4aJmlS MOwIxjmDMvijtKorYBWYrVUI6vtKouc= X-Stat-Signature: 5tmnnb33c3bmojz1gtpbm1h6a49wn53f X-Rspamd-Queue-Id: 0C179180068 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=HNJw7xrE; spf=pass (imf16.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.169 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1658338245-730000 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: On Wed, Jul 20, 2022 at 7:06 AM Zach O'Keefe wrote: > > 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 Reviewed-by: Yang Shi > --- > 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 >