From patchwork Fri Apr 18 18:34:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Ni X-Patchwork-Id: 14057583 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 5E326C369AB for ; Fri, 18 Apr 2025 18:39:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4E4C280147; Fri, 18 Apr 2025 14:39:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BAFB6280146; Fri, 18 Apr 2025 14:39:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A29AA280147; Fri, 18 Apr 2025 14:39:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 80D62280146 for ; Fri, 18 Apr 2025 14:39:49 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1E810160BFC for ; Fri, 18 Apr 2025 18:39:50 +0000 (UTC) X-FDA: 83348028540.13.8F7FD1E Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf25.hostedemail.com (Postfix) with ESMTP id 4FD21A0006 for ; Fri, 18 Apr 2025 18:39:48 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DZ6VoNP9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745001588; a=rsa-sha256; cv=none; b=OgK8GOrGuQyldCMWsvXqoS8JkcwKN5SMmfM+zUDtLbYSZsuA/Hsu9K+uz5EZARZiDfJEvW QoucqWd8BLHdygsZD1oiIhx0Q0WQdtKn6Qc0eiV43vTbQI7z0+K/VwJHxBfLQOFhtdu/LP ROUoeVAMUqdc9ryTBEDDn9PaLRFr9U0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745001588; 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=Goqo2j6Sp0E4BTDR+tbGqecfRzssVKsfJF5DD6KEUQU=; b=wb9oTIRYgLnt8+LCt8zi7dTA4jVdb09FY+/a6xCu8WMmxhcn5uumMoXBETSVCXT+oTQozG vE8LCwroDKvJlgNLuWruG6FCXDEuBy5317obwMQXqYpe0QLwmyN4VvJBHcjovb+iTN3El0 g6DkACSU7HvwpR0MS9yF3B7CCYqdsLY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DZ6VoNP9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22438c356c8so25748455ad.1 for ; Fri, 18 Apr 2025 11:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745001587; x=1745606387; 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=Goqo2j6Sp0E4BTDR+tbGqecfRzssVKsfJF5DD6KEUQU=; b=DZ6VoNP94A/L6nci0FX9rTR/PB3aEhsZ91pNL5z6TIoR2QF1xu81QHsJSyuBwguW/v jfDHkJdkRo98h1jkdnWHGRGDFQVouk1CgdyEZWdQTRMSzjPDfjU1RnHdmyN0hiLMivAL 6HIH/4042sxP0iBNF2d4gthjfKWOqnMbJb5FIg9I3FH8kxh/Wma9/G3DGgPeipjS3biQ 1AL7pU3vYeAt27g+DeSIc6b7rXSSZyoiyNAXjMUfrncSGCyikeTeCJDbIw5iZRKIcKvQ S6u/DGtJ0rByzwFJuTqkj3eSuY+ewDjlEQxvuUEMtJ2Wmk2IJQ120pz5y33o4VrcQoKm JSNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745001587; x=1745606387; 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=Goqo2j6Sp0E4BTDR+tbGqecfRzssVKsfJF5DD6KEUQU=; b=vqt6FrntbxxJBQGgpAx7ZJis4EH8Yj7DWQvC+vo9aK3R3FVojjoMsrR1c7sX2dK/eS fmyX9vsoLrHi4REA1gh6A6IYdYvq3xjxrto8Grfb8jtV2MnedCBsl3C/e8A3zw2BiGOE 85NVsvTC11ZHQNup9GgAeMKcBlZ/HYARQqBK1yJjM7jVUXn2VElTcnMqsLSR6GqxLuPl Q2TRj3OPVS1CtjlOvcEa+rjMsaJafg6TUC19WOt3N39ZcEZI2FyrNBYVB6IhpFgpF1Wh EhBS0C/+5bq3F41+nkIyrWr04Yn5JeQeI2YT1FQ5wfRqqF3Rv1Fs6z+wJn+turjDSI+n 4M9w== X-Forwarded-Encrypted: i=1; AJvYcCX6kYNqurpxhu+8bp58JmlMNnh5CmVxmovlmcamOMkEQaY3xrZMBOFV9yg1iWGXuhGkVPCVgsWtig==@kvack.org X-Gm-Message-State: AOJu0YxAzQV63mi2eUJJYr9j2GrYfpCznTT/Zr55zuvAapQXGH75Id2W Ok9WEH/dZn7LnM/lWK4GJz4dHEQY3MzKhs+kXLwyKnQA4L+4xYNg X-Gm-Gg: ASbGncsO+81hHIXPOfLrZUCR38Re9epC7lUX6nvhw1G0Zjm+lOkO70K1sAh1++I1kdM u6pFdEKWsGvZnd5GV0BfsdtrzPvDUTJxJUVMf8lNoPIl4X/yykWTd1pQVTiWI+c/zufVWuXmuCg dQB0EEPBQsvcZ0NU8G9e/uKP5OpSVEdXLMnvlnzFMy1mRrIEjFajetpp4aDcjBB2A7vX4gT9nQt mX28ZfJFsouqcC5MZYBEOQA9WV7TlvD7EGSmEu+EoqLrO/Lt+U1PaYAKNpdWdrMhGWEK/ff+Wce FB7M6UBRIiC02ul3YSXm1EE8L3Og83/NaqM35v0twC4wp6PB9uxnoNQKag== X-Google-Smtp-Source: AGHT+IHRJWWaKfQtg/yMVMqCi+pENNAPIR5/EfTc8Fd4qzR2x2UpCcVE/69Mn2/dX/6szddjaNNghQ== X-Received: by 2002:a17:902:ecc7:b0:220:d79f:60f1 with SMTP id d9443c01a7336-22c536151f7mr54362385ad.42.1745001587053; Fri, 18 Apr 2025 11:39:47 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8f03:9fee:5e33:e006:dcd5:852d]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50eb463asm19865975ad.141.2025.04.18.11.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 11:39:46 -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, nifan.cxl@gmail.com, Baolin Wang Subject: [PATCH v2 1/2] khugepaged: Refactor trace_mm_collapse_huge_page_isolate() to take folio instead of page Date: Fri, 18 Apr 2025 11:34:20 -0700 Message-ID: <20250418183920.273154-1-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 4FD21A0006 X-Stat-Signature: rsymr6qg6qejxcwg4oitfmyomzdrjjuo X-Rspam-User: X-HE-Tag: 1745001588-908632 X-HE-Meta: U2FsdGVkX18W+3gkTC1JujsW+wke0vjXFsckExujpkbjVA/V6VTxNC403OeuK/BEh5r+i+Y8sJ+WPq48ZeYZSTv+3J/UEZlAWw68q5VEOKtC4J9yduvjm3eNHRdF84025ucODiIe/PjmZpwCwOSXzB3w4daNot6v8olsZG7Ncig3V/j3wD8CeXxjgJeaehZ9xqEz10uP6Xh/O3mkZSXk/IhlG2EYBz7GzLxJjaWy6890TMTh7W/uOTH2TsaTb4Ugkn3ax3Z+wwnAs0Uub0EphheoPL8Y+ZTQNhGgfgGJMCMt1sxGtO8hO6oRjCZ5paI4EuxBW0Wl5M1/pHF4ecchGZcD7uTlPioyJ6FYYxik2NhcwCEHlAZkVJYNOvDA7XGdUE7v4iknHda4Yxn+O9Yrf3cwXp+PRwMA521Jia70BBLlvUdCyxrD7Zujr/A1qk2st2uqcFkSn6+ktpO4gkB34B11q4PvICWzNcc6sb9ZvYyHxy69pIbJHPtsweH4Jg94gaBG6qpzKxuIZDSVOyB++ugECgPntimsPZhHkJ3eoyOrOXEirFkW0KIGnMK2Xd4pOWdVfDC0h0E2DlDk3R5xX1qjIkwun7rrmmduNZK3mjDibsSQ0N7F04Ikt6tBTL31qDeb9sX2xn6455Aqy/rbKCf9Vmyh1W223VVxRmNbp/mY6SIQJpKBRAj0joSDU6j6AaLcOx1sZRXrb+QJ91q5wtDwzLH2GhlXmQoTAAJ0c7zOnemVNvR2FyqidoA289hlxWhUteWomEdIKcBQka+HOt3WlY4LWjEIkGG1wfASpNRHJKH/uC0cuNaR1CUk30l37UYGjqyb89XEkFyKsWxW0+IBnc1yrDQirzS2vuC9jhZuQPPa8QCyaBVlzwNqkp7xzTQMhfKRX+5PyTPOiNzq/LBOWKgO5s5jk1cCDB3lekp56plrWWPkMWpLAzwZ6W+MHH4t0L3nfINJUC/cngl LIrEp66Y Emd9s3C45jAHRHRjUUxVTCuwMBKhbM77DkosNsO49JpzK/ZO43+rTiT7ACNZVX48lS/UYrRE0zKn/hiEmVXDgiASAHKSs/dTke68Vei6Up0CMMPxh9ArgfyXfaHJDJNZbA1pO+MAGKvW0QRwzboYTjtrTP6Vi1m+YuTU63NrWFpBxoOZ6eGEYtYDNuk4PmhvWlGbfYOFZfSN416CLzR9oTpvNL74RuMGl6VUJMImTs3c7sK5f9jpIQeFrVFygl3erBHYkh/yKd1uDFpgZyt1tZh6QiPGaKD2vVJlmgMdos81ofjsgoPVwSdGeRSxjc7P71dRb3dreWI1TkixRavk1931gGDYnkf4DSAG2c5FPoQM9k5t4QD+xqkQ5qtPZ9tytMlsL/65j9nbFDgmXKF9mq+FE7GYjCLb1iyHCvcHxi1q8AXg2jocvZJaFrxNs+jOy0OI3WXPx84w++0v0WNw3O8JLJ9oQrdVWjd/b4T4vEFMdTzFrmPMxiJHDeTR0Rtnlja1erYT0sZCZFSG8EaPAGApQUOvHkPACQQhpDxe0lljKQjE7bKmh8b9h0pOelmfDizb44KNawHPpz1C79qWLhDdhEW0QqHNBYfE0aLO94R0+HGPLaDYj7otZtI0/h3NNq7+0d6G9ruv7W0eQwOZ0VZ0bAXrw8o3dIdSDnz9f73GMkduC+ON/RMqJxg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.078898, 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: Nico Pache Reviewed-by: Davidlohr Bueso Reviewed-by: Baolin Wang --- v2: Picked up Reviewed-by tags; v1: https://lore.kernel.org/linux-mm/CAA1CXcB06JD9Fp4c7GGU3NHEm4W-aV7TS7JW7eWxshJEM4t2_w@mail.gmail.com/T/ --- 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; }