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 295bf8c3858f01002b533cc9ba21d57f3937d785 Author: likun17 <[email protected]> AuthorDate: Wed Oct 28 13:14:01 2026 +0800 drivers/sensors/sensor_rpmsg: Add a proxy after ADVERTISE_ACK. sensor_rpmsg_adv_handler() added the new proxy to proxylist and posted proxysem before sending ADVERTISE_ACK, so an ioctl could reach the remote core before it had created the stub. The remote dropped it without an ack and the caller blocked. Add the proxy to proxylist and post proxysem only after ADVERTISE_ACK is queued. Also return early from the SUBSCRIBE_ACK handler when the path is unknown. Signed-off-by: likun17 <[email protected]> --- drivers/sensors/sensor_rpmsg.c | 82 ++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/drivers/sensors/sensor_rpmsg.c b/drivers/sensors/sensor_rpmsg.c index 293956f036c..0359b8f053a 100644 --- a/drivers/sensors/sensor_rpmsg.c +++ b/drivers/sensors/sensor_rpmsg.c @@ -560,11 +560,21 @@ static void sensor_rpmsg_free_stub(FAR struct sensor_rpmsg_stub_s *stub) kmm_free(stub); } +static void sensor_rpmsg_add_proxy(FAR struct sensor_rpmsg_dev_s *dev, + FAR struct sensor_rpmsg_proxy_s *proxy) +{ + sensor_rpmsg_lock(dev); + list_add_tail(&dev->proxylist, &proxy->node); + nxsem_post(&dev->proxysem); + sensor_rpmsg_unlock(dev); +} + static FAR struct sensor_rpmsg_proxy_s * sensor_rpmsg_alloc_proxy(FAR struct sensor_rpmsg_dev_s *dev, FAR struct rpmsg_endpoint *ept, FAR struct sensor_rpmsg_advsub_s *msg, - FAR struct sensor_state_s *state) + FAR struct sensor_state_s *state, + FAR bool *created) { FAR struct sensor_rpmsg_proxy_s *proxy; FAR struct sensor_rpmsg_proxy_s *ptmp; @@ -593,6 +603,7 @@ sensor_rpmsg_alloc_proxy(FAR struct sensor_rpmsg_dev_s *dev, if (proxy->cookie == msg->cookie) { sensor_rpmsg_unlock(dev); + *created = false; return proxy; } @@ -630,10 +641,9 @@ sensor_rpmsg_alloc_proxy(FAR struct sensor_rpmsg_dev_s *dev, dev->lower.persist = true; } - list_add_tail(&dev->proxylist, &proxy->node); - nxsem_post(&dev->proxysem); sensor_rpmsg_unlock(dev); sminfo(dev->name, "create proxy:%p", proxy); + *created = true; return proxy; } @@ -1293,6 +1303,7 @@ static int sensor_rpmsg_adv_handler(FAR struct rpmsg_endpoint *ept, FAR struct sensor_rpmsg_proxy_s *proxy; FAR struct sensor_rpmsg_dev_s *dev; struct sensor_state_s state; + bool created = false; int ret; dev = sensor_rpmsg_find_dev(msg->path); @@ -1302,29 +1313,40 @@ static int sensor_rpmsg_adv_handler(FAR struct rpmsg_endpoint *ept, } state.esize = UINT32_MAX; - proxy = sensor_rpmsg_alloc_proxy(dev, ept, msg, &state); + proxy = sensor_rpmsg_alloc_proxy(dev, ept, msg, &state, &created); if (!proxy) { snerr("ERROR: adv create proxy failed:%s\n", dev->path); + return 0; } - else + + msg->cookie = (uint64_t)(uintptr_t)dev; + msg->command = SENSOR_RPMSG_ADVERTISE_ACK; + ret = rpmsg_send(ept, msg, len); + if (ret < 0) { - msg->cookie = (uint64_t)(uintptr_t)dev; - msg->command = SENSOR_RPMSG_ADVERTISE_ACK; - ret = rpmsg_send(ept, msg, len); - if (ret < 0) - { - snerr("ERROR: adv rpmsg send failed:%s, %d, %s\n", - dev->path, ret, rpmsg_get_cpuname(ept->rdev)); - } - else + snerr("ERROR: adv rpmsg send failed:%s, %d, %s\n", + dev->path, ret, rpmsg_get_cpuname(ept->rdev)); + if (created) { - sensor_rpmsg_update_config(dev, &state); - sminfo(dev->name, "rpmsg adv proxy success, remote:%s", - rpmsg_get_cpuname(ept->rdev)); + kmm_free(proxy); } + + return 0; + } + + /* The proxy is visible to ioctl only after ADVERTISE_ACK is queued, + * so the remote stub always exists before any IOCTL arrives. + */ + + if (created) + { + sensor_rpmsg_add_proxy(dev, proxy); } + sensor_rpmsg_update_config(dev, &state); + sminfo(dev->name, "rpmsg adv proxy success, remote:%s", + rpmsg_get_cpuname(ept->rdev)); return 0; } @@ -1406,24 +1428,38 @@ static int sensor_rpmsg_suback_handler(FAR struct rpmsg_endpoint *ept, uint32_t src, FAR void *priv) { FAR struct sensor_rpmsg_advsub_s *msg = data; + FAR struct sensor_rpmsg_proxy_s *proxy = NULL; FAR struct sensor_rpmsg_dev_s *dev; struct sensor_state_s state; + bool created = false; state.esize = UINT32_MAX; dev = sensor_rpmsg_find_dev(msg->path); - if (dev && (!dev->nsubscribers || - !sensor_rpmsg_alloc_proxy(dev, ept, msg, &state))) + if (!dev) + { + return 0; + } + + if (dev->nsubscribers) + { + proxy = sensor_rpmsg_alloc_proxy(dev, ept, msg, &state, &created); + } + + if (!proxy) { sensor_rpmsg_advsub_one(dev, ept, SENSOR_RPMSG_UNSUBSCRIBE); snerr("ERROR: suback failed:%s\n", dev->path); + return 0; } - else + + if (created) { - sensor_rpmsg_update_config(dev, &state); - sminfo(dev->name, "rpmsg suback success, remote:%s", - rpmsg_get_cpuname(ept->rdev)); + sensor_rpmsg_add_proxy(dev, proxy); } + sensor_rpmsg_update_config(dev, &state); + sminfo(dev->name, "rpmsg suback success, remote:%s", + rpmsg_get_cpuname(ept->rdev)); return 0; }
