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 758BBC38A2D for ; Mon, 24 Oct 2022 17:36:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C280C940008; Mon, 24 Oct 2022 13:36:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB134940007; Mon, 24 Oct 2022 13:36:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5158940008; Mon, 24 Oct 2022 13:36:08 -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 91A55940007 for ; Mon, 24 Oct 2022 13:36:08 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4E1631402BB for ; Mon, 24 Oct 2022 17:36:08 +0000 (UTC) X-FDA: 80056546416.29.D5C74A9 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf02.hostedemail.com (Postfix) with ESMTP id EC5588000D for ; Mon, 24 Oct 2022 17:36:07 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id 128so9269622pga.1 for ; Mon, 24 Oct 2022 10:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xSP1eEqSv1XvPA9FALZsPLkCJwsdVfpHOieGi3imvbc=; b=WlmZ1wq6/6gt+R7MsXQ/k+6txkY+6LANNH270vSZs7cAXNKciUb1Aa3no7PuWJj0XN KDAH0220mAN4TzZYG6gbxrjGpaltlhLmpQn23Z0efGAQaxEk4kjPL5cNBo0OPQ3UNLPw k9r0EtHZ6BFmHl/MmP9eyxrJZ9L/y7oFV+2915zTW1x7lC6c6s428aBiSWmxW7U359RG PHv49s51u1NWfdUkr2lhNMnS4HuZmUz/2R70DVUUTNzcgyiPt5QVPasG9KPEHGPWGx90 BLBcXLyRz8VK2faSvjsnYJ8sJKNaZb+C1MhvCH5pE7PgaGBbT4C5KGMdKQylV3fMmZ+L MtZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xSP1eEqSv1XvPA9FALZsPLkCJwsdVfpHOieGi3imvbc=; b=tRkySCDUCQv1u4/UjNEZOPARJrADWcaPiz3IT8DxyDjeq8xqggLyFBEx7JTVDi8A3Z 7MfGqLn/13Xf0DQQc6QFIYzC1+dqKte3gsn4fmwsWV+LSJ/MyGySxlfEJeRjsXcnR4rR 1ywfn59FRgvVUPilpe+6byTBDhEqiKLUwze1BoEJtu6j1MDReSUf4acMmG76J7OW9RGC P3Kn8KwUaksgO7+FbJ/4lOmlD0FMYS6NRCSWc2VFytZY5Cv4/tkkOBtYN3k2pNM91vLC KjE5CSZTRUH49mm86ekg9SJ1XzlSU0fD2fuirSMehGicytWkX61w5Gpxwfp+V7ScFiUi zinw== X-Gm-Message-State: ACrzQf1xamxZ2e0zxZRCR6P2mYOcRGPpeCZ4L8Dschc2MDVkahAuUT5O mcWSffcTvVcJ+KLsBNawGGU= X-Google-Smtp-Source: AMsMyM4IUkNMSFbXGOyhjUiHSa6EOD4mZwmCeM+q3qGeinEpducdTZh6kL5gOl1BEtnO5JFDk01u0g== X-Received: by 2002:a05:6a00:2191:b0:56a:fd17:6723 with SMTP id h17-20020a056a00219100b0056afd176723mr17619569pfi.4.1666632966867; Mon, 24 Oct 2022 10:36:06 -0700 (PDT) Received: from biggie.. ([103.230.148.187]) by smtp.gmail.com with ESMTPSA id b26-20020aa78eda000000b0056283e2bdbdsm74955pfr.138.2022.10.24.10.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 10:36:06 -0700 (PDT) From: Gautam Menghani To: akpm@linux-foundation.org, rostedt@goodmis.org, mhiramat@kernel.org, zokeefe@google.com, shy828301@gmail.com, vbabka@suse.cz, david@redhat.com Cc: Gautam Menghani , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] mm/khugepaged: add tracepoint to collapse_file() Date: Mon, 24 Oct 2022 23:05:58 +0530 Message-Id: <20221024173559.332324-1-gautammenghani201@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WlmZ1wq6; spf=pass (imf02.hostedemail.com: domain of gautammenghani201@gmail.com designates 209.85.215.179 as permitted sender) smtp.mailfrom=gautammenghani201@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666632968; a=rsa-sha256; cv=none; b=8LarpPyOEgvas0Jjn0bHzXazDUtuGDYASnQeRBhpcYGEHYOsPWYvBbI6G0KUK4SF6HOvs3 Vxr2c0UzixRP24J0QeYd6MR9HHEuRfF8aae8a8S6LxaQiP9ja6Rg4r6+s/KudyCMACr+72 j1D2FyECgWhUOR89cHLTCQYLEDuaKFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666632968; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=xSP1eEqSv1XvPA9FALZsPLkCJwsdVfpHOieGi3imvbc=; b=7gvYSAC/3BVW02yM+FH6QPp3pGZGxxnuMI0wkNzUbpnInpBpXnaniM+b/8bu+H2pzRXkj1 AfmYJrcjV9fie/eWsK0ZVUEKnqR7qzmoS81IYYG0bVrxWfWd6LiLbw5sKW5mviLHbs8YdF InlgE7kch8wZe/zKwuOZPKBawjOra8E= X-Rspamd-Queue-Id: EC5588000D Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=WlmZ1wq6; spf=pass (imf02.hostedemail.com: domain of gautammenghani201@gmail.com designates 209.85.215.179 as permitted sender) smtp.mailfrom=gautammenghani201@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam02 X-Rspam-User: X-Stat-Signature: aqphd18grxxy5afjaric5bkkkie3ik6w X-HE-Tag: 1666632967-410278 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000118, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: In the file mm/khugepaged.c, a TODO in the function collapse_file() asks to add tracepoints. Add the tracepoint named "mm_khugepaged_collapse_file". Signed-off-by: Gautam Menghani --- changes in v2: 1. Move filename dereference out of calling path (Steven Rostedt). 2. Capture is_shmem and index (Zach O'Keefe) include/trace/events/huge_memory.h | 38 ++++++++++++++++++++++++++++++ mm/khugepaged.c | 4 +++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 935af4947917..472238d0e3a3 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -203,5 +203,43 @@ TRACE_EVENT(mm_khugepaged_scan_file, __print_symbolic(__entry->result, SCAN_STATUS)) ); +TRACE_EVENT(mm_khugepaged_collapse_file, + TP_PROTO(struct mm_struct *mm, struct page *hpage, pgoff_t index, + bool is_shmem, unsigned long addr, struct file *file, + int nr, int result), + TP_ARGS(mm, hpage, index, is_shmem, addr, file, nr, result), + TP_STRUCT__entry( + __field(struct mm_struct *, mm) + __field(unsigned long, hpfn) + __field(pgoff_t, index) + __field(bool, is_shmem) + __field(unsigned long, addr) + __string(filename, file->f_path.dentry->d_iname) + __field(int, nr) + __field(int, result) + ), + + TP_fast_assign( + __entry->mm = mm; + __entry->hpfn = hpage ? page_to_pfn(hpage) : -1; + __entry->index = index; + __entry->is_shmem = is_shmem; + __entry->addr = addr; + __assign_str(filename, file->f_path.dentry->d_iname); + __entry->nr = nr; + __entry->result = result; + ), + + TP_printk("mm=%p, hpage_pfn=0x%lx, index=%ld, is_shmem=%d, addr=%ld, filename=%s, nr=%d, result=%s", + __entry->mm, + __entry->hpfn, + __entry->index, + __entry->is_shmem, + __entry->addr, + __get_str(filename), + __entry->nr, + __print_symbolic(__entry->result, SCAN_STATUS)) +); + #endif /* __HUGE_MEMORY_H */ #include diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 4734315f7940..977c0ff82c46 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2059,7 +2059,9 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, mem_cgroup_uncharge(page_folio(hpage)); put_page(hpage); } - /* TODO: tracepoints */ + + trace_mm_khugepaged_collapse_file(mm, hpage, index, is_shmem, + addr, file, nr, result); return result; } -- 2.34.1