From patchwork Fri Mar 28 17:55:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 876724 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp683116wrs; Fri, 28 Mar 2025 10:56:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUna422oVjYZTAwB+jhEfOtcKZPsm1VERhwKhIKfRHI4ZJIHMzwVxDDQd+d+jBk2vTKcACacg==@linaro.org X-Google-Smtp-Source: AGHT+IGBpxN/hxKXr5K1mh2t2m0RPI/rwpiloy6osw7nRJ1fmHV1GPdZWK5YKoHNsH0YRfv/rzI5 X-Received: by 2002:a05:6214:1253:b0:6e0:f451:2e22 with SMTP id 6a1803df08f44-6ed23937727mr134466696d6.38.1743184564203; Fri, 28 Mar 2025 10:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743184564; cv=none; d=google.com; s=arc-20240605; b=EO72BhGJ3o6rAJBNvJNFvvSVPvyrQg3hsmXTQsClMl+vouJRraZM6dqL0LSVJTBofR RKesBf7D7RdcPrpxqX52+EnyU9uc332UV0WQWO2FLNKFBv4+gKhxy1kxWgfZSUlNTTYO 3e7lBvlmLOAhp3qF1ksiqyeat9Blxv79Rr2d0eXpdqhL8V8ZLY2yuKL/Rie78BexIKy9 /koImC95PY+zZxaAiOxSyJKRJmYko/tPhyGQ8XTWQEFbSHScjXn61Uk9QXYXwCpVAxj+ yqKp+QXrZgJsxZc6JPHrhkrSrhCDAoO3BZFcdryA86rxqXTJOPaFt2uF4cAK3hqUtOPT UybA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EybSmwG1+RXjmkQtMMdAGfPYVQXdDRNwqAPKK7xa2Q8=; fh=6hT5kbgE5j6opKUmP+Y/D3HLN5CckHpiLintkPGDdfE=; b=h7Rt0x8MzPczu73S2ir1YE6b3RWnEqnnt6DwhUkoOCLQtis/NGIl/v4dFnOhu9HoF0 lXp3kZopwefJxNLY2fYZEApAjSOGEatf/PlYKIVguFUhSr8F2wmxyFJ/+USh9xScKF7T upRS4nC1DVPcyzcjfBQCD6sYg1HmZOiPLPChykFLCvlXZEqg1Ir/kkc4obR6p1b1KXiD 8b6eFUe/rJa8CRRHsHH4pJDMvxzJmscW0qhxhxL4KTEcsfBoDLSRb8VQQ5tX12kJLTm5 7p+eBsWpnsUmmIIXO5xKaDMJEe1pqsmVT2qFT3MWC+NTI4Q28IZWpJeEfJgsqH0o8V0/ gukg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EmVlhyg8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eec97d1eebsi21757916d6.442.2025.03.28.10.56.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Mar 2025 10:56:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EmVlhyg8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tyDvb-0007J0-Pu; Fri, 28 Mar 2025 13:55:35 -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 1tyDva-0007Ia-6W for qemu-devel@nongnu.org; Fri, 28 Mar 2025 13:55:34 -0400 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tyDvX-0003KG-QA for qemu-devel@nongnu.org; Fri, 28 Mar 2025 13:55:33 -0400 Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-3fbaa18b810so660321b6e.2 for ; Fri, 28 Mar 2025 10:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743184530; x=1743789330; 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=EybSmwG1+RXjmkQtMMdAGfPYVQXdDRNwqAPKK7xa2Q8=; b=EmVlhyg8wA4bt9naE9DnU9LFT8UJTnzytSV9/4MPnEogCrvANdw5NIZbBwYvwk/Y9Y AhTa1KJ0nD18bj3EV098tsjz5auOreaO0iMxpGmp0NP/1GCZYjALc1DOjHMQejc/Nh9U 1OYMfuWeVvASJtWX31ZZGloHAprMEvwdSSMkz6ty7wRQg0FBHstuDx2gwiEVACpvKJQx pXC2w3ZjERf+j71B9MBAsnz6AQIIx9VO6HZa6LqprVgIERbY0FTdQFAAy6SU1xUi/OVA +yG5+GRdzRA/P9SzZebMHoHXRp2FXOyb1Vl4vrQig0bezbI3OOBoTie86Zu+rZGCMnwp hkHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743184530; x=1743789330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EybSmwG1+RXjmkQtMMdAGfPYVQXdDRNwqAPKK7xa2Q8=; b=P0lf1WYKCZF1ngQv4gmJvyrwEbgJxcr7y9cEObfclpTwOIKICGf5OtNWD3ltV5jVyF pMDkvbIywENG+rRyIIr5WnB4kNsh/6JjO6ctEdaRX0J1iKhwba7i+TqMYvsGeoMIhSeO KypcTAXhn2P/9nKcl3kjBeBLEmuT+WK7r3rnshT7QoviYtztzVz1JM6pGm0je3nNlTbh gra5g9imEBEipzPu7zI7k8UdXRLe2G3Q5IP0Nbr6AU423ZeeYzjyLt9UqSWm/Bn2FO6V UjWy73w3gdlSXQQ3K9LYenWYPcMnyiT3E1KOd1U+uAZVyLl2QqIQPC5jIPUgTenIAEmH gCEQ== X-Gm-Message-State: AOJu0Yw7GLV7+SRFa0iTsyCOYmS3CAG/WQ4wFvBAGlqlUNkhkdmhCoPI BUDNuwEBYDxBSUaYhGrO5j2TCDdXL1Q+FrWskabCYVlFLXmkawvSfAuNJ4o5gWgpV4BFZZyhffY j X-Gm-Gg: ASbGncsbkbu+bJ4B+xrSTfQEP+v1hT40KkFz+gsEMrzpDIYt4BNGIsoSo2n1G7D+QN/ BW499zpV3/arrMWM9+gV0QdLSy0lEqbQsNN9GPbss+YMo7nU8jiI5yntciTp0p2UWQI0gyvFp3s G+98ZS5GKhfzkT11YJeQ7xuR6+jkgkzJg6paust2rtEnlZ4oXA1CE7PtS7fMSjYnSbK1XWxpJSd b1307FhHPYAnEZFLM3ODCVbUCTp4VvvOKM0BLbEDw4MQFGDaT9LU/t4C7Jfop/q6O5iQjfcX6T0 9SJ3DxEeClehN+saLLl1rYN5ZOgzzVsmnjFKtigjuHwVnrFVchJFpG1TF7QLQg5rGH9ilMdRaRL jAjDq4oZxY28= X-Received: by 2002:a05:6808:120a:b0:3f8:3eeb:1192 with SMTP id 5614622812f47-3ff0f60ffd6mr111322b6e.27.1743184530162; Fri, 28 Mar 2025 10:55:30 -0700 (PDT) Received: from stoup.. (syn-071-042-197-003.biz.spectrum.com. [71.42.197.3]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3ff0529511esm410338b6e.46.2025.03.28.10.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 10:55:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, chenhuacai@kernel.org, jiaxun.yang@flygoat.com, arikalo@gmail.com Subject: [PATCH 1/3] target/mips: Revert TARGET_PAGE_BITS_VARY Date: Fri, 28 Mar 2025 12:55:24 -0500 Message-ID: <20250328175526.368121-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250328175526.368121-1-richard.henderson@linaro.org> References: <20250328175526.368121-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x232.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Revert ee3863b9d41 and a08d60bc6c2b. The logic behind changing the system page size because of what the Loongson kernel "prefers" is flawed. In the Loongson-2E manual, section 5.5, it is clear that the cpu supports a 4k page size (along with many others). Therefore we must continue to support a 4k page size. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/mips/cpu-param.h | 5 ----- hw/mips/fuloong2e.c | 1 - hw/mips/loongson3_virt.c | 1 - target/mips/tcg/system/cp0_helper.c | 7 +------ target/mips/tcg/system/tlb_helper.c | 2 +- 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h index 11b3ac0ac6..8fcb1b4f5f 100644 --- a/target/mips/cpu-param.h +++ b/target/mips/cpu-param.h @@ -18,12 +18,7 @@ # define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif #endif -#ifdef CONFIG_USER_ONLY #define TARGET_PAGE_BITS 12 -#else -#define TARGET_PAGE_BITS_VARY -#define TARGET_PAGE_BITS_MIN 12 -#endif #define TCG_GUEST_DEFAULT_MO (0) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 646044e274..2a8507b8b0 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -334,7 +334,6 @@ static void mips_fuloong2e_machine_init(MachineClass *mc) mc->default_cpu_type = MIPS_CPU_TYPE_NAME("Loongson-2E"); mc->default_ram_size = 256 * MiB; mc->default_ram_id = "fuloong2e.ram"; - mc->minimum_page_bits = 14; machine_add_audiodev_property(mc); } diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index db1cc51314..1da20dccec 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -677,7 +677,6 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = LOONGSON_MAX_VCPUS; mc->default_ram_id = "loongson3.highram"; mc->default_ram_size = 1600 * MiB; - mc->minimum_page_bits = 14; mc->default_nic = "virtio-net-pci"; } diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/cp0_helper.c index 01a07a169f..8c2114c58a 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -877,18 +877,13 @@ void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask) if ((mask >> maskbits) != 0) { goto invalid; } - /* We don't support VTLB entry smaller than target page */ - if ((maskbits + TARGET_PAGE_BITS_MIN) < TARGET_PAGE_BITS) { - goto invalid; - } env->CP0_PageMask = mask << CP0PM_MASK; return; invalid: /* When invalid, set to default target page size. */ - mask = (~TARGET_PAGE_MASK >> TARGET_PAGE_BITS_MIN); - env->CP0_PageMask = mask << CP0PM_MASK; + env->CP0_PageMask = 0; } void helper_mtc0_pagemask(CPUMIPSState *env, target_ulong arg1) diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/tlb_helper.c index ca4d6b27bc..123639fa18 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -875,7 +875,7 @@ refill: break; } } - pw_pagemask = m >> TARGET_PAGE_BITS_MIN; + pw_pagemask = m >> TARGET_PAGE_BITS; update_pagemask(env, pw_pagemask << CP0PM_MASK, &pw_pagemask); pw_entryhi = (address & ~0x1fff) | (env->CP0_EntryHi & 0xFF); { From patchwork Fri Mar 28 17:55:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 876727 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp683442wrs; Fri, 28 Mar 2025 10:56:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4k41TE/zvV8zgh6VWkJSrEy+ELaagNXyUxOwobozLc+FPAHbt1zmgP/zBUWGvZ3lLdnu2Fw==@linaro.org X-Google-Smtp-Source: AGHT+IH+tN6KR62vce5oyHBmjl1/UprsoTf5iveSx5HO13iEvd1pEyGDMJC7Sn7HfgGLprLMtOKS X-Received: by 2002:a05:620a:4048:b0:7c5:592c:c27 with SMTP id af79cd13be357-7c5ed9fd846mr1386551585a.21.1743184611671; Fri, 28 Mar 2025 10:56:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743184611; cv=none; d=google.com; s=arc-20240605; b=IDfUmz915fRH0yuzQmFHjYPPSCvGjEuYeg45r0DcbdCR79mLA6DY/cJP37hPcRqraG hOJGdauL1ZNdwN7JiLG2jf5tHsBhzc9/UnrEo13tqeWWwa90GSlNYSopGe+V6fSJx9Iz nVqDKuXiEQjY5aINIgD+c9vJucBDIlPg0mwPGtMGIlawgdi203TfNwydEa9icG7+y4/a I6l8hWVF9jcTum/wN5NT/ordyQ61ij2w7WqhQJI+ah7adXf/LLi+UVx/4L1d4se395jF Vvd8hj/lpzNJb5gkFTk8h6VvR+89XnWiLdFd4+m7Wyyc+PkpTDAi5Lt8rOuGyUqVk4AN JcDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iYwdx/b2OGQgAVCciSrxPH8SiijoimtZp2y9rlzhyo8=; fh=6hT5kbgE5j6opKUmP+Y/D3HLN5CckHpiLintkPGDdfE=; b=JCka6zngwva4fh2KgkcDtdjPPN6XgAue6071jQZmqJo7O2hTVYlpUaIjwN9VB6S2Yf FS9Gri3msAcxVHjF8HZbHRafsZ2JzrJkSLKypJOzXa+TUBKK85CiGfe43P8THZa6HHmT KQ2trC3vwFbd1SysDcUHQ7nD5dmEiuytgwghGY0kCC5gFsxVksACsBB6E8H4ItlWiC4/ PucaUaWbMW241+8DDnQlCubjL5MZla7Ke/xQw8v7OgtYYZE7zLOygxoV+L1kJSKIsZOT rpFVknstfpQENLWZCSf7w2hdkxeerewgDgbSyfUIG518qyv3ycUaOJsUNSvicQmq2DbS K09w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vmQ4eMKt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47782a58557si19652431cf.186.2025.03.28.10.56.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Mar 2025 10:56:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vmQ4eMKt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tyDvd-0007JW-10; Fri, 28 Mar 2025 13:55:37 -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 1tyDvb-0007Iy-7G for qemu-devel@nongnu.org; Fri, 28 Mar 2025 13:55:35 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tyDvZ-0003KN-54 for qemu-devel@nongnu.org; Fri, 28 Mar 2025 13:55:34 -0400 Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3fbc00143d6so1468360b6e.3 for ; Fri, 28 Mar 2025 10:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743184531; x=1743789331; 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=iYwdx/b2OGQgAVCciSrxPH8SiijoimtZp2y9rlzhyo8=; b=vmQ4eMKtEM4u75dDbuFzuOJrBV/v2cjp46m04HoiMiTiaAMeXynFX/pBU5+hlJqyqp HdvyvTkny0kVCFwiMrtxPC5SrZ7Rj97LnT17EGsu8pj4dqIrReD2pj42BaNyZrxmpndO a2Zh3emuG9ODuaBE00o93cJI3pzP+2PFWzMtVo/mvgKqmg/0hmsdvofEuGDXqBN4PLLp aVkVdjZwRBhykEuNsvCNr8nRNpD6LsVSxbgpfG5/YlGBDhVtGoCPR/g058VVf/RDC+jz +9G1f5gMVDpoS3Fco3mkgJgrGmL+HrilWfybO3b9p0LHOVRDam3BbNN54/O4aSjeoLdQ 2Q7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743184532; x=1743789332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iYwdx/b2OGQgAVCciSrxPH8SiijoimtZp2y9rlzhyo8=; b=U5weJQFZPuzr3ehavC3z7tbXMI31NRLfErq3b9OFQZT0Pv/o6BqHY8qmCzpf/sz6Ks TVKAvvV/5uKkhBuu9wbiHZnd2XsVPMes+Jmjf8IKVc9rlWjuC6oaAxYD0zSaYCTHlz+9 Iru/OWisB1tpmFoE7FIGvNL4xJS2hnGCvhtpPdo/Lw74V9eVOGojFBXdK4XYGVRZLmeG 2DE80MyW9mg3DXmYg8Hl5a04plKs8ZfWLNQcI2GBlOm9v/uYhTNkinLkFWQgi7ndhmPE vpIV8QGeMXOFkYm/lu+L1OXCCRxrSp7uNI5+3QWXjfpRGHuYopEnM6J2InEpQeR0DF2R Qgrw== X-Gm-Message-State: AOJu0Yy/ygAhc/XoMZYmRWYPkApnlzQKiF/e+CVHz0l3o0ANWouDuenz fspuM6WRfB9EXK56hrix5vLDD/AtzAibO93yXRIrGfC6yOnTKBjcPBkV7eBCgBeKWxmiJqIYoBu R X-Gm-Gg: ASbGncujsrEGNLF4zFeFzc2KtbpmFj23yRye+h6KX4cN8qAv4EzRPSu2IEyZjYeYTIz rFAGwmWhPY6GWiuNbCEC861joua48mz8+SD+h/NrbhVBj9GRa7GbnWxLT/SSQMdUQQPkLCsLtbC kBmRdXZi0dxWOqmiab/B7OqS5XEtovMJZxuVZ0eaGz13Mp6kDReg4BRP1qTOloMH7eK5FcggNYC qHCiXdf65KJrqkV8R3UB+ZXWReJKbLkX1V4FsCIYqOuWrRz7YEYWxPnyL8T95jVfXTRWQP3NwKm 9uzxwHKR5+SU6KSjPm0rVba2oqwCK0j1CskNLlevL9OI571JCwuQ0N9mrP5/cDukp1a8yEBnITa yFjn+VrGDgGs= X-Received: by 2002:a05:6808:1408:b0:3fb:2e8f:4dd8 with SMTP id 5614622812f47-3ff0f54f247mr106878b6e.15.1743184531585; Fri, 28 Mar 2025 10:55:31 -0700 (PDT) Received: from stoup.. (syn-071-042-197-003.biz.spectrum.com. [71.42.197.3]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3ff0529511esm410338b6e.46.2025.03.28.10.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 10:55:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, chenhuacai@kernel.org, jiaxun.yang@flygoat.com, arikalo@gmail.com Subject: [PATCH 2/3] target/mips: Require even maskbits in update_pagemask Date: Fri, 28 Mar 2025 12:55:25 -0500 Message-ID: <20250328175526.368121-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250328175526.368121-1-richard.henderson@linaro.org> References: <20250328175526.368121-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22a; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22a.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The number of bits set in PageMask must be even. Fixes: d40b55bc1b86 ("target/mips: Fix PageMask with variable page size") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/mips/tcg/system/cp0_helper.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/cp0_helper.c index 8c2114c58a..5db8166d45 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -866,24 +866,17 @@ void helper_mtc0_memorymapid(CPUMIPSState *env, target_ulong arg1) void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask) { - uint32_t mask; - int maskbits; - /* Don't care MASKX as we don't support 1KB page */ - mask = extract32((uint32_t)arg1, CP0PM_MASK, 16); - maskbits = cto32(mask); + uint32_t mask = extract32((uint32_t)arg1, CP0PM_MASK, 16); + int maskbits = cto32(mask); - /* Ensure no more set bit after first zero */ - if ((mask >> maskbits) != 0) { - goto invalid; + /* Ensure no more set bit after first zero, and maskbits even. */ + if ((mask >> maskbits) == 0 && maskbits % 2 == 0) { + env->CP0_PageMask = mask << CP0PM_MASK; + } else { + /* When invalid, set to default target page size. */ + env->CP0_PageMask = 0; } - env->CP0_PageMask = mask << CP0PM_MASK; - - return; - -invalid: - /* When invalid, set to default target page size. */ - env->CP0_PageMask = 0; } void helper_mtc0_pagemask(CPUMIPSState *env, target_ulong arg1) From patchwork Fri Mar 28 17:55:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 876726 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp683383wrs; Fri, 28 Mar 2025 10:56:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVufMZuW0U8Sr75dAyxZy+HErcdaCXVA+IPFg3OIyLuqPvB7OrC5yMGZdLhWTUKva6sPwrXKg==@linaro.org X-Google-Smtp-Source: AGHT+IGZXm43BE21E5W2VHSVQ2lo5X8/eFqoGBo7ZpPuWo7NFp5WXJjUGuSquq93b+MyLO/TZs5a X-Received: by 2002:a05:620a:25ca:b0:7c5:49b7:2372 with SMTP id af79cd13be357-7c5ed9f856amr1451134685a.18.1743184600841; Fri, 28 Mar 2025 10:56:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743184600; cv=none; d=google.com; s=arc-20240605; b=LpT+nH/yrHlO+J1wH48BA9VbYMGjo4E5hN6rssMjTpGKR/RYFoQbZd8Yvdq024FDQ/ WgoK0MrP6+qD5SCbjJQB9NpgpxWdvqV0AaxClatwZTmYE+L5vvu0H2tqpHKjiKaG33OQ X1AbdYy9kIDxU+grxuh0UgqwO2arzkEK0ijeQfXyyBoJKulLOX1yo/y95G5rUimXARpw ueKzGlwW19vEfOyPYQ3b+4uNt30Ft+6S2jh3TVpeRl4cZYLbggANP6mUr0BIxKx+LU5u orXZNfD1V7RXtaOtp61gESB46GZeHkFRhOCWgY3GHeNQ1H4nQfEaqg6ZZC0K7uFnkrnc sSzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gcyk73YP4oKFYII3KIDsxDGo+q3lvpuGonD6HbKGNuc=; fh=6hT5kbgE5j6opKUmP+Y/D3HLN5CckHpiLintkPGDdfE=; b=GA4BLvb+eYktYtZyNO9P1SY287EoQYtpQacjJmKJlUBvC4cdJm8nmEwVjT2XwOZadp RPOeEcKDoOgzj7Noik6nab7pN+0yrJX+ARzqVq1UuYkL2nihHqgdpOxZLVzUOr6J9cCr 6Mu3wyfL6BilG/qqLi+8ayaW3iIdaee6ZO5+pqrfcJoH2pBOT0GuDsnhZuV4gCe1xXxe sXPxrjHx9svWahrqrOIH4B8rWL/lWHavGbDEBMLz0qZsRkZ9RFYdvtkDPS6EZZCTCdKK r0VCu0qv/02RTlkzDhwZvbsnbyqQWOKP9PbXUBIEIICQKfLIBH5KQ9T/hOW8PS7MhBmE qzUQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=btAlVbzm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-477831ae761si19731371cf.635.2025.03.28.10.56.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Mar 2025 10:56:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=btAlVbzm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tyDvd-0007Jp-QU; Fri, 28 Mar 2025 13:55:37 -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 1tyDvc-0007JN-4i for qemu-devel@nongnu.org; Fri, 28 Mar 2025 13:55:36 -0400 Received: from mail-oi1-x22d.google.com ([2607:f8b0:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tyDva-0003Kb-CP for qemu-devel@nongnu.org; Fri, 28 Mar 2025 13:55:35 -0400 Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3fcfc85f1f5so723171b6e.2 for ; Fri, 28 Mar 2025 10:55:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743184533; x=1743789333; 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=Gcyk73YP4oKFYII3KIDsxDGo+q3lvpuGonD6HbKGNuc=; b=btAlVbzm531jQ4LiGvCSDkEiaFpDUNHiZ1+Is6ldwV/QVTFzFvLwRo6a+b8JAfzBfj oTMNpM9wIYYPWfIQxUS1eyzx0TfEg5wEOZSCYrstTz/MQXgEa8kBg2MGxunO9LnkQJUC kSr3LNgTZ7W3W/wJtnLWXgpFanIGUiJaKFmM2Dma+JIzfCUcSPnBFlYaXWpzVs3wusiV L0PqumYZ2XQU132rcRmCxLbrkDV7b7cTmGDrgMHGf4grcVI5R9oi3aq1aDMmUnKePdOk hMyKfj8/zteLb/gnpcosFjMo/QhL92Iv+EaMchIGYr5krDzne/y+fO4Eu2tJDW6fi/8z nj4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743184533; x=1743789333; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gcyk73YP4oKFYII3KIDsxDGo+q3lvpuGonD6HbKGNuc=; b=JScXec1iyt5ObVKr17CL8OFsU/5WqSiZW5QnBUN3hwXg/0niFWhFRPyrvQA6NTC//S LhzznimGHlRBwMwM3/Co4aRu0wgv4V9YAxvBbXI85UN1tA9PaHHzCI4Xx0JSLCS3+otg wtUH27OEBFcNWhWbrb6cksTSZvDM7Ie3+X2DsiYF7Ckdg4rELqACwFRMGYxAqkVHtQts M9GCOKJl9T8lF8wD8ltQRN+Bf88hVnea5JCreYqlxDKb9u2ojyuff3KcCx6dx1goQOIT OpjSvMJeffUFeG/3dwJWZLGlhyN1gzubvaL7xnnbrCKk9QI25JQtFLKu2TUMgtj0XiqO OH/w== X-Gm-Message-State: AOJu0YwC0R6AqvLjd4FiaVOQi/ICkaC+iSRZvix7QqploBUs4BX+ZEst e+3864PM02nxw7lU2av5+OjJRoAakve5gLVgQxNBYa+5wOuCYjUO6X2aukA5ZCLcEqBasVywv/3 Z X-Gm-Gg: ASbGncuhbnHwyky+EpgqjLsU5iWRJNyRvtxyLUVstYOetw2m5wyPDf93oIeVGFd+0WL P1ULpzjqCbPCuuuMe6KSzVSCqU+NDzWeMDRmb1ypwdOW+TqSbT3ZZ/FP+8+D8tdOW3637SbUjeu aqopsEeZJa1vvIWzYtufBGRKgj6ohzk3jADEbxYAQ6NHtcZ4EukLo5RCAchK9+WY57xh7n8ymEU TQSc5BV4niEST04/72FGinJU6DjRaZO74oHRKsubBkBz5ECEEF+7dtoWTWGk1KWJiJ4U4ns3r6Y INlK6cW4qtXLxlWDIJcAcAU99YQP8i8KciNrjKFriKDz4JJOgxiMTN3C1+9dp5YqJCMPBj9lkkO TpJ2oNPoNT2o= X-Received: by 2002:a05:6808:398d:b0:3fe:aeaf:316d with SMTP id 5614622812f47-3ff0f534c6dmr189121b6e.20.1743184532885; Fri, 28 Mar 2025 10:55:32 -0700 (PDT) Received: from stoup.. (syn-071-042-197-003.biz.spectrum.com. [71.42.197.3]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3ff0529511esm410338b6e.46.2025.03.28.10.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 10:55:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: philmd@linaro.org, chenhuacai@kernel.org, jiaxun.yang@flygoat.com, arikalo@gmail.com Subject: [PATCH 3/3] target/mips: Simplify and fix update_pagemask Date: Fri, 28 Mar 2025 12:55:26 -0500 Message-ID: <20250328175526.368121-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250328175526.368121-1-richard.henderson@linaro.org> References: <20250328175526.368121-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22d; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22d.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org When update_pagemask was split from helper_mtc0_pagemask, we failed to actually write to the new parameter but continue to write to env->CP0_PageMask. Thus the use within page_table_walk_refill modifies cpu state and not the local variable as expected. Simplify by renaming to compute_pagemask and returning the value directly. No need for either env or pointer return. Fixes: 074cfcb4dae ("target/mips: Implement hardware page table walker for MIPS32") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/mips/tcg/tcg-internal.h | 2 +- target/mips/tcg/system/cp0_helper.c | 10 +++++----- target/mips/tcg/system/tlb_helper.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/mips/tcg/tcg-internal.h b/target/mips/tcg/tcg-internal.h index 74fc1309a7..950e6afc3f 100644 --- a/target/mips/tcg/tcg-internal.h +++ b/target/mips/tcg/tcg-internal.h @@ -47,7 +47,7 @@ bool mips_cpu_exec_interrupt(CPUState *cpu, int int_req); void mmu_init(CPUMIPSState *env, const mips_def_t *def); -void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask); +uint32_t compute_pagemask(uint32_t val); void r4k_invalidate_tlb(CPUMIPSState *env, int idx, int use_extra); uint32_t cpu_mips_get_random(CPUMIPSState *env); diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/cp0_helper.c index 5db8166d45..78e422b0ca 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -864,24 +864,24 @@ void helper_mtc0_memorymapid(CPUMIPSState *env, target_ulong arg1) } } -void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask) +uint32_t compute_pagemask(uint32_t val) { /* Don't care MASKX as we don't support 1KB page */ - uint32_t mask = extract32((uint32_t)arg1, CP0PM_MASK, 16); + uint32_t mask = extract32(val, CP0PM_MASK, 16); int maskbits = cto32(mask); /* Ensure no more set bit after first zero, and maskbits even. */ if ((mask >> maskbits) == 0 && maskbits % 2 == 0) { - env->CP0_PageMask = mask << CP0PM_MASK; + return mask << CP0PM_MASK; } else { /* When invalid, set to default target page size. */ - env->CP0_PageMask = 0; + return 0; } } void helper_mtc0_pagemask(CPUMIPSState *env, target_ulong arg1) { - update_pagemask(env, arg1, &env->CP0_PageMask); + env->CP0_PageMask = compute_pagemask(arg1); } void helper_mtc0_pagegrain(CPUMIPSState *env, target_ulong arg1) diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/tlb_helper.c index 123639fa18..df80301a41 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -876,7 +876,7 @@ refill: } } pw_pagemask = m >> TARGET_PAGE_BITS; - update_pagemask(env, pw_pagemask << CP0PM_MASK, &pw_pagemask); + pw_pagemask = compute_pagemask(pw_pagemask << CP0PM_MASK); pw_entryhi = (address & ~0x1fff) | (env->CP0_EntryHi & 0xFF); { target_ulong tmp_entryhi = env->CP0_EntryHi;