summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeqi Wang <wangkeqi_chris@163.com>2024-02-09 17:16:59 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-23 09:25:01 +0100
commitc99d215c0c0f52f3bbdceaeb0923a965ed76b6ea (patch)
tree6ea74ba3a2db8fcb0575455e11e7d7a56ee03e4f
parent56a19b790f57cf20192041ed88d2a89c46e07d8f (diff)
downloadlinux-rpi-c99d215c0c0f52f3bbdceaeb0923a965ed76b6ea.tar.gz
linux-rpi-c99d215c0c0f52f3bbdceaeb0923a965ed76b6ea.tar.bz2
linux-rpi-c99d215c0c0f52f3bbdceaeb0923a965ed76b6ea.zip
connector/cn_proc: revert "connector: Fix proc_event_num_listeners count not cleared"
commit 8929f95b2b587791a7dcd04cc91520194a76d3a6 upstream. This reverts commit c46bfba1337d ("connector: Fix proc_event_num_listeners count not cleared"). It is not accurate to reset proc_event_num_listeners according to cn_netlink_send_mult() return value -ESRCH. In the case of stress-ng netlink-proc, -ESRCH will always be returned, because netlink_broadcast_filtered will return -ESRCH, which may cause stress-ng netlink-proc performance degradation. Reported-by: kernel test robot <oliver.sang@intel.com> Closes: https://lore.kernel.org/oe-lkp/202401112259.b23a1567-oliver.sang@intel.com Fixes: c46bfba1337d ("connector: Fix proc_event_num_listeners count not cleared") Signed-off-by: Keqi Wang <wangkeqi_chris@163.com> Link: https://lore.kernel.org/r/20240209091659.68723-1-wangkeqi_chris@163.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/connector/cn_proc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index 3d5e6d705fc6..44b19e696176 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -108,9 +108,8 @@ static inline void send_msg(struct cn_msg *msg)
filter_data[1] = 0;
}
- if (cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT,
- cn_filter, (void *)filter_data) == -ESRCH)
- atomic_set(&proc_event_num_listeners, 0);
+ cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT,
+ cn_filter, (void *)filter_data);
local_unlock(&local_event.lock);
}