From patchwork Thu Apr 17 17:17:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Ni X-Patchwork-Id: 14055924 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 5CB5BC369C9 for ; Thu, 17 Apr 2025 17:18:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9AE3280059; Thu, 17 Apr 2025 13:18:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4A27280052; Thu, 17 Apr 2025 13:18:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1212280059; Thu, 17 Apr 2025 13:18:33 -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 7E9B7280052 for ; Thu, 17 Apr 2025 13:18:33 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 699951C7771 for ; Thu, 17 Apr 2025 17:18:33 +0000 (UTC) X-FDA: 83344194906.10.1435B09 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf23.hostedemail.com (Postfix) with ESMTP id A093F14000C for ; Thu, 17 Apr 2025 17:18:31 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DHjHokA8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744910311; a=rsa-sha256; cv=none; b=Zjn8Sc2KaloAi84a/b+ZIJUXgqLQPKB9CySLCemlXXhfB18iaxbt8q8K3vstpcLvFwxx4o nWhUrqM1FEsk7MOEF6CJtZRZCBDu6azFU56gEFk4PreaTO+g+S2UN859C29bKy4y+keEa0 1QtyLcJiK+r7ey3uQ+kXlLimXmKP6xo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DHjHokA8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744910311; 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=Ij1VYhkhfoRdpQc1o7qdcqhwt77zHhYQwyqkQvp1cKQ=; b=K6Oon8wLVLrKRkmDCrp3/vGDEQ6URRx1WO/aUkIGUzpzm2fcZUWnvoDSZVs2PWt7DPMkMB jUk1LifxqeiZgb8nBQIOanwJra7K9KmcKwFMb7WpxXtuqJgd4IxD6G2FOtUMq/J8AOIH+E GhbikcXjFeMLiLRspFXnXEtWhdLw1Hw= Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-22c33ac23edso13244865ad.0 for ; Thu, 17 Apr 2025 10:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744910310; x=1745515110; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ij1VYhkhfoRdpQc1o7qdcqhwt77zHhYQwyqkQvp1cKQ=; b=DHjHokA8sWHy5Wk/0jPQZZRyJ1o59TtgLlLafacdFSGWpQG4XghS9NfWN+SxRpzQQ0 eC7zSXX88tHk9COPoRO4wQwhC/KLsasAximbuxzq4dcUddjO/qhducxwyYg/4iQ6KvKw Zl3DAjZPASu+PGpngjstNezgiHhl0HRtewR15tIm7qeuhlXFjvqcCOR1vZQFkH2d561R G5Ivfl2nGeInARsWlKXp6i97LwS/tc+lTg0r7BzMEq2BScY6p3j2Cn/WhiRa73TFqj6t 3VGgkF36hWgSqO+e82F9fcdYEGFW616ZHg6OdmAbW+MTkXUib+Sp3RZVpeT0GhlNP9Kg PdcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744910310; x=1745515110; 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=Ij1VYhkhfoRdpQc1o7qdcqhwt77zHhYQwyqkQvp1cKQ=; b=XpsB3NIujqBz347P7TXxl/3YK9+nv3GsB94qz22WFCeH/ha6P6ZG4ngH4RFuNp4Enu 7C+33UF8Tj4kddgyWwQK4Ap4oGb26wJXde81nzGriq3HVw8xQ2mgP+uuQFMVS3jcZxh8 Eo6iPhyMep25BWzgnCl3zCesf76kDIwX66bw35ThIUkmXlaSHlPxjcckA5G8CJE/Qp5a vvK/E0XdK+miH70oHNK8tQ2iUV1rcXk+RZkHXDjEFb3a4Q5LdtfL7IbO6VzmOIzdu/jY BcVhShcYw/98NoUBrPB6zFrfKdfCrjlKHeHE9dT6tLVfZbnX4ytzdZUqnBAA7BsQokY+ GcKg== X-Forwarded-Encrypted: i=1; AJvYcCXW67a9S5COOrfZ/l+Jq/+KQ9kRGfVdyWvq6w7iNR0r+y/CZ0PLrq+LxRcmtul/PguX3ulRwSeGRg==@kvack.org X-Gm-Message-State: AOJu0Yz4EY74YvG+ow3o1tzpX6IOZ3ZJz1z5q3QjX64AwFVFTJmojvJQ tr9ZmC5L0J6LFGqVIUHNRu+ICvF+Ff6IqM/5ijWfh+JhjxHzLreO X-Gm-Gg: ASbGncv9nTjpmsRMnqwvCPuSiP17KIr4i4rb2jsRD8g5w69AFbcxF6Nl01q79Z05lCM kGiDbqr8RTUGrsAhASfK3oaqophIy52C+WP1g6sBvSV9ws6BWVJ7wDoV2ANUtCLVlZ5snAHPEul 3PXZnHuN8AJhTpVqnqr+8jkmMLVgVVg/s5hB+1id2KvhPmLhBSTAwQJi4mNCAAOKX4g1qqjt8P8 Qj+bN2cfnzF7qqDd4xmG3TCvkb3REPA6M+zi+dL0uGar20wnO6loxHw9F+6sJ8fqxqTVXG3YhWU MI0LRvhI1H8xT6uHf2XplCP6knTEDsmLB/N0S0qxA3jiGdXTAzn50PsztQ== X-Google-Smtp-Source: AGHT+IHBxp0iLO5I1CTrBU923VZfaA0H2tWVL2x/5yftFykhou+NXEhiMf6ukkG7qWzsj3770MK+zw== X-Received: by 2002:a17:903:298d:b0:215:acb3:3786 with SMTP id d9443c01a7336-22c358ddbd0mr96860635ad.19.1744910310391; Thu, 17 Apr 2025 10:18:30 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8f03:9fee:5e33:e006:dcd5:852d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eceb74sm2338555ad.166.2025.04.17.10.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Apr 2025 10:18:29 -0700 (PDT) From: nifan.cxl@gmail.com To: rostedt@goodmis.org, mhiramat@kernel.org, willy@infradead.org Cc: akpm@linux-foundation.org, david@redhat.com, fan.ni@samsung.com, yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, npache@redhat.com, mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net Subject: [PATCH] khugepaged: Refactor trace_mm_collapse_huge_page_isolate() to take folio instead of page Date: Thu, 17 Apr 2025 10:17:11 -0700 Message-ID: <20250417171758.142745-1-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Rspamd-Queue-Id: A093F14000C X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: kdswngith4mfdjest7eoqitu5negwdsy X-HE-Tag: 1744910311-337940 X-HE-Meta: U2FsdGVkX1/mMircp80AD2brc/FX/iC9ZstoSAz/iILmSLzbpr6pDKJMU5hIBnlPxasYT28Pu0+Sho+pzMbV/7+b3hkgzBmYuRF0preL4gsHGmUADnBnTg8OOnF35lrlnpMiQMSjxYjuULiMbSKje7SytqpYBqSfOLPdf3CL8vtsp8TFI805uywbFg7hcFTUDrDac48MAnHXDzBrqmE/LG9Z+YI7TsHkmt27ENtFkIT9v1klEcuFDHvvZ71VAYQr6TsoMbSHmHf4JYKrJaVQj9lRWt8bPu8MR9IqMix1b5bKvmtpR33CF/XNQwoUfHQdd+VmIKi06+s7BM2JW+8Yb9D3B2t0ToW5AIRMyvzoBctGeAEu3Xtj53a97IE8Ei+SRqqQYvJyAd6pW12N+1qqE4CV5kAiS4OeUKpggeWsEQXDLYLXEAqWerWsKpnnQ353TCMzI7Rpg7ZEuInUaQAAq3E8mAiI1cZWmJMHDhzwaLjV1354SpNEiMfbW2cobdOqnrUXlVUila6jBBr6EZPIQe1/J/040MDxmICszHIPdqjsyJv55MfBK6Bdnv1B80/GDHYn0DLniLhuzo/qgDlCcJuxrjQywvG3kOXfjU5yKoYJUaSOkatcChCq2jqIWI8DXQiuOdO3KIhvVjbgMJg2iLL7DJwkQPFDfmhNOoSBReEBEDTl1ff70TAYEcdBOsCTGnbuAWSq2p5m0t7XOavTM0elUinyejAoB56DMaHTLIMQ5QEuFJcbHqUOfcR+FLW6G7qFVBqIGq1aPL1B8KGAsuykZmR4aNOtGqFBFnLDM/DX/AiDyJIfvvxpdWw/vFxl24bn0WFEfTpGBhC9mhdyn9ey4CEjN9qerrZixbptJGfCNztIxCgFkVMa7bFuh0u4SQWS0hDDsHR/nwJoHe+PjFebATANrdekmFCw7Upoal0XB6Tr2tgXeIcppvLPpPivNNsLdSKlS1Wpr84MyG5 cBwaDrK6 RseYv0YfKUvp693bdD6kVVKK6jXWagzE6c0RE8Af0jyyNPtkf1DU7AXpFZQf3UXHtbnOeR/lWj4IvSpBZuQXOhGkVqK8x2Ry2KoUZ5+Pn39VsxmBwSdS+zaCOmCLGeDeSccfJ4yAKe2SBhtkrgcaMZV2ce2Ya4WYrciWV3iJlnO61+Qre1JXaQZn8/56X7OPjdCgO/fJmviVAFBfU8obYfaasiIlytzyJUMRszIM1ipoPwb46yDfmCbXtrpo5jKw5iR/dx4mbRnMZidxHJAA3T1Q75cC+074TQyh6N+IgwbzF0W+XkSpKopU3rwF2jhDUst0D4/5Y1ofb3o03atFJkBOKgArkIsqP7njjU1INxxCwH2rGYdNnvNCV6HayOg7TDX4b66169X7tz2Bv6GORDTB54wsjPaGLrMWatlwmzVEvQ3IWGjmBZWjOZrO+vV+NMnNdAz3p0AlEjxzMDqOXr6KxcFOHuJw8JhU2vu5KkoaSXzvdtpSeCLCVBg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000115, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Fan Ni trace_mm_collapse_huge_page_isolate() is only used in __collapse_huge_page_isolate(), which passes in the head page of a folio, so refactor it to take folio directly. Signed-off-by: Fan Ni Reviewed-by: Baolin Wang Reviewed-by: Davidlohr Bueso Reviewed-by: Nico Pache --- include/trace/events/huge_memory.h | 6 +++--- mm/khugepaged.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h index 9d5c00b0285c..a73699f000de 100644 --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -116,10 +116,10 @@ TRACE_EVENT(mm_collapse_huge_page, TRACE_EVENT(mm_collapse_huge_page_isolate, - TP_PROTO(struct page *page, int none_or_zero, + TP_PROTO(struct folio *folio, int none_or_zero, int referenced, bool writable, int status), - TP_ARGS(page, none_or_zero, referenced, writable, status), + TP_ARGS(folio, none_or_zero, referenced, writable, status), TP_STRUCT__entry( __field(unsigned long, pfn) @@ -130,7 +130,7 @@ TRACE_EVENT(mm_collapse_huge_page_isolate, ), TP_fast_assign( - __entry->pfn = page ? page_to_pfn(page) : -1; + __entry->pfn = folio ? folio_pfn(folio) : -1; __entry->none_or_zero = none_or_zero; __entry->referenced = referenced; __entry->writable = writable; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b8838ba8207a..950d147cd95e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -696,13 +696,13 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, result = SCAN_LACK_REFERENCED_PAGE; } else { result = SCAN_SUCCEED; - trace_mm_collapse_huge_page_isolate(&folio->page, none_or_zero, + trace_mm_collapse_huge_page_isolate(folio, none_or_zero, referenced, writable, result); return result; } out: release_pte_pages(pte, _pte, compound_pagelist); - trace_mm_collapse_huge_page_isolate(&folio->page, none_or_zero, + trace_mm_collapse_huge_page_isolate(folio, none_or_zero, referenced, writable, result); return result; }