From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:18b1:b0:a2e:1324:ea5c with SMTP id c17csp1022128ejf; Tue, 16 Jan 2024 09:29:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGT54kd9o6mh9T3DH/avJ9PAIk/EpX9dSn5KVe9NXQd2RdWSsFf7mjhNIEo3UqMudcucItN X-Received: by 2002:a05:620a:122c:b0:783:45bd:4d28 with SMTP id v12-20020a05620a122c00b0078345bd4d28mr7416450qkj.9.1705426186267; Tue, 16 Jan 2024 09:29:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705426186; cv=none; d=google.com; s=arc-20160816; b=M71hoU57QG6HLycZiyaPB0e1iI70jYRq+cB4Oz61TY/bMn4FYIk84DU+WxKz8Qv0nQ j2jpgmWVdYDPB4rNzx7qM2FyRYUSUG/PGURMiUiFwrSw+ZczE3lWvTc5As6tzVwLw0lH edQvE58k98YGf8uIH7WuXec0ABNJ/eSm3GEdvqQE5mw1MC2SHRBI6Ywa4srAjQIgdZye zQOEUJqtJJJjDtj+Shciuu56J35AMvvjSqxvtR0MkQbZZOSjc+GHsjhzWVli+dCc3u5B 7ykwQafeX0eNl31UxmykQC8AUcyfoXk4YFMrT5TFXj8XcB5J8ccDabwvCL1trmnODIEK QGKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:from:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:date; bh=piYULvdV+co80oXQCnZeWXIkrWknrqpTia8KAdIy/4U=; fh=CPqfQhXyZp7q048m/2YkQDugvmq3ADVWuTpqTS8jIPQ=; b=XIvB9RruFMC+ThntIAxxu+TI9cfGDv7XLPZLp+H4kIYk1G4F//z65q1VMwjmdiDRjJ bpmmaMy+lRjImXbBdDgojclcqI/jLBTjayy4kBvwExKbivauskiGDvCVQcWCVnWbsDCj AIg+K/1/rbyAawnE/qcjL0M2q/yqKv7XmC51nU8mSMHVNnoCvICOkwhOPPWYIjyiDsWa xywdu6Nqs254+0EjK8tt0U7N9b79bv2tOPJcHZjYkUFMzTtKzuimAXs6+oDUICIIi2jO VjkYEEUSrlpCmlb57TMFwQ3/iQcygslpkpzxf+UkAi+f+Gp2hvfPtMhxTG5Eo2KYdwkd Ah5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u13-20020a05620a454d00b007833e6a3e8dsi10793166qkp.333.2024.01.16.09.29.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2024 09:29:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPnFY-0008Mm-NW; Tue, 16 Jan 2024 12:29:21 -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 1rPnFX-0008Lu-07; Tue, 16 Jan 2024 12:29:19 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPnFU-0005oh-NI; Tue, 16 Jan 2024 12:29:18 -0500 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4TDwsh44qtz6J9xb; Wed, 17 Jan 2024 01:26:32 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 30B94140135; Wed, 17 Jan 2024 01:29:10 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 16 Jan 2024 17:29:09 +0000 Date: Tue, 16 Jan 2024 17:29:07 +0000 To: Peter Maydell CC: , Subject: Re: [PATCH] target/arm: Fix VNCR fault detection logic Message-ID: <20240116172907.00003e6d@Huawei.com> In-Reply-To: <20240116165605.2523055-1-peter.maydell@linaro.org> References: <20240116165605.2523055-1-peter.maydell@linaro.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500005.china.huawei.com (7.191.163.240) To lhrpeml500005.china.huawei.com (7.191.163.240) Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: tSFzMs8CuOZr On Tue, 16 Jan 2024 16:56:05 +0000 Peter Maydell wrote: > In arm_deliver_fault() we check for whether the fault is caused > by a data abort due to an access to a FEAT_NV2 sysreg in the > memory pointed to by the VNCR. Unfortunately part of the > condition checks the wrong argument to the function, meaning > that it would spuriously trigger, resulting in some instruction > aborts being taken to the wrong EL and reported incorrectly. > > Use the right variable in the condition. > > Fixes: 674e5345275d425 ("target/arm: Report VNCR_EL2 based faults correctly") > Reported-by: Jonathan Cameron > Signed-off-by: Peter Maydell Matches what I have locally from discussion earlier. Tested-by: Jonathan Cameron Reviewed-by: Jonathan Cameron Thanks > --- > In less lax languages the compiler might have pointed out that > the type of the LHS and the RHS in the comparison didn't match :-) > --- > target/arm/tcg/tlb_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c > index dd5de74ffb7..5477c7fb7dc 100644 > --- a/target/arm/tcg/tlb_helper.c > +++ b/target/arm/tcg/tlb_helper.c > @@ -184,7 +184,7 @@ void arm_deliver_fault(ARMCPU *cpu, vaddr addr, > * (and indeed syndrome does not have the EC field in it, > * because we masked that out in disas_set_insn_syndrome()) > */ > - bool is_vncr = (mmu_idx != MMU_INST_FETCH) && > + bool is_vncr = (access_type != MMU_INST_FETCH) && > (env->exception.syndrome & ARM_EL_VNCR); > > if (is_vncr) { 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7ACDDC47077 for ; Tue, 16 Jan 2024 17:30:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPnFa-0008Mn-5C; Tue, 16 Jan 2024 12:29:22 -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 1rPnFX-0008Lu-07; Tue, 16 Jan 2024 12:29:19 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPnFU-0005oh-NI; Tue, 16 Jan 2024 12:29:18 -0500 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4TDwsh44qtz6J9xb; Wed, 17 Jan 2024 01:26:32 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 30B94140135; Wed, 17 Jan 2024 01:29:10 +0800 (CST) Received: from localhost (10.202.227.76) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 16 Jan 2024 17:29:09 +0000 Date: Tue, 16 Jan 2024 17:29:07 +0000 To: Peter Maydell CC: , Subject: Re: [PATCH] target/arm: Fix VNCR fault detection logic Message-ID: <20240116172907.00003e6d@Huawei.com> In-Reply-To: <20240116165605.2523055-1-peter.maydell@linaro.org> References: <20240116165605.2523055-1-peter.maydell@linaro.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.227.76] X-ClientProxiedBy: lhrpeml500005.china.huawei.com (7.191.163.240) To lhrpeml500005.china.huawei.com (7.191.163.240) Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Reply-to: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Tue, 16 Jan 2024 16:56:05 +0000 Peter Maydell wrote: > In arm_deliver_fault() we check for whether the fault is caused > by a data abort due to an access to a FEAT_NV2 sysreg in the > memory pointed to by the VNCR. Unfortunately part of the > condition checks the wrong argument to the function, meaning > that it would spuriously trigger, resulting in some instruction > aborts being taken to the wrong EL and reported incorrectly. > > Use the right variable in the condition. > > Fixes: 674e5345275d425 ("target/arm: Report VNCR_EL2 based faults correctly") > Reported-by: Jonathan Cameron > Signed-off-by: Peter Maydell Matches what I have locally from discussion earlier. Tested-by: Jonathan Cameron Reviewed-by: Jonathan Cameron Thanks > --- > In less lax languages the compiler might have pointed out that > the type of the LHS and the RHS in the comparison didn't match :-) > --- > target/arm/tcg/tlb_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c > index dd5de74ffb7..5477c7fb7dc 100644 > --- a/target/arm/tcg/tlb_helper.c > +++ b/target/arm/tcg/tlb_helper.c > @@ -184,7 +184,7 @@ void arm_deliver_fault(ARMCPU *cpu, vaddr addr, > * (and indeed syndrome does not have the EC field in it, > * because we masked that out in disas_set_insn_syndrome()) > */ > - bool is_vncr = (mmu_idx != MMU_INST_FETCH) && > + bool is_vncr = (access_type != MMU_INST_FETCH) && > (env->exception.syndrome & ARM_EL_VNCR); > > if (is_vncr) {