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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EE13C71157 for ; Wed, 18 Jun 2025 06:56:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D0816B008C; Wed, 18 Jun 2025 02:56:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A94D6B0092; Wed, 18 Jun 2025 02:56:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB2C06B0093; Wed, 18 Jun 2025 02:56:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DBDB26B008C for ; Wed, 18 Jun 2025 02:56:08 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7E3E91207CF for ; Wed, 18 Jun 2025 06:56:08 +0000 (UTC) X-FDA: 83567612016.28.541DAAD Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2058.outbound.protection.outlook.com [40.107.244.58]) by imf25.hostedemail.com (Postfix) with ESMTP id 7AD7CA0003 for ; Wed, 18 Jun 2025 06:56:05 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=VpvQ7op6; spf=pass (imf25.hostedemail.com: domain of ankita@nvidia.com designates 40.107.244.58 as permitted sender) smtp.mailfrom=ankita@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750229765; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bmpn7enO6x1CE0vhWWa5TJpoKWK13CaLaXZL4w0OjIc=; b=fQESg/SvTCJ4Kn8z/rudDbxm16GHAHCik1NHXRAHcp5Hb0mmOpZeHvF0kXkJqdVxfHNsLd iW95WLth//Sr9BEcoylcj1XVvPq1QK+EZACK1V6PpCj07oLRNwfq7to7jRi56CeIIQ3KNH 0g0ginvoHHal+hTvQBeHOslJnv2i9tY= ARC-Authentication-Results: i=2; imf25.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=VpvQ7op6; spf=pass (imf25.hostedemail.com: domain of ankita@nvidia.com designates 40.107.244.58 as permitted sender) smtp.mailfrom=ankita@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1750229765; a=rsa-sha256; cv=pass; b=Xw5AUKOGLWzwl2QIQ6+GchMblc7+oNkXStUhlT+ye8mU5EhSpvWPK6vsUhknsLPLn3P1pK 9ndkSR2klv4t4cLFEz0WAhr4ist5BdOqs7CBy4r4JwHvZ5tOKoBU3+GY2EcQvy9L2Ql7w0 W6RZwuDlrBCy+r8I9XDhSRAiyaQkB+E= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fW0SVqlMZG3Nbtpeco3PtSatYPli0NriGEfHIiu67R0BYlkOKwsYFs9uSLAHeaWKIMMJNVOol/hLGY4Zo94LtfyE4GUvho+Iiasdh+5B6GIfanvKF+/uUDtshZicIqFcADG2r45c9Ho++KLdq3zUL1WfSOc13har9xuf2AqxYYnkGgLkXvmNxvQmYXcMji48KkDjNf4QDacTIiTE1JgM8HR1gzh61zpGNUChe5yh2dHuZFqrQ+USe92tcfTsbu8cYeJz6pTlxH0QJSRIUWI8n8DF/7bBeF7klAwQsaP/ykaJSNOqdYFzngZV8hucBdC70nxpRugEI6zCQ2pvqh66IA== 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=bmpn7enO6x1CE0vhWWa5TJpoKWK13CaLaXZL4w0OjIc=; b=WrhNbIR0jwahcGWACri9oWDEZ8iCxvFC+Pu1pIMMsdzDNQdeV5TOujORnVp3b1K3ccDSMe+HKjFSItWvsMYZ2OW0Dm8iU+/Hu4RfuzW9P5YQCOj8RFuWg9QLBhl32UgMZEOUmRIfm+U8dus0pmj0cmJQg6WlHwlcAHPwhu/u4h4yqczxtrB7m+q8FOHBwHB8DCS5Lkh9APRaxVzfgB1IPVZKa44XV2U91cMEdRjbvJyAJtUKrzL2EWmUUI5+sDOpwq8tbN1Zru9zHfZc9aHz2uVLrhcdSgmFQ+bWa1dsLUswNSKTFga3eAE7EW5xVKEdXbqjeu6pAPhpV0vrEeXIlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bmpn7enO6x1CE0vhWWa5TJpoKWK13CaLaXZL4w0OjIc=; b=VpvQ7op6jSxXmsx/9CY/EI2HbD4dUN/8rSbIbkHRSdsqI2eBp3D4UwQ1OoISyskRdw4+I3K3Z/u6nTi3HPH5dtWUo544HXnUPttH6naYJBInux+S7NGr+BkF55QGEZIHEhF1GcFwDa+Yz7bPyvthqV/khL8M8KxADhY82XivVYzHz+p1lj0wavOW7MDviVTJohtzNJiDqPGkCKBixDmYuLJpa+Ke+chRfWUIAEbejrH6fZoGLPPfvvPsZmniBo9ws/g1i4vjy3bcW96sZznJTKj64N1RpV9d64D+MiQdPINPHj3YbVH1N0ibeZfSwiT9+cU3EqzdxkyPO5XMG079aw== Received: from PH7P220CA0024.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:326::11) by PH7PR12MB5783.namprd12.prod.outlook.com (2603:10b6:510:1d2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.27; Wed, 18 Jun 2025 06:55:59 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:510:326:cafe::d5) by PH7P220CA0024.outlook.office365.com (2603:10b6:510:326::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.27 via Frontend Transport; Wed, 18 Jun 2025 06:55:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015CB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21 via Frontend Transport; Wed, 18 Jun 2025 06:55:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 17 Jun 2025 23:55:44 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 17 Jun 2025 23:55:44 -0700 Received: from localhost.nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Tue, 17 Jun 2025 23:55:42 -0700 From: To: , , , , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v7 1/5] KVM: arm64: Rename symbols to reflect whether CMO may be used Date: Wed, 18 Jun 2025 06:55:37 +0000 Message-ID: <20250618065541.50049-2-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250618065541.50049-1-ankita@nvidia.com> References: <20250618065541.50049-1-ankita@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CB:EE_|PH7PR12MB5783:EE_ X-MS-Office365-Filtering-Correlation-Id: c17aa5cc-2fd0-4306-abe1-08ddae352e4f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UsdkWTYS6dtcUKNA8Ifrpra/lEdVCqFwaAygkHrh/9dn3vNIWvcV/Y6Wpwkd?= =?us-ascii?Q?fYmX2K0m/pPzVydS0PuZGjA+Pj4oe+SYqramI5vugGd9uDocu2n//i3Np5ZN?= =?us-ascii?Q?kHTEHaF0mYyz3VsxZxdLx0fkcjDbgnMy5thuYD9T9Eemygp3MjLRs6cg0YnJ?= =?us-ascii?Q?aaRW+bE1mr+OBLEwVdLiKCxKDOqx/FIP6uUJtkPrpncr1kMzzORc7xyYDIfD?= =?us-ascii?Q?eMPUcQSteels7NA6qkCnwzNQcE5m9AH4aBhCnvKl8UFxFsI6NUxDYWBR3zPO?= =?us-ascii?Q?OndphHR/Ic/oGhXLj+BFtsKbHlpcJD7FwUjhFvg3vFA6NoobqO6OtscDt8L2?= =?us-ascii?Q?MOmu+XGGGJGStwtANf22218BwRukONLgadPuPsNqq1BRo6xiC/OS5GG3iLnk?= =?us-ascii?Q?xx+8JzO6yfZvwhXAOZtc5HszSvft5LSMBjvQYH1tLal9f/1NF0fWRiqOCTDD?= =?us-ascii?Q?inPGSJWhJCNC2GwvGCwmHESERXrpnLIxO+zs5GGXnQ/uO3PcQNnUAYC1IACG?= =?us-ascii?Q?kIMyMIgfflJoY70YDSWWJ1M3l2CXNzeGreuPzro03M8qHCAHJ9ZxduHnHvIl?= =?us-ascii?Q?XjR5WB2z5HxP20rqghECcTwJeoy0Rz0IF3aJHolAZDuWprLGbt6saUUlJnnb?= =?us-ascii?Q?kccWzC0A9NrbQafcZ0KVNdYpqbrjvMak9zXR60dZDBmIxbYPuwjg8MVUsTKZ?= =?us-ascii?Q?ZOVvbylPooB4+zbPPxEmG/DZHnVkkihTLgN7IyUfMt8l54ic6Tcql1wSAXJz?= =?us-ascii?Q?4YyXMiAjkX77RHQg0l4YuAPhlJDbAu8LeJYfKOeZJBXKfLImM+TPikMpxGqr?= =?us-ascii?Q?/OROI4rcWEqjMnXye61G+BnZSccI1RvgaTdGSVnewnRHv6JqHsaTyhNAKWwb?= =?us-ascii?Q?43/G2d6CSEa85nEP/T980lGZjj91cHVOamxpMbUSATvy/LsQAY8RByeFLPMp?= =?us-ascii?Q?xJekoYIXFY3kdiCFRxEUXeOLmiVIqmU/3/89A8w0n0Xyr4Lj/ATczLfd07Wl?= =?us-ascii?Q?nBGoAAL5iv9nA4knWfbriVd45zP935fb+DG8Eh1kguz/eUE/RB9vaVJYOopH?= =?us-ascii?Q?0312KkXhX2asEql7rd+7V3KpZUKohkKN8L0lUMB8EgohwNIHZeva513OBel5?= =?us-ascii?Q?GEiey9VVx7hea21NMGgzoWX/+0nesOZn2CVK9o5a7KkHltEQ7J60k40TSStH?= =?us-ascii?Q?nbVuXdVkmB7/YjL5yTMN5p4Rl70xI3VSEcADQ3EX6KoZsuqPb7QBzK5LwCI0?= =?us-ascii?Q?i4xnQWYw1J3b715LgTjVXndIlZIo90gsM8mowRgutwA2XLkkioQOk6gCFpHh?= =?us-ascii?Q?dBQZy81o9a5jQhUlGuMZik16f0T2TVwnrkap62SgAtFjbxpmJ87qDSzirA47?= =?us-ascii?Q?ka7WdjTSZQb5X5XsKOX6kp2w5MzVYYSffmPOxhadwPCLRbr+ZLBFCYq9ctaV?= =?us-ascii?Q?Eegos0zN3ZKNgo17zisJ2F8Ipfk3m+xsoB5jBqnAx3/ZpinB4YaYx46cnyde?= =?us-ascii?Q?QSZtK+wG5D7vXCcHwFdPjr7wTMjjWobryphXPla/CnHfGcPXNPB4ne91Sg?= =?us-ascii?Q?=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(7416014)(376014)(1800799024)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 06:55:58.9356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c17aa5cc-2fd0-4306-abe1-08ddae352e4f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015CB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5783 X-Rspamd-Queue-Id: 7AD7CA0003 X-Stat-Signature: 5bj5i93zue3ismcab3cwxooioejo13xe X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1750229765-292698 X-HE-Meta: U2FsdGVkX1/hVrQKJOdWE6+WWtcumF7irkrE4C46uYyM3/dIa1ht3dvYC9u+hWueXKn4q9wUrcoIH5wxOJ3abGupdmA79JEFS2vY40wJ8+KQKTy4v0A4MU+u0MfRCnmm6DnKiEHeeLIEI4bgnFLypUocSoTzRgqw6vuZg6Z0D82zyjcsjkzFNtpSDt62EplxilHn6nQgGd/ek5G8Oi457NsH32sIHwIcxroysJE/KqvTd7YGpnfktcITrT0IyHEUEOYcOypCVYqvZ+tNxglFCIUx0Ov0Hg3F1b4jOSQjI4KQALbWpXhC/NeEb7RHGdfr7EPNgbX7fwjzDLRGPYGez62r90rOsWoz49GOAcC5i1IwMU64yK7+8l25B0m/d5N4FLoG/zjuZ2LhJHNWKldjJW7unE7evZ/80Ltz0nQfOCB++ZlFId821NUT4OPkCcMEnBxxP++lOmRnghy3rreEEB6oeQwBh0fonhZD9RGc41w0xYwNO8cwIQ9zdyVV1HrpvrZqW6z1oeLwbaIphs750+43xrNCghwbhbE1bueeBa64CDPCRXkEEQBD5o4Yaq9f/x2/yIl1PI/sek5MXqKpo6lC9/OuxnGqV1bj4phSpBQDBUxNGH0TLIma9RxYwANqQeTgGRuWXpTUsJgCtW6GgkqoXKwO7tRHQcM1skhsb+DUmgYqby/AA4/L153BY282HWLkWzjLZsQRi46V5dbWuDrhilX9UumyXOduIRBOFbh3Ska31UaY0duxdaFeJXmL4u3FKOy46mEkkbvzZj3vpajf1DvJQ7K70M71A1620Wg12FtKzPu9VgpbR3g7/FT7Mt0nL3BGUKoMAmnGrnX3RWJ8S2eHsl7lyGHFppJWlVZ4AlUjbcyAFz5CF7Go0rJQeG5dCfiKVflINi4NldUsZRbI8vPhkqV6R+jhAxlayVU6eXk15AaG4Qca2FSJnz56QVaWB0MNRpysa7nnGLe BJu683Fd +uJUiNQh2ALUvUqL/hwDiVm2/9z7jEnp3r8wltKtZQljr1Qq5HWyJD3nAfFky9QIs13WeZfsMbUzT43Ss51XqG/qACAC7+EahXcj7bwv15EE98Iq1aOEElOvwFNhiO8gWdAdq9Y1v/z7VS/GZw1SDhL/eReuCHlDH8LawIisAWbh+XW0wpEdglZYKATZ93dhDVzDmxn9AgTsPZI4BEyK2onsoKyJCLTsP7ol7yV4g5sHUVhC0FQCLATkQ4asu024P34eQjz9MTgLUWULf89Ld14E7xs3i0pcNA6Hvl3Fd5hkHR3RED5gEHNujdjVAE7U1GNDvp3C/rmQNJTv0o49pEacUcn7GKh4qjKZWrc8Y9C8GlhksK4L2edFMsJX8kbL7qz9wqVlhqp2NHzz0zezoGRcJW42ja5LsNhNqVlBPHrZmGNZyaVcuiHUnxA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Ankit Agrawal Currently, the kvm_is_device_pfn() detects if the memory is kernel mapped. It thus implies whether KVM can use Cache Maintenance Operations (CMOs) on that PFN. Rename the function to reflect this. Additionally, the "device" variable is effectively trying to setup the S2 to prevent CMOs. Calling it 'disable_cmo' would make this code clearer. Suggested-by: Jason Gunthorpe Signed-off-by: Ankit Agrawal --- arch/arm64/kvm/mmu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 2942ec92c5a4..3d77a278fc4f 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -193,9 +193,9 @@ int kvm_arch_flush_remote_tlbs_range(struct kvm *kvm, return 0; } -static bool kvm_is_device_pfn(unsigned long pfn) +static bool kvm_can_use_cmo_pfn(unsigned long pfn) { - return !pfn_is_map_memory(pfn); + return pfn_is_map_memory(pfn); } static void *stage2_memcache_zalloc_page(void *arg) @@ -1478,7 +1478,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, int ret = 0; bool write_fault, writable, force_pte = false; bool exec_fault, mte_allowed; - bool device = false, vfio_allow_any_uc = false; + bool disable_cmo = false, vfio_allow_any_uc = false; unsigned long mmu_seq; phys_addr_t ipa = fault_ipa; struct kvm *kvm = vcpu->kvm; @@ -1642,7 +1642,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, if (is_error_noslot_pfn(pfn)) return -EFAULT; - if (kvm_is_device_pfn(pfn)) { + if (!kvm_can_use_cmo_pfn(pfn)) { /* * If the page was identified as device early by looking at * the VMA flags, vma_pagesize is already representing the @@ -1653,7 +1653,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, * In both cases, we don't let transparent_hugepage_adjust() * change things at the last minute. */ - device = true; + disable_cmo = true; } else if (logging_active && !write_fault) { /* * Only actually map the page as writable if this was a write @@ -1662,7 +1662,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, writable = false; } - if (exec_fault && device) + if (exec_fault && disable_cmo) return -ENOEXEC; /* @@ -1695,7 +1695,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, * If we are not forced to use page mapping, check if we are * backed by a THP and thus use block mapping if possible. */ - if (vma_pagesize == PAGE_SIZE && !(force_pte || device)) { + if (vma_pagesize == PAGE_SIZE && !(force_pte || disable_cmo)) { if (fault_is_perm && fault_granule > PAGE_SIZE) vma_pagesize = fault_granule; else @@ -1709,7 +1709,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, } } - if (!fault_is_perm && !device && kvm_has_mte(kvm)) { + if (!fault_is_perm && !disable_cmo && kvm_has_mte(kvm)) { /* Check the VMM hasn't introduced a new disallowed VMA */ if (mte_allowed) { sanitise_mte_tags(kvm, pfn, vma_pagesize); @@ -1725,7 +1725,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, if (exec_fault) prot |= KVM_PGTABLE_PROT_X; - if (device) { + if (disable_cmo) { if (vfio_allow_any_uc) prot |= KVM_PGTABLE_PROT_NORMAL_NC; else -- 2.34.1