- Linux-stable-mirror - lists.linaro.org

by Tom Saeger

Build ID on arm64 is broken if CONFIG_MODVERSIONS=y on 5.4, 5.10, and 5.15 Greg mentioned to submit for _all_ branches here: https://lore.kernel.org/all/Y9N9B5e7HZhFN7nl@kroah.com/ so here is 6.1's series. This 6.1 series is not strictly necessary, as the problem does not present itself in the current 6.1 stable kernels. However, 6.1 would be broken with inclusion of either: 994b7ac1697b ("arm64: remove special treatment for the link order of head.o") 2348e6bf4421 ("riscv: remove special treatment for the link order of head.o") Should we just include these as well? Both the above are listed as Fixes for: [PATCH 6.1 fix build id for arm64 1/5] arch: fix broken BuildID for arm64 and riscv Applying this series to 6.1 is probably best to remain consistent. 4.19 and 4.14 are not susceptible to the underlying quirk of ld (at least in my study of the code to date). I've build tested on {x86_64, arm64, riscv, powerpc, s390, sh} Simple test case: $ readelf -n vmlinux | grep "Build ID" *NOTE* to following is not in mainline, yet: [PATCH 6.1 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT https://lore.kernel.org/all/9166a8abdc0f979e50377e61780a4bba1dfa2f52.167451… But it is now queued in akpm's tree: https://lore.kernel.org/all/20230127230702.81FA0C433D2@smtp.kernel.org/ Thank you Andrew! Regards, --Tom Masahiro Yamada (2): arch: fix broken BuildID for arm64 and riscv s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36 Michael Ellerman (2): powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Tom Saeger (1): sh: define RUNTIME_DISCARD_EXIT arch/powerpc/kernel/vmlinux.lds.S | 6 +++++- arch/s390/kernel/vmlinux.lds.S | 2 ++ arch/sh/kernel/vmlinux.lds.S | 2 ++ include/asm-generic/vmlinux.lds.h | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) base-commit: 93f875a8526a291005e7f38478079526c843cbec -- 2.39.1

2 years, 9 months

3
9
0 0

FAILED: patch "[PATCH] nvmem: core: fix cell removal on error" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: db3546d58b5a ("nvmem: core: fix cell removal on error") b985f4cba6db ("nvmem: add support for cell info") c7235ee3f4b8 ("nvmem: remove the global cell list") c1de7f43bd84 ("nvmem: use kref") fa72d847d68d ("nvmem: check the return value of nvmem_add_cells()") 1852183e142e ("nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells()") d7b9fd1669d4 ("nvmem: provide nvmem_dev_name()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From db3546d58b5a0fa581d9c9f2bdc2856fa6c5e43e Mon Sep 17 00:00:00 2001 From: Michael Walle <michael(a)walle.cc> Date: Fri, 27 Jan 2023 10:40:13 +0000 Subject: [PATCH] nvmem: core: fix cell removal on error nvmem_add_cells() could return an error after some cells are already added to the provider. In this case, the added cells are not removed. Remove any registered cells if nvmem_add_cells() fails. Fixes: fa72d847d68d7 ("nvmem: check the return value of nvmem_add_cells()") Cc: stable(a)vger.kernel.org Signed-off-by: Michael Walle <michael(a)walle.cc> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230127104015.23839-9-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index cbe5df99db82..563116405b3d 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -847,7 +847,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (config->cells) { rval = nvmem_add_cells(nvmem, config->cells, config->ncells); if (rval) - goto err_teardown_compat; + goto err_remove_cells; } rval = nvmem_add_cells_from_table(nvmem); @@ -870,7 +870,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_remove_cells: nvmem_device_remove_all_cells(nvmem); -err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); err_put_device:

2 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] nvmem: core: fix registration vs use race" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: ab3428cfd9aa ("nvmem: core: fix registration vs use race") 560181d3ace6 ("nvmem: core: fix cleanup after dev_set_name()") 569653f022a2 ("nvmem: core: remove nvmem_config wp_gpio") 3bd747c7ea13 ("nvmem: core: initialise nvmem->id early") 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") bd1244561fa2 ("nvmem: core: Fix memleak in nvmem_register()") f6c052afe6f8 ("nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property") de0534df9347 ("nvmem: core: fix error handling while validating keepout regions") 1333a6779501 ("nvmem: core: allow specifying of_node") fd3bb8f54a88 ("nvmem: core: Add support for keepout regions") 1eb51d6a4fce ("nvmem: switch to simpler IDA interface") 731aa3fae813 ("nvmem: core: add support to auto devid") b96fc5416b09 ("nvmem: ensure sysfs writes handle write-protect pin") 844003052719 ("nvmem: core: remove nvmem_sysfs_get_groups()") 664f0549380c ("nvmem: core: use is_bin_visible for permissions") f60442ddc40c ("nvmem: core: use device_register and device_unregister") e6de179d7a88 ("nvmem: core: add root_only member to nvmem device struct") 3c91ef69a3e9 ("nvmem: check for NULL reg_read and reg_write before dereferencing") a9c3766cb19c ("nvmem: release the write-protect pin") f7d8d7dcd978 ("nvmem: fix memory leak in error path") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From ab3428cfd9aa2f3463ee4b2909b5bb2193bd0c4a Mon Sep 17 00:00:00 2001 From: "Russell King (Oracle)" <rmk+kernel(a)armlinux.org.uk> Date: Fri, 27 Jan 2023 10:40:11 +0000 Subject: [PATCH] nvmem: core: fix registration vs use race The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers") Cc: stable(a)vger.kernel.org Signed-off-by: Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230127104015.23839-7-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ac77a019aed7..e92c6f1aadbb 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval = device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } if (config->cells) { @@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval = device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem; @@ -873,8 +873,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev);

