From nobody Mon Apr 6 21:34:18 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=1773770365; cv=none; d=zohomail.com; s=zohoarc; b=JxN/CQLmIlL7xCRwqY/OKwHh4Wi57y6kgsZgEE3OFP1Bby92Ik9/M6KuQBxRISArUu26Nfxh5Oej7dVZ0sD+8dXkh2nck9pXIhDuH0tb/6ydEeTuJGn72QZ2T70qY6CFUxjvlmamMKnX32Yrcy/fJ+JXgv2SQfoANkVufBIYTUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773770365; 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=Okui3+LoiEw6Ead0/iU3+dwFPXpVpxuXn0Pb9e4RdJE=; b=O3fVLX1xgm4RRGqhltflkRerUVn677VhXhTnnqrwqxrcA8hi6B42NckmaNiXu1BqOfJ15jHFmgudVvy3FcZLeglkDX6T5ZVlDLDUVPD7YrTJk4W9WIWi7pw27pQEBm+CFHVUgkO7yGMLS6zZdxTewucis8NYwyQ/9rtCi48Fr4k= 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 1773770365745123.32554123251896; Tue, 17 Mar 2026 10:59:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2YgQ-0004Xx-Dx; Tue, 17 Mar 2026 13:58:22 -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 1w2Yg4-0004W1-Sq for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:58:08 -0400 Received: from mail-dy1-x132f.google.com ([2607:f8b0:4864:20::132f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2Yg1-0000iu-Fx for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:57:59 -0400 Received: by mail-dy1-x132f.google.com with SMTP id 5a478bee46e88-2c0bdf1988cso4582515eec.1 for ; Tue, 17 Mar 2026 10:57:57 -0700 (PDT) Received: from localhost.localdomain ([143.54.78.51]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c0e55a2be4sm237884eec.22.2026.03.17.10.57.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 10:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773770276; x=1774375076; 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=Okui3+LoiEw6Ead0/iU3+dwFPXpVpxuXn0Pb9e4RdJE=; b=bVp+36gg9J82r3DIc8E3e+ce4fTiXUXIKxGSn04SuRrw42eRiMNnEDfamRNei2f07k fekZRVEjK49sFJMOGzmVdZmJNxrYymQwi5ddZAf6cu5l0KpB60pFavgSTMcHEMSPmGNQ KvR0g5nvGen00//SmsU3aFRirWvzjQyXR4KaLFSPNAD7MLYxNv8nybt3yeWRl7ps9MKk Z40QSu3qe3/kZKizu9JhS/ru4RF+3DLBPLeakBXwBZglIHRtVsFDV/bRbfjq14mfCAJX mXqwUn1lZqvRDtXS11MqYiGc3T3e8PdpGqxCVGESir31HDwk+bJNKHQTWIlwXQieivZc bEXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773770276; x=1774375076; 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=Okui3+LoiEw6Ead0/iU3+dwFPXpVpxuXn0Pb9e4RdJE=; b=cgrMHfvJxPLvw1qtkiUnmZ/RRZClmVbdUb3PGRJgKCSxg6hop89iTlrCVPHwzRkLXi Bxo05mgmAB/l8I/vvsBdlLAAL8vNJungTplVrZ4vIwldvhGPgK2wcRUBR9bvoAtskIQD 2umqQZhxTf6+K3VmlhD/3jjZ/0t0if1IWDHD4++OYVfjuFNhO3NSDw3tUMMT1++UAxzw p2ow+v3/s5q3+ogqUH9zzkwq18Mk9dWB4BO9ra7+ulIM8rvqlBIiGR/EzI04wHXI4jzp 9+sJ4Bj4yQdcxMI2A3XeduKNqnfB7OPgitkfk32Vkpl3rIe66+SvQgc0kkC/ywChF0Xz Vgow== X-Gm-Message-State: AOJu0YzoDNAz18rCRaWTXthdrQZboE9b5app7zekgbtFc/5LTWty/nve Oi4Y26cMjXV/jAhQ3Xr/RJBOOyvP4IM1DMhAmt2RNB9uSbjRE7nUnF4qtcpvuFkH X-Gm-Gg: ATEYQzwWuWHwY0XTV6bPnnnjgBo5jwS/5gd7yg+tEgHfzsA36vbqJXfgmprnyfwu4Aa UNs4MwrkUAHRwAMOloKFKDc82Sg+i8HBZiyQY22mSU3tFs3PP5I/sPtUt6twDA4SuEkx918oXbQ yEeqY6dLbXd48KsQz1/jhE75vbP6g4jKeElKrHe/GSgtmGD0HDBKxRmU715g0hnw8lTeC2E7EwY CQRZr+kV5ohiqMfD76fQ+UKNq9GlF7sFPTE82WqZc7zNu5EPm+uiZngUU+nEc8QlgXfcqCD/gxY OdH7PPh0sbE8fOoDU/iaE3q93YfgK6d9w852pIwEXABUSsfVJoJAlSO1YQUu2afvZfgu0Un/HS8 JDQueN14WWvkyNYgNBxMLn/QkLkoXLyP5ZSA3NaCqIu+CpUfYYp2vMjvag1fb4lmBwKI54KXg5u 6kVcCWcDweZkV78s8nd24xBOaB7Clr0/rV5a/z2fAYGPEn9QsJrhSh X-Received: by 2002:a05:7300:7491:b0:2be:c4a:d31b with SMTP id 5a478bee46e88-2c0e50a919dmr148331eec.18.1773770275514; Tue, 17 Mar 2026 10:57:55 -0700 (PDT) From: Lucas Amaral To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, agraf@csgraf.de, peter.maydell@linaro.org, mohamed@unpredictable.fr, Lucas Amaral Subject: [PATCH v4 1/3] virtio-gpu: validate host page alignment for MAP_FIXED blobs Date: Tue, 17 Mar 2026 14:57:42 -0300 Message-ID: <20260317175744.32469-2-lucaaamaral@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260317175744.32469-1-lucaaamaral@gmail.com> References: <20260317175744.32469-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::132f; envelope-from=lucaaamaral@gmail.com; helo=mail-dy1-x132f.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, 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: 1773770366881158500 Content-Type: text/plain; charset="utf-8" Commit 4eb0aace ("virtio-gpu: Support mapping hostmem blobs with map_fixed") uses mmap(MAP_FIXED) to map blob resources into a pre-allocated hostmem region. Both the offset and size passed to mmap must be aligned to the host page size, but the code does not validate this. On hosts where qemu_real_host_page_size() exceeds the guest's page size (e.g. ARM64 with 16KB or 64KB pages, macOS ARM64), the guest may provide blob offsets aligned to its own page size (4KB) but not to the host's. This causes mmap(MAP_FIXED) to fail with EINVAL, and the subsequent unmap (which also uses mmap MAP_FIXED) fails the same way, producing: virtio_gpu_virgl_unmap_resource_blob: failed to unmap(fixed) virgl resource: Invalid argument Add an alignment check before attempting MAP_FIXED. When the offset or blob size is not host-page-aligned, skip the MAP_FIXED path and fall through to the existing subregion method, which handles any alignment. Fixes: 4eb0aace ("virtio-gpu: Support mapping hostmem blobs with map_fixed") Signed-off-by: Lucas Amaral --- hw/display/virtio-gpu-virgl.c | 45 +++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index b7a2d160..f6583b48 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -185,25 +185,34 @@ virtio_gpu_virgl_map_resource_blob(VirtIOGPU *g, return -EBUSY; } =20 - ret =3D virgl_renderer_resource_map_fixed(res->base.resource_id, - gl->hostmem_mmap + offset); - switch (ret) { - case 0: - res->map_fixed =3D gl->hostmem_mmap + offset; - return 0; - - case -EOPNOTSUPP: - /* - * MAP_FIXED is unsupported by this resource. - * Mapping falls back to a blob subregion method in that case. - */ - break; + /* + * MAP_FIXED requires host-page-aligned offset and size. Hosts with + * page sizes larger than the guest's (e.g. 16KB on ARM64) may receive + * non-aligned blob offsets. Fall through to the subregion method when + * alignment requirements are not met. + */ + if (QEMU_IS_ALIGNED(offset, qemu_real_host_page_size()) && + QEMU_IS_ALIGNED(res->base.blob_size, qemu_real_host_page_size())) { + ret =3D virgl_renderer_resource_map_fixed(res->base.resource_id, + gl->hostmem_mmap + offset); + switch (ret) { + case 0: + res->map_fixed =3D gl->hostmem_mmap + offset; + return 0; + + case -EOPNOTSUPP: + /* + * MAP_FIXED is unsupported by this resource. + * Mapping falls back to a blob subregion method in that case. + */ + break; =20 - default: - qemu_log_mask(LOG_GUEST_ERROR, - "%s: failed to map(fixed) virgl resource: %s\n", - __func__, strerror(-ret)); - return ret; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "%s: failed to map(fixed) virgl resource: %s\n", + __func__, strerror(-ret)); + return ret; + } } #endif =20 --=20 2.52.0 From nobody Mon Apr 6 21:34:18 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=1773770366; cv=none; d=zohomail.com; s=zohoarc; b=cOKw0SC7XNPBWKQuW13AjckdQYLUmfKtHLGhoAnw+3L+DhvEMAGgXI3DW0vOVRAf7KbGCk7KssLPRcoFaLzR7DrvnaXKMzYctgkEJGwqPcj7yCyXB+xbQp41lomQN8proYhryWCOG2rMQlFkpch6A9vDNrXRT1Kih1wImrjzOEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773770366; h=Content-Type: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=OuDR2iSPCgURE7u24WDyiCzsUI0pm0+NFQd2ZCmyhBc=; b=IznZlaYfJAB9A77pM6FdHnkHz3lCh/dWAlE8dXCrD0G50IDLu9TYOhonpfNuZ2o5Ukc/W8fLm+CoOQUjryDcguxSsW27Rev4S0mbGXI8u1hfLJqvqcGf3bBjc+4UtpVXY4ly0JCvRgRhwvjo+S1qNonm31qTtnhRxbZVlHGrvtY= 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 1773770366063421.7288060983892; Tue, 17 Mar 2026 10:59:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2YgQ-0004Xw-CS; Tue, 17 Mar 2026 13:58:22 -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 1w2YgD-0004WR-0N for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:58:13 -0400 Received: from mail-dy1-x1335.google.com ([2607:f8b0:4864:20::1335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2Yg5-0000jW-Gv for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:58:04 -0400 Received: by mail-dy1-x1335.google.com with SMTP id 5a478bee46e88-2c0c955a481so333591eec.1 for ; Tue, 17 Mar 2026 10:58:01 -0700 (PDT) Received: from localhost.localdomain ([143.54.78.51]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c0e55a2be4sm237884eec.22.2026.03.17.10.57.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 10:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773770280; x=1774375080; 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=OuDR2iSPCgURE7u24WDyiCzsUI0pm0+NFQd2ZCmyhBc=; b=ku+YPl7tPSgc2sWPHxobmgSHz1l+S1GxZUTmlbjNadlLhgkVb77SSkxdBZRA+aFn/1 /Qibg9+ljq4gO0tU5Vf9rGAgoFsgPER/yYd3QG7jzTg1kzeTpXcpdv+YrMqvWRl0xIDP qXVFurM9CNHiovEqK2weLDZ1ln8zXTzLwDLXDxhzxq49iWBspiXvTFNLyPGx1bO+rwhL wSxVpTfbUBz8G8JiVXjoq+yp0bfXNU5TGEMpTOz4sAMxF+XzqbgF+BlvjSBRIytjEWt5 q714B5JSF7cfcK94adZaKIKGGBOJ0RMTr5dIBWQIb+FN0LrAVs5AaCUfS3NeBN3UUD/N I9oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773770280; x=1774375080; 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=OuDR2iSPCgURE7u24WDyiCzsUI0pm0+NFQd2ZCmyhBc=; b=QWgK0riQT1xpH2Ke0Oy60sOvmvxyjGTBxDbadgsh74PhF06hBbBwYlK+JzsJf3+k75 7B7IGRfiVAImVYclTbXFfcqvVQM1KPIEj7OFAZACRhv4hR3Bl3jNtUxZTyYFOd/s/4ao tWFiv/240yzxWV8YK1v9MwWokdskV+4hbzhS3xi6bLyLBJOq3Uv47TkSRhFFtQtoX6hV JtRNzOLijdCmvvHMbedw80mSO+p44bt587zVOO5N8UaC6ARezX4maA35/TWaDNGTiKqC DA1D3Tr6bYlDJ+c1S2x4uYiOFL2kCVq1P8uq6p02k+Nwis0KFJ7s0ZyhUbkKN++3jx9c /Z9w== X-Gm-Message-State: AOJu0YxVecf6oL3vBMCNpzQ/ojZFaff8j/s+5Pm8ohcGcknImlSoGmMG wY4HZvcXmWyD1Z+zMD1e0LrPr3uACZ1XROwY1ISgd2e17bc9s7k9BX1uKcxtQVWR X-Gm-Gg: ATEYQzz5iZAWZl9SyIToEUTL1VRI4Y/4fpADiah18Us1xwudO7deiLn+bvQAglMyA8f U5hYZGUXnqAUbnVJSTaX6YfslvA5LjiGGPU5kF/4iTZX0BvTL/QSnadaVAdAQLKQFoX4TPKHDgO TrFmk4OD5n/QflDRg/e9yz1zr8Px0DfDuxxKMs7YQarA9Ahd65dpW6BafFs3gWiPlTj2r0fRIpS DtbYZWViV0PQOBgQ39JWIH9NNjZ9S/UY/Fehh3SPrrwXZxLown5IZpKuYtxfPgqXkdKUOpWAN5v Zuu3irgP/XyUM9OyUnJynhjg1a/6kfWRbmgGtNRgX116vKjzba6fzU8hbnaAex+ht4hQ5YwHgjy b10wq/pCNTQNxSJ2sWNW12maYOc5INo71UvHRc3jlHxGIgF9XVQw256mXCPM/EZAQs9GkZhj0eT l6fgMb9za3meuMtuhhDJWIrolGrr9xd0tkTqvq1Pnk0ISsV468M0XF X-Received: by 2002:a05:693c:2c06:b0:2be:833c:14a6 with SMTP id 5a478bee46e88-2c0e5044091mr226880eec.15.1773770279624; Tue, 17 Mar 2026 10:57:59 -0700 (PDT) From: Lucas Amaral To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, agraf@csgraf.de, peter.maydell@linaro.org, mohamed@unpredictable.fr, Lucas Amaral Subject: [PATCH v4 2/3] accel/hvf: introduce map granule abstraction and IPA property Date: Tue, 17 Mar 2026 14:57:43 -0300 Message-ID: <20260317175744.32469-3-lucaaamaral@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260317175744.32469-1-lucaaamaral@gmail.com> References: <20260317175744.32469-1-lucaaamaral@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::1335; envelope-from=lucaaamaral@gmail.com; helo=mail-dy1-x1335.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, 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: 1773770366953158500 Add a map granule abstraction that decouples HVF memory mapping alignment from the host page size. On ARM64, Apple Silicon supports stage-2 translation with 4KB page granules regardless of the host OS page size (16KB on macOS). This allows running guests with 4KB pages without interior mapping failures. Introduce hvf_set_map_granule()/hvf_get_map_granule() in hvf-all.c to replace hard-coded qemu_real_host_page_size() references in do_hv_vm_protect() and hvf_set_phys_mem(). When the granule is not explicitly configured, fall back to host page size to preserve the previous behaviour. Add an "ipa-granule" accelerator property (auto, 4k, 16k) following the established kvm_arch_accel_class_init() pattern: ARM registers the property in hvf_arch_accel_class_init(), x86 provides an empty stub. This avoids #ifdef __aarch64__ in common code while keeping a single hvf-all.c shared by both targets. Fix hvf_set_phys_mem() to return early for non-aligned regions instead of clearing the add flag, which previously fell through to an incorrect unmap of a region that was never mapped. Signed-off-by: Lucas Amaral --- accel/hvf/hvf-all.c | 30 +++++++++++++++++++++++++++--- include/system/hvf.h | 15 +++++++++++++++ include/system/hvf_int.h | 2 ++ target/arm/hvf/hvf.c | 40 ++++++++++++++++++++++++++++++++++++++++ target/i386/hvf/hvf.c | 4 ++++ 5 files changed, 88 insertions(+), 3 deletions(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 5f357c6d..d745fefd 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -10,6 +10,8 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/units.h" +#include "qapi/error.h" #include "accel/accel-ops.h" #include "exec/cpu-common.h" #include "system/address-spaces.h" @@ -22,6 +24,21 @@ =20 bool hvf_allowed; =20 +static uint64_t hvf_map_granule; + +void hvf_set_map_granule(uint64_t size) +{ + hvf_map_granule =3D size; +} + +uint64_t hvf_get_map_granule(void) +{ + if (!hvf_map_granule) { + return qemu_real_host_page_size(); + } + return hvf_map_granule; +} + const char *hvf_return_string(hv_return_t ret) { switch (ret) { @@ -53,7 +70,7 @@ void assert_hvf_ok_impl(hv_return_t ret, const char *file= , unsigned int line, static void do_hv_vm_protect(hwaddr start, size_t size, hv_memory_flags_t flags) { - intptr_t page_mask =3D qemu_real_host_page_mask(); + intptr_t page_mask =3D -(intptr_t)hvf_get_map_granule(); hv_return_t ret; =20 trace_hvf_vm_protect(start, size, flags, @@ -83,7 +100,7 @@ static void hvf_set_phys_mem(MemoryRegionSection *sectio= n, bool add) MemoryRegion *area =3D section->mr; bool writable =3D !area->readonly && !area->rom_device; hv_memory_flags_t flags; - uint64_t page_size =3D qemu_real_host_page_size(); + uint64_t page_size =3D hvf_get_map_granule(); uint64_t gpa =3D section->offset_within_address_space; uint64_t size =3D int128_get64(section->size); hv_return_t ret; @@ -104,7 +121,7 @@ static void hvf_set_phys_mem(MemoryRegionSection *secti= on, bool add) if (!QEMU_IS_ALIGNED(size, page_size) || !QEMU_IS_ALIGNED(gpa, page_size)) { /* Not page aligned, so we can not map as RAM */ - add =3D false; + return; } =20 if (!add) { @@ -186,6 +203,11 @@ static int hvf_accel_init(AccelState *as, MachineState= *ms) int pa_range =3D 36; MachineClass *mc =3D MACHINE_GET_CLASS(ms); =20 + /* Resolve ipa-granule=3Dauto =E2=86=92 host page size */ + if (!s->ipa_granule) { + s->ipa_granule =3D qemu_real_host_page_size(); + } + hvf_set_map_granule(s->ipa_granule); =20 if (mc->get_physical_address_range) { pa_range =3D mc->get_physical_address_range(ms, @@ -223,6 +245,8 @@ static void hvf_accel_class_init(ObjectClass *oc, const= void *data) ac->init_machine =3D hvf_accel_init; ac->allowed =3D &hvf_allowed; ac->gdbstub_supported_sstep_flags =3D hvf_gdbstub_sstep_flags; + + hvf_arch_accel_class_init(oc); } =20 static const TypeInfo hvf_accel_type =3D { diff --git a/include/system/hvf.h b/include/system/hvf.h index d3dcf088..3c4c3b89 100644 --- a/include/system/hvf.h +++ b/include/system/hvf.h @@ -36,4 +36,19 @@ typedef struct HVFState HVFState; DECLARE_INSTANCE_CHECKER(HVFState, HVF_STATE, TYPE_HVF_ACCEL) =20 +#ifdef CONFIG_HVF_IS_POSSIBLE +/* + * Minimum alignment for hv_vm_map(). Returns the configured IPA granule + * or host page size if not set. + */ +void hvf_set_map_granule(uint64_t size); +uint64_t hvf_get_map_granule(void); +#else +static inline void hvf_set_map_granule(uint64_t size) {} +static inline uint64_t hvf_get_map_granule(void) +{ + return qemu_real_host_page_size(); +} +#endif + #endif diff --git a/include/system/hvf_int.h b/include/system/hvf_int.h index 2621164c..9589b022 100644 --- a/include/system/hvf_int.h +++ b/include/system/hvf_int.h @@ -38,6 +38,7 @@ struct HVFState { =20 hvf_vcpu_caps *hvf_caps; uint64_t vtimer_offset; + uint32_t ipa_granule; QTAILQ_HEAD(, hvf_sw_breakpoint) hvf_sw_breakpoints; }; extern HVFState *hvf_state; @@ -57,6 +58,7 @@ void assert_hvf_ok_impl(hv_return_t ret, const char *file= , unsigned int line, const char *hvf_return_string(hv_return_t ret); int hvf_arch_init(void); hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range); +void hvf_arch_accel_class_init(ObjectClass *oc); uint32_t hvf_arch_get_default_ipa_bit_size(void); uint32_t hvf_arch_get_max_ipa_bit_size(void); void hvf_kick_vcpu_thread(CPUState *cpu); diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 5fc8f6bb..1ba5bbf3 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -12,6 +12,8 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/units.h" +#include "qapi/error.h" =20 #include "system/runstate.h" #include "system/hvf.h" @@ -1218,6 +1220,44 @@ void hvf_arch_vcpu_destroy(CPUState *cpu) assert_hvf_ok(ret); } =20 +static char *hvf_get_ipa_granule(Object *obj, Error **errp) +{ + HVFState *s =3D HVF_STATE(obj); + + if (s->ipa_granule =3D=3D 4 * KiB) { + return g_strdup("4k"); + } + if (s->ipa_granule =3D=3D 16 * KiB) { + return g_strdup("16k"); + } + return g_strdup("auto"); +} + +static void hvf_set_ipa_granule(Object *obj, const char *value, Error **er= rp) +{ + HVFState *s =3D HVF_STATE(obj); + + if (!strcmp(value, "auto")) { + s->ipa_granule =3D 0; + } else if (!strcmp(value, "4k")) { + s->ipa_granule =3D 4 * KiB; + } else if (!strcmp(value, "16k")) { + s->ipa_granule =3D 16 * KiB; + } else { + error_setg(errp, "invalid ipa-granule: '%s' (use auto, 4k, 16k)", + value); + } +} + +void hvf_arch_accel_class_init(ObjectClass *oc) +{ + object_class_property_add_str(oc, "ipa-granule", + hvf_get_ipa_granule, + hvf_set_ipa_granule); + object_class_property_set_description(oc, "ipa-granule", + "IPA granule for HVF stage-2 translation (auto, 4k, 16k)"); +} + hv_return_t hvf_arch_vm_create(MachineState *ms, uint32_t pa_range) { hv_return_t ret; diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index c0d028b1..565c79b3 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -228,6 +228,10 @@ int hvf_arch_init(void) return 0; } =20 +void hvf_arch_accel_class_init(ObjectClass *oc) +{ +} + /* 48-bit on all Intel Macs. Function currently unused. */ uint32_t hvf_arch_get_default_ipa_bit_size(void) { --=20 2.52.0 From nobody Mon Apr 6 21:34:18 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=1773770365; cv=none; d=zohomail.com; s=zohoarc; b=NNIOd6mCHJIvXxCu5ftRTczZ9x385+hyV//A3LqFchlKkh2juCHev2lD1aeb1tvT9hejF+IcdfvkmEff9cMfk4J6d/FnmqA1fS32ZIR/49ACdB6mVyqIkJ4ylMmwojKzJjiHzWsI+H8kFbG7ksb5OlfLvAbjHDkec6rwsXk8+2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773770365; 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=lRfNN7dQR71XGPxf5F8n2Fq8CgG24SE+5S4X1Hu3a50=; b=IX2ZBSnRXV4zKvnIur1fyg+z4CpF9G4BDpKJo2LUIyqcqSrhwBPgra3BlXnh8ZKZ5bBLBK81/AzFQNgttR/fKFyocX4pxpAUHw9xWMi3bBulWBV7YObPqdvHd+6rFEmWokVsnr5DipdTBt/UtIAhvY/1ZG0sM5GNWZaaHlcN43M= 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 1773770365536436.6532947969014; Tue, 17 Mar 2026 10:59:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2YgV-0004Yw-Cu; Tue, 17 Mar 2026 13:58:27 -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 1w2YgG-0004Wo-Jo for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:58:15 -0400 Received: from mail-dl1-x122d.google.com ([2607:f8b0:4864:20::122d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2YgC-0000kB-Fk for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:58:10 -0400 Received: by mail-dl1-x122d.google.com with SMTP id a92af1059eb24-126ea4e9694so839046c88.1 for ; Tue, 17 Mar 2026 10:58:04 -0700 (PDT) Received: from localhost.localdomain ([143.54.78.51]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c0e55a2be4sm237884eec.22.2026.03.17.10.58.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 17 Mar 2026 10:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773770284; x=1774375084; 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=lRfNN7dQR71XGPxf5F8n2Fq8CgG24SE+5S4X1Hu3a50=; b=HnButinxL6BGEgsm1RKsVDdiMS7a4nd+299pG1o8OeKeCL7qDAvTqd07ZSxQwH7rHK JqupGKbc28Vir0tCpu6X8Ii5evDMIJV2rgsEECkPij0lqgCK/KCAZop1Rhv4FAUmi6DF s+SqS7lW3/5tjZn/vWNI9DaOUI2Zl78OELF2faruaGJM9z8aZUO04qzjfRFEc3v6HYaN Y6muCnVmak5O1fNxFymNbdsYrygF1cPXvU/dg0qLgi6XmwziLpmjxNmpwNbv1Iae8mwE K/0aHRxUper0z1do1RgF85Psv/kPDNuMBhD9D6bbALSb6tnQAEeoMqx5CYhegZYyPhO4 c2Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773770284; x=1774375084; 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=lRfNN7dQR71XGPxf5F8n2Fq8CgG24SE+5S4X1Hu3a50=; b=phOgbfn8GsX5/T+rBoO5CldLhQ8sa/opBpAIRWq16Gki2RGBuKCx9zvQVutZRq/H1n iHq14E0j2lNdvQqkGb+qhXCaXdeL49qSEOlQ6sUXf5x5/D32BAJx1MptCI/ERHpCJ5nf s0+qSlOgIaYtt6KNnz+mOAuUv7zh8SXDTfFacjz0P4qWj6fTtIzS2sr67RxrhrWGh3IS GlJPvBkfnfLVLDMjwSogJqS8MnYfbzNSfAehWzgeD4ETIhfBuS6TJ7OQyca6d5mTVge+ H88L1iCQfLVYqKtc25q4xmjdW+n+3vq57m7/oVlJy7M2fDsmAwNYYY5rTyGE1ycGCUJb P4ZQ== X-Gm-Message-State: AOJu0YxtnSPD+UOSPJcol2/OS+XEOc+R/eZz5pNQMglq15A7CG9ZuFcb Rl3tSom9vrDC6alWIOW/aRFoUqIFegLtmgI7GuouZXjfV9R2tikdhi0X9NFYD+Hi X-Gm-Gg: ATEYQzwmIOKUtb6x1ycRvoPe4hePP0qGz9yiQhLRdUzUZimMFf/4Vzstk2hETeiuxDh gUO1TPD62MaVOSgFSaUSR7XN6/uEhgBaJhTSZqTMe8ZiJnbSXlrrS4ryKGR1WzwJoMOH607lHMj dxoI/9dG2XVzRv6bTWQvSsC0iU96nYY+vCx7IammQEvUSozo+KmCyIXc/GFhTkCYebwDRW1GBQ2 cSBO4s+djz5zzEMIvWowJaqqL3PcFyfMwZIFwkn8rV5P0k/GquswmtSbM0Dth225qqbZtLyia++ TcOWPlz27J16GsOOA7MdNTiVoHDGajQ+IGCvBW3H3iqJTl1p7aOJq6w0zO80ClLLddc5akr0lpr 1mz+/7nIkUT5j8MTHDlaXg81Xnkp3lF1J7W0Y7nA1O0jHbk3c3JH5eJ6Oe1IKX79s/peMxK6VbM bUsGlh3/K+liWEQJnDKd1lFgKKkdEtx42Qyip/if4fGWsmjmG3hwBV X-Received: by 2002:a05:7022:10c:b0:124:8d7d:2d63 with SMTP id a92af1059eb24-129a7195e45mr209803c88.35.1773770283404; Tue, 17 Mar 2026 10:58:03 -0700 (PDT) From: Lucas Amaral To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, agraf@csgraf.de, peter.maydell@linaro.org, mohamed@unpredictable.fr, Lucas Amaral Subject: [PATCH v4 3/3] target/arm/hvf: configure IPA granule on macOS 26 Date: Tue, 17 Mar 2026 14:57:44 -0300 Message-ID: <20260317175744.32469-4-lucaaamaral@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260317175744.32469-1-lucaaamaral@gmail.com> References: <20260317175744.32469-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::122d; envelope-from=lucaaamaral@gmail.com; helo=mail-dl1-x122d.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, 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: 1773770367026154100 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