From patchwork Wed Aug 3 05:16:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1663206 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=dO8IarEB; 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=Nhmpey2w; 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 4LyKqk4cTmz9sB4 for ; Wed, 3 Aug 2022 15:17:38 +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:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=c4AuJpaH0c4yKZCgoV2Sgq3PquXnyonXX5KkUpGNPOE=; b=dO8IarEBuFb/LO WmLspe1Z+wtQ7+AUtjNPV7qv+nZN81W7r7uEmhwGLIwOHPQWQd+xkAKDGMm/0Uu2ll/5LkTuRqbsz cqL3KZMIeuVR8gl4FetQEoCC9+b9MmrdANg9HA8GYkYeTMYnz60Ga6zw57eoEDKwkQqZAdHHqxtqx C09DdLfY3r9bnqhtdYFYsMeczO2eUic9Mq/WW1ZRd7pbRxQj6DlWLjA3mRcjP6UPa5Sbj6zhFOrxU qkyUzDqOZuB7bWovQEAPB7UC5Pyullf/qvr9ByG31t9yhKJ+PDysgV5gBtMX+SGrmHynuvK0d/zvt ikykv7IL/AR6cgGz1/cw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJ6l1-002cpr-LA; Wed, 03 Aug 2022 05:17:23 +0000 Received: from mail-os0jpn01olkn2054.outbound.protection.outlook.com ([40.92.98.54] helo=JPN01-OS0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJ6ky-002ckG-7Q for opensbi@lists.infradead.org; Wed, 03 Aug 2022 05:17:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GIn3f0y5HitjoKTQt77lbYvGVhoqp5IWbe74iaMRHjANVpeT6CnWYrcvLtSZd4KSliSl4GzQRxFH33OlJ1+7zCtWu3/mdyWp3+61SaVgpV7bZ9eQa3s1BHODYB/w8ETSJXfRpZFzo5DlCIG9O9iEncoS5KU3JORfeEcPoGSguA8hhZjJbeL7GxhnGaTd3NjydeTVQ1F4QULSbFkZPL19Q2AIEjTB10c8bQ4fRttLP//RTqLQyt2Fh3XvfeAdOdYrjfXQ5qXkpvy0j70AB8mGxOie0nBlIgMJOeZ0M1+xEqh917D/WUClmLS0TYau2sECRqcs3AZjEBXnQ7ZBDFKsQg== 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=pkRDg9BLoI8DdIk1BwH/BT+R+0Nsd1G4U1pbmBnM8Sg=; b=Ux9QKDQ+dLSfBedfV3go1xcMYTsLFebYJLhWFbfSljxmYdfu57K0PlVaiijkkSrDtTsKWZw/4hyEnYmiyC67GN4qOxUku/PVpJrtXEfkf2fs11Hg5M81pGJsBHSSOAELE68zGFVDCzaxubTO7m0YMFaE7UC5MFMVPrrcnImqfZ936lc3nP50EZedGpbGGFrP43rqMPLa9NzAos+0ryVXWzM3LZ7yNJblRfSCzci4gZ58Y58bmscuvwUTe9GkjzI4N2+BaN9siYGC4iuwbc8Y9r4AVPZ1Xd8CtsehoQlpazryXaxzt7o6+tHHv4bssSVOdhSxTOk2S0EbxZQYxJ1/vQ== 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=pkRDg9BLoI8DdIk1BwH/BT+R+0Nsd1G4U1pbmBnM8Sg=; b=Nhmpey2wPFAebT5vIVeUABB9GzHHOp1P8CGb3hOL2/8eDiaY25gxyMP+5YF8qXTkiu0owAC8YbWzfLZCkvG7B7EaF5dKDeIwI3nNSjhM/BKvfrvhbrtDggnYYReId4NDDp8y50LVztbGGARUUk/5HbCjZssE+sqDpJ3rXDNk1S3pj5IZkvX0RUhvgM8OWbmUQZM1YtIdn5fDDCE0ylHR4RdVK3ad94O4rv2HFAOlWHaetYyz6xxP71XsLZAr0SAxt/NLOeaBSn6o1V50Tw+TaOgVHglwDutV/hFsroQdmHgmqdwgfTQJx6FaI2JIb0B3PeWKkQqyaM6sSxVBBQ0ktw== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by TYCP286MB0734.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:77::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.10; Wed, 3 Aug 2022 05:17:04 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36%6]) with mapi id 15.20.5504.014; Wed, 3 Aug 2022 05:17:04 +0000 From: dramforever To: opensbi@lists.infradead.org Subject: [RFC PATCH 3/3] lib: sbi_trap: Set hstatus.GVA when redirecting Date: Wed, 3 Aug 2022 13:16:52 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 In-Reply-To: References: X-TMN: [uZFF3gmv7HcfdSf2iWvSyyZQZCiL1seY] X-ClientProxiedBy: SG2PR01CA0186.apcprd01.prod.exchangelabs.com (2603:1096:4:189::14) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220803051651.1956484-3-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a78f35b7-f866-4347-d6c9-08da750f66ee X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRclnxqtZN/I05JnK8+TQetDZsJXRYKiue3PqCHMBeZQU4O2RyPbvozHnoCsU+n4TQKWtY1BMgeqoN8utDmh+bMSOB6VfEfFAroBb8e+pqtT109IHsINiiHfHEF0Xg1bdQYyZC/JC+G8laGfpno4fplkQMadbQQ4B2KYx5pyBeSsF8lMpr9H/8SukF6zIAuQoR6pTKaEifN/qctNpmSDPjszAE6+2E+TvG+95GM/gTjeAcv9m8PV5U4vrA/TIsdhNfqga1NA2zeNMjZYcOvl82zCd8drfRMmwMTGY8VV9GKrNwoMAjw6hQKCm1LdY5b6OHnFXPU+Q7Lnw3ey2cDQ+kjGDRhB1WUvwLo+/lj9HxOdi+3vY+h5suviFOSoFJdGXvuTNLARKGF+Hc7o5jUcgqRr7x7rBE9nDmw4S8B/A+FxAtQfPMfXBZGr67rhmOXVB93ZLBoBK9/iLjKEvHk7LK1uGL290HuRB0SOzmqw77Ems+Oea8enX0CX+9q5dCzaIXllC+18HG2sxO3qU0zw24FbaIla4CZmWsc/B/9tKo1B4i043AVSxjINYsxFf2L2QWOBnSlDiNn4zVaTcfUMJOLixlWdnQnIb+EbTse/x15P94Uo9CalhPYsdR1XhxLpNQBZygyAUPivGaES+hbcaNM+K7ZImfaK8Bedj8GrUahcVwHgehEveRXHok7nLNFFfmxer472NDMVWwcB81214ZEcXOcMQBf/KdUtE15HdnN9xirhh4WwfsBqa4bq/YlG1I= X-MS-TrafficTypeDiagnostic: TYCP286MB0734:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yyLmjka6GLVxdGkBDzGhhrspTR0mPqMWExakJhICOeIhnjLW82aOVVlLaBR9AZh5S7n90rihGZuPKqlbdt4ITC11kvrsDqTbYWqfGYYxjVbZC4cdsTeN2vIq9Qi2iRlNLkQpfHH+66Lxr7J3dB7WG+R3Kg+1nHQn2pdBaCxVgvomelwJV2LugcZNw7mrvavKlCsYMCy32yixoMdsiEQ2GbLdAG0wpzKLY0jYwbpbZqBvUy6/Q18UwaMHKmHE4BOBnRZ6SxRp6E8P6RbDnxmDGM5U23HuLUYwMsuveraW1iAJyHfUvn41+o4BMzD2cZeEOkndal+eA2/TFxKnDi/UgNrq6QWovRnnvnaVXf+pEA2XVxwMq4S3/O2VqOw2Qs2HFvtsJdOJP5Cq66QrstlWOcX7fyp7r8hdb1ZyT3t1hmzXTNEdwj1D9SS6VoYGFc8WXr2nHEbDo7OWqdM0WkQQF41nWUT81/aYMqPJuOFFc/N6vMFm2eH8hRwCz5BPyeKkOPRTQEQuefjc8S0/x4DAUp1pVn1pgnAAQfO6ena6NghqboX9rKknRAqJ7qV6/WPOsgOvhMHw+X5MQwj4y2AHauYeBtKaq6fwER+hTXZFBdIIg8LqWg//dEb9+9vhFwqgHi8eHQ85Hy/Rp+VgqD3bSQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7U5MyCHreuEVJjBYsyRxdQu38/rWceUm0Gbecm90bGchJcRSSgwQeo5WFMhdCacgDGCp7Fb6Ic70qDx3ID/mT0ox38UpnpCZ4TOYkmDZ101H1onBRgXB1XLS3UOMZDNbcBroUN39ONGjES+YZlAEvda6S7pIL9HaABWGM6VDzaNp4r14Y20bwtmD4Qiadw5tFFNWtK8Ol2EN4GSJ2p/bVR/96HIeP7CHFEqbPir2iNbo1jOJq5LAvot9yczBvHlb/HyLSOPIcRTcBuvxlqaOVdJRs3ySts1AsFn9IGHhSU+tzKn1dGpL0Qth1swVZaTSqu6VBKT1hY6zd4NuQ3VAgaZ/7w6qeuU3FBo4eFyBn/lHdm7iUeDJvkv6323HarTKTLFbJOoif6h+2raY9JEHPYmOIs6TEkKsez5YswJJb3sM2LLOCsGjBaDZxHBoadEAtTbmhHjgmoUnWaviU02DvAngJqQ8rrYKMzeYunLpwAczvHBhnElG8uQY55Kkkr3ArT9N9rReMLR0VjoOZKnFSfSW3YZKqp/8aPAvQiinJXV1coxQc1fkYCJ3Ht1gO0sIj8TTSKI/OUGk3xf05qpMaJhDpJ+BpMi93B/QLRfFpddU1zG+SbZgEJb46PZHLicBedlyAk8mQYVHqCAoATovuPS9Z5gnLo/4BxO0aV16vsykVvuxaj4iLEI+Q/TnCn1RHz/7POMinIsimex4pgSg9NMFgVVLuUtfzc3mFSbJAflbkaGZ62q2NbHLpFaShlfPOs+T2gmVqlzv+l4BDNTN4Iva+aKoMq8VttNWBwqkgF0RuTyvOAkncbDaxvG+VDQj2tjXRCJg/NAvCWJI9Y20+z6jhmiHT93Auaa+HZ3ByhOJ9gZxXNymgqgGS0AAYsUqkUELGoQjPiT4ss9440S0cZoSQbghIKSE/t2pABX0EdHKKOgz2e7TUlsUEeJwrWWbJm/KZpoQ4prXG75FQk2SOQOmFrXchpmia/O3nNQk+2DKNitNalbEqo8hu0Kn3aQDleMpOu6DMtJsmRWPp+Jlu/4Jy66wdcRwSdcJEYtYbW7SWEh4hVMogmSSoY9h8Bl5C9IeaesnOxJ5VTt9T90th2RIpmyclDt/gRKVsmBtn9ItLho1lVhHxJB/BWBBEIXbwDL8zKvS0vdcSm5E1IrdBDcsAi9GSn3cUf/NiNw64uWlsSYY4+ZCVMPnazj2BzJGLtDy2eIb0KZSYhxOQH8sEiOtrRqH5JjuA2kaMagnzWwfnMWwyLtQzZ/snfrDCm9eCjYt8BpnINmSq+gZROVFZQ== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: a78f35b7-f866-4347-d6c9-08da750f66ee X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2022 05:17:04.1480 (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: TYCP286MB0734 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220802_221720_291495_39090428 X-CRM114-Status: UNSURE ( 9.33 ) 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: --- lib/sbi/sbi_trap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index ee3e4e9..1669577 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -118,12 +118,15 @@ int sbi_trap_redirect(struct sbi_trap_regs *r [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.98.54 listed in list.dnswl.org] -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 --- lib/sbi/sbi_trap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index ee3e4e9..1669577 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -118,12 +118,15 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs, regs->mstatus |= (next_virt) ? MSTATUS_MPV : 0UL; #endif - /* Update HSTATUS for VS/VU-mode to HS-mode transition */ - if (misa_extension('H') && prev_virt && !next_virt) { - /* Update HSTATUS SPVP and SPV bits */ + /* Update HSTATUS if going to HS-mode */ + if (misa_extension('H') && !next_virt) { hstatus = csr_read(CSR_HSTATUS); - hstatus &= ~HSTATUS_SPVP; - hstatus |= (prev_mode == PRV_S) ? HSTATUS_SPVP : 0; + if (prev_virt) { + hstatus &= ~HSTATUS_SPVP; + hstatus |= (prev_mode == PRV_S) ? HSTATUS_SPVP : 0; + } + hstatus &= ~HSTATUS_GVA; + hstatus |= (trap->gva) ? HSTATUS_GVA : 0; hstatus &= ~HSTATUS_SPV; hstatus |= (prev_virt) ? HSTATUS_SPV : 0; csr_write(CSR_HSTATUS, hstatus);