From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-169.mta1.migadu.com [95.215.58.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A4763D9DAD for ; Mon, 19 Oct 2026 03:53:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792382027; cv=none; b=WK/pSgfpg7u9SZqwx1Sx6U/UsVsddr2c/l6VZjrTBuJEMpInjCqAV40BLd8rRD26Ub4gAWBZU/GUJ+6UeJz64Nv/jP3L3JgPt7zw2XCEni9v5uWyrQZA1TUvyk/wSXLoTbUTyFfo/B2IuGQXJcMQ6tRFHqaEGDaRxhLC+aHf1C8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792382027; c=relaxed/simple; bh=Vcxvr/qaW7PDnOXJbF3Nyf0hUX2HYPQGMERHgFWI0EY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IssBgQFSKUO7qr3s5MDmp3eJxb7qM6LQB5VF2HPzpNllcgpA2UCF0p3/fPsNm1mavzRwRcbZR1Jztev69f0zVCDKa/iq+c+xiXcXr44yvvCBxEQjbelSkpYOjfZKVDnKAy/eK9anWfHFdbSuFQgy+leDihOOoSUUvHUpKiLLKm4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=DOhYQEVI; arc=none smtp.client-ip=95.215.58.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="DOhYQEVI" X-Envelope-To: bpf@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=Vcxvr/qaW7PDnOXJbF3Nyf0hUX2HYPQGMERHgFWI0EY=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1792382023; v=1; x=1792986823; b=DOhYQEVIK6uoGJJBJkGThlqWnZvqo6wucO1tK6quYc84H21xMGpHknVNq8vL3M5fgCnTxl7q HSKPjeXj8LltMg28TVshGv6dxToX7FUcJkJJoNPUC4FUiGabGaIrQ0J483t5WA98cpFWBVrIAsp rueAPEor9IDeS0bMVupYmVq0= X-Envelope-To: bpf@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 577f89e16abcb16c; Mon, 19 Oct 2026 03:53:43 +0000 X-Mizu-Trace-ID: 577f89e16abcb16c X-Migadu-Flow: FLOW_OUT From: Ridong Chen To: Steven Rostedt , Masami Hiramatsu , Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Dave Chinner Cc: Mathieu Desnoyers , Muchun Song , Qi Zheng , David Hildenbrand , Lorenzo Stoakes , Kairui Song , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Baolin Wang , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, bpf@vger.kernel.org, Ridong Chen , Ridong Chen Subject: [PATCH v4 5/9] mm/vmscan: pass scan_control to the LRU isolate/shrink tracepoints Date: Mon, 19 Oct 2026 11:52:48 +0800 Message-Id: <20261019035252.2357900-5-ridong.chen@linux.dev> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261019034426.2354049-1-ridong.chen@linux.dev> References: <20261019034426.2354049-1-ridong.chen@linux.dev> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ridong Chen mm_vmscan_lru_isolate, mm_vmscan_lru_shrink_inactive and mm_vmscan_lru_shrink_active spell out reclaim state (reclaim_idx, order, priority) as individual arguments, all of which the caller already holds in struct scan_control. Now that the struct is visible from the trace header, pass sc directly and pick the fields out in TP_fast_assign. No functional change. The tracefs event format (TP_STRUCT__entry and TP_printk) is unchanged, so tracefs-based consumers are unaffected. BPF programs attached via raw_tp/tp_btf see the new TP_PROTO and need to be adjusted; tracepoints are not a stable ABI (see Documentation/bpf/bpf_design_QA.rst). Assisted-by: LLM Signed-off-by: Ridong Chen --- mm/trace_vmscan.h | 31 +++++++++++++++---------------- mm/vmscan.c | 14 +++++++------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/mm/trace_vmscan.h b/mm/trace_vmscan.h index db4590356845..b1b329039e14 100644 --- a/mm/trace_vmscan.h +++ b/mm/trace_vmscan.h @@ -350,15 +350,14 @@ TRACE_EVENT(mm_shrink_slab_end, ); TRACE_EVENT(mm_vmscan_lru_isolate, - TP_PROTO(int highest_zoneidx, - int order, - unsigned long nr_requested, - unsigned long nr_scanned, - unsigned long nr_skipped, - unsigned long nr_taken, - int lru), + TP_PROTO(struct scan_control *sc, + unsigned long nr_requested, + unsigned long nr_scanned, + unsigned long nr_skipped, + unsigned long nr_taken, + int lru), - TP_ARGS(highest_zoneidx, order, nr_requested, nr_scanned, nr_skipped, nr_taken, lru), + TP_ARGS(sc, nr_requested, nr_scanned, nr_skipped, nr_taken, lru), TP_STRUCT__entry( __field(int, highest_zoneidx) @@ -371,8 +370,8 @@ TRACE_EVENT(mm_vmscan_lru_isolate, ), TP_fast_assign( - __entry->highest_zoneidx = highest_zoneidx; - __entry->order = order; + __entry->highest_zoneidx = sc->reclaim_idx; + __entry->order = sc->order; __entry->nr_requested = nr_requested; __entry->nr_scanned = nr_scanned; __entry->nr_skipped = nr_skipped; @@ -466,9 +465,9 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, unsigned long nr_scanned, unsigned long nr_reclaimed, - struct reclaim_stat *stat, int priority, int file), + struct reclaim_stat *stat, struct scan_control *sc, int file), - TP_ARGS(nid, nr_scanned, nr_reclaimed, stat, priority, file), + TP_ARGS(nid, nr_scanned, nr_reclaimed, stat, sc, file), TP_STRUCT__entry( __field(int, nid) @@ -498,7 +497,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_inactive, __entry->nr_activate1 = stat->nr_activate[1]; __entry->nr_ref_keep = stat->nr_ref_keep; __entry->nr_unmap_fail = stat->nr_unmap_fail; - __entry->priority = priority; + __entry->priority = sc->priority; __entry->reclaim_flags = trace_reclaim_flags(file); ), @@ -517,9 +516,9 @@ TRACE_EVENT(mm_vmscan_lru_shrink_active, TP_PROTO(int nid, unsigned long nr_taken, unsigned long nr_active, unsigned long nr_deactivated, - unsigned long nr_referenced, int priority, int file), + unsigned long nr_referenced, struct scan_control *sc, int file), - TP_ARGS(nid, nr_taken, nr_active, nr_deactivated, nr_referenced, priority, file), + TP_ARGS(nid, nr_taken, nr_active, nr_deactivated, nr_referenced, sc, file), TP_STRUCT__entry( __field(int, nid) @@ -537,7 +536,7 @@ TRACE_EVENT(mm_vmscan_lru_shrink_active, __entry->nr_active = nr_active; __entry->nr_deactivated = nr_deactivated; __entry->nr_referenced = nr_referenced; - __entry->priority = priority; + __entry->priority = sc->priority; __entry->reclaim_flags = trace_reclaim_flags(file); ), diff --git a/mm/vmscan.c b/mm/vmscan.c index e064354ea24f..5d5eee757c61 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1759,7 +1759,7 @@ static unsigned long isolate_lru_folios(unsigned long nr_to_scan, } } *nr_scanned = total_scan; - trace_mm_vmscan_lru_isolate(sc->reclaim_idx, sc->order, nr_to_scan, + trace_mm_vmscan_lru_isolate(sc, nr_to_scan, total_scan, skipped, nr_taken, lru); update_lru_sizes(lruvec, lru, nr_zone_taken); return nr_taken; @@ -2048,7 +2048,7 @@ static unsigned long shrink_inactive_list(unsigned long nr_to_scan, handle_reclaim_writeback(nr_taken, pgdat, sc, &stat); trace_mm_vmscan_lru_shrink_inactive(pgdat->node_id, - nr_scanned, nr_reclaimed, &stat, sc->priority, file); + nr_scanned, nr_reclaimed, &stat, sc, file); return nr_reclaimed; } @@ -2155,7 +2155,7 @@ static void shrink_active_list(unsigned long nr_to_scan, mod_lruvec_state(lruvec, PGROTATE_ANON + file, nr_rotated); trace_mm_vmscan_lru_shrink_active(pgdat->node_id, nr_taken, nr_activate, - nr_deactivate, nr_rotated, sc->priority, file); + nr_deactivate, nr_rotated, sc, file); } static unsigned int reclaim_folio_list(struct list_head *folio_list, @@ -4844,9 +4844,9 @@ static int scan_folios(unsigned long nr_to_scan, struct lruvec *lruvec, mod_lruvec_state(lruvec, item, isolated); mod_lruvec_state(lruvec, PGREFILL, sorted); mod_lruvec_state(lruvec, PGSCAN_ANON + type, isolated); - trace_mm_vmscan_lru_isolate(sc->reclaim_idx, sc->order, nr_to_scan, - scanned, skipped, isolated, - type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON); + trace_mm_vmscan_lru_isolate(sc, nr_to_scan, + scanned, skipped, isolated, + type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON); *isolatedp = isolated; return scanned; @@ -4988,7 +4988,7 @@ static int evict_folios(unsigned long nr_to_scan, struct lruvec *lruvec, if (isolated) handle_reclaim_writeback(isolated, pgdat, sc, &stat); trace_mm_vmscan_lru_shrink_inactive(pgdat->node_id, - type_scanned, reclaimed, &stat, sc->priority, + type_scanned, reclaimed, &stat, sc, type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON); list_for_each_entry_safe_reverse(folio, next, &list, lru) { -- 2.34.1