[lttng-dev] [PATCH 3/3] vmscan: drop isolate_mode (v6.7+)

[Kienan Stewart]

Hi Bruce,

just a quick follow-up to say that the fixes for building against Linux 
6.7 have been merged into the master and stable-2.13 branches of 
lttng-modules.

thanks,
kienan

On 2023-11-23 14:56, Bruce Ashfield wrote:
> Aha,
> 
> So the mailing list isn't used for patch submission anymore ? I didn't
> notice any updates in the READMEs, etc, so I just fell back to my
> existing workflow.
> 
> I just want to know, so I won't waste time in the future.
> 
> Bruce
> 
> On Thu, Nov 23, 2023 at 2:49 PM Kienan Stewart <kstewart at efficios.com> wrote:
>>
>> Hi Bruce,
>>
>> thanks for the patches! There's a similar series waiting for review:
>> https://review.lttng.org/q/topic:%22fix-linux-6.7.0-rc1%22
>>
>> thanks,
>> kienan
>>
>> On 2023-11-23 14:32, Bruce Ashfield via lttng-dev wrote:
>>> From: Bruce Ashfield <bruce.ashfield at gmail.com>
>>>
>>> commit 3dfbb555c98ac55b9 [mm, vmscan: remove ISOLATE_UNMAPPED]
>>> makes the isolate_mode parameter unused, so it is removed.
>>>
>>> This updates the event to match.
>>>
>>> Signed-off-by: Bruce Ashfield <bruce.ashfield at gmail.com>
>>> ---
>>>
>>> Repeating the comment from patch 1 & 2 of this series:
>>>
>>> Someone else may or may not already have this in flight,
>>> but I didn't see anything on the list or in the git
>>> repo.
>>>
>>> I ran into this failure when working on the v6.7-rc
>>> kernel as part of yocto project kernel updates.
>>>
>>> Tweak as necessary, as I'm no expert in the right way
>>> to version these sort of changes.
>>>
>>> Bruce
>>>
>>>    include/instrumentation/events/mm_vmscan.h | 10 +++++++++-
>>>    1 file changed, 9 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/include/instrumentation/events/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h
>>> index e7e9b613..a3e9ddf2 100644
>>> --- a/include/instrumentation/events/mm_vmscan.h
>>> +++ b/include/instrumentation/events/mm_vmscan.h
>>> @@ -343,12 +343,18 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
>>>                unsigned long nr_scanned,
>>>                unsigned long nr_skipped,
>>>                unsigned long nr_taken,
>>> +#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,7,0))
>>>                isolate_mode_t isolate_mode,
>>> +#endif
>>>                int lru
>>>        ),
>>>
>>>        TP_ARGS(classzone_idx, order, nr_requested, nr_scanned, nr_skipped,
>>> -             nr_taken, isolate_mode, lru
>>> +             nr_taken,
>>> +#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,7,0))
>>> +             isolate_mode,
>>> +#endif
>>> +             lru
>>>        ),
>>>
>>>        TP_FIELDS(
>>> @@ -358,7 +364,9 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_isolate,
>>>                ctf_integer(unsigned long, nr_scanned, nr_scanned)
>>>                ctf_integer(unsigned long, nr_skipped, nr_skipped)
>>>                ctf_integer(unsigned long, nr_taken, nr_taken)
>>> +#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,7,0))
>>>                ctf_integer(isolate_mode_t, isolate_mode, isolate_mode)
>>> +#endif
>>>                ctf_integer(int, lru, lru)
>>>        )
>>>    )
> 
> 
>