From patchwork Sun Nov 19 18:19:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 745164 Delivered-To: patch@linaro.org Received: by 2002:a5d:5052:0:b0:32d:baff:b0ca with SMTP id h18csp917247wrt; Sun, 19 Nov 2023 10:22:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6h4K2qgC3sSXdWC6F4KPyLQcoP0UHrClyHbUHyl0HzN28wvtk8yyxQsdagK7AFhtCcT1f X-Received: by 2002:a05:622a:4c6:b0:41e:213d:3c8e with SMTP id q6-20020a05622a04c600b0041e213d3c8emr8058204qtx.32.1700418145787; Sun, 19 Nov 2023 10:22:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700418145; cv=none; d=google.com; s=arc-20160816; b=WYz7hVEZuDCRMpB3TUXTovbzRGpk28rlC87hB1O0Lcjtj2A0UNvzVEbu7O8LSVCJbo ueVItHpgyMeIaWlrIT6UM1DIuqIDPje/AXDO6hdJSSqrrP+wdDN7Xh4vVMFV6Tqi7wHv TWtpCzY3ul8iO7pwuyRyaE4zSJXVElpiBzpd5ye7O1zse8v2ABali7NY/eBT5cDdC3iA J02jUOzjCSxkl4DsHa3v1DxRU7lZzEARt3Ig1pbYdgKnaEAAiMSnAbHauIA7cUgv2Ir+ 50ooX7tsFezlYpqulZro5VFMxKBYpf8BEgiaP1i7pHgR71ViiXZ/3VxjizaRHKW+JtG/ 2WDw== 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; bh=9CwbX7ReJRdMVkkqfLFdn6jcJlRBJFjadokGPCpJ0V0=; fh=9QC5X2+P7FcP1RLnT24wD9PrLMedwgwgVdoErcIHFPs=; b=f51jjP/dZoLbnaEndNZaCOYAoWrJZ3s+RPfIlg0yAOMVj+oD2CwsBGsVVe99ekhdYv 2Yo+af7bP4UW75PEyvsh/Od6KiohydJkmd1tJxhcTJjunBObn8qWg3ch/Gz+3A+wb2h+ Uxz5HPaDEt9/NAuyx3OmGYWOc9wbQmZAuYw9dNsDcG6rPui0P2NO6VLnH3G2KrCCNzQA jr4LfBGFnjjJCdS1ep1wYRXZoBwKUGD1ZJmZWlVzJtxySpTiWXRA+ECllH3GJXUzgfLc BMMyE2j7niVZyuVLrR/Mm5uusT7VR5dPeLDFJNgJZmwEODDtEJtF17DPMlFbn4sEOGBr fEqA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a15-20020a05622a02cf00b0041815201c4bsi5979354qtx.12.2023.11.19.10.22.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 19 Nov 2023 10:22:25 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4mPT-0005Lp-J4; Sun, 19 Nov 2023 13:20:43 -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 1r4mPN-0005GP-NT; Sun, 19 Nov 2023 13:20:37 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r4mPL-00087n-GB; Sun, 19 Nov 2023 13:20:37 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 278D634906; Sun, 19 Nov 2023 21:20:11 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 7E2AB36245; Sun, 19 Nov 2023 21:20:07 +0300 (MSK) Received: (nullmailer pid 3314153 invoked by uid 1000); Sun, 19 Nov 2023 18:20:06 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , "Edgar E . Iglesias" , Michael Tokarev Subject: [Stable-8.1.3 58/59] target/arm: HVC at EL3 should go to EL3, not EL2 Date: Sun, 19 Nov 2023 21:19:54 +0300 Message-Id: <20231119182006.3314111-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Peter Maydell AArch64 permits code at EL3 to use the HVC instruction; however the exception we take should go to EL3, not down to EL2 (see the pseudocode AArch64.CallHypervisor()). Fix the target EL. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Message-id: 20231109151917.1925107-1-peter.maydell@linaro.org (cherry picked from commit fc58891d0422607d172a3d6b3158798f2556aef1) Signed-off-by: Michael Tokarev diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 58787ee8a7..7267f172d7 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2355,6 +2355,8 @@ static bool trans_SVC(DisasContext *s, arg_i *a) static bool trans_HVC(DisasContext *s, arg_i *a) { + int target_el = s->current_el == 3 ? 3 : 2; + if (s->current_el == 0) { unallocated_encoding(s); return true; @@ -2367,7 +2369,7 @@ static bool trans_HVC(DisasContext *s, arg_i *a) gen_helper_pre_hvc(cpu_env); /* Architecture requires ss advance before we do the actual work */ gen_ss_advance(s); - gen_exception_insn_el(s, 4, EXCP_HVC, syn_aa64_hvc(a->imm), 2); + gen_exception_insn_el(s, 4, EXCP_HVC, syn_aa64_hvc(a->imm), target_el); return true; }