From: Greg Kroah-Hartman Date: Tue, 29 Apr 2025 15:25:06 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.4.293~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8da580aa7636651500bc1d544c03eaaef60d196;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: asoc-qcom-q6afe-dai-fix-display-port-playback-stream-name.patch mips-cm-fix-warning-if-mips_cm-is-disabled.patch nvme-fixup-scan-failure-for-non-ana-multipath-controllers.patch objtool-silence-more-kcov-warnings-part-2.patch pci-fix-use-after-free-in-pci_bus_release_domain_nr.patch phy-freescale-imx8m-pcie-add-one-missing-error-return.patch phy-freescale-imx8m-pcie-do-cmn_rst-just-before-phy-pll-lock-check.patch tracing-remove-pointer-asterisk-and-brackets-from-cpumask_t-field.patch --- diff --git a/queue-6.1/asoc-qcom-q6afe-dai-fix-display-port-playback-stream-name.patch b/queue-6.1/asoc-qcom-q6afe-dai-fix-display-port-playback-stream-name.patch new file mode 100644 index 0000000000..7ea84cc405 --- /dev/null +++ b/queue-6.1/asoc-qcom-q6afe-dai-fix-display-port-playback-stream-name.patch @@ -0,0 +1,37 @@ +From 4f3fcf5f6dc8ab561e152c8747fd7e502b32266c Mon Sep 17 00:00:00 2001 +From: Srinivas Kandagatla +Date: Wed, 5 Jul 2023 13:48:50 +0100 +Subject: ASoC: qcom: q6afe-dai: fix Display Port Playback stream name + +From: Srinivas Kandagatla + +commit 4f3fcf5f6dc8ab561e152c8747fd7e502b32266c upstream. + +With recent changes to add more display ports did not change the Stream +name in q6afe-dai. This results in below error +"ASoC: Failed to add route DISPLAY_PORT_RX -> Display Port Playback(*)" +and sound card fails to probe. + +Fix this by adding correct stream name. + +Fixes: 90848a2557fe ("ASoC: qcom: q6dsp: add support to more display ports") +Reported-by: Amit Pundir +Signed-off-by: Srinivas Kandagatla +Link: https://lore.kernel.org/r/20230705124850.40069-1-srinivas.kandagatla@linaro.org +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/qcom/qdsp6/q6afe-dai.c ++++ b/sound/soc/qcom/qdsp6/q6afe-dai.c +@@ -496,7 +496,7 @@ static int q6afe_mi2s_set_sysclk(struct + + static const struct snd_soc_dapm_route q6afe_dapm_routes[] = { + {"HDMI Playback", NULL, "HDMI_RX"}, +- {"Display Port Playback", NULL, "DISPLAY_PORT_RX"}, ++ {"DISPLAY_PORT_RX_0 Playback", NULL, "DISPLAY_PORT_RX"}, + {"Slimbus Playback", NULL, "SLIMBUS_0_RX"}, + {"Slimbus1 Playback", NULL, "SLIMBUS_1_RX"}, + {"Slimbus2 Playback", NULL, "SLIMBUS_2_RX"}, diff --git a/queue-6.1/mips-cm-fix-warning-if-mips_cm-is-disabled.patch b/queue-6.1/mips-cm-fix-warning-if-mips_cm-is-disabled.patch new file mode 100644 index 0000000000..272bbfb37c --- /dev/null +++ b/queue-6.1/mips-cm-fix-warning-if-mips_cm-is-disabled.patch @@ -0,0 +1,38 @@ +From b73c3ccdca95c237750c981054997c71d33e09d7 Mon Sep 17 00:00:00 2001 +From: Thomas Bogendoerfer +Date: Fri, 28 Feb 2025 15:37:02 +0100 +Subject: MIPS: cm: Fix warning if MIPS_CM is disabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Bogendoerfer + +commit b73c3ccdca95c237750c981054997c71d33e09d7 upstream. + +Commit e27fbe16af5c ("MIPS: cm: Detect CM quirks from device tree") +introduced + +arch/mips/include/asm/mips-cm.h:119:13: error: ‘mips_cm_update_property’ + defined but not used [-Werror=unused-function] + +Fix this by making empty function implementation inline + +Fixes: e27fbe16af5c ("MIPS: cm: Detect CM quirks from device tree") +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/include/asm/mips-cm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/include/asm/mips-cm.h ++++ b/arch/mips/include/asm/mips-cm.h +@@ -104,7 +104,7 @@ static inline bool mips_cm_present(void) + #ifdef CONFIG_MIPS_CM + extern void mips_cm_update_property(void); + #else +-static void mips_cm_update_property(void) {} ++static inline void mips_cm_update_property(void) {} + #endif + + /** diff --git a/queue-6.1/nvme-fixup-scan-failure-for-non-ana-multipath-controllers.patch b/queue-6.1/nvme-fixup-scan-failure-for-non-ana-multipath-controllers.patch new file mode 100644 index 0000000000..17d852805f --- /dev/null +++ b/queue-6.1/nvme-fixup-scan-failure-for-non-ana-multipath-controllers.patch @@ -0,0 +1,36 @@ +From 26d7fb4fd4ca1180e2fa96587dea544563b4962a Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke +Date: Mon, 14 Apr 2025 14:05:09 +0200 +Subject: nvme: fixup scan failure for non-ANA multipath controllers + +From: Hannes Reinecke + +commit 26d7fb4fd4ca1180e2fa96587dea544563b4962a upstream. + +Commit 62baf70c3274 caused the ANA log page to be re-read, even on +controllers that do not support ANA. While this should generally +harmless, some controllers hang on the unsupported log page and +never finish probing. + +Fixes: 62baf70c3274 ("nvme: re-read ANA log page after ns scan completes") +Signed-off-by: Hannes Reinecke +Tested-by: Srikanth Aithal +[hch: more detailed commit message] +Signed-off-by: Christoph Hellwig +Reviewed-by: Sagi Grimberg +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nvme/host/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -4709,7 +4709,7 @@ static void nvme_scan_work(struct work_s + if (test_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events)) + nvme_queue_scan(ctrl); + #ifdef CONFIG_NVME_MULTIPATH +- else ++ else if (ctrl->ana_log_buf) + /* Re-read the ANA log page to not miss updates */ + queue_work(nvme_wq, &ctrl->ana_work); + #endif diff --git a/queue-6.1/objtool-silence-more-kcov-warnings-part-2.patch b/queue-6.1/objtool-silence-more-kcov-warnings-part-2.patch new file mode 100644 index 0000000000..251a9a8b5b --- /dev/null +++ b/queue-6.1/objtool-silence-more-kcov-warnings-part-2.patch @@ -0,0 +1,46 @@ +From 55c78035a1a8dfb05f1472018ce2a651701adb7d Mon Sep 17 00:00:00 2001 +From: Josh Poimboeuf +Date: Mon, 31 Mar 2025 21:26:36 -0700 +Subject: objtool: Silence more KCOV warnings, part 2 + +From: Josh Poimboeuf + +commit 55c78035a1a8dfb05f1472018ce2a651701adb7d upstream. + +Similar to GCOV, KCOV can leave behind dead code and undefined behavior. +Warnings related to those should be ignored. + +The previous commit: + + 6b023c784204 ("objtool: Silence more KCOV warnings") + +... only did so for CONFIG_CGOV_KERNEL. Also do it for CONFIG_KCOV, but +for real this time. + +Fixes the following warning: + + vmlinux.o: warning: objtool: synaptics_report_mt_data: unexpected end of section .text.synaptics_report_mt_data + +Fixes: 6b023c784204 ("objtool: Silence more KCOV warnings") +Reported-by: kernel test robot +Signed-off-by: Josh Poimboeuf +Signed-off-by: Ingo Molnar +Cc: Linus Torvalds +Link: https://lore.kernel.org/r/a44ba16e194bcbc52c1cef3d3cd9051a62622723.1743481539.git.jpoimboe@kernel.org +Closes: https://lore.kernel.org/oe-kbuild-all/202503282236.UhfRsF3B-lkp@intel.com/ +Signed-off-by: Greg Kroah-Hartman +--- + scripts/Makefile.lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -263,7 +263,7 @@ objtool-args-$(CONFIG_SLS) += --sls + objtool-args-$(CONFIG_STACK_VALIDATION) += --stackval + objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE) += --static-call + objtool-args-$(CONFIG_HAVE_UACCESS_VALIDATION) += --uaccess +-objtool-args-$(CONFIG_GCOV_KERNEL) += --no-unreachable ++objtool-args-$(or $(CONFIG_GCOV_KERNEL),$(CONFIG_KCOV)) += --no-unreachable + + objtool-args = $(objtool-args-y) \ + $(if $(delay-objtool), --link) \ diff --git a/queue-6.1/pci-fix-use-after-free-in-pci_bus_release_domain_nr.patch b/queue-6.1/pci-fix-use-after-free-in-pci_bus_release_domain_nr.patch new file mode 100644 index 0000000000..b4be729ac4 --- /dev/null +++ b/queue-6.1/pci-fix-use-after-free-in-pci_bus_release_domain_nr.patch @@ -0,0 +1,100 @@ +From 30ba2d09edb5ea857a1473ae3d820911347ada62 Mon Sep 17 00:00:00 2001 +From: Rob Herring +Date: Wed, 29 Mar 2023 07:38:35 -0500 +Subject: PCI: Fix use-after-free in pci_bus_release_domain_nr() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rob Herring + +commit 30ba2d09edb5ea857a1473ae3d820911347ada62 upstream. + +Commit c14f7ccc9f5d ("PCI: Assign PCI domain IDs by ida_alloc()") +introduced a use-after-free bug in the bus removal cleanup. The issue was +found with kfence: + + [ 19.293351] BUG: KFENCE: use-after-free read in pci_bus_release_domain_nr+0x10/0x70 + + [ 19.302817] Use-after-free read at 0x000000007f3b80eb (in kfence-#115): + [ 19.309677] pci_bus_release_domain_nr+0x10/0x70 + [ 19.309691] dw_pcie_host_deinit+0x28/0x78 + [ 19.309702] tegra_pcie_deinit_controller+0x1c/0x38 [pcie_tegra194] + [ 19.309734] tegra_pcie_dw_probe+0x648/0xb28 [pcie_tegra194] + [ 19.309752] platform_probe+0x90/0xd8 + ... + + [ 19.311457] kfence-#115: 0x00000000063a155a-0x00000000ba698da8, size=1072, cache=kmalloc-2k + + [ 19.311469] allocated by task 96 on cpu 10 at 19.279323s: + [ 19.311562] __kmem_cache_alloc_node+0x260/0x278 + [ 19.311571] kmalloc_trace+0x24/0x30 + [ 19.311580] pci_alloc_bus+0x24/0xa0 + [ 19.311590] pci_register_host_bridge+0x48/0x4b8 + [ 19.311601] pci_scan_root_bus_bridge+0xc0/0xe8 + [ 19.311613] pci_host_probe+0x18/0xc0 + [ 19.311623] dw_pcie_host_init+0x2c0/0x568 + [ 19.311630] tegra_pcie_dw_probe+0x610/0xb28 [pcie_tegra194] + [ 19.311647] platform_probe+0x90/0xd8 + ... + + [ 19.311782] freed by task 96 on cpu 10 at 19.285833s: + [ 19.311799] release_pcibus_dev+0x30/0x40 + [ 19.311808] device_release+0x30/0x90 + [ 19.311814] kobject_put+0xa8/0x120 + [ 19.311832] device_unregister+0x20/0x30 + [ 19.311839] pci_remove_bus+0x78/0x88 + [ 19.311850] pci_remove_root_bus+0x5c/0x98 + [ 19.311860] dw_pcie_host_deinit+0x28/0x78 + [ 19.311866] tegra_pcie_deinit_controller+0x1c/0x38 [pcie_tegra194] + [ 19.311883] tegra_pcie_dw_probe+0x648/0xb28 [pcie_tegra194] + [ 19.311900] platform_probe+0x90/0xd8 + ... + + [ 19.313579] CPU: 10 PID: 96 Comm: kworker/u24:2 Not tainted 6.2.0 #4 + [ 19.320171] Hardware name: /, BIOS 1.0-d7fb19b 08/10/2022 + [ 19.325852] Workqueue: events_unbound deferred_probe_work_func + +The stack trace is a bit misleading as dw_pcie_host_deinit() doesn't +directly call pci_bus_release_domain_nr(). The issue turns out to be in +pci_remove_root_bus() which first calls pci_remove_bus() which frees the +struct pci_bus when its struct device is released. Then +pci_bus_release_domain_nr() is called and accesses the freed struct +pci_bus. Reordering these fixes the issue. + +Fixes: c14f7ccc9f5d ("PCI: Assign PCI domain IDs by ida_alloc()") +Link: https://lore.kernel.org/r/20230329123835.2724518-1-robh@kernel.org +Link: https://lore.kernel.org/r/b529cb69-0602-9eed-fc02-2f068707a006@nvidia.com +Reported-by: Jon Hunter +Tested-by: Jon Hunter +Signed-off-by: Rob Herring +Signed-off-by: Bjorn Helgaas +Reviewed-by: Kuppuswamy Sathyanarayanan +Cc: stable@vger.kernel.org # v6.2+ +Cc: Pali Rohár +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/remove.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/pci/remove.c ++++ b/drivers/pci/remove.c +@@ -157,8 +157,6 @@ void pci_remove_root_bus(struct pci_bus + list_for_each_entry_safe(child, tmp, + &bus->devices, bus_list) + pci_remove_bus_device(child); +- pci_remove_bus(bus); +- host_bridge->bus = NULL; + + #ifdef CONFIG_PCI_DOMAINS_GENERIC + /* Release domain_nr if it was dynamically allocated */ +@@ -166,6 +164,9 @@ void pci_remove_root_bus(struct pci_bus + pci_bus_release_domain_nr(bus, host_bridge->dev.parent); + #endif + ++ pci_remove_bus(bus); ++ host_bridge->bus = NULL; ++ + /* remove the host bridge */ + device_del(&host_bridge->dev); + } diff --git a/queue-6.1/phy-freescale-imx8m-pcie-add-one-missing-error-return.patch b/queue-6.1/phy-freescale-imx8m-pcie-add-one-missing-error-return.patch new file mode 100644 index 0000000000..41db8e0617 --- /dev/null +++ b/queue-6.1/phy-freescale-imx8m-pcie-add-one-missing-error-return.patch @@ -0,0 +1,34 @@ +From b574baa64cf84e7793fe79f4491ae36c16e65a0b Mon Sep 17 00:00:00 2001 +From: Richard Zhu +Date: Mon, 19 Dec 2022 15:12:21 +0800 +Subject: phy: freescale: imx8m-pcie: Add one missing error return + +From: Richard Zhu + +commit b574baa64cf84e7793fe79f4491ae36c16e65a0b upstream. + +There should be one error return when fail to fetch the perst reset. +Add the missing error return. + +Fixes: dce9edff16ee ("phy: freescale: imx8m-pcie: Add i.MX8MP PCIe PHY support") + +Signed-off-by: Richard Zhu +Reviewed-by: Marek Vasut +Link: https://lore.kernel.org/r/1671433941-2037-1-git-send-email-hongxing.zhu@nxp.com +Signed-off-by: Vinod Koul +Signed-off-by: Greg Kroah-Hartman +--- + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/phy/freescale/phy-fsl-imx8m-pcie.c ++++ b/drivers/phy/freescale/phy-fsl-imx8m-pcie.c +@@ -271,7 +271,7 @@ static int imx8_pcie_phy_probe(struct pl + imx8_phy->perst = + devm_reset_control_get_exclusive(dev, "perst"); + if (IS_ERR(imx8_phy->perst)) +- dev_err_probe(dev, PTR_ERR(imx8_phy->perst), ++ return dev_err_probe(dev, PTR_ERR(imx8_phy->perst), + "Failed to get PCIE PHY PERST control\n"); + } + diff --git a/queue-6.1/phy-freescale-imx8m-pcie-do-cmn_rst-just-before-phy-pll-lock-check.patch b/queue-6.1/phy-freescale-imx8m-pcie-do-cmn_rst-just-before-phy-pll-lock-check.patch new file mode 100644 index 0000000000..5ce146365b --- /dev/null +++ b/queue-6.1/phy-freescale-imx8m-pcie-do-cmn_rst-just-before-phy-pll-lock-check.patch @@ -0,0 +1,92 @@ +From f89263b69731e0144d275fff777ee0dd92069200 Mon Sep 17 00:00:00 2001 +From: Richard Zhu +Date: Mon, 21 Oct 2024 11:52:41 -0400 +Subject: phy: freescale: imx8m-pcie: Do CMN_RST just before PHY PLL lock check + +From: Richard Zhu + +commit f89263b69731e0144d275fff777ee0dd92069200 upstream. + +When enable initcall_debug together with higher debug level below. +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=9 +CONFIG_CONSOLE_LOGLEVEL_QUIET=9 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7 + +The initialization of i.MX8MP PCIe PHY might be timeout failed randomly. +To fix this issue, adjust the sequence of the resets refer to the power +up sequence listed below. + +i.MX8MP PCIe PHY power up sequence: + /--------------------------------------------- +1.8v supply ---------/ + /--------------------------------------------------- +0.8v supply ---/ + + ---\ /-------------------------------------------------- + X REFCLK Valid +Reference Clock ---/ \-------------------------------------------------- + ------------------------------------------- + | +i_init_restn -------------- + ------------------------------------ + | +i_cmn_rstn --------------------- + ------------------------------- + | +o_pll_lock_done -------------------------- + +Logs: +imx6q-pcie 33800000.pcie: host bridge /soc@0/pcie@33800000 ranges: +imx6q-pcie 33800000.pcie: IO 0x001ff80000..0x001ff8ffff -> 0x0000000000 +imx6q-pcie 33800000.pcie: MEM 0x0018000000..0x001fefffff -> 0x0018000000 +probe of clk_imx8mp_audiomix.reset.0 returned 0 after 1052 usecs +probe of 30e20000.clock-controller returned 0 after 32971 usecs +phy phy-32f00000.pcie-phy.4: phy poweron failed --> -110 +probe of 30e10000.dma-controller returned 0 after 10235 usecs +imx6q-pcie 33800000.pcie: waiting for PHY ready timeout! +dwhdmi-imx 32fd8000.hdmi: Detected HDMI TX controller v2.13a with HDCP (samsung_dw_hdmi_phy2) +imx6q-pcie 33800000.pcie: probe with driver imx6q-pcie failed with error -110 + +Fixes: dce9edff16ee ("phy: freescale: imx8m-pcie: Add i.MX8MP PCIe PHY support") +Cc: stable@vger.kernel.org +Signed-off-by: Richard Zhu +Signed-off-by: Frank Li +Signed-off-by: Greg Kroah-Hartman + +v2 changes: +- Rebase to latest fixes branch of linux-phy git repo. +- Richard's environment have problem and can't sent out patch. So I help +post this fix patch. + +Link: https://lore.kernel.org/r/20241021155241.943665-1-Frank.Li@nxp.com +Signed-off-by: Vinod Koul +--- + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/phy/freescale/phy-fsl-imx8m-pcie.c ++++ b/drivers/phy/freescale/phy-fsl-imx8m-pcie.c +@@ -143,11 +143,6 @@ static int imx8_pcie_phy_power_on(struct + IMX8MM_GPR_PCIE_REF_CLK_PLL); + usleep_range(100, 200); + +- /* Do the PHY common block reset */ +- regmap_update_bits(imx8_phy->iomuxc_gpr, IOMUXC_GPR14, +- IMX8MM_GPR_PCIE_CMN_RST, +- IMX8MM_GPR_PCIE_CMN_RST); +- + switch (imx8_phy->drvdata->variant) { + case IMX8MP: + reset_control_deassert(imx8_phy->perst); +@@ -158,6 +153,11 @@ static int imx8_pcie_phy_power_on(struct + break; + } + ++ /* Do the PHY common block reset */ ++ regmap_update_bits(imx8_phy->iomuxc_gpr, IOMUXC_GPR14, ++ IMX8MM_GPR_PCIE_CMN_RST, ++ IMX8MM_GPR_PCIE_CMN_RST); ++ + /* Polling to check the phy is ready or not. */ + ret = readl_poll_timeout(imx8_phy->base + IMX8MM_PCIE_PHY_CMN_REG75, + val, val == PCIE_PHY_CMN_REG75_PLL_DONE, diff --git a/queue-6.1/series b/queue-6.1/series index ce46605f0d..6131a042a5 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -157,3 +157,11 @@ net-dsa-mv88e6xxx-enable-pvt-for-6321-switch.patch net-dsa-mv88e6xxx-enable-.port_set_policy-for-6320-family.patch net-dsa-mv88e6xxx-enable-stu-methods-for-6320-family.patch xdp-reset-bpf_redirect_info-before-running-a-xdp-s-bpf-prog.patch +mips-cm-fix-warning-if-mips_cm-is-disabled.patch +nvme-fixup-scan-failure-for-non-ana-multipath-controllers.patch +phy-freescale-imx8m-pcie-do-cmn_rst-just-before-phy-pll-lock-check.patch +phy-freescale-imx8m-pcie-add-one-missing-error-return.patch +tracing-remove-pointer-asterisk-and-brackets-from-cpumask_t-field.patch +pci-fix-use-after-free-in-pci_bus_release_domain_nr.patch +asoc-qcom-q6afe-dai-fix-display-port-playback-stream-name.patch +objtool-silence-more-kcov-warnings-part-2.patch diff --git a/queue-6.1/tracing-remove-pointer-asterisk-and-brackets-from-cpumask_t-field.patch b/queue-6.1/tracing-remove-pointer-asterisk-and-brackets-from-cpumask_t-field.patch new file mode 100644 index 0000000000..e482d47b55 --- /dev/null +++ b/queue-6.1/tracing-remove-pointer-asterisk-and-brackets-from-cpumask_t-field.patch @@ -0,0 +1,75 @@ +From fab89a09c86f948adfc7e20a7d608bd9f323bbe1 Mon Sep 17 00:00:00 2001 +From: "Steven Rostedt (Google)" +Date: Mon, 12 Dec 2022 19:38:14 -0500 +Subject: tracing: Remove pointer (asterisk) and brackets from cpumask_t field + +From: Steven Rostedt (Google) + +commit fab89a09c86f948adfc7e20a7d608bd9f323bbe1 upstream. + +To differentiate between long arrays and cpumasks, the __cpumask() field +was created. Part of the TRACE_EVENT() macros test if the type is signed +or not by using the is_signed_type() macro. The __cpumask() field used the +__dynamic_array() helper but because cpumask_t is a structure, it could +not be used in the is_signed_type() macro as that would fail to build, so +instead it passed in the pointer to cpumask_t. + +Unfortunately, that creates in the format file: + + field:__data_loc cpumask_t *[] mask; offset:36; size:4; signed:0; + +Which looks like an array of pointers to cpumask_t and not a cpumask_t +type, which is misleading to user space parsers. + +Douglas Raillard pointed out that the "[]" are also misleading, as +cpumask_t is not an array. + +Since cpumask() hasn't been created yet, and the parsers currently fail on +it (but will still produce the raw output), make it be: + + field:__data_loc cpumask_t mask; offset:36; size:4; signed:0; + +Which is the correct type of the field. + +Then the parsers can be updated to handle this. + +Link: https://lore.kernel.org/lkml/6dda5e1d-9416-b55e-88f3-31d148bc925f@arm.com/ +Link: https://lore.kernel.org/linux-trace-kernel/20221212193814.0e3f1e43@gandalf.local.home + +Cc: Masami Hiramatsu +Cc: Valentin Schneider +Cc: Andrew Morton +Fixes: 8230f27b1ccc ("tracing: Add __cpumask to denote a trace event field that is a cpumask_t") +Reported-by: Douglas Raillard +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Greg Kroah-Hartman +--- + include/trace/stages/stage4_event_fields.h | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +--- a/include/trace/stages/stage4_event_fields.h ++++ b/include/trace/stages/stage4_event_fields.h +@@ -48,7 +48,10 @@ + #define __bitmask(item, nr_bits) __dynamic_array(unsigned long, item, -1) + + #undef __cpumask +-#define __cpumask(item) __dynamic_array(cpumask_t *, item, -1) ++#define __cpumask(item) { \ ++ .type = "__data_loc cpumask_t", .name = #item, \ ++ .size = 4, .align = 4, \ ++ .is_signed = 0, .filter_type = FILTER_OTHER }, + + #undef __sockaddr + #define __sockaddr(field, len) __dynamic_array(u8, field, len) +@@ -69,7 +72,10 @@ + #define __rel_bitmask(item, nr_bits) __rel_dynamic_array(unsigned long, item, -1) + + #undef __rel_cpumask +-#define __rel_cpumask(item) __rel_dynamic_array(cpumask_t *, item, -1) ++#define __rel_cpumask(item) { \ ++ .type = "__rel_loc cpumask_t", .name = #item, \ ++ .size = 4, .align = 4, \ ++ .is_signed = 0, .filter_type = FILTER_OTHER }, + + #undef __rel_sockaddr + #define __rel_sockaddr(field, len) __rel_dynamic_array(u8, field, len)