From: David Gibson <david@gibson.dropbear.id.au>
To: Laurent Vivier <lvivier@redhat.com>,
passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 4/7] util: Add write_remainder() helper
Date: Wed, 28 Feb 2024 12:52:03 +1100 [thread overview]
Message-ID: <20240228015206.1214242-5-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20240228015206.1214242-1-david@gibson.dropbear.id.au>
We have several places where we want to write(2) a buffer or buffers and we
handle short write()s by retrying until everything is successfully written.
Add a helper for this in util.c.
This version has some differences from the typical write_all() function.
First, take an IO vector rather than a single buffer, because that will be
useful for some of our cases. Second, allow it to take an parameter to
skip the first n bytes of the given buffers. This will be useful for some
of the cases we want, and also falls out quite naturally from the
implementation.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
util.c | 33 +++++++++++++++++++++++++++++++++
util.h | 1 +
2 files changed, 34 insertions(+)
diff --git a/util.c b/util.c
index 8acce233..03e393f6 100644
--- a/util.c
+++ b/util.c
@@ -19,6 +19,7 @@
#include <arpa/inet.h>
#include <net/ethernet.h>
#include <sys/epoll.h>
+#include <sys/uio.h>
#include <fcntl.h>
#include <string.h>
#include <time.h>
@@ -26,6 +27,7 @@
#include <stdbool.h>
#include "util.h"
+#include "iov.h"
#include "passt.h"
#include "packet.h"
#include "log.h"
@@ -574,3 +576,34 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags,
return clone(fn, stack_area + stack_size / 2, flags, arg);
#endif
}
+
+/* write_remainder() - write the tail of an IO vector to an fd
+ * @fd: File descriptor
+ * @iov: IO vector
+ * @iovcnt: Number of entries in @iov
+ * @skip: Number of bytes of the vector to skip writing
+ *
+ * Return: 0 on success, -1 on error (with errno set)
+ *
+ * #syscalls write writev
+ */
+int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip)
+{
+ int i;
+
+ while ((i = iov_skip_bytes(iov, iovcnt, skip, &skip)) < iovcnt) {
+ ssize_t rc;
+
+ if (skip)
+ rc = write(fd, (char *)iov[i].iov_base + skip,
+ iov[i].iov_len - skip);
+ else
+ rc = writev(fd, &iov[i], iovcnt - i);
+
+ if (rc < 0)
+ return -1;
+ skip += rc;
+ }
+
+ return 0;
+}
diff --git a/util.h b/util.h
index e0df26c6..de6816af 100644
--- a/util.h
+++ b/util.h
@@ -229,6 +229,7 @@ void write_pidfile(int fd, pid_t pid);
int __daemon(int pidfile_fd, int devnull_fd);
int fls(unsigned long x);
int write_file(const char *path, const char *buf);
+int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip);
/**
* mod_sub() - Modular arithmetic subtraction
--
@@ -229,6 +229,7 @@ void write_pidfile(int fd, pid_t pid);
int __daemon(int pidfile_fd, int devnull_fd);
int fls(unsigned long x);
int write_file(const char *path, const char *buf);
+int write_remainder(int fd, const struct iovec *iov, int iovcnt, size_t skip);
/**
* mod_sub() - Modular arithmetic subtraction
--
2.43.2
next prev parent reply other threads:[~2024-02-28 1:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 1:51 [PATCH v2 0/7] Allow more use of iovecs in pcap and tap interfaces David Gibson
2024-02-28 1:52 ` [PATCH v2 1/7] iov: add some functions to manage iovec David Gibson
2024-02-29 8:09 ` Stefano Brivio
2024-02-28 1:52 ` [PATCH v2 2/7] iov: Add helper to find skip over first n bytes of an io vector David Gibson
2024-02-29 8:10 ` Stefano Brivio
2024-02-29 23:05 ` David Gibson
2024-02-28 1:52 ` [PATCH v2 3/7] pcap: Update pcap_frame() to take an iovec and offset David Gibson
2024-02-28 1:52 ` David Gibson [this message]
2024-02-28 1:52 ` [PATCH v2 5/7] pcap: Handle short writes in pcap_frame() David Gibson
2024-02-28 1:52 ` [PATCH v2 6/7] pcap: Allow pcap_frame() and pcap_multiple() to take multi-buffer frames David Gibson
2024-02-28 1:52 ` [PATCH v2 7/7] tap: Use write_remainder() in tap_send_frames_passt() David Gibson
2024-02-29 8:11 ` [PATCH v2 0/7] Allow more use of iovecs in pcap and tap interfaces Stefano Brivio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240228015206.1214242-5-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=lvivier@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).