From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42CBFC433C1 for ; Tue, 23 Mar 2021 14:37:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6BBD619BB for ; Tue, 23 Mar 2021 14:37:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6BBD619BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOi9V-0001yV-Sk for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 10:37:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOi00-0006Za-Ee for qemu-devel@nongnu.org; Tue, 23 Mar 2021 10:27:16 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:38519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOhzq-0007Bs-Ma for qemu-devel@nongnu.org; Tue, 23 Mar 2021 10:27:12 -0400 Received: by mail-wr1-x42d.google.com with SMTP id z2so20995611wrl.5 for ; Tue, 23 Mar 2021 07:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=040Av6eKFFO8DY7RlEdIpWKnOUZEmCANS3COgK9hh4Y=; b=gIL5o7Vf/LBG9a/6NzcNDX2YbQrKuySVagISYCn+KV5KNBLEluyouRTpEw3oLFAxF4 RFASvFYG9jbEgNtlWHCRn0lGI25LMlrvo1SyFWh7CZtJPxy3jgWNBkr5goF8FEcDmDBe F8bJdkdbv2jH92Cccm0M49ahumcKKHQOtK51f6WXI871u6Ousa5RbsC978uW7hQrZPyR HckHfvslR+q0OY2i04BUirNvaAri7XKPLQjCJfj5rs+MQ/6XqysU4PINGExk0bkcdouQ yVbqRyHtR9DnT4Ga0zjuMJeKDbcZdoKXB++cFNNCbpp+gy/A7z45DN5VHWU/MkWGDx2H J07Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=040Av6eKFFO8DY7RlEdIpWKnOUZEmCANS3COgK9hh4Y=; b=F9na5XJFCwVjJW7/1aC8aVC4rFxGyFrWgGVdFxDCpBXc2VRE2P85p0HqwMEBBzQCLb v2AWvhube8+b00JK73T9AQ48H23+8WkQmtsWQfANplxPG9W7jndjVmKnUke9pjKokKmG ISb3lRbXbJWnBAmkqKZULpG6Mj6EWLVZL9NvWiawZPDQ33S9POtuRaj+SLPxnf6ootWi toMNAiqLIR9Wg1dxsAgZ0ZcvKOL7RVoRoEKK/dCoblAaAvDqtGnru4ATOdqpx0W0uMzp M+eAQUuAqmH3wSGl6XdYbhdfPMjcsNfSQL4UKaTq/zCiC/5ysHGIhOtyMH/oEvZUFD0+ y61Q== X-Gm-Message-State: AOAM531MyY4J19MlsVxMd0iDmAEEvEaRX8CN1iQ+TUXmuq3hl7Vj1qm2 L3Zbg/5OSf4VGXeVBSfEPE92hyqRdqPgduOb X-Google-Smtp-Source: ABdhPJyd3RjAlSawSKzwz/L6zdLjeH/ExLij+P87sI9mpLHtZpE8rL4k6pmASGeb8btajDLj9EBaBA== X-Received: by 2002:adf:f44b:: with SMTP id f11mr4350216wrp.345.1616509620404; Tue, 23 Mar 2021 07:27:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a131sm2861292wmc.48.2021.03.23.07.26.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 07:27:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 7/7] target/arm: Set ARMMMUFaultInfo.level in user-only arm_cpu_tlb_fill Date: Tue, 23 Mar 2021 14:26:53 +0000 Message-Id: <20210323142653.3538-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323142653.3538-1-peter.maydell@linaro.org> References: <20210323142653.3538-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Pretend the fault always happens at page table level 3. Failure to set this leaves level = 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 Message-id: 20210320000606.1788699-1-richard.henderson@linaro.org Signed-off-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 9609333cbdf..3107f9823ef 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 = ARMFault_Translation; } + fi.level = 3; /* now we have a real cpu fault */ cpu_restore_state(cs, retaddr, true); -- 2.20.1