From nobody Tue Apr 7 09:19:25 2026 Delivered-To: importer@patchew.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773546185; cv=none; d=zohomail.com; s=zohoarc; b=TcVS3N9Zvf9gaX4bswgBLUp25HX/2dLf4YbfMBqZ245+hpRT6GsJHTxC40s+Ob1zq/zyUMU1VHbYZxPtFlFwcCurjWjfLQkRmfKZem/8WOihyBeaD4O81IypxZB/+45jWyAHJTEH34VYK5yXLm3hZ8Nqrh9+313wEuQXJdXkfiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773546185; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hUSbLOobWbo0z0ehlzPpMYjcHrg09tA0492KwnfG5oI=; b=PARH97+zt9osbUjgGPyo19GBq5iScYdyPVcrjwrSwb1f2QizG4fNG3xoJ5gXhuJ+wSFXaTZGc2CFRdig3faRhCP6SP2ZkjJUPl/8Qv2vknbqaEAdvQoP7fm7N2KoFTzgQStvHFPTYslk/beG4ekm2HIq9Kn74TfWs82aEzyIZRk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773546185059682.7651280919217; Sat, 14 Mar 2026 20:43:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w1cMj-0004yX-UF; Sat, 14 Mar 2026 23:42:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w1cMi-0004xK-Ff for qemu-devel@nongnu.org; Sat, 14 Mar 2026 23:42:08 -0400 Received: from mail-dy1-x1330.google.com ([2607:f8b0:4864:20::1330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w1cMg-0003lP-Sm for qemu-devel@nongnu.org; Sat, 14 Mar 2026 23:42:08 -0400 Received: by mail-dy1-x1330.google.com with SMTP id 5a478bee46e88-2bd9a485bd6so510134eec.1 for ; Sat, 14 Mar 2026 20:42:06 -0700 (PDT) Received: from 192.168.7.2 ([189.6.247.75]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2beab57b2b2sm8862982eec.33.2026.03.14.20.42.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 14 Mar 2026 20:42:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773546125; x=1774150925; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hUSbLOobWbo0z0ehlzPpMYjcHrg09tA0492KwnfG5oI=; b=k7FAMz83i8B64qtbi1AGEVo74T7AsSryE+b9nMT6JcupWniqtwx4HQMQWY/8lV+SaR 89rlZ0OnfhBLAWmZHedktlv/pQyxYkYhUz5qW7y1lBAKBPAK8lkit6owI96rl1rob6Yx vG+tTl9JgHUymi9tzSyFpPt5FoDfGludzNwBj8Us7d2O2lAnKl67zQ7zpyx0bgM3OylO mTe6IGKTVJNm3qzQiubhdWKALOUZ1tJRnGHtnAbLzrSWUHtcT4b5EpqSHkY06NyUVNEh hmr6bcT9CJeP5OSZmUtLbWL2M5cEQmVZtXRbnyb/CKFAJXKggLttWqSdcwAjI8jqCCvZ 32hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773546125; x=1774150925; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hUSbLOobWbo0z0ehlzPpMYjcHrg09tA0492KwnfG5oI=; b=FROgpJTD8lnKpVT/nOju84UkWBfcQo+U2Gs1TImAhPB8x2VOuEWvKBHZ119ULdaee0 clc1uRHwFfg0JDgfYpE10C5Nl4vaHwayNgwUHC5wiBPbItN1aCQmiMqKX7vfFU92C32S JHuItVVqcSSRW0M1tvpO4TP2hnR1jM9fGg5OBw7jaBIpraOMpGIJzbAya9gi8KiPyVzC nqXdsvMZUbNFbg/M9QpyuvGkDjxYuavfEFm1s2Ye7ybGZ1vbHZBd9tnlEg62WNQHC0hN 2Age7s/uyys0R4KSDxtcJ34WMUkDnH5T5QZ4rKYN0f5jGVpjY4yjSAeZU3+iYYp9kNU1 8sTQ== X-Gm-Message-State: AOJu0YyL9CIK4D0fW6ejLOvTRf3U9g19U8FLu+i4Ld7z2tWKdF6HAe1t C3MJl8FaSkgfHE8ApN5p8u2T8eZhMMH+S91/7hhV1rYxEUKrFj2wi2GoEhLejfd4 X-Gm-Gg: ATEYQzzHpHOiueznglsoGTil5qIqLZrT58WECLn/GCKJOwo25+y+BRL5DwDrJNVJcOg yHKTWt7UDjKBLiv3Z6oNhA9OFhaRmlKTO0pqujJqvkz+YTkln+ZVOQjJ6aMwgjV0xZjKWGlj0id PrIZElqg2W31XWbIu8nhhJLKNaWc2bF/EvIYQ2L4RJpdVflzSAQHr+4VnLBVtSppPvZASlyUGCv VGxNjcboj+NtkzFGq2694JjHSSU9aluXGdqmXVJMc47lwEEJkVhpHj0ilCIvQk/XW7t8D/xkqFS OKhj1Qgc0But0atPSPxPYAliS+B6t5Uu8W3W7D7d6Lo/+G8hBaQA+a6hatimeXTvp4COcKM8Spr g39AfFOLOh/pgWkftU/9I6fn4WiMO3xqdJs+9xb9eFdl7RdhOao/ug0AgQl/lIZw8JnMcFfj7uq srAJkiWmhqTRuei0KCIniFavWzaktkwjgVx6sSybJ4NZdNNvGQoA== X-Received: by 2002:a05:7300:c9e:b0:2ba:6b03:909b with SMTP id 5a478bee46e88-2bea558f037mr4190582eec.19.1773546125341; Sat, 14 Mar 2026 20:42:05 -0700 (PDT) From: Lucas Amaral To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Lucas Amaral , Lucas Amaral Subject: [PATCH 3/3] target/arm/hvf: configure IPA granule on macOS 26 Date: Sun, 15 Mar 2026 00:41:54 -0300 Message-ID: <20260315034154.41986-4-lucaaamaral@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260315034154.41986-1-lucaaamaral@gmail.com> References: <20260311022732.64141-1-lucaaamaral@gmail.com> <20260315034154.41986-1-lucaaamaral@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2607:f8b0:4864:20::1330; envelope-from=lucaaamaral@gmail.com; helo=mail-dy1-x1330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, FSL_HELO_BARE_IP_2=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1773546186634158500 Content-Type: text/plain; charset="utf-8" Read the ipa-granule property (set by hvf_accel_init) and configure the HVF stage-2 translation granule via hv_vm_config_set_ipa_granule() on macOS 26+. When ipa-granule=3D4k, use HV_IPA_GRANULE_4KB to allow HVF to map memory at 4KB granularity, matching 4KB-page guests on hosts with larger page sizes. If macOS < 26 and a sub-host-page granule was requested, warn and fall back to the host page size. Signed-off-by: Lucas Amaral --- target/arm/hvf/hvf.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 1ba5bbf3..e3b1e3e1 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1269,6 +1269,38 @@ hv_return_t hvf_arch_vm_create(MachineState *ms, uin= t32_t pa_range) } chosen_ipa_bit_size =3D pa_range; =20 + /* + * Configure IPA granule from the ipa-granule property. + * hvf_get_map_granule() was set by hvf_accel_init() before this call. + */ + { + uint64_t granule =3D hvf_get_map_granule(); + bool granule_set =3D false; + +#if defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ + (__MAC_OS_X_VERSION_MAX_ALLOWED >=3D MAC_OS_VERSION_26_0) + if (__builtin_available(macOS 26, *)) { + hv_ipa_granule_t hv_gran =3D (granule <=3D 4 * KiB) + ? HV_IPA_GRANULE_4KB : HV_IPA_GRANULE_16KB; + ret =3D hv_vm_config_set_ipa_granule(config, hv_gran); + if (ret !=3D HV_SUCCESS) { + error_report("HVF: failed to set IPA granule: %s", + hvf_return_string(ret)); + goto cleanup; + } + granule_set =3D true; + } +#endif + + if (!granule_set && granule < qemu_real_host_page_size()) { + warn_report("HVF: ipa-granule=3D%zuKB requested but macOS < 26= ; " + "falling back to host page size (%zuKB)", + (size_t)(granule / KiB), + (size_t)(qemu_real_host_page_size() / KiB)); + hvf_set_map_granule(qemu_real_host_page_size()); + } + } + ret =3D hv_vm_create(config); =20 cleanup: --=20 2.52.0