From patchwork Wed Aug 14 09:04:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 819101 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp612059wrm; Wed, 14 Aug 2024 02:06:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPMEM+ZzY1tZOZFXZEFdiCiEoawpTTGUFScFDhutG5xUmrruJUC7smmpJ6kiOkXDUD6fz9Sh471HnXpuz7KQo9 X-Google-Smtp-Source: AGHT+IEYNmsjgFTv7HesByZUhkBaWH49QSPdeECscKLVdSCbWpHgE/9TsWujR9GDKZXHAfuTPUOK X-Received: by 2002:a05:6214:4341:b0:6b7:4459:7dde with SMTP id 6a1803df08f44-6bf5d17df84mr25110436d6.13.1723626406712; Wed, 14 Aug 2024 02:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723626406; cv=none; d=google.com; s=arc-20160816; b=EACvlpnQy4MqZRbeHtN01gXpirDbbcrGrI+QdO9vWDJdaCNpKGIKTXxx/mApYk6MfD 57RIMixtH6eyFwCmAQYvBEw3JPsGwmEVfevJmdWat4SVHeyufVhI7NJBvjonbFeOGVr9 pPpHnUaYA4MWQKwGV6rv/yHi1dv6fUPdZO9FV6d9bBcSvN3RsPo8DslGiZAtfF+YLiKD aPWExoBIxK+HJ1/wYsN/pK83PbnNuBjRehOPvIQQjyvKEFJKHjvgsNGpO8OJtrwvZPrS RELTiu8gS1YjveLjC5XkH8UzI6F6jUWg2xgQI7l84ZnCbtqZy+jFvk0S0yo4xNc1wiCj cZ8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=KKHnEDZFkWOqzMoUUCQs4Gmx/1ICFTXsIFwtO9oeg58=; fh=KbgWYUS9OqO/4JTC9tmS48IRNwt9Cke8+NcPyuT3iko=; b=TdOQMgcylSWWUc2qLL0F9PpikfiLJATbKU4peH3SieJjtzUGhCSqf3BgS0PD9c7+WV C//8a/Ttq78rBfj43g1MS0J22OO+rzUSkGL1SyVjrmbUS4sJcMUmoaYPIY47HmxV0tQk yYS/4jQtXbv5T5y8EFIlFFQtvJKacEzUleGfkMMnOPm+SBujQMbIY9tjs3e2LrXWatQr QbM1TiNGkw1FNaYS6PRtssIcz93z6cwzryb/LrcuhroSrCuaNejIWwo8kvHIaV3xHdcV s91egK0J7Enqb3jUbgDByOwQDHRRpbhrGRXWglgIrpIAQmB6jDmQzNmtZROEDLkGmliG Qmbw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FHck7vWf; 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-6bd82e3584bsi103183736d6.312.2024.08.14.02.06.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Aug 2024 02:06:46 -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=FHck7vWf; 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 1se9xc-0004zV-R8; Wed, 14 Aug 2024 05:06:29 -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 1se9xb-0004oA-Df for qemu-devel@nongnu.org; Wed, 14 Aug 2024 05:06:27 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450: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 1se9xZ-0000of-Io for qemu-devel@nongnu.org; Wed, 14 Aug 2024 05:06:27 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a7a83a968ddso642481366b.0 for ; Wed, 14 Aug 2024 02:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723626380; x=1724231180; 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=KKHnEDZFkWOqzMoUUCQs4Gmx/1ICFTXsIFwtO9oeg58=; b=FHck7vWffXFyNSg5W1peTmr8pBEEfnTYpIqN9sndq41T8eCvZnLBR3TqCRIymdlP1S 9SuQxQNoi/XcBUwyuTUjJCJcKwhsNCXUPyfkcUiOcimPY23B5Ijh6CFfyNtztzPlnymT 5XieCruYBCgF5lmz4DCecqZ8x6a/mYzc06nn+n1YqDA/S8It9XQKXeC0BF6nGQ5SBGo9 O7jKLQkFr7bs7YhYayViMzzRzgqWAYn6KSKqVnl7vxzgMZPoMOpmUyg1hIJ4pIMlddMf aDmNAW2R7wUjTQp9f2Y6B9omqtpdI8iYB0mh18MWwk+IWXBWExtM8VGqsl1Pxt1HAnnk aloA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723626380; x=1724231180; 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=KKHnEDZFkWOqzMoUUCQs4Gmx/1ICFTXsIFwtO9oeg58=; b=wFuykThEg3QskKYl58lgmfHBDe5nqqZApQ78pIB0fxHNgJ5d5BrePUENhmHtGhRnwr uL5Wo2o0F772wKDSleRhW59HywV2sq8vjaKYuxJ26r7TVlK/BXVJCMvcw/F7IPhRLjD1 aCP25OKoksv4Sfjtvf4ZJPRcUsUVVWzDCZiL9ZF+b6r3/csom0k05r7gg0l2gy+BfgDv 6qf8fuxjNIKZorlgerSmuZZ0QssmQ1CtBsIJCsP1YtAaEIrW4FXteZZsHCuTwrekK/u6 0eyRiyKVL/ql+tosj78OS/oNZGbHJkiEZ8MdBwlH1J9VBRkY8ofYywiTUip/75zOV0Cm kaTA== X-Gm-Message-State: AOJu0YzZ7Iublm6RcyBg2x9R53xYNQkeLyYAcmCFdYwSF1GiW8HMp+JP uaErmkDBNiR04wrt0aasF3nUIezHrTyJwIZ3sGZYUytzG6FBI3S83ijMS6nxRPf9/lDQZc4qUUF HkIM= X-Received: by 2002:a17:907:1b0d:b0:a77:c30c:341 with SMTP id a640c23a62f3a-a83663fa418mr137716866b.0.1723626379702; Wed, 14 Aug 2024 02:06:19 -0700 (PDT) Received: from localhost.localdomain (124.170.88.92.rev.sfr.net. [92.88.170.124]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f414f06bsm145948166b.159.2024.08.14.02.06.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 02:06:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson , Thomas Petazzoni , Waldemar Brodkorb , Aleksandar Rikalo , Jiaxun Yang Subject: [PATCH-for-9.1 v4 2/3] target/mips: Use correct MMU index in get_pte() Date: Wed, 14 Aug 2024 11:04:51 +0200 Message-ID: <20240814090452.2591-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240814090452.2591-1-philmd@linaro.org> References: <20240814090452.2591-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-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, T_SCC_BODY_TEXT_LINE=-0.01 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 refactoring page_table_walk_refill() in commit 4e999bf419 we missed the indirect call to cpu_mmu_index() in get_pte(): page_table_walk_refill() -> get_pte() -> cpu_ld[lq]_code() -> cpu_mmu_index() Since we don't mask anymore the modes in hflags, cpu_mmu_index() can return UM or SM, while we only expect KM or ERL. Fix by propagating ptw_mmu_idx to get_pte(), and use the cpu_ld/st_code_mmu() API with the correct MemOpIdx. Reported-by: Thomas Petazzoni Reported-by: Waldemar Brodkorb Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2470 Fixes: 4e999bf419 ("target/mips: Pass ptw_mmu_idx down from mips_cpu_tlb_fill") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/sysemu/tlb_helper.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/tlb_helper.c index 60147ba0af..0e94e00a5f 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -593,16 +593,21 @@ static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, */ static bool get_pte(CPUMIPSState *env, uint64_t vaddr, MemOp op, - uint64_t *pte) + uint64_t *pte, unsigned ptw_mmu_idx) { + MemOpIdx oi; + if ((vaddr & (memop_size(op) - 1)) != 0) { return false; } + + oi = make_memop_idx(op | MO_TE, ptw_mmu_idx); if (op == MO_64) { - *pte = cpu_ldq_code(env, vaddr); + *pte = cpu_ldq_code_mmu(env, vaddr, oi, 0); } else { - *pte = cpu_ldl_code(env, vaddr); + *pte = cpu_ldl_code_mmu(env, vaddr, oi, 0); } + return true; } @@ -642,7 +647,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *vaddr, /* wrong base address */ return 0; } - if (!get_pte(env, *vaddr, directory_mop, &entry)) { + if (!get_pte(env, *vaddr, directory_mop, &entry, ptw_mmu_idx)) { return 0; } @@ -668,7 +673,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *vaddr, ptw_mmu_idx) != TLBRET_MATCH) { return 0; } - if (!get_pte(env, vaddr2, leaf_mop, &entry)) { + if (!get_pte(env, vaddr2, leaf_mop, &entry, ptw_mmu_idx)) { return 0; } entry = get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); @@ -823,7 +828,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, vaddr address, ptw_mmu_idx) != TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry, ptw_mmu_idx)) { return false; } dir_entry = get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); @@ -835,7 +840,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, vaddr address, ptw_mmu_idx) != TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry, ptw_mmu_idx)) { return false; } dir_entry = get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew);