From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgIT-0001M2-PY for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:50:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgIQ-0003pS-JM for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:50:01 -0400 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]:34506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgIQ-0003p6-4v for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:49:58 -0400 Received: by padhy16 with SMTP id hy16so158324543pad.1 for ; Mon, 12 Oct 2015 09:49:57 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 18:41:29 +0200 Message-Id: <1444668104-22955-36-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 35/50] ivshmem-server: fix hugetlbfs support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca From: Marc-André Lureau As pointed out on the ML by Andrew Jones, glibc no longer permits creating POSIX shm on hugetlbfs directly. When given a hugetlbfs path, create a shareable file there. Signed-off-by: Marc-André Lureau Reviewed-by: Vladimir Sementsov-Ogievskiy --- contrib/ivshmem-server/ivshmem-server.c | 41 ++++++++++++++++++++++++++++++++- contrib/ivshmem-server/ivshmem-server.h | 3 +-- contrib/ivshmem-server/main.c | 5 ++-- 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/contrib/ivshmem-server/ivshmem-server.c b/contrib/ivshmem-server/ivshmem-server.c index 972fda2..4a25d28 100644 --- a/contrib/ivshmem-server/ivshmem-server.c +++ b/contrib/ivshmem-server/ivshmem-server.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "qemu-common.h" #include "qemu/queue.h" @@ -271,15 +272,53 @@ ivshmem_server_init(IvshmemServer *server, const char *unix_sock_path, return 0; } +#define HUGETLBFS_MAGIC 0x958458f6 + +static long gethugepagesize(const char *path) +{ + struct statfs fs; + int ret; + + do { + ret = statfs(path, &fs); + } while (ret != 0 && errno == EINTR); + + if (ret != 0) { + if (errno != ENOENT) { + fprintf(stderr, "cannot stat shm file %s: %s\n", path, + strerror(errno)); + } + return -1; + } + + if (fs.f_type != HUGETLBFS_MAGIC) { + return -1; + } + + return fs.f_bsize; +} + /* open shm, create and bind to the unix socket */ int ivshmem_server_start(IvshmemServer *server) { struct sockaddr_un sun; int shm_fd, sock_fd, ret; + long hpagesize; /* open shm file */ - shm_fd = shm_open(server->shm_path, O_CREAT|O_RDWR, S_IRWXU); + hpagesize = gethugepagesize(server->shm_path); + if (hpagesize > 0) { + gchar *filename = g_strdup_printf("%s/ivshmem.XXXXXX", server->shm_path); + fprintf(stdout, "Using hugepages: %s\n", server->shm_path); + shm_fd = mkstemp(filename); + unlink(filename); + g_free(filename); + } else { + fprintf(stdout, "Using POSIX shared memory: %s\n", server->shm_path); + shm_fd = shm_open(server->shm_path, O_CREAT|O_RDWR, S_IRWXU); + } + if (shm_fd < 0) { fprintf(stderr, "cannot open shm file %s: %s\n", server->shm_path, strerror(errno)); diff --git a/contrib/ivshmem-server/ivshmem-server.h b/contrib/ivshmem-server/ivshmem-server.h index 2176d5e..e9b0e7a 100644 --- a/contrib/ivshmem-server/ivshmem-server.h +++ b/contrib/ivshmem-server/ivshmem-server.h @@ -81,8 +81,7 @@ typedef struct IvshmemServer { * @server: A pointer to an uninitialized IvshmemServer structure * @unix_sock_path: The pointer to the unix socket file name * @shm_path: Path to the shared memory. The path corresponds to a POSIX - * shm name. To use a real file, for instance in a hugetlbfs, - * it is possible to use /../../abspath/to/file. + * shm name or a hugetlbfs mount point. * @shm_size: Size of shared memory * @n_vectors: Number of interrupt vectors per client * @verbose: True to enable verbose mode diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 1385146..fb60af1 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -47,9 +47,8 @@ ivshmem_server_usage(const char *name, int code) " to listen to.\n" " Default=%s\n", IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH); fprintf(stderr, " -m : path to the shared memory.\n" - " The path corresponds to a POSIX shm name. To use a\n" - " real file, for instance in a hugetlbfs, use\n" - " /../../abspath/to/file.\n" + " The path corresponds to a POSIX shm name or a\n" + " hugetlbfs mount point.\n" " default=%s\n", IVSHMEM_SERVER_DEFAULT_SHM_PATH); fprintf(stderr, " -l : size of shared memory in bytes. The suffix\n" " K, M and G can be used (ex: 1K means 1024).\n" -- 2.4.3