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 E921FC433FE for ; Wed, 26 Oct 2022 04:45:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DBAB8E0002; Wed, 26 Oct 2022 00:45:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 18C318E0001; Wed, 26 Oct 2022 00:45:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 053018E0002; Wed, 26 Oct 2022 00:45:33 -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 EA79F8E0001 for ; Wed, 26 Oct 2022 00:45:32 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B4BFE1A0161 for ; Wed, 26 Oct 2022 04:45:32 +0000 (UTC) X-FDA: 80061862104.02.87C39D2 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf02.hostedemail.com (Postfix) with ESMTP id 570A08000B for ; Wed, 26 Oct 2022 04:45:32 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id j12so12946350plj.5 for ; Tue, 25 Oct 2022 21:45: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=EPEBUQ2z1U7/dgSFSNAUfBzMgt42T5/xBPU+XLvKjdk=; b=TmkyHcYaeg+xputRQCAesOCxrLkTrfMoeoEjkOxSE04SDZO5SV/QZFbalVeNW75ShL oIZYtdWLD/HIgAHP4DZfdE0GKrRbH6KCqLh8IT+WrKQEsLDLw+Cb3plCs8YA/3IZx3l8 YZnjLi7y87blubFTpSGhR9wd8w13SgDGeYwYXlUarJEa7DHWHj7tgdmE7JVWrV5X3vCr ZaveBbbZ2S9q47Lwrys9vAg0y7/NdbPeYSb2qZpZBWK2gvrZfh0Fv2BPxGZvnfi6LpUE IgRsimToKbSz/tR5IqXeoHriqufZ6XFcEpVZ5WthUiY5DETCC6REH+18YPF/4v3LphcL 0A9g== 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=EPEBUQ2z1U7/dgSFSNAUfBzMgt42T5/xBPU+XLvKjdk=; b=DwSFJXKF+EtQTrUxH7b0ez3/efEMt58qmuFEVrN6lE6UCVJH4X1KcNNktq10GLcfY2 +yn18tq/3OyzQZLM/oHPkxEAdaMbnkEq9Hbu/Bqlgydv0XgB2aFmSNytehFYzIb2qTIZ o+i8NLDo/iz90Utzj+Fvs1BGxMZl9CBB0H5Ad8W3k/DwLv+iboJbe6tgO/fuLVui5wcq U2BbW4Mi+OaqwCfk8xoXsgrWCtZqGT+8uPzjGAzpNTVKR8IdZHyj4bhJLQj/QJ9YEme2 ucDHBOeNTpEVhOH7+mQ81Mpj4AMKrp+8909jhxKlOd83G4N1hLAzig/CGwQQJ+cDMw6K guBw== X-Gm-Message-State: ACrzQf2qAy7g7OtBtuMcfOSeVpbAC/WTAyiXZFCnAIBValwO4/Gw5e/s TEZvokWdK5Ma/KPO8YAJ/gfvKq0sI4PrT+2s X-Google-Smtp-Source: AMsMyM6E8prJ0/hpgjm9+1NHeQpQ2EDXgO5KO/czl59OZhe0/yhvhAbOj6lT2YloJ+GvrEsl+jMszQ== X-Received: by 2002:a17:903:1109:b0:179:d220:1f55 with SMTP id n9-20020a170903110900b00179d2201f55mr41381097plh.42.1666759531164; Tue, 25 Oct 2022 21:45:31 -0700 (PDT) Received: from biggie.. ([103.230.148.186]) by smtp.gmail.com with ESMTPSA id p27-20020aa79e9b000000b00562a237179esm2181073pfq.131.2022.10.25.21.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 21:45:30 -0700 (PDT) From: Gautam Menghani To: akpm@linux-foundation.org, rostedt@goodmis.org, mhiramat@kernel.org, shy828301@gmail.com, zokeefe@google.com, david@redhat.com Cc: Gautam Menghani , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/khugepaged: Refactor mm_khugepaged_scan_file tracepoint to remove filename from function call Date: Wed, 26 Oct 2022 10:15:24 +0530 Message-Id: <20221026044524.54793-1-gautammenghani201@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666759532; a=rsa-sha256; cv=none; b=SkACbWvMhxPue9IODmEDl2HhdoSEMsNPksRzTP1cK31Lt0P1UFK1Ne5RJixvqzd7atw29r F1l3DfPKO2PjM91Q/mxuhJKZWkF3Vxd7VkqDMx4+2/5/iCzbJDjfFZdQA2Lar5vJQ+djl8 DAMTgl6ljL9RUdwGJd2kIoQ/4fXscA0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=TmkyHcYa; spf=pass (imf02.hostedemail.com: domain of gautammenghani201@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=gautammenghani201@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666759532; 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=EPEBUQ2z1U7/dgSFSNAUfBzMgt42T5/xBPU+XLvKjdk=; b=WB2zpnx4XSNi9+Eny5pVjy6uSev8JBgfm99EAqdvEp7itktxFDsv0l7nHP+5P0Dt83M/Em dNzw5QZPC3giZ5+OtU5AdExYel8/MvTIu2lIrj5uZNKacyLU4z0db7a6InSwDEEcexegEA oQxQlYUBLk7G+I8SgcfYlL1tU2/Txn8= X-Rspamd-Queue-Id: 570A08000B X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=TmkyHcYa; spf=pass (imf02.hostedemail.com: domain of gautammenghani201@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=gautammenghani201@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam04 X-Stat-Signature: z18c11p441a3oamc575sot6w1xor3wim X-HE-Tag: 1666759532-445002 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000005, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Refactor the mm_khugepaged_scan_file tracepoint to move filename dereference to the tracepoint definition, for maintaing consistency with other tracepoints[1]. [1]:lore.kernel.org/lkml/20221024111621.3ba17e2c@gandalf.local.home/ Signed-off-by: Gautam Menghani --- include/trace/events/huge_memory.h | 8 ++++---- mm/khugepaged.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 935af4947917..760455dfa860 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -171,15 +171,15 @@ TRACE_EVENT(mm_collapse_huge_page_swapin, TRACE_EVENT(mm_khugepaged_scan_file, - TP_PROTO(struct mm_struct *mm, struct page *page, const char *filename, + TP_PROTO(struct mm_struct *mm, struct page *page, struct file *file, int present, int swap, int result), - TP_ARGS(mm, page, filename, present, swap, result), + TP_ARGS(mm, page, file, present, swap, result), TP_STRUCT__entry( __field(struct mm_struct *, mm) __field(unsigned long, pfn) - __string(filename, filename) + __string(filename, file->f_path.dentry->d_iname) __field(int, present) __field(int, swap) __field(int, result) @@ -188,7 +188,7 @@ TRACE_EVENT(mm_khugepaged_scan_file, TP_fast_assign( __entry->mm = mm; __entry->pfn = page ? page_to_pfn(page) : -1; - __assign_str(filename, filename); + __assign_str(filename, file->f_path.dentry->d_iname); __entry->present = present; __entry->swap = swap; __entry->result = result; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 4734315f7940..9808a899f9f7 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2157,8 +2157,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, } } - trace_mm_khugepaged_scan_file(mm, page, file->f_path.dentry->d_iname, - present, swap, result); + trace_mm_khugepaged_scan_file(mm, page, file, present, swap, result); return result; } #else -- 2.34.1