Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drivers/serial/serial.c: adapt to the iovec-based api #14898

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+374 −92
Open

drivers/serial/serial.c: adapt to the iovec-based api #14898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aaa977b
Update a few comments after the recent readv/writev changes
yamt Nov 21, 2024
b8bdd60
Make readv/writev implementations update struct uio
yamt Nov 21, 2024
f06c4c9
rename uio_total_len to uio_resid
yamt Nov 22, 2024
0ba5f8b
add uio_copyfrom/uio_copyto
yamt Nov 21, 2024
9e8aec0
drivers/serial/serial.c: adapt to the iovec-based api
yamt Nov 21, 2024
d21774d
uio_advance: fix a calculation
yamt Dec 25, 2024
84f92ae
Make uio_init take iov/iovcnt
yamt Dec 25, 2024
a2715d0
uio_resid api tweak
yamt Dec 25, 2024
7604e62
include/nuttx/fs/uio.h: add a commented out uio_offset
yamt Dec 25, 2024
8f284e7
uio_copyfrom/uio_copyto: simplify a bit
yamt Dec 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions drivers/loop/loop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@
* Private Function Prototypes
****************************************************************************/

static ssize_t loop_readv(FAR struct file *filep,
FAR const struct uio *uio);
static ssize_t loop_writev(FAR struct file *filep,
FAR const struct uio *uio);
static ssize_t loop_readv(FAR struct file *filep, FAR struct uio *uio);
static ssize_t loop_writev(FAR struct file *filep, FAR struct uio *uio);
static int loop_ioctl(FAR struct file *filep, int cmd,
unsigned long arg);

Expand Down Expand Up @@ -71,23 +69,26 @@ static const struct file_operations g_loop_fops =
****************************************************************************/

/****************************************************************************
* Name: loop_read
* Name: loop_readv
****************************************************************************/

static ssize_t loop_readv(FAR struct file *filep,
FAR const struct uio *uio)
static ssize_t loop_readv(FAR struct file *filep, FAR struct uio *uio)
{
return 0; /* Return EOF */
}

/****************************************************************************
* Name: loop_write
* Name: loop_writev
****************************************************************************/

static ssize_t loop_writev(FAR struct file *filep,
FAR const struct uio *uio)
static ssize_t loop_writev(FAR struct file *filep, FAR struct uio *uio)
{
return uio_total_len(uio); /* Say that everything was written */
/* Say that everything was written */

size_t ret = uio->uio_resid;

uio_advance(uio, ret);
return ret;
}

/****************************************************************************
Expand Down
23 changes: 12 additions & 11 deletions drivers/misc/dev_null.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@
* Private Function Prototypes
****************************************************************************/

static ssize_t devnull_readv(FAR struct file *filep,
FAR const struct uio *uio);
static ssize_t devnull_writev(FAR struct file *filep,
FAR const struct uio *uio);
static ssize_t devnull_readv(FAR struct file *filep, FAR struct uio *uio);
static ssize_t devnull_writev(FAR struct file *filep, FAR struct uio *uio);
static int devnull_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup);

Expand Down Expand Up @@ -71,11 +69,10 @@ static const struct file_operations g_devnull_fops =
****************************************************************************/

/****************************************************************************
* Name: devnull_read
* Name: devnull_readv
****************************************************************************/

