From patchwork Mon Jan 23 13:35:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 645574 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp2236489pvb; Mon, 23 Jan 2023 07:12:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXugfoDlncxuLwMuC5AqviKuznQeA6FERACg8yzwPuuilycgG2VKEZ4FABapKLFL/2SdwBCL X-Received: by 2002:ad4:5d6b:0:b0:536:85cf:a265 with SMTP id fn11-20020ad45d6b000000b0053685cfa265mr21352818qvb.14.1674486728418; Mon, 23 Jan 2023 07:12:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674486728; cv=none; d=google.com; s=arc-20160816; b=lQW8cnojlb53NHwU8zCtLBoSqFx1PiZH4PeU4FxJ/vXDE29SBMvGnDdAfAbzBfb8I1 8Xk4qUv9kGWtSYllZ4ra0Sca4fqBRvzOfnXkKd5jO+ufEd8L8Vn6Wq5lMULWNyyc3uZV qrAfvp9zosMg2PWvU2rT58k2WndoBaTj+fSFKxE593MBHAh2RK/UebL7SrxJyvF+lrUT ENh9zdC4nKIcJG8/rQeEpMRh6+tKfGgz7q32gov4Ju58/UNcTD9V+PpjQlUuRNxny/7r WnXj/VJSG+6YRaHucSs8XhtpE9X1LrsLrxE58LHJVFxIIIHmS2MYLOFgl7quR+BkHnUW dRkQ== 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:to:from :dkim-signature; bh=t4bugJ+RO2MbQct6JNW9hnGo8RWEyhaawxl4hk6fSFE=; b=NXOBmsJt7Hj2yexM3bZSCsXdmoi8KajIpd3m9Akmzo7Zj9ITw28XPhWeeNhR61DdGC aKUZzgCDjsazWzgpx3CS1UQoI5BiICwIRJr0RHK1YrVzH+PX1r5DMDY4l0yfb/u4tUfx vMCku30L95VII75QrtEgE5sa45tzXh9yLqs+OqUWxeksyprrLnxqd2dwalTDWTtDs2VV 4ja8kpyNVkAa5WOZ3PQ0CVfmbj0H/+FnlgyIeYz4QaepAB2OTfUNWKUIiQHZh7neGRUw 4r5RxwFzR5/HS+cajKlyHGr6epqu8VEdxExjSFG494DOj9P1h8aHwwlMBW/ZXz+NP8W0 ks+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TxGjFB4l; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ke30-20020a056214301e00b005353ec9a265si10580809qvb.44.2023.01.23.07.12.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jan 2023 07:12:08 -0800 (PST) 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=TxGjFB4l; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJx00-0006Cw-72; Mon, 23 Jan 2023 08:36:36 -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 1pJwzj-00060i-Rr for qemu-devel@nongnu.org; Mon, 23 Jan 2023 08:36:23 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450: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 1pJwzg-0002Mg-Lw for qemu-devel@nongnu.org; Mon, 23 Jan 2023 08:36:19 -0500 Received: by mail-wm1-x331.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so10622886wma.1 for ; Mon, 23 Jan 2023 05:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=t4bugJ+RO2MbQct6JNW9hnGo8RWEyhaawxl4hk6fSFE=; b=TxGjFB4lSqLFsidh7yoptsPDvTUNfCH+V992YeG9C/VBkayxVK1m5ml8X8pCk1LqPC 6I5JEcKNSPXu9v1HNxEN8FzaVfFF8Uzw/bf1Fd80MSHs+tQMYj020yb1x52Tm9WvZt3I N2mfYOmNmXz4DX8f29jDn7Yakl2y44aea4kuxIpEtY9SAbR9DPP+Kv2pQVWRcGPVTF20 JePZsNMS/g0S2GuRhIhty+3a9NXxhOzDsOYXboaYSm1ok6YhMtguA/XxSr8jT1zH8KMB Pnym2ECiBjmm/3x1YXYXOtTHDCLLQYAL4vm8LPkrg//PwurtVXvZ9VJUHPUBlk5CAKKR +EUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t4bugJ+RO2MbQct6JNW9hnGo8RWEyhaawxl4hk6fSFE=; b=tBXBzfEBRBnxV0ChwflLHwIQjZJq6irYe9B7cdYDrOjSTdmknTxQPUwoXZRNtws3ce vt0cULE5HNOHoPpKuWDe/mxYN5c67wGrpc1QVWZ9IL/TMIDSB6iOGmkn66p2esGqUk0D U4I6uLmv8+z8GxPnu1uoKzMX/Cr0R0dlVaivO2Pd7tgZswJFkYZWhNSn0cukdYmwWN72 6h9R3sEhBILRZiIabmCYYUY8Z9MumMZ9o2w8/E/xAJ1OefeHegISv+dr8+8hq+n80KX1 O6fJ5ROnjKSejUvwBRBwV0AUN4AKNJZeg5ZlGYaAU7aN5tiv3r4v5tQUWoVvOXtOEDKW uuOw== X-Gm-Message-State: AFqh2krO3bNJcoqopXHUQ32Y1PfzsIW/8kzox9yV73lUEVqmm/zSYO5D iPwjD2Hw14W/mNU8Vl2wuthuwaLZdLpdrQZc X-Received: by 2002:a05:600c:5118:b0:3db:1e4f:7cdc with SMTP id o24-20020a05600c511800b003db1e4f7cdcmr16211655wms.15.1674480974548; Mon, 23 Jan 2023 05:36:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id d19-20020a05600c34d300b003a6125562e1sm10817457wmq.46.2023.01.23.05.36.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:36:14 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/26] target/arm: Fix in_debug path in S1_ptw_translate Date: Mon, 23 Jan 2023 13:35:48 +0000 Message-Id: <20230123133553.2171158-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123133553.2171158-1-peter.maydell@linaro.org> References: <20230123133553.2171158-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-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: 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 During the conversion, the test against get_phys_addr_lpae got inverted, meaning that successful translations went to the 'failed' label. Cc: qemu-stable@nongnu.org Fixes: f3639a64f60 ("target/arm: Use softmmu tlbs for page table walking") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1417 Signed-off-by: Richard Henderson Message-id: 20230114054605.2977022-1-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/ptw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 4bda0590c7c..57f3615a66d 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -238,8 +238,8 @@ static bool S1_ptw_translate(CPUARMState *env, S1Translate *ptw, }; GetPhysAddrResult s2 = { }; - if (!get_phys_addr_lpae(env, &s2ptw, addr, MMU_DATA_LOAD, - false, &s2, fi)) { + if (get_phys_addr_lpae(env, &s2ptw, addr, MMU_DATA_LOAD, + false, &s2, fi)) { goto fail; } ptw->out_phys = s2.f.phys_addr;