2 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] nvmem: core: fix registration vs use race" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: ab3428cfd9aa ("nvmem: core: fix registration vs use race") 560181d3ace6 ("nvmem: core: fix cleanup after dev_set_name()") 569653f022a2 ("nvmem: core: remove nvmem_config wp_gpio") 3bd747c7ea13 ("nvmem: core: initialise nvmem->id early") 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") bd1244561fa2 ("nvmem: core: Fix memleak in nvmem_register()") f6c052afe6f8 ("nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property") de0534df9347 ("nvmem: core: fix error handling while validating keepout regions") 1333a6779501 ("nvmem: core: allow specifying of_node") fd3bb8f54a88 ("nvmem: core: Add support for keepout regions") 1eb51d6a4fce ("nvmem: switch to simpler IDA interface") 731aa3fae813 ("nvmem: core: add support to auto devid") b96fc5416b09 ("nvmem: ensure sysfs writes handle write-protect pin") 844003052719 ("nvmem: core: remove nvmem_sysfs_get_groups()") 664f0549380c ("nvmem: core: use is_bin_visible for permissions") f60442ddc40c ("nvmem: core: use device_register and device_unregister") e6de179d7a88 ("nvmem: core: add root_only member to nvmem device struct") 3c91ef69a3e9 ("nvmem: check for NULL reg_read and reg_write before dereferencing") a9c3766cb19c ("nvmem: release the write-protect pin") f7d8d7dcd978 ("nvmem: fix memory leak in error path") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From ab3428cfd9aa2f3463ee4b2909b5bb2193bd0c4a Mon Sep 17 00:00:00 2001 From: "Russell King (Oracle)" <rmk+kernel(a)armlinux.org.uk> Date: Fri, 27 Jan 2023 10:40:11 +0000 Subject: [PATCH] nvmem: core: fix registration vs use race The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers") Cc: stable(a)vger.kernel.org Signed-off-by: Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230127104015.23839-7-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ac77a019aed7..e92c6f1aadbb 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval = device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } if (config->cells) { @@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval = device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem; @@ -873,8 +873,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev);

2 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] nvmem: core: fix registration vs use race" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: ab3428cfd9aa ("nvmem: core: fix registration vs use race") 560181d3ace6 ("nvmem: core: fix cleanup after dev_set_name()") 569653f022a2 ("nvmem: core: remove nvmem_config wp_gpio") 3bd747c7ea13 ("nvmem: core: initialise nvmem->id early") 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") bd1244561fa2 ("nvmem: core: Fix memleak in nvmem_register()") f6c052afe6f8 ("nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property") de0534df9347 ("nvmem: core: fix error handling while validating keepout regions") 1333a6779501 ("nvmem: core: allow specifying of_node") fd3bb8f54a88 ("nvmem: core: Add support for keepout regions") 1eb51d6a4fce ("nvmem: switch to simpler IDA interface") 731aa3fae813 ("nvmem: core: add support to auto devid") b96fc5416b09 ("nvmem: ensure sysfs writes handle write-protect pin") 844003052719 ("nvmem: core: remove nvmem_sysfs_get_groups()") 664f0549380c ("nvmem: core: use is_bin_visible for permissions") f60442ddc40c ("nvmem: core: use device_register and device_unregister") e6de179d7a88 ("nvmem: core: add root_only member to nvmem device struct") 3c91ef69a3e9 ("nvmem: check for NULL reg_read and reg_write before dereferencing") a9c3766cb19c ("nvmem: release the write-protect pin") f7d8d7dcd978 ("nvmem: fix memory leak in error path") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From ab3428cfd9aa2f3463ee4b2909b5bb2193bd0c4a Mon Sep 17 00:00:00 2001 From: "Russell King (Oracle)" <rmk+kernel(a)armlinux.org.uk> Date: Fri, 27 Jan 2023 10:40:11 +0000 Subject: [PATCH] nvmem: core: fix registration vs use race The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers") Cc: stable(a)vger.kernel.org Signed-off-by: Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230127104015.23839-7-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ac77a019aed7..e92c6f1aadbb 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval = device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } if (config->cells) { @@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval = device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem; @@ -873,8 +873,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev);

