From nobody Wed May 1 20:05:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1512400923016598.1858737069938; Mon, 4 Dec 2017 07:22:03 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4695A5D68A; Mon, 4 Dec 2017 15:22:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 825BB5D98A; Mon, 4 Dec 2017 15:22:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 52E8C4BB79; Mon, 4 Dec 2017 15:21:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vB4FLvqK010997 for ; Mon, 4 Dec 2017 10:21:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id EEF836FEE8; Mon, 4 Dec 2017 15:21:57 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6CE96FF05 for ; Mon, 4 Dec 2017 15:21:51 +0000 (UTC) Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D847B81DFF for ; Mon, 4 Dec 2017 15:21:49 +0000 (UTC) Received: from pps.filterd (m0127843.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vB4FK1su007772 for ; Mon, 4 Dec 2017 07:21:48 -0800 Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp0017.outbound.protection.outlook.com [207.46.163.17]) by mx0b-002c1b01.pphosted.com with ESMTP id 2eku5hsn29-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 04 Dec 2017 07:21:48 -0800 Received: from tomato.dev.eng.nutanix.com (62.254.189.133) by BN3PR0201MB0930.namprd02.prod.outlook.com (10.160.155.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Mon, 4 Dec 2017 15:21:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Nz50gkmsaPL3qwmsjx99wU4YXZTXbqXGbbbLPyu4e5E=; b=4P8zTyOH7jFkLlVJ361QrdD6voZJz36f+ZNhWQtiKPqaPeoIyP5w+z36huevPtHD/YltPiNxkj0hAqja2AVV1EZ7J1mKZf+1k8mfJw1HDKz1Eg6bj7oCO5vHOHxpMUaM1slBDnd2/7IqK8BQV1Lh9gUxOG+zMLF1PSoXFmiNTRY= From: David Vrabel To: libvir-list@redhat.com Date: Mon, 4 Dec 2017 15:21:27 +0000 Message-Id: <20171204152127.14534-1-david.vrabel@nutanix.com> MIME-Version: 1.0 X-Originating-IP: [62.254.189.133] X-ClientProxiedBy: BN6PR16CA0015.namprd16.prod.outlook.com (10.172.212.153) To BN3PR0201MB0930.namprd02.prod.outlook.com (10.160.155.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 977b53ed-6079-4b12-972f-08d53b2abc2e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603286); SRVR:BN3PR0201MB0930; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0201MB0930; 3:r+xLFdy8T3lksA3j0fVHzdM98JJNc8TpzvLHw9fek5gfPxPWEAlcYN5xzBMuLKwLDfkzr/7UY5xa0YQezkwVn9EHcMqGZfkrJlj8hh1XEUHlnGCGLgTPgNxA+psg0StQkPFDrhSa01eMkm/JkWTnckulav4tXcAwVYLcFKsrjQQGcyFu6VuGp/dAM1W1lJvEbtxwkUCz5f3kmV4zTaqKkAgrJ6d3iEgu0OlZbfLoB0JjlfY6lSuSGZvoDTvf/r57; 25:3nqna53ovnwELiVlNIEnpsOZ9W58tUSPCVc3LsjkeXkHKv8Ep2J19x3tb34aQxAKgeEysT3jsS5xpt1812qbIWcp/QRoRitbS6Whvm60NkxP8a8hhGssDquttg/6PPQCTsqkwRSTTJhDjmEpIikgZdexiEEPmqbyFc4J68eWRmBcbX93zfRuaIUQVWNzmeUmWwWwyf5MTcEGdP5hDqhXPMuZ8tJrz2Pv821JLlhHu1eCPwoYrnNWbMMqNz8QfwDR0IPuUZNd7Djdpd1DxkKMwhBiieroGhNDbTe0Dy1MAAUvlrRO08xkJcrBM5tSDDyHMSZ/X3FI/tRceq/mQgBfxA==; 31:OcHR9rxQxvO/vlIstf7eewOY1epZZtM8fbbfjaB02TvNnU4nSl2vIGGxOjBA9WnqvG6Wx/BUT72/rYUrTjziAo/IeKMRxl8tDizjCjNW8uAB99l1kwMb1XLL8uGn4aHf6aEWNc7h09psI8rVQqdi8bSjDfqOfBV7nLAE8vhtdrveULA2UxLQevQeaKyNIRe91pS7e0zoshYRLUbWgQG0Xag21EQyuDToI0TKmxeW2QA= X-MS-TrafficTypeDiagnostic: BN3PR0201MB0930: X-Microsoft-Exchange-Diagnostics: 1; BN3PR0201MB0930; 20:AKBGWhpQwgrXMbPFwZSO23uwisT/gq+id1RBDGWjDEH0tyODqMSswFKq546urRXPOMV8yHJycRk55Qlj5NjyhnmptUOISKQTQzmqKy5G3FOHK5i/VN/qNTlsE7eur3YTnwGMwQ7sZkKC29LyG02+2E+rF68+hZ//Yj+Npv6F/mxlMzqP6eCFmZtpbaPyTPB2jkmN4rBTJLI/YXaj69mQC4zCQs17gzGjzDC1gozCr+4hSHIjJfA9kwDfew/cFT0BX8CIrdatuHyGWycvh5ctEryrHwVofqvidfWX6wVYLZfsE1wI2oHqlJj5Z2/zL922NDyK7QWTq0nJXdzFDv1c36FU/CmsDK/z0PtRJGZQSECIWJ06qjvlRIvJIWfU4lwII/oZuxh00c9l3WJW0RAAL895Yc2uBJh3F2Rd5/KzbPuPS5suN/Ok4K/lRTFC4eRDr/sxMdtwnlH4+Y3gn13D0ceX4Lz0A6VIRt+5pZu+ngwCQsgnr/vlGNW3DBfsZs6Qa2ejGQH1hYTCLcT++HODzK/0bzemGT2BlT/+3mTolFQy2zFoI3v/7kN6UqxfBQKLOlutcBaVlEDyHnNE+rf4MeBXiDbV1YnCyqlTQgcmcow=; 4:pndu+ltsPm2/w+0NzZfyDLrCzwCyNPiy9H4vShRod4W3Wdv03cuVdircao/USy3oCcIeyBSkPTbFMbE232OtfzVUDdXrvYQGB17dMoSweL3DCN0XWW3kC4Xpb358DDPd4MYpaElMhNzp76wfMPOEBu9eLlQ+ALd7GT20wj2OHAOqNJWRE7fnupesRk6regCbOiRp/i7rxTKK0gqFyfKoREZcWqERKDjB8uIPzoYFX+YL1pqksGq3dYIVS0NI1lDZIVaysY7jnoRM2fBvZyhiRw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231022)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(6072148)(201708071742011); SRVR:BN3PR0201MB0930; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN3PR0201MB0930; X-Forefront-PRVS: 051158ECBB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(39860400002)(346002)(366004)(376002)(189002)(199003)(81156014)(81166006)(86362001)(478600001)(316002)(8676002)(2906002)(52116002)(33646002)(106356001)(25786009)(305945005)(7736002)(2351001)(48376002)(53936002)(105586002)(47776003)(6666003)(107886003)(2361001)(1076002)(6916009)(50466002)(68736007)(6116002)(3846002)(66066001)(16526018)(97736004)(101416001)(5660300001)(4326008)(50226002)(16586007)(51416003)(6486002)(7696005)(8936002)(189998001)(36756003)(64030200001)(129583001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0201MB0930; H:tomato.dev.eng.nutanix.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Received-SPF: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0201MB0930; 23:57A0mqaTwlPtn7i2UIAUkbcTg5LCvjzFxev+Dc5?= =?us-ascii?Q?ZObw7sIlv9nbCkOcxrVnfjj+EOQqFWVukrzpSde1Ut8Q7czypEgOziaYCag8?= =?us-ascii?Q?GA+Yv4pYZPCWUB9gp2kr8YDGGgJwya45psgyeOQhlfrFciumI/mD58n90VIs?= =?us-ascii?Q?aRQVzQDZT8r5ESvsO8z1H3H7PzkAih3YI0Z6Ttdg98++TrdLS2XzjM1puWUF?= =?us-ascii?Q?iKiv08pNyD78YawQhOYj06UWhq2wy4Nk4kuAfQcxLXGSNMoqlhqh6ATIgllT?= =?us-ascii?Q?hDWIz6yJOvdzYuFFXBHxRl++AuuopcI56wvchxIG5vStcLGZ7WhH36mAAGSZ?= =?us-ascii?Q?gpYOkoaLQ2odceXMOBt94AXFmxJskGKtKG500Pv2Kra0w/8KkQhzAnBwxyau?= =?us-ascii?Q?FW8akNOtvvh8kzWsVWIz8tLVC8A4hb5b2q1j5dd9U7vLlQZLKDRhWt7C4pr9?= =?us-ascii?Q?8SQRsWaT3Pr6LwisG2/wwoc++vxiLnDYelzcGhG3FhGPLnoj9t90Qsk3Xr5d?= =?us-ascii?Q?sfcpnB4lKkeM23v1Y0rOOzxMi32fk8Jwc6aflhHcOa+NJeaCMB05lZTZOzaw?= =?us-ascii?Q?pYT6Cb6uU3r6wFjqeSx4UAD4K2PilO+NuoD2mS2CxgjR2wsplI7T366d0Llo?= =?us-ascii?Q?EtokUEFx91XI21hoUuaE2mmFyPnPNLqhGZr3pbgX/roCrFrfKdr7s8LKuhhE?= =?us-ascii?Q?LYm7n4MyTX4mNqlrW+lISEit/blxC3M6qALSV/zWAZpbwBRtr+Q8lW8V3s8C?= =?us-ascii?Q?x5oMnqKGXzRyBbgx25uB1A3I4l1oeO9pjIolPF52m1Cbs5N/boNylBt0SayK?= =?us-ascii?Q?8Pb8Azy4GJ8YI0QkqMIMJcPNyumNF2pSNK2M8kLFWFGQT0MchJZgG0vtvvFm?= =?us-ascii?Q?ENtG2DS1k0joKyc57PJ1olI+oZvbEsjQo/9JcmhPCQdIkyzdxjMTFZnfDCY0?= =?us-ascii?Q?gKbmE8AtnnbxDO7CxvGmfB1rSInvwZDtLHQduV2MF7HBf9D9azQA7nfJszB6?= =?us-ascii?Q?Pz9cybYqr/ECm+XIEHNdAEr/w4sE9Zo5VUeFfwuKBekeqholM9rFLvjolCZS?= =?us-ascii?Q?02UBdkkHBxBfnw9kqUf2g61Snf+yjfBLJK68oZqWjyfO3DTbgzKiXmTlxazn?= =?us-ascii?Q?1uefzn79hGB5Dq3OixA2ivvBSgYRCPHQSQHncJI+a5DMmrnnuqT8uIw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: ZeOzCOiM5/P1fWG8PQmBxJKBi7vCm3cfnIwM8bAGncuNpM5i4jCHQWvFUQ9WDRpF/8U/7gWfFVmMJMwDRujjlQ== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0201MB0930; 6:vcjIy6kb2L+ykP3M3s80grzbkKuwfSt6rnF8j8f2f4/vTVbv3UpPFoU/+xJ+uqc+GpNyz8lC90tItxIv0U1LBaMw+hPQBa15njTXYsrIR5VOUIo1ugKpdGGkgb0K854tXJao4mQWU28b+I9c/LNMeVMp0LaPSpfTcMBUMBzohIPJ4iYn/yFoXzj2YlutTd74tVR1RtaVMswyXa3WSN3i+9lpv1palS2ZdLbf8bo9sLtMsZpT2vfmqCn+ybVbVa1xGtzoRfIKNRIS78G0iLrx9+bMP4X9RYD1+XjU/Syzb5GGNiMoR9HOd29R4ojb9REkvXRg5SqgWeS+GwHc84xAI2iZNqA+uaQ7kIw6nJvsxic=; 5:G0cXv8Mx40E5CRgSpPyhfal6sGqUQUFCphepQtLwalqwxZ6vhZDm8GfutHNkfvgzUWYzjA7p6xDsCf+oFei9vCqG4Mhj7/KvQy0ASGZjeK9sERbQD9xf9kfZPy0qaHHo4mpIFxPGk7XyiYFpiIgFGefZFHdOGo/fcBQER6oZXsI=; 24:aibwPWSgWRtOZq65jAuu/N4o8ECtMl2NGKKcJ/64VyLyFvjA9q7b4w5cQaaWPtuEx2KxEcuWIXQM2O2i82XVvPFuUqyb5ZqJ9qKVsWu0v00=; 7:nr2w2FRSag4l6z7ldZCLiNJeqtaxg2LeYrIWlT2HyrJ4jRI6Xe7C0A8nKLwdC6e/iOk5RTyRktdiSYt+Kj6itIJvFaT2uuCg8mC6M6RI1ZK8znerTJeDP6BWV0llpaFJYN9GqO0Z8wx6N4pyBEasBH6IGjd2QwMillDlH3CVjwH1nudrMpODdaPYkxfyVHlWxvclQI5q7YQfso9v7lGopUD3lk88E52HFvck8bJqlmyrKeAXf/XrZuzHymYu3vF6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2017 15:21:47.0722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 977b53ed-6079-4b12-972f-08d53b2abc2e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0201MB0930 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-12-04_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1712040223 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 04 Dec 2017 15:21:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 04 Dec 2017 15:21:50 +0000 (UTC) for IP:'148.163.155.12' DOMAIN:'mx0b-002c1b01.pphosted.com' HELO:'mx0b-002c1b01.pphosted.com' FROM:'david.vrabel@nutanix.com' RCPT:'' X-RedHat-Spam-Score: -0.821 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_PASS) 148.163.155.12 mx0b-002c1b01.pphosted.com 148.163.155.12 mx0b-002c1b01.pphosted.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: David Vrabel Subject: [libvirt] [PATCH] virfile: relax checks for hugetlbfs X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 04 Dec 2017 15:22:01 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There are use cases where it is useful to use the support in libvirt for file-backed guest memory, but without using hugetlbfs but tmpfs instead (for example, to run tests on hosts that do not have hugepages configured, or to use Linux's idle page tracking to monitor guest memory accesses at a 4k page granularity.). Drop the check for hugetlbfs when querying the huge page size, but move it to the loop that's searching for a suitable mount to use. Change-Id: I2c9589191e14653724725b944171689553ee6bae --- src/util/virfile.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 82cb36dbc..24ff5e208 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3438,19 +3438,23 @@ virFileGetHugepageSize(const char *path, goto cleanup; } =20 - if (fs.f_type !=3D HUGETLBFS_MAGIC) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("not a hugetlbfs mount: '%s'"), - path); - goto cleanup; - } - *size =3D fs.f_bsize / 1024; /* we are storing size in KiB */ ret =3D 0; cleanup: return ret; } =20 +static bool +virFileIsHugeTLBFS(const char *path) +{ + struct statfs fs; + + if (statfs(path, &fs) < 0) { + return false; + } + return fs.f_type =3D=3D HUGETLBFS_MAGIC; +} + # define PROC_MEMINFO "/proc/meminfo" # define HUGEPAGESIZE_STR "Hugepagesize:" =20 @@ -3517,6 +3521,9 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, if (STRNEQ(mb.mnt_type, "hugetlbfs")) continue; =20 + if (!virFileIsHugeTLBFS(mb.mnt_dir)) + continue; + if (VIR_EXPAND_N(fs, nfs, 1) < 0) goto cleanup; =20 --=20 2.11.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list