mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-11 23:22:11 -05:00
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.43 Removed upstreamed: generic/backport-6.12/612-07-v6.17-net-dsa-b53-prevent-SWITCH_CTRL-access-on-BCM5325.patch[1] generic-backport/612-08-v6.17-net-dsa-b53-fix-IP_MULTICAST_CTRL-on-BCM5325.patch[2] generic-backport/612-09-v6.17-net-dsa-b53-prevent-DIS_LEARNING-access-on-BCM5325.patch[3] generic-backport/612-11-v6.17-net-dsa-b53-prevent-GMII_PORT_OVERRIDE_CTRL-access-on-BCM5325.patch[4] generic-backport/612-14-v6.17-net-dsa-b53-ensure-BCM5325-PHYs-are-enabled.patch[5] generic-backport/830-v6.17-Revert-leds-trigger-netdev-Configure-LED-blink-inter.patch[6] bcm27xx/patches-6.12/950-0100-media-tc358743-Increase-FIFO-level-to-374.patch[7] bcm27xx/patches-6.12/950-0102-media-tc358743-Check-I2C-succeeded-during-probe.patch[8] bcm27xx/patches-6.12/950-0107-media-tc358743-Return-an-appropriate-colorspace-from.patch[9] bcm27xx/patches-6.12/950-0341-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch[10] lantiq/patches-6.12/102-11-v6.17-MIPS-lantiq-falcon-sysctrl-fix-request-memory-check-.patch[11] lantiq/patches-6.12/102-12-v6.17-MIPS-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch[12] qualcommax/patches-6.12/0170-clk-qcom-gcc-ipq8074-fix-broken-freq-table-for-nss_port6_tx_clk_src.patch[13] generic/backport-6.12/612-13-v6.17-net-dsa-b53-fix-b53_imp_vlan_setup-for-BCM5325.patch[14] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=f16f96ccfe56ef2d627c20ba47f6d9d7dea40f5b 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=394bd12d1f93ed2fa0fa1d8f31ffd3c344681e85 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=9f45e4858f8096bb27f9a2c75fc24a538dffad67 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=15cf46cc6ecc7a54b397294675d11c379ddf69ef 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=0d250ad617a035904744cef74a5d5dc43d0199b9 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=cb9bb872366e10fa42e1e0200a0c2e5d05a27bec 7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=f25d566c5674decd0051a3e624805fc1524729bf 8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=3e03ee3b65baeac4c253b30650492ffffad9b608 9. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=b42b107293b52ac8d46238815b1071138a47a7e4 10. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=e285cdb9d2e4ba2e4515ae898f92e9f38be64eb3 11. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=1e9079ff83eac962bc3b1e2fbad73b2f7d5256f4 12. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=8520c843d9a2770012f23da08e4e2ccf1bb05ba6 13. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=f1c5c55fb6cda312f5ed15505588caaf05a69043 14. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.43&id=757955c80663ac3df7053abaf6fcc75051ef7a7c Build system: x86/64 (Intel N150 based) Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19618 Signed-off-by: Robert Marko <robimarko@gmail.com>
165 lines
4.6 KiB
Diff
165 lines
4.6 KiB
Diff
From 858df9db80c1568db255659baca7602504f823af Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Wed, 15 May 2024 08:19:51 +0100
|
|
Subject: [PATCH 5/8] block: add support for notifications
|
|
|
|
Add notifier block to notify other subsystems about the addition or
|
|
removal of block devices.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
block/Kconfig | 6 +++
|
|
block/Makefile | 1 +
|
|
block/blk-notify.c | 107 +++++++++++++++++++++++++++++++++++++++++
|
|
include/linux/blkdev.h | 8 +++
|
|
4 files changed, 122 insertions(+)
|
|
create mode 100644 block/blk-notify.c
|
|
|
|
--- a/block/Kconfig
|
|
+++ b/block/Kconfig
|
|
@@ -209,6 +209,12 @@ config BLK_INLINE_ENCRYPTION_FALLBACK
|
|
by falling back to the kernel crypto API when inline
|
|
encryption hardware is not present.
|
|
|
|
+config BLOCK_NOTIFIERS
|
|
+ bool "Enable support for notifications in block layer"
|
|
+ help
|
|
+ Enable this option to provide notifiers for other subsystems
|
|
+ upon addition or removal of block devices.
|
|
+
|
|
source "block/partitions/Kconfig"
|
|
|
|
config BLK_MQ_PCI
|
|
--- a/block/Makefile
|
|
+++ b/block/Makefile
|
|
@@ -38,3 +38,4 @@ obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += b
|
|
blk-crypto-sysfs.o
|
|
obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o
|
|
obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o
|
|
+obj-$(CONFIG_BLOCK_NOTIFIERS) += blk-notify.o
|
|
--- /dev/null
|
|
+++ b/block/blk-notify.c
|
|
@@ -0,0 +1,107 @@
|
|
+// SPDX-License-Identifier: GPL-2.0-or-later
|
|
+/*
|
|
+ * Notifiers for addition and removal of block devices
|
|
+ *
|
|
+ * Copyright (c) 2024 Daniel Golle <daniel@makrotopia.org>
|
|
+ */
|
|
+
|
|
+#include <linux/list.h>
|
|
+#include <linux/mutex.h>
|
|
+#include <linux/notifier.h>
|
|
+#include <linux/workqueue.h>
|
|
+
|
|
+#include "blk.h"
|
|
+
|
|
+struct blk_device_list {
|
|
+ struct device *dev;
|
|
+ struct list_head list;
|
|
+};
|
|
+
|
|
+static RAW_NOTIFIER_HEAD(blk_notifier_list);
|
|
+static DEFINE_MUTEX(blk_notifier_lock);
|
|
+static LIST_HEAD(blk_devices);
|
|
+
|
|
+struct blk_notify_event {
|
|
+ struct delayed_work work;
|
|
+ struct device *dev;
|
|
+};
|
|
+
|
|
+void blk_register_notify(struct notifier_block *nb)
|
|
+{
|
|
+ struct blk_device_list *existing_blkdev;
|
|
+
|
|
+ mutex_lock(&blk_notifier_lock);
|
|
+ raw_notifier_chain_register(&blk_notifier_list, nb);
|
|
+
|
|
+ list_for_each_entry(existing_blkdev, &blk_devices, list)
|
|
+ nb->notifier_call(nb, BLK_DEVICE_ADD, existing_blkdev->dev);
|
|
+
|
|
+ mutex_unlock(&blk_notifier_lock);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(blk_register_notify);
|
|
+
|
|
+void blk_unregister_notify(struct notifier_block *nb)
|
|
+{
|
|
+ mutex_lock(&blk_notifier_lock);
|
|
+ raw_notifier_chain_unregister(&blk_notifier_list, nb);
|
|
+ mutex_unlock(&blk_notifier_lock);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(blk_unregister_notify);
|
|
+
|
|
+static void blk_notify_work(struct work_struct *work)
|
|
+{
|
|
+ struct blk_notify_event *ev =
|
|
+ container_of(work, struct blk_notify_event, work.work);
|
|
+
|
|
+ raw_notifier_call_chain(&blk_notifier_list, BLK_DEVICE_ADD, ev->dev);
|
|
+ kfree(ev);
|
|
+}
|
|
+
|
|
+static int blk_call_notifier_add(struct device *dev)
|
|
+{
|
|
+ struct blk_device_list *new_blkdev;
|
|
+ struct blk_notify_event *ev;
|
|
+
|
|
+ new_blkdev = kmalloc(sizeof (*new_blkdev), GFP_KERNEL);
|
|
+ if (!new_blkdev)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ ev = kmalloc(sizeof(*ev), GFP_KERNEL);
|
|
+ INIT_DEFERRABLE_WORK(&ev->work, blk_notify_work);
|
|
+ ev->dev = dev;
|
|
+ new_blkdev->dev = dev;
|
|
+ mutex_lock(&blk_notifier_lock);
|
|
+ list_add_tail(&new_blkdev->list, &blk_devices);
|
|
+ schedule_delayed_work(&ev->work, msecs_to_jiffies(500));
|
|
+ mutex_unlock(&blk_notifier_lock);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void blk_call_notifier_remove(struct device *dev)
|
|
+{
|
|
+ struct blk_device_list *old_blkdev, *tmp;
|
|
+
|
|
+ mutex_lock(&blk_notifier_lock);
|
|
+ list_for_each_entry_safe(old_blkdev, tmp, &blk_devices, list) {
|
|
+ if (old_blkdev->dev != dev)
|
|
+ continue;
|
|
+
|
|
+ list_del(&old_blkdev->list);
|
|
+ kfree(old_blkdev);
|
|
+ }
|
|
+ raw_notifier_call_chain(&blk_notifier_list, BLK_DEVICE_REMOVE, dev);
|
|
+ mutex_unlock(&blk_notifier_lock);
|
|
+}
|
|
+
|
|
+static struct class_interface blk_notifications_bus_interface __refdata = {
|
|
+ .class = &block_class,
|
|
+ .add_dev = &blk_call_notifier_add,
|
|
+ .remove_dev = &blk_call_notifier_remove,
|
|
+};
|
|
+
|
|
+static int __init blk_notifications_init(void)
|
|
+{
|
|
+ return class_interface_register(&blk_notifications_bus_interface);
|
|
+}
|
|
+device_initcall(blk_notifications_init);
|
|
--- a/include/linux/blkdev.h
|
|
+++ b/include/linux/blkdev.h
|
|
@@ -1751,4 +1751,12 @@ static inline bool bdev_can_atomic_write
|
|
|
|
#define DEFINE_IO_COMP_BATCH(name) struct io_comp_batch name = { }
|
|
|
|
+
|
|
+#ifdef CONFIG_BLOCK_NOTIFIERS
|
|
+#define BLK_DEVICE_ADD 1
|
|
+#define BLK_DEVICE_REMOVE 2
|
|
+extern void blk_register_notify(struct notifier_block *nb);
|
|
+extern void blk_unregister_notify(struct notifier_block *nb);
|
|
+#endif
|
|
+
|
|
#endif /* _LINUX_BLKDEV_H */
|