From nobody Sat Feb 7 08:53:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579784192; cv=none; d=zohomail.com; s=zohoarc; b=dS0DSw6SRD3oyVMir2NbuO3nl+xP/9ogoBVrUy8YmC7Ph+RH8dexQ8WZyOIVfJVCOOWYWNKtG+eWnSC7SVXxme/RHxQhyhQvCEqckadmeAxoUrsL2ff/6mx8AFD+Fv+p865UduMENn8TY33EAXpOWQxMcG5VDqn7d3BgfefJCBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579784192; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=k7mBXAFtvDsyUSUbNhu62bwV7HPcVRcpfs00IOEBwlc=; b=EVPqnz7dSkRyJbmB+Tv6xoK+W9a/pS+iO+FotrkF04D0cT49RG1q4EphHdmfBz6A/MKtpYX44tMvYWsfaqXUB0/koZqMc9QZqmovuFleUjouqw69j0iK+pSqUR3wl+FnzzYYInYfyZeqNU0DObaH/waKsp9aBeGka2oDnK3lGZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579784192374853.5554888085225; Thu, 23 Jan 2020 04:56:32 -0800 (PST) Received: from localhost ([::1]:56614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuc2A-0005lQ-KM for importer@patchew.org; Thu, 23 Jan 2020 07:56:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36540) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuatw-0000DF-7Q for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuatu-0005JB-En for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:55 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:23866 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuatu-0005Il-Bf for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-Hnpbjk0mNT-o96OL-6tBig-1; Thu, 23 Jan 2020 06:43:51 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A355ADB61; Thu, 23 Jan 2020 11:43:50 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D73A1001DD7; Thu, 23 Jan 2020 11:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k7mBXAFtvDsyUSUbNhu62bwV7HPcVRcpfs00IOEBwlc=; b=efN7xXAlHyDZtMCT5hvZYuVK7JsQG/GwXvh1sTbPpGUpt1GbXLZgl8WIq3cbNdUKMVDgsJ 7JM+vH9Yaas3YkaDRevbKNDCt/5p7AjmB47N9J5pZ+carMGDTPHZwGgdiquW3p17KjplvU 4JMDqtOIpueu2Hr26KrekUS4vHAU2GE= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 74/80] exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize() Date: Thu, 23 Jan 2020 12:38:39 +0100 Message-Id: <1579779525-20065-75-git-send-email-imammedo@redhat.com> In-Reply-To: <1579779525-20065-1-git-send-email-imammedo@redhat.com> References: <1579779525-20065-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: Hnpbjk0mNT-o96OL-6tBig-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since all RAM is backed by hostmem backends, drop global -mem-path invariant and simplify code. Signed-off-by: Igor Mammedov --- CC: pbonzini@redhat.com CC: rth@twiddle.net --- exec.c | 51 +++++---------------------------------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/exec.c b/exec.c index 67e520d..809987c 100644 --- a/exec.c +++ b/exec.c @@ -1667,60 +1667,19 @@ static int find_max_backend_pagesize(Object *obj, v= oid *opaque) */ long qemu_minrampagesize(void) { - long hpsize =3D LONG_MAX; - long mainrampagesize; - Object *memdev_root; - MachineState *ms =3D MACHINE(qdev_get_machine()); - - mainrampagesize =3D qemu_mempath_getpagesize(mem_path); - - /* it's possible we have memory-backend objects with - * hugepage-backed RAM. these may get mapped into system - * address space via -numa parameters or memory hotplug - * hooks. we want to take these into account, but we - * also want to make sure these supported hugepage - * sizes are applicable across the entire range of memory - * we may boot from, so we take the min across all - * backends, and assume normal pages in cases where a - * backend isn't backed by hugepages. - */ - memdev_root =3D object_resolve_path("/objects", NULL); - if (memdev_root) { - object_child_foreach(memdev_root, find_min_backend_pagesize, &hpsi= ze); - } - if (hpsize =3D=3D LONG_MAX) { - /* No additional memory regions found =3D=3D> Report main RAM page= size */ - return mainrampagesize; - } - - /* If NUMA is disabled or the NUMA nodes are not backed with a - * memory-backend, then there is at least one node using "normal" RAM, - * so if its page size is smaller we have got to report that size inst= ead. - */ - if (hpsize > mainrampagesize && - (ms->numa_state =3D=3D NULL || - ms->numa_state->num_nodes =3D=3D 0 || - ms->numa_state->nodes[0].node_memdev =3D=3D NULL)) { - static bool warned; - if (!warned) { - error_report("Huge page support disabled (n/a for main memory)= ."); - warned =3D true; - } - return mainrampagesize; - } + long hpsize; + Object *memdev_root =3D object_resolve_path("/objects", NULL); =20 + object_child_foreach(memdev_root, find_min_backend_pagesize, &hpsize); return hpsize; } =20 long qemu_maxrampagesize(void) { - long pagesize =3D qemu_mempath_getpagesize(mem_path); + long pagesize; Object *memdev_root =3D object_resolve_path("/objects", NULL); =20 - if (memdev_root) { - object_child_foreach(memdev_root, find_max_backend_pagesize, - &pagesize); - } + object_child_foreach(memdev_root, find_max_backend_pagesize, &pagesize= ); return pagesize; } #else --=20 2.7.4