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 dffb09c171c99414fc71ef3d74f5cd9272066ceb Author: chenzihan1 <[email protected]> AuthorDate: Wed Nov 18 23:07:31 2026 +0800 drivers/rpmsg/rpmsg_char: copy into the reader's buffer directly When a reader is waiting in read(), the endpoint callback now copies the message into the reader's buffer instead of allocating an rx buffer and copying it a second time in read(). Signed-off-by: chenzihan1 <[email protected]> Signed-off-by: Bowen Wang <[email protected]> --- drivers/rpmsg/rpmsg_char.c | 60 +++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 45304ca316e..7371f4c27dc 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -64,6 +64,8 @@ struct rpmsg_eptdev_s sem_t rxsem; FAR struct pollfd_s *fds[CONFIG_RPMSG_CHAR_NPOLLWAITERS]; bool created; + FAR char *rdbuf; + size_t rdlen; }; struct rpmsg_eptdev_buf_s @@ -279,6 +281,8 @@ static ssize_t rpmsg_eptdev_read(FAR struct file *filep, FAR char *buffer, break; } + eptdev->rdbuf = buffer; + eptdev->rdlen = buflen; spin_unlock_irqrestore(&eptdev->lock, flags); ret = nxsem_wait(&eptdev->rxsem); flags = spin_lock_irqsave(&eptdev->lock); @@ -293,16 +297,32 @@ static ssize_t rpmsg_eptdev_read(FAR struct file *filep, FAR char *buffer, { break; } + + if (eptdev->rdbuf == NULL) + { + ret = eptdev->rdlen; + break; + } } - buf = list_remove_head_type(&eptdev->rxbuf, struct rpmsg_eptdev_buf_s, - node); - spin_unlock_irqrestore(&eptdev->lock, flags); - if (buf != NULL) + eptdev->rdbuf = NULL; + eptdev->rdlen = 0; + + if (ret == 0) { - ret = MIN(buflen, buf->len); - memcpy(buffer, buf->data, ret); - kmm_free(buf); + buf = list_remove_head_type(&eptdev->rxbuf, struct rpmsg_eptdev_buf_s, + node); + spin_unlock_irqrestore(&eptdev->lock, flags); + if (buf != NULL) + { + ret = MIN(buflen, buf->len); + memcpy(buffer, buf->data, ret); + kmm_free(buf); + } + } + else + { + spin_unlock_irqrestore(&eptdev->lock, flags); } return ret; @@ -491,23 +511,29 @@ static int rpmsg_eptdev_ept_cb(FAR struct rpmsg_endpoint *ept, irqstate_t flags; int ret = OK; - buf = kmm_malloc(sizeof(*buf) + len - 1); - if (buf != NULL) + flags = spin_lock_irqsave_nopreempt(&eptdev->lock); + if (eptdev->rdbuf != NULL) { + eptdev->rdlen = MIN(eptdev->rdlen, len); + memcpy(eptdev->rdbuf, data, eptdev->rdlen); + eptdev->rdbuf = NULL; + } + else + { + spin_unlock_irqrestore_nopreempt(&eptdev->lock, flags); + buf = kmm_malloc(sizeof(*buf) + len - 1); + DEBUGASSERT(buf); + buf->len = len; memcpy(buf->data, data, len); flags = spin_lock_irqsave_nopreempt(&eptdev->lock); list_add_tail(&eptdev->rxbuf, &buf->node); - rpmsg_eptdev_wakeup_rx(eptdev); - poll_notify(eptdev->fds, CONFIG_RPMSG_CHAR_NPOLLWAITERS, POLLIN); - spin_unlock_irqrestore_nopreempt(&eptdev->lock, flags); - } - else - { - rpmsgerr("Failed to allocate buffer\n"); - ret = -ENOMEM; } + rpmsg_eptdev_wakeup_rx(eptdev); + poll_notify(eptdev->fds, CONFIG_RPMSG_CHAR_NPOLLWAITERS, POLLIN); + spin_unlock_irqrestore_nopreempt(&eptdev->lock, flags); + return ret; }
