From patchwork Thu Feb 13 15:37:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Babchuk X-Patchwork-Id: 13973479 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 38A26C0219D for ; Thu, 13 Feb 2025 15:38:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.887826.1297288 (Exim 4.92) (envelope-from ) id 1tibHz-00006b-BI; Thu, 13 Feb 2025 15:38:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 887826.1297288; Thu, 13 Feb 2025 15:38:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tibHz-00006U-7h; Thu, 13 Feb 2025 15:38:07 +0000 Received: by outflank-mailman (input) for mailman id 887826; Thu, 13 Feb 2025 15:38:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tibHx-000853-Vf for xen-devel@lists.xenproject.org; Thu, 13 Feb 2025 15:38:06 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062f.outbound.protection.outlook.com [2a01:111:f403:2614::62f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 83bfc019-ea20-11ef-abfc-e33de0ed8607; Thu, 13 Feb 2025 16:38:04 +0100 (CET) Received: from GV1PR03MB10456.eurprd03.prod.outlook.com (2603:10a6:150:16a::21) by AS8PR03MB7030.eurprd03.prod.outlook.com (2603:10a6:20b:295::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Thu, 13 Feb 2025 15:37:58 +0000 Received: from GV1PR03MB10456.eurprd03.prod.outlook.com ([fe80::a41e:5aa8:e298:757e]) by GV1PR03MB10456.eurprd03.prod.outlook.com ([fe80::a41e:5aa8:e298:757e%4]) with mapi id 15.20.8445.013; Thu, 13 Feb 2025 15:37:58 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 83bfc019-ea20-11ef-abfc-e33de0ed8607 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Bl5ebXVtgIhkPMEwNgHsOof++VfPRAA2ThrYaEK8VBybKn3hR/Ea93U9qHuX+tJ3hkgXNNMeJNeA8SkV6h4ts0+BrBgtoh/eeJNFP3gnAJaQf7TKYylaGhdvYbJoLY7jxR/KKfb7QAgTiVPxFS3RjnkBtvXHCPLxNoEwsTjcQ0T9N1J9+ddkXRLrcatgMlfkWmlqOQzfxu7L3PM6mcKHkJre2o7bHFUvFo1STViwf6vTItruxl56rL17G7ndl99xMv/E+LhQexe6KcL+t8SSwTBE3qRh8Pq+fjDk/F7Az5rOA8/kyw8tZ+Ao+XPiWRzueZnbezx2U7gpKRzFKp5tgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=5lUWhDpk9z4EobijUnTQ7RN6XrcUJy+kCom73IXEI2I=; b=sEJfZL+ygAgiR6OUfcNsFhPyUM0LIrBZmwjgtMeriyQOfr3cd73TfmLxSHHypeC4Tj4FNTtmQclC4Wq+4z+1/rTaTqad+jrGXZu2vXbloUo7gZOaGFOyBKfCKyAf9c33dIorcDwjGWstsKjVU5h56+F5QjJ++MMiDiBJdN/XChEFR9ziYN3EF3C2ZVKK0DAuP7CVWZzjQjAjlgh8gF9wA/L6rXcQ7ub4nOP8qxLgIzGtV249nQ5hV4rSvaxsbWkzPOs8srbuSHx1rzO9R4VpB8vX3Za7u6whM4EuNFOMQpMVsFukRpOa8ofAXNuEqsIKytYHOTf24m7m7HVTWFYEgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5lUWhDpk9z4EobijUnTQ7RN6XrcUJy+kCom73IXEI2I=; b=U58N3qkfmEWu46XZHXxAEk0bvf/oQgRiWMKE2yIzuDvxrl8PABkQ7b2BFL1GCH//AyyrjuAqz4DomUm0cmUHADRG8CD87QTrBAiCZ9/WoQCBlbx/mSesCma8FqppIqavNcMB8ACdNfC1/jVqPW2vXJZoAwzybRmO1B0LoKX+V49fq3I+rWs9gvZ/Qtd2KXuLjbRlUI7lBgfB2Io55hPNJuXDD04oQeazYMkDO3AHjC7krw/bloUfbXMhjRXHk9foYe7nF15G3U4+kpu4yifm9Q0pkALwDr0VUhe+t5T7jtgpepeZt0QxAzBfiD4CBQzAzUo3bJEcNyo/jOdPswl0lw== From: Volodymyr Babchuk To: "xen-devel@lists.xenproject.org" CC: Volodymyr Babchuk , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk Subject: [PATCH v2 1/2] arch: arm64: always set IL=1 when injecting undefined exception Thread-Topic: [PATCH v2 1/2] arch: arm64: always set IL=1 when injecting undefined exception Thread-Index: AQHbfi0/n6EK9tAEc02lOS/WV8Illg== Date: Thu, 13 Feb 2025 15:37:54 +0000 Message-ID: <20250213153748.2869989-2-volodymyr_babchuk@epam.com> References: <20250213153748.2869989-1-volodymyr_babchuk@epam.com> In-Reply-To: <20250213153748.2869989-1-volodymyr_babchuk@epam.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.47.1 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV1PR03MB10456:EE_|AS8PR03MB7030:EE_ x-ms-office365-filtering-correlation-id: 4c258905-ee91-4b4e-372c-08dd4c4464ab x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?+hE5/EPOory/gJH98RH2d7ZjYE?= =?iso-8859-1?q?UuEcVz9tsb21ykBI8OSf0ehRYXaz+v2UxHd5hYKFCUXcrL0pMmpkzVszq93j?= =?iso-8859-1?q?tpRtlKvmrY01s5LIE0C1Eelc7SMOCbdhgxsXyjPQ4oB7Lcza5uIGbC3KIW9r?= =?iso-8859-1?q?HfWNBsVoaqJx5V1aEK+LgnoyHm3Vc71sKJxq8ZVF+YcYR1MsNvBOQQ9EgPPp?= =?iso-8859-1?q?S8hKN42+cDyvN2Ez/kCOL2/ocJlGdThhAfk6klL59cqsZfpbs9oxb+PSPErx?= =?iso-8859-1?q?FUpwtItpWo+as6W7Gq2QlR6obKgpes2WhXHijIPz2+vYDGGPDgxev0IVi1Tt?= =?iso-8859-1?q?vUw8Y3oHFNqzVRPAx9kIlMP2662TH8B8wOm5WGbJfwO0o9r17xTQl7VZ8QU0?= =?iso-8859-1?q?nZiUhOW2Xnwf02Iu/HXJTt3sd0NhdUvCqG545A7GJ1OgHDz3uxJq/JA/5u0Z?= =?iso-8859-1?q?O6HMctqNISA6tTQi56tpSN3n6eoFgwMUUKYsh55xwOv9jMSPd9kJyFFT7d2m?= =?iso-8859-1?q?shMRAcTHJID62CCIPhHrSf2AhQDsmAN+tDe8MCLNIPfz+70CDtKuE5ULFmkq?= =?iso-8859-1?q?Soo3wX740TE7ZMvS4aQCGrn9woUfRStjiiVuoldaCMtkjYE+G7d6IIv0qG63?= =?iso-8859-1?q?XCTd8fNtthulkVZr/TTHT2p6Ns/lLGms0F5Yabr2LU08iN+UANJfBeoivNKI?= =?iso-8859-1?q?qJ3Gc83okoBB9TvpB9AIrZ2pxgwFYgTQjUg6OM/BdXFn3TAW8ma07YU8Pp/v?= =?iso-8859-1?q?MhvxZ3KpoOfXFqIBCJgaGboBexPzi4e6cp0gjY53jvkj7rLAm/QWAVr4irW+?= =?iso-8859-1?q?hze4dsajKdeXF912ZPHkyWwq9F3muiUd+5IaasgcdYWVgqxygBsjuuNRPcGa?= =?iso-8859-1?q?Lb6MGADfVz6y2GOqTh+1JiJlBk5AAA9DrVxEaNl0uMZMDTSuKMm8cqvpwtTL?= =?iso-8859-1?q?cdE/WsU/1+RVuPPoYBETG95CQOhtpsG+uYVjqF6nvfqyJF7QEmWeFkK0PVDE?= =?iso-8859-1?q?RyqFOieDMrepz6wS4bvAJyauTRD3eclYk09euQysZnj86EJuZmTCEIQ691GM?= =?iso-8859-1?q?LU1ZxkPFgs+l930nhN3nnqcc67dtnedUlmagxTu11xL9UjhuWPv3k4oD7s4v?= =?iso-8859-1?q?TTn6Dn+5veV30HrywknOQ4tz5IxlCw7B07Yo1W80EBCInt3u/q/wAlzBZCWC?= =?iso-8859-1?q?ktg5eBdIs+71ptqRh2vsxMbeKYbkKoTCqkKk0DmZJqy78yU/qNI6vz6TiE/D?= =?iso-8859-1?q?7UFEvVKRDf/WM/km98qvmxMBSq7N19LZpnOA1RvuL/NZUCv0+GoX1qZdoQfp?= =?iso-8859-1?q?MC5XUy0f6Kk7DUb+AcL8DCZlsZuqm4TXG9h+eoIgJeMjYZSTszh0XpGSSwUG?= =?iso-8859-1?q?NudjvDWpiN2NzyXeGWABiqIBH/1gdlA1ngOS98a4nYyHVXV4VLM8uK38LA2Z?= =?iso-8859-1?q?j/0hqbyC+qPr9E4ulxa68z22ouQCLYmAOI+qv1pFrnk3tnaMjR/om0IGblr+?= =?iso-8859-1?q?NAepXK?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR03MB10456.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?1sekgi7J6469VcZEmv9xCQ9?= =?iso-8859-1?q?jYe7hYyG2lYY8xtAowfoTgrUqY8ihACQUBz/ltlHMMAXWIdTvtX3t98qsAug?= =?iso-8859-1?q?4LagdJtEwtpXmH8GnA0wawL61WeOX0Q0VzppFvffLPfBfgFINRM/89w3MZ6p?= =?iso-8859-1?q?UJBXOOzhr6NYSiDb90Tue8OYTmXtTNg8oVce43laIu0Pb9flD1EBPzV5wD5Q?= =?iso-8859-1?q?iOyb56e/7LgRNhjzAQU0+Dgxe9MlvawycwBvBfldgmy9nvSl8bQzDGWU7n4q?= =?iso-8859-1?q?G9vqckFDmo2kglCTzdLTelJvdS378MX7Y+QIlzMGLKpHho37oKpjGOo3fydp?= =?iso-8859-1?q?sr77g27lNz7gJOLXU+VsArbsf4QfoeVnLCcdJD0xq+AL369RtYGfEE+20q7B?= =?iso-8859-1?q?TcYL7j6+SUHROtzvuBpDcG2Xy+K5ep1ZVXSo5j2ihaPMyNMwqUfcrqi98i07?= =?iso-8859-1?q?gZ1U7/mr3cwUVwlaaZPbYiDKPgPGQQ7uawEpUMzE02VHeeA46xIp6WtUiQn+?= =?iso-8859-1?q?5F6qLpfpmSIPYpWQwLOIHowQMGVsI901xK5c+ITIC0nTAHMc6JaA6R7OuAUF?= =?iso-8859-1?q?MjN7V8w5GXxlmqorJucZ2JNnjPWMdGL0xFCTeMTmqUkjbmUhEShJhVdhHagE?= =?iso-8859-1?q?lQdhv7UNwwhN0BFUVDWNdMVqIXtUZHc/HuNSg7+C4UvVIKX1YMfHcpF06Ied?= =?iso-8859-1?q?EDcMPkZGjZaURX8pBRD+5wWEr5dnSqrZohQ9TQgrYFE2lpoH7r3na1UBUAVn?= =?iso-8859-1?q?ahCELN4keE12m6GRooml+OK+mOTJVo5DoiNbSLrZ6Uaau/wBhZWsituuvwBA?= =?iso-8859-1?q?s3Me/PmHna3Xfh9Dxb1K4mdEgmGII/Jre3G7Z1wsu0ReRFkSAdfvKHxYC7TA?= =?iso-8859-1?q?GZdbQoSepCtKxUdmLXsXQtfMqm9kMr2S1XMc1HhcEOALK/L3k+OikgsdHbcr?= =?iso-8859-1?q?ZgyR+YrlxgwyTBMpn2PsLy6CE4bmXygV1C16F/ZPBP8G7B5ZGA1jp+rDvAJt?= =?iso-8859-1?q?PfMXTM/nvVDwufZ8zx7AUoqDK5AkfR4IP6434jeSvVUtgZn8nvqHfcgmD2j9?= =?iso-8859-1?q?C1W7OJpTyr8kRXFqyyQGT8ySYDgpAoYuGV6QLczctxUT/LAvZlL2AJIRHN9s?= =?iso-8859-1?q?igNG1nKn5KDy8K0kLlww6a69fBIkB5PclabRARhhboXL68RSjWcIF+wOw9Xw?= =?iso-8859-1?q?Z9Y5sIDM454zH9cTxDYEXBKvWZKo5mU1rOFNsemZ7P+hflw+oJBIOpMD2XUx?= =?iso-8859-1?q?H7dgtE+5aPystASOMxImnFyAvq29vG9tYiBBc+esYkJyoeNznYbaoOo1X8uw?= =?iso-8859-1?q?Oe6PhhS2i2YcwnZ5NaBqiUuwALqFc1NCcBozvnDzeViSv4TJy9aXz7/ZUWQm?= =?iso-8859-1?q?KI4HYdUE4Ja60U7sG33MePHe3poKPfNud9kPvoC8m/CYxNVQ3udr66jNISta?= =?iso-8859-1?q?8EFAhEJJEFN+iW/Jc9YpH2ZidAdP68HN/RK5FH3h5jjg4nVkhw99oyCa0FF/?= =?iso-8859-1?q?im1p4dQdR7VCjlYnneo2dWDzTZzrWVwKGkUY4/Rpx9VMN0PI6kuqKmWeR/Un?= =?iso-8859-1?q?71PpnJr7nbAc+LIqfxK8DX4S8vXXW59O7xes38lyP1RiFIx5nULOLKTN1kON?= =?iso-8859-1?q?4/HNYrwMlxZd/ClTzfpIS1yAZHAeRTsBgPc+Ktg=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV1PR03MB10456.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c258905-ee91-4b4e-372c-08dd4c4464ab X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2025 15:37:54.7576 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: iMs8IH+ncpS7ECODAxLIdojuL6blmQZZ+AH6OHpN1FUoRwLCqcQoz6O1brBdp99khq80D3mlLsgw0cwv0cUXmMSlmMG/tWWIY8D+5/sGSbQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7030 ARM Architecture Reference Manual states that IL field of ESR_EL1 register should be 1 when EC is 0b000000 aka HSR_EC_UNKNOWN. Section D24.2.40, page D24-7337 of ARM DDI 0487L: IL, bit [25] Instruction Length for synchronous exceptions. Possible values of this bit are: [...] 0b1 - 32-bit instruction trapped. This value is also used when the exception is one of the following: [...] - An exception reported using EC value 0b000000. To align code with the specification, set .len field to 1 in inject_undef64_exception() and remove unneeded second parameter. Signed-off-by: Volodymyr Babchuk Reviewed-by: Stefano Stabellini --- Changes in v2: - Removed unused parameter from p2m_set_way_flush() --- xen/arch/arm/arm64/vsysreg.c | 10 +++++----- xen/arch/arm/include/asm/arm64/traps.h | 2 +- xen/arch/arm/include/asm/p2m.h | 3 +-- xen/arch/arm/include/asm/traps.h | 2 +- xen/arch/arm/p2m.c | 5 ++--- xen/arch/arm/traps.c | 24 ++++++++++++------------ xen/arch/arm/vcpreg.c | 26 +++++++++++++------------- xen/arch/arm/vsmc.c | 6 ++---- 8 files changed, 37 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index c73b2c95ce..d14258290f 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -95,7 +95,7 @@ void do_sysreg(struct cpu_user_regs *regs, */ case HSR_SYSREG_ACTLR_EL1: if ( regs_mode_is_user(regs) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); if ( hsr.sysreg.read ) set_user_reg(regs, regidx, v->arch.actlr); break; @@ -109,7 +109,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_DCCSW: case HSR_SYSREG_DCCISW: if ( !hsr.sysreg.read ) - p2m_set_way_flush(current, regs, hsr); + p2m_set_way_flush(current, regs); break; /* @@ -267,7 +267,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_CNTP_TVAL_EL0: case HSR_SYSREG_CNTP_CVAL_EL0: if ( !vtimer_emulate(regs, hsr) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); break; /* @@ -280,7 +280,7 @@ void do_sysreg(struct cpu_user_regs *regs, case HSR_SYSREG_ICC_SGI0R_EL1: if ( !vgic_emulate(regs, hsr) ) - return inject_undef64_exception(regs, hsr.len); + return inject_undef64_exception(regs); break; /* @@ -440,7 +440,7 @@ void do_sysreg(struct cpu_user_regs *regs, gdprintk(XENLOG_ERR, "unhandled 64-bit sysreg access %#"PRIregister"\n", hsr.bits & HSR_SYSREG_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } /* diff --git a/xen/arch/arm/include/asm/arm64/traps.h b/xen/arch/arm/include/asm/arm64/traps.h index a347cb13d6..3be2fa69ee 100644 --- a/xen/arch/arm/include/asm/arm64/traps.h +++ b/xen/arch/arm/include/asm/arm64/traps.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM64_TRAPS__ #define __ASM_ARM64_TRAPS__ -void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len); +void inject_undef64_exception(struct cpu_user_regs *regs); void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr); diff --git a/xen/arch/arm/include/asm/p2m.h b/xen/arch/arm/include/asm/p2m.h index 4818dd4b6a..594dc40041 100644 --- a/xen/arch/arm/include/asm/p2m.h +++ b/xen/arch/arm/include/asm/p2m.h @@ -298,8 +298,7 @@ void p2m_domain_creation_finished(struct domain *d); */ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end); -void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, - const union hsr hsr); +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs); void p2m_toggle_cache(struct vcpu *v, bool was_enabled); diff --git a/xen/arch/arm/include/asm/traps.h b/xen/arch/arm/include/asm/traps.h index 9a60dbf70e..3b40afe262 100644 --- a/xen/arch/arm/include/asm/traps.h +++ b/xen/arch/arm/include/asm/traps.h @@ -44,7 +44,7 @@ int check_conditional_instr(struct cpu_user_regs *regs, const union hsr hsr); void advance_pc(struct cpu_user_regs *regs, const union hsr hsr); -void inject_undef_exception(struct cpu_user_regs *regs, const union hsr hsr); +void inject_undef_exception(struct cpu_user_regs *regs); /* read as zero and write ignore */ void handle_raz_wi(struct cpu_user_regs *regs, int regidx, bool read, diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 65b70955e3..ef8bd4b6ab 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -428,8 +428,7 @@ int p2m_cache_flush_range(struct domain *d, gfn_t *pstart, gfn_t end) * * - Once the caches are enabled, we stop trapping VM ops. */ -void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, - const union hsr hsr) +void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs) { /* This function can only work with the current vCPU. */ ASSERT(v == current); @@ -438,7 +437,7 @@ void p2m_set_way_flush(struct vcpu *v, struct cpu_user_regs *regs, { gprintk(XENLOG_ERR, "The cache should be flushed by VA rather than by set/way.\n"); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); return; } diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 737f4d65e3..5338d5c033 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -533,12 +533,12 @@ static vaddr_t exception_handler64(struct cpu_user_regs *regs, vaddr_t offset) } /* Inject an undefined exception into a 64 bit guest */ -void inject_undef64_exception(struct cpu_user_regs *regs, int instr_len) +void inject_undef64_exception(struct cpu_user_regs *regs) { vaddr_t handler; const union hsr esr = { .iss = 0, - .len = instr_len, + .len = 1, .ec = HSR_EC_UNKNOWN, }; @@ -606,13 +606,13 @@ static void inject_iabt64_exception(struct cpu_user_regs *regs, #endif -void inject_undef_exception(struct cpu_user_regs *regs, const union hsr hsr) +void inject_undef_exception(struct cpu_user_regs *regs) { if ( is_32bit_domain(current->domain) ) inject_undef32_exception(regs); #ifdef CONFIG_ARM_64 else - inject_undef64_exception(regs, hsr.len); + inject_undef64_exception(regs); #endif } @@ -1418,7 +1418,7 @@ static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr, if ( hsr.iss != XEN_HYPERCALL_TAG ) { gprintk(XENLOG_WARNING, "Invalid HVC imm 0x%x\n", hsr.iss); - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); } curr->hcall_preempted = false; @@ -1655,7 +1655,7 @@ void handle_raz_wi(struct cpu_user_regs *regs, ASSERT((min_el == 0) || (min_el == 1)); if ( min_el > 0 && regs_mode_is_user(regs) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); if ( read ) set_user_reg(regs, regidx, 0); @@ -1674,10 +1674,10 @@ void handle_wo_wi(struct cpu_user_regs *regs, ASSERT((min_el == 0) || (min_el == 1)); if ( min_el > 0 && regs_mode_is_user(regs) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); if ( read ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); /* else: ignore */ advance_pc(regs, hsr); @@ -1694,10 +1694,10 @@ void handle_ro_read_val(struct cpu_user_regs *regs, ASSERT((min_el == 0) || (min_el == 1)); if ( min_el > 0 && regs_mode_is_user(regs) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); if ( !read ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); set_user_reg(regs, regidx, val); @@ -2147,7 +2147,7 @@ void asmlinkage do_trap_guest_sync(struct cpu_user_regs *regs) case HSR_EC_SVE: GUEST_BUG_ON(regs_mode_is_32bit(regs)); gprintk(XENLOG_WARNING, "Domain tried to use SVE while not allowed\n"); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); break; #endif @@ -2164,7 +2164,7 @@ void asmlinkage do_trap_guest_sync(struct cpu_user_regs *regs) gprintk(XENLOG_WARNING, "Unknown Guest Trap. HSR=%#"PRIregister" EC=0x%x IL=%x Syndrome=0x%"PRIx32"\n", hsr.bits, hsr.ec, hsr.len, hsr.iss); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); break; } } diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index 0b336875a4..e7c484f2c1 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -206,7 +206,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG32(CNTP_CTL): case HSR_CPREG32(CNTP_TVAL): if ( !vtimer_emulate(regs, hsr) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); break; /* @@ -217,7 +217,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) */ case HSR_CPREG32(ACTLR): if ( regs_mode_is_user(regs) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); if ( cp32.read ) set_user_reg(regs, regidx, v->arch.actlr); break; @@ -232,7 +232,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG32(DCCSW): case HSR_CPREG32(DCCISW): if ( !cp32.read ) - p2m_set_way_flush(current, regs, hsr); + p2m_set_way_flush(current, regs); break; /* @@ -397,7 +397,7 @@ void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); gdprintk(XENLOG_ERR, "unhandled 32-bit CP15 access %#"PRIregister"\n", hsr.bits & HSR_CP32_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); return; } advance_pc(regs, hsr); @@ -421,7 +421,7 @@ void do_cp15_64(struct cpu_user_regs *regs, const union hsr hsr) */ case HSR_CPREG64(CNTP_CVAL): if ( !vtimer_emulate(regs, hsr) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); break; /* @@ -433,7 +433,7 @@ void do_cp15_64(struct cpu_user_regs *regs, const union hsr hsr) case HSR_CPREG64(ICC_ASGI1R): case HSR_CPREG64(ICC_SGI0R): if ( !vgic_emulate(regs, hsr) ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); break; GENERATE_CASE(TTBR0, 64) @@ -467,7 +467,7 @@ void do_cp15_64(struct cpu_user_regs *regs, const union hsr hsr) gdprintk(XENLOG_ERR, "unhandled 64-bit CP15 access %#"PRIregister"\n", hsr.bits & HSR_CP64_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); return; } } @@ -532,7 +532,7 @@ void do_cp14_32(struct cpu_user_regs *regs, const union hsr hsr) * is set to 0, which we emulated below. */ if ( !cp32.read ) - return inject_undef_exception(regs, hsr); + return inject_undef_exception(regs); /* Implement the minimum requirements: * - Number of watchpoints: 1 @@ -631,7 +631,7 @@ void do_cp14_32(struct cpu_user_regs *regs, const union hsr hsr) cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); gdprintk(XENLOG_ERR, "unhandled 32-bit cp14 access %#"PRIregister"\n", hsr.bits & HSR_CP32_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } void do_cp14_64(struct cpu_user_regs *regs, const union hsr hsr) @@ -669,7 +669,7 @@ void do_cp14_64(struct cpu_user_regs *regs, const union hsr hsr) cp64.op1, cp64.reg1, cp64.reg2, cp64.crm, regs->pc); gdprintk(XENLOG_ERR, "unhandled 64-bit CP14 access %#"PRIregister"\n", hsr.bits & HSR_CP64_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr) @@ -698,7 +698,7 @@ void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr) gdprintk(XENLOG_ERR, "unhandled 64-bit CP14 DBG access %#"PRIregister"\n", hsr.bits & HSR_CP64_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } void do_cp10(struct cpu_user_regs *regs, const union hsr hsr) @@ -731,7 +731,7 @@ void do_cp10(struct cpu_user_regs *regs, const union hsr hsr) cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->pc); gdprintk(XENLOG_ERR, "unhandled 32-bit CP10 access %#"PRIregister"\n", hsr.bits & HSR_CP32_REGS_MASK); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); return; } @@ -756,7 +756,7 @@ void do_cp(struct cpu_user_regs *regs, const union hsr hsr) ASSERT(!cp.tas); /* We don't trap SIMD instruction */ gdprintk(XENLOG_ERR, "unhandled CP%d access\n", cp.coproc); - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } /* diff --git a/xen/arch/arm/vsmc.c b/xen/arch/arm/vsmc.c index 62d8117a12..e253865b6c 100644 --- a/xen/arch/arm/vsmc.c +++ b/xen/arch/arm/vsmc.c @@ -346,13 +346,11 @@ void do_trap_smc(struct cpu_user_regs *regs, const union hsr hsr) if ( vsmccc_handle_call(regs) ) advance_pc(regs, hsr); else - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } void do_trap_hvc_smccc(struct cpu_user_regs *regs) { - const union hsr hsr = { .bits = regs->hsr }; - /* * vsmccc_handle_call() will return false if this call is not * SMCCC compatible (e.g. immediate value != 0). As it is not @@ -360,7 +358,7 @@ void do_trap_hvc_smccc(struct cpu_user_regs *regs) * ARM_SMCCC_ERR_UNKNOWN_FUNCTION. */ if ( !vsmccc_handle_call(regs) ) - inject_undef_exception(regs, hsr); + inject_undef_exception(regs); } /* From patchwork Thu Feb 13 15:37:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Babchuk X-Patchwork-Id: 13973481 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 BEAF1C021A0 for ; Thu, 13 Feb 2025 15:38:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.887824.1297267 (Exim 4.92) (envelope-from ) id 1tibHv-00085G-Sx; Thu, 13 Feb 2025 15:38:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 887824.1297267; Thu, 13 Feb 2025 15:38:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tibHv-000859-Q1; Thu, 13 Feb 2025 15:38:03 +0000 Received: by outflank-mailman (input) for mailman id 887824; Thu, 13 Feb 2025 15:38:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tibHv-000853-7n for xen-devel@lists.xenproject.org; Thu, 13 Feb 2025 15:38:03 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062f.outbound.protection.outlook.com [2a01:111:f403:2614::62f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 81bfc045-ea20-11ef-abfc-e33de0ed8607; Thu, 13 Feb 2025 16:38:01 +0100 (CET) Received: from GV1PR03MB10456.eurprd03.prod.outlook.com (2603:10a6:150:16a::21) by AS8PR03MB7030.eurprd03.prod.outlook.com (2603:10a6:20b:295::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Thu, 13 Feb 2025 15:37:59 +0000 Received: from GV1PR03MB10456.eurprd03.prod.outlook.com ([fe80::a41e:5aa8:e298:757e]) by GV1PR03MB10456.eurprd03.prod.outlook.com ([fe80::a41e:5aa8:e298:757e%4]) with mapi id 15.20.8445.013; Thu, 13 Feb 2025 15:37:59 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 81bfc045-ea20-11ef-abfc-e33de0ed8607 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HSAJN0lHYlVq8OiW0kbSZ3GLKK0TFQQqFVpFoLDLcm/jACyA2w0iWzrWODweFSMM68YG0fLu/qPTUX3jDu4Hw3MAHEIhffmbBhwQITQ8te7QdoFIABc/TwzTYMJQ9MjDFXoUsms+l2e5mpRGA4jt41946+9bd4TiYHxkoQ0mLB6kQvEBA4H88qkXpLXbyr6xV3bkO/3zOXCJ5lNtGdR+VZldKn0SSLgK/k14Fd5VBvZDrZXc/Qm7kosUqtx41ajDpGGBiHLKl79wQ8Qh2szg7GvqqH4u6UwXmkf7ZzQKqYfLI4sesiFG8NgtaBd9kF6UaJX6lFAK9HdBScz/MyTqiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=5dxQkqz6IteHjS+Vk9HyCGR6dBrUE8NGLox/Z/hxaYQ=; b=EcZyvBbd4kGDFvcu4JGh29EZHYQjjN4vQ8RS+7vSqDgPvuXOMZnH9Lekp0kvofBz5tZ55wdgJCB/yHtbOaLrIQMeC18WUBZE32b2YnPvNeEFgcNGNc7ZsGyTQMnXFHP3/ASl9eSywdugZN95Oh8oLQCV9vDc7UbF/9z2xdcGmeYzCUXSVqfZvy10PuNjIEtJlQ3AHoUp/jp25Rl3W6T+PUc2RDFVAXg5c2CpWa1tyNTo0/K6Ivx5pZ0+/TdTAaUiasIsp6rbB8Y+QN+NGBotA+rq2q2rxzPxT1Q7w27aMi2pJWQIT5pxoBnV1hkodqiAYLY9VKKDJCZtBIkO0DhoKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5dxQkqz6IteHjS+Vk9HyCGR6dBrUE8NGLox/Z/hxaYQ=; b=G7RlaD51lQZ35+4+R1oZ7dHuJ+gPYCRorhJQSFOjwn5M/h0AQwf/MTlrLzpuPaD6IooE7tYyNfI03goNqLwwpXqIhVtc05mAlYBdWthvqV+BQOiKEved/GYn2v8lDDijCt+GNWlAkxuVXzCiZzC8jKRlvi4aoJbGCygCohtY9bd+vglVlIpW+z8QcQcPvAWw/gvfY+u/oXl7RzGte180fvw8bidKJ9FOb+UPqi7TBrV9diO96GChZqnKeVyI1ui2D4DGb64Me/24h+CbCvCf9ZF4h2QoJeJbbooVQvTD3tTUf9mGRwpB1MWrgAjjZ0PbYCjOskbfEqefi4GTg72s0g== From: Volodymyr Babchuk To: "xen-devel@lists.xenproject.org" CC: Volodymyr Babchuk , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk Subject: [PATCH v2 2/2] arch: arm64: always set IL=1 when injecting an abort exception Thread-Topic: [PATCH v2 2/2] arch: arm64: always set IL=1 when injecting an abort exception Thread-Index: AQHbfi1Am1l4vN4jQUCNGyHDqcpHNw== Date: Thu, 13 Feb 2025 15:37:55 +0000 Message-ID: <20250213153748.2869989-3-volodymyr_babchuk@epam.com> References: <20250213153748.2869989-1-volodymyr_babchuk@epam.com> In-Reply-To: <20250213153748.2869989-1-volodymyr_babchuk@epam.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.47.1 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: GV1PR03MB10456:EE_|AS8PR03MB7030:EE_ x-ms-office365-filtering-correlation-id: 2f949f63-ad6c-4a16-6b26-08dd4c4464d8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?kBYQPnAkIzBGwdDEw5VUShdV2z?= =?iso-8859-1?q?C+LPSpmcP6UqTIxFR4I8JSfMXlJRpMvThnUg7NW6PALatjxFTuIBxuRCGryw?= =?iso-8859-1?q?DT1z44A9Dby58s+l291mAdz10iOZYziJcsiNQHQRSd2Mg0qJGcMoXhLkUTF4?= =?iso-8859-1?q?aUGbvGtGU7lT83AG6oq3oevIeup9415cnjp/yvSimi4esb69WxzvkAmBMZJE?= =?iso-8859-1?q?5nxHaL30yQdJJjYoiV0rb5a/aClUpKXl8UIGyPamw6jGno/MrjXllxUZZC+M?= =?iso-8859-1?q?TR9OX6zUJL7g5MkFJJn7kO+U65bXEnIhWHrRRoy0zUYpsxQ3PZGpTGHe0vMl?= =?iso-8859-1?q?4tnXfh9Geg92DwZ2yVQEeCdEvUD4EEk4BkPgGLSTA0AH6cx2TaaTaKmhV307?= =?iso-8859-1?q?t32Z9JuXCyrAVRMpyd5j3+RKOl/a2SGYmt9jGHVXVQvAe7JfaO6qGYZ8UAYt?= =?iso-8859-1?q?C4G+hAsVfRfPtleys8Ef8DkzLiL11k98eI9gtYKn/Ri/HHdYDwQq37zd5Cmn?= =?iso-8859-1?q?4tYlvQ9i2fgbMlyf2uV9mcGHq0wAxdNQXhe0/4mq24UFMORvWirtWBMqOebS?= =?iso-8859-1?q?IyjzfEVUC08vrRvHhyiG16vYQEO3tEjRa2W8ChG6xEfqgcmUlSLBg0G4tgcv?= =?iso-8859-1?q?glE8ltzIPpmSHhbni3jbPyQtCNt3Xfk6/fqZWMJysRFZuOhEaTBRCvit3hi/?= =?iso-8859-1?q?qN1DDyzzi+a5GO3Xj/S8s3NjpdRxg2Rv7ZOCX/sFhtBBbX2Nv/PWNAJp5Stj?= =?iso-8859-1?q?QZlCwJRI0RG0Ab61HuuYWN8Yj09Ncm7WAPKo1NwlgDsIW+j/MSHhF8n4CVBR?= =?iso-8859-1?q?S+r8n4CDAXoQ8wG5xD6jeu1YcZuJEdsEy3OVJbnEVcaniSiP4skwnYC02o5h?= =?iso-8859-1?q?1BYoJ52euedlx8y4kHF2ofzxWxgSgPQdpYvFcQDwH4MjH3usBs3laS5uyTpY?= =?iso-8859-1?q?PFXnXTuxLipjYEMociyW+SOEGzg0oMb3oQMwku6bxgOpjtchu0GuRXaN7Iw3?= =?iso-8859-1?q?tq/8arC5SMztbOEuAQ3v+u/T/5uUIo5wwxea1r3JQFD37eLXKuT5BaunTrpr?= =?iso-8859-1?q?tlqND9PLbQu5NvBqx5FqETTLLelN+zb50Aq1/3s9xp1HU4zTJAgT+M6Pb2/c?= =?iso-8859-1?q?HdMqPmK3QQbNjfKp3ldMvTzWBMlaQMhAPyYhypShE0BpCT/9RczR9ZF++qKe?= =?iso-8859-1?q?fXKnxwYMGxtZZod4PRsmYCSNHe/dpqhkXdWdo89rGBTZwuLzeTDPMVhaoJ95?= =?iso-8859-1?q?6sKdZcxB0tFmMjNkyMXRFP3C/ubXe3Ul9rUnq351TqZmWr6PJB+znnPozDcj?= =?iso-8859-1?q?IYHZxUBw0cPvrMizT3sUwQIXsJvdB9bgRiai0WWQLuO6TLkERlg3VBaOvR4k?= =?iso-8859-1?q?7LNj3RXGW1Q6WMssBNU8T8/JPH058Y2wPIg9vp4f7z5ZuxygUpjvjCEsy5bF?= =?iso-8859-1?q?CYTfqyTvPvs8TgfZYkebFlPksPVGnzZLuchUAp2/ZwgqAadnxZRPQrgiXW+I?= =?iso-8859-1?q?QQkkds?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV1PR03MB10456.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?p1UJ2QfhCBjQB12choM9mEr?= =?iso-8859-1?q?oKNLVr9r5x9tOAhOScTVHqVdgRYrgzUDcq+h3I1Wr4+uMoW/+yDndc2pGzii?= =?iso-8859-1?q?a1pu1rALdQpgS1olxsaVX0PHCkjTKeje7A91U25UmGcF+CbbKpkbOLdIjt8S?= =?iso-8859-1?q?XBoFx+stUG8MGmujcv3OP+EKiUlNjdxY9ExETDkIHk52htAnWXBt/GjIC7no?= =?iso-8859-1?q?1wmqrHfNI+xxJE5Xb+Jby4szmE+e5S9qO9pYnow9MVe9/ryM+7egGvXlGoNu?= =?iso-8859-1?q?8Nc9cmdSrY/hlr+btKgCG8uBkpn0vxiGjlT+xQnwD5+f0oKcIhQG/WEKQvIe?= =?iso-8859-1?q?jFQk0sFvB53AYvdK67yBIEPZbnrzCXxU0FtCnA+7V4GFr1I+y+eCwS3ZSmIh?= =?iso-8859-1?q?5jOhPKa96pJYGcXoEVikgaB5jl5sagHtqYvt2QvZH/5XvqlCy4yntYBVMCAN?= =?iso-8859-1?q?1X+5RA+as2mmeL3r2/gzDv5QlcP0qlzGgQuVZruP6AUluChIUFoJMvzGstUb?= =?iso-8859-1?q?0yPxKL4UYvc3gJK9aUDc4Gn1vEcrBw1lWnwX8oTRM6B1Z0sfOSzrcRnSRPrq?= =?iso-8859-1?q?Q64NRUCwDk/Kp+MpncmUJnerqlfONSQJ4l3RW3ViwH11zHgaojHH9sM4TyrQ?= =?iso-8859-1?q?m5JZ9wpEAhcdkfimG+O1W0ZdRqPlhOe2AWvsLp2EYp9PCupIE+zXPprc3jwY?= =?iso-8859-1?q?CJTOuaGEVMO3a3+Hj754ulUFdbHz3PdRFx7MxTsxQcs4cABxbm+OaUwYuo4S?= =?iso-8859-1?q?3vZBmki7xjGA3dtCtAgufmaCNTNMEo817rtB2Tz2QdBSkGUc9fz72sL3pvzp?= =?iso-8859-1?q?EK63sbNN1LisYNRrBeXcfKWOw0S6JXmkMBl4WrNgLFPn6hIOqrv8CuBYDCgg?= =?iso-8859-1?q?VnRhWSQFubrq/1XKZo3mc6NUwNUvSme6JW2Yt5AOdC8FpRwdzvb4hNyrZO1Z?= =?iso-8859-1?q?S+dGy15vF5Wq1FBO7o//cUeOLi8cjSchF7ME0aG/N1yIinT+jpaWWnQN1XaC?= =?iso-8859-1?q?GAKchXpg47j3tfTHpCiQ24aA8Imcs7/h4syD4YZaFnI8PfZWe/hpaImibFwq?= =?iso-8859-1?q?qH9cllzwjByPkIWyFwbt/4OKM0BP32cTjm0zucitUBPrMrYlDdvrD7xXX3sO?= =?iso-8859-1?q?Z71uUYWiQzqso7gBI1L3/Fh01qKTSOE8p1p8SjH9A1ZaLZPLJjgrB6UOz7+U?= =?iso-8859-1?q?mQfoNbYwyNtxg0Tth31nnCr2br1I8M4waGwNjGKby62KwBKf90rvl2n22Q8Q?= =?iso-8859-1?q?tdmmujiUAE5LI8EuNkxerIUI+jJEo53pHb79wO0QCIecXhHjFVSSw311yw61?= =?iso-8859-1?q?68ySmkVtS5QOi1zHXb5/Dd5Qe1EjaIt2MJuZKj/z7fmGsGtFXx1c+WFw3z7x?= =?iso-8859-1?q?vWqdTe7GaqbvJK5KGMc7Rmb2V0KFpprFsfzB419p02klkC0dZv4NPGIKpK7E?= =?iso-8859-1?q?9FWFGgeVexp7sWlFEoaYjg93YFDCNl5bY75EQa+rQviqZ7t5xjef9hqTc55Y?= =?iso-8859-1?q?C6Z3Fl1u6uQ0lj/8AIVG/gujsbYGqGSGeQOR4AdGfxObkBIxxKqU5imyQ4dv?= =?iso-8859-1?q?Ud8na41mZJdyKCnNKKMXUyqn3c8APLO5NLhaRAcocwj6t+UAZdHppti+LCnc?= =?iso-8859-1?q?+EPw7JUZS96avWJ8uxt2lpkVgoGFUJLw9L5Zb7A=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: GV1PR03MB10456.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f949f63-ad6c-4a16-6b26-08dd4c4464d8 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2025 15:37:55.1185 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: TQdmCIocS5Hgt20jah0EKofsUBta+sA4uih3Mjh33UvhqKbev4zZIFNPPdV7P6xmyGT9P+231bs6IRPzqk0svnDn4H1ln64CelQRO3cavLI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7030 ARM Architecture Reference Manual states that IL field of ESR_EL1 register should be 1 in some cases, and all these cases are covered by inject_abt64_exception() Section D24.2.40, page D24-7337 of ARM DDI 0487L: IL, bit [25] Instruction Length for synchronous exceptions. Possible values of this bit are: [...] 0b1 - 32-bit instruction trapped. This value is also used when the exception is one of the following: [...] - An Instruction Abort exception. - A Data Abort exception for which the value of the ISV bit is 0. [...] inject_abt64_exception() function injects either Instruction Abort or Data Abort exception. In both cases, ISS is 0, which means that ISV bit is 0 as well. Thus, IL must be set to 1 unconditionally. To align code with the specification, set .len field to 1 in inject_abt64_exception() and remove unneeded third parameter. Signed-off-by: Volodymyr Babchuk Changes in v2: - Introduced in v2 Reviewed-by: Michal Orzel --- xen/arch/arm/traps.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 5338d5c033..3071c38768 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -559,13 +559,12 @@ void inject_undef64_exception(struct cpu_user_regs *regs) /* Inject an abort exception into a 64 bit guest */ static void inject_abt64_exception(struct cpu_user_regs *regs, int prefetch, - register_t addr, - int instr_len) + register_t addr) { vaddr_t handler; union hsr esr = { .iss = 0, - .len = instr_len, + .len = 1, }; if ( regs_mode_is_user(regs) ) @@ -591,17 +590,15 @@ static void inject_abt64_exception(struct cpu_user_regs *regs, } static void inject_dabt64_exception(struct cpu_user_regs *regs, - register_t addr, - int instr_len) + register_t addr) { - inject_abt64_exception(regs, 0, addr, instr_len); + inject_abt64_exception(regs, 0, addr); } static void inject_iabt64_exception(struct cpu_user_regs *regs, - register_t addr, - int instr_len) + register_t addr) { - inject_abt64_exception(regs, 1, addr, instr_len); + inject_abt64_exception(regs, 1, addr); } #endif @@ -617,26 +614,24 @@ void inject_undef_exception(struct cpu_user_regs *regs) } static void inject_iabt_exception(struct cpu_user_regs *regs, - register_t addr, - int instr_len) + register_t addr) { if ( is_32bit_domain(current->domain) ) inject_pabt32_exception(regs, addr); #ifdef CONFIG_ARM_64 else - inject_iabt64_exception(regs, addr, instr_len); + inject_iabt64_exception(regs, addr); #endif } static void inject_dabt_exception(struct cpu_user_regs *regs, - register_t addr, - int instr_len) + register_t addr) { if ( is_32bit_domain(current->domain) ) inject_dabt32_exception(regs, addr); #ifdef CONFIG_ARM_64 else - inject_dabt64_exception(regs, addr, instr_len); + inject_dabt64_exception(regs, addr); #endif } @@ -1965,9 +1960,9 @@ inject_abt: "HSR=%#"PRIregister" pc=%#"PRIregister" gva=%#"PRIvaddr" gpa=%#"PRIpaddr"\n", hsr.bits, regs->pc, gva, gpa); if ( is_data ) - inject_dabt_exception(regs, gva, hsr.len); + inject_dabt_exception(regs, gva); else - inject_iabt_exception(regs, gva, hsr.len); + inject_iabt_exception(regs, gva); } static inline bool needs_ssbd_flip(struct vcpu *v)