From nobody Sun Nov 16 05:58:57 2025 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=1743450658; cv=none; d=zohomail.com; s=zohoarc; b=Z2eOVgcY2KJ9P8OdacN5YuozxVvGbTuV5xDZPDeP8JKdpIc3oHxWdFcwM1S//OiRFEj8SV6EkHwCFEXJN0xzpEFoMe42OqjVOHaCWWt+vAM4kgB6x/foCZHzhyrf+L3yGd5fKdXJsrvdyxiyAZxz7+kPoKkd+3Gwq1Nhqp1J1ss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743450658; 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=VzKtyLe3+l5VVhvYpqfNmFw5xAG2MCpsoE8LLZO9QKE=; b=HdWaDiEzCENVvK379mBO6Z6AxVuzNRWXqtcKpwVwyaW0MAXbhKQtTlZJdcjrbztS/BmummfvO5k9NakNHc/bmA+59FI7xmarNIyXOAHAkAqJHKnza37/U/zbKVjuvSTHhbku4w06Sb6/6ZhAwWj+aAMUVg4A/cpCSerY6xxnpic= 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 1743450658039984.1242252047049; Mon, 31 Mar 2025 12:50:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzL9j-00053X-H2; Mon, 31 Mar 2025 15:50:47 -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 1tzL9I-0004Lf-LY for qemu-devel@nongnu.org; Mon, 31 Mar 2025 15:50:20 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tzL9F-0003i5-EV for qemu-devel@nongnu.org; Mon, 31 Mar 2025 15:50:20 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cec5cd73bso31131065e9.3 for ; Mon, 31 Mar 2025 12:50:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b6656a0sm12170928f8f.37.2025.03.31.12.50.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 31 Mar 2025 12:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743450615; x=1744055415; 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=VzKtyLe3+l5VVhvYpqfNmFw5xAG2MCpsoE8LLZO9QKE=; b=yjIDMHzccJp170X5Y/wgAszCTKGn+U9Iclr7lMbhWDYm/bXqS9UJtJZL1L6D3nsBWB oT5xXW9ebTrD90B66cfKstsiWai+gUEBbFXSvnSxWvNf8T2s7iOfzPBZ9HX1BG/hWKKC SAZ2va2n7yUmYpF+t3lmfnKLW5XAGlCpD1ZX81yrsyIEXChKgMMh/a+dxe9sic7QYYov GN6pGEPXhF9jnHuKmSIgrYmokYBkNOBvz55Ih9QuGJ3uDkbi0le6QPVa2KsUSXs7nEGU sg/RcFYgFsEqccMVWIJI42YN/Kwu7r0hj8woMa2G+8reUWAQYEySuazERxlU9eJv+7en LeiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743450615; x=1744055415; 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=VzKtyLe3+l5VVhvYpqfNmFw5xAG2MCpsoE8LLZO9QKE=; b=BZyP9RlCfJJQ8B4SlteXM7z5S7Km7kaLpY+0BpzG8f+dI5PCGs85bQaxGwcIZ+HIgc Q1ffkOCqdRv+/Y7J7N2ax5Jjmw1MdjlMnnmc16Yn9cr/laCunBEwFOzmvFNsXNWs2GgL 2aNSPN83HGrO4D9CstRwxgAL8CvMLHxuUab7H94fHTbdQwseRV2Bl/Evya6ACXerf+1x Ovj3Q7AAJM3TCF2QzQ1Sa3TYeYa15ybUHbYwlu49cdc6RCNaa8rsI75nkKkSksrFVm2L KjRg5F59lOCsrmMyoxIP1P9pfxgCQn0LQUrqQvuEZpOGNM+QKTHFnPZNnDxlhTQ08u/V vdEg== X-Gm-Message-State: AOJu0YzgrJt/I5LvJDfcwSu3UTTH/Zz909MtkamoRYBF+e7PFLUyo74W xY3Zjd07VMLXF5iBuHSQBI+S3lUbzssLiCYWnZXrtGoqNXMCs821BA2sKgr+jS/WKFizqx7lDko v X-Gm-Gg: ASbGnctfORb9Fj3QJBm+fsVbG+53qdcc3v78TS6LL9hv9LfJCFBw0n1yVfq1+2hwDl9 aATaBfknYMcNByokLWXuLUQAIu/Y+ziC2RdVT2CTOFhFnPbZYdfDdsn/quyOE0zOxHxyi1Ah2am 6u5QBusGhGgckpysMyby/BY3hLQ0WF7a1vGO1ZKUk3SzHmLsDMhRDiVADUPtrmiAIyRu7D/zF6y drLUU/rqGWz1c6F9zUJqFduAsA+KVQEi+vFGnEIzXQKN42rUZKVjWmh6UULvmp64G6VMT5hIQfi d9NvBxTbwFX+IFqecrx/CMWLqj1bJ5bN9e9RrXRM0lv9zIBRbDLJfD/ZkG7+Nk92IDyALjsJw0L yPCn5DJaom/9lG3HI+Dw= X-Google-Smtp-Source: AGHT+IFtdHoV4k9HS1QMvyY8QkctSHR13+vxKOKZHKPvSgFoUwD9DzGtAX1nbbgpr26XdcVOZ2RKvQ== X-Received: by 2002:a05:600c:83cc:b0:43d:cc9:b09d with SMTP id 5b1f17b1804b1-43db62bc26fmr79716895e9.20.1743450615415; Mon, 31 Mar 2025 12:50:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-stable@nongnu.org Subject: [PULL 22/23] target/mips: Require even maskbits in update_pagemask Date: Mon, 31 Mar 2025 21:48:20 +0200 Message-ID: <20250331194822.77309-23-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250331194822.77309-1-philmd@linaro.org> References: <20250331194822.77309-1-philmd@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=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1743450659304019000 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=C3=A9 Message-ID: <20250328175526.368121-3-richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Cc: qemu-stable@nongnu.org --- 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/c= p0_helper.c index 8c2114c58a6..5db8166d452 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, targe= t_ulong arg1) =20 void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagema= sk) { - uint32_t mask; - int maskbits; - /* Don't care MASKX as we don't support 1KB page */ - mask =3D extract32((uint32_t)arg1, CP0PM_MASK, 16); - maskbits =3D cto32(mask); + uint32_t mask =3D extract32((uint32_t)arg1, CP0PM_MASK, 16); + int maskbits =3D cto32(mask); =20 - /* Ensure no more set bit after first zero */ - if ((mask >> maskbits) !=3D 0) { - goto invalid; + /* Ensure no more set bit after first zero, and maskbits even. */ + if ((mask >> maskbits) =3D=3D 0 && maskbits % 2 =3D=3D 0) { + env->CP0_PageMask =3D mask << CP0PM_MASK; + } else { + /* When invalid, set to default target page size. */ + env->CP0_PageMask =3D 0; } - env->CP0_PageMask =3D mask << CP0PM_MASK; - - return; - -invalid: - /* When invalid, set to default target page size. */ - env->CP0_PageMask =3D 0; } =20 void helper_mtc0_pagemask(CPUMIPSState *env, target_ulong arg1) --=20 2.47.1