2 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] nvmem: core: fix registration vs use race" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: ab3428cfd9aa ("nvmem: core: fix registration vs use race") 560181d3ace6 ("nvmem: core: fix cleanup after dev_set_name()") 569653f022a2 ("nvmem: core: remove nvmem_config wp_gpio") 3bd747c7ea13 ("nvmem: core: initialise nvmem->id early") 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") bd1244561fa2 ("nvmem: core: Fix memleak in nvmem_register()") f6c052afe6f8 ("nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property") de0534df9347 ("nvmem: core: fix error handling while validating keepout regions") 1333a6779501 ("nvmem: core: allow specifying of_node") fd3bb8f54a88 ("nvmem: core: Add support for keepout regions") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From ab3428cfd9aa2f3463ee4b2909b5bb2193bd0c4a Mon Sep 17 00:00:00 2001 From: "Russell King (Oracle)" <rmk+kernel(a)armlinux.org.uk> Date: Fri, 27 Jan 2023 10:40:11 +0000 Subject: [PATCH] nvmem: core: fix registration vs use race The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers") Cc: stable(a)vger.kernel.org Signed-off-by: Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230127104015.23839-7-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ac77a019aed7..e92c6f1aadbb 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval = device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } if (config->cells) { @@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval = device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem; @@ -873,8 +873,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev);

2 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] nvmem: core: fix registration vs use race" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: ab3428cfd9aa ("nvmem: core: fix registration vs use race") 560181d3ace6 ("nvmem: core: fix cleanup after dev_set_name()") 569653f022a2 ("nvmem: core: remove nvmem_config wp_gpio") 3bd747c7ea13 ("nvmem: core: initialise nvmem->id early") 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") bd1244561fa2 ("nvmem: core: Fix memleak in nvmem_register()") f6c052afe6f8 ("nvmem: core: Fix a conflict between MTD and NVMEM on wp-gpios property") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From ab3428cfd9aa2f3463ee4b2909b5bb2193bd0c4a Mon Sep 17 00:00:00 2001 From: "Russell King (Oracle)" <rmk+kernel(a)armlinux.org.uk> Date: Fri, 27 Jan 2023 10:40:11 +0000 Subject: [PATCH] nvmem: core: fix registration vs use race The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers") Cc: stable(a)vger.kernel.org Signed-off-by: Russell King (Oracle) <rmk+kernel(a)armlinux.org.uk> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Link: https://lore.kernel.org/r/20230127104015.23839-7-srinivas.kandagatla@linaro… Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ac77a019aed7..e92c6f1aadbb 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval = device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } if (config->cells) { @@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval = device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem; @@ -873,8 +873,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev);

2 years, 9 months

1
0
0 0

[PATCH] iommu/vt-d: Avoid superfluous IOTLB tracking in lazy mode

by Jacob Pan

Intel IOMMU driver implements IOTLB flush queue with domain selective or PASID selective invalidations. In this case there's no need to track IOVA page range and sync IOTLBs, which may cause significant performance hit. This patch adds a check to avoid IOVA gather page and IOTLB sync for the lazy path. The performance difference on Sapphire Rapids 100Gb NIC is improved by the following (as measured by iperf send): w/o this fix~48 Gbits/s. with this fix ~54 Gbits/s Cc: <stable(a)vger.kernel.org> Tested-by: Sanjay Kumar <sanjay.k.kumar(a)intel.com> Signed-off-by: Sanjay Kumar <sanjay.k.kumar(a)intel.com> Signed-off-by: Jacob Pan <jacob.jun.pan(a)linux.intel.com> --- drivers/iommu/intel/iommu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index b4878c7ac008..705a1c66691a 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -4352,7 +4352,13 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain, if (dmar_domain->max_addr == iova + size) dmar_domain->max_addr = iova; - iommu_iotlb_gather_add_page(domain, gather, iova, size); + /* + * We do not use page-selective IOTLB invalidation in flush queue, + * There is no need to track page and sync iotlb. Domain-selective or + * PASID-selective validation are used in the flush queue. + */ + if (!gather->queued) + iommu_iotlb_gather_add_page(domain, gather, iova, size); return size; } -- 2.25.1

