From: Stefano Garzarella <sgarzare@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-block@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
slp@redhat.com, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Brad Smith" <brad@comstyle.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Thomas Huth" <thuth@redhat.com>,
"Eric Blake" <eblake@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Raphael Norwitz" <raphael@enfabrica.net>,
gmaglione@redhat.com, "Laurent Vivier" <lvivier@redhat.com>,
stefanha@redhat.com, "David Hildenbrand" <david@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v4 08/12] libvhost-user: enable it on any POSIX system
Date: Wed, 8 May 2024 09:44:52 +0200 [thread overview]
Message-ID: <20240508074457.12367-9-sgarzare@redhat.com> (raw)
In-Reply-To: <20240508074457.12367-1-sgarzare@redhat.com>
The vhost-user protocol is not really Linux-specific so let's enable
libvhost-user for any POSIX system.
Compiling it on macOS and FreeBSD some problems came up:
- avoid to include linux/vhost.h which is avaibale only on Linux
(vhost_types.h contains many of the things we need)
- macOS doesn't provide sys/endian.h, so let's define them
(note: libvhost-user doesn't include qemu's headers, so we can't use
use "qemu/bswap.h")
- define eventfd_[write|read] as write/read wrapper when system doesn't
provide those (e.g. macOS)
- copy SEAL defines from include/qemu/memfd.h to make the code works
on FreeBSD where MFD_ALLOW_SEALING is defined
- define MAP_NORESERVE if it's not defined (e.g. on FreeBSD)
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
meson.build | 2 +-
subprojects/libvhost-user/libvhost-user.h | 2 +-
subprojects/libvhost-user/libvhost-user.c | 60 +++++++++++++++++++++--
3 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index 955921dcb8..7954da5971 100644
--- a/meson.build
+++ b/meson.build
@@ -3168,7 +3168,7 @@ endif
config_host_data.set('CONFIG_FDT', fdt.found())
vhost_user = not_found
-if host_os == 'linux' and have_vhost_user
+if have_vhost_user
libvhost_user = subproject('libvhost-user')
vhost_user = libvhost_user.get_variable('vhost_user_dep')
endif
diff --git a/subprojects/libvhost-user/libvhost-user.h b/subprojects/libvhost-user/libvhost-user.h
index deb40e77b3..e13e1d3931 100644
--- a/subprojects/libvhost-user/libvhost-user.h
+++ b/subprojects/libvhost-user/libvhost-user.h
@@ -18,9 +18,9 @@
#include <stdbool.h>
#include <stddef.h>
#include <poll.h>
-#include <linux/vhost.h>
#include <pthread.h>
#include "standard-headers/linux/virtio_ring.h"
+#include "standard-headers/linux/vhost_types.h"
/* Based on qemu/hw/virtio/vhost-user.c */
#define VHOST_USER_F_PROTOCOL_FEATURES 30
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 1c361ffd51..03edb4bf64 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -28,9 +28,7 @@
#include <inttypes.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/eventfd.h>
#include <sys/mman.h>
-#include <endian.h>
/* Necessary to provide VIRTIO_F_VERSION_1 on system
* with older linux headers. Must appear before
@@ -39,8 +37,8 @@
#include "standard-headers/linux/virtio_config.h"
#if defined(__linux__)
+#include <endian.h>
#include <sys/syscall.h>
-#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/vhost.h>
#include <sys/vfs.h>
@@ -52,6 +50,62 @@
#endif
+#if defined(__APPLE__) && (__MACH__)
+#include <libkern/OSByteOrder.h>
+#define htobe16(x) OSSwapHostToBigInt16(x)
+#define htole16(x) OSSwapHostToLittleInt16(x)
+#define be16toh(x) OSSwapBigToHostInt16(x)
+#define le16toh(x) OSSwapLittleToHostInt16(x)
+
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#define htole32(x) OSSwapHostToLittleInt32(x)
+#define be32toh(x) OSSwapBigToHostInt32(x)
+#define le32toh(x) OSSwapLittleToHostInt32(x)
+
+#define htobe64(x) OSSwapHostToBigInt64(x)
+#define htole64(x) OSSwapHostToLittleInt64(x)
+#define be64toh(x) OSSwapBigToHostInt64(x)
+#define le64toh(x) OSSwapLittleToHostInt64(x)
+#endif
+
+#ifdef CONFIG_EVENTFD
+#include <sys/eventfd.h>
+#else
+#define eventfd_t uint64_t
+
+int eventfd_write(int fd, eventfd_t value)
+{
+ return (write(fd, &value, sizeof(value)) == sizeof(value)) ? 0 : -1;
+}
+
+int eventfd_read(int fd, eventfd_t *value)
+{
+ return (read(fd, value, sizeof(*value)) == sizeof(*value)) ? 0 : -1;
+}
+#endif
+
+#ifdef MFD_ALLOW_SEALING
+#include <fcntl.h>
+
+#ifndef F_LINUX_SPECIFIC_BASE
+#define F_LINUX_SPECIFIC_BASE 1024
+#endif
+
+#ifndef F_ADD_SEALS
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+
+#define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */
+#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
+#define F_SEAL_GROW 0x0004 /* prevent file from growing */
+#define F_SEAL_WRITE 0x0008 /* prevent writes */
+#endif
+#endif
+
+#ifndef MAP_NORESERVE
+#define MAP_NORESERVE 0
+#endif
+
#include "include/atomic.h"
#include "libvhost-user.h"
--
2.45.0
next prev parent reply other threads:[~2024-05-08 7:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 7:44 [PATCH v4 00/12] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 01/12] libvhost-user: set msg.msg_control to NULL when it is empty Stefano Garzarella
2024-05-08 8:57 ` Daniel P. Berrangé
2024-05-08 9:33 ` Stefano Garzarella
2024-05-08 10:23 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 02/12] libvhost-user: fail vu_message_write() if sendmsg() is failing Stefano Garzarella
2024-05-08 8:59 ` Daniel P. Berrangé
2024-05-08 10:23 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 03/12] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported Stefano Garzarella
2024-05-08 10:39 ` Philippe Mathieu-Daudé
2024-05-10 8:25 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 04/12] vhost-user-server: do not set memory fd non-blocking Stefano Garzarella
2024-05-08 9:00 ` Daniel P. Berrangé
2024-05-08 7:44 ` [PATCH v4 05/12] contrib/vhost-user-blk: fix bind() using the right size of the address Stefano Garzarella
2024-05-08 10:25 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 06/12] contrib/vhost-user-*: use QEMU bswap helper functions Stefano Garzarella
2024-05-08 10:13 ` Philippe Mathieu-Daudé
2024-05-08 10:25 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 07/12] vhost-user: enable frontends on any POSIX system Stefano Garzarella
2024-05-08 10:26 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` Stefano Garzarella [this message]
2024-05-08 10:36 ` [PATCH v4 08/12] libvhost-user: enable it " Philippe Mathieu-Daudé
2024-05-10 8:56 ` Stefano Garzarella
2024-05-10 9:56 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 09/12] contrib/vhost-user-blk: " Stefano Garzarella
2024-05-08 10:32 ` Philippe Mathieu-Daudé
2024-05-10 9:02 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 10/12] hostmem: add a new memory backend based on POSIX shm_open() Stefano Garzarella
2024-05-08 11:59 ` Markus Armbruster
2024-05-10 9:37 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 11/12] tests/qtest/vhost-user-blk-test: use memory-backend-shm Stefano Garzarella
2024-05-10 5:57 ` Thomas Huth
2024-05-10 10:54 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 12/12] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Stefano Garzarella
2024-05-10 5:58 ` Thomas Huth
2024-05-08 10:39 ` [PATCH v4 00/12] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Philippe Mathieu-Daudé
2024-05-09 19:20 ` Stefan Hajnoczi
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=20240508074457.12367-9-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=brad@comstyle.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=gmaglione@redhat.com \
--cc=hreitz@redhat.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael@enfabrica.net \
--cc=slp@redhat.com \
--cc=stefanha@redhat.com \
--cc=thuth@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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).