From patchwork Sat Jun 1 17:33:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 44550 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E169DC32717 for ; Sat, 1 Jun 2024 17:33:41 +0000 (UTC) Received: from a27-30.smtp-out.us-west-2.amazonses.com (a27-30.smtp-out.us-west-2.amazonses.com [54.240.27.30]) by mx.groups.io with SMTP id smtpd.web10.42246.1717263219566411893 for ; Sat, 01 Jun 2024 10:33:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=MV1Ppulu; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=YDwmAVJ/; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.30, mailfrom: 0101018fd4dd3881-67e1ebdc-7e28-4bea-8494-26748bb5a56e-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1717263219; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=Qc0x8Ch9sYAVy/805LnG77FIFt1VTTWUjuhuAx0dJa0=; b=MV1PpuluQfgCxJFZGk6Fz0KADNyBCii/EbzV+ILyM7WLHN1hpkTeVi1VuQArMIaB UHRNCmNQMm6w6Sz92LloRhbB8Ne4zzgBGPkbwacCbCbKs+afvx+qJYhMrdMsBdpGdcO A75cTS2cIpvhJIVB0SFoEd2YfiRi8jFyHSDqA6zI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1717263219; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=Qc0x8Ch9sYAVy/805LnG77FIFt1VTTWUjuhuAx0dJa0=; b=YDwmAVJ/q+Fk82y38NVVkHw+SFNfXd9DnH/zJrbLH4hcxFJJ29vJCAgym5DeoFEO OliKGAxJdTr1mBF8tg8WOCol1jEeAwnWR5tBze04eXtYuMCbcpAndTHbpd1KDskDraE 8XVPFXWzFx7UWfH2A+Qihsi42nbIT86qe2U6rHNo= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] lttng-modules: upgrading to 2.13.13 FAILED Message-ID: <0101018fd4dd3881-67e1ebdc-7e28-4bea-8494-26748bb5a56e-000000@us-west-2.amazonses.com> Date: Sat, 1 Jun 2024 17:33:38 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.06.01-54.240.27.30 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 01 Jun 2024 17:33:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200177 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *lttng-modules* to *2.13.13* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-lttng-modules-upgrade-2.13.12-2.13.13.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 402c75221fe4257ab26d53b110df0c79f2cc71b1 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 1 Jun 2024 14:29:32 +0000 Subject: [PATCH] lttng-modules: upgrade 2.13.12 -> 2.13.13 --- ...x-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch | 93 ------------ ...e-missing-CONFIG_TRACEPOINTS-to-warn.patch | 12 +- ...ponent-to-set_bias_level-events-in-l.patch | 132 ------------------ ...n_migratepages-changed-in-linux-6.9-.patch | 81 ----------- ...v_base_lock-removed-in-linux-6.9-rc1.patch | 57 -------- ...es_2.13.12.bb => lttng-modules_2.13.13.bb} | 9 +- 6 files changed, 9 insertions(+), 375 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch rename meta/recipes-kernel/lttng/{lttng-modules_2.13.12.bb => lttng-modules_2.13.13.bb} (77%) diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch deleted file mode 100644 index 9d5fd0de60..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch +++ /dev/null @@ -1,93 +0,0 @@ -From fec007d9630e010062cf5699a08460f71f46b527 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 25 Mar 2024 08:54:42 -0400 -Subject: [PATCH 1/4] Fix: ASoC snd_doc_dapm on linux 6.9-rc1 - -See upstream commit: - - commit 7df3eb4cdb6bbfa482f51548b9fd47c2723c68ba - Author: Luca Ceresoli - Date: Wed Mar 6 10:30:01 2024 +0100 - - ASoC: trace: add event to snd_soc_dapm trace events - - Add the event value to the snd_soc_dapm_start and snd_soc_dapm_done trace - events to make them more informative. - - Trace before: - - aplay-229 [000] 250.140309: snd_soc_dapm_start: card=vscn-2046 - aplay-229 [000] 250.167531: snd_soc_dapm_done: card=vscn-2046 - aplay-229 [000] 251.169588: snd_soc_dapm_start: card=vscn-2046 - aplay-229 [000] 251.195245: snd_soc_dapm_done: card=vscn-2046 - - Trace after: - - aplay-214 [000] 693.290612: snd_soc_dapm_start: card=vscn-2046 event=1 - aplay-214 [000] 693.315508: snd_soc_dapm_done: card=vscn-2046 event=1 - aplay-214 [000] 694.537349: snd_soc_dapm_start: card=vscn-2046 event=2 - aplay-214 [000] 694.563241: snd_soc_dapm_done: card=vscn-2046 event=2 - -Upstream-Status: Backport [88c4e0fe Fix: ASoC snd_doc_dapm on linux 6.9-rc1] - -Change-Id: If0d33544b8dd1dfb3d12ca9390892190fc0444b0 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/asoc.h | 33 +++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h -index 21d13a0f..5126d4c1 100644 ---- a/include/instrumentation/events/asoc.h -+++ b/include/instrumentation/events/asoc.h -@@ -51,6 +51,38 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done, - - ) - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) -+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, -+ -+ TP_PROTO(struct snd_soc_card *card, int event), -+ -+ TP_ARGS(card, event), -+ -+ TP_FIELDS( -+ ctf_string(name, card->name) -+ ctf_integer(int, event, event) -+ ) -+) -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_start, -+ -+ asoc_snd_soc_dapm_start, -+ -+ TP_PROTO(struct snd_soc_card *card, int event), -+ -+ TP_ARGS(card, event) -+ -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done, -+ -+ asoc_snd_soc_dapm_done, -+ -+ TP_PROTO(struct snd_soc_card *card, int event), -+ -+ TP_ARGS(card, event) -+ -+) -+#else - LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, - - TP_PROTO(struct snd_soc_card *card), -@@ -81,6 +113,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done, - TP_ARGS(card) - - ) -+#endif - - LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_widget, - --- -2.39.2 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch index 120528bf9c..ed2ffb622d 100644 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch @@ -1,4 +1,4 @@ -From 878f89b6136ff7b870a19e04901cc6f316bbe10a Mon Sep 17 00:00:00 2001 +From 6cab21fdba5cd5c074bf43b0ccb90a9a15f915da Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 15 May 2021 10:26:38 -0400 Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning @@ -19,10 +19,10 @@ Signed-off-by: Bruce Ashfield src/Kbuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -Index: lttng-modules-2.13.10/src/Kbuild -=================================================================== ---- lttng-modules-2.13.10.orig/src/Kbuild -+++ lttng-modules-2.13.10/src/Kbuild +diff --git a/src/Kbuild b/src/Kbuild +index 7137874..04eb5c9 100644 +--- a/src/Kbuild ++++ b/src/Kbuild @@ -2,10 +2,13 @@ ifdef CONFIG_LOCALVERSION # Check if dot-config is included. @@ -38,7 +38,7 @@ Index: lttng-modules-2.13.10/src/Kbuild TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. lttng_check_linux_version = $(shell pwd)/include/linux/version.h -@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump- +@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o obj-$(CONFIG_LTTNG) += probes/ obj-$(CONFIG_LTTNG) += lib/ obj-$(CONFIG_LTTNG) += tests/ diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch deleted file mode 100644 index 6ea10ffc91..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch +++ /dev/null @@ -1,132 +0,0 @@ -From d8379ec6365a925db33cae94fb6783cdbdb6a922 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 25 Mar 2024 09:40:29 -0400 -Subject: [PATCH 2/4] Fix: ASoC add component to set_bias_level events in linux - 6.9-rc1 - -See upstream commit: - - commit 6ef46a69ec32fe1cf56de67742fcd01af4bf48af - Author: Luca Ceresoli - Date: Wed Mar 6 10:30:00 2024 +0100 - - ASoC: trace: add component to set_bias_level trace events - - The snd_soc_bias_level_start and snd_soc_bias_level_done trace events - currently look like: - - aplay-229 [000] 1250.140778: snd_soc_bias_level_start: card=vscn-2046 val=1 - aplay-229 [000] 1250.140784: snd_soc_bias_level_done: card=vscn-2046 val=1 - aplay-229 [000] 1250.140786: snd_soc_bias_level_start: card=vscn-2046 val=2 - aplay-229 [000] 1250.140788: snd_soc_bias_level_done: card=vscn-2046 val=2 - kworker/u8:1-21 [000] 1250.140871: snd_soc_bias_level_start: card=vscn-2046 val=1 - kworker/u8:0-11 [000] 1250.140951: snd_soc_bias_level_start: card=vscn-2046 val=1 - kworker/u8:0-11 [000] 1250.140956: snd_soc_bias_level_done: card=vscn-2046 val=1 - kworker/u8:0-11 [000] 1250.140959: snd_soc_bias_level_start: card=vscn-2046 val=2 - kworker/u8:0-11 [000] 1250.140961: snd_soc_bias_level_done: card=vscn-2046 val=2 - kworker/u8:1-21 [000] 1250.167219: snd_soc_bias_level_done: card=vscn-2046 val=1 - kworker/u8:1-21 [000] 1250.167222: snd_soc_bias_level_start: card=vscn-2046 val=2 - kworker/u8:1-21 [000] 1250.167232: snd_soc_bias_level_done: card=vscn-2046 val=2 - kworker/u8:0-11 [000] 1250.167440: snd_soc_bias_level_start: card=vscn-2046 val=3 - kworker/u8:0-11 [000] 1250.167444: snd_soc_bias_level_done: card=vscn-2046 val=3 - kworker/u8:1-21 [000] 1250.167497: snd_soc_bias_level_start: card=vscn-2046 val=3 - kworker/u8:1-21 [000] 1250.167506: snd_soc_bias_level_done: card=vscn-2046 val=3 - - There are clearly multiple calls, one per component, but they cannot be - discriminated from each other. - - Change the ftrace events to also print the component name, to make it clear - which part of the code is involved. This requires changing the passed value - from a struct snd_soc_card, where the DAPM context is not kwown, to a - struct snd_soc_dapm_context where it is obviously known but the a card - pointer is also available. - - With this change, the resulting trace becomes: - - aplay-247 [000] 1436.357332: snd_soc_bias_level_start: card=vscn-2046 component=(none) val=1 - aplay-247 [000] 1436.357338: snd_soc_bias_level_done: card=vscn-2046 component=(none) val=1 - aplay-247 [000] 1436.357340: snd_soc_bias_level_start: card=vscn-2046 component=(none) val=2 - aplay-247 [000] 1436.357343: snd_soc_bias_level_done: card=vscn-2046 component=(none) val=2 - kworker/u8:4-215 [000] 1436.357437: snd_soc_bias_level_start: card=vscn-2046 component=ff560000.codec val=1 - kworker/u8:5-231 [000] 1436.357518: snd_soc_bias_level_start: card=vscn-2046 component=ff320000.i2s val=1 - kworker/u8:5-231 [000] 1436.357523: snd_soc_bias_level_done: card=vscn-2046 component=ff320000.i2s val=1 - kworker/u8:5-231 [000] 1436.357526: snd_soc_bias_level_start: card=vscn-2046 component=ff320000.i2s val=2 - kworker/u8:5-231 [000] 1436.357528: snd_soc_bias_level_done: card=vscn-2046 component=ff320000.i2s val=2 - kworker/u8:4-215 [000] 1436.383217: snd_soc_bias_level_done: card=vscn-2046 component=ff560000.codec val=1 - kworker/u8:4-215 [000] 1436.383221: snd_soc_bias_level_start: card=vscn-2046 component=ff560000.codec val=2 - kworker/u8:4-215 [000] 1436.383231: snd_soc_bias_level_done: card=vscn-2046 component=ff560000.codec val=2 - kworker/u8:5-231 [000] 1436.383468: snd_soc_bias_level_start: card=vscn-2046 component=ff320000.i2s val=3 - kworker/u8:5-231 [000] 1436.383472: snd_soc_bias_level_done: card=vscn-2046 component=ff320000.i2s val=3 - kworker/u8:4-215 [000] 1436.383503: snd_soc_bias_level_start: card=vscn-2046 component=ff560000.codec val=3 - kworker/u8:4-215 [000] 1436.383513: snd_soc_bias_level_done: card=vscn-2046 component=ff560000.codec val=3 - -Upstream-Status: Backport [303434ab Fix: ASoC add component to set_bias_level events in linux 6.9-rc1] - -Change-Id: I959f1680c002acdf29828b968d3975247f5433d8 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/asoc.h | 36 +++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -Index: lttng-modules-2.13.12/include/instrumentation/events/asoc.h -=================================================================== ---- lttng-modules-2.13.12.orig/include/instrumentation/events/asoc.h -+++ lttng-modules-2.13.12/include/instrumentation/events/asoc.h -@@ -10,6 +10,7 @@ - #include - - #define DAPM_DIRECT "(direct)" -+#define DAPM_COMPONENT_NONE "(none)" - - #ifndef _TRACE_ASOC_DEF - #define _TRACE_ASOC_DEF -@@ -119,6 +120,40 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc - ) - #endif - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) -+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context, -+ -+ TP_PROTO(struct snd_soc_dapm_context *dapm, int val), -+ -+ TP_ARGS(dapm, val), -+ -+ TP_FIELDS( -+ ctf_string(name, dapm->card->name) -+ ctf_string(component, dapm->component ? dapm->component->name : DAPM_COMPONENT_NONE) -+ ctf_integer(int, val, val) -+ ) -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context, snd_soc_bias_level_start, -+ -+ asoc_snd_soc_bias_level_start, -+ -+ TP_PROTO(struct snd_soc_dapm_context *dapm, int val), -+ -+ TP_ARGS(dapm, val) -+ -+) -+ -+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context, snd_soc_bias_level_done, -+ -+ asoc_snd_soc_bias_level_done, -+ -+ TP_PROTO(struct snd_soc_dapm_context *dapm, int val), -+ -+ TP_ARGS(dapm, val) -+ -+) -+#else - LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_card, - - TP_PROTO(struct snd_soc_card *card, int val), -@@ -150,6 +185,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc - TP_ARGS(card, val) - - ) -+#endif - - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch deleted file mode 100644 index 66c48ebe8f..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch +++ /dev/null @@ -1,81 +0,0 @@ -From f4a6415f8d5fa447868d1fdc7119e0a328966379 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 25 Mar 2024 10:30:32 -0400 -Subject: [PATCH 3/4] Fix: mm_compaction_migratepages changed in linux 6.9-rc1 - -See upstream commit: - - commit ab755bf4249b992fc2140d615ab0a686d50765b4 - Author: Baolin Wang - Date: Tue Feb 20 14:16:31 2024 +0800 - - mm: compaction: update the cc->nr_migratepages when allocating or freeing the freepages - - Currently we will use 'cc->nr_freepages >= cc->nr_migratepages' comparison - to ensure that enough freepages are isolated in isolate_freepages(), - however it just decreases the cc->nr_freepages without updating - cc->nr_migratepages in compaction_alloc(), which will waste more CPU - cycles and cause too many freepages to be isolated. - - So we should also update the cc->nr_migratepages when allocating or - freeing the freepages to avoid isolating excess freepages. And I can see - fewer free pages are scanned and isolated when running thpcompact on my - Arm64 server: - - k6.7 k6.7_patched - Ops Compaction pages isolated 120692036.00 118160797.00 - Ops Compaction migrate scanned 131210329.00 154093268.00 - Ops Compaction free scanned 1090587971.00 1080632536.00 - Ops Compact scan efficiency 12.03 14.26 - - Moreover, I did not see an obvious latency improvements, this is likely - because isolating freepages is not the bottleneck in the thpcompact test - case. - - k6.7 k6.7_patched - Amean fault-both-1 1089.76 ( 0.00%) 1080.16 * 0.88%* - Amean fault-both-3 1616.48 ( 0.00%) 1636.65 * -1.25%* - Amean fault-both-5 2266.66 ( 0.00%) 2219.20 * 2.09%* - Amean fault-both-7 2909.84 ( 0.00%) 2801.90 * 3.71%* - Amean fault-both-12 4861.26 ( 0.00%) 4733.25 * 2.63%* - Amean fault-both-18 7351.11 ( 0.00%) 6950.51 * 5.45%* - Amean fault-both-24 9059.30 ( 0.00%) 9159.99 * -1.11%* - Amean fault-both-30 10685.68 ( 0.00%) 11399.02 * -6.68%* - -Upstream-Status: Backport [175fe77c Fix: mm_compaction_migratepages changed in linux 6.9-rc1] - -Change-Id: I103a43fd1b549360b3fc978fd409b7c17ef3e192 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - include/instrumentation/events/compaction.h | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -Index: lttng-modules-2.13.12/include/instrumentation/events/compaction.h -=================================================================== ---- lttng-modules-2.13.12.orig/include/instrumentation/events/compaction.h -+++ lttng-modules-2.13.12/include/instrumentation/events/compaction.h -@@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(comp - - #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ - --#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \ -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) -+LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, -+ -+ compaction_migratepages, -+ -+ TP_PROTO(unsigned int nr_migratepages, -+ unsigned int nr_succeeded), -+ -+ TP_ARGS(nr_migratepages, nr_succeeded), -+ -+ TP_FIELDS( -+ ctf_integer(unsigned long, nr_migrated, nr_succeeded) -+ ctf_integer(unsigned long, nr_failed, nr_migratepages - nr_succeeded) -+ ) -+) -+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \ - LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0)) - LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch deleted file mode 100644 index 59ef4f9313..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 217bc2e4685050dddce9bdd2557b64f6b8c16622 Mon Sep 17 00:00:00 2001 -From: Kienan Stewart -Date: Mon, 25 Mar 2024 10:53:46 -0400 -Subject: [PATCH 4/4] Fix: dev_base_lock removed in linux 6.9-rc1 - -See upstream commit: - - commit 1b3ef46cb7f2618cc0b507393220a69810f6da12 - Author: Eric Dumazet - Date: Tue Feb 13 06:32:45 2024 +0000 - - net: remove dev_base_lock - - dev_base_lock is not needed anymore, all remaining users also hold RTNL. - -Upstream-Status: Backport [52eb2ee9 Fix: dev_base_lock removed in linux 6.9-rc1] - -Change-Id: I6b07e6eed07fd398302ca14d23162ed24d74df15 -Signed-off-by: Kienan Stewart -Signed-off-by: Mathieu Desnoyers ---- - src/lttng-statedump-impl.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -Index: lttng-modules-2.13.12/src/lttng-statedump-impl.c -=================================================================== ---- lttng-modules-2.13.12.orig/src/lttng-statedump-impl.c -+++ lttng-modules-2.13.12/src/lttng-statedump-impl.c -@@ -392,6 +392,20 @@ void lttng_enumerate_device(struct lttng - } - } - -+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) -+static -+int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session) -+{ -+ struct net_device *dev; -+ -+ rtnl_lock(); -+ for_each_netdev(&init_net, dev) -+ lttng_enumerate_device(session, dev); -+ rtnl_unlock(); -+ -+ return 0; -+} -+#else - static - int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session) - { -@@ -404,6 +418,7 @@ int lttng_enumerate_network_ip_interface - - return 0; - } -+#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) */ - #else /* CONFIG_INET */ - static inline - int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb similarity index 77% rename from meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb index 95d5e2d615..0f05622bd4 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb @@ -10,16 +10,13 @@ inherit module include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch \ - file://0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch \ - file://0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch \ - file://0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch \ - " + file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ + " # Use :append here so that the patch is applied also when using devupstream SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" -SRC_URI[sha256sum] = "d85fcb66c7bd31003ab8735e8c77700e5e4f417b4c22fe1f20112cf435abad79" +SRC_URI[sha256sum] = "7d26c07a5e80b66aa7bdcfdaaf4857f00fc9a5cdde79226b2528676700d50228" export INSTALL_MOD_DIR="kernel/lttng-modules"