2 years, 9 months

4
7
0 0

FAILED: patch "[PATCH] serial: stm32: Merge hard IRQ and threaded IRQ handling into" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: 3f6c02fa712b ("serial: stm32: Merge hard IRQ and threaded IRQ handling into single IRQ handler") 6333a4850621 ("serial: stm32: push DMA RX data before suspending") 6eeb348c8482 ("serial: stm32: terminate / restart DMA transfer at suspend / resume") e0abc903deea ("serial: stm32: rework RX dma initialization and release") d1ec8a2eabe9 ("serial: stm32: update throttle and unthrottle ops for dma mode") 33bb2f6ac308 ("serial: stm32: rework RX over DMA") cc58d0a3f0a4 ("serial: stm32: re-introduce an irq flag condition in usart_receive_chars") 59bd4eedf118 ("serial: stm32: use the defined variable to simplify code") a7770a4bfcf4 ("serial: stm32: defer probe for dma devices") cea37afd28f1 ("serial: stm32: defer sysrq processing") e359b4411c28 ("serial: stm32: fix threaded interrupt handling") 3d530017bef1 ("serial: stm32: update wakeup IRQ management") c0f3332cb5f2 ("serial: stm32: clean wakeup handling in serial_suspend") 1631eeeaf084 ("serial: stm32: rework wakeup management") 9f77d19207a0 ("serial: stm32: add FIFO flush when port is closed") 12761869f0ef ("serial: stm32: fix wake-up flag handling") ad7676812437 ("serial: stm32: fix a deadlock condition with wakeup event") 25a8e7611da5 ("serial: stm32: fix TX and RX FIFO thresholds") f4518a8a75f5 ("serial: stm32: fix startup by enabling usart for reception") 87fd0741d6dc ("serial: stm32: fix probe and remove order for dma") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 3f6c02fa712bd453871877fe1d1969625617471e Mon Sep 17 00:00:00 2001 From: Marek Vasut <marex(a)denx.de> Date: Fri, 20 Jan 2023 17:03:32 +0100 Subject: [PATCH] serial: stm32: Merge hard IRQ and threaded IRQ handling into single IRQ handler Requesting an interrupt with IRQF_ONESHOT will run the primary handler in the hard-IRQ context even in the force-threaded mode. The force-threaded mode is used by PREEMPT_RT in order to avoid acquiring sleeping locks (spinlock_t) in hard-IRQ context. This combination makes it impossible and leads to "sleeping while atomic" warnings. Use one interrupt handler for both handlers (primary and secondary) and drop the IRQF_ONESHOT flag which is not needed. Fixes: e359b4411c283 ("serial: stm32: fix threaded interrupt handling") Reviewed-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Tested-by: Valentin Caron <valentin.caron(a)foss.st.com> # V3 Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230120160332.57930-1-marex@denx.de Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index a1490033aa16..409e91d6829a 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -797,25 +797,11 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr) spin_unlock(&port->lock); } - if (stm32_usart_rx_dma_enabled(port)) - return IRQ_WAKE_THREAD; - else - return IRQ_HANDLED; -} - -static irqreturn_t stm32_usart_threaded_interrupt(int irq, void *ptr) -{ - struct uart_port *port = ptr; - struct tty_port *tport = &port->state->port; - struct stm32_port *stm32_port = to_stm32_port(port); - unsigned int size; - unsigned long flags; - /* Receiver timeout irq for DMA RX */ - if (!stm32_port->throttled) { - spin_lock_irqsave(&port->lock, flags); + if (stm32_usart_rx_dma_enabled(port) && !stm32_port->throttled) { + spin_lock(&port->lock); size = stm32_usart_receive_chars(port, false); - uart_unlock_and_check_sysrq_irqrestore(port, flags); + uart_unlock_and_check_sysrq(port); if (size) tty_flip_buffer_push(tport); } @@ -1015,10 +1001,8 @@ static int stm32_usart_startup(struct uart_port *port) u32 val; int ret; - ret = request_threaded_irq(port->irq, stm32_usart_interrupt, - stm32_usart_threaded_interrupt, - IRQF_ONESHOT | IRQF_NO_SUSPEND, - name, port); + ret = request_irq(port->irq, stm32_usart_interrupt, + IRQF_NO_SUSPEND, name, port); if (ret) return ret; @@ -1601,13 +1585,6 @@ static int stm32_usart_of_dma_rx_probe(struct stm32_port *stm32port, struct dma_slave_config config; int ret; - /* - * Using DMA and threaded handler for the console could lead to - * deadlocks. - */ - if (uart_console(port)) - return -ENODEV; - stm32port->rx_buf = dma_alloc_coherent(dev, RX_BUF_L, &stm32port->rx_dma_buf, GFP_KERNEL);

