Message ID | 20240224150546.368-4-ankita@nvidia.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 BC671C48BF6 for <linux-mm@archiver.kernel.org>; Sat, 24 Feb 2024 15:07:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4DEC66B008C; Sat, 24 Feb 2024 10:07:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B59E6B0092; Sat, 24 Feb 2024 10:07:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 308166B0093; Sat, 24 Feb 2024 10:07:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1CAA26B008C for <linux-mm@kvack.org>; Sat, 24 Feb 2024 10:07:01 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F4090A1336 for <linux-mm@kvack.org>; Sat, 24 Feb 2024 15:07:00 +0000 (UTC) X-FDA: 81827025000.11.ED82AA1 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2078.outbound.protection.outlook.com [40.107.96.78]) by imf15.hostedemail.com (Postfix) with ESMTP id 2CAF9A000C for <linux-mm@kvack.org>; Sat, 24 Feb 2024 15:06:57 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=TNiRMXRA; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf15.hostedemail.com: domain of ankita@nvidia.com designates 40.107.96.78 as permitted sender) smtp.mailfrom=ankita@nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708787218; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=38sjOfDPntBETQKkswWgEcSo54FMUnu5XGVPfsldrSI=; b=KZxZXD4nQzAJ9kV5qhaVNVgBkoQBqn8tceg10eoj6I7FDVdcmLkdus/1o0mE/MIo8f8sg7 O22z8kiBxqQsnU+fI30F/zJle9cYoWxn+OVPUDTeVqwCl8c8Sf10arz3fD6GPh8DeePfBE /7HeUQffjKTta5hMh3frf2YBO5WFZwA= ARC-Authentication-Results: i=2; imf15.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=TNiRMXRA; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf15.hostedemail.com: domain of ankita@nvidia.com designates 40.107.96.78 as permitted sender) smtp.mailfrom=ankita@nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1708787218; a=rsa-sha256; cv=pass; b=04JrwHl5cUEe3PO0cLWwSFNkCuEAUuLb6lGJ8P7TgWmLMnrzd2IfFFRbbZizWwlJMnhVU2 08FJVS6DIyLhoKui2mQpmMUWhA7Jhy2x5pasQdePinbZfPN2Ziuz5njouZkFs+mSFinNwt WlF/YMJIVSw242fC8OPbfoyQVC1VkgI= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVK0cGu5AHYQzOIG5CqN20lOKmV/xjbxSytF+soKbCVvzMiRjh6RdMqIQUpz3FMK2I52odqvjqc0mibf7jP1FJigvXSbfYywxXDeLjTClyUaYpyq/t5Q2pjPaqAoVDkp3r5b4+3GOSDplqRH0c5uwEtsVLnNoI79CoueZgWRFJ+o0lznGqSuCPuJiKHv9JYHN+k3X9nRdtOrpynSJzYf9AQh014kF4RtUnomuNES8pKm7j8i/Sv6XPsI5Ad7wF/jB+5nuUKeMNr5c7h3TLiyxQ8RY0vjHJZLvEdR3jV5FGn8X53YxUhLrL9V3AirRHFVN3w9zQvJHv+BS7bM8BOfNw== 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=38sjOfDPntBETQKkswWgEcSo54FMUnu5XGVPfsldrSI=; b=WmvW+6NXll5gtsyx1SHhD0GBWwXcqDT5LyphXfdISP9NRkLKPum4Wu0AXn035CHCSh8Mgyf9BQqn22dCXAT8HF48dHUN8MHxbnKJU9HJz7OzaQm7LCs2wC+mbgDxwNRcnzxr8Re0BWVx2ZXJIF+5y/MANxuyQ0xCaRcu8x9X7/580yr5Kc+X3TBblGgEhYLF+Hc7FQqm+OREwxQjYRY7rA1V/ACFjV9ZqFESvfI3AHtPzeXAgmi1ZK5BUlsSPGtV+mMjusg3QIevR0E+r8WXSj07YuuEsdYrAaU69CiLmHqKK5hdQgNCjM8DHgsGeMkw1HoUAULNeIkDSucNOfUgVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=kernel.org 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=38sjOfDPntBETQKkswWgEcSo54FMUnu5XGVPfsldrSI=; b=TNiRMXRA9pRJy1r5DiCE6GcB21XKZL/8C9fbYIUvfbh6/hn03mYNSjkXLqtoc9OpyD5+/Es/Hm5zaYV8ReSPh6NMHFj9+tA4snYQ01+J1L2s6faxYqwOBNoKkVA5UDYY/USLv5oVIFi1awfsS3Qm4dK8GLtVzvyjJxjY6Yu2QJEnMX7Vy7a+yktIXMQNmFAiUV0RaoXJcR4kmtQxgACAhJlXq/8JV/E9tLSHEC6qRaP/qCAOTWmyQBzt6B/dFgfuqeNTpGuEqki/DNjbzl8ZXfQfMVDseNgRtsC5DldV+zL/3tKMzctNgDa17K7Phdfk7GXIH2CBMA7L+SCURe9p+Q== Received: from CH2PR19CA0011.namprd19.prod.outlook.com (2603:10b6:610:4d::21) by DS0PR12MB7678.namprd12.prod.outlook.com (2603:10b6:8:135::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.24; Sat, 24 Feb 2024 15:06:52 +0000 Received: from DS3PEPF000099D7.namprd04.prod.outlook.com (2603:10b6:610:4d:cafe::d5) by CH2PR19CA0011.outlook.office365.com (2603:10b6:610:4d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.48 via Frontend Transport; Sat, 24 Feb 2024 15:06:52 +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 DS3PEPF000099D7.mail.protection.outlook.com (10.167.17.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Sat, 24 Feb 2024 15:06:52 +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.986.41; Sat, 24 Feb 2024 07:06:39 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1258.12; Sat, 24 Feb 2024 07:06:38 -0800 Received: from sgarnayak-dt.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Sat, 24 Feb 2024 07:06:26 -0800 From: <ankita@nvidia.com> To: <ankita@nvidia.com>, <jgg@nvidia.com>, <maz@kernel.org>, <oliver.upton@linux.dev>, <james.morse@arm.com>, <suzuki.poulose@arm.com>, <yuzenghui@huawei.com>, <reinette.chatre@intel.com>, <surenb@google.com>, <stefanha@redhat.com>, <brauner@kernel.org>, <catalin.marinas@arm.com>, <will@kernel.org>, <mark.rutland@arm.com>, <alex.williamson@redhat.com>, <kevin.tian@intel.com>, <yi.l.liu@intel.com>, <ardb@kernel.org>, <akpm@linux-foundation.org>, <andreyknvl@gmail.com>, <wangjinchao@xfusion.com>, <gshan@redhat.com>, <shahuang@redhat.com>, <ricarkol@google.com>, <linux-mm@kvack.org>, <lpieralisi@kernel.org>, <rananta@google.com>, <ryan.roberts@arm.com>, <david@redhat.com>, <linus.walleij@linaro.org>, <bhe@redhat.com> CC: <aniketa@nvidia.com>, <cjia@nvidia.com>, <kwankhede@nvidia.com>, <targupta@nvidia.com>, <vsethi@nvidia.com>, <acurrid@nvidia.com>, <apopple@nvidia.com>, <jhubbard@nvidia.com>, <danw@nvidia.com>, <kvmarm@lists.linux.dev>, <mochs@nvidia.com>, <zhiw@nvidia.com>, <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org> Subject: [PATCH v9 3/4] KVM: arm64: Set io memory s2 pte as normalnc for vfio pci device Date: Sat, 24 Feb 2024 20:35:45 +0530 Message-ID: <20240224150546.368-4-ankita@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240224150546.368-1-ankita@nvidia.com> References: <20240224150546.368-1-ankita@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D7:EE_|DS0PR12MB7678:EE_ X-MS-Office365-Filtering-Correlation-Id: a20538a6-580a-4022-9a6b-08dc354a3bbc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hC4hhayOtUyn4ffNXgDelGD9b4kuU8rkx2Zk+kuSiRA6qt6A6GVWHvEnuvbA0PdW0bkE6rCPtzu/K/FYsnRQ6BoxppPYZaKxtmeHGYxGlvzpKKGjoCVbgwKAgV4neYhozCyvl9RrZ7cO7FrWKFbke7QBt/dAbs97b0qTshqwNxh0fTuiEVc/QBbT8RwCPG9agpDz50vPxodgNGgPYpZ8miUmgwARYVdmybHHChcOo3uwk25oRpePbkIdc0QOhBqSL9YdVsVEZxq1jxwv+7SxFIxEbe0iZz3xEj9L4mylXDWav8Q78BHCaQNl5bbJvcHzJvrlGxfhg3T4LxEuCDbyj2PNzDd+1/DiTsgsWoYyaVVK878Ff6opm+pwikR6oS2QbncRU7IowTuf6UeDh2cb5gN6UA6GHsU7tN7WeJH9Gr2WFtvmM8SNMaaECj/nOHb5cEaIqz9FAaozLi0I84I3233SeYHEVrIfFHV0PRdTIBLJA56BAAN5LPYH474+/28FERNJhrnphDoXFwSLTyLOrtf9YAez2+EYDWG+vdh++tXqCRGV3nqYD/JsU85HRosohh/XdBz1NNrC02DVpMxAlbDy9IVD99K0wc8Xjns51qLS8M1uUMM+Ca7gkzPQgRBilGk9ukt6DjRn3i14rtb8ZvL87tLKu7dZSu5zheqnU6Y= 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:(13230031)(36860700004)(40470700004)(46966006)(921011);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2024 15:06:52.3179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a20538a6-580a-4022-9a6b-08dc354a3bbc 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: DS3PEPF000099D7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7678 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2CAF9A000C X-Stat-Signature: 5z5ucr8zia74y6ci43g7httt9zssm5cw X-HE-Tag: 1708787217-104233 X-HE-Meta: U2FsdGVkX1+i488rlEUNjuqgd4rOL2yNi+8ym9G9IcGdmW/UiBe6IUL4eYTHb5mcaThxCrQsFXovLhQyADl8RdzaGPxTYXq1/t6UkyzXARQuyt4FbkWt7lZR/Re/1iAUmYo2Xswp1qI/iHvwmY7hXqyppuCIv7uLldC6irChtIDuc6j/ts2SFj+tmaNFR7SpMkP8M2+xourmdHBjOy2g0PIy/BxhrWqEVUWYvHOJLLHLI5M3J9xsjNKjaL0AdBBgQFVumPYFYYq8WY/JO9HS5zogP0eXfQJiExgIi4SHmEliuoWC+BKSFkBvYK7f12uSWm1e5YVf0uF+Jwj8wSQeP7IdeSvkVOR5+VYHJN4Cid93BVB0uLbvguO+dnwdd4HjKzYxqBahLYMlccjhPKmAYP1G1z6Xj4aGFSfIMlCDDdTRmtg6nepQ5axueqx7gTqflWBP0BKCETeH2zIUZRv4fu0QMQUMoM4LNG3GDOFCceekvlvSQh7AudWnTPoVkEVu30NK1OpZzu/fV+ubg9Guq0qN35WfWfsnMkHCYF8EW5vRT6NpYRqUHVPskcEi3tznKBOYf4hPFxlHUSNyOfOMW+huX9zJMHFYm4He8fclQ+G5LOUmDP9hgvY8v5qcZFwc3zsqnF+vlaO7rQZeFT65hRZnhSKpwnqPbcn884S2CclMIrGyRZZJNFBCV0GmPaz6g46ssJPSN7fBOezxs7LGJjcUr26eAUe6/1rQgTpGltnoNkMKP8rqNaYKcrF+d1gFSTmJmzAFoHPwrRBQpFSl0ZJWpf6NLagSJIQ+kMYMz0aSayhKLre86TrMT2fOB5h2Su70aNfNdcMEs/unRvi6YtfUx/AMiG99bf210FCSneRO6WD1a2TpwVM7vhzrcAx/JyUkxIy/EHHHiPKkp0CP+w== 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
KVM: arm64: Allow the VM to select DEVICE_* and NORMAL_NC for IO memory
|
expand
|
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index d14504821b79..1742fdccb432 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1381,7 +1381,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; + bool device = false, vfio_allow_any_uc = false; unsigned long mmu_seq; struct kvm *kvm = vcpu->kvm; struct kvm_mmu_memory_cache *memcache = &vcpu->arch.mmu_page_cache; @@ -1472,6 +1472,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, gfn = fault_ipa >> PAGE_SHIFT; mte_allowed = kvm_vma_mte_allowed(vma); + vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED; + /* Don't use the VMA after the unlock -- it may have vanished */ vma = NULL; @@ -1557,10 +1559,14 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, if (exec_fault) prot |= KVM_PGTABLE_PROT_X; - if (device) - prot |= KVM_PGTABLE_PROT_DEVICE; - else if (cpus_have_final_cap(ARM64_HAS_CACHE_DIC)) + if (device) { + if (vfio_allow_any_uc) + prot |= KVM_PGTABLE_PROT_NORMAL_NC; + else + prot |= KVM_PGTABLE_PROT_DEVICE; + } else if (cpus_have_final_cap(ARM64_HAS_CACHE_DIC)) { prot |= KVM_PGTABLE_PROT_X; + } /* * Under the premise of getting a FSC_PERM fault, we just need to relax