From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771322352; cv=none; d=zohomail.com; s=zohoarc; b=UGgs0pBCE2e7M10TRDUUCNkX4NXqCS84nFxRClPXp0EYarojkskvU9AZfzCuXa3tBOn0JfacHZI0sxluLY4L3+FUfb6VzxkSY8Pewm5i/JD4rimYJ9NwMTbqHFA3RIA5ZOODMdsUgPjuoqETjzrqiBF42b4rjBZZ4fQH9YPAU54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771322352; 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=mKoafgl9k/P7C/ae0FhPI1YFMXXnXfGrilpKysbRFTw=; b=RpyB5T80eqy8sKFhIrPjp4+QDmMo6TqqgGOyH6lSMO0Nm/EZ1nb6QQuvExkVq47sPWVzJKNPSuW/u5DOB6HvSVHP75ucczb5ejG8dllZNDOj/dUcIgkHuQbgaF1q7WbKHQDhN92vKldXGIILJ+phH105l7dT4sKYVjVOPC6cxlc= 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 177132235249998.90951838350236; Tue, 17 Feb 2026 01:59:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHrA-0000Yg-FF; Tue, 17 Feb 2026 04:59:00 -0500 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 1vsHqw-0000Vx-MT for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:58:50 -0500 Received: from mail-ot1-x331.google.com ([2607:f8b0:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHqv-0001KY-59 for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:58:46 -0500 Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-7d4cb7e10efso3480575a34.0 for ; Tue, 17 Feb 2026 01:58:44 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771322324; x=1771927124; 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=mKoafgl9k/P7C/ae0FhPI1YFMXXnXfGrilpKysbRFTw=; b=bCHz8bSgn9DRjkIo61H7+l2yvds3TCuZouqFkeuouRB1nRzEBrLxr1BOaACQGPepZC Lj5eL4wMZ2/wfpAPJkg1gIjBTVhyw0T8DXibIj2jkI7gnby9lGdlByWckqgTE2hKQSEb Lzx4Vgw+SccqTbiKe3KuUU6/MXb0LBWzCmYOJnc+pZUnKTmLffZ36WbzRf9CC4fkH5+X rTfObHh2inM6/nTV1agArnGtfqCzVzuT+KB8DwkLvvVHHibKNMnphzDbMHDV+s8xUVfI VtWTtrWTRMkC0ZVb8ZwDdqCeP+M1kikeiMuyu0hM8lBEndnAB0fPxNHYdZ2wnm+Nl+E9 dT9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771322324; x=1771927124; 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=mKoafgl9k/P7C/ae0FhPI1YFMXXnXfGrilpKysbRFTw=; b=GD1c/gl4mP5hSjB2SMHuQlfh11f2KyvUX9bvaUaJ32CrzrND+X8ICPfV2ZNPZYmx6V Jktm24+8jXbXTpNlyb41cB0CiCM2QsMiReJM0MvO4mv3KHmWC4sYVINP+vhd8MUPj5Od cF4AGqKmhNxg7LI4+3oDm6xlsqzjJGv9xxW911ZQFzwDYI1y/iXylW9VnXtNy7vvWrcX eUnp0gbpSW0W/u7uUcK/eFp+xWwGjEkAwQcSoNv5moGTPCFUNU79FDuCDh0I4x2R7x6n NiTMgNH0JkcXyQu2yT6knaPs6RUspE1dhlLn9HcmCRok+Bi/eO0k1Os47YK4RRlCXNPq SkrQ== X-Gm-Message-State: AOJu0YxnrruaI1DY3R8Rkr9u9ujvsc2vhliRZRY5egklg/JSGnYUjos2 fyfZW6jo5voHiAd54A8QtzBLOC1YOvYr3A4JxiMDxckFsyAElwmcLiU4Bup23UW8SVXZnDd/iwq a1V53 X-Gm-Gg: AZuq6aLsNNdDT6NjldcIkNK0YmuiY0SHnlIk1SEs2wLnRGr16eoc9fCIyxBfFYFUF+/ WXTU1pMPNwmMGF5OeFUAFDAwAzYhNdQ7UF95JH+ayEGELy5OkjfftmdA7kMPCeZMzNEiH5mmE6z Y9qJJrW4be1C+fODETP6NLlBJG00VG0PG3bUsEzKSg2kNdPpXthlMhSVwf/iFKNaaqSZAUx2Fga 5LBnJOKFx6lVahJYBzAbv2cTT0N0Gz5qKamdkc83xPrFeb0wx+B49pWcdXbp1GywRDRpcilC0eb XNaAr+iUe7vQW6CjPl5TBKldVaBlSbSjLPSrw+DwrMX/eX3z7zzZxBhTari7B3A46k+yUeHH+n1 DS9vekgV4bEkqglXjG4LD84irEcjTId9OC1VgfxPXwzop77ecLkiCoeAGGqZBvo/ZeOHKR4Lq1u Tk6+wsU9ubebmv/fscHb3nKbb5lvc2cawF0KE7BngIlQmSwF3NkHzo485ZtkxncPse0/AlNbi+m R5UoNSkzhQcTeDwPsjXFm4XsNPRFIAvr9RugUxOk7SAwPfcJw== X-Received: by 2002:a17:903:22ca:b0:2aa:d7fe:8603 with SMTP id d9443c01a7336-2ad17431b82mr99461555ad.8.1771321874944; Tue, 17 Feb 2026 01:51:14 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Pierrick Bouvier Subject: [PATCH v2 1/7] page-vary: Expose TARGET_PAGE_BITS_MIN definition Date: Tue, 17 Feb 2026 19:51:00 +1000 Message-ID: <20260217095106.598486-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::331; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x331.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771322375726154100 From: Philippe Mathieu-Daud=C3=A9 We'll use TARGET_PAGE_BITS_MIN in page-vary-common.c, so expose it via "exec/page-vary.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson Message-ID: <20260213182713.44924-3-philmd@linaro.org> --- include/exec/page-vary.h | 14 ++++++++++++++ page-vary-target.c | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h index 101c25911c..3c77689ca5 100644 --- a/include/exec/page-vary.h +++ b/include/exec/page-vary.h @@ -20,6 +20,20 @@ #ifndef EXEC_PAGE_VARY_H #define EXEC_PAGE_VARY_H =20 +/* + * For system mode, the minimum comes from the number of bits + * required for maximum alignment (6) and the number of bits + * required for TLB_FLAGS_MASK (3). + * + * For user mode, TARGET_PAGE_BITS_VARY is a hack to allow the target + * page size to match the host page size. Mostly, this reduces the + * ordinary target page size to run on a host with 4KiB pages (i.e. x86). + * There is no true minimum required by the implementation, but keep the + * same minimum as for system mode for sanity. + * See linux-user/mmap.c, mmap_h_lt_g and mmap_h_gt_g. + */ +#define TARGET_PAGE_BITS_MIN 9 + typedef struct { bool decided; int bits; diff --git a/page-vary-target.c b/page-vary-target.c index 49a32b4fe5..ab92da4539 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -23,21 +23,6 @@ #include "exec/page-vary.h" #include "exec/target_page.h" =20 - -/* - * For system mode, the minimum comes from the number of bits - * required for maximum alignment (6) and the number of bits - * required for TLB_FLAGS_MASK (3). - * - * For user mode, TARGET_PAGE_BITS_VARY is a hack to allow the target - * page size to match the host page size. Mostly, this reduces the - * ordinary target page size to run on a host with 4KiB pages (i.e. x86). - * There is no true minimum required by the implementation, but keep the - * same minimum as for system mode for sanity. - * See linux-user/mmap.c, mmap_h_lt_g and mmap_h_gt_g. - */ -#define TARGET_PAGE_BITS_MIN 9 - #ifndef TARGET_PAGE_BITS_VARY QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN); #endif --=20 2.43.0 From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771321944; cv=none; d=zohomail.com; s=zohoarc; b=B1i9UfAOMxN56SZSLiAi/PEpvS2BT1m0TWfVcDaXMuYcEn58szqjKdI0jl+TykCRt2Vn0AZdJWPevcFN73JsQHtozHCSav7DH5HFAih5wbgWXorDhtXx1vlZOC8KSYaPio3CSEHFJBAXDs+xZ8glh6rxVmkDghFhB1NiggkC6mc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771321944; 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=cUYJz053QLtjvsiz/bO4c3UYZbOjR/48eIpI+h985bg=; b=PZLlJ5eHRj+9kpqQxO97H94cwbtWN7IG2D7pHJBI/yEux5AzE5/oDfvxvxsTJCn8B4eixasyQYtl6FGXBc59iTCBZ1ROvrzzNjvzEnC5/U9K3RDvqhrtw8VCQ2PJRNVVlGOyrdLWu3cC0P8AiyDeIQGJPVoJqd8WINbkOwel2AE= 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 1771321944375855.0578689215118; Tue, 17 Feb 2026 01:52:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkV-0002kh-CS; Tue, 17 Feb 2026 04:52:07 -0500 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 1vsHju-0002L2-Ta for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:37 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHjm-00063r-Jc for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:24 -0500 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2aae4816912so28072915ad.2 for ; Tue, 17 Feb 2026 01:51:18 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321877; x=1771926677; 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=cUYJz053QLtjvsiz/bO4c3UYZbOjR/48eIpI+h985bg=; b=KsgyRHQgI//XrzHsmwA8os3MlmElFsLaNEBJBUFtYyyLcaYVXGKEdo2GO4MnZ5Mo5l eHjXSsv4j79Rt1Uk/3we9C3pmyeTexW36NaaNos+myVlEMRQwDQ1rYA22BbxqWS+rEZx gXy22uzxDBlkPlEYyQ21pAmpkL+qkvLgapOIaFcNfa/vkSareQcIaz7J5+CN2UfuinwA JLmlz3jk/Qk1iifQb3dpnxcEDvsRFBmRate+djQ/4g6dpK15i/V0o6t085linfdpRDll MMg8p1tD9kpu5v8qKRRnlqHkcdEU+QSfdmJ9QFFWtq6H7M9ZRHBm17QvYMCbnt7RxGjK qL1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321877; x=1771926677; 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=cUYJz053QLtjvsiz/bO4c3UYZbOjR/48eIpI+h985bg=; b=uTdFAPio5Ognn5AEdwmp0VjXPviKtmSJR9PDpFptGjCXlDckMobwOlSNnkGggwjXuv BkAcPG+2EipmuYWlkhCDMeFh+DrG1oJavTiyeWmkkZqQWD3Svfd1gvJHoXZG7ekrn1Ls i65BKzfe1DljmGoDN/8dXONo6gUVlYJ89Nmb3H/l33jWrwxzLNwX3jDaS8CUcTdNSiVX drqF6UEC4tOe+PWyfy3xndBt03D58pfEGjvWsdYWJiZhLH1JzwzkAn/KWz0BysQPGWlI UjUbt84rw2r++fGabiTBWuxjU7miM+RJdOHhChVNX1LChCmtDbNQFDDh45KYT02iPLnA Ds2g== X-Gm-Message-State: AOJu0YwVrztFnRyyGR5wEOhXwdYq4KZQVuYKtcUyUkUF5xVvspSG2zXJ 5XXxDZnnTIIvYoat634QRTsZvlF5z0+OiH1WWowMoHUvfJBYgs5+O1vwlhm6OclW0/2pk1oZYwD Qm77W5KA= X-Gm-Gg: AZuq6aIplemkpAshEBkSlSwVE0sZRMMDr3MId/etEcBw+jzxxt9qI17bdQdcsWAvnWE p4ih4GEmCME3+ZvcXdDyMS6bPfm3gnLZXnL5PGHrcol2i37bS8fUvs9S+P4PkEWWiLNkYg+tqZN R4f2PQ+DKj4aoMKMjoTffte+ZGyOkflSDdsSIp26maqoWtQjHISaAoSspcTYDbXcZOxer1Ydl1G EnalAgNzA4ZGjaVgHd8MlJXbkxhfCV67I0p57V4tFc1IsUybecxSv06YzXAelRFoSzbDtYtxFoX RhuHIcB7pF9+bWeQJ1rzxSNWrtOLbu0CR1dpca8Uun6SuLI0+VvlHXBzNGWWur3HxZ1N4x/S4Dm 2H4fAAKXq2IFI57FCRdOwWXWfY8crU5aqM4xWIimrRhRIF4vi3NNwCr+qMhVqBw2DCb4161Iml6 8bBIXPKRx4+sr+5JrK+n7uYAzwac74MtWu9SfErUjuTt+wYg13u7ydBvsxiUXzY+0cqZv896bsG 32pq6kLn2IpK8U3I8xuzZwMqHertwUjkY/+Jm8= X-Received: by 2002:a17:902:eb83:b0:2aa:d5ea:4e6e with SMTP id d9443c01a7336-2ad17457785mr90582025ad.13.1771321877268; Tue, 17 Feb 2026 01:51:17 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 2/7] target-info: Add page_bits_{init,vary} Date: Tue, 17 Feb 2026 19:51:01 +1000 Message-ID: <20260217095106.598486-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771321945403158500 Content-Type: text/plain; charset="utf-8" Add two fields that will hold TARGET_PAGE_BITS, TARGET_PAGE_BITS_VARY, TARGET_PAGE_BITS_LEGACY. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/target-info-impl.h | 7 +++++++ configs/targets/aarch64-softmmu.c | 3 +++ configs/targets/arm-softmmu.c | 3 +++ target-info-stub.c | 9 +++++++++ 4 files changed, 22 insertions(+) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index e446585bf5..c917d546ea 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -25,6 +25,13 @@ typedef struct TargetInfo { const char *machine_typename; /* related to TARGET_BIG_ENDIAN definition */ EndianMode endianness; + /* + * runtime equivalent of + * TARGET_PAGE_BITS_VARY ? TARGET_PAGE_BITS_LEGACY : TARGET_PAGE_BITS + */ + unsigned page_bits_init; + /* runtime equivalent of TARGET_PAGE_BITS_VARY definition */ + bool page_bits_vary; } TargetInfo; =20 /** diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c index 4e1e2f64da..82ccb57575 100644 --- a/configs/targets/aarch64-softmmu.c +++ b/configs/targets/aarch64-softmmu.c @@ -10,6 +10,7 @@ #include "qemu/target-info-impl.h" #include "hw/arm/machines-qom.h" #include "target/arm/cpu-qom.h" +#include "target/arm/cpu-param.h" =20 static const TargetInfo target_info_aarch64_system =3D { .target_name =3D "aarch64", @@ -18,6 +19,8 @@ static const TargetInfo target_info_aarch64_system =3D { .cpu_type =3D TYPE_ARM_CPU, .machine_typename =3D TYPE_TARGET_AARCH64_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, + .page_bits_vary =3D true, + .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, }; =20 const TargetInfo *target_info(void) diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c index 9b3fdd2854..18940e51e5 100644 --- a/configs/targets/arm-softmmu.c +++ b/configs/targets/arm-softmmu.c @@ -10,6 +10,7 @@ #include "qemu/target-info-impl.h" #include "hw/arm/machines-qom.h" #include "target/arm/cpu-qom.h" +#include "target/arm/cpu-param.h" =20 static const TargetInfo target_info_arm_system =3D { .target_name =3D "arm", @@ -18,6 +19,8 @@ static const TargetInfo target_info_arm_system =3D { .cpu_type =3D TYPE_ARM_CPU, .machine_typename =3D TYPE_TARGET_ARM_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, + .page_bits_vary =3D true, + .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, }; =20 const TargetInfo *target_info(void) diff --git a/target-info-stub.c b/target-info-stub.c index 65220cc782..896f16e582 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -23,6 +23,15 @@ static const TargetInfo target_info_stub =3D { .cpu_type =3D CPU_RESOLVING_TYPE, .machine_typename =3D TYPE_MACHINE, .endianness =3D TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITT= LE, +#ifdef TARGET_PAGE_BITS_VARY + .page_bits_vary =3D true, +# ifdef TARGET_PAGE_BITS_LEGACY + .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, +# endif +#else + .page_bits_vary =3D false, + .page_bits_init =3D TARGET_PAGE_BITS, +#endif }; =20 const TargetInfo *target_info(void) --=20 2.43.0 From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771322000; cv=none; d=zohomail.com; s=zohoarc; b=dL2qwvoA5qouy118ckxF9xSHc1TcHglIbUkeqbCRTd4rCC35s9UKaChRgoD8FDW2B5XcSctyj0D/hzMKWB+uY43f6NQV0tFaOGGTaLkBvJrdzfGv0xmNJ2yWWVWPBIoWAUKDzpMo0Ax9nZV7y8blq96910owZVkBRLddJibe+0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771322000; 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=KONI0odzEjpnPZwDGvH1YlLeEVQ/Hz1dcJSr9A9Azdc=; b=BOsT0IfC9qBOKLkTftFC3JwWtwfJKML61poyQDkhBqJ3qVr8oXj2bAb0Kr0my76HciJBQQMAw51ee5F/HWfbngVzdbwXo1oLICAw8lBZeEJm0WZpfGclg/m2nG/f1S+2QoxyBLGkOYBM7mpSMf+C6N20k91TSuKQames1wJuyYc= 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 1771321999965969.2182354831381; Tue, 17 Feb 2026 01:53:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkW-0002mW-Cv; Tue, 17 Feb 2026 04:52:08 -0500 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 1vsHkJ-0002Tb-Sb for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:59 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHkF-00065b-IN for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:53 -0500 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2aad1bb5058so41040205ad.0 for ; Tue, 17 Feb 2026 01:51:20 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321879; x=1771926679; 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=KONI0odzEjpnPZwDGvH1YlLeEVQ/Hz1dcJSr9A9Azdc=; b=QXAKPlqxYDX74hIN8KP3z2yb8c7mY+hq6k5XVc89SfgmJdWIPY6/UcToKr6PtcqxWv AVgOnirOOrgl5wBRxDMLdBCst0zyBDAIxLmKFi6RT6YimRenyV4sV8Q3/X165moLXQ0T i49NOgZ6c55oOt9HdgwoWQfUdcx7JWU5nL6esU1LW2qB+/SN/S3PVr7drQetCMWQS8up RuKqqIbc/KJBvlAiDipL43XMALqVDXvLekdLrp/+YmHVFkHQQXGTEK5gdJIEwPzEXpFn CFLidU2vwB6jYL/jUkxKL3DZHPOqzmsUwiUxBNXdYuLizGEEwFDzndU8AbJJkvELO60y /05w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321879; x=1771926679; 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=KONI0odzEjpnPZwDGvH1YlLeEVQ/Hz1dcJSr9A9Azdc=; b=tlcEpn0sE4pkFulJELJPFMzWbxZf7+tVY+Y/7/+kTdFzJrRsOQVOkyrTY3dr/aRGxn gD+UaeFRG8P0z0Kle3ksns6ZG/mAK+SFwTKihInIp1+3aaN5rcHX7TWcjdJcpL2X1GWP /PICeV+YDjLXw2lquad9KCEg4Zv+VcT1XPYK2PG+haIy1wu2LCkVVQLweh/0KyrwuEmz 1QoHsFr3Cmwtdj8QPcI/8PE6cAKW9vq5M6BeIoCOOJv6dPN+q7EF0VZbIaSlwXMZ+c1w 6JQ+sOm6bnrh7SHWLhKRj3SKqz5oXAr1ZzkLPndouZbZHX3ujXzlvxuYdpp+nKrs5GC9 TD7w== X-Gm-Message-State: AOJu0YzZr501EX4GqKCHok8g8Hl4z2fiIU2pMbJIjXNHtrmlpHtzusX3 qlxNeCdEKMNEbaBeHxVaxQBQSPTy6QQ2iYt/XsC6v/wm1dmcyZf/xRHl28kCA+4t7Y0HuoUpfv9 73jO5+ik= X-Gm-Gg: AZuq6aLVu7l2EsctO9tPbqd16C3+MLt00RVvT3YsH3cAMbCPhGfd4r50w+OJf571PyH dsWpWt5AjCFJ9RsdQ/2qYiJWz/PRxuMRF4gbOD2/rV8uAchAedeYEREQJNXFXGkBW1EMUv69mQB JjOL129l2ajgyVuf4N5WP5TSJ8YV7mSB6HECPujdxwGOAz7lmrWtkl0n9KV1cLgmxQYhcYfQYSI uAKjGMAs7IziRgJ423VTxC7h9Rngx0o8jK/IfIk5GsOJV9IXtkTFgql0acxI3PUs8vITrG+K293 3hdRr8BVEDTip42WmsDEKc1UKfagDKFSUY5UzEZHzUk7Ad3BudX/kTRWfHEWl5xfirfwJKDJi+B t2yzdZDxrL9e3DOUCke7UzozFoHJ62L9XfMHKAxvK4xrrCaHUKywTU3ZKLTo+gFF/IY2MfDh90R 4qdAjaFOtJiiy44PbTGItIyc54PIoFJQUy+o+iQLrFPQ/dOOFR0lmaavqgAHSqmj33gG5OLyj9E mAKW4zwU+px/5dQhr4E3JyPEk5Avj+nqnj6QQw= X-Received: by 2002:a17:902:d4ce:b0:2aa:ecec:a442 with SMTP id d9443c01a7336-2ab505b7ccbmr149742125ad.40.1771321879451; Tue, 17 Feb 2026 01:51:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 3/7] target-info: Move TARGET_PAGE_BITS sanity check Date: Tue, 17 Feb 2026 19:51:02 +1000 Message-ID: <20260217095106.598486-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::633; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x633.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771322002643154100 Content-Type: text/plain; charset="utf-8" Move the check from page-vary-target.c to target-info-stub.c, in the process of removing page-vary-target.c entirely. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- page-vary-target.c | 4 ---- target-info-stub.c | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/page-vary-target.c b/page-vary-target.c index ab92da4539..7c0565dd8d 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -23,10 +23,6 @@ #include "exec/page-vary.h" #include "exec/target_page.h" =20 -#ifndef TARGET_PAGE_BITS_VARY -QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN); -#endif - #ifndef CONFIG_USER_ONLY #include "exec/tlb-flags.h" =20 diff --git a/target-info-stub.c b/target-info-stub.c index 896f16e582..f5896a7262 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -11,11 +11,17 @@ #include "qemu/target-info-impl.h" #include "hw/core/boards.h" #include "cpu.h" +#include "exec/page-vary.h" =20 /* Validate correct placement of CPUArchState. */ QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) !=3D 0); QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) !=3D sizeof(CPUState)); =20 +/* Validate target page size, if invariant. */ +#ifndef TARGET_PAGE_BITS_VARY +QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS < TARGET_PAGE_BITS_MIN); +#endif + static const TargetInfo target_info_stub =3D { .target_name =3D TARGET_NAME, .target_arch =3D glue(SYS_EMU_TARGET_, TARGET_ARCH), --=20 2.43.0 From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771321993; cv=none; d=zohomail.com; s=zohoarc; b=FFXYIdgeFYQBeqGBama/x0/fG8UDWFU68ZaQRwA/wXbCv6oR6i9qq+Hz7MV9imBVtnqv+5C0Uo9FjhYmSDa2/juqgIuW8gQ+zh2EEqRmSAboewjwsD2cjZ9Y0Glvy17/ssiQPy6+eK3uzY+lDFOp+LteNsR/21CuASEfTrBvtsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771321993; 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=RA/xW5zJd5cGLeWZe1fjyerEL6z5rrn6x+7ECtoAUpw=; b=XVFEfDHXbSQnUHpSKRnH6fUh3hxohkdv3c0SIMHZzovUeLL3FqwoHUwS27VgljwecRF0hHEbpdtKjU8iL7bhFLOA6Liw13p2phTIP8nyTaoqhbBa7z5tvqVzmm5t8CV+eaOtJmdB7GaEW7FgssKRZT+x0vkDlUT+GDQLyNt9a14= 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 1771321993435564.0752718430058; Tue, 17 Feb 2026 01:53:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkn-00036j-1c; Tue, 17 Feb 2026 04:52:25 -0500 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 1vsHkZ-0002rC-TF for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:52:11 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHkQ-00068N-6E for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:52:11 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2a962230847so33780955ad.3 for ; Tue, 17 Feb 2026 01:51:22 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321882; x=1771926682; 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=RA/xW5zJd5cGLeWZe1fjyerEL6z5rrn6x+7ECtoAUpw=; b=lMn250cDqgLgp8eNhGsLjHr5VhbSHRHkAdZ4V3x5/l10lR5EGUdfeuxssYNDqwYMf5 7a1KwjTPOwZ6MsS4JhExC7xq75YTGJ5egc2r8MgTCIksvE7Wdf/U36vAzdiuwwGnJlwH /95inPHlrSBxhZwi+wKzshr6W3N2lCjV7VujtUe90YGguEtVXTFxFF+ADkLNWSLkskng PR5lcFYZpaEkspfZZFMEXS9JzIjLEWWtvAtUT1d2vp1bm33BqjaL6Z7SnbKlO0S1VpUr d5CgUur+ra8sKK1U5ep11yfy2QA9aK8siRUk15BQ6j8pdQ8EKkadtauGLESv/gaEn3q5 6ZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321882; x=1771926682; 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=RA/xW5zJd5cGLeWZe1fjyerEL6z5rrn6x+7ECtoAUpw=; b=SiS8eHN6GhOXc+1cWTYQgYCNNCHrLVLnvd96O6TrwcVKGtKp8r4z/hwxz/UmsMM0vE BJWtgoUocNIiAk82D19ap9kQbzbo7Y6xyHZ7Wh0YOH6o2CVzNtWbX+6D/nErDdBQ3wvv UAEvQ5W1AkV3MQmvG2aR3ZfXd5efSBzwEC730nhBf1Au0CHeAZkrTlVS3J75ujpT9Q67 tHCovVHuFsjxIbTqKTzJ19p6xervJLYi2e4oS6DY7aD7aNV5fO42p0jWUhNCoC7TwXxv ZuL+I1VDUnwz+44mFMTRDnpYklwJy66GswRPfzN1ZX1VRffQjOCgKVipsByWw0TlgJQS gf7Q== X-Gm-Message-State: AOJu0YzrAQtlXBmXB7D+Ge1U8W735etWhJUcZq7I+b8hddQCW6v9O6Bw l3SGe6ODm6AWXaBwwNhHCGfu1G4GHAb55JLrh4mbK9DWAzQYt9GG9AyG8bVuE9uAyz7gDAkZh/P LIVD3mv0= X-Gm-Gg: AZuq6aLDXNccoahAGn3d5sshpKDB5LqF6O/qkGQYauZ1IKx34aPcdYqF2uRpSmyrfeC U7UOHfSVWJ7gyDWKWfNmgTRCBtg/TXZUr8ZUfZOnMzZwI6MXj2l2uISZsrp2mjP7aSbLS6VLavb I5+C4IlR3kBoM+nxou86zc9nGTnB+q2silr+NBorCWPIy+zacPYKDrql1pkJxz1GBZLlcvtH5we Y6jClJqmfhtEdyV23B1Yn9BYbwOc60hY68sKRg+QXJMXTtWgzIdarOMRO21ijbv12wY0dm6SNUg kTgQD9hdiaV4ZB1G91A0K8pEVHC5JWAdLxp1X9kzYplTheFy7Ux0PvzaXfpVCAl+i/wxjp3AiKW 65NssKJebSDlQvmx0wM5HyhhyY8fmhOfNf3q3xAhLtJkurSk9WsA5SrFfSCIYU2zwbcHZ04F9/f msV1wMxVDKgy3qaiHGLDkD4jPGZnK+MWSd7BVGrVfTu0yyikxhJjHw6W2m874xwiix9fH3EPw5O TQMbqksKpobWivvq7vYB6UnoHOtiQjhbhIJkkMlkLSUcbcsVw== X-Received: by 2002:a17:903:2444:b0:2aa:ec1b:d3c3 with SMTP id d9443c01a7336-2ab505c34bcmr139135335ad.43.1771321881566; Tue, 17 Feb 2026 01:51:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 4/7] page-vary: Build set_preferred_target_page_bits as common code Date: Tue, 17 Feb 2026 19:51:03 +1000 Message-ID: <20260217095106.598486-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771321995715158500 Content-Type: text/plain; charset="utf-8" Use target_info->page_bits_vary to merge set_preferred_target_page_bits_common into set_preferred_target_page_bits in page-vary-common.c. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/page-vary.h | 1 - page-vary-common.c | 29 ++++++++++++++++++----------- page-vary-target.c | 10 ---------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h index 3c77689ca5..c4dc56634b 100644 --- a/include/exec/page-vary.h +++ b/include/exec/page-vary.h @@ -41,7 +41,6 @@ typedef struct { } TargetPageBits; =20 #ifdef IN_PAGE_VARY -bool set_preferred_target_page_bits_common(int bits); void finalize_target_page_bits_common(int min); #endif =20 diff --git a/page-vary-common.c b/page-vary-common.c index ab77672dd4..b41137c644 100644 --- a/page-vary-common.c +++ b/page-vary-common.c @@ -20,25 +20,32 @@ #define IN_PAGE_VARY 1 =20 #include "qemu/osdep.h" +#include "qemu/target-info-impl.h" #include "exec/page-vary.h" =20 /* WARNING: This file must *not* be complied with -flto. */ =20 TargetPageBits target_page; =20 -bool set_preferred_target_page_bits_common(int bits) +bool set_preferred_target_page_bits(int bits) { - /* - * The target page size is the lowest common denominator for all - * the CPUs in the system, so we can only make it smaller, never - * larger. And we can't make it smaller once we've committed to - * a particular size. - */ - if (target_page.bits =3D=3D 0 || target_page.bits > bits) { - if (target_page.decided) { - return false; + const TargetInfo *ti =3D target_info(); + + assert(bits >=3D TARGET_PAGE_BITS_MIN); + if (ti->page_bits_vary) { + + /* + * The target page size is the lowest common denominator for all + * the CPUs in the system, so we can only make it smaller, never + * larger. And we can't make it smaller once we've committed to + * a particular size. + */ + if (target_page.bits =3D=3D 0 || target_page.bits > bits) { + if (target_page.decided) { + return false; + } + target_page.bits =3D bits; } - target_page.bits =3D bits; } return true; } diff --git a/page-vary-target.c b/page-vary-target.c index 7c0565dd8d..d388c5c3d6 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -39,16 +39,6 @@ int migration_legacy_page_bits(void) } #endif =20 -bool set_preferred_target_page_bits(int bits) -{ - assert(bits >=3D TARGET_PAGE_BITS_MIN); -#ifdef TARGET_PAGE_BITS_VARY - return set_preferred_target_page_bits_common(bits); -#else - return true; -#endif -} - void finalize_target_page_bits(void) { #ifndef TARGET_PAGE_BITS_VARY --=20 2.43.0 From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771321935; cv=none; d=zohomail.com; s=zohoarc; b=iRkET0swxsg5gUSpu/rQEU4MSGBI6fLY7HgWA7LU7zNFyx+GRlEPjfkhVzvuPIdd+OMxpBLQf/fCDJFvSQJjGoGdDLbhKegCiIxToBT4jaMPJRlN3Jqg5T8ZlzXdgSVlAAKVEZnHzA+PTDuWdiUA1bOw3s4wpHsaan5flmgMpPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771321935; 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=hNM7XgKmeqgrM8/J+m8bKIPPky9vmnlqRq/BAY1KTRs=; b=MdkPHtWR/wYancOHEwCzWHTz0cMcDqV79wpHHn61nHbNn1y59v7uTcAbT/WQtu4APXmqQeGA7lbEPYTnJVUfQs5Yr/iPwxvD//O9JSalnd5NN9HSCTftGgzjDIGDgL+Kcmv+CcYVy1pmvpoSPUJAnwNSdaTKNNTZ2Xhq+jSwXKU= 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 177132193577868.2393121115141; Tue, 17 Feb 2026 01:52:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkV-0002l8-HN; Tue, 17 Feb 2026 04:52:07 -0500 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 1vsHkN-0002U0-Jv for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:59 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHkF-0006AL-RO for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:56 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2a7a9b8ed69so39554075ad.2 for ; Tue, 17 Feb 2026 01:51:25 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321884; x=1771926684; 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=hNM7XgKmeqgrM8/J+m8bKIPPky9vmnlqRq/BAY1KTRs=; b=kYU7wyxZwI7PZWJFdLWK31ot/T0HmEt5yqZKvn3nZXC6l4Emdd9EGLPSufk9twnfjR hAbXjnODWdbBS+ZFVqa/tkzYRvUbxZTSlvC1LP8iWT9FgNqzPI/UspQUWk4PZNvVRVHQ Oq67/Yhtyut4NmB28taS+b8mwdiaF7uEKP555v234Gx0MK54KQICZzPMinVsX91p5urB GcSiZztKC48izq5gXubSpvzt2Wr7jKlZnQ8daYFA+FwI1WuVAqv/DH/pXwG8GXn1aoSE z3fWGO4IdLG9CLVQAxscia6lUinzVj49wxbUGdwCAvfzmM/1eEOyfpoV41i/SKvIR6Rr XF3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321884; x=1771926684; 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=hNM7XgKmeqgrM8/J+m8bKIPPky9vmnlqRq/BAY1KTRs=; b=fIOkFnjZFXKsv/GPjIv9Q79K/+AFIu2hmfy3lXUjKyKSyIqYsjkfWiU19ModMIb37j s5J2xNWXXDeiLu/H2GAx4wKMnZ6svwmkJ64J9JzNdydErggML6Yzi8pOSrSXv4/UHXmW HNrIt/uSmBU/OcDKAb1+1oftThkiTw1EGNqy7B3QG1+sGGxNX7Uw/QGB1RJvI3/Mt9Lh h9eVGlU92i3alee9vHM9L79OCwHQGvGSftAkEyAf10vmNhc2L/7kqwcpnB5fLFwHyOsq Raj2rzoRsXqEdPKo6D2sVbGrXXFBwS7YrX2lT46d6c2y5elpQdn5UjZ8dCUiVSoF7sm4 YYLQ== X-Gm-Message-State: AOJu0YybqNpvH0qNjNquMEKvo5R8fA2wOoAYnnqCcw8Z/+GuM5Fja0/i hZ2K4dw8KuDpiEJ7a3LCYssvJWYQh++8u50E+GXyUVYTWNb+/fvJeimW9tDV5e5xjWJ2kNjfZ88 MCc5n8n0= X-Gm-Gg: AZuq6aILl3vLY603v9qKU7jFN9/mvNklciI8Le3jCObSGnTBIlOBdCAYOCMWBoWF7CJ j/r2nSTZCB7sBEIXllBBaxdO80VARtJQx05caeWpztVMboh/ILyqjj8nIVohN5Q2dfE0exi6ZuA UIe8eh8T6XSBswzqI1TK8YLURP424Jil2v694WZ/ivpqYjWGxffWb/jgEOU5bnBmcDMwvUYMg3W R5s4gL/0/QY/6UrA734PmMlX1/5VXVQAW0x+XSB5CIEMrg3fPptTp8p/L2XRDwMuPwcqqoZi+1w l6gyxo2jw/BtAF5v/RBQCoImKgB/0dAvQuwPfTDbbXQaFjF6vUtEpZHds6Ls5AR/IeCIJxTwyzO tlzsaGkX30c0S+EFZn9rlREMnX25RpsOFWEAcGaUQ6ApEpTJnnJXxfC57m1avPzqJNN5VsHjdAR xuoNtJeeetz4quMoTnoe572uAAM0irc4DKC/CkUqoU025fwU+j7XR5BOPl1I5xI05CfxuEBayqa 0CLqlyB/JrEQZACXDY6XhSEGLIJzyLqdTcXzo4= X-Received: by 2002:a17:903:3805:b0:2a1:3cd9:a737 with SMTP id d9443c01a7336-2ab50598d8fmr155781675ad.36.1771321883948; Tue, 17 Feb 2026 01:51:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 5/7] page-vary: Build finalize_target_page_bits as common code Date: Tue, 17 Feb 2026 19:51:04 +1000 Message-ID: <20260217095106.598486-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771321937764154100 Content-Type: text/plain; charset="utf-8" Use target_info->page_bits_init to merge finalize_target_page_bits_common into finalize_target_page_bits in page-vary-common.c. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/exec/page-vary.h | 4 ---- page-vary-common.c | 15 +++++++++++---- page-vary-target.c | 12 ------------ 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h index c4dc56634b..f2d735bec2 100644 --- a/include/exec/page-vary.h +++ b/include/exec/page-vary.h @@ -40,10 +40,6 @@ typedef struct { uint64_t mask; } TargetPageBits; =20 -#ifdef IN_PAGE_VARY -void finalize_target_page_bits_common(int min); -#endif - /** * set_preferred_target_page_bits: * @bits: number of bits needed to represent an address within the page diff --git a/page-vary-common.c b/page-vary-common.c index b41137c644..ddd0863378 100644 --- a/page-vary-common.c +++ b/page-vary-common.c @@ -50,11 +50,18 @@ bool set_preferred_target_page_bits(int bits) return true; } =20 -void finalize_target_page_bits_common(int min) +void finalize_target_page_bits(void) { - if (target_page.bits =3D=3D 0) { - target_page.bits =3D min; + int bits =3D target_page.bits; + + if (bits =3D=3D 0) { + const TargetInfo *ti =3D target_info(); + + bits =3D ti->page_bits_init; + assert(bits !=3D 0); + target_page.bits =3D bits; } - target_page.mask =3D -1ull << target_page.bits; + + target_page.mask =3D -1ull << bits; target_page.decided =3D true; } diff --git a/page-vary-target.c b/page-vary-target.c index d388c5c3d6..bc4d8931b6 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -38,15 +38,3 @@ int migration_legacy_page_bits(void) #endif } #endif - -void finalize_target_page_bits(void) -{ -#ifndef TARGET_PAGE_BITS_VARY - finalize_target_page_bits_common(TARGET_PAGE_BITS); -#elif defined(CONFIG_USER_ONLY) - assert(target_page.bits !=3D 0); - finalize_target_page_bits_common(target_page.bits); -#else - finalize_target_page_bits_common(TARGET_PAGE_BITS_LEGACY); -#endif -} --=20 2.43.0 From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771321937; cv=none; d=zohomail.com; s=zohoarc; b=OLi44NYmHaI8/oiMD9JUyLg36tBshKr4Ft5lcD1QEP8qKJRP94BVzJae7JJScDqSbTyU5QBgbwglcvfwROqSAMX4C8jTcKkDfH3n6udgLUeyRcN4FpWPfpna3FIKPPmDyscuB+xdCzJnpuEnm9Ul7XiG68kJyLXl4yxbUB9MZ9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771321937; 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=lH0dnvNM5971XYrImykDmi/zsT4QBP8YuEiiUlIsVhQ=; b=nNtNHQoTWxrTamBgiOaLAd28kzXSMJmfk/ABb8ANrotIVcDheN8u5HciOryoX3AU3i6Tr3uxcpuqev7vH3cLWJK5/UC8OBHaH1lZnPPzwpdyFUF5MFBDM/ozNXfE9SicGpJwFRbdqB1Wgv05xLoXZtYLleO7yvFeCiNlBI9LPCg= 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 1771321937202567.677379984885; Tue, 17 Feb 2026 01:52:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkS-0002f2-LT; Tue, 17 Feb 2026 04:52:04 -0500 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 1vsHk8-0002Ov-5F for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:47 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHk3-0006B2-Qr for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:51:43 -0500 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-c6e191c4b8fso1354505a12.0 for ; Tue, 17 Feb 2026 01:51:27 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321886; x=1771926686; 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=lH0dnvNM5971XYrImykDmi/zsT4QBP8YuEiiUlIsVhQ=; b=Ram+1Hl7of07iGuREUc+nsukug8UaCFxUDAYso7vG+W+1O7pOdCW+D3RO2bwnzFs8m b3lZKaOoHP19TABQx8pCtyL77lFdxn0cjSFgsouczDAWr8P/P6mqNM9a3vsbn0XMsnPV xv+D+WuQbfTJgMOEgBwdDpB/fD4MVSiuNoctwJqmOuSqKfXirFLz7xISaR8Heb3iEoLS 81KrUb3E0oVjna8g6gtgFm/w3jOpy8cxtEtkXKYCYxsn5E/IhMlvHs2ygEp5VgXoFSiU bgNiA+3JUVpmoRc9/HRXWOWlkEjs9m3Ra15Nro4oS5mgbMWubbpKMB9qxr/4mh2/oP6M MXCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321886; x=1771926686; 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=lH0dnvNM5971XYrImykDmi/zsT4QBP8YuEiiUlIsVhQ=; b=LEWgh/3/b2a9KMHwKihiJbDytcx6/ErTAc3ROQximnTPTT0chLq5qDAiuYRxwC+Hll 4335vPGK0NQDDxwKxn3u8LjuIcfPqW9lNZtY53qxjE7Wt+GQbu0xR0tMzoOHoKPze5ig SjIsMV/psSbLDZiPM2+MqEh1jn/12eHYu9DzlIelBU2x+xyLIf3lKM+kjrSJghCw9C2C EzQp3QkHKzp0Cunyn8WBgaNpgxpdwJ3N8EQIdYkKErbbYecqNHnRxj3OrdtXn16VpGQ7 ddMWZ52N7+ZZ7RSnsGGR8BSqmdvGf52q3Xg8CuV2LGei36Jtkt6EO+eJOxjlWe5Iaqiq saxQ== X-Gm-Message-State: AOJu0YzL8VnkuW70zrExnJ/Xd2/BmVtLPutOkcqG8x+hd7Ti08m1B4qG egvo3c02MO/nohnWJBf5f6lPZzn4TFX/PeaktrjiQOxg4C+zaLQg0SKrGHtqkP4M6yHxRM2qF2t E/rPg1kw= X-Gm-Gg: AZuq6aIcBMZWLgg0q7JVtV++3Q5MXB0pgqGocMUJwK0s2KqfE5xIaYB0bOPx/eYXtjQ bHuBrjqL2nhUNUfRLCWRfI5kNU0lUbkZ1WniNJE9cfmUDHZr7ybKnyrRWcb0nOWqu5hByw/sWZU P1qCUYWLn+xZ5jWFb4QjmE4CqW7d59Bg3fc9/+BKK8gqIvMckicI00ZC1YhXkZ08N5wmvaKG5U6 ybZn4km2rTwko6JJi0N7XYn1cgnTK/IEjUvPOgzVeUuGR+fNhnda3ivTuBppeb3I0Gv5gMMD0ti lI3xXdc06U5vBb1vFYn834XNt/ZOvNzFcatyuyLNSicn65e2FWnSvFZAIfKc064zHZVyFlbepqX HB0D7IBGnPT6xc1AM1PDPqlkd5srIJ6X6dPsEzt0o3jiYfJDwn80cGldGQrDXi+7fJ39wSI5wjv ZjaTVX+Chjn8kIEhJLuJirbtLFVaw5R1Q3tqYKaqKjJ6xfqMkx/rnjs12yJiMBOarbIbz9nu11c FN0tcbC0D+1M+CkCMFzTzbu9qsVUDfi44Jbqbw= X-Received: by 2002:a17:903:2a90:b0:2a8:ff32:5f96 with SMTP id d9443c01a7336-2ad17430becmr94246895ad.13.1771321886297; Tue, 17 Feb 2026 01:51:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 6/7] page-vary: Build migration_legacy_page_bits as common code Date: Tue, 17 Feb 2026 19:51:05 +1000 Message-ID: <20260217095106.598486-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771321939311158500 Content-Type: text/plain; charset="utf-8" Use target_info->page_bits_init to implement migration_legacy_page_bits. Because this is the last function within the file, rename page-vary-target.c to page-vary-system.c and build once for system mode. Signed-off-by: Richard Henderson --- page-vary-target.c =3D> page-vary-system.c | 19 ++++++------------- meson.build | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) rename page-vary-target.c =3D> page-vary-system.c (74%) diff --git a/page-vary-target.c b/page-vary-system.c similarity index 74% rename from page-vary-target.c rename to page-vary-system.c index bc4d8931b6..6c49c10e23 100644 --- a/page-vary-target.c +++ b/page-vary-system.c @@ -1,5 +1,5 @@ /* - * Variable page size handling -- target specific part. + * Variable page size handling -- system specific part. * * Copyright (c) 2003 Fabrice Bellard * @@ -17,24 +17,17 @@ * License along with this library; if not, see . */ =20 -#define IN_PAGE_VARY 1 - #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/target_page.h" - -#ifndef CONFIG_USER_ONLY #include "exec/tlb-flags.h" +#include "qemu/target-info-impl.h" =20 QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & ((1u < TARGET_PAGE_BITS_MIN) - 1)); =20 int migration_legacy_page_bits(void) { -#ifdef TARGET_PAGE_BITS_VARY - QEMU_BUILD_BUG_ON(TARGET_PAGE_BITS_LEGACY < TARGET_PAGE_BITS_MIN); - return TARGET_PAGE_BITS_LEGACY; -#else - return TARGET_PAGE_BITS; -#endif + const TargetInfo *ti =3D target_info(); + + assert(ti->page_bits_init >=3D TARGET_PAGE_BITS_MIN); + return ti->page_bits_init; } -#endif diff --git a/meson.build b/meson.build index 4af32c3e1f..1dc10f144b 100644 --- a/meson.build +++ b/meson.build @@ -3835,7 +3835,7 @@ if get_option('b_lto') pagevary =3D declare_dependency(link_with: pagevary) endif common_ss.add(pagevary) -specific_ss.add(files('page-vary-target.c')) +system_ss.add(files('page-vary-system.c')) =20 common_ss.add(files('target-info.c')) system_ss.add(files('target-info-qom.c')) --=20 2.43.0 From nobody Sun Apr 12 04:24:19 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771321967; cv=none; d=zohomail.com; s=zohoarc; b=jYKAvfLzsMJy2EVWKm6lu97uwvwgLRG0nBtaFlHJZKHWtJsULXRjHHEMwvroQ8mRHhX0IxR/Af/xtwQBc/kkfHIgLShPk5/4Ic0vofjyd4Mozi4bvnudWa29Nf9qaUZS2jmAfVCYwDKlaOijAiOJIl242JaJKFM0YFf7PCcoShQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771321967; 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=MqKGZs0n4DofZPkoSFoT/fTZEG3Fs+4rNgilmKZe4Ic=; b=BZyxpTsMXDxuxBksxody26PkQAjDJ6ZHBsLRkN+gCFUWii8TQBIoLTtTciH7g6ryMvpAknyV5N0V5k4kmnrEYAOdFmgqE+4Cx3TBdozd8NGmCQN7CgQMlXNGcAgr/34pMM9BYwegWxR7bBQxoBi0kRFdha1WaecAo4hYXuzJoLY= 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 1771321967297434.4173344005736; Tue, 17 Feb 2026 01:52:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vsHkd-0002sk-41; Tue, 17 Feb 2026 04:52:15 -0500 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 1vsHkR-0002au-1Y for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:52:03 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vsHkO-0006Bg-B8 for qemu-devel@nongnu.org; Tue, 17 Feb 2026 04:52:02 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2a962230847so33781885ad.3 for ; Tue, 17 Feb 2026 01:51:29 -0800 (PST) Received: from localhost.localdomain (2403-580b-742d-0-10a2-dce1-aa4a-dd32.ip6.aussiebb.net. [2403:580b:742d:0:10a2:dce1:aa4a:dd32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa33esm99108675ad.13.2026.02.17.01.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Feb 2026 01:51:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771321889; x=1771926689; 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=MqKGZs0n4DofZPkoSFoT/fTZEG3Fs+4rNgilmKZe4Ic=; b=Fko+t9JjwwcBIfCOSpOnIracX+dE2cjLKC3kUzZFQAZT36rbZrQExvdQgXnap8p9ea TyiAixdjAzM0Nt9h+MWR26ShnwYH63P5WwEzO302MrCm5+5kwQy2mSTaHtQ1Wp449iaE d7hx+74vNxwnDokY1Uox5r0AXjP8xhOTv+DeHDDMWLG8PaFQKq5ZUusZR5A++8cFC4uY JYzMAr2FSrD77WrvfmXcT24s06O4ttU6y2HkvfOtkWH+863WqVmCmheDXuIbjus6rJmS 5l0p3q0KkdKVcQWgHqC9l6I0UHsDE9VqXRa24yYSzTDVfEZI6/8K/c8fz+OGN9JP3nLf aBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771321889; x=1771926689; 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=MqKGZs0n4DofZPkoSFoT/fTZEG3Fs+4rNgilmKZe4Ic=; b=S3Cwv3dt7RHtZc92igYNi9iwX46JWxsDYw/Tu4CuQxP00dBSD0/dFIit/Dc2p74jEw lnTpxzjubt0Lr7ktc4LSLZmSopnpfFe8CNDrOzLGlDlDNhkkdFzuJ4MUwJxR1rarDSUM J1S8EHdfddLLQkxIb+U4pv/CuwugMvltVQ4JBfoZ1hDnca8adkiS9w2rl5pnmaWW/c/s lSPWFZbJzb3x0FOYITdy9RuV0giR8nqZxF033VF2o7F5Tv4HVzvpu+ZXc4nEvnrNbBTp 7Hmg5rfMiNNY+tTCgYhZOwRasaCKC6OBxa7uPjzwKSMeH/D8gSmf7VdZq2M9G0j+15tI EewA== X-Gm-Message-State: AOJu0YykyyoVwgiBvJTNXlONhTG4JdgTr4YhL3DKn0k2R7YLfAd16nE9 B1NXB2opeZKLSGUuZLGYV7pRCgW1k8xPL4Vfo+PsSQ18P2sGhMuCZEi36P8Y1PUJvOBJpf0xYCH TGzv27kA= X-Gm-Gg: AZuq6aLHc4Sq9acEswjIu+F36c2R2s0QgDkqWmvhBSHvlsdqOCpVmL6YUtD0midWmVl 8/SvtzrQ5N3WltohtrsT6TO183bsgo+M1XoaoU/Zw0z9ReQUWiJPN0zUapv1l+JXuJ14iY88AhX njJZrwE5q5oPo43wknXUcK4utmnyarZieHO7kPxJ355dNES0KvPCKYwHww3mRH4Tp7nTMf9TZa+ wbwL+wNrZHXD0DWXmUQiHq+qM56wzPZHQZremUdsM/wwpqEV1QWQ39qMHgumgRIOxmNmPpC9tae 1kv8C7ZxRXen5WSt5AM7FC8qOU6OQWh18flr+TbpXIOYUJkuEhmIBQf46XeUkFSPREpW5V5qQ68 X9IPyQM73oe579cvD+JCZve2pWRkdgXk/iQjfx4hABaBho8cqU1iXTJSPv4unudsMlmZ4gJxGby lr3JKdEqdxgbwitotoKLXVXDDDbqg7pcRsNk4XT8fm7+TJ7yJbcSw8POPSfPqxox6yOG6JDsg+X GWgjjYuOWDeH3ctd/2TsrGqezMJaqHihwcEVCnMd4m01thjGw== X-Received: by 2002:a17:903:1a44:b0:2a9:5e25:4708 with SMTP id d9443c01a7336-2ab504e89fbmr139591365ad.3.1771321888706; Tue, 17 Feb 2026 01:51:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 7/7] target-info: Eliminate TARGET_PAGE_BITS_LEGACY Date: Tue, 17 Feb 2026 19:51:06 +1000 Message-ID: <20260217095106.598486-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260217095106.598486-1-richard.henderson@linaro.org> References: <20260217095106.598486-1-richard.henderson@linaro.org> 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::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 @linaro.org) X-ZM-MESSAGEID: 1771321970292154100 Content-Type: text/plain; charset="utf-8" Expand TARGET_PAGE_BITS_LEGACY directly within the two Arm TargetInfo structures; remove it from target/arm/cpu-param.h. Do not allow new uses with target-info-stub.c. Signed-off-by: Richard Henderson --- include/qemu/target-info-impl.h | 2 +- target/arm/cpu-param.h | 1 - configs/targets/aarch64-softmmu.c | 3 +-- configs/targets/arm-softmmu.c | 3 +-- target-info-stub.c | 12 ++++++------ 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-imp= l.h index c917d546ea..a7c519cd0b 100644 --- a/include/qemu/target-info-impl.h +++ b/include/qemu/target-info-impl.h @@ -27,7 +27,7 @@ typedef struct TargetInfo { EndianMode endianness; /* * runtime equivalent of - * TARGET_PAGE_BITS_VARY ? TARGET_PAGE_BITS_LEGACY : TARGET_PAGE_BITS + * TARGET_PAGE_BITS_VARY ? minimum for the target : TARGET_PAGE_BITS */ unsigned page_bits_init; /* runtime equivalent of TARGET_PAGE_BITS_VARY definition */ diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h index 8b46c7c570..07af31aa3e 100644 --- a/target/arm/cpu-param.h +++ b/target/arm/cpu-param.h @@ -29,7 +29,6 @@ * have to support 1K tiny pages. */ # define TARGET_PAGE_BITS_VARY -# define TARGET_PAGE_BITS_LEGACY 10 #endif /* !CONFIG_USER_ONLY */ =20 /* diff --git a/configs/targets/aarch64-softmmu.c b/configs/targets/aarch64-so= ftmmu.c index 82ccb57575..561af56e1a 100644 --- a/configs/targets/aarch64-softmmu.c +++ b/configs/targets/aarch64-softmmu.c @@ -10,7 +10,6 @@ #include "qemu/target-info-impl.h" #include "hw/arm/machines-qom.h" #include "target/arm/cpu-qom.h" -#include "target/arm/cpu-param.h" =20 static const TargetInfo target_info_aarch64_system =3D { .target_name =3D "aarch64", @@ -20,7 +19,7 @@ static const TargetInfo target_info_aarch64_system =3D { .machine_typename =3D TYPE_TARGET_AARCH64_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_vary =3D true, - .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, + .page_bits_init =3D 10, }; =20 const TargetInfo *target_info(void) diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c index 18940e51e5..488217c7a0 100644 --- a/configs/targets/arm-softmmu.c +++ b/configs/targets/arm-softmmu.c @@ -10,7 +10,6 @@ #include "qemu/target-info-impl.h" #include "hw/arm/machines-qom.h" #include "target/arm/cpu-qom.h" -#include "target/arm/cpu-param.h" =20 static const TargetInfo target_info_arm_system =3D { .target_name =3D "arm", @@ -20,7 +19,7 @@ static const TargetInfo target_info_arm_system =3D { .machine_typename =3D TYPE_TARGET_ARM_MACHINE, .endianness =3D ENDIAN_MODE_LITTLE, .page_bits_vary =3D true, - .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, + .page_bits_init =3D 10, }; =20 const TargetInfo *target_info(void) diff --git a/target-info-stub.c b/target-info-stub.c index f5896a7262..d948ebef5f 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -29,14 +29,14 @@ static const TargetInfo target_info_stub =3D { .cpu_type =3D CPU_RESOLVING_TYPE, .machine_typename =3D TYPE_MACHINE, .endianness =3D TARGET_BIG_ENDIAN ? ENDIAN_MODE_BIG : ENDIAN_MODE_LITT= LE, -#ifdef TARGET_PAGE_BITS_VARY - .page_bits_vary =3D true, -# ifdef TARGET_PAGE_BITS_LEGACY - .page_bits_init =3D TARGET_PAGE_BITS_LEGACY, -# endif -#else +#ifndef TARGET_PAGE_BITS_VARY .page_bits_vary =3D false, .page_bits_init =3D TARGET_PAGE_BITS, +#elif defined(CONFIG_USER_ONLY) + .page_bits_vary =3D true, + /* page_bits_init is unused; page size always set by main */ +#else +# error "page_bits_init must be set in configs/target" #endif }; =20 --=20 2.43.0