This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit abcb4394ae615e3d6cc7c51a2ad9622e70e07a58 Author: dongjiuzhu1 <[email protected]> AuthorDate: Fri Nov 15 14:55:36 2024 +0800 drivers/sensors/sensor_rpmsg: Fix deadlock between open/close and rptun. sensor_rpmsg_open() and sensor_rpmsg_close() sent the advertise and subscribe broadcasts while holding the sensor upper lock. Sending may block in rpmsg_get_tx_payload_buffer() waiting for a free tx buffer, while the rptun thread that releases tx buffers is blocked in sensor_rpmsg_unsub_handler() waiting for the same upper lock. Only record which broadcast is needed while holding the lock, and send it after the lock is released. Signed-off-by: dongjiuzhu1 <[email protected]> --- drivers/sensors/sensor_rpmsg.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/sensors/sensor_rpmsg.c b/drivers/sensors/sensor_rpmsg.c index 8272c63d1b7..6d6761d7519 100644 --- a/drivers/sensors/sensor_rpmsg.c +++ b/drivers/sensors/sensor_rpmsg.c @@ -663,6 +663,8 @@ static int sensor_rpmsg_open(FAR struct sensor_lowerhalf_s *lower, { FAR struct sensor_rpmsg_dev_s *dev = lower->priv; FAR struct sensor_lowerhalf_s *drv = dev->drv; + bool adv = false; + bool sub = false; int ret; if (drv->ops->open) @@ -684,7 +686,7 @@ static int sensor_rpmsg_open(FAR struct sensor_lowerhalf_s *lower, { if (dev->nadvertisers++ == 0) { - sensor_rpmsg_advsub(dev, SENSOR_RPMSG_ADVERTISE); + adv = true; } } @@ -692,11 +694,22 @@ static int sensor_rpmsg_open(FAR struct sensor_lowerhalf_s *lower, { if (dev->nsubscribers++ == 0) { - sensor_rpmsg_advsub(dev, SENSOR_RPMSG_SUBSCRIBE); + sub = true; } } sensor_rpmsg_unlock(dev); + + if (adv) + { + sensor_rpmsg_advsub(dev, SENSOR_RPMSG_ADVERTISE); + } + + if (sub) + { + sensor_rpmsg_advsub(dev, SENSOR_RPMSG_SUBSCRIBE); + } + return 0; } @@ -709,6 +722,8 @@ static int sensor_rpmsg_close(FAR struct sensor_lowerhalf_s *lower, FAR struct sensor_rpmsg_proxy_s *ptmp; FAR struct sensor_rpmsg_stub_s *stub; FAR struct sensor_rpmsg_stub_s *stmp; + bool unadv = false; + bool unsub = false; int ret = 0; if (drv->ops->close) @@ -726,7 +741,7 @@ static int sensor_rpmsg_close(FAR struct sensor_lowerhalf_s *lower, { if (dev->nadvertisers == 1) { - sensor_rpmsg_advsub(dev, SENSOR_RPMSG_UNADVERTISE); + unadv = true; list_for_every_entry_safe(&dev->stublist, stub, stmp, struct sensor_rpmsg_stub_s, node) { @@ -741,7 +756,7 @@ static int sensor_rpmsg_close(FAR struct sensor_lowerhalf_s *lower, { if (dev->nsubscribers == 1) { - sensor_rpmsg_advsub(dev, SENSOR_RPMSG_UNSUBSCRIBE); + unsub = true; list_for_every_entry_safe(&dev->proxylist, proxy, ptmp, struct sensor_rpmsg_proxy_s, node) { @@ -753,6 +768,17 @@ static int sensor_rpmsg_close(FAR struct sensor_lowerhalf_s *lower, } sensor_rpmsg_unlock(dev); + + if (unadv) + { + sensor_rpmsg_advsub(dev, SENSOR_RPMSG_UNADVERTISE); + } + + if (unsub) + { + sensor_rpmsg_advsub(dev, SENSOR_RPMSG_UNSUBSCRIBE); + } + return ret; }
