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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBA6CECAAD8 for ; Thu, 22 Sep 2022 22:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230129AbiIVWlC (ORCPT ); Thu, 22 Sep 2022 18:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230087AbiIVWk6 (ORCPT ); Thu, 22 Sep 2022 18:40:58 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88208100A9F for ; Thu, 22 Sep 2022 15:40:56 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id w197-20020a627bce000000b00556ac6baf07so15038pfc.4 for ; Thu, 22 Sep 2022 15:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=MBOpi+V30VyxTJAocMNniALW6MRkylbw2LBwu6hBIIE=; b=oCIFKiW4OUoQtrTsXOTzbEwKVNj3saFB85MgUqa9cFr48OmpsyR1spCbGGEqcyYPFG 7YEMwrHdx3zwZ8hqx0g8fa+21utbCxsG/YoS645+NA4dDCrwoFB9tEJsfDHbYgveDgqQ CnqIbfysHBPRpIzSkkWe/59LIuau6cZPk0i2Hc0QmysIZbmcJMqYfOpfg4DZvb+jlsKL KkolsrymESXvFV3oLZXN6pBwGXgg3wdGK5tW//5Z5FtbMefTOJ1uzPjxGdxOmdjRdcV8 CMyAribGVqeaxHtoSIlpa4HGiBt592UTr0/CmDONCJ1n1a4YWfJu7f6toC9EHRYOO74w 9BYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=MBOpi+V30VyxTJAocMNniALW6MRkylbw2LBwu6hBIIE=; b=KpMl//pbVh3epP7x668lGo/WLnVytzRC3vy0QHf01liF1olP7nvCHVtB8z08xlHEGS jYhTbQ5vvIaxK+fglEk9rXoRvJmkCYG2kCvCsGr1wBglXekARLx7MEwnLgEwh6yNdD1B w9EqZecuUPlreb2cT7TpWro5+vqdB9QS2Lt23BpzY3OzF1pH6v92DUFvL6VW2DeTJlOb kJwgXvnbSj0nsb5cVFGzYeev+lQ3Rr8c1LnKtahE3bLdRs/cFMC6NF7WWJ5u5hsCryHG MwuvrXa6UBLyhEIcwE2kh2A/MOR+0FCgSNVK37Lo1SXyc8j+AYT1nufHFJ9qON5NGoVG CViw== X-Gm-Message-State: ACrzQf3ZTgCKQGTQtsaj5rtndtdUqxRzmwcKsx95UfXyxwis6Phnrrak Cgt7OEVNf9b/amrhd/JIslQJNk2h6K5Y X-Google-Smtp-Source: AMsMyM4jj4v1oLXtfd10ojhtj3GOdmWxKUkaFwe9xELneMFuZPFD1yJUHeS6uz/V1MAyM3E0xOLKc9miAq6L X-Received: from zokeefe3.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1b6]) (user=zokeefe job=sendgmr) by 2002:a05:6a00:17a1:b0:542:be09:7b23 with SMTP id s33-20020a056a0017a100b00542be097b23mr5939804pfg.12.1663886455880; Thu, 22 Sep 2022 15:40:55 -0700 (PDT) Date: Thu, 22 Sep 2022 15:40:40 -0700 In-Reply-To: <20220922224046.1143204-1-zokeefe@google.com> Mime-Version: 1.0 References: <20220922224046.1143204-1-zokeefe@google.com> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog Message-ID: <20220922224046.1143204-5-zokeefe@google.com> Subject: [PATCH mm-unstable v4 04/10] mm/khugepaged: add tracepoint to hpage_collapse_scan_file() From: "Zach O'Keefe" To: Andrew Morton Cc: linux-mm@kvack.org, linux-api@vger.kernel.org, Axel Rasmussen , James Houghton , Hugh Dickins , Yang Shi , 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" Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org 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. Link: https://lkml.kernel.org/r/20220907144521.3115321-5-zokeefe@google.com Signed-off-by: Zach O'Keefe Reviewed-by: Yang Shi Cc: Axel Rasmussen Cc: Chris Kennelly Cc: David Hildenbrand Cc: David Rientjes Cc: Hugh Dickins Cc: James Houghton Cc: "Kirill A. Shutemov" Cc: Matthew Wilcox Cc: Miaohe Lin Cc: Minchan Kim Cc: Pasha Tatashin Cc: Peter Xu Cc: Rongwei Wang Cc: SeongJae Park Cc: Song Liu Cc: Vlastimil Babka --- 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 a272fc065dd7..6d2dfd96608a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2159,7 +2159,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.3.998.g577e59143f-goog