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 08002CE79AB for ; Wed, 20 Sep 2023 07:49:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B85B6B0127; Wed, 20 Sep 2023 03:49:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8409E6B0128; Wed, 20 Sep 2023 03:49:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B9866B0129; Wed, 20 Sep 2023 03:49:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 558C26B0127 for ; Wed, 20 Sep 2023 03:49:58 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2E860B421C for ; Wed, 20 Sep 2023 07:49:58 +0000 (UTC) X-FDA: 81256202076.15.D43B61F Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by imf09.hostedemail.com (Postfix) with ESMTP id 39D8914002B for ; Wed, 20 Sep 2023 07:49:52 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=samsung.com header.s=mail20170921 header.b=VoZqTPP3; dmarc=pass (policy=none) header.from=samsung.com; spf=pass (imf09.hostedemail.com: domain of jaewon31.kim@samsung.com designates 203.254.224.33 as permitted sender) smtp.mailfrom=jaewon31.kim@samsung.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695196194; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=i58ZkLZkk/P5k3DKdwoGOc6L9UHO7+MgGuc1nYssIAU=; b=LLz/eE9oUNruTrqTxPNj8W6Jy0qApmVUVdvKzrt4/6qJGkSfxfIlwfAGmWSxQUU65wBOwA z0a0kCEhhppjqXpbMGAtIgvHnzAYrDicpzWDZT0jLcRHWR2WQb08mQSkAaCXKirA8r0Oht GPLqs2wSvthBnoKe3rBOeemUYBlhD4s= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=samsung.com header.s=mail20170921 header.b=VoZqTPP3; dmarc=pass (policy=none) header.from=samsung.com; spf=pass (imf09.hostedemail.com: domain of jaewon31.kim@samsung.com designates 203.254.224.33 as permitted sender) smtp.mailfrom=jaewon31.kim@samsung.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695196194; a=rsa-sha256; cv=none; b=18q8/WIyNZErGEmslxz8p1Ap/Vt5LXqr12oboEoOXOuS2naCsM9BDEKEHsUrwZ3uagY3MF tekZTJt8ZtH8u0iCY5avQN7HnFwZXyRObjysUKeJWWtqp43HEzGulZBgojIexTcd/+YEjl ZqNhdI67aPMNrbZQAYE2xPuTd+jEKC8= Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20230920074949epoutp03691491cf330420445d2355a248420c38~Gi-Pjzn4n1580215802epoutp03X for ; Wed, 20 Sep 2023 07:49:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20230920074949epoutp03691491cf330420445d2355a248420c38~Gi-Pjzn4n1580215802epoutp03X DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1695196189; bh=i58ZkLZkk/P5k3DKdwoGOc6L9UHO7+MgGuc1nYssIAU=; h=Subject:Reply-To:From:To:CC:In-Reply-To:Date:References:From; b=VoZqTPP3tm6M7RExmL+pZtqtgL0C5uSOO/QNL+zXdBqgPD+SZ1oN1OAijNLWmuOES gq9UbW2Fu1iOUw0KFkQNf2zzAFawK2qejLx6o3tOmFZ0CSpqFeNqYxlTbL3qmeMuW8 03ujYzX/HpnJQiuSBwEngANkr9RsSxbiaX7wdJOI= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20230920074948epcas1p39221f2dc9f392bfe1645a42fb03c5c77~Gi-PE7Oqg2471724717epcas1p3o; Wed, 20 Sep 2023 07:49:48 +0000 (GMT) Received: from epsmges1p1.samsung.com (unknown [182.195.36.225]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4Rr9fh3Rw2z4x9Q2; Wed, 20 Sep 2023 07:49:48 +0000 (GMT) X-AuditID: b6c32a35-76dfa7000000271c-50-650aa41caa4f Received: from epcas1p3.samsung.com ( [182.195.41.47]) by epsmges1p1.samsung.com (Symantec Messaging Gateway) with SMTP id 5C.1A.10012.C14AA056; Wed, 20 Sep 2023 16:49:48 +0900 (KST) Mime-Version: 1.0 Subject: RE:(2) [PATCH] vmscan: add trace events for lru_gen Reply-To: jaewon31.kim@samsung.com From: =?UTF-8?B?6rmA7J6s7JuQ?= To: Steven Rostedt , =?UTF-8?B?6rmA7J6s7JuQ?= CC: "yuzhao@google.com" , "tjmercier@google.com" , "kaleshsingh@google.com" , "akpm@linux-foundation.org" , "vbabka@suse.cz" , "hannes@cmpxchg.org" , "linux-kernel@vger.kernel.org" , "linux-trace-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "jaewon31.kim@gmail.com" X-Priority: 3 X-Content-Kind-Code: NORMAL In-Reply-To: <20230919095927.5a964094@gandalf.local.home> X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20230920074948epcms1p82d18c2f4d6a0b5699d50fc419b9ba9fe@epcms1p8> Date: Wed, 20 Sep 2023 16:49:48 +0900 X-CMS-MailID: 20230920074948epcms1p82d18c2f4d6a0b5699d50fc419b9ba9fe Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAJsWRmVeSWpSXmKPExsWy7bCmvq7MEq5Ug96tYhZz1q9hs1i9ydei e/NMRove96+YLJr2zWS3uLxrDpvFvTX/WS2OrD/LYrGv4wGTxbv1X9gsZjf2MVq8m/CF1YHH 4/Cb98weO2fdZfdo2XeL3WPBplKPTZ8msXucmPGbxaNvyypGjzMLjrB7fN4kF8AZlW2TkZqY klqkkJqXnJ+SmZduq+QdHO8cb2pmYKhraGlhrqSQl5ibaqvk4hOg65aZA3SxkkJZYk4pUCgg sbhYSd/Opii/tCRVISO/uMRWKbUgJafArECvODG3uDQvXS8vtcTK0MDAyBSoMCE74+316+wF L0Mrbr8Na2D85tzFyMkhIWAi8az1CFsXIxeHkMAORoltnzuZuxg5OHgFBCX+7hAGqREWsJGY PX8PI4gtJKAkcfbHFXaIuLXE/kUzmEBsNgFLie03J4LViAjES3zd3sYOMpNZoItFYs+s5ewQ y3glZrQ/ZYGwpSW2L98K1sAJ1Dy9vYsZIi4qcXP1W3YY+/2x+YwQtohE672zUDWCEg9+7maE mfPn+HM2CLtYYlnnAyYIu0ZixblVUHFziYa3K9kg/vKVWLCkCiTMIqAqcejZBqiRLhLfTt0F O41ZQF5i+9s54GBgFtCUWL9LH6JEUWLn77mMECV8Eu++9rDCfLVj3hOorWoSLc++QsVlJP7+ e8YKMkZCwENi2wZGSChvZpSYtPEX2wRGhVmIgJ6FZPEshMULGJlXMYqlFhTnpqcWGxYYwqM2 OT93EyM46WqZ7mCc+PaD3iFGJg7GQ4wSHMxKIry5alypQrwpiZVVqUX58UWlOanFhxhNgV6e yCwlmpwPTPt5JfGGJpYGJmZGJhbGlsZmSuK8zI96U4QE0hNLUrNTUwtSi2D6mDg4pRqYVmjU NNoIN+fJ2x9ynVny4WboE8lvEbWGrzUnrdW98u+QenfTnqvNH+/c6riowpaTW1m0zssnpe2F 5jLugj1h3tucnCIzjzvE8VrsdnWQdD5e0HRSxURpu/czjln7Cj4tPmbNbn6l2/RC2l0FidcC Ip8vVuUpFDJtOz1R7Ef4pUvqyzIOr7rwL8ZIOafpvuj3OcKauyz/LOqbu79PV9s8Rolz38VG Y5YvG2Y+mO/DenjGu8ZFB4L8vmq8mm35YNJ3fiuDN78iDz+awOnuUntv57aYrsrIYtM/qULL HRxdvpiedDrUWOY0Mcm570a7esLhM6aNs2ZfUVfh/VZsGJjgmJoufbdyxZ6028YzWfqUWIoz Eg21mIuKEwHhdVMUQwQAAA== DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20230919025012epcas1p2c2c57a34eea3299ef3bb643f4cbddf0b References: <20230919095927.5a964094@gandalf.local.home> <20230919025216.1878-1-jaewon31.kim@samsung.com> X-Rspamd-Queue-Id: 39D8914002B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: qgej1cbf8n94rtunrkzc6wqnjsgnbaqu X-HE-Tag: 1695196192-833771 X-HE-Meta: U2FsdGVkX19TBcKF+0CjVi4eUbH/pgXpuqB1Ouz5saDw7NLG67DHrMjmfeoQa0RLut0jHY3Oj4xhOGSKuzNpCeFRYAqlg7QDlks+NXaT6razrOR4P7FtdfmctZR6REiDJHq9+4r2m5LnW4kGK+UOgF72J9k0yRgUe1JDwLvoqlBQPqxlqYZ9trpyeOMnXpygZ2XSvMa3xcEk1ILDlOMkDjgmHHnUAz+IpqMH6iRnF54TRJ7lXPtFIBJ9SQUmYkNghl1jqdFvXl2RCCx+QiwinS3Cciaj0qvpb4LrCKsKPxkm6rIXd8rjqjdW0SATk+VN7JR52JDgini3jwaWeMR3CD3pScuk40/QWNGMCd2+WTH2jb12SjQ3mmkaslFOSFLPwXVpqHpe0Uc3Agm2kp4TgGGSzprS5bRoEoO017oGMjpC5rYvxLPC2RI6spblSNzMmi7Ygg1X3I808GIMSHeBO3Iqa36B6I8wSOLZrDonIveRHrmgGulWmmeXgOmI2tO+q4qrENqt+iXR4JWNHdnpTP4FXdxXErxe2SJGci4TyjrxW+Ol7zZSItIa7GmUG9nqyIUe5eOr5dt/4zLFV/GVEKP8ShNWeJAn69EmRlHuRv6p1MdAk+JQ0WkpLVJZo8aN4dCokikA11fYMPp2/QnNwbEgyIfowSkYzENxbxdLrx8uDVAXmJ5NJH062d1eJvxeCiYDQn+lFlurYNEf7w6c2rzuC7lIw6OgN46fBiT1WyHFZB7tQD3e2d+A+/uiHIhtlf6+/o6Anmdjh5aFxUnROK2B07EPuTMtzgO1GhVHwfKSslA1jnB6Pw0ainNYJ2uBy6cmXUpMhLT0CF5fFVoeo80dErZySRwI0QN+Npnbmm6YwceGDEiuo+5jLKWBQbwU8HTKGsM21Nl8pT2Cl9upNU5ZBb3pTqJcwPRuwhmkiVJOrA3/E6b2NDtX532PNNm1xBj9uwiHR3Hg2kuycbH 1UXace7/ FbmyPb5wS4nOvVJB6Zuf6nEYZUJRZbdNcvLZjrX3nC85be/c4VdkvOv22dW82qIMYZLysHDeiKjGVCbgaonAg5PZs5xVKLELqyHTCEMZd53iYixQeG7Pa3bz8xoHmHY3c+IrwyvrtVG7AsVYeMJrifMjOoZZTid5aD+CelPq++mv5cYvI0zVOuLSNO3BgUQ2uIORxOPuIslFP941sPoiWRmnyrDe15cbvIM52hfbs2DzakSPvY306V4kGOvGH6mZUI6yC+4rHKt29blvWxiVyj8uFYqmrpVlgzBe88M7CDjN526C/UZggjtDqSGenTGLPlwSiAA9EaORNSyL3VA4OSF69ba9RLj0XyAGZ1JVEXJWFqEKK0Ct8epk+95ljjU15vJ3r X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: >On Tue, 19 Sep 2023 11:52:16 +0900 >Jaewon Kim wrote: > >> /* >> * Now redefine the EM() and EMe() macros to map the enums to the strings >> diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h >> index d2123dd960d5..e8f9d0452e89 100644 >> --- a/include/trace/events/vmscan.h >> +++ b/include/trace/events/vmscan.h >> @@ -327,6 +327,55 @@ TRACE_EVENT(mm_vmscan_lru_isolate, >> __print_symbolic(__entry->lru, LRU_NAMES)) >> ); >> >> +TRACE_EVENT(mm_vmscan_lru_gen_scan, >> + TP_PROTO(int highest_zoneidx, >> + int order, >> + unsigned long nr_requested, >> + unsigned long nr_scanned, >> + unsigned long nr_skipped, >> + unsigned long nr_taken, >> + isolate_mode_t isolate_mode, >> + int lru), > >This is a lot of parameter passing, can you consolidate it? > >(see below to where you call this) > >> + >> + TP_ARGS(highest_zoneidx, order, nr_requested, nr_scanned, nr_skipped, nr_taken, isolate_mode, lru), >> + >> + TP_STRUCT__entry( >> + __field(int, highest_zoneidx) >> + __field(int, order) >> + __field(unsigned long, nr_requested) >> + __field(unsigned long, nr_scanned) >> + __field(unsigned long, nr_skipped) >> + __field(unsigned long, nr_taken) >> + __field(unsigned int, isolate_mode) >> + __field(int, lru) >> + ), >> + >> + TP_fast_assign( >> + __entry->highest_zoneidx = highest_zoneidx; >> + __entry->order = order; >> + __entry->nr_requested = nr_requested; >> + __entry->nr_scanned = nr_scanned; >> + __entry->nr_skipped = nr_skipped; >> + __entry->nr_taken = nr_taken; >> + __entry->isolate_mode = (__force unsigned int)isolate_mode; >> + __entry->lru = lru; >> + ), >> + >> + /* >> + * classzone is previous name of the highest_zoneidx. >> + * Reason not to change it is the ABI requirement of the tracepoint. >> + */ >> + TP_printk("isolate_mode=%d classzone=%d order=%d nr_requested=%lu nr_scanned=%lu nr_skipped=%lu nr_taken=%lu lru=%s", >> + __entry->isolate_mode, >> + __entry->highest_zoneidx, >> + __entry->order, >> + __entry->nr_requested, >> + __entry->nr_scanned, >> + __entry->nr_skipped, >> + __entry->nr_taken, >> + __print_symbolic(__entry->lru, LRU_GEN_NAMES)) >> +); >> + >> TRACE_EVENT(mm_vmscan_write_folio, >> >> TP_PROTO(struct folio *folio), >> @@ -437,6 +486,53 @@ TRACE_EVENT(mm_vmscan_lru_shrink_active, >> show_reclaim_flags(__entry->reclaim_flags)) >> ); >> >> +TRACE_EVENT(mm_vmscan_lru_gen_evict, >> + >> + TP_PROTO(int nid, unsigned long nr_reclaimed, >> + struct reclaim_stat *stat, int priority, int file), >> + >> + TP_ARGS(nid, nr_reclaimed, stat, priority, file), >> + >> + TP_STRUCT__entry( >> + __field(int, nid) > >On 64 bit architectures, this causes a 4 byte hole in the ring buffer >layout. Please keep 32 bit size fields paired with other 32 bit size if >possible. That is, move the above "int nid" down where it doesn't cause a >long field to be 4 bytes away. > >> + __field(unsigned long, nr_reclaimed) >> + __field(unsigned long, nr_dirty) >> + __field(unsigned long, nr_writeback) >> + __field(unsigned long, nr_congested) >> + __field(unsigned long, nr_immediate) >> + __field(unsigned int, nr_activate0) >> + __field(unsigned int, nr_activate1) >> + __field(unsigned long, nr_ref_keep) >> + __field(unsigned long, nr_unmap_fail) > > __field(int, nid) > >here! > >> + __field(int, priority) >> + __field(int, reclaim_flags) >> + ), >> + >> + TP_fast_assign( >> + __entry->nid = nid; >> + __entry->nr_reclaimed = nr_reclaimed; >> + __entry->nr_dirty = stat->nr_dirty; >> + __entry->nr_writeback = stat->nr_writeback; >> + __entry->nr_congested = stat->nr_congested; >> + __entry->nr_immediate = stat->nr_immediate; >> + __entry->nr_activate0 = stat->nr_activate[0]; >> + __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->reclaim_flags = trace_reclaim_flags(file); >> + ), >> + >> + TP_printk("nid=%d nr_reclaimed=%ld nr_dirty=%ld nr_writeback=%ld nr_congested=%ld nr_immediate=%ld nr_activate_anon=%d nr_activate_file=%d nr_ref_keep=%ld nr_unmap_fail=%ld priority=%d flags=%s", >> + __entry->nid, __entry->nr_reclaimed, >> + __entry->nr_dirty, __entry->nr_writeback, >> + __entry->nr_congested, __entry->nr_immediate, >> + __entry->nr_activate0, __entry->nr_activate1, >> + __entry->nr_ref_keep, __entry->nr_unmap_fail, >> + __entry->priority, >> + show_reclaim_flags(__entry->reclaim_flags)) >> +); >> + >> TRACE_EVENT(mm_vmscan_node_reclaim_begin, >> >> TP_PROTO(int nid, int order, gfp_t gfp_flags), >> diff --git a/mm/vmscan.c b/mm/vmscan.c >> index 6f13394b112e..cc10e3fb8fa2 100644 >> --- a/mm/vmscan.c >> +++ b/mm/vmscan.c >> @@ -5005,6 +5005,7 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, >> int sorted = 0; >> int scanned = 0; >> int isolated = 0; >> + int skipped = 0; >> int remaining = MAX_LRU_BATCH; >> struct lru_gen_folio *lrugen = &lruvec->lrugen; >> struct mem_cgroup *memcg = lruvec_memcg(lruvec); >> @@ -5018,7 +5019,7 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, >> >> for (i = MAX_NR_ZONES; i > 0; i--) { >> LIST_HEAD(moved); >> - int skipped = 0; >> + int skipped_zone = 0; >> int zone = (sc->reclaim_idx + i) % MAX_NR_ZONES; >> struct list_head *head = &lrugen->folios[gen][type][zone]; >> >> @@ -5040,16 +5041,17 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, >> isolated += delta; >> } else { >> list_move(&folio->lru, &moved); >> - skipped += delta; >> + skipped_zone += delta; >> } >> >> - if (!--remaining || max(isolated, skipped) >= MIN_LRU_BATCH) >> + if (!--remaining || max(isolated, skipped_zone) >= MIN_LRU_BATCH) >> break; >> } >> >> - if (skipped) { >> + if (skipped_zone) { >> list_splice(&moved, head); >> - __count_zid_vm_events(PGSCAN_SKIP, zone, skipped); >> + __count_zid_vm_events(PGSCAN_SKIP, zone, skipped_zone); >> + skipped += skipped_zone; >> } >> >> if (!remaining || isolated >= MIN_LRU_BATCH) >> @@ -5065,6 +5067,10 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, >> __count_memcg_events(memcg, PGREFILL, sorted); >> __count_vm_events(PGSCAN_ANON + type, isolated); >> >> + if (scanned) > >BTW, you can make this branch conditional with the trace event logic, so >that it isn't tested when tracing is enabled. That is, remove the > "if (scanned)" test and use TRACE_EVENT_CONDITION() as I show below. > >> + trace_mm_vmscan_lru_gen_scan(sc->reclaim_idx, sc->order, >> + MAX_LRU_BATCH, scanned, skipped, isolated, >> + sc->may_unmap ? 0 : ISOLATE_UNMAPPED, type); > >Why not pass the sc in to the trace event, and then do the assigning there? > >// use CONDITION to test scanned > >TRACE_EVENT_CONDITION(mm_vmscan_lru_gen_scan, > > 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(...) > > TP_CONDITION(nr_scanned) > > TP_fast_assign( > __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; > __entry->nr_taken = nr_taken; > __entry->isolate_mode = (__force unsigned int)(sc->may_unmap ? 0 : ISOLATE_UNMAPPED); > __entry->lru = lru; > ), > >Lots of parameters can be expensive to pass, as it requires more copying. > >-- Steve Great. Thank you for your comment. For the putting the struct scan_control *sc inside the trace, I couldn't do that because struct scan_control is defined in mm/vmscan.c. I think I should not move it to a seperate header file. As you may expect, I just made this by copying the existing trace_mm_vmscan_lru_isolate and trace_mm_vmscan_lru_shrink_inactive I've tried to change like this. Would this be good for you? --- a/include/trace/events/vmscan.h +++ b/include/trace/events/vmscan.h @@ -327,7 +327,7 @@ TRACE_EVENT(mm_vmscan_lru_isolate, __print_symbolic(__entry->lru, LRU_NAMES)) ); -TRACE_EVENT(mm_vmscan_lru_gen_scan, +TRACE_EVENT_CONDITION(mm_vmscan_lru_gen_scan, TP_PROTO(int highest_zoneidx, int order, unsigned long nr_requested, @@ -339,6 +339,8 @@ TRACE_EVENT(mm_vmscan_lru_gen_scan, TP_ARGS(highest_zoneidx, order, nr_requested, nr_scanned, nr_skipped, nr_taken, isolate_mode, lru), + TP_CONDITION(nr_scanned), + TP_STRUCT__entry( __field(int, highest_zoneidx) __field(int, order) @@ -494,7 +496,6 @@ TRACE_EVENT(mm_vmscan_lru_gen_evict, TP_ARGS(nid, nr_reclaimed, stat, priority, file), TP_STRUCT__entry( - __field(int, nid) __field(unsigned long, nr_reclaimed) __field(unsigned long, nr_dirty) __field(unsigned long, nr_writeback) @@ -504,6 +505,7 @@ TRACE_EVENT(mm_vmscan_lru_gen_evict, __field(unsigned int, nr_activate1) __field(unsigned long, nr_ref_keep) __field(unsigned long, nr_unmap_fail) + __field(int, nid) __field(int, priority) __field(int, reclaim_flags) ), --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -5131,10 +5131,9 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, __count_memcg_events(memcg, PGREFILL, sorted); __count_vm_events(PGSCAN_ANON + type, isolated); - if (scanned) - trace_mm_vmscan_lru_gen_scan(sc->reclaim_idx, sc->order, - MAX_LRU_BATCH, scanned, skipped, isolated, - sc->may_unmap ? 0 : ISOLATE_UNMAPPED, type); + trace_mm_vmscan_lru_gen_scan(sc->reclaim_idx, sc->order, MAX_LRU_BATCH, + scanned, skipped, isolated, + sc->may_unmap ? 0 : ISOLATE_UNMAPPED, type); > > >> /* >> * There might not be eligible folios due to reclaim_idx. Check the >> * remaining to prevent livelock if it's not making progress. >> @@ -5194,6 +5200,8 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap >> retry: >> reclaimed = shrink_folio_list(&list, pgdat, sc, &stat, false); >> sc->nr_reclaimed += reclaimed; >> + trace_mm_vmscan_lru_gen_evict(pgdat->node_id, reclaimed, &stat, >> + sc->priority, type); >> >> list_for_each_entry_safe_reverse(folio, next, &list, lru) { >> if (!folio_evictable(folio)) { >