From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C627C2D0C2 for ; Tue, 31 Dec 2019 13:55:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC21F205ED for ; Tue, 31 Dec 2019 13:55:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I3LOPfek" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC21F205ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHzC-0003uB-FH for qemu-devel@archiver.kernel.org; Tue, 31 Dec 2019 08:55:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57530) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imHCi-0006BO-0K for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imHCg-00058h-Lb for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:55 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:29573 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 1imHCg-00056e-H3 for qemu-devel@nongnu.org; Tue, 31 Dec 2019 08:04:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577797494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ogW+EFqqnnwiHLDYruVGlKO6poTQH/msccHNIijYD9M=; b=I3LOPfekT1IhT0lwRDQhx6xVYVuvF1DTD40F1gUaoJ1O2kBVBjjN0hw0JeMt/yu6We4IDi yJC9O1dFD4mzU/hj74k2U7DNFWHT0Zbl0XqqfkaGUhzI8rD1BnY/1brvgIih5RF69NT3sN sb9BFyywlbj9ekuQckV9dnoJ2qKL6Xk= 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-425-8Y2o6AmlOF--_7NJ72Qamg-1; Tue, 31 Dec 2019 08:04:52 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6E99800EB8 for ; Tue, 31 Dec 2019 13:04:51 +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 291BC78E96 for ; Tue, 31 Dec 2019 13:04:51 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH 77/86] exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize() Date: Tue, 31 Dec 2019 14:04:01 +0100 Message-Id: <1577797450-88458-78-git-send-email-imammedo@redhat.com> In-Reply-To: <1577797450-88458-1-git-send-email-imammedo@redhat.com> References: <1577797450-88458-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 8Y2o6AmlOF--_7NJ72Qamg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since all RAM is backed by hostmem backends, drop global -mem-path invariant and simplify code. Signed-off-by: Igor Mammedov --- exec.c | 51 +++++---------------------------------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/exec.c b/exec.c index d4b769d..7b6e376 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