From nobody Wed Dec 17 09:50:20 2025 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C03938C; Tue, 16 Jan 2024 02:14:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="hFQ5vDCS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=bDHIH 1quueGsNnOP4D3RZ6pHrBtyn71jVIoHgB5hwh4=; b=hFQ5vDCSlq+XZf096lLjr YTetwEZgnl4Kikbcm6PmPAkELiuhk4sOTB2JpF7P8iuLjH22OplNXpVBa0576zDa VZdrB73Lfus5YOLAPxhVPGqC7s8w/r3E/8xXO171Je4fNi5XSjxlmcIZ1G1gV5gM uBCrSEtXIQFz619/+BfCrI= Received: from localhost.localdomain (unknown [111.202.47.2]) by zwqz-smtp-mta-g3-4 (Coremail) with SMTP id _____wC3v+Ky4qVleFbHBA--.54402S2; Tue, 16 Jan 2024 09:58:10 +0800 (CST) From: wangkeqi To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, wangkeqi , kernel test robot , fengwei.yin@intel.com Subject: [PATCH net v2] connector: Change the judgment conditions for clearing proc_event_num_listeners Date: Tue, 16 Jan 2024 09:57:53 +0800 Message-Id: <20240116015753.209781-1-wangkeqi_chris@163.com> X-Mailer: git-send-email 2.27.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wC3v+Ky4qVleFbHBA--.54402S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw43JFWxtw1kuFyfur1rJFb_yoW5XFyxpa yqvFsxZF48KF1fWw1DA3W29F13Za4kXF1UCrWIk34kurZxWrWkAF48tFsavF9xA34vkr12 qw12gFW3uF4DC3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jbvtAUUUUU= X-CM-SenderInfo: 5zdqwy5htlsupkul2qqrwthudrp/1tbiVBhn3GVOBDmFSQAAst Content-Type: text/plain; charset="utf-8" From: wangkeqi It is inaccurate to judge whether proc_event_num_listeners is cleared by cn_netlink_send_mult returning -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. Therefore, the judgment condition is modified to whether there is a listener. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202401112259.b23a1567-oliver.sang@in= tel.com Fixes: c46bfba133 ("connector: Fix proc_event_num_listeners count not clear= ed") Signed-off-by: wangkeqi Cc: fengwei.yin@intel.com --- drivers/connector/cn_proc.c | 6 ++++-- drivers/connector/connector.c | 6 ++++++ include/linux/connector.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 3d5e6d705..b09f74ed3 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -108,8 +108,10 @@ static inline void send_msg(struct cn_msg *msg) filter_data[1] =3D 0; } =20 - if (cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT, - cn_filter, (void *)filter_data) =3D=3D -ESRCH) + if (netlink_has_listeners(get_cdev_nls(), CN_IDX_PROC)) + cn_netlink_send_mult(msg, msg->len, 0, CN_IDX_PROC, GFP_NOWAIT, + cn_filter, (void *)filter_data); + else atomic_set(&proc_event_num_listeners, 0); =20 local_unlock(&local_event.lock); diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 7f7b94f61..1b2cd410e 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c @@ -129,6 +129,12 @@ int cn_netlink_send(struct cn_msg *msg, u32 portid, u3= 2 __group, } EXPORT_SYMBOL_GPL(cn_netlink_send); =20 +struct sock *get_cdev_nls(void) +{ + return cdev.nls; +} +EXPORT_SYMBOL_GPL(get_cdev_nls); + /* * Callback helper - queues work and setup destructor for given data. */ diff --git a/include/linux/connector.h b/include/linux/connector.h index cec2d99ae..255466aea 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h @@ -127,6 +127,7 @@ int cn_netlink_send_mult(struct cn_msg *msg, u16 len, u= 32 portid, */ int cn_netlink_send(struct cn_msg *msg, u32 portid, u32 group, gfp_t gfp_m= ask); =20 +struct sock *get_cdev_nls(void); int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, const struct cb_id *id, void (*callback)(struct cn_msg *, struct netlink_skb_parms *)); --=20 2.27.0