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 C63C6ECAAA1 for ; Fri, 16 Sep 2022 23:05:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E3EA8D0002; Fri, 16 Sep 2022 19:05:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0940D8D0001; Fri, 16 Sep 2022 19:05:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4DE08D0002; Fri, 16 Sep 2022 19:05:43 -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 D285F8D0001 for ; Fri, 16 Sep 2022 19:05:43 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9DC0A141C8A for ; Fri, 16 Sep 2022 23:05:43 +0000 (UTC) X-FDA: 79919482566.24.3E5D303 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf13.hostedemail.com (Postfix) with ESMTP id 2D72C200AC for ; Fri, 16 Sep 2022 23:05:43 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id q63so21644631pga.9 for ; Fri, 16 Sep 2022 16:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date; bh=JPS3rZg4bQ62RtLzsB7DgGU6ZsDdjoF4tP8H2c4lSWg=; b=jh7AhztYzYpQz9QGFSUwzCSl6BMCHWMP5wLzATZsIheNEgGXNQ8PlG5i9weZ51RKmf hDhnRs4dglyPOGituqoUMss4FgEukjpASj9OouMXam+9KJJ4cmIvHmOSERSqXmdaRxfG yt3/E5GzzjG5EgQtBohUesRrPXzEoSJ4047ffdt8W1C4FOXlJPEQeQsNWNsH7Emz+W/s 1ezR39+sok5UN+ys0LIhMmEKCXTuZHgzGh4puiywidbDm0I6zxGLaLCDZtpS47PknAfV Wwd6y35mHkM92lOBgDEKmtuEb5h5CHu/2ClPPNoiUMkFb8qEhw7vKAAIoZAOa0KV8MaU 5TOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date; bh=JPS3rZg4bQ62RtLzsB7DgGU6ZsDdjoF4tP8H2c4lSWg=; b=xCumDG+eyqc6Y4iFX61JpL7Aca3/+Co08xacK3jvyYBBJDYFKkWav0OipSnAsZcgNO +5nRLCISEJhVr0rwDOBmhgGUoeSi3SbX29N6q6kZN4k2TbwNF88PabNVHGTblXzNf/Za sFTF35Cf4BxMRJonzFZK+0lyvQEuT/93MBtyte0m7//9mu0nMfQ84tvLc4smfBw8oNSZ seRsFSlYZi0huw7OW1qehB45YY4FclN7ajVqSllVeLrUmQuCF8LQXQZCpGWOByMHq5Il O+J7OrmE+/3S7iYd6TbzIgpfiOWq0JsnuYnS6JL4n+PYoNCIRKxA76dV3Uk7tmy3x04c 9Agg== X-Gm-Message-State: ACrzQf0Fn5EFpQO3VjKFgiGR/AkLRUinc5NqY2BrhPOjiNq5IhTUbMcp iW/ihOZib184pa/JI+fVQ895Dw== X-Google-Smtp-Source: AMsMyM4w0RVV82+Q3b7HuylqZMpKg87acNTPI01JO42vgXPC+p5MKWY281B2C9+jJX3cGhkOJWq/9g== X-Received: by 2002:a62:1a8d:0:b0:544:1309:19f3 with SMTP id a135-20020a621a8d000000b00544130919f3mr7429622pfa.37.1663369541940; Fri, 16 Sep 2022 16:05:41 -0700 (PDT) Received: from google.com (33.5.83.34.bc.googleusercontent.com. [34.83.5.33]) by smtp.gmail.com with ESMTPSA id c3-20020a170902d48300b001786b712f0esm4535776plg.227.2022.09.16.16.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 16:05:41 -0700 (PDT) Date: Fri, 16 Sep 2022 16:05:37 -0700 From: Zach O'Keefe To: Yang Shi 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 Subject: Re: [PATCH mm-unstable v3 04/10] mm/khugepaged: add tracepoint to hpage_collapse_scan_file() Message-ID: References: <20220907144521.3115321-1-zokeefe@google.com> <20220907144521.3115321-5-zokeefe@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663369543; a=rsa-sha256; cv=none; b=8WlpX8HNbLBjcjgnqgYxA9nAhK2A4YH7AC6YRzASvl/Q8Enw/NP4vfd6uru1zMo2ibCkdk lSO9rgvp0iRW+GreJnkmDdVZsF5HUATo6x7u9UgNCNCzkoloafg40j96s0FjVpCJtiFAe4 rFQxPnW7RxT26aI55m2HRauJ4HHNYEg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jh7AhztY; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of zokeefe@google.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=zokeefe@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663369543; 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=JPS3rZg4bQ62RtLzsB7DgGU6ZsDdjoF4tP8H2c4lSWg=; b=Y16ns6xsre7Ue/lqxEbuLzEg4UiVaUKPC3iMZageNU262AKnnaXzuiTuCEWdddk2242cpR +edYpTNnb8VCS2ANkODlRZ5Lb4PlCdwAIhtZA9WNGxEncJV5HAhMrI1p5iVEcjbS6foHF0 zwIPU28hSbrt0v5I7LDj/hIClAEgeak= X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 2D72C200AC Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jh7AhztY; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of zokeefe@google.com designates 209.85.215.175 as permitted sender) smtp.mailfrom=zokeefe@google.com X-Stat-Signature: wmfnrbndsuu96auy98pajwkcsgzb8w9p X-HE-Tag: 1663369543-697277 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 Sep 16 13:41, Yang Shi wrote: > 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 > Thanks, as always! > > --- > > 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 > >