From patchwork Wed May 14 12:57:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 889868 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2610965wrr; Wed, 14 May 2025 06:07:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5L1PZHRZOJ/Z7NV1lEDuOSQbIoyuZkrcz7E7KigV1MuWIfxPup80KOBNN15VcEXEqlQ3Qvg==@linaro.org X-Google-Smtp-Source: AGHT+IFyeKIjxbvqC/Xq8I9uVtzpU5tDJ7nsZ4s4U5zPjVm5AHEGqVBOeDbAaPE/YEO8lp56Dvyk X-Received: by 2002:a05:620a:1985:b0:7c8:c9c:2a8a with SMTP id af79cd13be357-7cd288636ebmr619067985a.49.1747228020980; Wed, 14 May 2025 06:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747228020; cv=none; d=google.com; s=arc-20240605; b=WZKs8ScD46W+wCPKbMSlVfsHhLckV6O262BKfRe3hZEzrKIF3uVMYbZ43rP4URGacz MT4ElDXdrHdXVgpKY/DHbELgBL2BtfB8km3K0M4kZ8zHniq+3uCiEgm+iayeq/10QmaM y9+8YjZZhnzm4N4dNsdrH27z1GyOKRplF7Iz8eYWVHGIdINVEsAq8gL9mLp8YMdOsdTV HHhnHCgOVgTUrPkFXNWEZFH2+kvULZuBbwBjZXVI3072kkNZWUxSjiAHnb/BZiKePeGs Q0aqxlZ/TQ8eeC4llRubn9KGNmL9NMLvsS6xsnXP0QDb9JCnQ7/t8K4OSFOU0DGf10xM qchA== 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; bh=X23sGOVJfbiiCDYmDHxWJrZ5bvm22GuNyvp4S2Vzq8M=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=KJ20LCC3qXE0F+aAxqCD/p8CuZe+eXYb08MkKrdQnOjwkYtQ3qU/TVnn/iWIgfbZUa /px0tugwOSCt/YHKhO//o/XVWSUn96Ki1FaDEH9ZAeAn5hJtR/ef0wlPdsG5QahSUBZp MtGlLqgz8OQdE/333pEGTVnx9i3dT0YajA1emwLm3T7ecW1kTW7rZJzvZYsV1WcppLsJ y2WkGT2DTCnSHwQBFgRf7IQmBqUeaE3z1CuTv8uvmuFo+GsKzKOHu9nyoqw1N5T05qNE lqRvDWWU2jF/DEv72+14ho/TVXaEDXdgFF4rrGHhYyX3MOkTjgCDBiqmJRpbXN6Ec9B3 jBWA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cd00fe31b6si1332493085a.427.2025.05.14.06.07.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 06:07:00 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFBiG-0005sZ-KO; Wed, 14 May 2025 08:59:56 -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 1uFBhL-0003pR-2a; Wed, 14 May 2025 08:58:59 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFBhI-0007rp-JN; Wed, 14 May 2025 08:58:58 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3DE34121AE4; Wed, 14 May 2025 15:57:49 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id DD76E20B852; Wed, 14 May 2025 15:57:58 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-9.2.4 06/34] target/mips: Require even maskbits in update_pagemask Date: Wed, 14 May 2025 15:57:28 +0300 Message-Id: <20250514125758.92030-6-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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 From: Richard Henderson 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é Message-ID: <20250328175526.368121-3-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé Cc: qemu-stable@nongnu.org (cherry picked from commit d89b9899babcc01d7ee75f2917da861dc2afbc27) Signed-off-by: Michael Tokarev diff --git a/target/mips/tcg/sysemu/cp0_helper.c b/target/mips/tcg/sysemu/cp0_helper.c index fb394bf0ed..4796638126 100644 --- a/target/mips/tcg/sysemu/cp0_helper.c +++ b/target/mips/tcg/sysemu/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)