2 years, 9 months

1
0
0 0

FAILED: patch "[PATCH] serial: stm32: Merge hard IRQ and threaded IRQ handling into" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. Possible dependencies: 3f6c02fa712b ("serial: stm32: Merge hard IRQ and threaded IRQ handling into single IRQ handler") 6333a4850621 ("serial: stm32: push DMA RX data before suspending") 6eeb348c8482 ("serial: stm32: terminate / restart DMA transfer at suspend / resume") e0abc903deea ("serial: stm32: rework RX dma initialization and release") d1ec8a2eabe9 ("serial: stm32: update throttle and unthrottle ops for dma mode") 33bb2f6ac308 ("serial: stm32: rework RX over DMA") cc58d0a3f0a4 ("serial: stm32: re-introduce an irq flag condition in usart_receive_chars") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 3f6c02fa712bd453871877fe1d1969625617471e Mon Sep 17 00:00:00 2001 From: Marek Vasut <marex(a)denx.de> Date: Fri, 20 Jan 2023 17:03:32 +0100 Subject: [PATCH] serial: stm32: Merge hard IRQ and threaded IRQ handling into single IRQ handler Requesting an interrupt with IRQF_ONESHOT will run the primary handler in the hard-IRQ context even in the force-threaded mode. The force-threaded mode is used by PREEMPT_RT in order to avoid acquiring sleeping locks (spinlock_t) in hard-IRQ context. This combination makes it impossible and leads to "sleeping while atomic" warnings. Use one interrupt handler for both handlers (primary and secondary) and drop the IRQF_ONESHOT flag which is not needed. Fixes: e359b4411c283 ("serial: stm32: fix threaded interrupt handling") Reviewed-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> Tested-by: Valentin Caron <valentin.caron(a)foss.st.com> # V3 Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20230120160332.57930-1-marex@denx.de Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index a1490033aa16..409e91d6829a 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -797,25 +797,11 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr) spin_unlock(&port->lock); } - if (stm32_usart_rx_dma_enabled(port)) - return IRQ_WAKE_THREAD; - else - return IRQ_HANDLED; -} - -static irqreturn_t stm32_usart_threaded_interrupt(int irq, void *ptr) -{ - struct uart_port *port = ptr; - struct tty_port *tport = &port->state->port; - struct stm32_port *stm32_port = to_stm32_port(port); - unsigned int size; - unsigned long flags; - /* Receiver timeout irq for DMA RX */ - if (!stm32_port->throttled) { - spin_lock_irqsave(&port->lock, flags); + if (stm32_usart_rx_dma_enabled(port) && !stm32_port->throttled) { + spin_lock(&port->lock); size = stm32_usart_receive_chars(port, false); - uart_unlock_and_check_sysrq_irqrestore(port, flags); + uart_unlock_and_check_sysrq(port); if (size) tty_flip_buffer_push(tport); } @@ -1015,10 +1001,8 @@ static int stm32_usart_startup(struct uart_port *port) u32 val; int ret; - ret = request_threaded_irq(port->irq, stm32_usart_interrupt, - stm32_usart_threaded_interrupt, - IRQF_ONESHOT | IRQF_NO_SUSPEND, - name, port); + ret = request_irq(port->irq, stm32_usart_interrupt, + IRQF_NO_SUSPEND, name, port); if (ret) return ret; @@ -1601,13 +1585,6 @@ static int stm32_usart_of_dma_rx_probe(struct stm32_port *stm32port, struct dma_slave_config config; int ret; - /* - * Using DMA and threaded handler for the console could lead to - * deadlocks. - */ - if (uart_console(port)) - return -ENODEV; - stm32port->rx_buf = dma_alloc_coherent(dev, RX_BUF_L, &stm32port->rx_dma_buf, GFP_KERNEL);

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror