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 22111C38A2D for ; Mon, 24 Oct 2022 15:09:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0F01940008; Mon, 24 Oct 2022 11:09:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABEA2940007; Mon, 24 Oct 2022 11:09:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98682940008; Mon, 24 Oct 2022 11:09:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 84F6D940007 for ; Mon, 24 Oct 2022 11:09:34 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5C338140E26 for ; Mon, 24 Oct 2022 15:09:34 +0000 (UTC) X-FDA: 80056177068.25.2D198B3 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf03.hostedemail.com (Postfix) with ESMTP id DD0252002D for ; Mon, 24 Oct 2022 15:09:32 +0000 (UTC) Received: by mail-pl1-f176.google.com with SMTP id c2so485534plz.11 for ; Mon, 24 Oct 2022 08:09:32 -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=w3y2AMrHeVKvlfYZQ2uRso4bzDxf1Jp6u6RB+7N/ROg=; b=Z6H0V/KnDIDr+iK4ALSarBPwH632T1G5oGp3SDUHnpEebz/CWdkx0Gvj0KeApZZV3q AgHV6H8pEWsE40nitz3o1frKYCUTvj3RTqVdJJYVfnXm/5bJ4dogQGkY2S8qVGs7AvCL qETHwAUVgPYzH3IMvvT3dBa2P7A8kqZnXhaw2fThf1utMAagGpq1usWh+XnSsoK3v63A sU+udcfxpHzXfiVcDgNooXDgKANYya1kkT1T6FE036JoEBW8L9/sgA7YdGl9T0nn5Vlk PIOl9MXz4YAzQ9aEDVgZaUnzalov/jk+EuZNnrFKPKccPwJONed+fmhtzZHVr7Sjjq9D 8ldg== 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=w3y2AMrHeVKvlfYZQ2uRso4bzDxf1Jp6u6RB+7N/ROg=; b=nerAPpxqmonfsErTWiv7HEgP2IXgJhNufo56yAcLt4gxK1XBjX+c/s7AtdV1Jahe3H KK6lHRuxvaFpO+bA5qaPECt3kF8rLKhNZrXRUe8EqPuhB4xMSLId/YdRWEKkj3gnnrgI O6h0Tbq7UAy5OOrQiDbqr/J7FuKKHZJGgTEHE6EKPJvOcomfWC9HSeGUXljNkR0u5D0y +5wASaIbPyuWLBtIf+574Vk60bUKo9vXklfe1C7jZO+ZyxsMMsVwtbtbYgXe4YX82B1E qkMr/4Ar5GuAcykKyBVGPLqMLAdyb0lusSs55aoInJKG2BYu+aTFrw83eWL0ZJcrqzy2 vIkg== X-Gm-Message-State: ACrzQf38gY6i9jEsG7/xPmdF1/nOnylgulM3fS1Ux1XNh9Hz+SC6rFla CsUDOLqpiowDtMJJSsdVU5Q= X-Google-Smtp-Source: AMsMyM6N/9jO7DpbdtNliGJjhCPCNxfkUwy6g54IEy3I0K1xF7p1W5slfSfQGbwcdb3YEz80xd5Fpw== X-Received: by 2002:a17:903:11cd:b0:170:cde8:18b7 with SMTP id q13-20020a17090311cd00b00170cde818b7mr34053534plh.165.1666624171540; Mon, 24 Oct 2022 08:09:31 -0700 (PDT) Received: from biggie.. ([103.230.148.187]) by smtp.gmail.com with ESMTPSA id w65-20020a628244000000b0056b802b8845sm4300138pfd.43.2022.10.24.08.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Oct 2022 08:09:30 -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] mm/khugepaged: add tracepoint to collapse_file() Date: Mon, 24 Oct 2022 20:39:22 +0530 Message-Id: <20221024150922.129814-1-gautammenghani201@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666624172; 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=w3y2AMrHeVKvlfYZQ2uRso4bzDxf1Jp6u6RB+7N/ROg=; b=tGICeQTskXavvnXj/qK/LNqu7GFfCunwxYIz0CQJQF+heB7nZLx9hn6tMwrSjUeBP4UTOy 7E9yAjGcGjHqRvPYmapulcgDA8rLPE1zxurhen65GoW646xtslP3bKdgniDlBHhLPOBD/K wgjP8Q0VA9oCFfVokc2JZjEGBMf9GSc= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Z6H0V/Kn"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of gautammenghani201@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=gautammenghani201@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666624172; a=rsa-sha256; cv=none; b=3a3Rcu/H7GXoWHCuqGOlcDsN5mG3tbBbQ2TGl8eYAtkbJdo7cuguZU4Fuk2jNbqr4Oe6xL 38Wktan/FUE5xP4chxu5Ate+M1tpz1jAmm5y6+2PqZhkQOCA6oH0vwYjYdaOIfDselM/3a fV1iWCrNyskBkok6XjPer20ZMZ/ni0I= X-Stat-Signature: cjz9zhx89ni8tm1iytwqifnp18b85tbf X-Rspamd-Queue-Id: DD0252002D X-Rspam-User: Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Z6H0V/Kn"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf03.hostedemail.com: domain of gautammenghani201@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=gautammenghani201@gmail.com X-Rspamd-Server: rspam01 X-HE-Tag: 1666624172-298623 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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_scan_file". Signed-off-by: Gautam Menghani --- include/trace/events/huge_memory.h | 32 ++++++++++++++++++++++++++++++ mm/khugepaged.c | 4 +++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 935af4947917..b2f3157d2ff6 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -203,5 +203,37 @@ 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, + unsigned long addr, const char *filename, int nr, + int result), + TP_ARGS(mm, hpage, addr, filename, nr, result), + TP_STRUCT__entry( + __field(struct mm_struct *, mm) + __field(unsigned long, hpfn) + __field(unsigned long, addr) + __string(filename, filename) + __field(int, nr) + __field(int, result) + ), + + TP_fast_assign( + __entry->mm = mm; + __entry->hpfn = hpage ? page_to_pfn(hpage) : -1; + __entry->addr = addr; + __assign_str(filename, filename); + __entry->nr = nr; + __entry->result = result; + ), + + TP_printk("mm=%p, hpage_pfn=0x%lx, addr=%ld, filename=%s, nr=%d, result=%s", + __entry->mm, + __entry->hpfn, + __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..14db90e2f2ec 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, addr, file->f_path.dentry->d_iname, + nr, result); return result; } -- 2.34.1