static ssize_t devnull_readv(FAR struct file *filep,
FAR const struct uio *uio)
static ssize_t devnull_readv(FAR struct file *filep, FAR struct uio *uio)
{
UNUSED(filep);
UNUSED(uio);
Expand All @@ -84,15 +81,19 @@ static ssize_t devnull_readv(FAR struct file *filep,
}

/****************************************************************************
* Name: devnull_write
* Name: devnull_writev
****************************************************************************/

static ssize_t devnull_writev(FAR struct file *filep,
FAR const struct uio *uio)
static ssize_t devnull_writev(FAR struct file *filep, FAR struct uio *uio)
{
UNUSED(filep);

return uio_total_len(uio); /* Say that everything was written */
/* Say that everything was written */

size_t ret = uio->uio_resid;

uio_advance(uio, ret);
return ret;
}

/****************************************************************************
Expand Down
31 changes: 14 additions & 17 deletions drivers/misc/dev_zero.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@
* Private Function Prototypes
****************************************************************************/

static ssize_t devzero_readv(FAR struct file *filep,
FAR const struct uio *uio);
static ssize_t devzero_writev(FAR struct file *filep,
FAR const struct uio *uio);
static ssize_t devzero_readv(FAR struct file *filep, FAR struct uio *uio);
static ssize_t devzero_writev(FAR struct file *filep, FAR struct uio *uio);
static int devzero_poll(FAR struct file *filep, FAR struct pollfd *fds,
bool setup);

Expand Down Expand Up @@ -71,42 +69,41 @@ static const struct file_operations g_devzero_fops =
****************************************************************************/

/****************************************************************************
* Name: devzero_read
* Name: devzero_readv
****************************************************************************/

static ssize_t devzero_readv(FAR struct file *filep,
FAR const struct uio *uio)
static ssize_t devzero_readv(FAR struct file *filep, FAR struct uio *uio)
{
ssize_t total = uio_total_len(uio);
size_t total = uio->uio_resid;
FAR const struct iovec *iov = uio->uio_iov;
int iovcnt = uio->uio_iovcnt;
int i;

UNUSED(filep);

if (total < 0)
{
return total;
}

for (i = 0; i < iovcnt; i++)
{
memset(iov[i].iov_base, 0, iov[i].iov_len);
}

uio_advance(uio, total);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we advance one by one to avoid iterate the vector three times


return total;
}

/****************************************************************************
* Name: devzero_write
* Name: devzero_writev
****************************************************************************/

static ssize_t devzero_writev(FAR struct file *filep,
FAR const struct uio *uio)
static ssize_t devzero_writev(FAR struct file *filep, FAR struct uio *uio)
{
size_t total;
UNUSED(filep);

return uio_total_len(uio);
total = uio->uio_resid;

uio_advance(uio, total);
return total;
}

/****************************************************************************
Expand Down
96 changes: 74 additions & 22 deletions drivers/serial/serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ static int uart_putxmitchar(FAR uart_dev_t *dev, int ch,
static inline ssize_t uart_irqwrite(FAR uart_dev_t *dev,
FAR const char *buffer,
size_t buflen);
static inline ssize_t uart_irqwritev(FAR uart_dev_t *dev,
FAR struct uio *uio);
static int uart_tcdrain(FAR uart_dev_t *dev,
bool cancelable, clock_t timeout);

Expand All @@ -110,11 +112,8 @@ static int uart_tcsendbreak(FAR uart_dev_t *dev,

static int uart_open(FAR struct file *filep);
static int uart_close(FAR struct file *filep);
static ssize_t uart_read(FAR struct file *filep,
FAR char *buffer, size_t buflen);
static ssize_t uart_write(FAR struct file *filep,
FAR const char *buffer,
size_t buflen);
static ssize_t uart_readv(FAR struct file *filep, FAR struct uio *uio);
static ssize_t uart_writev(FAR struct file *filep, FAR struct uio *uio);
static int uart_ioctl(FAR struct file *filep,
int cmd, unsigned long arg);
static int uart_poll(FAR struct file *filep,
Expand All @@ -141,15 +140,15 @@ static const struct file_operations g_serialops =
{
uart_open, /* open */
uart_close, /* close */
uart_read, /* read */
uart_write, /* write */
NULL, /* read */
NULL, /* write */
NULL, /* seek */
uart_ioctl, /* ioctl */
NULL, /* mmap */
NULL, /* truncate */
uart_poll, /* poll */
NULL, /* readv */
NULL /* writev */
uart_readv, /* readv */
uart_writev /* writev */
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
, uart_unlink /* unlink */
#endif
Expand Down Expand Up @@ -441,6 +440,50 @@ static inline ssize_t uart_irqwrite(FAR uart_dev_t *dev,
return buflen;
}

/****************************************************************************
* Name: uart_irqwritev
****************************************************************************/

static inline ssize_t uart_irqwritev(FAR uart_dev_t *dev,
FAR struct uio *uio)
{
ssize_t error = 0;
ssize_t total = 0;
int iovcnt = uio->uio_iovcnt;
int i;

for (i = 0; i < iovcnt; i++)
{
const struct iovec *iov = &uio->uio_iov[i];
if (iov->iov_len == 0)
{
continue;
}

ssize_t written = uart_irqwrite(dev, iov->iov_base, iov->iov_len);
if (written < 0)
{
error = written;
break;
}

if (SSIZE_MAX - total < written)
{
error = -EOVERFLOW;
break;
}

total += written;
}

if (error != 0 && total == 0)
{
return error;
}

return total;
}

/****************************************************************************
* Name: uart_tcdrain
*
Expand Down Expand Up @@ -847,11 +890,10 @@ static int uart_close(FAR struct file *filep)
}

/****************************************************************************
* Name: uart_read
* Name: uart_readv
****************************************************************************/

static ssize_t uart_read(FAR struct file *filep,
FAR char *buffer, size_t buflen)
static ssize_t uart_readv(FAR struct file *filep, FAR struct uio *uio)
{
FAR struct inode *inode = filep->f_inode;
FAR uart_dev_t *dev = inode->i_private;
Expand All @@ -862,6 +904,7 @@ static ssize_t uart_read(FAR struct file *filep,
#endif
irqstate_t flags;
ssize_t recvd = 0;
ssize_t buflen;
bool echoed = false;
int16_t tail;
char ch;
Expand All @@ -885,7 +928,8 @@ static ssize_t uart_read(FAR struct file *filep,
* data from the end of the buffer.
*/

while ((size_t)recvd < buflen)
buflen = uio->uio_resid;
while (recvd < buflen)
{
#ifdef CONFIG_SERIAL_REMOVABLE
/* If the removable device is no longer connected, refuse to read any
Expand Down Expand Up @@ -961,7 +1005,8 @@ static ssize_t uart_read(FAR struct file *filep,
{
if (recvd > 0)
{
*buffer-- = '\0';
static const char zero = '\0';
uio_copyfrom(uio, recvd, &zero, 1);
recvd--;
if (dev->tc_lflag & ECHO)
{
Expand Down Expand Up @@ -990,7 +1035,7 @@ static ssize_t uart_read(FAR struct file *filep,

/* Store the received character */

*buffer++ = ch;
uio_copyfrom(uio, recvd, &ch, 1);
recvd++;

if (dev->tc_lflag & ECHO)
Expand Down Expand Up @@ -1325,19 +1370,24 @@ static ssize_t uart_read(FAR struct file *filep,
#endif

nxmutex_unlock(&dev->recv.lock);
if (recvd >= 0)
{
uio_advance(uio, recvd);
}

return recvd;
}

/****************************************************************************
* Name: uart_write
* Name: uart_writev
****************************************************************************/

static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer,
size_t buflen)
static ssize_t uart_writev(FAR struct file *filep, FAR struct uio *uio)
{
FAR struct inode *inode = filep->f_inode;
FAR uart_dev_t *dev = inode->i_private;
ssize_t nwritten = buflen;
ssize_t nwritten;
ssize_t buflen;
bool oktoblock;
int ret;
char ch;
Expand All @@ -1363,12 +1413,14 @@ static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer,
#endif

flags = enter_critical_section();
ret = uart_irqwrite(dev, buffer, buflen);
ret = uart_irqwritev(dev, uio);
leave_critical_section(flags);

return ret;
}

buflen = nwritten = uio->uio_resid;

/* Only one user can access dev->xmit.head at a time */

ret = nxmutex_lock(&dev->xmit.lock);
Expand Down Expand Up @@ -1408,9 +1460,9 @@ static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer,
*/

uart_disabletxint(dev);
for (; buflen; buflen--)
for (; buflen; uio_advance(uio, 1), buflen--)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge line 1474

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, i'm not sure which line you were referring to.

{
ch = *buffer++;
uio_copyto(uio, 0, &ch, 1);
ret = OK;

/* Do output post-processing */
Expand Down
Loading
Loading