From nobody Mon Feb 9 16:47:11 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 1517861142540740.5324802467118; Mon, 5 Feb 2018 12:05:42 -0800 (PST) Received: from localhost ([::1]:55084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ein1J-0003zJ-Pt for importer@patchew.org; Mon, 05 Feb 2018 15:05:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimSd-0004rX-VO for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimSd-00059u-1f for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:51 -0500 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35757) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimSc-00059e-RH for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:50 -0500 Received: by mail-wr0-x244.google.com with SMTP id w50so30854520wrc.2 for ; Mon, 05 Feb 2018 11:29:50 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:48 -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=j0fmaggeLBIIMPcKajeL9+vW9OzXi4W64ELeIQD+utQ=; b=aoyqyoYKK+7As49hTkKkF9NWwE21OZmrWNlmZRsYxrJlEvyDgvyJYKAHSRnGHOGBAf zWwTyJ+WV5bboWv24oSp+4czqIkeZnEjHy7htIewCijuBuN17irVw/RjgSfcUOWh/b8q yLMbfZO+r95vj20aY0H6xWqFuGRXE/tviQKrY+h5pHt8a3OyAVya/B5aZikv6fCDBIFg VY9TcYBxYNeC8XBRehjRVE68rOfj+rCkz8qZGlgmHcEjJJCgafFnxyn8gNYVb4HIgpBo Aa0ZEIU/WTWXxX9B9lHSQ6sQZSSSBLsHrvAWc3xCWaJ65j6aEX8Dfgjc4M5yMVAPcBV+ 0ceA== 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=j0fmaggeLBIIMPcKajeL9+vW9OzXi4W64ELeIQD+utQ=; b=Mw51QJ5ueVlEJajgA6lEQC+9II913jGIMZHmeFnWFNWsr7803URPXqp3bFMp0ZrOeS f8R6J7W8NTrLRMy5bI3oViFkKaTbeJ393rUxBW+u+ZctlJihc/Z+yI+67iihN64gD+oa GxS69wusYsR+GMpwr38vTJfaencfZjzqfJLAfQRClzV3UzZ0tBGjKUaairnDxybeiuJx e8gkpxcZzWHxYP5nlo8VzcLXJMKQOX35Inu3PfR08D100bjbp3Kw0ksC1FhvnfogybD7 TdtILiO7JY3RV6pGipNJtuBU1EEaycvMrXjtdvz5nIBlqCdMnCr9YO63hgpRxPkxPFyu FXWA== X-Gm-Message-State: AKwxytd26BGgvjYVsRnEJ+bc3WKP4FlYaeJfZXaFsytTX6jniEVpHknq YMKYOr8GcChjFt9ou/3Of/EVNFwL X-Google-Smtp-Source: AH8x224GPPPQa950ixevtVsk9VE7x1rOp7YlCCMLKErhjR9KyXCfEZZWjHb3zowyXO3NPOipM22SMA== X-Received: by 10.223.170.221 with SMTP id i29mr28310836wrc.270.1517858989452; Mon, 05 Feb 2018 11:29:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:52 +0100 Message-Id: <1517858941-5538-39-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:c0c::244 Subject: [Qemu-devel] [PULL 38/47] memfd: add hugetlbsize argument 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 Learn to specificy hugetlb size as qemu_memfd_create() argument. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20180201132757.23063-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- include/qemu/memfd.h | 2 +- util/memfd.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/qemu/memfd.h b/include/qemu/memfd.h index 1d3ecc7..de10198 100644 --- a/include/qemu/memfd.h +++ b/include/qemu/memfd.h @@ -17,7 +17,7 @@ #endif =20 int qemu_memfd_create(const char *name, size_t size, bool hugetlb, - unsigned int seals, Error **errp); + uint64_t hugetlbsize, unsigned int seals, Error **er= rp); void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals, int *fd, Error **errp); void qemu_memfd_free(void *ptr, size_t size, int fd); diff --git a/util/memfd.c b/util/memfd.c index 7594af7..07d579e 100644 --- a/util/memfd.c +++ b/util/memfd.c @@ -29,6 +29,7 @@ =20 #include "qapi/error.h" #include "qemu/memfd.h" +#include "qemu/host-utils.h" =20 #if defined CONFIG_LINUX && !defined CONFIG_MEMFD #include @@ -56,9 +57,22 @@ static int memfd_create(const char *name, unsigned int f= lags) #define MFD_HUGETLB 0x0004U #endif =20 +#ifndef MFD_HUGE_SHIFT +#define MFD_HUGE_SHIFT 26 +#endif + int qemu_memfd_create(const char *name, size_t size, bool hugetlb, - unsigned int seals, Error **errp) + uint64_t hugetlbsize, unsigned int seals, Error **er= rp) { + int htsize =3D hugetlbsize ? ctz64(hugetlbsize) : 0; + + if (htsize && 1 << htsize !=3D hugetlbsize) { + error_setg(errp, "Hugepage size must be a power of 2"); + return -1; + } + + htsize =3D htsize << MFD_HUGE_SHIFT; + #ifdef CONFIG_LINUX int mfd =3D -1; unsigned int flags =3D MFD_CLOEXEC; @@ -68,8 +82,8 @@ int qemu_memfd_create(const char *name, size_t size, bool= hugetlb, } if (hugetlb) { flags |=3D MFD_HUGETLB; + flags |=3D htsize; } - mfd =3D memfd_create(name, flags); if (mfd < 0) { goto err; @@ -104,11 +118,11 @@ void *qemu_memfd_alloc(const char *name, size_t size,= unsigned int seals, int *fd, Error **errp) { void *ptr; - int mfd =3D qemu_memfd_create(name, size, false, seals, NULL); + int mfd =3D qemu_memfd_create(name, size, false, 0, seals, NULL); =20 /* some systems have memfd without sealing */ if (mfd =3D=3D -1) { - mfd =3D qemu_memfd_create(name, size, false, 0, NULL); + mfd =3D qemu_memfd_create(name, size, false, 0, 0, NULL); } =20 if (mfd =3D=3D -1) { --=20 1.8.3.1