From patchwork Thu Jun 9 07:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1641035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=QRB6iWf5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.a=rsa-sha256 header.s=selector1 header.b=QFEnox3f; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LJZtr6Z5hz9sFk for ; Thu, 9 Jun 2022 17:08:20 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dTAN3+NedKd4nM12SbO5TcP7tAYoh5RGmGBCJQAkg/o=; b=QRB6iWf55EUU6l eSQUbdiv0rLQ13q9KWB7SaRiWSv4INA3kQqacpIyo1WqAscfIfAK5HD8iN7uz6KcpmY23WvvoxVzA nD+NMuGyqNYim5PamwsWBUAMP5HEsDWaPuWvLOOHhsWRnwLgMKpvvSqlZC0jUb7NXniMa+WLE0gaY 72J2+DeXjjZxDv9LovhkPoU+rrlZVJY01RmDgJQDlSUgrbatLRaS0SkpWecWtzRg6VimL8KWK/zT8 4ko5JZOG4rq71kAI1CR1cMv4Bvp1xhW00p4vK+9s44xDDCtEcYsvmtnwiMhwbatfPNL8KKU5xTSq6 WmuekXtSB2pAiV0vTcWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzCH0-00HGki-2s; Thu, 09 Jun 2022 07:08:06 +0000 Received: from mail-tycjpn01olkn20801.outbound.protection.outlook.com ([2a01:111:f403:7010::801] helo=JPN01-TYC-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzCGu-00HGfK-7X for opensbi@lists.infradead.org; Thu, 09 Jun 2022 07:08:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0MhUNr2HnuRVAX9MWrPELWcfPCgC6fe0DsbKE5ZMQwWzXhgEMKFOM578g6UUJNUm5CZWfwB5/ZUZ6t+hVHKdAs64sZp4fiWM6tBzh3Zxg2HeoS82S/X6+0Tt96gU4/z/aKbHR1Dyk6LROcoSjuNhQF/TFiE8c0091VyYx/lWDZhWhvlcff27B3yp6ZU8PxBe/QYHpOqf9uZpINUPHM9JjKH7O4AD4Ky8ukiABUVIVKuTGffmpYtD5nxSFw+KA400J3dKZ4o8OEl8KyH1G+DWHKARqJlwQmVIf2//2RevdLR1bhpKg12V+bylnCm3H64Su5XwYBqtJde3haEt6415A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s2MN2rS+12AeJx9MChd/3PFJUPlu+rNE++YVCswLNMA=; b=EUmmb3IaNP5q1TLXAVLGkSD58rTmglGJRsVBNCW0hdF4sIc/dsjatV6zC/eZviyhxTXu1w0Pr7JKGAMYSk9S8f6dQ9xHuqfNP4Yz1tcbYSSXLqdCQF6FOVNhMXL1OSVu4HQqBLIxG7eTV9DSy3OkC99KIChWAHqPxS5qyahyU9GQXH0koRbq/6EuGe9Oi76KUhGl1zB5OofT3ZEaNvlYmsD4rhs/AyBBZKDvXpCVDLoyPLTspoGXniLj0xNNYjTUY4/E45FlNigi5WRYvrIdl7Mkj32GmbpWwDhpbrQSySkdGHHhNdFDl43iiOYxGjDQSqBkzCoBPviuNsdZt44onw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s2MN2rS+12AeJx9MChd/3PFJUPlu+rNE++YVCswLNMA=; b=QFEnox3fiuCdLz3sI93PHuSsbLEdvIayDNboYuovMA5HwV9Sf7LCV9WJ7efsCTkqW5y0PS7MwERnHiE3lzy3KC2a9p0xIRzJTUgR6e5wcuZPbxBl1ZkWMkV1f4lhe2dcZMcC9r8/ehamB2fcEUKIhTZmdqcRdAo3in+cp/2Gr29hDxjWT7v5rJbqc7X8PIfOTWnHYC4Kjqvu4DLpUUSA3RRBJ99GFFkZzYyHvGVz/e+G1ILSI5Ef/GawyRUusnN3nO12wD1997a1hyMdE7rqUM+uO68tiSnCBdiz76sDvkWZKjJJnYTDJpOHn9q8bSy2fdP9o5KlYPdJ8AoD+a/fQA== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by OS3P286MB1334.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:12b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.11; Thu, 9 Jun 2022 07:07:53 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::d46a:33ed:9885:418d]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::d46a:33ed:9885:418d%5]) with mapi id 15.20.5332.011; Thu, 9 Jun 2022 07:07:53 +0000 From: dramforever To: opensbi@lists.infradead.org Cc: dramforever Subject: [PATCH 3/3] lib: sbi: Fix tval and tinst for sbi_get_insn() Date: Thu, 9 Jun 2022 15:07:31 +0800 Message-ID: X-Mailer: git-send-email 2.36.0 In-Reply-To: References: X-TMN: [SoxkkWwX435iX6+gDq/dp5TyI7oZ5Sb4] X-ClientProxiedBy: SJ0PR05CA0022.namprd05.prod.outlook.com (2603:10b6:a03:33b::27) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220609070731.1095255-3-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b11a76c-7828-4388-4f6a-08da49e6c545 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTijo6adWu98SeQwQNDMnIRs6g6GD3u5uvCgNbknQqD+YSM0sNFHq6voIhhJeP3vuHkeEep51c5NhkGrrQHPNLU6ud3J2geETQFVhmLfmCX6rOyJ0wQ9F6Rllro7DQNdAnjxA82ooSV0KPuX5K/AsSfnlO/gJnh/WBQ4VPFjmiELRMnCsrI4Hp+2rddx6CNwZpCUy3/zS0mcbID1t29jXgPl19HvZeijjqkYWmnaVHVXQx4+2IVdToOhvN/74cz+2FTa0GBc5uvjIaePDZYg+Mh21qtXCTeOKc3Lni/WfZfWg6UnTCufxMfpeHltzcfjoiG0gt5tNacWxC8+HFw1LK6FJGeVDi6bzTvEtqqvNCIakFo7plbYCWWlE3PHJ7ysimipYBGVUBKX7SU3NN0pqGditHrVOz9ej1HN5CIqaGSc69Tb/kvwd1mjvnRKk4oozyuiJH5+UXB7URfMGuqkzQhRNbcXFW3HL+z5Vr+TJLLUdczOoS27GcRZglj9HkqXG42Feyj7GviEdfPNvcKVPA39ksytFS0vhbV6cvnkog4smVxDmKsxbVqeXL4JiEF0dWop5FlQQmm+qGro/O1xg9ecLvfi9MfziMUvpCqNK87S2/0mV4iyQWHYMYtESjyf7d+JUAXivpqRYjrboOI6XINvBtQMJ8ZnZ7dlaM1PsRKwCabll50B9dPLSOmWnFowTJch2n9L65ejGlJmWTfbEWuxEPP9mDvjI3Oe2nmB+JPCbF92YE77MYOiUWH7s3lxGE= X-MS-TrafficTypeDiagnostic: OS3P286MB1334:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bXDoh6QuaBULjLWyddKcWCIgl8z4XMM4XqeMD+VpYFh9PYYXdKQ1XrjcCoJR+TV9X1GjQ5Mupw/QFFngqR95smqUWSXPqLc077m5R7/22eCtEycWX4ecdKdlh7q1Cq/dvHlo2BotYKP3uuP6JVrzvCVpzlBqDKXRhwm27nwC20+w0glV9oOCa+OjRMYW7LUYl3sOYl1u9QVdBa0OS3cWp0Kpi2KxycqcLIAulNpkvWVhh88CWsXzqaX5ew9O2kyNhuHluckzzu2MTGDa/7wrTXDBApf5F2L5tStFfPA5mM25+o542KStDAQ+LbyYB850qUkvJzgiBtKXIGHf27XelQKZw7QPCHDkscxlJkNTulEo6447cSyj5+p22NLvDNQptfhGGxt06nkvvXPyTkaxmhlmHxQhLeomjiqjHGiEfKOTrfDfDChzApzQwKItd60q7yYflm5jP3T1YG32R/6BvqELyq7Bk9u90vEzYtjtY6lfy0LbI/edloCMpFEYhS5ZXyeT2l8nedsUJ5weCgp9LTcDzbZHnLuQZYwIx7oB08UWT4rv0hIongAcFepf7PLHAQuZdmuZlqCjyZYkcbDHIQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RmA6ZC7W1tOB8Gi9wTfdYhdo3IkkSQ04fT9PtQDVxDxdeAefgYWnhabbc7C9mwtXIZkfwzzgH03v4eoKKKu3SyOPxJ7kj+mpJxbyJX8clx69Zif1bt731NwWyOCQmyVyc03UmdSyevsi7YRMQj6cOf8E/qDSF3Mc3T7dvpRXonyeHpKielNALwhQwgGkGavBZ0QFzHN+JFprLlcaGCP/jgvSqwqILUA6k+7FAQQd/D6L8uANcheZLyJmzzWGm91yEe6XfXPF0nCOYcBJXo+yZB8pqJGv4CbObvg6nv+TCjXT/W/F8tOj2eHvH/x45rKs3eOdR3o/A0LojdTBBMUQUPGqTsAIwV8PWkGfiPlVUK2I92B3sWFu8bqZyjiNikoSDbvjgcnUyJAQwoYpOspOtXU9nhjr0kBiW5yCaAHzGFl+MCuKfUqYpyPUqBIl2PRdosDuuWh6Ipd7wDiApVLn77Pd4FqrSmRhtBrGV34GP8GX3N2ya6+94vc22mSYs/uqaG3ig4wiepCg1QiBAaV59xINfMe7UFADuri8wROf2sy4wYuYTvii3jPFlbJOJzTM+EuPglNpzvrhtJGEfyK7TST2RnQcHQOr+oe1h0NX5Iqrzvg54mayGyEdNWn4yIsdnXoMLRcNLuYpTWIWnIHStm0Yd+5JbZeR+e1w9zlgXhB7687XxmAksD7WDQNEHn2nHv5AEHmhJZk8eT3bYDVv8ws/EgPlwb5pXJHUnxvGLbpL35lQ1DhN/DaoHdX24lTnFmCisuk0KCX34xzAwNiKOyVLfz+eri0YeQ2XHpo+Bb0MxCjPaH5JSLXZLglBgjAwnlCEInhUJY3YxGqMQLPZFE5eq9kKAmEe6tKJMu0FxoHWZvxenA6JsMeNXIvt+SENmecovPS2B+qm3YkQXuLSx6dzlilgxqJSCHHvY44BvEuTjLYLvAF7DMTRXA/Q6izf9v6+EbmPuZfeqdlW9Edp8FkRERhZg7M1TFCdlpaAlbtX6mBEkhOrJLvSPGoBFqoj+ScQhgNuhcVYqQpnm56OIcR4US4zGDb87wXzFhGcxXsQqsTE0MCYPzKeCz6AOaZ9zgHzBlO8mVSe38TkR7WvguB3qqKdnuQn9CucH744QkcbCJBwLjk1/AciNTrQXwqyWB/5VQ/7/UNN2UNhWI4Dq+JEmT0U/M9tS19o6c0Zg5BR9lJEnoBBEr6nB14omNGFw47pzbnhFO0XvPD2+k3sknfGvtbWIiEG+aGp5cFt4kHyfkRnZ44+KQD/iB2ZhHfOdL1HzaX6v4xUcCUXNv8MrSwCT63UNQU1X1cN31OWj0mEOWKzbcF7SZuVVCnWXRUYeCJ1W2f6/3P4dWOPNzM7rOpwP1WNMA6A3k64pkkO7VECmymWXJPBPk+mUvYjChkuTeRtYqc90hOuQjIS67YUAQVVZFPLCWNoU0KqEVBBRq0= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 2b11a76c-7828-4388-4f6a-08da49e6c545 X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 07:07:53.0586 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3P286MB1334 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220609_000800_309864_891AF47D X-CRM114-Status: UNSURE ( 8.69 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: We should not change trap->tval to mepc because mtval already points to the faulting portion of the emulated instruction fetch, which is also what stval is expected to be. In addition, htinst is only allowed to be zero for instruction access faults or page faults, and is only allowed to be zero or a psuedoinstruction for instruction guest-page faults. Fix trap->tinst fo [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dramforever[at]live.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org We should not change trap->tval to mepc because mtval already points to the faulting portion of the emulated instruction fetch, which is also what stval is expected to be. In addition, htinst is only allowed to be zero for instruction access faults or page faults, and is only allowed to be zero or a psuedoinstruction for instruction guest-page faults. Fix trap->tinst for these cases. Signed-off-by: dramforever Reviewed-by: Anup Patel --- lib/sbi/sbi_unpriv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/sbi/sbi_unpriv.c b/lib/sbi/sbi_unpriv.c index 73b530c..9a34a71 100644 --- a/lib/sbi/sbi_unpriv.c +++ b/lib/sbi/sbi_unpriv.c @@ -149,15 +149,17 @@ ulong sbi_get_insn(ulong mepc, struct sbi_trap_info *trap) switch (trap->cause) { case CAUSE_LOAD_ACCESS: trap->cause = CAUSE_FETCH_ACCESS; - trap->tval = mepc; + trap->tinst = 0UL; break; case CAUSE_LOAD_PAGE_FAULT: trap->cause = CAUSE_FETCH_PAGE_FAULT; - trap->tval = mepc; + trap->tinst = 0UL; break; case CAUSE_LOAD_GUEST_PAGE_FAULT: trap->cause = CAUSE_FETCH_GUEST_PAGE_FAULT; - trap->tval = mepc; + if (trap->tinst != INSN_PSEUDO_VS_LOAD && + trap->tinst != INSN_PSEUDO_VS_STORE) + trap->tinst = 0UL; break; default: break;