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 F1CBBECAAD8 for ; Fri, 16 Sep 2022 20:41:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EB138D0002; Fri, 16 Sep 2022 16:41:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 872F68D0001; Fri, 16 Sep 2022 16:41:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6ECCD8D0002; Fri, 16 Sep 2022 16:41:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5C0638D0001 for ; Fri, 16 Sep 2022 16:41:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 355D21A0498 for ; Fri, 16 Sep 2022 20:41:46 +0000 (UTC) X-FDA: 79919119812.13.C3A7932 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf07.hostedemail.com (Postfix) with ESMTP id E347A40097 for ; Fri, 16 Sep 2022 20:41:45 +0000 (UTC) Received: by mail-pf1-f170.google.com with SMTP id w2so12043362pfb.0 for ; Fri, 16 Sep 2022 13:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=D2eCqKKZO/KXHTc0SQAQ7M2iKnTcdBEOyyiC24Tc+Xo=; b=bBMFda+nptqrlQl7ZUX4e35Q7+mbOtguQHSnbkE3b9DqfJ4xL8COtmNBXQv8rQiiu2 JMxcLesNiYuLf0uJkRLYOVEo9eJ8QdpyWx5yvcWdLICFIELKcEvlxU906Qj3jdxFlKce xirCE72KwiE+Yonxqx7IYFIK8639X/W9dOcAVHDKFromWxBK2ArrJ7uXLprCPLjdNJ+C bXt1lN1x6d142yccXeY662hHYuakpJ28R6AY/U71/mSmUoDvqJyL0Yu4HvQM1N7/qCiJ OzjCccCkyseW+qcZZHKZkhBFIWmWBWZSskSkcPUEK+JqxWZDD40/V5Tpyu1+1UwmZDcG 9bdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=D2eCqKKZO/KXHTc0SQAQ7M2iKnTcdBEOyyiC24Tc+Xo=; b=KNm/v9Q65n1x2SNAs/636/jHVphmfXfCSV0H7+OejuHVPWxZAqVMGGP765qWB8f9CO miFJfb81Gqw1yDr4XDoGlYN/Qv1f71jrO6vGxGV5HKCJukdxb5NT2sOOGiAYHidn75u7 5MamHswKOzFNglOq4vV87MjMOQr6YivBbflV+u8wR/Oh+e4aHbfR/ioKqh4XSmm+PpL5 GkGzQv7FCApYCI8e2CK22NloVSAGfvZE1Cu0AcytaSqO+t8xv5NN/FmaVyQ08c2+0B5S TQB7Nz64k3bz/lkJawZENcQl2mPlHu5Vz9hzAR5tbAMQE6OPFQuNVHn5h7MpbwLAlBlV lTbQ== X-Gm-Message-State: ACrzQf3KFDgeUH6IfmzfKjFRYLgth3zucRZhXuHnExjuCm1tWnuKovV/ Baq+q4W9Kxll+1ocm3KLEMJK8HTdoa5LURFM/7Y= X-Google-Smtp-Source: AMsMyM6t0VmlxoQlMKOPt/NFyQo/t6IJwLAzKh0xQPTMuf8YK+2qyVgXZdHuBcgogMxeyRDcgOBJxNhyFHMqBUsMDkQ= X-Received: by 2002:aa7:9193:0:b0:536:62e6:1a84 with SMTP id x19-20020aa79193000000b0053662e61a84mr7176756pfa.20.1663360904910; Fri, 16 Sep 2022 13:41:44 -0700 (PDT) MIME-Version: 1.0 References: <20220907144521.3115321-1-zokeefe@google.com> <20220907144521.3115321-5-zokeefe@google.com> In-Reply-To: <20220907144521.3115321-5-zokeefe@google.com> From: Yang Shi Date: Fri, 16 Sep 2022 13:41:32 -0700 Message-ID: Subject: Re: [PATCH mm-unstable v3 04/10] mm/khugepaged: add tracepoint to hpage_collapse_scan_file() To: "Zach O'Keefe" Cc: linux-mm@kvack.org, Andrew Morton , linux-api@vger.kernel.org, Axel Rasmussen , James Houghton , Hugh Dickins , Miaohe Lin , David Hildenbrand , David Rientjes , Matthew Wilcox , Pasha Tatashin , Peter Xu , Rongwei Wang , SeongJae Park , Song Liu , Vlastimil Babka , Chris Kennelly , "Kirill A. Shutemov" , Minchan Kim , Patrick Xia Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663360905; 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=D2eCqKKZO/KXHTc0SQAQ7M2iKnTcdBEOyyiC24Tc+Xo=; b=XHZuJ7pkBznmF/SA3ZVSRaGH2tqI7ekvG4bpGXQO0fugRimejBUMMU4GXdm+bzIulNH2xp r1wKydVhFv/BR56CxVJ7jdPwCv/cXopw5l3L0VZcZ8RB4PF2AfRs57wwIeb/ltUUjYn+IG PgPZ3KZCn2qXRO6JI4HYz+0LdUj9FA0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bBMFda+n; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=shy828301@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663360905; a=rsa-sha256; cv=none; b=cGehOyPDzW2Mzi6v0keSyfeqmwrZ2Xs2uFgRTJ5GNqS+5OnPz0knC1qx8KmEcuOmutE9V3 yQ0srUta/lfh+skDu8ZTCKlcTXjhv6cUFZ+mdC8WivEkZuZ7KLgQba8183D42mGdFQTANs gUgg+/PoNWrMAVshUtfD4CFsE+514UQ= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: E347A40097 X-Rspam-User: X-Stat-Signature: fiokz71z75tzazerpmkojok6d3m3de6r Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=bBMFda+n; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of shy828301@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=shy828301@gmail.com X-HE-Tag: 1663360905-819498 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, Sep 7, 2022 at 7:45 AM Zach O'Keefe wrote: > > Add huge_memory:trace_mm_khugepaged_scan_file tracepoint to > hpage_collapse_scan_file() analogously to hpage_collapse_scan_pmd(). > While this change is targeted at debugging MADV_COLLAPSE pathway, the > "mm_khugepaged" prefix is retained for symmetry with > huge_memory:trace_mm_khugepaged_scan_pmd, which retains it's legacy name > to prevent changing kernel ABI as much as possible. > > Signed-off-by: Zach O'Keefe Reviewed-by: Yang Shi > --- > include/trace/events/huge_memory.h | 34 ++++++++++++++++++++++++++++++ > mm/khugepaged.c | 3 ++- > 2 files changed, 36 insertions(+), 1 deletion(-) > > diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h > index df33453b70fc..935af4947917 100644 > --- a/include/trace/events/huge_memory.h > +++ b/include/trace/events/huge_memory.h > @@ -169,5 +169,39 @@ TRACE_EVENT(mm_collapse_huge_page_swapin, > __entry->ret) > ); > > +TRACE_EVENT(mm_khugepaged_scan_file, > + > + TP_PROTO(struct mm_struct *mm, struct page *page, const char *filename, > + int present, int swap, int result), > + > + TP_ARGS(mm, page, filename, present, swap, result), > + > + TP_STRUCT__entry( > + __field(struct mm_struct *, mm) > + __field(unsigned long, pfn) > + __string(filename, filename) > + __field(int, present) > + __field(int, swap) > + __field(int, result) > + ), > + > + TP_fast_assign( > + __entry->mm = mm; > + __entry->pfn = page ? page_to_pfn(page) : -1; > + __assign_str(filename, filename); > + __entry->present = present; > + __entry->swap = swap; > + __entry->result = result; > + ), > + > + TP_printk("mm=%p, scan_pfn=0x%lx, filename=%s, present=%d, swap=%d, result=%s", > + __entry->mm, > + __entry->pfn, > + __get_str(filename), > + __entry->present, > + __entry->swap, > + __print_symbolic(__entry->result, SCAN_STATUS)) > +); > + > #endif /* __HUGE_MEMORY_H */ > #include > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index 66457a06b4e7..9325aec25abc 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2152,7 +2152,8 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, > } > } > > - /* TODO: tracepoints */ > + trace_mm_khugepaged_scan_file(mm, page, file->f_path.dentry->d_iname, > + present, swap, result); > return result; > } > #else > -- > 2.37.2.789.g6183377224-goog >