From nobody Mon Apr 29 05:09:01 2024 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=1616198890; cv=none; d=zohomail.com; s=zohoarc; b=isPXz8x2BTl7EoIF/Y+zWB+KOdi3slCJRoQ93zSUzK3zsp/hAvP5fUhX+phMH69Fi7hOLhsujQIuZoQQK2GdklBWeFuvWdBs20YYoUG8apiV7iruBs72ptiIpvUZEZTs7SFMoUCP3jRrxqT40FT4szZUKlRxUSmAy/+WNO3cXR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616198890; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=50D/9t9mW9UHwUGC/sHHaB7xF9nAx1NkJISt8YSPxJs=; b=AOj2jG3YLCyPDdlgMR8TAEzXJ/avydGrW5/5bdrI6+lYw+pbr2l3XB5YpebQTBzqBBwOCyEIKmf9nRKZJcjsc5op9ULNSc8NXxTJ62USvXUrtJsW53hZGBS17qs7Yio6AKfN9OXwCM04SI3lzc/xbgzmrWmCXOOlHRAoisjF8DU= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616198890469766.0025544497738; Fri, 19 Mar 2021 17:08:10 -0700 (PDT) Received: from localhost ([::1]:34792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNPA0-0001rC-DX for importer@patchew.org; Fri, 19 Mar 2021 20:08:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNP8C-0001Im-Oa for qemu-devel@nongnu.org; Fri, 19 Mar 2021 20:06:16 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]:34322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNP88-0007Y1-0f for qemu-devel@nongnu.org; Fri, 19 Mar 2021 20:06:16 -0400 Received: by mail-oi1-x22a.google.com with SMTP id l79so6592331oib.1 for ; Fri, 19 Mar 2021 17:06:10 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id k24sm1609953oic.51.2021.03.19.17.06.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 17:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=50D/9t9mW9UHwUGC/sHHaB7xF9nAx1NkJISt8YSPxJs=; b=zyEPRp0pisRS6EH80TkrjGT1bVL6QRFo5XEp4th3BPHuelE4MoK8sLDNYhlp5SKznP Yp0xRERT8QloMU1h3uIAxOlN9Fc6WROxX8RGNsJ+4BOl78ka+wMSb2iMLLUQ3Y7NIRSD bcYpQcF6gBXeWc+nrNQQx5pm3wJobNmaYOGvG8ygqxgJpGfsW6iaC98+9LxvoMec83f8 M12cRm8C5XRx2AQDJwgu74C9JUeatOiUiIL+8xmdP08qyyxNUL5WZh0SF23wJAgxo+F8 XRwWmzoa3q8ALAIOvn16UxXBEHcMFpIvElkoS4IEpIfXZe32vwDTWzqaibaCljDSZWoP eDmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=50D/9t9mW9UHwUGC/sHHaB7xF9nAx1NkJISt8YSPxJs=; b=AyIRc8UR3mOYAGEQUO76jVp1h30B0y80PldlVTWHR1CSUYOht/CXFbOEwOX70vHurM XRI7vxgyN54eSl9gc+ILyDOiCRm8BxAQgAShAc46BRUYg5DW53c+b8v2z/aYxDt4o4J6 VjmNjLkQbwZFqEt4oJ7hALisekP+WE+HKfOVk4+q7GmYdoa1bdbKn/aojAmdouQweM2h PffQNaccb55L9VL54YjgZ+z+u/XU7FvJjdTWNOno7k62DotKdyQw1n+gaxDScnmqtCG3 40E2+s/ef9PVS70C4/91RRVoNtqV+dlYKfKT28aCa8Lsr/40rQ+yzjq3A7M8+VJsDybl Wl2g== X-Gm-Message-State: AOAM530Z05g/2rfUr/Uj7sZ7ouUa0VyW9xLD8Ez92fG9Ggo9xX2uEjkQ ffi7oAVwxM0+Y9lT9iliq7C32nCGFQCJ5/yS X-Google-Smtp-Source: ABdhPJxHSo9iszYzgntgaA+V7ftmsWQHL3ZQ/PcE3jcYqreI8vzur+WkuWKQNJ8TDRfh58rbvsgq3w== X-Received: by 2002:aca:4c52:: with SMTP id z79mr2783411oia.125.1616198769606; Fri, 19 Mar 2021 17:06:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH for-6.0] target/arm: Set ARMMMUFaultInfo.level in user-only arm_cpu_tlb_fill Date: Fri, 19 Mar 2021 18:06:06 -0600 Message-Id: <20210320000606.1788699-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Pretend the fault always happens at page table level 3. Failure to set this leaves level =3D 0, which is impossible for ARMFault_Permission, and produces an invalid syndrome, which reaches g_assert_not_reached in cpu_loop. Fixes: 8db94ab4e5db ("linux-user/aarch64: Pass syndrome to EXC_*_ABORT") Reported-by: Laurent Vivier Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/tlb_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c index 9609333cbd..3107f9823e 100644 --- a/target/arm/tlb_helper.c +++ b/target/arm/tlb_helper.c @@ -163,6 +163,7 @@ bool arm_cpu_tlb_fill(CPUState *cs, vaddr address, int = size, } else { fi.type =3D ARMFault_Translation; } + fi.level =3D 3; =20 /* now we have a real cpu fault */ cpu_restore_state(cs, retaddr, true); --=20 2.25.1