From nobody Mon Feb 9 02:55:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517860779029218.15473336415698; Mon, 5 Feb 2018 11:59:39 -0800 (PST) Received: from localhost ([::1]:54981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimvS-00074o-5y for importer@patchew.org; Mon, 05 Feb 2018 14:59:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimSb-0004pA-O0 for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimSa-00058m-LO for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:49 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:38696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimSa-00058S-Ak for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:48 -0500 Received: by mail-wm0-x242.google.com with SMTP id 141so27960116wme.3 for ; Mon, 05 Feb 2018 11:29:48 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S+6Km1w+DuiS1Hg7b5R/3ZTexlS8LdD6/d4EXjWagAs=; b=IE7bJuC5JPge4JjFQzVLiZ4y0gaYl7MUQIltAbfX5dMKGusxtOJInYTNNoHzQivYMQ xtE75it6+wpqokiRrbvVJAfBXquMY/HUZVL2Fxp8HnTydjfy/Yrjmkf2rWZ8CeCvHtHz kN+aZNlV1HCS849qb6AatYVWRPFxzWiHhJ40x3TQjiF47Jg6SGqVgf0MzJK+jcbHzqdg Fpo5b4Drr2eI7F2PmrpuB2exYBQ2lnSTtBktrIL6L+lh7ciwjujAnyHZVDZohP0l56Ts 3VEB90CSx3gBC3mD6JgXL9382McDGjreZU99ZNMO/021qF9+6cTLL2BR7FlEki0IgfJO gr+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=S+6Km1w+DuiS1Hg7b5R/3ZTexlS8LdD6/d4EXjWagAs=; b=UqwCOmTtwwif7saoHO7HUl/fPJcb6ZtZdoEPKASdMEMisxCi1/i8Dqrt9thK3IumgP F9bFA7lsFP4+QCi8LyTNrotLoaeXMFtjT/Jt/sbwL+T23vF/P9IqBhDoltonVf8vZlj4 eF+GBnOleY8nKu1hEBil5YgHG/yVo4VLZ7JE3EUClmjkTjqI/hZGbjMCjJIxKd+fHRS0 D3eE/1SRrWYm4bkLYjHNeCu/8ScAPXykvAIsSXnjTqHFdhbcCixsw4bSO4KvvDcEXF+k P3bJZwWkxLAcsdJOrVUdyOu/4II5aWqPruP4lsXyfepm5rfLFDz6aiujsM5IcS+hf1Nk +Ecw== X-Gm-Message-State: APf1xPDL7V8hSvinaS5c+eTnvFTt4EDT8mr7BME5w4Wl2vtyPxXjxCKx mQOA8Q0ljJripwLbgfMhudpM2tl5 X-Google-Smtp-Source: AH8x226A9C5BLT/1NtSdg9LqgcKatxh94EZyFWSyqHrnWgwf73Nml1cy78KXQlxVxucd1tDqNIx14A== X-Received: by 10.28.220.66 with SMTP id t63mr307693wmg.100.1517858986900; Mon, 05 Feb 2018 11:29:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:50 +0100 Message-Id: <1517858941-5538-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 36/47] memfd: add error argument, instead of perror() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau This will allow callers to silence error report when the call is allowed to failed. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20180201132757.23063-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- hw/virtio/vhost.c | 8 +++++++- include/qemu/memfd.h | 5 +++-- util/memfd.c | 57 +++++++++++++++++++++++++++---------------------= ---- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index d16c0c8..338e439 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -330,6 +330,7 @@ static uint64_t vhost_get_log_size(struct vhost_dev *de= v) =20 static struct vhost_log *vhost_log_alloc(uint64_t size, bool share) { + Error *err =3D NULL; struct vhost_log *log; uint64_t logsize =3D size * sizeof(*(log->log)); int fd =3D -1; @@ -338,7 +339,12 @@ static struct vhost_log *vhost_log_alloc(uint64_t size= , bool share) if (share) { log->log =3D qemu_memfd_alloc("vhost-log", logsize, F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_S= EAL, - &fd); + &fd, &err); + if (err) { + error_report_err(err); + g_free(log); + return NULL; + } memset(log->log, 0, logsize); } else { log->log =3D g_malloc0(logsize); diff --git a/include/qemu/memfd.h b/include/qemu/memfd.h index 41c24d8..b9d0987 100644 --- a/include/qemu/memfd.h +++ b/include/qemu/memfd.h @@ -16,9 +16,10 @@ #define F_SEAL_WRITE 0x0008 /* prevent writes */ #endif =20 -int qemu_memfd_create(const char *name, size_t size, unsigned int seals); +int qemu_memfd_create(const char *name, size_t size, unsigned int seals, + Error **errp); void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals, - int *fd); + int *fd, Error **errp); void qemu_memfd_free(void *ptr, size_t size, int fd); bool qemu_memfd_check(void); =20 diff --git a/util/memfd.c b/util/memfd.c index dce61f9..8d27307 100644 --- a/util/memfd.c +++ b/util/memfd.c @@ -27,6 +27,7 @@ =20 #include "qemu/osdep.h" =20 +#include "qapi/error.h" #include "qemu/memfd.h" =20 #if defined CONFIG_LINUX && !defined CONFIG_MEMFD @@ -51,11 +52,11 @@ static int memfd_create(const char *name, unsigned int = flags) #define MFD_ALLOW_SEALING 0x0002U #endif =20 -int qemu_memfd_create(const char *name, size_t size, unsigned int seals) +int qemu_memfd_create(const char *name, size_t size, + unsigned int seals, Error **errp) { - int mfd =3D -1; - #ifdef CONFIG_LINUX + int mfd =3D -1; unsigned int flags =3D MFD_CLOEXEC; =20 if (seals) { @@ -64,23 +65,26 @@ int qemu_memfd_create(const char *name, size_t size, un= signed int seals) =20 mfd =3D memfd_create(name, flags); if (mfd < 0) { - return -1; + goto err; } =20 if (ftruncate(mfd, size) =3D=3D -1) { - perror("ftruncate"); - close(mfd); - return -1; + goto err; } =20 if (seals && fcntl(mfd, F_ADD_SEALS, seals) =3D=3D -1) { - perror("fcntl"); - close(mfd); - return -1; + goto err; } -#endif =20 return mfd; + +err: + if (mfd >=3D 0) { + close(mfd); + } +#endif + error_setg_errno(errp, errno, "failed to create memfd"); + return -1; } =20 /* @@ -90,14 +94,14 @@ int qemu_memfd_create(const char *name, size_t size, un= signed int seals) * sealing. */ void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals, - int *fd) + int *fd, Error **errp) { void *ptr; - int mfd =3D qemu_memfd_create(name, size, seals); + int mfd =3D qemu_memfd_create(name, size, seals, NULL); =20 /* some systems have memfd without sealing */ if (mfd =3D=3D -1) { - mfd =3D qemu_memfd_create(name, size, 0); + mfd =3D qemu_memfd_create(name, size, 0, NULL); } =20 if (mfd =3D=3D -1) { @@ -109,27 +113,26 @@ void *qemu_memfd_alloc(const char *name, size_t size,= unsigned int seals, unlink(fname); g_free(fname); =20 - if (mfd =3D=3D -1) { - perror("mkstemp"); - return NULL; - } - - if (ftruncate(mfd, size) =3D=3D -1) { - perror("ftruncate"); - close(mfd); - return NULL; + if (mfd =3D=3D -1 || + ftruncate(mfd, size) =3D=3D -1) { + goto err; } } =20 ptr =3D mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, mfd, 0); if (ptr =3D=3D MAP_FAILED) { - perror("mmap"); - close(mfd); - return NULL; + goto err; } =20 *fd =3D mfd; return ptr; + +err: + error_setg_errno(errp, errno, "failed to allocate shared memory"); + if (mfd >=3D 0) { + close(mfd); + } + return NULL; } =20 void qemu_memfd_free(void *ptr, size_t size, int fd) @@ -157,7 +160,7 @@ bool qemu_memfd_check(void) int fd; void *ptr; =20 - ptr =3D qemu_memfd_alloc("test", 4096, 0, &fd); + ptr =3D qemu_memfd_alloc("test", 4096, 0, &fd, NULL); memfd_check =3D ptr ? MEMFD_OK : MEMFD_KO; qemu_memfd_free(ptr, 4096, fd); } --=20 1.8.3.1